From owner-cvs-all@FreeBSD.ORG Wed Jun 9 10:21:11 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AC6716A4CE; Wed, 9 Jun 2004 10:21:11 +0000 (GMT) Received: from cell.sick.ru (cell.sick.ru [217.72.144.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBE7643D62; Wed, 9 Jun 2004 10:21:09 +0000 (GMT) (envelope-from glebius@cell.sick.ru) Received: from cell.sick.ru (glebius@localhost [127.0.0.1]) by cell.sick.ru (8.12.9/8.12.8) with ESMTP id i59AL5vw036264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 9 Jun 2004 14:21:05 +0400 (MSD) (envelope-from glebius@cell.sick.ru) Received: (from glebius@localhost) by cell.sick.ru (8.12.9/8.12.6/Submit) id i59AL5EQ036263; Wed, 9 Jun 2004 14:21:05 +0400 (MSD) Date: Wed, 9 Jun 2004 14:21:04 +0400 From: Gleb Smirnoff To: Kris Kennaway Message-ID: <20040609102104.GA36241@cell.sick.ru> References: <200406090758.i597w4Rm039057@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="sdtB3X0nJg68CQEu" Content-Disposition: inline In-Reply-To: <200406090758.i597w4Rm039057@repoman.freebsd.org> User-Agent: Mutt/1.5.6i cc: cvs-ports@freebsd.org cc: cvs-all@freebsd.org cc: ports-committers@freebsd.org Subject: Re: cvs commit: ports/net/ng_daphne Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 10:21:11 -0000 --sdtB3X0nJg68CQEu Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Kris, attached patch fixes build. I have no chance to test it, but it shold work. On Wed, Jun 09, 2004 at 07:58:04AM +0000, Kris Kennaway wrote: K> kris 2004-06-09 07:58:04 UTC K> K> FreeBSD ports repository K> K> Modified files: K> net/ng_daphne Makefile K> Log: K> BROKEN: Does not compile K> K> Revision Changes Path K> 1.2 +2 -0 ports/net/ng_daphne/Makefile K> _______________________________________________ K> cvs-all@freebsd.org mailing list K> http://lists.freebsd.org/mailman/listinfo/cvs-all K> To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE --sdtB3X0nJg68CQEu Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename="ng_daphne.c.patch" --- ../ng_daphne-1.0-orig/ng_daphne.c Wed Jun 9 13:46:28 2004 +++ ng_daphne.c Wed Jun 9 14:16:02 2004 @@ -108,7 +108,7 @@ NGM_DAPHNE_COOKIE, NGM_DAPHNE_SET_ENADDR, "setenaddr", - &ng_ether_enaddr_type, + &ng_parse_enaddr_type, NULL }, { @@ -116,7 +116,7 @@ NGM_DAPHNE_GET_ENADDR, "getenaddr", NULL, - &ng_ether_enaddr_type + &ng_parse_enaddr_type }, { 0 } }; @@ -126,18 +126,16 @@ * Node type descriptor */ static struct ng_type ng_daphne_typestruct = { - NG_ABI_VERSION, - NG_DAPHNE_NODE_TYPE, - NULL, - ng_daphne_constructor, - ng_daphne_rcvmsg, - ng_daphne_shutdown, - ng_daphne_newhook, - NULL, - ng_daphne_connect, - ng_daphne_rcvdata, - ng_daphne_disconnect, - ng_daphne_cmdlist, + .version = NG_ABI_VERSION, + .name = NG_DAPHNE_NODE_TYPE, + .constructor = ng_daphne_constructor, + .rcvmsg = ng_daphne_rcvmsg, + .shutdown = ng_daphne_shutdown, + .newhook = ng_daphne_newhook, + .connect = ng_daphne_connect, + .rcvdata = ng_daphne_rcvdata, + .disconnect = ng_daphne_disconnect, + .cmdlist = ng_daphne_cmdlist, }; NETGRAPH_INIT(daphne, &ng_daphne_typestruct); @@ -311,22 +309,18 @@ /* The peer node is eiface. If we know out hardware address, let it know */ if (priv->myRowHead) { - struct ng_eiface_par *eiAddr; + struct ether_addr *eiAddr; - NG_MKMESSAGE (msg, NGM_EIFACE_COOKIE, NGM_EIFACE_SET, sizeof (struct ng_eiface_par), M_NOWAIT); + NG_MKMESSAGE (msg, NGM_EIFACE_COOKIE, NGM_EIFACE_SET, sizeof (struct ether_addr), M_NOWAIT); if (msg == NULL) return (ENOMEM); /* Fill up msg data */ - eiAddr = (struct ng_eiface_par *)(msg->data); + eiAddr = (struct ether_addr *)(msg->data); - eiAddr->oct0 = priv->myRowHead->etherAddr[0]; - eiAddr->oct1 = priv->myRowHead->etherAddr[1]; - eiAddr->oct2 = priv->myRowHead->etherAddr[2]; - eiAddr->oct3 = priv->myRowHead->etherAddr[3]; - eiAddr->oct4 = priv->myRowHead->etherAddr[4]; - eiAddr->oct5 = priv->myRowHead->etherAddr[5]; + bcopy((void *)priv->myRowHead->etherAddr, + (void *)&eiAddr, sizeof(struct ether_addr)); /* Send message to this node */ NG_SEND_MSG_ID (error, node, msg, NG_PEER_NODE(hook)->nd_ID, 0); @@ -1208,7 +1202,7 @@ { FREE_CHAIN (p_tempRowHead->neighbours, rtElem); p_tempRowHead->neighbours = NULL; - p_tempRowHead->numNeighb = NULL; + p_tempRowHead->numNeighb = 0; p_tempRowHead->routingSeqNum = 0; p_tempRowHead->routingSeqNumTimer = 0; --sdtB3X0nJg68CQEu--