[asterisk-commits] rizzo: branch rizzo/astobj2 r47901 - /team/rizzo/astobj2/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Tue Nov 21 12:04:20 2006
New Revision: 47901

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47901
Log:
more documentation and cleaning of sip_register timeouts.


Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=47901&r1=47900&r2=47901
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Tue Nov 21 12:04:20 2006
@@ -17373,7 +17373,9 @@
 	);
 }
 
-/*! \brief Send all known registrations */
+/*! \brief Send all known registrations.
+ * Called at initialization or at reload.
+ */
 static void sip_send_all_registers(void)
 {
 	int ms;
@@ -17389,6 +17391,10 @@
 		if (iterator->expire > -1)
 			ast_sched_del(sched, iterator->expire);
 		ms += regspacing;
+		/* grab a reference to make sure objects do not go away when
+		 * the timeout is canceled.
+		 */
+		ASTOBJ_REF(iterator);
 		iterator->expire = ast_sched_add(sched, ms, sip_reregister, iterator);
 		ASTOBJ_UNLOCK(iterator);
 	} while (0)