enhance network monitoring (workaround this stupid avahi eth0 interface)

report call faillure because of no network at all.

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index c9266b7dec1d657e7f20976b703e001f6caaad44..2ada417af3db2b925ad9b8a825ab5b00eb28e69d 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1162,8 +1162,7 @@ void linphone_core_get_local_ip(LinphoneCore *lc, const char *dest, char *result
                strncpy(result,linphone_core_get_nat_address(lc),LINPHONE_IPADDR_SIZE);
                return;
        }
-       if (dest==NULL) dest="87.98.157.38"; /*a public IP address*/
-       if (linphone_core_get_local_ip_for(dest,result)==0)
+       if (linphone_core_get_local_ip_for(lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,dest,result)==0)
                return;
        /*else fallback to SAL routine that will attempt to find the most realistic interface */
        sal_get_default_local_ip(lc->sal,lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,result,LINPHONE_IPADDR_SIZE);
@@ -1515,14 +1514,15 @@ static void monitor_network_state(LinphoneCore *lc, time_t curtime){
 
        /* only do the network up checking every five seconds */
        if (last_check==0 || (curtime-last_check)>=5){
-               sal_get_default_local_ip(lc->sal,
-                   lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,
-                   result,LINPHONE_IPADDR_SIZE);
+               linphone_core_get_local_ip_for(lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,NULL,result);
                if (strcmp(result,"::1")!=0 && strcmp(result,"127.0.0.1")!=0){
                        new_status=TRUE;
                }else new_status=FALSE;
                last_check=curtime;
                if (new_status!=last_status) {
+                       if (new_status){
+                               ms_message("New local ip address is %s",result);
+                       }
                        set_network_reachable(lc,new_status);
                        last_status=new_status;
                }

diff --git a/coreapi/misc.c b/coreapi/misc.c
index c6e6735471c6bfc14ed77dbbd8beac026c241e52..41ca8d0bc31e6b4d9e91e1e17b63001b2166ccc3 100644 (file)
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -38,6 +38,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #undef snprintf
 #include <ortp/stun.h>
 
+#ifdef HAVE_GETIFADDRS
+#include <net/if.h>
+#include <ifaddrs.h>
+#endif
+
 
 #if !defined(WIN32)
 
@@ -646,7 +651,40 @@ int linphone_core_wake_up_possible_already_running_instance(
        return -1;
 }
 
-int linphone_core_get_local_ip_for(const char *dest, char *result){
+#ifdef HAVE_GETIFADDRS
+
+#include <ifaddrs.h>
+static int get_local_ip_with_getifaddrs(int type, char *address, int size)
+{
+       struct ifaddrs *ifp;
+       struct ifaddrs *ifpstart;
+       int ret = 0;
+
+       if (getifaddrs(&ifpstart) < 0) {
+               return -1;
+       }
+
+       for (ifp = ifpstart; ifp != NULL; ifp = ifp->ifa_next) {
+               if (ifp->ifa_addr && ifp->ifa_addr->sa_family == type
+                       && (ifp->ifa_flags & IFF_RUNNING) && !(ifp->ifa_flags & IFF_LOOPBACK))
+               {
+                       getnameinfo(ifp->ifa_addr,
+                                               (type == AF_INET6) ?
+                                               sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in),
+                                               address, size, NULL, 0, NI_NUMERICHOST);
+                       if (strchr(address, '%') == NULL) {     /*avoid ipv6 link-local addresses */
+                               /*ms_message("getifaddrs() found %s",address);*/
+                               ret++;
+                       }
+               }
+       }
+       freeifaddrs(ifpstart);
+       return ret;
+}
+#endif
+
+
+static int get_local_ip_for_with_connect(const char *dest, char *result){
        int err,tmp;
        struct addrinfo hints;
        struct addrinfo *res=NULL;
@@ -705,3 +743,27 @@ int linphone_core_get_local_ip_for(const char *dest, char *result){
        ms_message("Local interface to reach %s is %s.",dest,result);
        return 0;
 }
+
+int linphone_core_get_local_ip_for(int type, const char *dest, char *result){
+       if (dest==NULL) {
+               if (type==AF_INET)
+                       dest="87.98.157.38"; /*a public IP address*/
+               else dest="2a00:1450:8002::68";
+       }
+#ifdef HAVE_GETIFADDRS
+       {
+               int found_ifs;
+       
+               found_ifs=get_local_ip_with_getifaddrs(type,result,LINPHONE_IPADDR_SIZE);
+               if (found_ifs==1){
+                       return 0;
+               }else if (found_ifs<=0){
+                       /*absolutely no network on this machine */
+                       strcpy(result,type==AF_INET ? "127.0.0.1" : "::1");
+                       return -1;
+               }
+       }
+#endif
+       /*else use connect to find the best local ip address */
+       return get_local_ip_for_with_connect(dest,result);
+}

diff --git a/coreapi/private.h b/coreapi/private.h
index 18ed34c74b08ee95ffd670231fd73bb6d17c2a54..4a3c1dbaa3bd33ce0c818b14a5da5a4901f19b51 100644 (file)
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -164,7 +164,7 @@ LinphoneFriend * linphone_friend_new_from_config_file(struct _LinphoneCore *lc,
 void linphone_proxy_config_update(LinphoneProxyConfig *cfg);
 void linphone_proxy_config_get_contact(LinphoneProxyConfig *cfg, const char **ip, int *port);
 LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const LinphoneAddress *uri);
-int linphone_core_get_local_ip_for(const char *dest, char *result);
+int linphone_core_get_local_ip_for(int type, const char *dest, char *result);
 
 LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(struct _LpConfig *config, int index);
 void linphone_proxy_config_write_to_config_file(struct _LpConfig* config,LinphoneProxyConfig *obj, int index);

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index c85079fc126254d59ddd825f215c9011ea47625e..de227b317d426e5ab4726d47b41741e50bd63876 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "sal_eXosip2.h"
 
 #include "offeranswer.h"
-/*this function is not declared in some versions of eXosip*/
-extern void *eXosip_call_get_reference(int cid);
 
 static void text_received(Sal *sal, eXosip_event_t *ev);
 
@@ -44,6 +42,25 @@ void sal_get_default_local_ip(Sal *sal, int address_family,char *ip, size_t iple
        }
 }
 
+
+static SalOp * sal_find_call(Sal *sal, int cid){
+       const MSList *elem;
+       SalOp *op;
+       for(elem=sal->calls;elem!=NULL;elem=elem->next){
+               op=(SalOp*)elem->data;
+               if (op->cid==cid) return op;
+       }
+       return NULL;
+}
+
+static void sal_add_call(Sal *sal, SalOp *op){
+       sal->calls=ms_list_append(sal->calls,op);
+}
+
+static void sal_remove_call(Sal *sal, SalOp *op){
+       sal->calls=ms_list_remove(sal->calls, op);
+}
+
 static SalOp * sal_find_register(Sal *sal, int rid){
        const MSList *elem;
        SalOp *op;
@@ -164,7 +181,7 @@ void sal_op_release(SalOp *op){
        }
        if (op->cid!=-1){
                ms_message("Cleaning cid %i",op->cid);
-               eXosip_call_set_reference(op->cid,NULL);
+               sal_remove_call(op->base.root,op);
        }
        if (op->sid!=-1){
                sal_remove_out_subscribe(op->base.root,op);
@@ -492,7 +509,7 @@ int sal_call(SalOp *h, const char *from, const char *to){
                ms_error("Fail to send invite !");
                return -1;
        }else{
-               eXosip_call_set_reference(h->cid,h);
+               sal_add_call(h->base.root,h);
        }
        return 0;
 }
@@ -647,8 +664,8 @@ int sal_call_send_dtmf(SalOp *h, char dtmf){
 int sal_call_terminate(SalOp *h){
        eXosip_lock();
        eXosip_call_terminate(h->cid,h->did);
-       eXosip_call_set_reference(h->cid,NULL);
        eXosip_unlock();
+       sal_remove_call(h->base.root,h);
        return 0;
 }
 
@@ -689,11 +706,7 @@ static void set_network_origin(SalOp *op, osip_message_t *req){
 
 static SalOp *find_op(Sal *sal, eXosip_event_t *ev){
        if (ev->cid>0){
-#ifdef HAVE_EXOSIP_GET_REF
-               return (SalOp*)eXosip_call_get_ref(ev->cid);
-#else
-               return (SalOp*)eXosip_call_get_reference(ev->cid);
-#endif
+               return sal_find_call(sal,ev->cid);
        }
        if (ev->rid>0){
                return sal_find_register(sal,ev->rid);
@@ -743,7 +756,7 @@ static void inc_new_call(Sal *sal, eXosip_event_t *ev){
        op->cid=ev->cid;
        op->did=ev->did;
        
-       eXosip_call_set_reference(op->cid,op);
+       sal_add_call(op->base.root,op);
        sal->callbacks.call_received(op);
 }
 
@@ -906,7 +919,7 @@ static void call_terminated(Sal *sal, eXosip_event_t *ev){
                return;
        }
        osip_from_to_str(ev->request->from,&from);
-       eXosip_call_set_reference(ev->cid,NULL);
+       sal_remove_call(sal,op);
        op->cid=-1;
        sal->callbacks.call_terminated(op,from);
        osip_free(from);
@@ -915,6 +928,7 @@ static void call_terminated(Sal *sal, eXosip_event_t *ev){
 static void call_released(Sal *sal, eXosip_event_t *ev){
        SalOp *op=find_op(sal,ev);
        if (op==NULL){
+               ms_warning("No op associated to this call_released()");
                return;
        }
        op->cid=-1;
@@ -1453,6 +1467,10 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){
                        ms_message("CALL_REQUESTFAILURE or GLOBALFAILURE or SERVERFAILURE\n");
                        return call_failure(sal,ev);
                        break;
+               case EXOSIP_CALL_RELEASED:
+                       ms_message("CALL_RELEASED\n");
+                       call_released(sal, ev);
+                       break;
                case EXOSIP_CALL_INVITE:
                        ms_message("CALL_NEW\n");
                        inc_new_call(sal,ev);
@@ -1517,10 +1535,6 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){
                case EXOSIP_SUBSCRIPTION_GLOBALFAILURE:
                        sal_exosip_subscription_closed(sal,ev);
                        break;
-               case EXOSIP_CALL_RELEASED:
-                       ms_message("CALL_RELEASED\n");
-                       call_released(sal, ev);
-                       break;
                case EXOSIP_REGISTRATION_FAILURE:
                        ms_message("REGISTRATION_FAILURE\n");
                        return registration_failure(sal,ev);

diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h
index cc9b5b14b9b4aebf44bf7498a843e28668ab6466..97ed0142377d65870aae0f7489d742a30e81dbac 100644 (file)
--- a/coreapi/sal_eXosip2.h
+++ b/coreapi/sal_eXosip2.h
@@ -30,6 +30,7 @@ int sdp_to_media_description(sdp_message_t *sdp, SalMediaDescription *desc);
 
 struct Sal{
        SalCallbacks callbacks;
+       MSList *calls; /*MSList of SalOp */
        MSList *registers;/*MSList of SalOp */
        MSList *out_subscribes;/*MSList of SalOp */
        MSList *in_subscribes;/*MSList of SalOp */