ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-11 06:54:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxip: delete default gateway route before reconfiguration

Browse Source
This commit is contained in:
Christian Prochaska 2017-02-08 14:51:29 +01:00 committed by Norman Feske
parent b8b34efef9
commit 7b3a6e6347
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
repos/dde_linux/patches/lxip_ip_config.patch
View File

@ -4,11 +4,11 @@ From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
--- ---
net/ipv4/ipconfig.c | 26 ++++++++++++++++---------- net/ipv4/ipconfig.c | 55 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 16 insertions(+), 10 deletions(-) 1 file changed, 45 insertions(+), 10 deletions(-)
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 0bc7412..c907f8d 100644 index 0bc7412..a92c6e3 100644
--- a/net/ipv4/ipconfig.c --- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c
@@ -133,7 +133,7 @@ int ic_proto_enabled __initdata = 0 @@ -133,7 +133,7 @@ int ic_proto_enabled __initdata = 0
@ -29,7 +29,41 @@ index 0bc7412..c907f8d 100644
static u8 ic_domain[64]; /* DNS (not NIS) domain name */ static u8 ic_domain[64]; /* DNS (not NIS) domain name */
/* /*
@@ -1531,24 +1531,24 @@ static int __init ip_auto_config(void) @@ -435,6 +435,33 @@ static int __init ic_setup_routes(void)
return 0;
}
+static int __init ic_delete_routes(void)
+{
+ /* No need to delete device routes, only the default route... */
+
+ if (ic_gateway != NONE) {
+ struct rtentry rm;
+ int err;
+
+ memset(&rm, 0, sizeof(rm));
+ if ((ic_gateway ^ ic_myaddr) & ic_netmask) {
+ pr_err("IP-Config: Gateway not on directly connected network\n");
+ return -1;
+ }
+ set_sockaddr((struct sockaddr_in *) &rm.rt_dst, 0, 0);
+ set_sockaddr((struct sockaddr_in *) &rm.rt_genmask, 0, 0);
+ set_sockaddr((struct sockaddr_in *) &rm.rt_gateway, ic_gateway, 0);
+ rm.rt_flags = RTF_UP | RTF_GATEWAY;
+ if ((err = ic_route_ioctl(SIOCDELRT, &rm)) < 0) {
+ pr_err("IP-Config: Cannot delete default route (%d)\n",
+ err);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
/*
* Fill in default values for all missing parameters.
*/
@@ -1531,24 +1558,24 @@ static int __init ip_auto_config(void)
*/ */
pr_info("IP-Config: Complete:\n"); pr_info("IP-Config: Complete:\n");
@ -62,10 +96,12 @@ index 0bc7412..c907f8d 100644
pr_cont("\n"); pr_cont("\n");
#endif /* !SILENT */ #endif /* !SILENT */
@@ -1621,6 +1621,12 @@ static int __init ip_auto_config_setup(char *addrs) @@ -1621,6 +1648,14 @@ static int __init ip_auto_config_setup(char *addrs)
ic_set_manually = 1; ic_set_manually = 1;
ic_enable = 1; ic_enable = 1;
+ ic_delete_routes();
+
+ ic_myaddr = NONE; + ic_myaddr = NONE;
+ ic_netmask = NONE; + ic_netmask = NONE;
+ ic_gateway = NONE; + ic_gateway = NONE;

2
repos/dde_linux/ports/dde_linux.hash
View File

@ -1 +1 @@
2e9fd79b5d3185327c93e906daee89136260b0e7 cf7368615df3c26e71fd3d23c3305da7bc0e7cce