Changeset 252:690efbd91dd4 in verona for phapi/phapi.c

Timestamp:

Jul 12, 2011 2:47:42 PM (23 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Children:

253:cbe0776765ad, 264:f55d03c29bb5

Message:

Add support for specifying explicit NAT router address
Fix handling of route for REGISTER requests
Implement support for adding user=phone to Contact header

File:

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

phapi/phapi.c

@@ -422 +422 @@
 
 ph_config_t phcfg = {
+                /* public ip addr */ "",
                 /* local ip addr */ "",
                 /* local audio rtp port */"10600",
@@ -430 +431 @@
                 /* local video rtcp port */ "11100",
                 /* sipport  */ "5060",
+                /* public sip port */ "",
                 /* sip transport */ IPPROTO_UDP,
                 /* nattype */  "" ,
@@ -2288 +2290 @@
 
 static void 
-add_contact_param(struct vline *vl,  const char *param, const char *value)
+add_contact_param(struct vline *vl,  const char *param, const char *value, int inside)
 {
         osip_contact_t *ctct;
@@ -2299 +2301 @@
 
         osip_contact_parse(ctct, vl->contact);
-        osip_contact_param_add(ctct, osip_strdup(param), osip_strdup(value));
+        if (inside)
+                osip_uri_param_add(&ctct->url->url_params, osip_strdup(param), osip_strdup(value));
+        else
+                osip_contact_param_add(ctct, osip_strdup(param), osip_strdup(value));
 
         osip_free(vl->contact);
@@ -2951 +2956 @@
         assert(vl->server!=NULL);
 
-        snprintf(utmp, sizeof(utmp), "sip:%s@%s", vl->username, vl->server);
+        if (vl->displayname)
+                snprintf(utmp, sizeof(utmp), "\"%s\" <sip:%s@%s>", vl->displayname, vl->username, vl->server);
+        else
+                snprintf(utmp, sizeof(utmp), "sip:%s@%s", vl->username, vl->server);
 
         server = stmp;
@@ -2972 +2980 @@
                         vl->rid = -2;
         }  else {
+#if 1
+                vl->rid = eXosip_register_build_initial_register(utmp, server, vl->contact, vl->regTimeout, &msg);
+                if (vl->proxy)
+                        osip_message_set_route(msg, vl->proxy);
+        }
+#else
                 if (vl->proxy && vl->proxy[0] == '<') {
                         int size = strlen(vl->proxy);
@@ -2985 +2999 @@
                         else
                                 vl->rid = eXosip_register_build_initial_register(utmp, server, vl->contact, vl->regTimeout, &msg);
-                }
-        }
+
+                }
+        }
+#endif
 
         if (vl->rid >= 0)
@@ -3310 +3326 @@
 
         if (mobility == PH_LINE_MOBILITY_FIXED)
-                add_contact_param(vl, "mobility", "fixed");
+                add_contact_param(vl, "mobility", "fixed", FALSE);
         else if (mobility == PH_LINE_MOBILITY_MOBILE)
-                add_contact_param(vl, "mobility", "mobile");
+                add_contact_param(vl, "mobility", "mobile", FALSE);
+        else if (mobility == PH_LINE_MOBILITY_PHONE)
+                add_contact_param(vl, "user", "phone", TRUE);
+
 
         vl->mobility = mobility;
@@ -3971 +3990 @@
         ph_nat_type_str[0] = 0;
 
+        if (phcfg.public_ip_addr[0])
+                return;
+
         if (!phcfg.use_tunnel && phcfg.nattype[0])
         {
@@ -4309 +4331 @@
                 return -1;
 
+        if (phcfg.public_ip_addr[0])
+        {
+                int port = atoi(phcfg.public_sipport);
+                eXosip_masquerade_contact(phcfg.public_ip_addr, port ? port : atoi(phcfg.sipport));
+        }
+
         if (phcfg.local_ip_addr[0] == 0)
                 eXosip_listen_addr(proto, NULL, atoi(phcfg.sipport), AF_INET, secure);
         else
         {
-                eXosip_masquerade_contact(phcfg.local_ip_addr, atoi(phcfg.sipport));
+                if (!phcfg.public_ip_addr[0])
+                        eXosip_masquerade_contact(phcfg.local_ip_addr, atoi(phcfg.sipport));
                 eXosip_listen_addr(proto, phcfg.local_ip_addr, atoi(phcfg.sipport), AF_INET, secure);
         }