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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3179 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index 93da3af..ee3ac99 100644 (file)
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LINUX_ATM): 
        install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib
 
 $(IPKG_LINUX_ATM): 
        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)/
        $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_LINUX_ATM)/
        $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
 

diff --git a/openwrt/package/linux-atm/patches/100-br2684.patch b/openwrt/package/linux-atm/patches/100-br2684.patch
index 94239ae..58eab46 100644 (file)
--- a/openwrt/package/linux-atm/patches/100-br2684.patch
+++ b/openwrt/package/linux-atm/patches/100-br2684.patch
@@ -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)
 +
 +#endif                                /* _LINUX_ATMBR2684_H */
 +                              struct br2684_filter_set)
 +
 +#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.orig/src/br2684/br2684ctl.c
-+++ linux-atm-2.4.1/src/br2684/br2684ctl.c
-@@ -0,0 +1,302 @@
+--- linux-atm-2.4.1/src/br2684/br2684ctl.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-atm-2.4.1.new/src/br2684/br2684ctl.c 2006-02-07 14:05:14.000000000 +0100
+@@ -0,0 +1,307 @@

 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.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)
 +                              syslog(LOG_INFO,
 +
 +                      if (err == 0)
 +                              syslog(LOG_INFO,

-+                                     "Interface \"%s\" created sucessfully\n",
-+                                     ni.ifname);
++                                     "Interface \"%s\" (mtu=%d, payload=%s) created sucessfully\n",
++                                     ni.ifname, ni.mtu,ni.payload ? "bridged" : "routed");

 +                      else
 +                              syslog(LOG_INFO,
 +                                     "Interface \"%s\" could not be created, reason: %s\n",
 +                      else
 +                              syslog(LOG_INFO,
 +                                     "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
-+          ("usage: %s [-b] [[-c number] [-e 0|1] [-p 0|1] [-t 4|6] [-a [itf.]vpi.vci]*]*\n",
++      printf("usage: %s [-b] [[-c number] [-e 0|1] [-p 0|1] [-s num] [-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);
 +      exit(1);
 +}
 +           s);
 +      exit(1);
 +}