diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/wmpload/patches/patch-aa | 55 | ||||
| -rw-r--r-- | net/wmpload/patches/patch-ab | 35 |
2 files changed, 28 insertions, 62 deletions
diff --git a/net/wmpload/patches/patch-aa b/net/wmpload/patches/patch-aa index 3fd81869b4c..c7d40941370 100644 --- a/net/wmpload/patches/patch-aa +++ b/net/wmpload/patches/patch-aa @@ -1,41 +1,26 @@ -$NetBSD: patch-aa,v 1.3 2002/05/24 18:27:17 martin Exp $ +$NetBSD: patch-aa,v 1.4 2004/11/27 00:15:30 abs Exp $ ---- ioctl_stat.c.orig Sat Dec 18 02:35:12 1999 -+++ ioctl_stat.c Fri May 24 20:22:27 2002 -@@ -68,6 +68,13 @@ - - void ioctl_stat(if_data *ifd) +--- ioctl_stat.c.orig 2000-02-01 07:49:01.000000000 +0000 ++++ ioctl_stat.c +@@ -62,6 +62,10 @@ void ioctl_stat(if_data *ifd) { -+#ifdef __NetBSD__ -+ struct ifreq ifr; -+#ifdef SIOCGIFDATA + struct ifreq ifr; + struct ifpppstatsreq req; ++#ifdef SIOCGIFDATA /* Supported on at least NetBSD */ + struct ifdatareq ifdr; -+ struct if_data * const ifi = &ifdr.ifdr_data; ++ struct if_data * const ifi = &ifdr.ifdr_data; +#endif -+#endif - struct ifpppstatsreq req; - if (s < 0) getsocket(); -@@ -79,6 +86,31 @@ - req.stats_ptr = (caddr_t) &req.stats; - #endif - /* sprintf(req.ifr_name, ifd->device); */ -+#ifdef __NetBSD__ -+ strncpy(ifr.ifr_name, ifd->device, sizeof(ifr.ifr_name)); -+ if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0 || -+ !(ifr.ifr_flags&IFF_UP)) -+ { -+ /* invalid interface, or interface down */ -+ ifd->in_bytes = 0UL; -+ ifd->out_bytes = 0UL; -+ return; -+ } -+#endif -+ -+#if defined(__NetBSD__) && defined(SIOCGIFDATA) -+ /* prefere the generic interface statistics over the PPP specific ones */ + if (!ifd->s) getsocket(ifd); + +@@ -84,6 +88,19 @@ void ioctl_stat(if_data *ifd) + #define ifr_name ifr__name + #endif + ++#if defined(SIOCGIFDATA) ++ /* prefer generic interface statistics over PPP specific ones */ + strncpy(ifdr.ifdr_name, ifd->device, sizeof(ifdr.ifdr_name)); -+ if (ioctl(s, SIOCGIFDATA, &ifdr) == -1) ++ if (ioctl(ifd->s, SIOCGIFDATA, &ifdr) == -1) + { + /* non-existant device? */ + ifd->in_bytes = 0UL; @@ -46,9 +31,9 @@ $NetBSD: patch-aa,v 1.3 2002/05/24 18:27:17 martin Exp $ + ifd->out_bytes = (unsigned long)ifi->ifi_obytes; +#else strncpy(req.ifr_name, ifd->device, sizeof(req.ifr_name)); - - if (ioctl(s, SIOCGPPPSTATS, &req) != 0) -@@ -91,6 +123,7 @@ + if (ioctl(ifd->s, SIOCGPPPSTATS, &req) != 0) + { +@@ -95,6 +112,7 @@ void ioctl_stat(if_data *ifd) ifd->in_bytes = (unsigned long)req.stats.p.ppp_ibytes; ifd->out_bytes = (unsigned long)req.stats.p.ppp_obytes; diff --git a/net/wmpload/patches/patch-ab b/net/wmpload/patches/patch-ab index cfdaa583dcd..714950028fa 100644 --- a/net/wmpload/patches/patch-ab +++ b/net/wmpload/patches/patch-ab @@ -1,32 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/07/22 16:52:30 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2004/11/27 00:15:30 abs Exp $ ---- Imakefile.orig Sat Dec 18 02:35:12 1999 +--- Imakefile.orig 2000-02-01 07:49:01.000000000 +0000 +++ Imakefile -@@ -4,23 +4,19 @@ - XCOMM +@@ -13,7 +13,7 @@ DEFINES = -DVERSION="\"$(VER)\"" $(OSDEF - include osdefs.mk -- DEPLIBS = $(DEPXLIB) -+ DEPLIBS = $(DEPXLIB) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) - SYS_LIBRARIES = MathLibrary - HEADERS = wmpload.h -- VER = 0.9.4 -+ VER = 0.9.4 - DEFINES = -DVERSION="\"$(VER)\"" $(OSDEFS) - --ComplexProgramTarget(wmpload) -+ComplexProgramTargetNoMan(wmpload) + ComplexProgramTarget(wmpload) -distclean: clean -- $(RM) Makefile osdefs.mk core -- --tgz: -+tgz: - rm -rf wmpload-$(VER) - mkdir wmpload-$(VER) - cp `echo * | sed s,wmpload-$(VER),,` wmpload-$(VER) - cd wmpload-$(VER) && make distclean - tar cvf - wmpload-$(VER) | gzip -9 > wmpload-$(VER).tar.gz - rm -rf wmpload-$(VER) -- ++distclean:: clean + $(RM) Makefile osdefs.mk core \ + wmpload-$(VER).tar.gz \ + wmpload-$(VER)-1.i386.rpm \ |