Date:2010-08-04 23:47:29 (13 years 7 months ago)
Author:jow
Commit:da8fbc65ef8785b3ae306e4863eb4ec6c7dfde13
Message:[package] pppd: only remove own default route on shutdown (#7694)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22495 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: package/ppp/Makefile (1 diff)
package/ppp/patches/320-custom_iface_names.patch (2 diffs)
package/ppp/patches/330-retain_foreign_default_routes.patch (1 diff)

Change Details

package/ppp/Makefile
1010
1111PKG_NAME:=ppp
1212PKG_VERSION:=2.4.4
13PKG_RELEASE:=8
13PKG_RELEASE:=9
1414
1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
package/ppp/patches/320-custom_iface_names.patch
7878
7979     if (ppp_dev_fd >= 0) {
8080         dbglog("in make_ppp_unit, already had /dev/ppp open?");
81@@ -645,6 +650,32 @@ static int make_ppp_unit()
81@@ -645,6 +650,30 @@ static int make_ppp_unit()
8282     }
8383     if (x < 0)
8484         error("Couldn't create new ppp unit: %m");
...... 
103103+ error("Couldn't rename %s to %s", ifr.ifr_name, ifr.ifr_newname);
104104+ close(ppp_dev_fd);
105105+ ppp_dev_fd = -1;
106+ } else {
107+ info("Renamed %s to %s", ifr.ifr_name, ifr.ifr_newname);
108106+ }
109107+ }
110108+
package/ppp/patches/330-retain_foreign_default_routes.patch
1--- a/pppd/sys-linux.c
2@@ -1717,6 +1717,7 @@ int cifdefaultroute (int unit, u_int32_t
3     SIN_ADDR(rt.rt_genmask) = 0L;
4     }
5
6+ rt.rt_dev = ifname;
7     rt.rt_flags = RTF_UP;
8     if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) {
9     if (still_ppp()) {

Archive Download the corresponding diff file



interactive