Changeset 282:f092dbf9c3c2 in verona

Timestamp:

Sep 8, 2011 10:45:31 AM (22 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

add support for RFC5626

Files:

• misc/vtims.py (modified) (5 diffs)
• phapi/phapi.c (modified) (5 diffs)
• phapi/phapi.h (modified) (3 diffs)

misc/vtims.py

@@ -46 +46 @@
 USERNAME="Vadim Lebedev"
 PUBLIC_IP_ADDR  = "217.128.124.171"
+#PUBLIC_IP_ADDR = MYIPADDR
 if True:
    #testsip3 server
@@ -52 +53 @@
    TARGET=imspasswd.TARGET1
    ZNDI = "0" + NDI
+
    USERNAME=ZNDI
-#   PREFIX="974682000"
-#   SUFFIX=".DGP.9TALK@sfr.fr"
-#   USER="+33999" + NDI
-   PREFIX=""
-   SUFFIX=".TST.DGP@sfr.fr"
+   if imspasswd.MODE9BOX:
+      PREFIX=""
+      SUFFIX=".TST.DGP@sfr.fr"
+   elif imspasswd.NEWSPECS:
+      PREFIX="974682000"
+      SUFFIX=".DGP.9TALK@sfr.fr"
+   else:
+      PREFIX="999"
+      PREFPREFIX = "999"
+      SUFFIX=".TST.9TALK@sfr.fr"
+
+   if imspasswd.RFC5626:
+      USERFC5626 = 1 << 11
+   else:
+      USERFC5626 = 0
+
    USER="+33" + PREFIX + NDI
-#   IMSUSERID="NDI" + ZNDI + ".TST.9TALK@sfr.fr"
+   PREFUSER = "+33" + PREFPREFIX + NDI
    IMSUSERID="NDI" + ZNDI + SUFFIX
    SERVER="ims.mnc010.mcc208.3gppnetwork.org"
    PROXY="<sip:91.68.5.52;lr>"
+   #PROXY="<sip:172.22.43.69:5062;lr>"   # In PROLOG office behind 9BOX
    REALM="sfr.fr"
+   TRANSPORT = 17  # IPPROTO_UDP
+   if imspasswd.PROTOCOL == "tcp":
+      TRANSPORT = 6 # IPPROTO_TCP
 else:
    # external server
@@ -87 +104 @@
     cfg.audio_codecs="PCMA,PCMU"
     cfg.local_audio_rtp_port = "16384"
+    cfg.sip_id = '"<urn:uuid:00000000-0000-1000-8000-AABBCCDDEEFF>"'
     cfg.ptime=20
+    cfg.transport = TRANSPORT
     if 0 < API.init():
        print "Init failed\n"
@@ -93 +112 @@
 def reg1():
     global VLID
+ 
     API.addAuthInfo(USER, IMSUSERID, PASSWD, REALM)
-    VLID = API.addVline(USERNAME, USER, SERVER, PROXY, 3600, verona.PH_LINE_MOBILITY_PHONE+verona.PH_NORTCP_ATTR)
+    VLID = API.addVline(USERNAME, USER, SERVER, PROXY, 3600, verona.PH_LINE_MOBILITY_PHONE+verona.PH_NORTCP_ATTR + USERFC5626)
     print "vlid = ", VLID
 
@@ -132 +152 @@
 
 def addcustomizations():
-    prefid = "<sip:%s@%s;user=phone>" % (USER, SERVER)
-    API.addCustomHeader("INVITE", "P-Preferred-Identity", prefid) 
+    prefid = "<sip:%s@%s;user=phone>" % (PREFUSER, SERVER)
+    prefid = "<sip:%s@%s>" % (PREFUSER, SERVER)
+    prefid = "<tel:%s>"   %  PREFUSER
+    API.addCustomHeader("INVITE", "P-Preferred-Identity", prefid)
+    if imspasswd.RFC5626:
+       API.addCustomHeader("REGISTER,INVITE", "Suppported", "path, outbound")
 
 def setup():

phapi/phapi.c

@@ -1548 +1548 @@
                 ph_replace_contact(invite, vl->contact);
         }
+        if (vl->mobility & PH_USE_RFC5626)
+                ph_replace_contact(invite, vl->contact);
+
 
 
@@ -2312 +2315 @@
         osip_contact_parse(ctct, vl->contact);
         if (inside)
-                osip_uri_param_add(&ctct->url->url_params, osip_strdup(param), osip_strdup(value));
+                osip_uri_param_add(&ctct->url->url_params, osip_strdup(param), value ? osip_strdup(value) : 0);
         else
-                osip_contact_param_add(ctct, osip_strdup(param), osip_strdup(value));
+                osip_contact_param_add(ctct, osip_strdup(param), value ? osip_strdup(value) : 0);
 
         osip_free(vl->contact);
@@ -2947 +2950 @@
 }
 
+static void ph_fix_reg_contact(struct vline* vl, char **rcontact)
+{
+        osip_contact_t* ctct = 0;
+        char regid[16];
+        int fixit = (PH_USE_RFC5626 == (vl->mobility & PH_USE_RFC5626));
+
+        *rcontact = vl->contact;
+
+        if (!fixit)
+                return;
+
+
+
+        if (osip_contact_init(&ctct))
+                return;
+
+        if (osip_contact_parse(ctct, vl->contact))
+                goto err;
+
+        snprintf(regid, 16, "%d", ph_vline2vlid(vl) );
+        if (osip_contact_param_add(ctct, osip_strdup("reg-id"), osip_strdup(regid)))
+                goto err;
+
+        if (osip_contact_param_add(ctct, osip_strdup("+sip.instance"), osip_strdup(phcfg.sip_id)))
+                goto err;
+
+        osip_contact_to_str(ctct, rcontact);
+
+err:
+        osip_contact_free(ctct);
+}
+
 PHAPI_EXPORT int
 phvlRegister(int vlid)
@@ -2991 +3026 @@
         }  else {
 #if 1
-                vl->rid = eXosip_register_build_initial_register(utmp, server, vl->contact, vl->regTimeout, &msg);
+                char *rcontact;
+
+                ph_fix_reg_contact(vl, &rcontact);
+
+                vl->rid = eXosip_register_build_initial_register(utmp, server, rcontact, vl->regTimeout, &msg);
                 if (vl->proxy)
                         osip_message_set_route(msg, vl->proxy);
+                if (rcontact != vl->contact)
+                        osip_free(rcontact);
         }
 #else
@@ -3343 +3384 @@
                 add_contact_param(vl, "user", "phone", TRUE);
 
+        if ((mobility & PH_USE_RFC5626) == PH_USE_RFC5626) {
+                // add_contact_param(vl, "ob", 0, TRUE);
+        }
 
         vl->mobility = mobility;

phapi/phapi.h

@@ -174 +174 @@
 #define PH_ANONYMOUS_CALL (1 << 9)
 #define PH_NORTCP_ATTR (1 << 10)
+#define PH_USE_RFC5626 (1 << 11)
 
 typedef struct _phStream
@@ -197 +198 @@
   PH_LINE_MOBILITY_MOBILE,
   PH_LINE_MOBILITY_PHONE,
-  PH_LINE_MOBILITY_MASK = 255
+  PH_LINE_MOBILITY_MASK = 3
 };
 #define checkmobility(m, v) ((((m) & PH_LINE_MOBILITY_MASK) == (v)))
@@ -1263 +1264 @@
   char http_proxy_user[128];
   char http_proxy_passwd[128];
+
+  char sip_id[128];  // Used for RFC5626 functionality
+
 #ifdef WIN32
   void* videoHandle;