diff options
Diffstat (limited to 'patches/ppp-2.4.7/0033-ipv6-accept-remote.patch')
-rw-r--r-- | patches/ppp-2.4.7/0033-ipv6-accept-remote.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/patches/ppp-2.4.7/0033-ipv6-accept-remote.patch b/patches/ppp-2.4.7/0033-ipv6-accept-remote.patch deleted file mode 100644 index 01376cf14..000000000 --- a/patches/ppp-2.4.7/0033-ipv6-accept-remote.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 28 Sep 2019 08:11:50 +0200 -Subject: [PATCH] ipv6-accept-remote - -Imported from ppp_2.4.7-2+4.1.debian.tar.xz - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - pppd/ipv6cp.c | 5 ++++- - pppd/ipv6cp.h | 3 ++- - pppd/pppd.8 | 5 +++++ - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c -index c1602f41c206..432170462196 100644 ---- a/pppd/ipv6cp.c -+++ b/pppd/ipv6cp.c -@@ -245,6 +245,8 @@ static option_t ipv6cp_option_list[] = { - - { "ipv6cp-accept-local", o_bool, &ipv6cp_allowoptions[0].accept_local, - "Accept peer's interface identifier for us", 1 }, -+ { "ipv6cp-accept-remote", o_bool, &ipv6cp_allowoptions[0].accept_remote, -+ "Accept peer's interface identifier for itself", 1 }, - - { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip, - "Use (default) IPv4 address as interface identifier", 1 }, -@@ -435,6 +437,7 @@ ipv6cp_init(unit) - memset(ao, 0, sizeof(*ao)); - - wo->accept_local = 1; -+ wo->accept_remote = 1; - wo->neg_ifaceid = 1; - ao->neg_ifaceid = 1; - -@@ -960,7 +963,7 @@ ipv6cp_reqci(f, inp, len, reject_if_disagree) - orc = CONFREJ; /* Reject CI */ - break; - } -- if (!eui64_iszero(wo->hisid) && -+ if (!eui64_iszero(wo->hisid) && !wo->accept_remote && - !eui64_equals(ifaceid, wo->hisid) && - eui64_iszero(go->hisid)) { - -diff --git a/pppd/ipv6cp.h b/pppd/ipv6cp.h -index 2f4c06ddc189..1617707ebbde 100644 ---- a/pppd/ipv6cp.h -+++ b/pppd/ipv6cp.h -@@ -150,7 +150,8 @@ - typedef struct ipv6cp_options { - int neg_ifaceid; /* Negotiate interface identifier? */ - int req_ifaceid; /* Ask peer to send interface identifier? */ -- int accept_local; /* accept peer's value for iface id? */ -+ int accept_local; /* accept peer's value for our iface id? */ -+ int accept_remote; /* accept peer's value for his iface id? */ - int opt_local; /* ourtoken set by option */ - int opt_remote; /* histoken set by option */ - int use_ip; /* use IP as interface identifier */ -diff --git a/pppd/pppd.8 b/pppd/pppd.8 -index 848ca8a16b77..65bbe721f761 100644 ---- a/pppd/pppd.8 -+++ b/pppd/pppd.8 -@@ -463,6 +463,11 @@ With this option, pppd will accept the peer's idea of our local IPv6 - interface identifier, even if the local IPv6 interface identifier - was specified in an option. - .TP -+.B ipv6cp\-accept\-remote -+With this option, pppd will accept the peer's idea of its (remote) -+IPv6 interface identifier, even if the remote IPv6 interface -+identifier was specified in an option. -+.TP - .B ipv6cp\-max\-configure \fIn - Set the maximum number of IPv6CP configure-request transmissions to - \fIn\fR (default 10). |