update ms2 and cleanup dead function

[linphone] / coreapi / friend.c

diff --git a/coreapi/friend.c b/coreapi/friend.c
index 451f8ad645c9fe3b2ad7b11bce4ee3a75148d4dc..c6dee2440a8d28019c003893123cc2dfde218b0a 100644 (file)
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -68,31 +68,11 @@ const char *linphone_online_status_to_string(LinphoneOnlineStatus ss){
        return str;
 }
 
-static int friend_data_compare(const void * a, const void * b, void * data){
+static int friend_compare(const void * a, const void * b){
        LinphoneAddress *fa=((LinphoneFriend*)a)->uri;
        LinphoneAddress *fb=((LinphoneFriend*)b)->uri;
-       const char *ua,*ub;
-       ua=linphone_address_get_username(fa);
-       ub=linphone_address_get_username(fb);
-       if (ua!=NULL && ub!=NULL) {
-               //printf("Comparing usernames %s,%s\n",ua,ub);
-               return strcasecmp(ua,ub);
-       }
-       else {
-               /* compare hosts*/
-               ua=linphone_address_get_domain(fa);
-               ub=linphone_address_get_domain(fb);
-               if (ua!=NULL && ub!=NULL){
-                       int ret=strcasecmp(ua,ub);
-                       //printf("Comparing hostnames %s,%s,res=%i\n",ua,ub,ret);
-                       return ret;
-               }
-               else return -1;
-       }
-}
-
-static int friend_compare(const void * a, const void * b){
-       return friend_data_compare(a,b,NULL);
+       if (linphone_address_weak_equal (fa,fb)) return 0;
+       return 1;
 }
 
 
@@ -171,8 +151,13 @@ LinphoneFriend * linphone_friend_new(){
 }
 
 LinphoneFriend *linphone_friend_new_with_addr(const char *addr){
+       LinphoneAddress* linphone_address = linphone_address_new(addr);
+       if (linphone_address == NULL) {
+               ms_error("Cannot create friend for address [%s]",addr?addr:"null");
+               return NULL;
+       }
        LinphoneFriend *fr=linphone_friend_new();
-       if (linphone_friend_set_sip_addr(fr,addr)<0){
+       if (linphone_friend_set_addr(fr,linphone_address)<0){
                linphone_friend_destroy(fr);
                return NULL;
        }
@@ -201,6 +186,7 @@ void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char
                        /*try adding domain part from default current proxy*/
                        LinphoneAddress * id=linphone_address_new(linphone_core_get_identity(lc));
                        if (id!=NULL){
+                               linphone_address_set_display_name(id,NULL);
                                linphone_address_set_username(id,uri);
                                *result=linphone_address_as_string(id);
                                linphone_address_destroy(id);
@@ -216,12 +202,8 @@ void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char
        linphone_address_destroy(fr);
 }
 
-int linphone_friend_set_sip_addr(LinphoneFriend *lf, const char *addr){
-       LinphoneAddress *fr=linphone_address_new(addr);
-       if (fr==NULL) {
-               ms_warning("Invalid friend sip uri: %s",addr);
-               return -1;
-       }
+int linphone_friend_set_addr(LinphoneFriend *lf, const LinphoneAddress *addr){
+       LinphoneAddress *fr=linphone_address_clone(addr);
        linphone_address_clean(fr);
        if (lf->uri!=NULL) linphone_address_destroy(lf->uri);   
        lf->uri=fr;
@@ -292,7 +274,9 @@ SalPresenceStatus linphone_online_status_to_sal(LinphoneOnlineStatus os){
 }
 
 void linphone_friend_notify(LinphoneFriend *lf, LinphoneOnlineStatus os){
-       //printf("Wish to notify %p, lf->nid=%i\n",lf,lf->nid);
+       char *addr=linphone_address_as_string(linphone_friend_get_address(lf));
+       ms_message("Want to notify %s, insub=%p",addr,lf->insub);
+       ms_free(addr);
        if (lf->insub!=NULL){
                sal_notify_presence(lf->insub,linphone_online_status_to_sal(os),NULL);
        }
@@ -301,8 +285,6 @@ void linphone_friend_notify(LinphoneFriend *lf, LinphoneOnlineStatus os){
 static void linphone_friend_unsubscribe(LinphoneFriend *lf){
        if (lf->outsub!=NULL) {
                sal_unsubscribe(lf->outsub);
-               sal_op_release(lf->outsub);
-               lf->outsub=NULL;
                lf->subscribe_active=FALSE;
        }
 }
@@ -311,13 +293,19 @@ void linphone_friend_close_subscriptions(LinphoneFriend *lf){
        linphone_friend_unsubscribe(lf);
        if (lf->insub){
                sal_notify_close(lf->insub);
-               sal_op_release(lf->insub);
-               lf->insub=NULL;
+               
        }
 }
 
 void linphone_friend_destroy(LinphoneFriend *lf){
-       
+       if (lf->insub) {
+               sal_op_release(lf->insub);
+               lf->insub=NULL;
+       }
+       if (lf->outsub){
+               sal_op_release(lf->outsub);
+               lf->outsub=NULL;
+       }
        if (lf->uri!=NULL) linphone_address_destroy(lf->uri);
        if (lf->info!=NULL) buddy_info_free(lf->info);
        ms_free(lf);
@@ -408,8 +396,8 @@ void linphone_core_add_friend(LinphoneCore *lc, LinphoneFriend *lf)
 void linphone_core_remove_friend(LinphoneCore *lc, LinphoneFriend* fl){
        MSList *el=ms_list_find(lc->friends,(void *)fl);
        if (el!=NULL){
-               lc->friends=ms_list_remove_link(lc->friends,el);
                linphone_friend_destroy((LinphoneFriend*)el->data);
+               lc->friends=ms_list_remove_link(lc->friends,el);
                linphone_core_write_friends_config(lc);
        }
 }
@@ -447,13 +435,19 @@ static bool_t username_match(const char *u1, const char *u2){
 LinphoneFriend *linphone_core_get_friend_by_address(const LinphoneCore *lc, const char *uri){
        LinphoneAddress *puri=linphone_address_new(uri);
        const MSList *elem;
-       const char *username=linphone_address_get_username(puri);
-       const char *domain=linphone_address_get_domain(puri);
+       const char *username;
+       const char *domain;
        LinphoneFriend *lf=NULL;
                
        if (puri==NULL){
                return NULL;
        }
+       username=linphone_address_get_username(puri);
+       domain=linphone_address_get_domain(puri);
+       if (domain==NULL) {
+               linphone_address_destroy(puri);
+               return NULL;
+       }
        for(elem=lc->friends;elem!=NULL;elem=ms_list_next(elem)){
                lf=(LinphoneFriend*)elem->data;
                const char *it_username=linphone_address_get_username(lf->uri);