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

platform/trivial: rename enum value NM_IP_CONFIG_SOURCE_RTPROT_KERNEL

Browse Source 
This source type was platform internal up to now. Next we will expose it.
This commit is contained in:
Thomas Haller
2015-06-23 17:00:24 +02:00
parent e7f3ccf7cd
commit 85bf9ded2e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-types.h
View File

@@ -55,8 +55,8 @@ typedef enum {
/* platform internal flag used to mark routes with RTM_F_CLONED. */ /* platform internal flag used to mark routes with RTM_F_CLONED. */
_NM_IP_CONFIG_SOURCE_RTM_F_CLONED, _NM_IP_CONFIG_SOURCE_RTM_F_CLONED,
/* platform internal flag used to mark routes with protocol RTPROT_KERNEL. */ /* routes from platform with protocol RTPROT_KERNEL. */
_NM_IP_CONFIG_SOURCE_RTPROT_KERNEL, NM_IP_CONFIG_SOURCE_RTPROT_KERNEL,
NM_IP_CONFIG_SOURCE_KERNEL, NM_IP_CONFIG_SOURCE_KERNEL,
NM_IP_CONFIG_SOURCE_SHARED, NM_IP_CONFIG_SOURCE_SHARED,

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

@@ -597,7 +597,7 @@ _nm_ip_config_source_to_rtprot (NMIPConfigSource source)
case NM_IP_CONFIG_SOURCE_UNKNOWN: case NM_IP_CONFIG_SOURCE_UNKNOWN:
return RTPROT_UNSPEC; return RTPROT_UNSPEC;
case NM_IP_CONFIG_SOURCE_KERNEL: case NM_IP_CONFIG_SOURCE_KERNEL:
case _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL: case NM_IP_CONFIG_SOURCE_RTPROT_KERNEL:
return RTPROT_KERNEL; return RTPROT_KERNEL;
case NM_IP_CONFIG_SOURCE_DHCP: case NM_IP_CONFIG_SOURCE_DHCP:
return RTPROT_DHCP; return RTPROT_DHCP;
@@ -616,7 +616,7 @@ _nm_ip_config_source_from_rtprot (guint rtprot)
case RTPROT_UNSPEC: case RTPROT_UNSPEC:
return NM_IP_CONFIG_SOURCE_UNKNOWN; return NM_IP_CONFIG_SOURCE_UNKNOWN;
case RTPROT_KERNEL: case RTPROT_KERNEL:
return _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL; return NM_IP_CONFIG_SOURCE_RTPROT_KERNEL;
case RTPROT_REDIRECT: case RTPROT_REDIRECT:
return NM_IP_CONFIG_SOURCE_KERNEL; return NM_IP_CONFIG_SOURCE_KERNEL;
case RTPROT_RA: case RTPROT_RA:

2
src/platform/nm-platform.c
View File

@@ -2281,7 +2281,7 @@ static const char *
source_to_string (NMIPConfigSource source) source_to_string (NMIPConfigSource source)
{ {
switch (source) { switch (source) {
case _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL: case NM_IP_CONFIG_SOURCE_RTPROT_KERNEL:
return "rtprot-kernel"; return "rtprot-kernel";
case _NM_IP_CONFIG_SOURCE_RTM_F_CLONED: case _NM_IP_CONFIG_SOURCE_RTM_F_CLONED:
return "rtm-f-cloned"; return "rtm-f-cloned";

2
src/platform/nmp-object.c
View File

@@ -786,7 +786,7 @@ _vt_cmd_obj_is_visible_ipx_route (const NMPObject *obj)
{ {
NMIPConfigSource source = obj->ip_route.source; NMIPConfigSource source = obj->ip_route.source;
return obj->object.ifindex > 0 && (source != _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL && source != _NM_IP_CONFIG_SOURCE_RTM_F_CLONED); return obj->object.ifindex > 0 && (source != NM_IP_CONFIG_SOURCE_RTPROT_KERNEL && source != _NM_IP_CONFIG_SOURCE_RTM_F_CLONED);
} }
/******************************************************************/ /******************************************************************/