ipaddress: accept symbolic names
Subsystems (3)
PATCH 1/1 ipaddress: accept symbolic names
The function rtnl_addproto_a2n() was defined but never used. Use it to allow for symbolic names, and fix the function signatures so protocol value is consistently __u8.
Fixes bdb8d8549ed9 ("ip: Support IP address protocol")
Signed-off-by Stephen Hemminger <[email protected]>
--- include/rt_names.h | 4 ++-- ip/ipaddress.c | 2 +- lib/rt_names.c | 18 +++++------------- 3 files changed, 8 insertions(+), 16 deletions(-)
include/rt_names.h +2 -2
@@ -5,7 +5,7 @@#include <asm/types.h> const char *rtnl_rtprot_n2a (int id,char *buf,int len); -const char *rtnl_addrprot_n2a (int id,char *buf,int len); +const char *rtnl_addrprot_n2a (__u8 id,char *buf,int len);const char *rtnl_rtscope_n2a (int id,char *buf,int len);const char *rtnl_rttable_n2a (__u32 id,char *buf,int len);const char *rtnl_rtrealm_n2a (int id,char *buf,int len);
@@ -14,7 +14,7 @@ const char *rtnl_dsfield_get_name(int id);const char *rtnl_group_n2a (int id,char *buf,int len);int rtnl_rtprot_a2n (__u32 *id,const char *arg); -int rtnl_addrprot_a2n (__u32 *id,const char *arg); +int rtnl_addrprot_a2n (__u8 *id,const char *arg);int rtnl_rtscope_a2n (__u32 *id,const char *arg);int rtnl_rttable_a2n (__u32 *id,const char *arg);int rtnl_rtrealm_a2n (__u32 *id,const char *arg);
ip/ipaddress.c +1 -1
@@ -2547,7 +2547,7 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)__u8 proto;NEXT_ARG (); -if (get_u8 (&proto, *argv,0 )) +if (rtnl_addrprot_a2n (&proto, *argv))invarg ("\"proto\" value is invalid\n" , *argv);addattr8 (&req.n,sizeof (req),IFA_PROTO , proto); }else {
lib/rt_names.c +5 -13
@@ -242,9 +242,9 @@ static void rtnl_addrprot_initialize(void) rtnl_addrprot_tab_initialized = true; } -const char *rtnl_addrprot_n2a (int id,char *buf,int len) +const char *rtnl_addrprot_n2a (__u8 id,char *buf,int len) { -if (id <0 || id >=256 || numeric) +if (numeric) goto numeric;if (!rtnl_addrprot_tab_initialized)rtnl_addrprot_initialize ();
@@ -255,27 +255,19 @@ numeric:return buf; } -int rtnl_addrprot_a2n (__u32 *id,const char *arg) +int rtnl_addrprot_a2n (__u8 *id,const char *arg) { -static char *cache; -static unsigned long res; +unsigned long res;char *end;int i; -if (cache &&strcmp (cache, arg) ==0 ) { - *id = res; -return 0 ; - } -if (!rtnl_addrprot_tab_initialized)rtnl_addrprot_initialize ();for (i =0 ; i <256 ; i++) {if (rtnl_addrprot_tab[i] &&strcmp (rtnl_addrprot_tab[i], arg) ==0 ) { - cache = rtnl_addrprot_tab[i]; - res = i; - *id = res; + *id = i;return 0 ; } }
Signature · 1 line
2.39.2
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:
Hello:
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:
Quoted 9 lines · On Fri, 2 Jun 2023 08:54:19 -0700 you wrote:
The function
rtnl_addproto_a2n()was defined but never used. Use it to allow for symbolic names, and fix the function signatures so protocol value is consistently__u8.Fixes bdb8d8549ed9 ("ip: Support IP address protocol")Signed-off-by Stephen Hemminger <[email protected]>[...]
Here is the summary with links:
- [iproute2] ipaddress: accept symbolic names
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=709063e8368a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html