X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Floopback-setup.c;h=98fc04dd2e93e67c799359e4844d1efa7e02acd4;hb=46bcf49291874c5a6b5b34ad6413c5a0f7725f4c;hp=ffe661aa9e31d3e751d593d87bd14020aaf396f8;hpb=753e98788a9bcbd3bba2b3006672c003ae72eefa;p=elogind.git
diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index ffe661aa9..98fc04dd2 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -19,12 +19,10 @@
along with systemd; If not, see .
***/
-#include
#include
#include
#include
#include
-#include
#include
#include
#include
@@ -36,75 +34,25 @@
#include "sd-rtnl.h"
#include "rtnl-util.h"
-static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
- int *counter = userdata;
- int r;
-
- (*counter) --;
-
- r = sd_rtnl_message_get_errno(m);
-
- return r == -EEXIST ? 0 : r;
-}
-
-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;
- int r;
-
- r = sd_rtnl_message_addr_new(RTM_NEWADDR, if_loopback, AF_INET, 8,
- IFA_F_PERMANENT, RT_SCOPE_HOST, &ipv4);
- if (r < 0)
- return r;
-
- r = sd_rtnl_message_append_in_addr(ipv4, IFA_LOCAL, ipv4_address);
- if (r < 0)
- return r;
-
- r = sd_rtnl_call_async(rtnl, ipv4, &pipe_handler, counter, 0, NULL);
- if (r < 0)
- return r;
-
- (*counter) ++;
-
- if (!socket_ipv6_is_supported())
- return 0;
-
- r = sd_rtnl_message_addr_new(RTM_NEWADDR, if_loopback, AF_INET6, 128,
- IFA_F_PERMANENT, RT_SCOPE_HOST, &ipv6);
- if (r < 0)
- return r;
-
- r = sd_rtnl_message_append_in6_addr(ipv6, IFA_LOCAL, &in6addr_loopback);
- if (r < 0)
- return r;
-
- r = sd_rtnl_call_async(rtnl, ipv6, &pipe_handler, counter, 0, NULL);
- if (r < 0)
- return r;
-
- (*counter) ++;
-
- return 0;
-}
+/* this is hardcoded in the kernel, so don't look it up */
+#define LOOPBACK_IFINDEX 1
-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;
+static int start_loopback(sd_rtnl *rtnl) {
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
- r = sd_rtnl_message_link_new(RTM_SETLINK, if_loopback, &req);
+ r = sd_rtnl_message_new_link(rtnl, &req, RTM_SETLINK, LOOPBACK_IFINDEX);
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;
- r = sd_rtnl_call_async(rtnl, req, &pipe_handler, counter, 0, NULL);
+ r = sd_rtnl_call(rtnl, req, 0, NULL);
if (r < 0)
return r;
- (*counter) ++;
-
return 0;
}
@@ -135,50 +83,20 @@ static int check_loopback(void) {
}
int loopback_setup(void) {
- _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
- int r, if_loopback, counter = 0;
- bool eperm = false;
- struct in_addr ipv4_address;
-
- errno = 0;
- if_loopback = (int) if_nametoindex("lo");
- if (if_loopback <= 0)
- return errno ? -errno : -ENODEV;
-
- ipv4_address.s_addr = htonl(INADDR_LOOPBACK);
-
- r = sd_rtnl_open(0, &rtnl);
- if (r < 0)
- return r;
+ _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
+ int r;
- r = add_addresses(rtnl, if_loopback, &ipv4_address, &counter);
+ r = sd_rtnl_open(&rtnl, 0);
if (r < 0)
return r;
- r = start_interface(rtnl, if_loopback, &ipv4_address, &counter);
- if (r < 0)
- return r;
+ r = start_loopback(rtnl);
+ if (r == -EPERM) {
+ if (check_loopback() < 0)
+ return log_warning_errno(EPERM, "Failed to configure loopback device: %m");
+ } else if (r < 0)
+ return log_warning_errno(r, "Failed to configure loopback device: %m");
- while (counter > 0) {
- r = sd_rtnl_wait(rtnl, 0);
- if (r < 0)
- return r;
-
- r = sd_rtnl_process(rtnl, 0);
- if (r < 0) {
- if (r == -EPERM)
- eperm = true;
- else {
- log_warning("Failed to configure loopback device: %s", strerror(-r));
- return r;
- }
- }
- }
-
- if (eperm && check_loopback() < 0) {
- log_warning("Failed to configure loopback device: %s", strerror(EPERM));
- return -EPERM;
- }
return 0;
}