f8b58757d0
0d004db Revert "pppd: Include time.h before using time_t" e400854 pppdump: Eliminate printf format warning by using %zd 7f2f0de pppd: Refactor setjmp/longjmp with pipe pair in event wait loop 4e71317 make: Avoid using host include for cross-compiling 3202f89 pppoe: Remove the use of cdefs d8e8d7a pppd: Remove unused rcsid variables 486f854 pppd: Fix GLIBC version test for non-glibc toolchains b6cd558 pppd: Include time.h before using time_t ef8ec11 radius: Fix compiler warning f6330ec magic: Remove K&R style of arguments 347904e Add Submitting-patches.md Remove patches 130-no_cdefs_h.patch, 131-missing_prototype_macro.patch, 132-fix_linux_includes.patch as fixed upstream Refresh patches Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
pppd: Fill in default gateway on Linux
|
|
|
|
On Linux, when pppd creates the default route, it does not set the peer
|
|
address as gateway, leading to a default route without gateway address.
|
|
|
|
This behaviour breaks various downstream programs which attempt to infer
|
|
the default gateway IP address from the system default route entry.
|
|
|
|
This patch addresses the issue by filling in the peer address as gateway
|
|
when generating the default route entry.
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
|
|
|
|
--- a/pppd/sys-linux.c
|
|
+++ b/pppd/sys-linux.c
|
|
@@ -1710,6 +1710,9 @@ int sifdefaultroute (int unit, u_int32_t
|
|
memset (&rt, 0, sizeof (rt));
|
|
SET_SA_FAMILY (rt.rt_dst, AF_INET);
|
|
|
|
+ SET_SA_FAMILY(rt.rt_gateway, AF_INET);
|
|
+ SIN_ADDR(rt.rt_gateway) = gateway;
|
|
+
|
|
rt.rt_dev = ifname;
|
|
rt.rt_metric = dfl_route_metric + 1; /* +1 for binary compatibility */
|
|
|
|
@@ -1718,7 +1721,7 @@ int sifdefaultroute (int unit, u_int32_t
|
|
SIN_ADDR(rt.rt_genmask) = 0L;
|
|
}
|
|
|
|
- rt.rt_flags = RTF_UP;
|
|
+ rt.rt_flags = RTF_UP | RTF_GATEWAY;
|
|
if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) {
|
|
if (!ok_error(errno))
|
|
error("default route ioctl(SIOCADDRT): %m");
|