src: Improve genl command error logging.

multipath-tcp · Jul 26, 2022 · 04511ee · 04511ee
1 parent f2b15a2
commit 04511ee
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/commands.c b/src/commands.c
@@ -54,7 +54,10 @@ bool mptcpd_check_genl_error(struct l_genl_msg *msg, char const *fname)
         int const error = l_genl_msg_get_error(msg);
 
         if (error < 0) {
-                // Error during send.  Likely insufficient perms.
+                // Error during send.
+
+                char errmsg[80] = { 0 };
+                (void) strerror_r(-error, errmsg, L_ARRAY_SIZE(errmsg));
 
                 char const *const genl_errmsg =
 #ifdef HAVE_L_GENL_MSG_GET_EXTENDED_ERROR
@@ -63,18 +66,10 @@ bool mptcpd_check_genl_error(struct l_genl_msg *msg, char const *fname)
                         NULL;
 #endif
 
-                if (genl_errmsg != NULL) {
-                        l_error("%s: %s", fname, genl_errmsg);
-                } else {
-                        char errmsg[80];
-                        int const r = strerror_r(-error,
-                                                 errmsg,
-                                                 L_ARRAY_SIZE(errmsg));
-
-                        l_error("%s error: %s",
-                                fname,
-                                r == 0 ? errmsg : "<unknown error>");
-                }
+                if (genl_errmsg != NULL)
+                        l_error("%s: %s: %s", fname, genl_errmsg, errmsg);
+                else
+                        l_error("%s: %s", fname, errmsg);
 
                 return false;
         }