X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-route.c;h=058f887ebf82b01013f99fa7d6887737e95e98e1;hp=6db1bcffbddb1fc422b5241e4c1c793ca7847091;hb=da927ba997d68401563b927f92e6e40e021a8e5c;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 6db1bcffb..058f887eb 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -114,7 +114,7 @@ int route_drop(Route *route, Link *link,
                                       RTM_DELROUTE, route->family,
                                       route->protocol);
         if (r < 0) {
-                log_error_errno(-r, "Could not create RTM_DELROUTE message: %m");
+                log_error_errno(r, "Could not create RTM_DELROUTE message: %m");
                 return r;
         }
 
@@ -124,7 +124,7 @@ int route_drop(Route *route, Link *link,
                 else if (route->family == AF_INET6)
                         r = sd_rtnl_message_append_in6_addr(req, RTA_GATEWAY, &route->in_addr.in6);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m");
+                        log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
                         return r;
                 }
         }
@@ -135,13 +135,13 @@ int route_drop(Route *route, Link *link,
                 else if (route->family == AF_INET6)
                         r = sd_rtnl_message_append_in6_addr(req, RTA_DST, &route->dst_addr.in6);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not append RTA_DST attribute: %m");
+                        log_error_errno(r, "Could not append RTA_DST attribute: %m");
                         return r;
                 }
 
                 r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not set destination prefix length: %m");
+                        log_error_errno(r, "Could not set destination prefix length: %m");
                         return r;
                 }
         }
@@ -152,32 +152,32 @@ int route_drop(Route *route, Link *link,
                 else if (route->family == AF_INET6)
                         r = sd_rtnl_message_append_in6_addr(req, RTA_PREFSRC, &route->prefsrc_addr.in6);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not append RTA_PREFSRC attribute: %m");
+                        log_error_errno(r, "Could not append RTA_PREFSRC attribute: %m");
                         return r;
                 }
         }
 
         r = sd_rtnl_message_route_set_scope(req, route->scope);
         if (r < 0) {
-                log_error_errno(-r, "Could not set scope: %m");
+                log_error_errno(r, "Could not set scope: %m");
                 return r;
         }
 
         r = sd_rtnl_message_append_u32(req, RTA_PRIORITY, route->metrics);
         if (r < 0) {
-                log_error_errno(-r, "Could not append RTA_PRIORITY attribute: %m");
+                log_error_errno(r, "Could not append RTA_PRIORITY attribute: %m");
                 return r;
         }
 
         r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex);
         if (r < 0) {
-                log_error_errno(-r, "Could not append RTA_OIF attribute: %m");
+                log_error_errno(r, "Could not append RTA_OIF attribute: %m");
                 return r;
         }
 
         r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Could not send rtnetlink message: %m");
+                log_error_errno(r, "Could not send rtnetlink message: %m");
                 return r;
         }
 
@@ -201,7 +201,7 @@ int route_configure(Route *route, Link *link,
                                       RTM_NEWROUTE, route->family,
                                       route->protocol);
         if (r < 0) {
-                log_error_errno(-r, "Could not create RTM_NEWROUTE message: %m");
+                log_error_errno(r, "Could not create RTM_NEWROUTE message: %m");
                 return r;
         }
 
@@ -211,7 +211,7 @@ int route_configure(Route *route, Link *link,
                 else if (route->family == AF_INET6)
                         r = sd_rtnl_message_append_in6_addr(req, RTA_GATEWAY, &route->in_addr.in6);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m");
+                        log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
                         return r;
                 }
         }
@@ -222,13 +222,13 @@ int route_configure(Route *route, Link *link,
                 else if (route->family == AF_INET6)
                         r = sd_rtnl_message_append_in6_addr(req, RTA_DST, &route->dst_addr.in6);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not append RTA_DST attribute: %m");
+                        log_error_errno(r, "Could not append RTA_DST attribute: %m");
                         return r;
                 }
 
                 r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not set destination prefix length: %m");
+                        log_error_errno(r, "Could not set destination prefix length: %m");
                         return r;
                 }
         }
@@ -239,32 +239,32 @@ int route_configure(Route *route, Link *link,
                 else if (route->family == AF_INET6)
                         r = sd_rtnl_message_append_in6_addr(req, RTA_PREFSRC, &route->prefsrc_addr.in6);
                 if (r < 0) {
-                        log_error_errno(-r, "Could not append RTA_PREFSRC attribute: %m");
+                        log_error_errno(r, "Could not append RTA_PREFSRC attribute: %m");
                         return r;
                 }
         }
 
         r = sd_rtnl_message_route_set_scope(req, route->scope);
         if (r < 0) {
-                log_error_errno(-r, "Could not set scope: %m");
+                log_error_errno(r, "Could not set scope: %m");
                 return r;
         }
 
         r = sd_rtnl_message_append_u32(req, RTA_PRIORITY, route->metrics);
         if (r < 0) {
-                log_error_errno(-r, "Could not append RTA_PRIORITY attribute: %m");
+                log_error_errno(r, "Could not append RTA_PRIORITY attribute: %m");
                 return r;
         }
 
         r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex);
         if (r < 0) {
-                log_error_errno(-r, "Could not append RTA_OIF attribute: %m");
+                log_error_errno(r, "Could not append RTA_OIF attribute: %m");
                 return r;
         }
 
         r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Could not send rtnetlink message: %m");
+                log_error_errno(r, "Could not send rtnetlink message: %m");
                 return r;
         }