diff options
| author | DENG Qingfang <dengqf6@mail2.sysu.edu.cn> | 2020-01-01 15:23:32 +0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-01-05 19:36:45 +0100 |
| commit | 983605e61f16b76e173fa62092f1b37c3a8e3859 (patch) | |
| tree | 56022179c9346b59ae8720abb1aabeca7a419b20 /package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch | |
| parent | 3d7f76383f87f490ba611aa18af89d33170997ff (diff) | |
| download | upstream-983605e61f16b76e173fa62092f1b37c3a8e3859.tar.gz upstream-983605e61f16b76e173fa62092f1b37c3a8e3859.tar.bz2 upstream-983605e61f16b76e173fa62092f1b37c3a8e3859.zip | |
pppd: update to 2.4.8
78cd384 Update README and patchlevel.h for 2.4.8 release
5d03403 pppd: Avoid use of strnlen (and strlen) in vslprintf
a1e950a pppd: Fix IPv6 default route code for Solaris
ca5e61b plugins/rp-pppoe: Make tag parsing loop condition more accurate
c10c3c7 pppd: Make sure word read from options file is null-terminated
b311e98 pppd: Limit memory accessed by string formats with max length specified
3ea9de9 pppd: Eliminate some more compiler warnings
57edb1a pppd: Include time.h header before using time_t
09f695f pppd: Don't free static string
03104ba pppd.h: Add missing headers
388597e pppd: Add defaultroute6 and related options
66ce4ba pppd: Avoid declarations within statements in main.c
5637180 pppd: Fix `ifname` option in case of multilink (#105)
d00f8a0 pppd: Fix variable reference syntax in Makefile.linux
b6b4d28 pppd: Check tdb pointer before closing
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Diffstat (limited to 'package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch')
| -rw-r--r-- | package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch index b028df4844..75c803650f 100644 --- a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch +++ b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch @@ -41,7 +41,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> /* make sure the string is null-terminated */ rec.dptr[rec.dsize-1] = 0; - /* parse the interface number */ -- parse_num(rec.dptr, "IFNAME=ppp", &unit); +- parse_num(rec.dptr, "UNIT=", &unit); + /* check the pid value */ if (!parse_num(rec.dptr, "PPPD_PID=", &pppd_pid) @@ -114,7 +114,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> TDB_DATA kd, vd; int ret = 0; -- slprintf(ifkey, sizeof(ifkey), "IFNAME=ppp%d", unit); +- slprintf(ifkey, sizeof(ifkey), "UNIT=%d", unit); + slprintf(ifkey, sizeof(ifkey), "IFNAME=%s", ifname); + kd.dptr = ifkey; @@ -126,7 +126,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> && memcmp(vd.dptr, key.dptr, vd.dsize) == 0; --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -693,6 +693,16 @@ void cfg_bundle(int mrru, int mtru, int +@@ -700,6 +700,16 @@ void cfg_bundle(int mrru, int mtru, int add_fd(ppp_dev_fd); } @@ -143,7 +143,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua> /* * make_new_bundle - create a new PPP unit (i.e. a bundle) * and connect our channel to it. This should only get called -@@ -711,6 +721,8 @@ void make_new_bundle(int mrru, int mtru, +@@ -718,6 +728,8 @@ void make_new_bundle(int mrru, int mtru, /* set the mrru and flags */ cfg_bundle(mrru, mtru, rssn, tssn); |