Changeset 1851 for pjproject

Timestamp:

Mar 8, 2008 9:26:22 AM (17 years ago)

Author:

bennylp

Message:

Make SIP and RTP ports in simpleua configurable, and add initial support for IPv6 too

File:

• pjproject/trunk/pjsip-apps/src/samples/simpleua.c (modified) (9 diffs)

pjproject/trunk/pjsip-apps/src/samples/simpleua.c

@@ -30 +30 @@
  * Capabilities to be demonstrated here:
  *  - Basic call
+ *  - Should support IPv6 (not tested)
  *  - UDP transport at port 5060 (hard coded)
  *  - RTP socket at port 4000 (hard coded)
@@ -63 +64 @@
 
 #include "util.h"
+
+
+/* Settings */
+#define AF          pj_AF_INET()     /* Change to pj_AF_INET6() for IPv6.
+                                      * PJ_HAS_IPV6 must be enabled and
+                                      * your system must support IPv6.  */
+#define SIP_PORT    5060             /* Listening SIP port              */
+#define RTP_PORT    4000             /* RTP port                        */
 
 /*
@@ -180 +189 @@
      */
     {
-        pj_sockaddr_in addr;
-
-        addr.sin_family = pj_AF_INET();
-        addr.sin_addr.s_addr = 0;
-        addr.sin_port = pj_htons(5060);
-
-        status = pjsip_udp_transport_start( g_endpt, &addr, NULL, 1, NULL);
+        pj_sockaddr addr;
+
+        pj_sockaddr_init(AF, &addr, NULL, (pj_uint16_t)SIP_PORT);
+        
+        if (AF == pj_AF_INET()) {
+            status = pjsip_udp_transport_start( g_endpt, &addr.ipv4, NULL, 
+                                                1, NULL);
+        } else if (AF == pj_AF_INET6()) {
+            status = pjsip_udp_transport_start6(g_endpt, &addr.ipv6, NULL,
+                                                1, NULL);
+        } else {
+            status = PJ_EAFNOTSUP;
+        }
+
         if (status != PJ_SUCCESS) {
             app_perror(THIS_FILE, "Unable to start UDP transport", status);
@@ -274 +290 @@
      * opt to re-use the same media transport for subsequent calls.
      */
-    status = pjmedia_transport_udp_create(g_med_endpt, NULL, 4000, 0, 
-                                          &g_med_transport);
+    status = pjmedia_transport_udp_create3(g_med_endpt, AF, NULL, NULL, 
+                                           RTP_PORT, 0, &g_med_transport);
     if (status != PJ_SUCCESS) {
         app_perror(THIS_FILE, "Unable to create media transport", status);
@@ -293 +309 @@
      */
     if (argc > 1) {
+        pj_sockaddr hostaddr;
+        char hostip[PJ_INET6_ADDRSTRLEN+2];
         char temp[80];
         pj_str_t dst_uri = pj_str(argv[1]);
@@ -300 +318 @@
         pjsip_tx_data *tdata;
 
-        pj_ansi_sprintf(temp, "sip:simpleuac@%s", pjsip_endpt_name(g_endpt)->ptr);
+        if (pj_gethostip(AF, &hostaddr) != PJ_SUCCESS) {
+            app_perror(THIS_FILE, "Unable to retrieve local host IP", status);
+            return 1;
+        }
+        pj_sockaddr_print(&hostaddr, hostip, sizeof(hostip), 2);
+
+        pj_ansi_sprintf(temp, "<sip:simpleuac@%s:%d>", 
+                        hostip, SIP_PORT);
         local_uri = pj_str(temp);
 
@@ -306 +331 @@
         status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
                                        &local_uri,  /* local URI */
-                                       NULL,        /* local Contact */
+                                       &local_uri,  /* local Contact */
                                        &dst_uri,    /* remote URI */
                                        &dst_uri,    /* remote target */
@@ -462 +487 @@
 static pj_bool_t on_rx_request( pjsip_rx_data *rdata )
 {
+    pj_sockaddr hostaddr;
+    char temp[80], hostip[PJ_INET6_ADDRSTRLEN];
+    pj_str_t local_uri;
     pjsip_dialog *dlg;
     pjmedia_sdp_session *local_sdp;
@@ -514 +542 @@
 
     /*
+     * Generate Contact URI
+     */
+    if (pj_gethostip(AF, &hostaddr) != PJ_SUCCESS) {
+        app_perror(THIS_FILE, "Unable to retrieve local host IP", status);
+        return PJ_TRUE;
+    }
+    pj_sockaddr_print(&hostaddr, hostip, sizeof(hostip), 2);
+
+    pj_ansi_sprintf(temp, "<sip:simpleuas@%s:%d>", 
+                    hostip, SIP_PORT);
+    local_uri = pj_str(temp);
+
+    /*
      * Create UAS dialog.
      */
     status = pjsip_dlg_create_uas( pjsip_ua_instance(), 
                                    rdata,
-                                   NULL, /* contact */
+                                   &local_uri, /* contact */
                                    &dlg);
     if (status != PJ_SUCCESS) {