rtnl cleanups
cover rtnl cleanups
As discussed on IRC here are the API changes.
Daniel Wagner (2):
rtnl: Make IPv4 and IPv6 naming scheme consistent
rtnl: Rename l_rtnl_ifaddr{4|6|}_get to l_rntl_ifaddr{4|6}_dump
ell/rtnl.c | 52 ++++++++++++++++++++++++------------------------ ell/rtnl.h | 28 +++++++++++++------------- unit/test-rtnl.c | 42 +++++++++++++++++++------------------- 3 files changed, 61 insertions(+), 61 deletions(-)
Signature · 1 line
2.25.0
PATCH 1/2 rtnl: Make IPv4 and IPv6 naming scheme consistent
Add the protocol version into into the function names and drop the infix 'ipv6' string. This makes it more consistent with the existing APIs.
--- ell/rtnl.c | 52 ++++++++++++++++++++++++------------------------ ell/rtnl.h | 28 +++++++++++++------------- unit/test-rtnl.c | 42 +++++++++++++++++++------------------- 3 files changed, 61 insertions(+), 61 deletions(-)
ell/rtnl.c +26 -26
@@ -157,7 +157,7 @@ uint32_t l_rtnl_set_powered(struct l_netlink *rtnl, int ifindex, bool powered,return id; } -void l_rtnl_ifaddr_extract (const struct ifaddrmsg *ifa,int bytes, +void l_rtnl_ifaddr4_extract (const struct ifaddrmsg *ifa,int bytes,char **label,char **ip,char **broadcast) {struct in_addr in_addr;
@@ -192,7 +192,7 @@ void l_rtnl_ifaddr_extract(const struct ifaddrmsg *ifa, int bytes, } } -uint32_t l_rtnl_ifaddr_get (struct l_netlink *rtnl,l_netlink_command_func_t cb, +uint32_t l_rtnl_ifaddr4_get (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) {
@@ -213,7 +213,7 @@ uint32_t l_rtnl_ifaddr_get(struct l_netlink *rtnl, l_netlink_command_func_t cb,return id; } -static uint32_t l_rtnl_ifaddr_change (struct l_netlink *rtnl,uint16_t nlmsg_type, +static uint32_t l_rtnl_ifaddr4_change (struct l_netlink *rtnl,uint16_t nlmsg_type,int ifindex,uint8_t prefix_len,const char *ip,const char *broadcast, l_netlink_command_func_t
@@ -270,27 +270,27 @@ static uint32_t l_rtnl_ifaddr_change(struct l_netlink *rtnl, uint16_t nlmsg_typereturn id; } -uint32_t l_rtnl_ifaddr_add (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr4_add (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,const char *broadcast,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) { -return l_rtnl_ifaddr_change (rtnl,RTM_NEWADDR , ifindex, prefix_len, ip, +return l_rtnl_ifaddr4_change (rtnl,RTM_NEWADDR , ifindex, prefix_len, ip, broadcast, cb, user_data, destroy); } -uint32_t l_rtnl_ifaddr_delete (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr4_delete (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,const char *broadcast,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) { -return l_rtnl_ifaddr_change (rtnl,RTM_DELADDR , ifindex, prefix_len, ip, +return l_rtnl_ifaddr4_change (rtnl,RTM_DELADDR , ifindex, prefix_len, ip, broadcast, cb, user_data, destroy); } -void l_rtnl_route_extract_ipv4 (const struct rtmsg *rtmsg,uint32_t len, +void l_rtnl_route4_extract (const struct rtmsg *rtmsg,uint32_t len,uint32_t *ifindex,char **dst,char **gateway,char **src) {
@@ -334,7 +334,7 @@ void l_rtnl_route_extract_ipv4(const struct rtmsg *rtmsg, uint32_t len, } } -uint32_t l_rtnl_route_dump_ipv4 (struct l_netlink *rtnl, +uint32_t l_rtnl_route4_dump (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) {
@@ -348,7 +348,7 @@ uint32_t l_rtnl_route_dump_ipv4(struct l_netlink *rtnl, destroy); } -static uint32_t l_rtnl_route_add(struct l_netlink *rtnl, int ifindex, +static uint32_t l_rtnl_route4_add(struct l_netlink *rtnl, int ifindex, uint8_t scope, uint8_t dst_len, const char *dst, const char *gateway, const char *src,
@@ -422,18 +422,18 @@ static uint32_t l_rtnl_route_add(struct l_netlink *rtnl, int ifindex, destroy); } -uint32_t l_rtnl_route_ipv4_add_connected (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_route4_add_connected (struct l_netlink *rtnl,int ifindex,uint8_t dst_len,const char *dst,const char *src,uint8_t proto,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) { -return l_rtnl_route_add (rtnl, ifindex,RT_SCOPE_LINK , dst_len, dst,NULL , +return l_rtnl_route4_add (rtnl, ifindex,RT_SCOPE_LINK , dst_len, dst,NULL , src,0 , proto, cb, user_data, destroy); } -uint32_t l_rtnl_route_ipv4_add_gateway(struct l_netlink *rtnl, int ifindex, +uint32_t l_rtnl_route4_add_gateway(struct l_netlink *rtnl, int ifindex, const char *gateway, const char *src, uint32_t priority_offset, uint8_t proto,
@@ -441,12 +441,12 @@ uint32_t l_rtnl_route_ipv4_add_gateway(struct l_netlink *rtnl, int ifindex, void *user_data, l_netlink_destroy_func_t destroy) { -return l_rtnl_route_add (rtnl, ifindex,RT_SCOPE_UNIVERSE ,0 ,NULL , +return l_rtnl_route4_add (rtnl, ifindex,RT_SCOPE_UNIVERSE ,0 ,NULL , gateway, src, priority_offset, proto, cb, user_data, destroy); } -void l_rtnl_ifaddr_ipv6_extract (const struct ifaddrmsg *ifa,int len,char **ip) +void l_rtnl_ifaddr6_extract (const struct ifaddrmsg *ifa,int len,char **ip) {struct in6_addr in6_addr;struct rtattr *attr;
@@ -476,7 +476,7 @@ void l_rtnl_ifaddr_ipv6_extract(const struct ifaddrmsg *ifa, int len, char **ip) } } -uint32_t l_rtnl_ifaddr_ipv6_get (struct l_netlink *rtnl, +uint32_t l_rtnl_ifaddr6_get (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) {
@@ -497,7 +497,7 @@ uint32_t l_rtnl_ifaddr_ipv6_get(struct l_netlink *rtnl,return id; } -static uint32_t l_rtnl_ifaddr_ipv6_change(struct l_netlink *rtnl, +static uint32_t l_rtnl_ifaddr6_change(struct l_netlink *rtnl, uint16_t nlmsg_type, int ifindex, uint8_t prefix_len, const char *ip,
@@ -541,26 +541,26 @@ static uint32_t l_rtnl_ifaddr_ipv6_change(struct l_netlink *rtnl,return id; } -uint32_t l_rtnl_ifaddr_ipv6_add (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr6_add (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) { -return l_rtnl_ifaddr_ipv6_change (rtnl,RTM_NEWADDR , ifindex, prefix_len, +return l_rtnl_ifaddr6_change (rtnl,RTM_NEWADDR , ifindex, prefix_len, ip, cb, user_data, destroy); } -uint32_t l_rtnl_ifaddr_ipv6_delete (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr6_delete (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) { -return l_rtnl_ifaddr_ipv6_change (rtnl,RTM_DELADDR , ifindex, prefix_len, +return l_rtnl_ifaddr6_change (rtnl,RTM_DELADDR , ifindex, prefix_len, ip, cb, user_data, destroy); } -static uint32_t l_rtnl_route_ipv6_change(struct l_netlink *rtnl, +static uint32_t l_rtnl_route6_change(struct l_netlink *rtnl, uint16_t nlmsg_type, int ifindex, const char *gateway, uint32_t priority_offset,
@@ -614,7 +614,7 @@ static uint32_t l_rtnl_route_ipv6_change(struct l_netlink *rtnl, destroy); } -uint32_t l_rtnl_route_ipv6_add_gateway(struct l_netlink *rtnl, int ifindex, +uint32_t l_rtnl_route6_add_gateway(struct l_netlink *rtnl, int ifindex, const char *gateway, uint32_t priority_offset, uint8_t proto,
@@ -622,12 +622,12 @@ uint32_t l_rtnl_route_ipv6_add_gateway(struct l_netlink *rtnl, int ifindex,void *user_data, l_netlink_destroy_func_t destroy) { - return l_rtnl_route_ipv6_change(rtnl, RTM_NEWROUTE, ifindex, gateway, + return l_rtnl_route6_change(rtnl, RTM_NEWROUTE, ifindex, gateway,priority_offset ,proto ,cb ,user_data ,destroy ); } -uint32_t l_rtnl_route_ipv6_delete_gateway(struct l_netlink *rtnl, int ifindex, +uint32_t l_rtnl_route6_delete_gateway(struct l_netlink *rtnl, int ifindex, const char *gateway, uint32_t priority_offset, uint8_t proto,
@@ -635,7 +635,7 @@ uint32_t l_rtnl_route_ipv6_delete_gateway(struct l_netlink *rtnl, int ifindex,void *user_data, l_netlink_destroy_func_t destroy) { - return l_rtnl_route_ipv6_change(rtnl, RTM_DELROUTE, ifindex, gateway, + return l_rtnl_route6_change(rtnl, RTM_DELROUTE, ifindex, gateway,priority_offset ,proto ,cb ,user_data ,destroy ); }
ell/rtnl.h +14 -14
@@ -46,35 +46,35 @@ uint32_t l_rtnl_set_powered(struct l_netlink *rtnl, int ifindex, bool powered, l_netlink_command_func_t cb, void *user_data, l_netlink_destroy_func_t destroy); -void l_rtnl_ifaddr_extract (const struct ifaddrmsg *ifa,int bytes, +void l_rtnl_ifaddr4_extract (const struct ifaddrmsg *ifa,int bytes,char **label,char **ip,char **broadcast); -uint32_t l_rtnl_ifaddr_get (struct l_netlink *rtnl,l_netlink_command_func_t cb, +uint32_t l_rtnl_ifaddr4_get (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_ifaddr_add (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr4_add (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,const char *broadcast,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_ifaddr_delete (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr4_delete (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,const char *broadcast,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -void l_rtnl_route_extract_ipv4 (const struct rtmsg *rtmsg,uint32_t len, +void l_rtnl_route4_extract (const struct rtmsg *rtmsg,uint32_t len,uint32_t *ifindex,char **dst,char **gateway,char **src); -uint32_t l_rtnl_route_dump_ipv4 (struct l_netlink *rtnl, +uint32_t l_rtnl_route4_dump (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_route_ipv4_add_connected (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_route4_add_connected (struct l_netlink *rtnl,int ifindex,uint8_t dst_len,const char *dst,const char *src,uint8_t proto,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_route_ipv4_add_gateway(struct l_netlink *rtnl, int ifindex, +uint32_t l_rtnl_route4_add_gateway(struct l_netlink *rtnl, int ifindex, const char *gateway, const char *src, uint32_t priority_offset, uint8_t proto,
@@ -82,29 +82,29 @@ uint32_t l_rtnl_route_ipv4_add_gateway(struct l_netlink *rtnl, int ifindex,void *user_data, l_netlink_destroy_func_t destroy); -void l_rtnl_ifaddr_ipv6_extract (const struct ifaddrmsg *ifa,int bytes, +void l_rtnl_ifaddr6_extract (const struct ifaddrmsg *ifa,int bytes,char **ip); -uint32_t l_rtnl_ifaddr_ipv6_get (struct l_netlink *rtnl, +uint32_t l_rtnl_ifaddr6_get (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_ifaddr_ipv6_add (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr6_add (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_ifaddr_ipv6_delete (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_ifaddr6_delete (struct l_netlink *rtnl,int ifindex,uint8_t prefix_len,const char *ip,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_route_ipv6_add_gateway (struct l_netlink *rtnl,int ifindex, +uint32_t l_rtnl_route6_add_gateway (struct l_netlink *rtnl,int ifindex,const char *gateway,uint32_t priority_offset,uint8_t proto,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); -uint32_t l_rtnl_route_ipv6_delete_gateway(struct l_netlink *rtnl, int ifindex, +uint32_t l_rtnl_route6_delete_gateway(struct l_netlink *rtnl, int ifindex, const char *gateway, uint32_t priority_offset, uint8_t proto,
unit/test-rtnl.c +21 -21
109 lines not on this page · raw message
Signature · 1 line
2.25.0
Re: [PATCH 1/2] rtnl: Make IPv4 and IPv6 naming scheme consistent
Hi Daniel,
Quoted 9 lines · Daniel Wagner
Add the protocol version into into the function names and drop the infix 'ipv6' string. This makes it more consistent with the existing APIs.
--- ell/rtnl.c | 52 ++++++++++++++++++++++++------------------------ ell/rtnl.h | 28 +++++++++++++------------- unit/test-rtnl.c | 42 +++++++++++++++++++------------------- 3 files changed, 61 insertions(+), 61 deletions(-)
Applied after splitting this patch in two. One for rtnl.[ch] changes and one for unit/ directory changes.
Regards,
-Denis
Re: [PATCH 1/2] rtnl: Make IPv4 and IPv6 naming scheme consistent
Hi Denis,
Quoted 2 lines · Denis Kenzior
Applied after splitting this patch in two. One for rtnl.[ch] changes and one for unit/ directory changes.
I forgot about the directory rule. Will do it in future.
Thanks,
Daniel
PATCH 2/2 rtnl: Rename l_rtnl_ifaddr{4|6|}_get to l_rntl_ifaddr{4|6}_dump
In reply to Daniel WagnerThese functions use NLM_F_DUMP so rename them accordingly.
--- ell/rtnl.c | 4 ++-- ell/rtnl.h | 4 ++-- unit/test-rtnl.c | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 16 deletions(-)
ell/rtnl.c +2 -2
@@ -192,7 +192,7 @@ void l_rtnl_ifaddr4_extract(const struct ifaddrmsg *ifa, int bytes, } } -uint32_t l_rtnl_ifaddr4_get (struct l_netlink *rtnl,l_netlink_command_func_t cb, +uint32_t l_rtnl_ifaddr4_dump (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) {
@@ -476,7 +476,7 @@ void l_rtnl_ifaddr6_extract(const struct ifaddrmsg *ifa, int len, char **ip) } } -uint32_t l_rtnl_ifaddr6_get (struct l_netlink *rtnl, +uint32_t l_rtnl_ifaddr6_dump (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy) {
ell/rtnl.h +2 -2
@@ -48,7 +48,7 @@ uint32_t l_rtnl_set_powered(struct l_netlink *rtnl, int ifindex, bool powered,void l_rtnl_ifaddr4_extract (const struct ifaddrmsg *ifa,int bytes,char **label,char **ip,char **broadcast); -uint32_t l_rtnl_ifaddr4_get (struct l_netlink *rtnl,l_netlink_command_func_t cb, +uint32_t l_rtnl_ifaddr4_dump (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy); uint32_t l_rtnl_ifaddr4_add(struct l_netlink *rtnl, int ifindex,
@@ -84,7 +84,7 @@ uint32_t l_rtnl_route4_add_gateway(struct l_netlink *rtnl, int ifindex,void l_rtnl_ifaddr6_extract (const struct ifaddrmsg *ifa,int bytes,char **ip); -uint32_t l_rtnl_ifaddr6_get (struct l_netlink *rtnl, +uint32_t l_rtnl_ifaddr6_dump (struct l_netlink *rtnl,l_netlink_command_func_t cb,void *user_data,l_netlink_destroy_func_t destroy);
unit/test-rtnl.c +12 -12
@@ -139,7 +139,7 @@ static void test_route4_dump(struct l_netlink *rtnl, void *user_data) NULL, route4_dump_destroy_cb)); } -static void ifaddr4_get_cb (int error, +static void ifaddr4_dump_cb (int error,uint16_t type,const void *data,uint32_t len,void *user_data) {
@@ -158,18 +158,18 @@ static void ifaddr4_get_cb(int error,l_free (broadcast); } -static void ifaddr4_get_destroy_cb (void *user_data) +static void ifaddr4_dump_destroy_cb (void *user_data) {test_next (); } -static void test_ifaddr4_get (struct l_netlink *rntl,void *user_data) +static void test_ifaddr4_dump (struct l_netlink *rntl,void *user_data) { -test_assert (l_rtnl_ifaddr4_get (rtnl, ifaddr4_get_cb, -NULL , ifaddr4_get_destroy_cb)); +test_assert (l_rtnl_ifaddr4_dump (rtnl, ifaddr4_dump_cb, +NULL , ifaddr4_dump_destroy_cb)); } -static void ifaddr6_get_cb (int error, +static void ifaddr6_dump_cb (int error,uint16_t type,const void *data,uint32_t len,void *user_data) {
@@ -186,15 +186,15 @@ static void ifaddr6_get_cb(int error,l_free (ip); } -static void ifaddr6_get_destroy_cb (void *user_data) +static void ifaddr6_dump_destroy_cb (void *user_data) {test_next (); } -static void test_ifaddr6_get (struct l_netlink *rntl,void *user_data) +static void test_ifaddr6_dump (struct l_netlink *rntl,void *user_data) { -test_assert (l_rtnl_ifaddr6_get (rtnl, ifaddr6_get_cb, -NULL , ifaddr6_get_destroy_cb)); +test_assert (l_rtnl_ifaddr6_dump (rtnl, ifaddr6_dump_cb, +NULL , ifaddr6_dump_destroy_cb)); }static void test_run (void )
@@ -211,8 +211,8 @@ int main(int argc, char *argv[])return -1 ;test_add ("Dump IPv4 routing table" , test_route4_dump,NULL ); -test_add ("Get IPv4 address" , test_ifaddr4_get,NULL ); -test_add ("Get IPv6 address" , test_ifaddr6_get,NULL ); +test_add ("Dump IPv4 addresses" , test_ifaddr4_dump,NULL ); +test_add ("Dump IPv6 addresses" , test_ifaddr6_dump,NULL );l_log_set_stderr ();
Signature · 1 line
2.25.0
Denis Kenzior
AppliedRe: [PATCH 2/2] rtnl: Rename l_rtnl_ifaddr{4|6|}_get to l_rntl_ifaddr{4|6}_dump
Hi Daniel,
Quoted 7 lines · Daniel Wagner
These functions use
NLM_F_DUMPso rename them accordingly.--- ell/rtnl.c | 4 ++-- ell/rtnl.h | 4 ++-- unit/test-rtnl.c | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 16 deletions(-)
Applied, also after splitting this into two.
Regards,
-Denis