Changeset 546:d276b88db68b in verona

Timestamp:

Mar 18, 2013 3:10:50 PM (2 months ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Tags:

tip

rebase_source:

36ae1b90934c62cf275ed2c3f863830842de5b06

Message:

some minor bufixes in phtests

Files:

• phtest/phmxtestsrunner.cpp (modified) (3 diffs)
• phtest/phtests_core.cpp (modified) (1 diff)
• swig/java/CMakeLists.txt (modified) (1 diff)
• swig/verona.i (modified) (1 diff)

phtest/phmxtestsrunner.cpp

@@ -41 +41 @@
 
 #define DUMMY_PATH_LEN 128
-using namespace std;
+
+void prepare_phapi();
+void clean_phapi();
 
 int main(int argc,  char *argv[])
@@ -88 +90 @@
               }
 
-              strcat(buf,"/dummycslrc");
+              strcat(buf,"/dummyisl.ini.");
               // child : update conf.myid and conf.otheruri with child_no
               val = atoi(conf.otheruri) + child_no;
@@ -101 +103 @@
               sprintf(conf.myid, "%d", val);
               strcat(buf,conf.myid);
+
               setenv("DUMMYCSLRC", buf, 1);
               printf("SIPPORT %s SERVER %s DUMMYCSLRC for %s is %s, other uri is %s\n",conf.sipport, conf.server, conf.myid, buf, conf.otheruri);
-              if(strcmp(conf.audiodev_out, "default") && !strstr(conf.audiodev_out, "dev/null")){
+              if(strcmp(conf.audiodev_out, "default") && !strstr(conf.audiodev_out, "/dev/null")){
                 strcat(conf.audiodev_out, conf.myid);
                 printf("audiodev_out is %s\n", conf.audiodev_out);
               }
+              prepare_phapi();
               sleep(child_no%10);
               (*loops[0]).loop(&conf);
+              clean_phapi();
               exit(0);
             }else{

phtest/phtests_core.cpp

@@ -159 +159 @@
                         printf("INCALL line=%d cid=%d to=%s from=%s streams=%x callinfo=%s\n", info->vlid, cid,
                                         info->localUri, info->remoteUri, info->streams, nz(info->callinfo));
+#ifdef HAVE_CSL
                         this->ringingCall(cid);
-                        //this->acceptCall(cid, 0, PH_STREAM_AUDIO);
+#else
+                        this->acceptCall(cid, 0, PH_STREAM_AUDIO);
+#endif
                         break;
 

swig/java/CMakeLists.txt

@@ -4 +4 @@
 
 if (ANDROID)
-        set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-package" "com.mbdsys.qutecom.service.swig.phapi"
+        set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-package"
+                "com.discretio.android.service.swig.phapi"
                 "-I${CMAKE_CURRENT_SOURCE_DIR}/")
         SWIG_ADD_MODULE(jni_verona java verona.i ../../phcpp/phapipp.cpp)

swig/verona.i

@@ -79 +79 @@
         ms_set_jvm(ajvm);
         osip_set_jvm(ajvm);
+        putenv("SSLISLRC=/data/data/com.discretio.android/files/sslisl.ini");
         return JNI_VERSION_1_6;
 }