More Symbian works:

 - changed PJ_VERSION to pj_get_version() in pjsua-lib
 - added .mmp file for symbian_sound.cpp
 - allow pj_gethostip() in Symbian to return 127.0.0.1



git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1426 74dad513-b988-da41-8d7b-12977e46ad98

7 files changed, 106 insertions, 26 deletions

diff --git a/build.symbian/pjproject.cww b/build.symbian/pjproject.cww
index bf5fb935..f5b7eea7 100644
--- a/build.symbian/pjproject.cww
+++ b/build.symbian/pjproject.cww
@@ -54,7 +54,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -79,7 +79,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -104,7 +104,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -129,7 +129,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -139,7 +139,7 @@
     <WINDOW>

         <SESSION>-1</SESSION>

         <EDOCTYPE>0</EDOCTYPE>

-        <PATH USERELATIVEPATHS = "true">pjmedia.mcp</PATH>

+        <PATH USERELATIVEPATHS = "true">pjsdp.mcp</PATH>

         <FRAMELOC>

             <X>0</X>

             <Y>0</Y>

@@ -154,7 +154,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -164,7 +164,7 @@
     <WINDOW>

         <SESSION>-1</SESSION>

         <EDOCTYPE>0</EDOCTYPE>

-        <PATH USERELATIVEPATHS = "true">pjsdp.mcp</PATH>

+        <PATH USERELATIVEPATHS = "true">pjmedia.mcp</PATH>

         <FRAMELOC>

             <X>0</X>

             <Y>0</Y>

@@ -179,7 +179,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -204,7 +204,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -229,7 +229,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -241,12 +241,12 @@
         <EDOCTYPE>0</EDOCTYPE>

         <PATH USERELATIVEPATHS = "true">pjsip_ua.mcp</PATH>

         <FRAMELOC>

-            <X>548</X>

-            <Y>123</Y>

+            <X>0</X>

+            <Y>0</Y>

         </FRAMELOC>

         <FRAMESIZE>

-            <W>400</W>

-            <H>372</H>

+            <W>347</W>

+            <H>128</H>

         </FRAMESIZE>

         <DOCKINFO>

             <STATUS>1</STATUS>

@@ -254,7 +254,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -266,8 +266,8 @@
         <EDOCTYPE>0</EDOCTYPE>

         <PATH USERELATIVEPATHS = "true">pjsua_lib.mcp</PATH>

         <FRAMELOC>

-            <X>634</X>

-            <Y>231</Y>

+            <X>0</X>

+            <Y>0</Y>

         </FRAMELOC>

         <FRAMESIZE>

             <W>347</W>

@@ -279,7 +279,7 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

@@ -291,8 +291,8 @@
         <EDOCTYPE>0</EDOCTYPE>

         <PATH USERELATIVEPATHS = "true">symbian_ua.mcp</PATH>

         <FRAMELOC>

-            <X>571</X>

-            <Y>149</Y>

+            <X>0</X>

+            <Y>0</Y>

         </FRAMELOC>

         <FRAMESIZE>

             <W>347</W>

@@ -304,11 +304,37 @@
             <COLUMN>0</COLUMN>

             <DOCKBARID>59420</DOCKBARID>

             <PCTWIDTH>1.000000</PCTWIDTH>

-            <HGT>274</HGT>

+            <HGT>350</HGT>

             <GROUPID>

                 <GIDHIGHPART>4294967294</GIDHIGHPART>

                 <GIDLOWPART>4294967294</GIDLOWPART>

             </GROUPID>

         </DOCKINFO>

     </WINDOW>

+    <WINDOW>

+        <SESSION>-1</SESSION>

+        <EDOCTYPE>1</EDOCTYPE>

+        <PATH USERELATIVEPATHS = "true">..\pjsip-apps\src\symbian_ua\ua.cpp</PATH>

+        <MAXIMIZED>true</MAXIMIZED>

+        <FRAMELOC>

+            <X>4</X>

+            <Y>4</Y>

+        </FRAMELOC>

+        <FRAMESIZE>

+            <W>557</W>

+            <H>627</H>

+        </FRAMESIZE>

+        <DOCKINFO>

+            <STATUS>0</STATUS>

+            <ROW></ROW>

+            <COLUMN></COLUMN>

+            <DOCKBARID></DOCKBARID>

+            <PCTWIDTH></PCTWIDTH>

+            <HGT></HGT>

+            <GROUPID>

+                <GIDHIGHPART></GIDHIGHPART>

+                <GIDLOWPART></GIDLOWPART>

+            </GROUPID>

+        </DOCKINFO>

+    </WINDOW>

 </MWIDEWORKSPACE>

diff --git a/build.symbian/symbian_audio.mmp b/build.symbian/symbian_audio.mmp
new file mode 100644
index 00000000..5a86c308
--- /dev/null
+++ b/build.symbian/symbian_audio.mmp
@@ -0,0 +1,42 @@
+#if defined(EKA2)
+
+TARGET		symbian_audio.dll
+TARGETTYPE	dll
+UID		0x1000008d 0xA0004288
+
+CAPABILITY	None
+LIBRARY		pjlib.lib charconv.lib euser.lib estlib.lib
+LIBRARY 	mediaclientaudiostream.lib
+LIBRARY 	mediaclientaudioinputstream.lib
+
+MACRO		PJ_DLL
+MACRO		PJ_EXPORTING
+
+DEFFILE		.\symbian_audio.def
+
+#else
+
+TARGET 		symbian_audio.lib
+TARGETTYPE 	lib
+UID		0x100039CE 0x10004288
+VENDORID	0x70000001
+
+#endif
+
+SOURCEPATH	..\pjmedia\src\pjmedia
+
+OPTION		CW -lang c++
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+SOURCE		symbian_sound.cpp
+
+SYSTEMINCLUDE	..\pjlib\include
+SYSTEMINCLUDE	..\pjmedia\include
+
+SYSTEMINCLUDE	\epoc32\include
+SYSTEMINCLUDE	\epoc32\include\libc
+
+SYSTEMINCLUDE	\epoc32\include\mmf\plugin 
+
diff --git a/build.symbian/symbian_audioU.def b/build.symbian/symbian_audioU.def
new file mode 100644
index 00000000..880a5350
--- /dev/null
+++ b/build.symbian/symbian_audioU.def
@@ -0,0 +1,11 @@
+EXPORTS
+	pjmedia_snd_deinit                       @ 1 NONAME
+	pjmedia_snd_get_dev_count                @ 2 NONAME
+	pjmedia_snd_get_dev_info                 @ 3 NONAME
+	pjmedia_snd_init                         @ 4 NONAME
+	pjmedia_snd_open                         @ 5 NONAME
+	pjmedia_snd_open_player                  @ 6 NONAME
+	pjmedia_snd_open_rec                     @ 7 NONAME
+	pjmedia_snd_stream_close                 @ 8 NONAME
+	pjmedia_snd_stream_start                 @ 9 NONAME
+	pjmedia_snd_stream_stop                  @ 10 NONAME
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index ee243f23..4a92f530 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -1,6 +1,6 @@
 TARGET 		symbian_ua.exe

 TARGETTYPE 	exe

-UID		0x100039CE 0x10004299

+UID		0x100039CE 0x10004289

 VENDORID	0x70000001

 

 SOURCEPATH	..\pjsip-apps\src\symbian_ua

diff --git a/pjlib/src/pj/addr_resolv_symbian.cpp b/pjlib/src/pj/addr_resolv_symbian.cpp
index ea3c7660..7bdc4a6f 100644
--- a/pjlib/src/pj/addr_resolv_symbian.cpp
+++ b/pjlib/src/pj/addr_resolv_symbian.cpp
@@ -127,8 +127,9 @@ PJ_DEF(pj_status_t) pj_gethostip(pj_in_addr *addr)
 
 	len = sizeof(a);
 	status = pj_sock_getsockname(fd, &a, &len);
-	if (status != PJ_SUCCESS) {
+	if (status != PJ_SUCCESS || a.sin_addr.s_addr==0) {
 	    pj_sock_close(fd);
+	    /* May return 127.0.0.1 */
 	    return status;
 	}
 
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index c338159f..a586b4dd 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -211,7 +211,7 @@ static void default_config(struct app_config *cfg)
     unsigned i;
 
     pjsua_config_default(&cfg->cfg);
-    pj_ansi_sprintf(tmp, "PJSUA v%s/%s", PJ_VERSION, PJ_OS_NAME);
+    pj_ansi_sprintf(tmp, "PJSUA v%s/%s", pj_get_version(), PJ_OS_NAME);
     pj_strdup2_with_null(app_config.pool, &cfg->cfg.user_agent, tmp);
 
     pjsua_logging_config_default(&cfg->log_cfg);
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 90e8380c..fa55da60 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -527,7 +527,7 @@ PJ_DEF(pj_status_t) pjsua_create(void)
     pjsua_var.cap_dev = pjsua_var.play_dev = -1;
 
     /* Init caching pool. */
-    pj_caching_pool_init(&pjsua_var.cp, &pj_pool_factory_default_policy, 0);
+    pj_caching_pool_init(&pjsua_var.cp, NULL, 0);
 
     /* Create memory pool for application. */
     pjsua_var.pool = pjsua_pool_create("pjsua", 4000, 4000);
@@ -749,7 +749,7 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg,
     /* Done! */
 
     PJ_LOG(3,(THIS_FILE, "pjsua version %s for %s initialized", 
-			 PJ_VERSION, PJ_OS_NAME));
+			 pj_get_version(), PJ_OS_NAME));
 
     return PJ_SUCCESS;