Increment tries in loop that have a maximum number of tries.

[linphone] / coreapi / sal_eXosip2.c

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 1bbbe36e6ed3e67307eb248395ecb8d42555fe61..222e7c329a0df37786bfecc793fe04bd9ae3be72 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -1771,6 +1771,26 @@ static bool_t comes_from_local_if(osip_message_t *msg){
 static const char *days[]={"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};\r
 static const char *months[]={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};\r
 \r
+static int utc_offset() {\r
+       time_t ref = 24 * 60 * 60L;\r
+       struct tm * timeptr;\r
+       int gmtime_hours;\r
+\r
+       /* get the local reference time for Jan 2, 1900 00:00 UTC */\r
+       timeptr = localtime(&ref);\r
+       gmtime_hours = timeptr->tm_hour;\r
+\r
+       /* if the local time is the "day before" the UTC, subtract 24 hours\r
+       from the hours to get the UTC offset */\r
+       if (timeptr->tm_mday < 2) gmtime_hours -= 24;\r
+\r
+       return gmtime_hours;\r
+}\r
+\r
+time_t mktime_utc(struct tm *timeptr) {\r
+       return mktime(timeptr) + utc_offset() * 3600;\r
+}\r
+\r
 static void text_received(Sal *sal, eXosip_event_t *ev){\r
        osip_body_t *body=NULL;\r
        char *from=NULL,*msg=NULL;\r
@@ -1842,7 +1862,7 @@ static void text_received(Sal *sal, eXosip_event_t *ev){
        salmsg.text=msg;\r
        salmsg.url=external_body_size>0 ? unquoted_external_body_url : NULL;\r
        salmsg.message_id=message_id;\r
-       salmsg.time=date!=NULL ? mktime(&ret) : time(NULL);\r
+       salmsg.time=date!=NULL ? mktime_utc(&ret) : time(NULL);\r
        sal->callbacks.text_received(op,&salmsg);\r
        sal_op_release(op);\r
        osip_free(from);\r
@@ -2297,7 +2317,7 @@ static void register_set_contact(osip_message_t *msg, const char *contact){
        osip_uri_uparam_add(ct->url,osip_strdup("line"),line);\r
 }\r
 \r
-static void sal_register_add_route(osip_message_t *msg, const char *proxy){\r
+void sal_message_add_route(osip_message_t *msg, const char *proxy){\r
        osip_route_t *route;\r
 \r
        osip_list_special_free(&msg->routes,(void (*)(void*))osip_route_free);\r
@@ -2344,7 +2364,7 @@ int sal_register(SalOp *h, const char *proxy, const char *from, int expires){
                h->rid=eXosip_register_build_initial_register(from,domain,NULL,expires,&msg);\r
                if (msg){\r
                        if (contact) register_set_contact(msg,contact);\r
-                       sal_register_add_route(msg,proxy);\r
+                       sal_message_add_route(msg,proxy);\r
                        sal_add_register(h->base.root,h);\r
                }else{\r
                        ms_error("Could not build initial register.");\r
@@ -2354,7 +2374,7 @@ int sal_register(SalOp *h, const char *proxy, const char *from, int expires){
        }else{\r
                eXosip_lock();\r
                eXosip_register_build_register(h->rid,expires,&msg);\r
-               sal_register_add_route(msg,proxy);\r
+               sal_message_add_route(msg,proxy);\r
        }\r
        if (msg){\r
                eXosip_register_send_register(h->rid,msg);\r
@@ -2380,6 +2400,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
@@ -2392,7 +2413,7 @@ int sal_register_refresh(SalOp *op, int expires){
        eXosip_register_build_register(op->rid,expires,&msg);\r
        if (msg!=NULL){\r
                if (contact) register_set_contact(msg,contact);\r
-               sal_register_add_route(msg,sal_op_get_route(op));\r
+               sal_message_add_route(msg,sal_op_get_route(op));\r
                eXosip_register_send_register(op->rid,msg);\r
        }else ms_error("Could not build REGISTER refresh message.");\r
        eXosip_unlock();\r