X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=993931d1cd6a06141fdce3388977b1a3ac205a3a;hb=4f882b2a5007e51032459e29d15a86df6b5ea9f4;hp=52b023cd9e3b686b1d9befb148a34a685e511e64;hpb=39032b87779323a244dd89f4832949d462b2ac68;p=elogind.git

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 52b023cd9..993931d1c 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -310,6 +310,56 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat
         return 1;
 }
 
+static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(m);
+        assert(link);
+        assert(link->ifname);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0 && r != -EEXIST)
+                log_warning_link(link, "Could not set MTU: %s", strerror(-r));
+
+        return 1;
+}
+
+static int link_set_mtu(Link *link, uint32_t mtu) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        log_debug_link(link, "setting MTU: %" PRIu32, mtu);
+
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error_link(link, "Could not allocate RTM_SETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_message_append_u32(req, IFLA_MTU, mtu);
+        if (r < 0) {
+                log_error_link(link, "Could not append MTU: %s", strerror(-r));
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, 0, NULL);
+        if (r < 0) {
+                log_error_link(link,
+                               "Could not send rtnetlink message: %s", strerror(-r));
+                return r;
+        }
+
+        return 0;
+}
+
 static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
         Link *link = userdata;
         struct in_addr address;
@@ -319,6 +369,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
         int r;
 
         assert(link);
+        assert(link->network);
 
         if (link->state == LINK_STATE_FAILED)
                 return;
@@ -345,6 +396,20 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
                         route_free(link->dhcp_route);
                         link->dhcp_route = NULL;
                 }
+
+                if (link->network->dhcp_mtu) {
+                        uint16_t mtu;
+
+                        r = sd_dhcp_client_get_mtu(client, &mtu);
+                        if (r >= 0 && link->original_mtu != mtu) {
+                                r = link_set_mtu(link, link->original_mtu);
+                                if (r < 0) {
+                                        log_warning_link(link, "DHCP error: could not reset MTU");
+                                        link_enter_failed(link);
+                                        return;
+                                }
+                        }
+                }
         }
 
         r = sd_dhcp_client_get_address(client, &address);
@@ -378,6 +443,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
         if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) {
                 _cleanup_address_free_ Address *addr = NULL;
                 _cleanup_route_free_ Route *rt = NULL;
+                struct in_addr **nameservers;
 
                 log_struct_link(LOG_INFO, link,
                                 "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
@@ -420,6 +486,27 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
                 addr = NULL;
                 rt = NULL;
 
+                if (link->network->dhcp_dns) {
+                        r = sd_dhcp_client_get_dns(client, &nameservers);
+                        if (r >= 0) {
+                                r = manager_update_resolv_conf(link->manager);
+                                if (r < 0)
+                                        log_error("Failed to update resolv.conf");
+                        }
+                }
+
+                if (link->network->dhcp_mtu) {
+                        uint16_t mtu;
+
+                        r = sd_dhcp_client_get_mtu(client, &mtu);
+                        if (r >= 0) {
+                                r = link_set_mtu(link, mtu);
+                                if (r < 0)
+                                        log_error_link(link, "Failed to set MTU "
+                                                             "to %" PRIu16, mtu);
+                        }
+                }
+
                 link_enter_set_addresses(link);
         }
 
@@ -453,6 +540,14 @@ static int link_acquire_conf(Link *link) {
                         return r;
         }
 
+        log_debug_link(link, "acquiring DHCPv4 lease");
+
+        if (link->network->dhcp_mtu) {
+                r = sd_dhcp_client_set_request_option(link->dhcp, 26);
+                if (r < 0)
+                        return r;
+        }
+
         r = sd_dhcp_client_start(link->dhcp);
         if (r < 0)
                 return r;
@@ -470,7 +565,7 @@ static int link_update_flags(Link *link, unsigned flags) {
                 return 0;
 
         if (link->flags == flags) {
-                log_debug_link(link, "link status unchanged: %#x", flags);
+                log_debug_link(link, "link status unchanged: %#.8x", flags);
                 return 0;
         }
 
@@ -503,7 +598,7 @@ static int link_update_flags(Link *link, unsigned flags) {
         }
 
         log_debug_link(link,
-                       "link status updated: %#x -> %#x", link->flags, flags);
+                       "link status updated: %#.8x -> %#.8x", link->flags, flags);
 
         link->flags = flags;
 
@@ -609,6 +704,7 @@ static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                         link->network->bridge->name,
                         BRIDGE(link->network->bridge),
                         NULL);
+
         link_bridge_joined(link);
 
         return 1;
@@ -713,6 +809,8 @@ int link_configure(Link *link) {
 
 int link_update(Link *link, sd_rtnl_message *m) {
         unsigned flags;
+        void *data;
+        uint16_t type;
         int r;
 
         assert(link);
@@ -723,9 +821,16 @@ int link_update(Link *link, sd_rtnl_message *m) {
 
         r = sd_rtnl_message_link_get_flags(m, &flags);
         if (r < 0) {
-                log_warning_link(link, "could not get link flags");
+                log_warning_link(link, "Could not get link flags");
                 return r;
         }
 
+        while (sd_rtnl_message_read(m, &type, &data) > 0) {
+                if (type == IFLA_MTU && link->network->dhcp_mtu && !link->original_mtu) {
+                        link->original_mtu = *(uint16_t *) data;
+                        log_debug_link(link, "saved original MTU: %" PRIu16, link->original_mtu);
+                }
+        }
+
         return link_update_flags(link, flags);
 }