dbus-timer: fix bus_timer_vtable to have the correct times

[elogind.git] / src / core / loopback-setup.c

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index d3669e9e32cbc498ef802499ee5cf50b2ebc5226..d0156f2b48b3a8dbd2be043e7b5aff8fc31cf634 100644 (file)
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -24,7 +24,6 @@
 #include <net/if.h>
 #include <asm/types.h>
 #include <netinet/in.h>
 #include <net/if.h>
 #include <asm/types.h>
 #include <netinet/in.h>

-#include <linux/rtnetlink.h>

 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>


@@ -48,10 +47,22 @@ static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {
 }
 
 static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {

-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *ipv4 = NULL, *ipv6 = NULL;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *ipv4 = NULL, *ipv6 = NULL;

         int r;
 
         int r;
 

-        r = sd_rtnl_message_addr_new(RTM_NEWADDR, if_loopback, AF_INET, 8, IFA_F_PERMANENT, RT_SCOPE_HOST, &ipv4);
+        r = sd_rtnl_message_new_addr(rtnl, &ipv4, RTM_NEWADDR, if_loopback, AF_INET);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_addr_set_prefixlen(ipv4, 8);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_addr_set_flags(ipv4, IFA_F_PERMANENT);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_addr_set_scope(ipv4, RT_SCOPE_HOST);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -68,7 +79,19 @@ static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad
         if (!socket_ipv6_is_supported())
                 return 0;
 
         if (!socket_ipv6_is_supported())
                 return 0;
 

-        r = sd_rtnl_message_addr_new(RTM_NEWADDR, if_loopback, AF_INET6, 128, 0, 0, &ipv6);
+        r = sd_rtnl_message_new_addr(rtnl, &ipv6, RTM_NEWADDR, if_loopback, AF_INET6);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_addr_set_prefixlen(ipv6, 128);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_addr_set_flags(ipv6, IFA_F_PERMANENT);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_addr_set_scope(ipv6, RT_SCOPE_HOST);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -86,14 +109,14 @@ static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad
 }
 
 static int start_interface(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {
 }
 
 static int start_interface(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {

-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;

         int r;
 
         int r;
 

-        r = sd_rtnl_message_link_new(RTM_SETLINK, if_loopback, &req);
+        r = sd_rtnl_message_new_link(rtnl, &req, RTM_SETLINK, if_loopback);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        r = sd_rtnl_message_link_set_flags(req, IFF_UP);
+        r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -133,7 +156,7 @@ static int check_loopback(void) {
 }
 
 int loopback_setup(void) {
 }
 
 int loopback_setup(void) {

-        _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
+        _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;

         int r, if_loopback, counter = 0;
         bool eperm = false;
         struct in_addr ipv4_address;
         int r, if_loopback, counter = 0;
         bool eperm = false;
         struct in_addr ipv4_address;


@@ -145,7 +168,7 @@ int loopback_setup(void) {
 
         ipv4_address.s_addr = htonl(INADDR_LOOPBACK);
 
 
         ipv4_address.s_addr = htonl(INADDR_LOOPBACK);
 

-        r = sd_rtnl_open(0, &rtnl);
+        r = sd_rtnl_open(&rtnl, 0);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;