Fixed user-space br2684ctl to be more verbose, also copy all the libatm dependencies.

SVN-Revision: 3179
This commit is contained in:
Florian Fainelli 2006-02-07 13:12:05 +00:00
parent 11a28b3194
commit 6641b176a9
2 changed files with 13 additions and 9 deletions

View file

@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_LINUX_ATM): $(IPKG_LINUX_ATM):
install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1* $(IDIR_LINUX_ATM)/usr/lib
$(RSTRIP) $(IDIR_LINUX_ATM)/ $(RSTRIP) $(IDIR_LINUX_ATM)/
$(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)

View file

@ -176,10 +176,9 @@ diff -Nur linux-atm-2.4.1.orig/src/include/linux/atmbr2684.h linux-atm-2.4.1/src
+ struct br2684_filter_set) + struct br2684_filter_set)
+ +
+#endif /* _LINUX_ATMBR2684_H */ +#endif /* _LINUX_ATMBR2684_H */
diff Nur linux-atm-2.4.1.orig/src/br2684/br2684ctl.c linux-atm-2.4.1/src/br2684/br2684ctl.c --- linux-atm-2.4.1/src/br2684/br2684ctl.c 1970-01-01 01:00:00.000000000 +0100
--- linux-atm-2.4.1.orig/src/br2684/br2684ctl.c +++ linux-atm-2.4.1.new/src/br2684/br2684ctl.c 2006-02-07 14:05:14.000000000 +0100
+++ linux-atm-2.4.1/src/br2684/br2684ctl.c @@ -0,0 +1,307 @@
@@ -0,0 +1,302 @@
+#include <stdio.h> +#include <stdio.h>
+#include <stdlib.h> +#include <stdlib.h>
+#include <unistd.h> +#include <unistd.h>
@ -270,8 +269,8 @@ diff Nur linux-atm-2.4.1.orig/src/br2684/br2684ctl.c linux-atm-2.4.1/src/br2684/
+ +
+ if (err == 0) + if (err == 0)
+ syslog(LOG_INFO, + syslog(LOG_INFO,
+ "Interface \"%s\" created sucessfully\n", + "Interface \"%s\" (mtu=%d, payload=%s) created sucessfully\n",
+ ni.ifname); + ni.ifname, ni.mtu,ni.payload ? "bridged" : "routed");
+ else + else
+ syslog(LOG_INFO, + syslog(LOG_INFO,
+ "Interface \"%s\" could not be created, reason: %s\n", + "Interface \"%s\" could not be created, reason: %s\n",
@ -369,8 +368,13 @@ diff Nur linux-atm-2.4.1.orig/src/br2684/br2684ctl.c linux-atm-2.4.1/src/br2684/
+ +
+void usage(char *s) +void usage(char *s)
+{ +{
+ printf + printf("usage: %s [-b] [[-c number] [-e 0|1] [-p 0|1] [-s num] [-a [itf.]vpi.vci]*]*\n"
+ ("usage: %s [-b] [[-c number] [-e 0|1] [-p 0|1] [-t 4|6] [-a [itf.]vpi.vci]*]*\n", + " -b = run in background (daemonize)\n"
+ " -c <num> = use interface nas<num>\n"
+ " -e 0|1 = encapsulation (0=LLC, 1=VC Mux)\n"
+ " -p 0|1 = payload type (0=routed,1=bridged)\n"
+ " -s <num> = set sndbuf (send buffer) size (default 8192)\n"
+ " -a [itf.]vpi.vci = ATM interface no, VPI, VCI\n",
+ s); + s);
+ exit(1); + exit(1);
+} +}