Changeset 295:7c2d63cfbe15 in mediastreamer2

Timestamp:

Mar 5, 2009 2:14:39 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix bug when adding contacts
sipsetup plugins work in progress.

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

Location:

linphone/coreapi

Files:

• friend.c (modified) (1 diff)
• linphonecore.h (modified) (1 diff)
• proxy.c (modified) (2 diffs)
• sipsetup.c (modified) (1 diff)
• sipsetup.h (modified) (3 diffs)

linphone/coreapi/friend.c

@@ -654 +654 @@
         ms_return_if_fail(lf->lc==NULL);
         ms_return_if_fail(lf->url!=NULL);
+        lc->friends=ms_list_append(lc->friends,lf);
         linphone_friend_apply(lf,lc);
-        lc->friends=ms_list_append(lc->friends,lf);
         return ;
 }

linphone/coreapi/linphonecore.h

@@ -318 +318 @@
 #define linphone_proxy_config_get_expires(obj)  ((obj)->expires)
 #define linphone_proxy_config_register_enabled(obj) ((obj)->reg_sendregister)
-
+#define linphone_proxy_config_get_core(obj) ((obj)->lc)
 /* destruction is called automatically when removing the proxy config */
 void linphone_proxy_config_destroy(LinphoneProxyConfig *cfg);

linphone/coreapi/proxy.c

@@ -93 +93 @@
         eXosip_register_send_register(obj->rid,msg);
         eXosip_unlock();
-        ms_message("Resending new register with updated contact %s:%i",received,rport);
+        ms_message("Resending new register with updated contact %s:%s",received,rport);
 }
 
@@ -568 +568 @@
         SipSetupContext *ssc;
         if (!ss) return ;
-        ssc=sip_setup_context_new(ss);
+        ssc=sip_setup_context_new(ss,cfg);
         if (sip_setup_context_login_account(ssc,cfg->reg_identity,NULL)==0){
                 char proxy[256];

linphone/coreapi/sipsetup.c

@@ -85 +85 @@
 }
 
+LinphoneProxyConfig *sip_setup_context_get_proxy_config(const SipSetupContext *ctx){
+        return ctx->cfg;
+}
 
-SipSetupContext *sip_setup_context_new(SipSetup *s){
+SipSetupContext *sip_setup_context_new(SipSetup *s, struct _LinphoneProxyConfig *cfg){
         SipSetupContext *obj=(SipSetupContext*)ms_new0(SipSetupContext,1);
         obj->funcs=s;
         obj->data=NULL;
+        obj->cfg=cfg;
         if (obj->funcs->init_instance){
                 obj->funcs->init_instance(obj);

linphone/coreapi/sipsetup.h

@@ -31 +31 @@
 struct _SipSetupContext{
         struct _SipSetup *funcs;
+        struct _LinphoneProxyConfig *cfg;
         char domain[128];
         char username[128];
@@ -99 +100 @@
 
 int sip_setup_new_account(SipSetup *s, const char *uri, const char *passwd);
-SipSetupContext * sip_setup_context_new(SipSetup *s);
+SipSetupContext * sip_setup_context_new(SipSetup *s, struct _LinphoneProxyConfig *cfg);
 int sip_setup_context_get_capabilities(SipSetupContext *ctx);
 int sip_setup_context_login_account(SipSetupContext * ctx, const char *uri, const char *passwd);
@@ -111 +112 @@
 void sip_setup_context_free(SipSetupContext *ctx);
 
+/*internal methods*/
+struct _LinphoneProxyConfig *sip_setup_context_get_proxy_config(const SipSetupContext *ctx);
+
+
 #ifdef __cplusplus
 }
 #endif
 
+
 #endif