X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Floopback-setup.c;h=d0156f2b48b3a8dbd2be043e7b5aff8fc31cf634;hb=1b8689f94983b47bf190e77ddb03a8fc6af15fb3;hp=a53855fdc05e761375180a262c400a2c90ec8945;hpb=d595c5cc9e894c3608ed634052b0ba93aa94bf2f;p=elogind.git diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c index a53855fdc..d0156f2b4 100644 --- a/src/core/loopback-setup.c +++ b/src/core/loopback-setup.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -51,7 +50,7 @@ static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad _cleanup_rtnl_message_unref_ sd_rtnl_message *ipv4 = NULL, *ipv6 = NULL; int r; - r = sd_rtnl_message_new_addr(RTM_NEWADDR, if_loopback, AF_INET, &ipv4); + r = sd_rtnl_message_new_addr(rtnl, &ipv4, RTM_NEWADDR, if_loopback, AF_INET); if (r < 0) return r; @@ -80,7 +79,7 @@ static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad if (!socket_ipv6_is_supported()) return 0; - r = sd_rtnl_message_new_addr(RTM_NEWADDR, if_loopback, AF_INET6, &ipv6); + r = sd_rtnl_message_new_addr(rtnl, &ipv6, RTM_NEWADDR, if_loopback, AF_INET6); if (r < 0) return r; @@ -113,7 +112,7 @@ static int start_interface(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; - r = sd_rtnl_message_new_link(RTM_SETLINK, if_loopback, &req); + r = sd_rtnl_message_new_link(rtnl, &req, RTM_SETLINK, if_loopback); if (r < 0) return r; @@ -169,7 +168,7 @@ int loopback_setup(void) { ipv4_address.s_addr = htonl(INADDR_LOOPBACK); - r = sd_rtnl_open(0, &rtnl); + r = sd_rtnl_open(&rtnl, 0); if (r < 0) return r;