diff options
author | Thomas Haller <thaller@redhat.com> | 2016-08-29 11:41:05 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-08-29 11:41:05 +0200 |
commit | 091620e76592349ae3efee08faed881ce1a2495b (patch) | |
tree | 1290bda36c0b01cf0f8030ffc411d9856d4ab2fa | |
parent | 895c61a742eb1d816b022c260494f5632bd7a922 (diff) | |
parent | 2bef71611bd9fd2e333a7522205f0262ac25680f (diff) |
platform: merge branch 'th/platform-set-address-enfile-bgo770456'
https://bugzilla.gnome.org/show_bug.cgi?id=770456
-rw-r--r-- | src/platform/nm-linux-platform.c | 62 |
1 files changed, 53 insertions, 9 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 67443aa853..ad88c8e961 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -4061,18 +4061,14 @@ out: return !!nmp_cache_lookup_obj (priv->cache, obj_id); } -static NMPlatformError -do_change_link (NMPlatform *platform, - int ifindex, - struct nl_msg *nlmsg) +static WaitForNlResponseResult +do_change_link_request (NMPlatform *platform, + int ifindex, + struct nl_msg *nlmsg) { nm_auto_pop_netns NMPNetns *netns = NULL; WaitForNlResponseResult seq_result = WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN; int nle; - char s_buf[256]; - NMPlatformError result = NM_PLATFORM_ERROR_SUCCESS; - NMLogLevel log_level = LOGL_DEBUG; - const char *log_result = "failure", *log_detail = ""; if (!nm_platform_netns_push (platform, &netns)) return NM_PLATFORM_ERROR_UNSPECIFIED; @@ -4099,6 +4095,18 @@ retry: nlmsg_hdr (nlmsg)->nlmsg_type = RTM_SETLINK; goto retry; } + return seq_result; +} + +static NMPlatformError +do_change_link_result (NMPlatform *platform, + int ifindex, + WaitForNlResponseResult seq_result) +{ + char s_buf[256]; + NMPlatformError result = NM_PLATFORM_ERROR_SUCCESS; + NMLogLevel log_level = LOGL_DEBUG; + const char *log_result = "failure", *log_detail = ""; if (seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK) { log_result = "success"; @@ -4124,6 +4132,17 @@ retry: return result; } +static NMPlatformError +do_change_link (NMPlatform *platform, + int ifindex, + struct nl_msg *nlmsg) +{ + WaitForNlResponseResult seq_result; + + seq_result = do_change_link_request (platform, ifindex, nlmsg); + return do_change_link_result (platform, ifindex, seq_result); +} + static gboolean link_add (NMPlatform *platform, const char *name, @@ -4431,6 +4450,8 @@ link_set_address (NMPlatform *platform, int ifindex, gconstpointer address, size { nm_auto_nlmsg struct nl_msg *nlmsg = NULL; gs_free char *mac = NULL; + WaitForNlResponseResult seq_result; + char s_buf[256]; if (!address || !length) g_return_val_if_reached (NM_PLATFORM_ERROR_BUG); @@ -4450,7 +4471,30 @@ link_set_address (NMPlatform *platform, int ifindex, gconstpointer address, size NLA_PUT (nlmsg, IFLA_ADDRESS, length, address); - return do_change_link (platform, ifindex, nlmsg); + seq_result = do_change_link_request (platform, ifindex, nlmsg); + + if (NM_IN_SET (-((int) seq_result), ENFILE)) { + const NMPObject *obj_cache; + + /* workaround ENFILE which may be wrongly returned (bgo #770456). + * If the MAC address is as expected, assume success? */ + + obj_cache = nmp_cache_lookup_link (NM_LINUX_PLATFORM_GET_PRIVATE (platform)->cache, ifindex); + if ( obj_cache + && obj_cache->link.addr.len == length + && memcmp (obj_cache->link.addr.data, address, length) == 0) { + _NMLOG (LOGL_DEBUG, + "do-change-link[%d]: %s changing link: %s%s", + ifindex, + "success", + wait_for_nl_response_to_string (seq_result, s_buf, sizeof (s_buf)), + " (assume success changing address)"); + return NM_PLATFORM_ERROR_SUCCESS; + } + } + + return do_change_link_result (platform, ifindex, seq_result); + nla_put_failure: g_return_val_if_reached (NM_PLATFORM_ERROR_UNSPECIFIED); } |