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

l3cfg: drop unused NM_L3_CONFIG_MERGE_FLAGS_EXTERNAL

Browse Source 
The current approach also tracks external configuration in an NMIP[46]Config, and
we need to special handle those. In the future, we only want to track what we actually
want to configure. So this flag won't be used with NML3Cfg/NML3ConfigData.
This commit is contained in:
Thomas Haller
2020-08-28 17:19:09 +02:00
parent 38b2239146
commit 41b9d44f9b
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nm-l3-config-data.c
View File

@@ -2028,25 +2028,6 @@ nm_l3_config_data_merge (NML3ConfigData *self,
&& !hook_add_addr (src, obj, hook_user_data)) && !hook_add_addr (src, obj, hook_user_data))
continue; continue;
if ( NM_FLAGS_HAS (merge_flags, NM_L3_CONFIG_MERGE_FLAGS_EXTERNAL)
&& !NMP_OBJECT_CAST_IP_ADDRESS (obj)->external) {
NMPlatformIPXAddress a;
if (IS_IPv4)
a.a4 = *NMP_OBJECT_CAST_IP4_ADDRESS (obj);
else
a.a6 = *NMP_OBJECT_CAST_IP6_ADDRESS (obj);
a.ax.ifindex = self->ifindex;
a.ax.external = TRUE;
nm_l3_config_data_add_address_full (self,
addr_family,
NULL,
&a.ax,
NM_L3_CONFIG_ADD_FLAGS_EXCLUSIVE,
NULL);
continue;
}
nm_l3_config_data_add_address_full (self, nm_l3_config_data_add_address_full (self,
addr_family, addr_family,
obj, obj,

2
src/nm-l3-config-data.h
View File

@@ -51,14 +51,12 @@ typedef enum {
* Note that if the respective NML3ConfigData has NM_L3_CONFIG_DAT_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES * Note that if the respective NML3ConfigData has NM_L3_CONFIG_DAT_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES
* set, this flag gets ignored during merge. * set, this flag gets ignored during merge.
* @NM_L3_CONFIG_MERGE_FLAGS_NO_DNS: don't merge DNS information * @NM_L3_CONFIG_MERGE_FLAGS_NO_DNS: don't merge DNS information
* @NM_L3_CONFIG_MERGE_FLAGS_EXTERNAL: mark new addresses as external
*/ */
typedef enum { typedef enum {
NM_L3_CONFIG_MERGE_FLAGS_NONE = 0, NM_L3_CONFIG_MERGE_FLAGS_NONE = 0,
NM_L3_CONFIG_MERGE_FLAGS_NO_ROUTES = (1LL << 0), NM_L3_CONFIG_MERGE_FLAGS_NO_ROUTES = (1LL << 0),
NM_L3_CONFIG_MERGE_FLAGS_NO_DEFAULT_ROUTES = (1LL << 1), NM_L3_CONFIG_MERGE_FLAGS_NO_DEFAULT_ROUTES = (1LL << 1),
NM_L3_CONFIG_MERGE_FLAGS_NO_DNS = (1LL << 2), NM_L3_CONFIG_MERGE_FLAGS_NO_DNS = (1LL << 2),
NM_L3_CONFIG_MERGE_FLAGS_EXTERNAL = (1LL << 3),
} NML3ConfigMergeFlags; } NML3ConfigMergeFlags;
/*****************************************************************************/ /*****************************************************************************/