diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-07-28 20:22:45 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-07-29 02:12:54 +0200 |
| commit | a3e970d6d57a58de05a2e60dfdf6d9bf992310b1 (patch) | |
| tree | a8899a8649075af6520572c97089b70c12d2fc1e | |
| parent | d3a1f0036b1aaa84051eadc107076f7a6efc5dbc (diff) | |
| download | connman-a3e970d6d57a58de05a2e60dfdf6d9bf992310b1.tar.gz connman-a3e970d6d57a58de05a2e60dfdf6d9bf992310b1.tar.bz2 connman-a3e970d6d57a58de05a2e60dfdf6d9bf992310b1.zip | |
Add a family argument to the ipconfig routing functions
| -rw-r--r-- | src/connman.h | 4 | ||||
| -rw-r--r-- | src/ipconfig.c | 4 | ||||
| -rw-r--r-- | src/rtnl.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/connman.h b/src/connman.h index 0dd87d27..b1d631a8 100644 --- a/src/connman.h +++ b/src/connman.h @@ -214,9 +214,9 @@ void __connman_ipconfig_newaddr(int index, int family, const char *label, unsigned char prefixlen, const char *address); void __connman_ipconfig_deladdr(int index, int family, const char *label, unsigned char prefixlen, const char *address); -void __connman_ipconfig_newroute(int index, unsigned char scope, +void __connman_ipconfig_newroute(int index, int family, unsigned char scope, const char *dst, const char *gateway); -void __connman_ipconfig_delroute(int index, unsigned char scope, +void __connman_ipconfig_delroute(int index, int family, unsigned char scope, const char *dst, const char *gateway); void __connman_ipconfig_foreach(void (*function) (int index, void *user_data), diff --git a/src/ipconfig.c b/src/ipconfig.c index c5570635..71b859a4 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -687,7 +687,7 @@ void __connman_ipconfig_deladdr(int index, int family, const char *label, } } -void __connman_ipconfig_newroute(int index, unsigned char scope, +void __connman_ipconfig_newroute(int index, int family, unsigned char scope, const char *dst, const char *gateway) { struct connman_ipdevice *ipdevice; @@ -723,7 +723,7 @@ void __connman_ipconfig_newroute(int index, unsigned char scope, scope, scope2str(scope)); } -void __connman_ipconfig_delroute(int index, unsigned char scope, +void __connman_ipconfig_delroute(int index, int family, unsigned char scope, const char *dst, const char *gateway) { struct connman_ipdevice *ipdevice; @@ -648,7 +648,7 @@ static void process_newroute(unsigned char family, unsigned char scope, inet_ntop(family, &dst, dststr, sizeof(dststr)); inet_ntop(family, &gateway, gatewaystr, sizeof(gatewaystr)); - __connman_ipconfig_newroute(index, scope, dststr, gatewaystr); + __connman_ipconfig_newroute(index, family, scope, dststr, gatewaystr); /* skip host specific routes */ if (scope != RT_SCOPE_UNIVERSE && @@ -682,7 +682,7 @@ static void process_delroute(unsigned char family, unsigned char scope, inet_ntop(family, &dst, dststr, sizeof(dststr)); inet_ntop(family, &gateway, gatewaystr, sizeof(gatewaystr)); - __connman_ipconfig_delroute(index, scope, dststr, gatewaystr); + __connman_ipconfig_delroute(index, family, scope, dststr, gatewaystr); /* skip host specific routes */ if (scope != RT_SCOPE_UNIVERSE && |