Attachment 879257 Details for Bug 1074294 – networkd git commit d39edfc reversed - bridge dhcp OK

[patch] networkd git commit d39edfc reversed - bridge dhcp OK

networkd-gitd39edfc-revers.patch (text/plain), 4.40 KB, created by poma on 2014-03-27 02:35:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-03-27 02:35:31 UTC

Size: 4.40 KB

patch

obsolete

>diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
>index 684b1c7..46815e0 100644
>--- a/src/network/networkd-manager.c
>+++ b/src/network/networkd-manager.c
>@@ -324,7 +324,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
> 
>                 r = netdev_get(m, name, &netdev);
>                 if (r >= 0) {
>-                        r = netdev_set_ifindex(netdev, message);
>+                        r = netdev_set_ifindex(netdev, ifindex);
>                         if (r < 0)
>                                 log_debug("could not set ifindex of netdev '%s' to %d: %s",
>                                           name, ifindex, strerror(-r));
>diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
>index e333c47..2614e6c 100644
>--- a/src/network/networkd-netdev.c
>+++ b/src/network/networkd-netdev.c
>@@ -162,7 +162,7 @@ static int netdev_enter_ready(NetDev *netdev) {
> static int netdev_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
>                                 void *userdata) {
>         NetDev *netdev = userdata;
>-        int r;
>+        int r, ifindex;
> 
>         assert(netdev);
> 
>@@ -179,7 +179,19 @@ static int netdev_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
>                 return 1;
>         }
> 
>-        netdev_set_ifindex(netdev, m);
>+       r = sd_rtnl_message_link_get_ifindex(m, &ifindex);
>+       if (r < 0) {
>+               log_struct_netdev(LOG_ERR, netdev,
>+                              	"MESSAGE=%s: could not get ifindex: %s",
>+                               netdev->name, strerror(-r),
>+                               "ERRNO=%d", -r,
>+                               NULL);
>+               return 1;
>+       }
>+
>+       r = netdev_set_ifindex(netdev, ifindex);
>+       if (r < 0)
>+               log_warning_netdev(netdev, "could not set ifindex to %d", ifindex);
> 
>         return 1;
> }
>@@ -385,57 +397,11 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac
>         return 0;
> }
> 
>-int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
>+int netdev_set_ifindex(NetDev *netdev, int ifindex) {
>         uint16_t type;
>-        const char *kind;
>-        char *received_kind;
>-        int r, ifindex;
> 
>         assert(netdev);
>-        assert(message);
>-
>-        r = sd_rtnl_message_get_type(message, &type);
>-        if (r < 0)
>-                return r;
>-
>-        if (type != RTM_NEWLINK)
>-                return -EINVAL;
>-
>-        r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
>-        if (r < 0) {
>-                log_error_netdev(netdev, "Could not get LINKINFO");
>-                return r;
>-        }
>-
>-        r = sd_rtnl_message_read_string(message, IFLA_INFO_KIND, &received_kind);
>-        if (r < 0) {
>-                log_error_netdev(netdev, "Could not get KIND");
>-                return r;
>-        }
>-
>-        kind = netdev_kind_to_string(netdev->kind);
>-        if (!kind) {
>-                log_error_netdev(netdev, "Could not get kind");
>-                netdev_enter_failed(netdev);
>-                return -EINVAL;
>-        }
>-
>-        if (!streq(kind, received_kind)) {
>-                log_error_netdev(netdev, "Received newlink with wrong KIND");
>-                netdev_enter_failed(netdev);
>-                return r;
>-        }
>-
>-        r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
>-        if (r < 0) {
>-                log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
>-                netdev_enter_failed(netdev);
>-                return r;
>-        } else if (ifindex <= 0) {
>-                log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
>-                netdev_enter_failed(netdev);
>-                return r;
>-        }
>+        assert(ifindex > 0);
> 
>         if (netdev->ifindex > 0) {
>                 if (netdev->ifindex == ifindex)
>diff --git a/src/network/networkd.h b/src/network/networkd.h
>index 8144031..239ef1c 100644
>--- a/src/network/networkd.h
>+++ b/src/network/networkd.h
>@@ -264,7 +264,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_free);
> #define _cleanup_netdev_free_ _cleanup_(netdev_freep)
> 
> int netdev_get(Manager *manager, const char *name, NetDev **ret);
>-int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *newlink);
>+int netdev_set_ifindex(NetDev *netdev, int ifindex);
> int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t cb);
> 
> const char *netdev_kind_to_string(NetDevKind d) _const_;

Actions: View | Diff

Attachments on bug 1074294: 873647 | 875193 | 875621 | 877526 | 878306 | 879257 | 879259 | 879706 | 879714 | 880039 | 880456 | 881142 | 887928 | 888512 | 888713 | 889475