diff options
author | Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-11-07 16:42:01 +0100 |
---|---|---|
committer | Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-11-08 01:36:45 +0100 |
commit | 1bf749aa3e4b0ccc40057b2587af5211926a1431 (patch) | |
tree | 1e59105d64e7dc13f4f1cd4ae8437bb8bb932292 /hicn-light/src/hicn/config/configurationListeners.c | |
parent | a30d495f6e91f3bed0420bf76c19315fe0de8801 (diff) |
[HICN-385] fix route removal in hicnctrl, code uniformization in hicn-light control api
Change-Id: Id097368dcde993775f206623195cc5aa57b4fe12
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Diffstat (limited to 'hicn-light/src/hicn/config/configurationListeners.c')
-rw-r--r-- | hicn-light/src/hicn/config/configurationListeners.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hicn-light/src/hicn/config/configurationListeners.c b/hicn-light/src/hicn/config/configurationListeners.c index 8abbeb781..21bfe7640 100644 --- a/hicn-light/src/hicn/config/configurationListeners.c +++ b/hicn-light/src/hicn/config/configurationListeners.c @@ -364,7 +364,7 @@ bool _addHicn(Configuration *config, add_listener_command *control, switch (control->addressType) { case ADDR_INET: { localAddress = - addressFromInaddr4Port(&control->address.ipv4, &control->port); + addressFromInaddr4Port(&control->address.v4.as_u32, &control->port); success = _setupHicnListenerOnInet4(configuration_GetForwarder(config), symbolic, localAddress); break; @@ -372,7 +372,7 @@ bool _addHicn(Configuration *config, add_listener_command *control, case ADDR_INET6: { localAddress = - addressFromInaddr6Port(&control->address.ipv6, &control->port); + addressFromInaddr6Port(&control->address.v6.as_in6addr, &control->port); success = _setupHicnListenerOnInet6(configuration_GetForwarder(config), symbolic, localAddress); break; @@ -416,11 +416,11 @@ bool _addIP(Configuration *config, add_listener_command *control, if (control->connectionType == UDP_CONN) { success = _setupUdpListenerOnInet(configuration_GetForwarder(config), symbolic, - &control->address.ipv4, &control->port, control->interfaceName); + &control->address.v4.as_u32, &control->port, control->interfaceName); } else if (control->connectionType == TCP_CONN) { success = _setupTcpListenerOnInet(configuration_GetForwarder(config), symbolic, - &control->address.ipv4, &control->port, control->interfaceName); + &control->address.v4.as_u32, &control->port, control->interfaceName); } break; } @@ -428,11 +428,11 @@ bool _addIP(Configuration *config, add_listener_command *control, case ADDR_INET6: { if (control->connectionType == UDP_CONN) { success = _setupUdpListenerOnInet6Light( - configuration_GetForwarder(config), symbolic, &control->address.ipv6, + configuration_GetForwarder(config), symbolic, &control->address.v6.as_in6addr, &control->port, control->interfaceName); } else if (control->connectionType == TCP_CONN) { success = _setupTcpListenerOnInet6Light( - configuration_GetForwarder(config), symbolic, &control->address.ipv6, + configuration_GetForwarder(config), symbolic, &control->address.v6.as_in6addr, &control->port, control->interfaceName, 0); } break; @@ -522,12 +522,12 @@ struct iovec *configurationListeners_AddPunting(Configuration *config, bool success = false; if (control->addressType == ADDR_INET) { - Address *address = addressFromInaddr4Port(&control->address.ipv4, &port); + Address *address = addressFromInaddr4Port(&control->address.v4.as_u32, &port); Punting *punting = puntingCreate(symbolicOrConnid, address, len); success = _AddPuntingInet(config, punting, ingressId); addressDestroy(&address); } else if (control->addressType == ADDR_INET6) { - Address *address = addressFromInaddr6Port(&control->address.ipv6, &port); + Address *address = addressFromInaddr6Port(&control->address.v6.as_in6addr, &port); Punting *punting = puntingCreate(symbolicOrConnid, address, len); success = _AddPuntingInet6(config, punting, ingressId); addressDestroy(&address); |