From e11af615454e9aadeca3195a8f2c2e8123dabd4d Mon Sep 17 00:00:00 2001
From: jehan <jehan@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Fri, 26 Sep 2008 15:11:58 +0000
Subject: [PATCH] add c interface

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@53 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 p2pproxy/launcher/src/p2pproxy.c              | 37 ++++++++++---------
 .../linphone/p2pproxy/core/P2pProxyMain.java  |  4 ++
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/p2pproxy/launcher/src/p2pproxy.c b/p2pproxy/launcher/src/p2pproxy.c
index 1d0c3b4fa..eacba8d21 100644
--- a/p2pproxy/launcher/src/p2pproxy.c
+++ b/p2pproxy/launcher/src/p2pproxy.c
@@ -17,7 +17,7 @@ JavaVM* p2pproxy_application_jvm = 0;
 int p2pproxy_application_start(int argc, char **argv) {
 
 	JavaVMInitArgs args;
-	JavaVMOption options[8];
+	JavaVMOption options[7];
 	jint res=-1;
 	jclass lP2pProxyMainClass;
 	jmethodID mainMethod;
@@ -30,21 +30,21 @@ int p2pproxy_application_start(int argc, char **argv) {
 		return P2PPROXY_ERROR_APPLICATION_ALREADY_STARTED;
 	}
 	args.version = JNI_VERSION_1_4;
-	args.nOptions = 8;
-	options[0].optionString = "-verbose:jni";
-	options[1].optionString = "-Djava.class.path="P2PPROXY_BUILDDIR"/p2pproxy.jar:"\
+	args.nOptions = 7;
+	/*options[0].optionString = "-verbose:jni";*/
+	options[0].optionString = "-Djava.class.path="P2PPROXY_BUILDDIR"/p2pproxy.jar:"\
 								P2PPROXY_INSTALLDIR"/p2pproxy.jar:"\
 								P2PPROXY_BUILDDIR"/log4j.jar:"\
 								P2PPROXY_INSTALLDIR"/log4j.jar";
 
 
 
-	options[2].optionString = "-Dcom.sun.management.jmxremote";
-	options[3].optionString = "-Dcom.sun.management.jmxremote.port="P2PPROXY_JMX_PORT;
-	options[4].optionString = "-Dcom.sun.management.jmxremote.authenticate=false";
-	options[5].optionString = "-Dcom.sun.management.jmxremote.ssl=false";
-	options[6].optionString = "-Dorg.linphone.p2pproxy.install.dir="P2PPROXY_INSTALLDIR;
-	options[7].optionString = "-Dorg.linphone.p2pproxy.build.dir="P2PPROXY_BUILDDIR;
+	options[1].optionString = "-Dcom.sun.management.jmxremote";
+	options[2].optionString = "-Dcom.sun.management.jmxremote.port="P2PPROXY_JMX_PORT;
+	options[3].optionString = "-Dcom.sun.management.jmxremote.authenticate=false";
+	options[4].optionString = "-Dcom.sun.management.jmxremote.ssl=false";
+	options[5].optionString = "-Dorg.linphone.p2pproxy.install.dir="P2PPROXY_INSTALLDIR;
+	options[6].optionString = "-Dorg.linphone.p2pproxy.build.dir="P2PPROXY_BUILDDIR;
 
 
 	args.options = options;
@@ -72,7 +72,6 @@ int p2pproxy_application_start(int argc, char **argv) {
 
 	}
 
-
 	(*p2pproxy_application_jnienv)->CallStaticVoidMethod(p2pproxy_application_jnienv, lP2pProxyMainClass, mainMethod, applicationArgsList);
 
 	return P2PPROXY_NO_ERROR;
@@ -96,14 +95,16 @@ int p2pproxy_accountmgt_deleteAccount(const char* user_name) {
 	return P2PPROXY_ERROR;
 }
 
-
-
-JNIEnv* create_vm() {
-
-}
-
-void invoke_class(JNIEnv* env) {
+jobject p2pproxy_get_accountmgt() {
+	jclass lP2pProxyMainClass;
+	jmethodID getAccountMgtMethod;
+	
+	lP2pProxyMainClass = (*p2pproxy_application_jnienv)->FindClass(p2pproxy_application_jnienv, "org/linphone/p2pproxy/core/P2pProxyMain");
+	getAccountMgtMethod = (*p2pproxy_application_jnienv)->GetStaticMethodID(p2pproxy_application_jnienv, lP2pProxyMainClass, "getAccountManager", "(V)Lorg/linphone/p2pproxy/core/P2pProxyAccountManagementMBean");
+	
 	
 }
 
 
+
+
diff --git a/p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java b/p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java
index c9199adeb..6f404893d 100644
--- a/p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java
+++ b/p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java
@@ -56,6 +56,7 @@ public class P2pProxyMain  implements P2pProxyMainMBean {
    private static Configurator mConfigurator;
    private static String mConfigHomeDir;
    
+   
    static {
 //      System.setProperty("com.sun.management.jmxremote", "true");
 //      System.setProperty("com.sun.management.jmxremote.port", "6789");
@@ -365,4 +366,7 @@ public  static void staticLoadTraceConfigFile()  throws P2pProxyException {
       throw new P2pProxyException("enable to load traces",e);
    }
 }
+public static P2pProxyAccountManagementMBean getAccountManager() {
+   return mP2pProxyAccountManagement;
+}
 }
\ No newline at end of file