diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-30 19:23:05 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-30 19:23:05 +0000 |
commit | e61f1251cf68f981d3430c94fba944502fcc8031 (patch) | |
tree | 3f3d9fdd92698d35fb3e267e5bea26343a91804e /channels | |
parent | daec794be68de1187b9d4c26219a3bf935066abd (diff) |
Merged revisions 152877 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r152877 | russell | 2008-10-30 14:21:53 -0500 (Thu, 30 Oct 2008) | 9 lines
Modify the documentation of the sip_registry struct
- Remove a comment that says that the monitor thread is the only one that
ever touches these objects. This is no longer the case with TCP. Also,
I would eventually like to get the scheduler in its own thread, so this
is just a poor assumption to make.
- Note that reference counting of these objects with respect to scheduler
entries is not complete. There are some leaked references when deleting
scheduler entries.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152878 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index dc66bdae9..28af55455 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1559,7 +1559,9 @@ struct sip_peer { }; -/*! \brief Registrations with other SIP proxies +/*! + * \brief Registrations with other SIP proxies + * * Created by sip_register(), the entry is linked in the 'regl' list, * and never deleted (other than at 'sip reload' or module unload times). * The entry always has a pending timeout, either waiting for an ACK to @@ -1568,11 +1570,12 @@ struct sip_peer { * or once the previously completed registration one expires). * The registration can be in one of many states, though at the moment * the handling is a bit mixed. - * Note that the entire evolution of sip_registry (transmissions, - * incoming packets and timeouts) is driven by one single thread, - * do_monitor(), so there is almost no synchronization issue. - * The only exception is the sip_pvt creation/lookup, - * as the dialoglist is also manipulated by other threads. + * + * XXX \todo Reference count handling for this object has some problems with + * respect to scheduler entries. The ref count is handled in some places, + * but not all of them. There are some places where references get leaked + * when this scheduler entry gets cancelled. At worst, this would cause + * memory leaks on reloads if registrations get removed from configuration. */ struct sip_registry { ASTOBJ_COMPONENTS_FULL(struct sip_registry,1,1); @@ -4571,7 +4574,6 @@ static void sip_registry_destroy(struct sip_registry *reg) ast_atomic_fetchadd_int(®objs, -1); ast_dnsmgr_release(reg->dnsmgr); ast_free(reg); - } /*! \brief Execute destruction of SIP dialog structure, release memory */ |