r3229 - in trunk/libminisip: include/libminisip/sip source/ipprovider source/sip

[mikma at minisip.org]

Author: mikma
Date: 2007-03-07 10:44:35 +0100 (Wed, 07 Mar 2007)
New Revision: 3229

Modified:
   trunk/libminisip/include/libminisip/sip/DefaultDialogHandler.h
   trunk/libminisip/include/libminisip/sip/SipSoftPhoneConfiguration.h
   trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
   trunk/libminisip/source/sip/SipDialogVoipClient.cxx
   trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
Log:
Add use_100rel and use_anat settings in configuration.
Add 127.0.0.0/8 to private ip range in SimpleIpProvider.



Modified: trunk/libminisip/include/libminisip/sip/DefaultDialogHandler.h
===================================================================
--- trunk/libminisip/include/libminisip/sip/DefaultDialogHandler.h	2007-03-07 09:37:17 UTC (rev 3228)
+++ trunk/libminisip/include/libminisip/sip/DefaultDialogHandler.h	2007-03-07 09:44:35 UTC (rev 3229)
@@ -131,7 +131,7 @@
 		 * @param p2tDialog the reference to the call
 		 * return true if a dialog was found
 		 */
-		bool getP2TDialog(string GroupId, MRef<SipDialogP2T*> &p2tDialog);
+		bool getP2TDialog(std::string GroupId, MRef<SipDialogP2T*> &p2tDialog);
 #endif
 		
 		/**

Modified: trunk/libminisip/include/libminisip/sip/SipSoftPhoneConfiguration.h
===================================================================
--- trunk/libminisip/include/libminisip/sip/SipSoftPhoneConfiguration.h	2007-03-07 09:37:17 UTC (rev 3228)
+++ trunk/libminisip/include/libminisip/sip/SipSoftPhoneConfiguration.h	2007-03-07 09:44:35 UTC (rev 3229)
@@ -113,6 +113,8 @@
 		std::string stunDomain;
 		bool useUserDefinedStunServer;
 		std::string userDefinedStunServer;
+
+		bool useAnat;
 		
 		std::string soundDeviceIn;
 		std::string soundDeviceOut;

Modified: trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx	2007-03-07 09:37:17 UTC (rev 3228)
+++ trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx	2007-03-07 09:44:35 UTC (rev 3229)
@@ -131,8 +131,10 @@
 }
 
 bool SimpleIpProvider::isInPrivateIpRange( string ipstr ) {
-	//check the easy ones first ... 10.x.x.x and 192.168.x.x
+	//check the easy ones first ... 10.x.x.x, 127.x.x.x,
+	//192.168.x.x and 0.x.x.x
 	if (ipstr.substr(0,3)=="10." 
+			|| ipstr.substr(0,4)=="127."
 			|| ipstr.substr(0,7)=="192.168" 
 			|| ipstr.substr(0,2)=="0.") {	//Found local interfaces in Windows XP used to communicate only
 							//internally with a web camera that started with "0."

Modified: trunk/libminisip/source/sip/SipDialogVoipClient.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogVoipClient.cxx	2007-03-07 09:37:17 UTC (rev 3228)
+++ trunk/libminisip/source/sip/SipDialogVoipClient.cxx	2007-03-07 09:44:35 UTC (rev 3229)
@@ -552,7 +552,8 @@
 #ifdef ENABLE_TS
 		ts.save("getSdpOffer");
 #endif
-		sdp = mediaSession->getSdpOffer( peerUri );
+		bool anat = phoneconf->useAnat;
+		sdp = mediaSession->getSdpOffer( peerUri, anat );
 #ifdef ENABLE_TS
 		ts.save("getSdpOffer");
 #endif

Modified: trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2007-03-07 09:37:17 UTC (rev 3228)
+++ trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2007-03-07 09:44:35 UTC (rev 3229)
@@ -79,6 +79,7 @@
 	findStunServerFromDomain(false),
 	stunDomain(""),
 	useUserDefinedStunServer(false),
+	useAnat(false),
 	soundDeviceIn(""),
 	soundDeviceOut(""),
 	videoDevice(""),
@@ -382,6 +383,12 @@
 	backend->save("stun_manual_server", userDefinedStunServer);
 	
 	/************************************************************
+	 * SIP extensions
+	 ************************************************************/
+	backend->saveBool( "use_100rel", sipStackConfig->use100Rel );
+	backend->saveBool( "use_anat", useAnat );
+
+	/************************************************************
 	 * Advanced settings
 	 ************************************************************/
 	backend->saveBool("tcp_server", tcp_server);
@@ -782,6 +789,9 @@
 	frameHeight = backend->loadInt( "frame_height", 144 );
 #endif
 
+	sipStackConfig->use100Rel = backend->loadBool("use_100rel");
+	useAnat = backend->loadBool("use_anat");
+
 	useSTUN = backend->loadBool("use_stun");
 	findStunServerFromSipUri = backend->loadBool("stun_server_autodetect");