Merge branch 'master' of git://git.linphone.org/linphone

[linphone] / coreapi / sal_eXosip2.c

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index e577b6422ad43b4de8802e232456eae23eb7c477..284773c9d503264010ea14f8e9cedbaaa9dea505 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -1464,6 +1464,7 @@ static bool_t call_failure(Sal *sal, eXosip_event_t *ev){
                case 480:\r
                        error=SalErrorFailure;\r
                        sr=SalReasonTemporarilyUnavailable;\r
+               break;\r
                case 486:\r
                        error=SalErrorFailure;\r
                        sr=SalReasonBusy;\r
@@ -1653,7 +1654,7 @@ static void process_notify(Sal *sal, eXosip_event_t *ev){
                //osip_content_type_t *ct=NULL;\r
                osip_message_get_body(ev->request,0,&body);\r
                //ct=osip_message_get_content_type(ev->request);\r
-               if (h->hvalue && strcasecmp(h->hvalue,"refer")==0){\r
+               if (h->hvalue && strncasecmp(h->hvalue,"refer",strlen("refer"))==0){\r
                        /*special handling of refer events*/\r
                        if (body && body->body){\r
                                osip_message_t *msg;\r
@@ -2400,6 +2401,7 @@ int sal_register_refresh(SalOp *op, int expires){
                * the exosip lock in a non blocking way, and give up if it takes too long*/\r
                while (eXosip_trylock()!=0){\r
                        ms_usleep(100000);\r
+                       tries++;\r
                        if (tries>30) {/*after 3 seconds, give up*/\r
                                ms_warning("Could not obtain exosip lock in a reasonable time, giving up.");\r
                                return -1;\r