From 7912d93ee6881c28ae35332118ed952ffa050f9e Mon Sep 17 00:00:00 2001 From: jehan Date: Fri, 10 Oct 2008 15:56:20 +0000 Subject: [PATCH] add native test ++ git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@78 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- p2pproxy/launcher/Debug/src/subdir.mk | 9 ++++++--- p2pproxy/launcher/src/launcher-tester.c | 7 ++++--- p2pproxy/launcher/src/p2pproxy.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/p2pproxy/launcher/Debug/src/subdir.mk b/p2pproxy/launcher/Debug/src/subdir.mk index 839cd1d90..6246aeb1d 100644 --- a/p2pproxy/launcher/Debug/src/subdir.mk +++ b/p2pproxy/launcher/Debug/src/subdir.mk @@ -5,15 +5,18 @@ # Add inputs and outputs from these tool invocations to the build variables C_SRCS += \ ../src/launcher-tester.c \ -../src/p2pproxy.c +../src/p2pproxy.c \ +../src/p2pproxy_wrap.c OBJS += \ ./src/launcher-tester.o \ -./src/p2pproxy.o +./src/p2pproxy.o \ +./src/p2pproxy_wrap.o C_DEPS += \ ./src/launcher-tester.d \ -./src/p2pproxy.d +./src/p2pproxy.d \ +./src/p2pproxy_wrap.d # Each subdirectory must supply rules for building sources it contributes diff --git a/p2pproxy/launcher/src/launcher-tester.c b/p2pproxy/launcher/src/launcher-tester.c index 35b159e4b..ae1733e6d 100644 --- a/p2pproxy/launcher/src/launcher-tester.c +++ b/p2pproxy/launcher/src/launcher-tester.c @@ -3,7 +3,8 @@ #include static void * thread_starter(void *args){ - p2pproxy_application_start( 0, 0); + char* largs[] = {"-seeding-server","-sip", "5058"}; + p2pproxy_application_start(3,largs); return NULL; } @@ -12,8 +13,8 @@ int main(int argc, char **argv) { pthread_t th; printf("starting p2pproxy tester"); pthread_create(&th,NULL,thread_starter,NULL); - p2pproxy_application_start( 0, 0); - sleep(10); + + sleep(1000); /*p2pproxy_application_stop();*/ pthread_join(th,NULL); return 0; diff --git a/p2pproxy/launcher/src/p2pproxy.c b/p2pproxy/launcher/src/p2pproxy.c index 1427af2f3..68aebb38b 100644 --- a/p2pproxy/launcher/src/p2pproxy.c +++ b/p2pproxy/launcher/src/p2pproxy.c @@ -71,7 +71,7 @@ int p2pproxy_application_start(int argc, char **argv) { applicationArgsList = (*p2pproxy_application_jnienv)->NewObjectArray(p2pproxy_application_jnienv, argc, (*p2pproxy_application_jnienv)->FindClass(p2pproxy_application_jnienv, "java/lang/String"), NULL); for (i=0;iNewStringUTF(p2pproxy_application_jnienv, *argv++); + applicationArg = (*p2pproxy_application_jnienv)->NewStringUTF(p2pproxy_application_jnienv, argv[i]); (*p2pproxy_application_jnienv)->SetObjectArrayElement(p2pproxy_application_jnienv, applicationArgsList, 0, applicationArg); }