From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 30 Aug 2012 14:27:16 +0000 (+0200)
Subject: add function LinphoneProxyConfig * linphone_core_create_proxy_config(LinphoneCore... 
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=4e847d24ca5c3a5012cb62beee4248667428b24c

add function LinphoneProxyConfig * linphone_core_create_proxy_config(LinphoneCore *lc) to create proxy config with default values from section [default_values]
---

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 4895ccb9..2972bc09 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -956,6 +956,14 @@ const char *linphone_core_get_payload_type_description(LinphoneCore *lc, Payload
 
 bool_t linphone_core_check_payload_type_usability(LinphoneCore *lc, PayloadType *pt);
 
+/**
+ * @ingroup proxy 
+ *Create a proxy config with default value from Linphone core.
+ *@param lc #LinphoneCore object
+ *@return #LinphoneProxyConfig with defualt value set 
+ */
+LinphoneProxyConfig * linphone_core_create_proxy_config(LinphoneCore *lc);
+	
 int linphone_core_add_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *config);
 
 void linphone_core_clear_proxy_config(LinphoneCore *lc);
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 8e066ea3..11a55f59 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -42,10 +42,17 @@ void linphone_proxy_config_write_all_to_config_file(LinphoneCore *lc){
 	lp_config_set_int(lc->config,"sip","default_proxy",linphone_core_get_default_proxy(lc,NULL));
 }
 
-void linphone_proxy_config_init(LinphoneProxyConfig *obj){
+#define DEFAULT_INT(config,name,default) \
+		config?lp_config_get_int(config,"default_values",#name,default):default
+#define DEFAULT_STRING(config,name,default) \
+	config?lp_config_get_string(config,"default_values",#name,default):default
+
+static void linphone_proxy_config_init(LinphoneCore* lc,LinphoneProxyConfig *obj){
 	memset(obj,0,sizeof(LinphoneProxyConfig));
 	obj->magic=linphone_proxy_config_magic;
-	obj->expires=3600;
+	obj->expires=DEFAULT_INT((lc?lc->config:NULL),reg_expires,3600);
+	obj->dial_prefix=ms_strdup(DEFAULT_STRING((lc?lc->config:NULL),dial_prefix,'\0'));
+	obj->dial_escape_plus=DEFAULT_INT((lc?lc->config:NULL),dial_escape_plus,0);
 }
 
 /**
@@ -54,15 +61,21 @@ void linphone_proxy_config_init(LinphoneProxyConfig *obj){
 **/
 
 /**
- * Creates an empty proxy config.
+ * @deprecated, use #linphone_core_create_proxy_config instead
+ *Creates an empty proxy config.
 **/
-LinphoneProxyConfig *linphone_proxy_config_new(){
+LinphoneProxyConfig *linphone_proxy_config_new() {
+	return linphone_core_create_proxy_config(NULL);
+}
+LinphoneProxyConfig * linphone_core_create_proxy_config(LinphoneCore *lc) {
 	LinphoneProxyConfig *obj=NULL;
 	obj=ms_new(LinphoneProxyConfig,1);
-	linphone_proxy_config_init(obj);
+	linphone_proxy_config_init(lc,obj);
 	return obj;
 }
 
+
+
 /**
  * Destroys a proxy config.
  * 
@@ -701,13 +714,13 @@ LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LpConfig *config
 	tmp=lp_config_get_string(config,key,"reg_route",NULL);
 	if (tmp!=NULL) linphone_proxy_config_set_route(cfg,tmp);
 
-	linphone_proxy_config_expires(cfg,lp_config_get_int(config,key,"reg_expires",600));
+	linphone_proxy_config_expires(cfg,lp_config_get_int(config,key,"reg_expires",DEFAULT_INT(config,reg_expires,600)));
 	linphone_proxy_config_enableregister(cfg,lp_config_get_int(config,key,"reg_sendregister",0));
 	
 	linphone_proxy_config_enable_publish(cfg,lp_config_get_int(config,key,"publish",0));
 
-	linphone_proxy_config_set_dial_escape_plus(cfg,lp_config_get_int(config,key,"dial_escape_plus",0));
-	linphone_proxy_config_set_dial_prefix(cfg,lp_config_get_string(config,key,"dial_prefix",NULL));
+	linphone_proxy_config_set_dial_escape_plus(cfg,lp_config_get_int(config,key,"dial_escape_plus",DEFAULT_INT(config,dial_escape_plus,0)));
+	linphone_proxy_config_set_dial_prefix(cfg,lp_config_get_string(config,key,"dial_prefix",DEFAULT_STRING(config,dial_prefix,NULL)));
 	
 	tmp=lp_config_get_string(config,key,"type",NULL);
 	if (tmp!=NULL && strlen(tmp)>0)