Changeset 262:ff54883c1657 in mediastreamer2 for linphone/coreapi/proxy.c

Timestamp:

Feb 18, 2009 9:22:45 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

wip for buddy lookup.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@265 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/coreapi/proxy.c (modified) (3 diffs)

linphone/coreapi/proxy.c

@@ -540 +540 @@
                 return NULL;
         }
-        identity=lp_config_get_string(config,key,"reg_identity",NULL);
-        tmp=lp_config_get_string(config,key,"type",NULL);
+
+        cfg=linphone_proxy_config_new();
+
+        identity=lp_config_get_string(config,key,"reg_identity",NULL);  
         proxy=lp_config_get_string(config,key,"reg_proxy",NULL);
-        if (tmp!=NULL && strlen(tmp)>0){
-                cfg=linphone_proxy_config_new_from_setup(tmp,identity);
-                if (cfg==NULL) return NULL;
-        }else{
-                if (!identity || !proxy) return NULL;
-                cfg=linphone_proxy_config_new();
-                linphone_proxy_config_set_identity(cfg,identity);
-                linphone_proxy_config_set_server_addr(cfg,proxy);
-                
-        }
+        
+        linphone_proxy_config_set_identity(cfg,identity);
+        linphone_proxy_config_set_server_addr(cfg,proxy);
         
         tmp=lp_config_get_string(config,key,"reg_route",NULL);
@@ -562 +557 @@
         linphone_proxy_config_enable_publish(cfg,lp_config_get_int(config,key,"publish",0));
         
+        tmp=lp_config_get_string(config,key,"type",NULL);
+        if (tmp!=NULL && strlen(tmp)>0) 
+                linphone_proxy_config_set_setup_object(cfg,tmp);
+
         return cfg;
 }
 
-LinphoneProxyConfig *linphone_proxy_config_new_from_setup(const char *type, const char *identity){
+void linphone_proxy_config_set_setup_object(LinphoneProxyConfig *cfg, const char *type){
         SipSetup *ss=sip_setup_lookup(type);
-        LinphoneProxyConfig *cfg;
         SipSetupContext *ssc;
-        if (!ss) return NULL;
-        cfg=linphone_proxy_config_new();
-        linphone_proxy_config_set_identity(cfg,identity);
+        if (!ss) return ;
         ssc=sip_setup_context_new(ss);
-        if (sip_setup_context_login_account(ssc,identity,NULL)==0){
+        if (sip_setup_context_login_account(ssc,cfg->reg_identity,NULL)==0){
                 char proxy[256];
                 if (sip_setup_context_get_proxy(ssc,NULL,proxy,sizeof(proxy))==0){
@@ -580 +576 @@
         }
         cfg->ssctx=ssc;
-        return cfg;
-}
-
-
+}
+
+