iaxclient-cvs

[Iaxclient-cvs] SF.net SVN: iaxclient: [1213] branches/2.0/lib/iaxclient_lib.c

[<sb...@us...>]

Revision: 1213
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1213&view=rev
Author:   sbalea
Date:     2007-10-18 09:40:11 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
Merge bugfix from trunk
Fix the registration issue that was reported by Andrea Suisani

Modified Paths:
--------------
    branches/2.0/lib/iaxclient_lib.c

Modified: branches/2.0/lib/iaxclient_lib.c
===================================================================
--- branches/2.0/lib/iaxclient_lib.c	2007-10-18 16:36:17 UTC (rev 1212)
+++ branches/2.0/lib/iaxclient_lib.c	2007-10-18 16:40:11 UTC (rev 1213)
@@ -1723,8 +1723,13 @@
 #endif
 		// first, see if this is an event for one of our calls.
 		callNo = iaxc_find_call_by_session(e->session);
-		if (callNo >= 0)
+		if ( e->etype == IAX_EVENT_NULL )
 		{
+			// Should we do something here?
+			// Right now we do nothing, just go with the flow
+			// and let the event be deallocated.
+		} else if ( callNo >= 0 )
+		{
 			iaxc_handle_network_event(e, callNo);
 		} else if ((reg = iaxc_find_registration_by_session(e->session)) != NULL)
 		{
@@ -1744,11 +1749,6 @@
 			iaxci_usermsg(IAXC_STATUS,
 					"Timeout for a non-existant session. Dropping",
 					e->etype);
-		} else if ( e->etype == IAX_EVENT_NULL )
-		{
-			// Should we do something here?
-			// Right now we do nothing, just go with the flow
-			// and let the event be deallocated.
 		} else
 		{
 			iaxci_usermsg(IAXC_STATUS,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1261] branches/2.0/lib/iaxclient_lib.c

[<sb...@us...>]

Revision: 1261
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1261&view=rev
Author:   sbalea
Date:     2007-11-02 09:41:54 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Merge from trunk: make sure that all encoders and decoders are properly
destroyed upon iaxclient shutdown

Modified Paths:
--------------
    branches/2.0/lib/iaxclient_lib.c

Modified: branches/2.0/lib/iaxclient_lib.c
===================================================================
--- branches/2.0/lib/iaxclient_lib.c	2007-11-02 16:32:05 UTC (rev 1260)
+++ branches/2.0/lib/iaxclient_lib.c	2007-11-02 16:41:54 UTC (rev 1261)
@@ -651,7 +651,25 @@
 
 	audio_driver.destroy(&audio_driver);
 	video_destroy();
-
+	
+	/* destroy enocders and decoders for all existing calls */
+	if ( calls ) 
+	{
+                int i;
+		for ( i=0 ; i<max_calls ; i++ ) 
+		{
+			if ( calls[i].encoder )
+				calls[i].encoder->destroy(calls[i].encoder);
+			if ( calls[i].decoder )
+				calls[i].decoder->destroy(calls[i].decoder);
+			if ( calls[i].vencoder )
+				calls[i].vdecoder->destroy(calls[i].vencoder);
+			if ( calls[i].vdecoder )
+				calls[i].vencoder->destroy(calls[i].vdecoder);
+                }
+		free(calls);
+		calls = NULL;
+	}
 	put_iaxc_lock();
 #ifdef WIN32
 	closesocket(iax_get_fd()); //fd:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.