From 87edbec1ae4b6971640d77d50ecfdc67693d5bcd Mon Sep 17 00:00:00 2001 From: Martin Xu Date: Wed, 30 Dec 2009 16:24:11 +0800 Subject: [PATCH] Add INET functions for setting gateway address and gateway interface --- include/inet.h | 3 ++- src/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/include/inet.h b/include/inet.h index d8be5b7..412cf11 100644 --- a/include/inet.h +++ b/include/inet.h @@ -44,7 +44,8 @@ connman_bool_t connman_inet_is_mac80211(int index); int connman_inet_set_address(int index, struct connman_ipaddress *ipaddress); int connman_inet_clear_address(int index); -int connman_inet_set_gateway(int index, struct in_addr gateway); +int connman_inet_set_gateway_interface(int index); +int connman_inet_set_gateway_address(int index, const char *gateway); #ifdef __cplusplus } diff --git a/src/inet.c b/src/inet.c index 9fcf3d7..f7482d8 100644 --- a/src/inet.c +++ b/src/inet.c @@ -620,7 +620,55 @@ int connman_inet_clear_address(int index) return 0; } -int connman_inet_set_gateway(int index, struct in_addr gateway) +int connman_inet_set_gateway_interface(int index) +{ + struct ifreq ifr; + struct rtentry rt; + struct sockaddr_in addr; + int sk, err; + + DBG(""); + + sk = socket(PF_INET, SOCK_DGRAM, 0); + if (sk < 0) + return -1; + + memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_ifindex = index; + + if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { + close(sk); + return -1; + } + + DBG("ifname %s", ifr.ifr_name); + + memset(&rt, 0, sizeof(rt)); + + rt.rt_dev = ifr.ifr_name; + + rt.rt_flags = RTF_UP; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = INADDR_ANY; + + memcpy(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); + + memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); + + memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); + + err = ioctl(sk, SIOCADDRT, &rt); + if (err < 0) + connman_error("Setting interface as default route failed (%s)", + strerror(errno)); + close(sk); + + return err; +} + +int connman_inet_set_gateway_address(int index, const char *gateway) { struct ifreq ifr; struct rtentry rt; @@ -646,7 +694,7 @@ int connman_inet_set_gateway(int index, struct in_addr gateway) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_addr = gateway; + addr.sin_addr.s_addr = inet_addr(gateway); memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); memset(&addr, 0, sizeof(addr)); @@ -676,7 +724,7 @@ int connman_inet_set_gateway(int index, struct in_addr gateway) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_addr = gateway; + addr.sin_addr.s_addr = inet_addr(gateway); memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); memset(&addr, 0, sizeof(addr)); -- 2.7.4