On 07/23/15 20:15, Antoine Jacoutot wrote:
>>>> Building on exopi-3 under shells/nsh
> DIST = [shells/nsh:nsh-1.0.20140503.tar.gz]
> FULLPKGNAME = nsh-1.0.20140503p1
> distfiles size=122697
>>>> Running build in shells/nsh at 1437678603
> ===> shells/nsh
> ===> Verifying specs: c edit termcap sqlite3
> ===> found c.80.1 edit.5.2 termcap.14.0 sqlite3.30.1
> ===> Checking files for nsh-1.0.20140503p1
> `/exopi-cvs/ports/distfiles/nsh-1.0.20140503.tar.gz' is up to date.
> ===> Extracting for nsh-1.0.20140503p1
> ===> Patching for nsh-1.0.20140503p1
> ===> Configuring for nsh-1.0.20140503p1
> ===> Building for nsh-1.0.20140503p1
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c arp.c
> sh
> /exopi-obj/pobj/nsh-1.0.20140503/nsh-17aad6edd4ad4b0a7f4f281aa575490cbe68606a/compile.sh
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c compile.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c main.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c genget.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c commands.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c stats.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c kroute.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c ctl.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c show.c
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c if.c
> if.c:638: warning: no previous prototype for 'addaf'
> if.c: In function 'intxflags':
> if.c:1527: warning: 'value' is used uninitialized in this function
> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
> -Wbad-function-cast -nostdinc -idirafter /usr/include -c version.c
> version.c: In function 'version':
> version.c:82: error: 'MPLSCTL_IFQUEUE' undeclared (first use in this function)
> version.c:82: error: (Each undeclared identifier is reported only once
> version.c:82: error: for each function it appears in.)
> *** Error 1 in
> /exopi-obj/pobj/nsh-1.0.20140503/nsh-17aad6edd4ad4b0a7f4f281aa575490cbe68606a
> (<sys.mk>:87 'version.o')
> *** Error 1 in shells/nsh
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2767
> '/exopi-obj/pobj/nsh-1.0.20140503/.build_done')
> *** Error 1 in shells/nsh
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2488 'build')
> ===> Exiting shells/nsh with an error
> *** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:147
> 'build')
> Error: job failed 256
>
>
Saw that error on my build for amd64 ...
>From this change maybe....
Index: netmpls/mpls.h
===================================================================
RCS file: /cvs/src/sys/netmpls/mpls.h,v
retrieving revision 1.31
diff -u -p -r1.31 mpls.h
--- netmpls/mpls.h 10 Apr 2015 13:58:20 -0000 1.31
+++ netmpls/mpls.h 20 Jul 2015 06:08:35 -0000
@@ -107,7 +107,6 @@ struct rt_mpls {
*/
#define MPLSCTL_ENABLE 1
#define MPLSCTL_DEFTTL 2
-#define MPLSCTL_IFQUEUE 3
#define MPLSCTL_MAXINKLOOP 4
#define MPLSCTL_MAPTTL_IP 5
#define MPLSCTL_MAPTTL_IP6 6
@@ -160,7 +159,6 @@ void mpe_input6(struct mbuf *, struct if
extern int mpls_raw_usrreq(struct socket *, int, struct mbuf *,
struct mbuf *, struct mbuf *, struct proc *);
-extern struct niqueue mplsintrq; /* MPLS input queue */
extern int mpls_defttl;
extern int mpls_mapttl_ip;
extern int mpls_mapttl_ip6;
@@ -168,15 +166,15 @@ extern int mpls_inkloop;
$ cvs -R -q log -r1.30:1.33 sys/netmpls/mpls.h
total revisions: 33; selected revisions: 4
description:
----------------------------
revision 1.33
date: 2015/07/20 22:16:41; author: rzalamena; state: Exp; lines: +18
-1; commitid: yaHvJbufOxtjWSFd;
Implemented MPLS pseudowire (mpw(4)) to be used with VPLS and VPWS.
ok mpi@, claudio@.
----------------------------
revision 1.32
date: 2015/07/20 21:16:39; author: rzalamena; state: Exp; lines: +3
-5; commitid: t2fhFUpUuj89g4Sj;
Kill NETISR_MPLS, from now on we will use interface input handlers to deal
with MPLS packets.
ok mpi@, claudio@
----------------------------
revision 1.31
date: 2015/04/10 13:58:20; author: dlg; state: Exp; lines: +2 -2;
commitid: c7ei8kPelCOOwHXy;
replace the use of ifqueues for most input queues serviced by netisr
with niqueues.
this change is so big because there's a lot of code that takes
pointers to different input queues (eg, ether_input picks between
ipv4, ipv6, pppoe, arp, and mpls input queues) and falls through
to code to enqueue packets against the pointer. if i changed only
one of the input queues id have to add sepearate code paths, one
for ifqueues and one for niqueues in each of these places
by flipping all these input queues at once i can keep the currently
common code common.
testing by mpi@ sthen@ and rafael zalamena
ok mpi@ sthen@ claudio@ henning@
----------------------------
revision 1.30
date: 2015/03/26 11:02:44; author: mpi; state: Exp; lines: +3 -2;
commitid: 0DQqDmKCmYNj6g7x;
Use rt_ifa_add(9) and rt_ifa_del(9) to configure MPLS labels.
Since the removal of the link-layer ifa from "struct ifnet" it was
impossible to configure MPLS routes on mpe(4). Because just like
enc(4), mpe(4) was abusing the link-layer ifa to attach its route
entries.
So explicitly pass a "glue" ifa to the routing layer.
>From Rafael Zalamena who discovered this the hardway, thanks!
ok claudio@
