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

core: move NM_ACD_TIMEOUT_MAX_MSEC define to "nm-l3cfg.h" header for reuse

Browse Source
This commit is contained in:
Thomas Haller
2022-05-19 09:23:29 +02:00
parent f9d601ef06
commit d60ba91c87
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/nm-l3cfg.c
View File

@@ -37,7 +37,6 @@ G_STATIC_ASSERT(NM_ACD_TIMEOUT_RFC5227_MSEC == N_ACD_TIMEOUT_RFC5227);
#define ACD_ENSURE_RATELIMIT_MSEC ((guint32) 4000u) #define ACD_ENSURE_RATELIMIT_MSEC ((guint32) 4000u)
#define ACD_WAIT_PROBING_EXTRA_TIME_MSEC ((guint32) (1000u + ACD_ENSURE_RATELIMIT_MSEC)) #define ACD_WAIT_PROBING_EXTRA_TIME_MSEC ((guint32) (1000u + ACD_ENSURE_RATELIMIT_MSEC))
#define ACD_WAIT_PROBING_EXTRA_TIME2_MSEC ((guint32) 1000u) #define ACD_WAIT_PROBING_EXTRA_TIME2_MSEC ((guint32) 1000u)
#define ACD_MAX_TIMEOUT_MSEC ((guint32) 30000u)
#define ACD_WAIT_TIME_PROBING_FULL_RESTART_MSEC ((guint32) 30000u) #define ACD_WAIT_TIME_PROBING_FULL_RESTART_MSEC ((guint32) 30000u)
#define ACD_WAIT_TIME_CONFLICT_RESTART_MSEC ((guint32) 120000u) #define ACD_WAIT_TIME_CONFLICT_RESTART_MSEC ((guint32) 120000u)
#define ACD_WAIT_TIME_ANNOUNCE_RESTART_MSEC ((guint32) 30000u) #define ACD_WAIT_TIME_ANNOUNCE_RESTART_MSEC ((guint32) 30000u)
@@ -1866,10 +1865,10 @@ _l3_acd_data_add(NML3Cfg *self,
acd_data = _l3_acd_data_find(self, addr); acd_data = _l3_acd_data_find(self, addr);
if (acd_timeout_msec > ACD_MAX_TIMEOUT_MSEC) { if (acd_timeout_msec > NM_ACD_TIMEOUT_MAX_MSEC) {
/* we limit the maximum timeout. Otherwise we have to handle integer overflow /* we limit the maximum timeout. Otherwise we have to handle integer overflow
* when adding timeouts. */ * when adding timeouts. */
acd_timeout_msec = ACD_MAX_TIMEOUT_MSEC; acd_timeout_msec = NM_ACD_TIMEOUT_MAX_MSEC;
} }
if (!acd_data) { if (!acd_data) {
@@ -3229,8 +3228,8 @@ nm_l3cfg_add_config(NML3Cfg *self,
nm_assert(l3cd); nm_assert(l3cd);
nm_assert(nm_l3_config_data_get_ifindex(l3cd) == self->priv.ifindex); nm_assert(nm_l3_config_data_get_ifindex(l3cd) == self->priv.ifindex);
if (acd_timeout_msec > ACD_MAX_TIMEOUT_MSEC) if (acd_timeout_msec > NM_ACD_TIMEOUT_MAX_MSEC)
acd_timeout_msec = ACD_MAX_TIMEOUT_MSEC; acd_timeout_msec = NM_ACD_TIMEOUT_MAX_MSEC;
nm_assert(NM_IN_SET(acd_defend_type, nm_assert(NM_IN_SET(acd_defend_type,
NM_L3_ACD_DEFEND_TYPE_NEVER, NM_L3_ACD_DEFEND_TYPE_NEVER,

1
src/core/nm-l3cfg.h
View File

@@ -10,6 +10,7 @@
#define NM_L3CFG_CONFIG_PRIORITY_IPV6LL 1 #define NM_L3CFG_CONFIG_PRIORITY_IPV6LL 1
#define NM_L3CFG_CONFIG_PRIORITY_VPN 9 #define NM_L3CFG_CONFIG_PRIORITY_VPN 9
#define NM_ACD_TIMEOUT_RFC5227_MSEC 9000u #define NM_ACD_TIMEOUT_RFC5227_MSEC 9000u
#define NM_ACD_TIMEOUT_MAX_MSEC 30000u
#define NM_TYPE_L3CFG (nm_l3cfg_get_type()) #define NM_TYPE_L3CFG (nm_l3cfg_get_type())
#define NM_L3CFG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_L3CFG, NML3Cfg)) #define NM_L3CFG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_L3CFG, NML3Cfg))