Changeset 364:e1b6bfaba51c in verona

Timestamp:

Nov 8, 2011 3:40:01 PM (19 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

Implement correct hanling of Expires parameter value in Contact header of REGISTER replies

File:

• phapi/phapi.c (modified) (2 diffs)

phapi/phapi.c

@@ -121 +121 @@
 
 
+static char *ph_get_call_(phcall_t *ca);
+static void set_customized_header(osip_message_t *req, const char *h, const char *v);
 static char *ph_get_call_contact(phcall_t *ca);
-static void set_customized_header(osip_message_t *req, const char *h, const char *v);
 
 #define MEDIA_SUSPEND
@@ -6141 +6142 @@
 static int ph_find_expires_for_vl(int vlid, osip_message_t *msg)
 {
-        //TODO: we must every Contact header field and extracting the value of "expires" param,
-        //currently let's return 0 so phapi will keep the vline regTimeout
-        return 0;
+        osip_contact_t*  mctct;
+        osip_contact_t*  lctct;
+        struct vline *vl;
+        int ret = 0;
+        int pos = 0;
+
+        osip_contact_init(&lctct);
+        osip_contact_parse(lctct, vl->contact);
+
+        vl = vl = ph_valid_vlid(vlid);
+        if (!vl)
+                return 0;
+
+        while(!osip_message_get_contact(msg, pos++, &mctct)) {
+                osip_uri_param_t *param;
+
+                ret = ph_same_str(lctct->url->username, mctct->url->username) &&
+                                ph_same_str(lctct->url->host, mctct->url->host) &&
+                                ph_same_str(lctct->url->port, mctct->url->port);
+                if (!ret)
+                        continue;
+
+                ret = 0;
+                if (!osip_contact_param_get_byname(mctct, "Expires", &param)) {
+                        ret = atoi(param->gvalue);
+                }
+                break;
+        }
+        osip_contact_free(lctct);
+        return ret;
 }