tst_rtnetlink: pass error codes using rtnl_errno variable
PATCH 1/1 tst_rtnetlink: pass error codes using rtnl_errno variable
--- include/tst_rtnetlink.h | 2 ++ lib/tst_netdevice.c | 26 +++++++++++++++----------- lib/tst_rtnetlink.c | 6 ++++-- 3 files changed, 21 insertions(+), 13 deletions(-)
include/tst_rtnetlink.h +2 -0
@@ -21,6 +21,8 @@ struct tst_rtnl_message {size_t payload_size; }; +extern int rtnl_errno; +/* Open a netlink socket */ struct tst_rtnl_context *tst_rtnl_create_context (const char *file,const int lineno);
lib/tst_netdevice.c +15 -11
@@ -149,9 +149,9 @@ int tst_create_veth_pair(const char *file, const int lineno,tst_rtnl_destroy_context (file, lineno, ctx);if (!ret) { -tst_brk_ (file, lineno,TBROK |TTERRNO , -"Failed to create veth interfaces %s+%s" , ifname1, - ifname2); +tst_brk_ (file, lineno,TBROK , +"Failed to create veth interfaces %s+%s: %s" , ifname1, + ifname2,tst_strerrno (rtnl_errno)); }return ret;
@@ -183,8 +183,9 @@ int tst_remove_netdev(const char *file, const int lineno, const char *ifname)tst_rtnl_destroy_context (file, lineno, ctx);if (!ret) { -tst_brk_ (file, lineno,TBROK |TTERRNO , -"Failed to remove netdevice %s" , ifname); +tst_brk_ (file, lineno,TBROK , +"Failed to remove netdevice %s: %s" , ifname, +tst_strerrno (rtnl_errno)); }return ret;
@@ -232,8 +233,9 @@ static int modify_address(const char *file, const int lineno,tst_rtnl_destroy_context (file, lineno, ctx);if (!ret) { -tst_brk_ (file, lineno,TBROK |TTERRNO , -"Failed to modify %s network address" , ifname); +tst_brk_ (file, lineno,TBROK , +"Failed to modify %s network address: %s" , ifname, +tst_strerrno (rtnl_errno)); }return ret;
@@ -301,8 +303,9 @@ static int change_ns(const char *file, const int lineno, const char *ifname,tst_rtnl_destroy_context (file, lineno, ctx);if (!ret) { -tst_brk_ (file, lineno,TBROK |TTERRNO , -"Failed to move %s to another namespace" , ifname); +tst_brk_ (file, lineno,TBROK , +"Failed to move %s to another namespace: %s" , ifname, +tst_strerrno (rtnl_errno)); }return ret;
@@ -392,8 +395,9 @@ static int modify_route(const char *file, const int lineno, unsigned int action,tst_rtnl_destroy_context (file, lineno, ctx);if (!ret) { -tst_brk_ (file, lineno,TBROK |TTERRNO , -"Failed to modify network route" ); +tst_brk_ (file, lineno,TBROK , +"Failed to modify network route: %s" , +tst_strerrno (rtnl_errno)); }return ret;
lib/tst_rtnetlink.c +4 -2
@@ -24,6 +24,8 @@ struct tst_rtnl_context {struct nlmsghdr *curmsg; }; +int rtnl_errno; +static int tst_rtnl_grow_buffer (const char *file,const int lineno,struct tst_rtnl_context *ctx,size_t size) {
@@ -380,7 +382,7 @@ int tst_rtnl_check_acks(const char *file, const int lineno, }if (res->err->error) { -TST_ERR = -res->err->error; + rtnl_errno = -res->err->error;return 0 ; } }
@@ -394,7 +396,7 @@ int tst_rtnl_send_validate(const char *file, const int lineno,struct tst_rtnl_message *response;int ret; -TST_ERR =0 ; + rtnl_errno =0 ;if (tst_rtnl_send (file, lineno, ctx) <=0 )return 0 ;
Signature · 1 line
2.32.0
PATCH 1/1 tst_rtnetlink: pass error codes using rtnl_errno variable
Hello Martin,
Quoted 12 lines · Martin Doucha
Signed-off-by Martin Doucha <[email protected]>--- include/tst_rtnetlink.h | 2 ++ lib/tst_netdevice.c | 26 +++++++++++++++----------- lib/tst_rtnetlink.c | 6 ++++-- 3 files changed, 21 insertions(+), 13 deletions(-)include/tst_rtnetlink.h +0
-0
include/tst_rtnetlink.h struct tst_rtnl_message { · line 24
Quoted 4 lines
include/tst_rtnetlink.h +1
-0@@ -21,6 +21,8 @@ struct tst_rtnl_message {size_t payload_size; }; +extern int rtnl_errno;
This is polluting the name space. I suppose it can be prepended with tst_, but does the test author need to see this? Or you could even just merge tst_netdevice and tst_rtnetlink.
Otherwise I think this approach is fine.
Signature · 2 lines
Thank you, Richard.
PATCH 1/1 tst_rtnetlink: pass error codes using rtnl_errno variable
Quoted 10 lines · Richard Palethorpe
Hello Martin,
Quoted 1 line · Martin Doucha
+extern int
rtnl_errno;This is polluting the name space. I suppose it can be prepended with
tst_, but does the test author need to see this? Or you could even just mergetst_netdeviceandtst_rtnetlink.Otherwise I think this approach is fine.
You're right, I should have prefixed it with tst_. I'll send v2 in a moment.
Yes, test authors will need to access this variable if they want to use RTNL_CHECK_ACKS() or RTNL_SEND_VALIDATE() in their tests.
Signature · 7 lines
Martin Doucha [email protected] QA Engineer for Software Maintenance SUSE LINUX, s.r.o. CORSO IIa Krizikova 148/34 186 00 Prague 8 Czech Republic