cc'ing Chris,
[email protected] writes:
> 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@
Yup. Chris, does the following patch look correct for the 5.8 release?
Index: Makefile
===================================================================
RCS file: /cvs/ports/shells/nsh/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 10 Jan 2015 13:13:16 -0000 1.11
+++ Makefile 23 Jul 2015 19:52:25 -0000
@@ -3,7 +3,7 @@
COMMENT = network switch style shell
DISTNAME = nsh-1.0.20140503
-REVISION = 1
+REVISION = 2
GH_ACCOUNT = yellowman
GH_PROJECT = nsh
Index: patches/patch-commands_c
===================================================================
RCS file: patches/patch-commands_c
diff -N patches/patch-commands_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-commands_c 23 Jul 2015 19:51:20 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- commands.c.orig Thu Jul 23 13:51:04 2015
++++ commands.c Thu Jul 23 13:51:14 2015
+@@ -287,7 +287,6 @@ Menu ip6tab[] = {
+
+ Menu mplstab[] = {
+ { "ttl", "MPLS ttl", CMPL0 0, 0, 0, 1,
ipsysctl },
+- { "ifq-maxlen", "MPLS IFQ maxlen", CMPL0 0, 0, 0, 1,
ipsysctl },
+ { "mapttl-ip", "MPLS mapttl IPv4", CMPL0 0, 0, 0, 1,
ipsysctl },
+ { "mapttl-ip6", "MPLS mapttl IPv6", CMPL0 0, 0, 0, 1,
ipsysctl },
+ { "?", "Help", CMPL0 0, 0, 0, 0,
sysctlhelp },
Index: patches/patch-sysctl_c
===================================================================
RCS file: patches/patch-sysctl_c
diff -N patches/patch-sysctl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysctl_c 23 Jul 2015 19:47:56 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- sysctl.c.orig Thu Jul 23 13:47:26 2015
++++ sysctl.c Thu Jul 23 13:47:50 2015
+@@ -128,7 +128,6 @@ struct ipsysctl ip6sysctls[] = {
+
+ struct ipsysctl mplssysctls[] = {
+ { "ttl", { CTL_NET, PF_MPLS, MPLSCTL_DEFTTL, MIB_STOP, 0 },
DEFAULT_MTTL, 0 },
+-{ "ifq-maxlen", { CTL_NET, PF_MPLS, MPLSCTL_IFQUEUE,
IFQCTL_MAXLEN, MIB_STOP, 0 }, IFQ_MAXLEN, 0 },
+ { "mapttl-ip", { CTL_NET, PF_MPLS, MPLSCTL_MAPTTL_IP,
MIB_STOP, 0 }, 0, 0 },
+ { "mapttl-ip6", { CTL_NET, PF_MPLS, MPLSCTL_MAPTTL_IP6,
MIB_STOP, 0 }, 0, 1 },
+ { 0, { 0, 0, 0, 0, 0, 0 }, 0, 0 }
Index: patches/patch-version_c
===================================================================
RCS file: /cvs/ports/shells/nsh/patches/patch-version_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-version_c
--- patches/patch-version_c 16 Mar 2015 15:21:58 -0000 1.3
+++ patches/patch-version_c 23 Jul 2015 19:47:55 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-version_c,v 1.3 2015/03/16 15:21:58 naddy Exp $
---- version.c.orig Sat May 3 23:50:07 2014
-+++ version.c Mon Mar 16 16:17:26 2015
+--- version.c.orig Sat May 3 15:50:07 2014
++++ version.c Thu Jul 23 13:47:13 2015
@@ -16,7 +16,6 @@
#include <stdio.h>
@@ -9,7 +9,40 @@ $OpenBSD: patch-version_c,v 1.3 2015/03/
#include <string.h>
#include <errno.h>
#include <sys/param.h>
-@@ -98,15 +97,14 @@ version(int argc, char **argv)
+@@ -25,7 +24,6 @@
+ #include <sys/socket.h>
+ #include <net/if.h>
+ #include <netinet/in.h>
+-#include <netmpls/mpls.h>
+ #include "externs.h"
+
+ int
+@@ -38,7 +36,7 @@ version(int argc, char **argv)
+ size_t len;
+ time_t c;
+ uint64_t physmem;
+- int mib[5], ipdrops, mplsdrops, pntd, weeks, days, hours, mins;
++ int mib[5], ipdrops, pntd, weeks, days, hours, mins;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM64;
+@@ -78,15 +76,6 @@ version(int argc, char **argv)
+ printf("%% IFQ_DROPS: %s\n", strerror(errno));
+ return(1);
+ }
+- mib[0] = CTL_NET;
+- mib[1] = PF_MPLS;
+- mib[2] = MPLSCTL_IFQUEUE;
+- mib[3] = IFQCTL_DROPS;
+- len = sizeof(mplsdrops);
+- if (sysctl(mib, 4, &mplsdrops, &len, NULL, 0) == -1) {
+- printf("%% MPLS_IFQCTL_DROPS: %s\n", strerror(errno));
+- return(1);
+- }
+ if (uname(&un)) {
+ printf("%% uname: %s\n", strerror(errno));
+ return(1);
+@@ -98,15 +87,14 @@ version(int argc, char **argv)
printf("Compiled %s by %s@%s\n", compiled, compiledby, compilehost);
printf("uptime: ");
pntd = 0;
@@ -33,3 +66,12 @@ $OpenBSD: patch-version_c,v 1.3 2015/03/
if (weeks) {
printf("%d week%s", weeks, weeks == 1 ? "" : "s");
pntd = 1;
+@@ -134,7 +122,7 @@ version(int argc, char **argv)
+ printf("cpu: %s\n", cpubuf);
+ printf("memory: %sB\n", format_k(physmem / 1024));
+ printf("kernel: %s", kernver);
+- printf("IFQ drops: ip %d mpls %d\n", ipdrops, mplsdrops);
++ printf("IFQ drops: ip %d\n", ipdrops);
+ return(0);
+ }
+
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
