diff options
author | Fabrice Bellet <fabrice@bellet.info> | 2019-06-28 13:45:11 +0200 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2019-07-04 17:03:43 -0400 |
commit | 0512ecaa2d29b901e67a41b04f46175af0c193f1 (patch) | |
tree | 1732bacdf7b4272c87521b46b5b4b8ddaeab5cf2 /agent/agent-priv.h | |
parent | 2118cbae32a3bdd6a03c692d5188437b4e53890e (diff) | |
download | libnice-0512ecaa2d29b901e67a41b04f46175af0c193f1.tar.gz |
conncheck: define a property for a final idle timeout
This final idle timeout is renamed from the
NICE_AGENT_MAX_TIMER_GRACE_PERIOD macro, and keeps its semantic.
We also increase the default value of this timeout from 1 second to 5
seconds. This is useful for the sipe pidgin plugin that has to deal
with SfB agents, that may take some time in controlling mode before
choosing and testing the nominated pair
Diffstat (limited to 'agent/agent-priv.h')
-rw-r--r-- | agent/agent-priv.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/agent/agent-priv.h b/agent/agent-priv.h index ee1000e..4b47252 100644 --- a/agent/agent-priv.h +++ b/agent/agent-priv.h @@ -122,18 +122,6 @@ nice_input_message_iter_compare (const NiceInputMessageIter *a, ((obj)->compatibility == NICE_COMPATIBILITY_RFC5245 || \ (obj)->compatibility == NICE_COMPATIBILITY_OC2007R2) -/* A grace period before declaring a component as failed, in msecs. This - * delay is added to reduce the chance to see the agent receiving new - * stun activity just after the conncheck list has been declared failed, - * reactiviting conncheck activity, and causing a (valid) state - * transitions like that: connecting -> failed -> connecting -> - * connected -> ready. - * Such transitions are not buggy per-se, but may break the - * test-suite, that counts precisely the number of time each state - * has been set, and doesnt expect these transcient failed states. - */ -#define NICE_AGENT_MAX_TIMER_GRACE_PERIOD 1000 - struct _NiceAgent { GObject parent; /* gobject pointer */ @@ -157,6 +145,7 @@ struct _NiceAgent guint stun_reliable_timeout; /* property: stun reliable timeout */ NiceNominationMode nomination_mode; /* property: Nomination mode */ gboolean support_renomination; /* property: support RENOMINATION STUN attribute */ + guint idle_timeout; /* property: conncheck timeout before stop */ GSList *local_addresses; /* list of NiceAddresses for local interfaces */ @@ -193,7 +182,7 @@ struct _NiceAgent gboolean use_ice_tcp; gboolean use_ice_trickle; - guint conncheck_timer_grace_period; /* ongoing delay before timer stop */ + guint conncheck_ongoing_idle_delay; /* ongoing delay before timer stop */ gboolean controlling_mode; /* controlling mode used by the conncheck */ /* XXX: add pointer to internal data struct for ABI-safe extensions */ |