colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: assume ifname is present in _linktype_get_type()

Browse Source 
_linktype_get_type() only has one caller, and ifname is *never*
NULL.
This commit is contained in:
Thomas Haller
2016-12-12 14:06:44 +01:00
parent d32fb8158b
commit 396d90e744
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/platform/nm-linux-platform.c
View File

@@ -611,6 +611,7 @@ _linktype_get_type (NMPlatform *platform,
guint i; guint i;
ASSERT_NETNS_CURRENT (platform); ASSERT_NETNS_CURRENT (platform);
nm_assert (ifname);
if (completed_from_cache) { if (completed_from_cache) {
const NMPObject *obj; const NMPObject *obj;
@@ -631,7 +632,7 @@ _linktype_get_type (NMPlatform *platform,
* of messing stuff up. */ * of messing stuff up. */
if ( obj if ( obj
&& !NM_IN_SET (obj->link.type, NM_LINK_TYPE_UNKNOWN, NM_LINK_TYPE_NONE) && !NM_IN_SET (obj->link.type, NM_LINK_TYPE_UNKNOWN, NM_LINK_TYPE_NONE)
&& !g_strcmp0 (ifname, obj->link.name) && nm_streq (ifname, obj->link.name)
&& ( !kind && ( !kind
|| !g_strcmp0 (kind, obj->link.kind))) { || !g_strcmp0 (kind, obj->link.kind))) {
nm_assert (obj->link.kind == g_intern_string (obj->link.kind)); nm_assert (obj->link.kind == g_intern_string (obj->link.kind));
@@ -652,7 +653,7 @@ _linktype_get_type (NMPlatform *platform,
NMPlatformTunProperties props; NMPlatformTunProperties props;
if ( platform if ( platform
&& nm_platform_link_tun_get_properties (platform, ifindex, ifname ?: "", &props)) { && nm_platform_link_tun_get_properties (platform, ifindex, ifname, &props)) {
if (!g_strcmp0 (props.mode, "tap")) if (!g_strcmp0 (props.mode, "tap"))
return NM_LINK_TYPE_TAP; return NM_LINK_TYPE_TAP;
if (!g_strcmp0 (props.mode, "tun")) if (!g_strcmp0 (props.mode, "tun"))
@@ -675,11 +676,8 @@ _linktype_get_type (NMPlatform *platform,
else if (arptype == ARPHRD_TUNNEL6) else if (arptype == ARPHRD_TUNNEL6)
return NM_LINK_TYPE_IP6TNL; return NM_LINK_TYPE_IP6TNL;
if (ifname) { {
NMPUtilsEthtoolDriverInfo driver_info; NMPUtilsEthtoolDriverInfo driver_info;
nm_auto_close int dirfd = -1;
gs_free char *devtype = NULL;
char ifname_verified[IFNAMSIZ];
/* Fallback OVS detection for kernel <= 3.16 */ /* Fallback OVS detection for kernel <= 3.16 */
if (nmp_utils_ethtool_get_driver_info (ifindex, &driver_info)) { if (nmp_utils_ethtool_get_driver_info (ifindex, &driver_info)) {
@@ -694,6 +692,12 @@ _linktype_get_type (NMPlatform *platform,
return NM_LINK_TYPE_ETHERNET; return NM_LINK_TYPE_ETHERNET;
} }
} }
}
{
nm_auto_close int dirfd = -1;
gs_free char *devtype = NULL;
char ifname_verified[IFNAMSIZ];
dirfd = nmp_utils_sysctl_open_netdir (ifindex, ifname, ifname_verified); dirfd = nmp_utils_sysctl_open_netdir (ifindex, ifname, ifname_verified);
if (dirfd >= 0) { if (dirfd >= 0) {