X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Floopback-setup.c;h=9058b6f1c12ae2a2465cf08fde5a59b160f383c4;hb=5c56a259e07661a66e806cc2fbc71de96a75f78e;hp=d3669e9e32cbc498ef802499ee5cf50b2ebc5226;hpb=2a700de47200837af24f848c08d752f652302c6e;p=elogind.git diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c index d3669e9e3..9058b6f1c 100644 --- a/src/core/loopback-setup.c +++ b/src/core/loopback-setup.c @@ -51,7 +51,19 @@ static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *ipv4 = NULL, *ipv6 = NULL; 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_addr_new(RTM_NEWADDR, if_loopback, AF_INET, &ipv4); + 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; @@ -68,7 +80,19 @@ 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_addr_new(RTM_NEWADDR, if_loopback, AF_INET6, 128, 0, 0, &ipv6); + r = sd_rtnl_message_addr_new(RTM_NEWADDR, if_loopback, AF_INET6, &ipv6); + 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; @@ -93,7 +117,7 @@ static int start_interface(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ 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;