sd-rtnl: fix creation of synthetic error replies

[elogind.git] / src / libsystemd / sd-rtnl / rtnl-util.c

diff --git a/src/libsystemd/sd-rtnl/rtnl-util.c b/src/libsystemd/sd-rtnl/rtnl-util.c
index 1ec1fa8d27905c7b5a77b7765983624a3a877da4..5666ea44cb385bb42a5398a5ed25dcc50564a964 100644 (file)
--- a/src/libsystemd/sd-rtnl/rtnl-util.c
+++ b/src/libsystemd/sd-rtnl/rtnl-util.c
@@ -107,12 +107,10 @@ int rtnl_message_new_synthetic_error(int error, uint32_t serial, sd_rtnl_message
 
         assert(error <= 0);
 
-        r = message_new(NULL, ret, NLMSG_SPACE(sizeof(struct nlmsgerr)));
+        r = message_new(NULL, ret, NLMSG_ERROR);
         if (r < 0)
                 return r;
 
-        (*ret)->hdr->nlmsg_len = NLMSG_LENGTH(sizeof(struct nlmsgerr));
-        (*ret)->hdr->nlmsg_type = NLMSG_ERROR;
         (*ret)->hdr->nlmsg_seq = serial;
 
         err = NLMSG_DATA((*ret)->hdr);
@@ -122,6 +120,17 @@ int rtnl_message_new_synthetic_error(int error, uint32_t serial, sd_rtnl_message
         return 0;
 }
 
+bool rtnl_message_type_is_neigh(uint16_t type) {
+        switch (type) {
+                case RTM_NEWNEIGH:
+                case RTM_GETNEIGH:
+                case RTM_DELNEIGH:
+                        return true;
+                default:
+                        return false;
+        }
+}
+
 bool rtnl_message_type_is_route(uint16_t type) {
         switch (type) {
                 case RTM_NEWROUTE:
@@ -157,11 +166,9 @@ bool rtnl_message_type_is_addr(uint16_t type) {
 }
 
 int rtnl_log_parse_error(int r) {
-        log_error("Failed to parse netlink message: %s", strerror(-r));
-        return r;
+        return log_error_errno(r, "Failed to parse netlink message: %m");
 }
 
 int rtnl_log_create_error(int r) {
-        log_error("Failed to create netlink message: %s", strerror(-r));
-        return r;
+        return log_error_errno(r, "Failed to create netlink message: %m");
 }