Changeset 4387

Timestamp:

Feb 27, 2013 10:16:08 AM (12 years ago)

Author:

ming

Message:

Re #1559: Backported to 1.x, except r4312,r4330

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjlib-util/build/Makefile (modified) (1 diff)
• pjlib/build/Makefile (modified) (1 diff)
• pjlib/src/pj/sock_bsd.c (modified) (2 diffs)
• pjlib/src/pjlib-test/activesock.c (modified) (1 diff)
• pjlib/src/pjlib-test/ioq_tcp.c (modified) (6 diffs)
• pjlib/src/pjlib-test/ioq_udp.c (modified) (3 diffs)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/alsa_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia/g711.c (modified) (2 diffs)
• pjmedia/src/pjmedia/rtcp.c (modified) (1 diff)
• pjmedia/src/pjmedia/rtp.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)
• pjnath/build/Makefile (modified) (1 diff)
• pjsip-apps/src/python/setup.py (modified) (1 diff)
• pjsip-apps/src/samples/icedemo.c (modified) (1 diff)
• pjsip/build/Makefile (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (3 diffs)
• pjsip/src/pjsip/sip_parser.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/branches/1.x/pjlib-util/build/Makefile

@@ -75 +75 @@
         $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB)
 
-pjlib-util-test:
+pjlib-util-test: pjlib-util
         $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(UTIL_TEST_EXE)
 

pjproject/branches/1.x/pjlib/build/Makefile

@@ -88 +88 @@
         touch ../include/pj/config_site.h
         
-pjlib-test: 
+pjlib-test: pjlib
         $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(TEST_EXE)
 

pjproject/branches/1.x/pjlib/src/pj/sock_bsd.c

@@ -719 +719 @@
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(buf && len, PJ_EINVAL);
-    PJ_ASSERT_RETURN(from && fromlen, (*len=-1, PJ_EINVAL));
 
     *len = recvfrom(sock, (char*)buf, *len, flags, 
@@ -727 +726 @@
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
     else {
-        PJ_SOCKADDR_RESET_LEN(from);
+        if (from) {
+            PJ_SOCKADDR_RESET_LEN(from);
+        }
         return PJ_SUCCESS;
     }

pjproject/branches/1.x/pjlib/src/pjlib-test/activesock.c

@@ -214 +214 @@
             pj_time_val delay = {0, 10};
 #ifdef PJ_SYMBIAN
+            PJ_UNUSED_ARG(delay);
             pj_symbianos_poll(-1, 100);
 #else

pjproject/branches/1.x/pjlib/src/pjlib-test/ioq_tcp.c

@@ -364 +364 @@
 #ifdef PJ_SYMBIAN
         callback_call_count = 0;
-        pj_symbianos_poll(-1, 1000);
+        pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
         status = callback_call_count;
 #else
@@ -413 +413 @@
         pj_time_val timeout = {1, 0};
 #ifdef PJ_SYMBIAN
-        status = pj_symbianos_poll(-1, 1000);
+        status = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
         status = pj_ioqueue_poll(ioque, &timeout);
@@ -543 +543 @@
 #ifdef PJ_SYMBIAN
         callback_call_count = 0;
-        pj_symbianos_poll(-1, 1000);
+        pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
         status = callback_call_count;
 #else
@@ -577 +577 @@
         pj_time_val timeout = {1, 0};
 #ifdef PJ_SYMBIAN
-        status = pj_symbianos_poll(-1, 1000);
+        status = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
         status = pj_ioqueue_poll(ioque, &timeout);
@@ -772 +772 @@
 
 #ifdef PJ_SYMBIAN
-                status = pj_symbianos_poll(-1, 1000);
+                status = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
                 status = pj_ioqueue_poll(ioque, &timeout);
@@ -798 +798 @@
             pj_time_val timeout = {1, 0};
 #ifdef PJ_SYMBIAN
-            status = pj_symbianos_poll(-1, 1000);
+            status = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
             status = pj_ioqueue_poll(ioque, &timeout);

pjproject/branches/1.x/pjlib/src/pjlib-test/ioq_udp.c

@@ -268 +268 @@
         TRACE_("poll...");
 #ifdef PJ_SYMBIAN
-        rc = pj_symbianos_poll(-1, 5000);
+        rc = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
         rc = pj_ioqueue_poll(ioque, &timeout);
@@ -784 +784 @@
             pj_time_val timeout = { 1, 0 };
 #ifdef PJ_SYMBIAN
-            rc = pj_symbianos_poll(-1, 1000);
+            rc = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
             rc = pj_ioqueue_poll(ioque, &timeout);
@@ -813 +813 @@
             pj_time_val timeout = { 0, 10 };
 #ifdef PJ_SYMBIAN
+            PJ_UNUSED_ARG(timeout);
             rc = pj_symbianos_poll(-1, 100);
 #else       

pjproject/branches/1.x/pjmedia/build/Makefile

@@ -151 +151 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB)
 
-pjmedia-test: $(PJMEDIA_LIB)
+$(PJMEDIA_LIB): pjmedia
+
+pjmedia-test: $(PJMEDIA_LIB) pjmedia
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE)
 

pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/alsa_dev.c

@@ -233 +233 @@
 
     /* Set device name */
-    strcpy(adi->name, dev_name);
+    strncpy(adi->name, dev_name, sizeof(adi->name));
 
     /* Check the number of playback channels */

pjproject/branches/1.x/pjmedia/src/pjmedia/g711.c

@@ -331 +331 @@
 #if !PLC_DISABLED
         /* Create PLC, always with 10ms ptime */
-        status = pjmedia_plc_create(g711_factory.pool, 8000, 80,
+        status = pjmedia_plc_create(g711_factory.pool, 8000,
+                                    SAMPLES_PER_FRAME,
                                     0, &codec_priv->plc);
         if (status != PJ_SUCCESS) {
@@ -341 +342 @@
         /* Create VAD */
         status = pjmedia_silence_det_create(g711_factory.pool,
-                                            8000, 80,
+                                            8000, SAMPLES_PER_FRAME,
                                             &codec_priv->vad);
         if (status != PJ_SUCCESS) {

pjproject/branches/1.x/pjmedia/src/pjmedia/rtcp.c

@@ -753 +753 @@
     /* Check and get BYE reason */
     if (size > 8) {
-        reason.slen = *((pj_uint8_t*)pkt+8);
+        reason.slen = PJ_MIN(sizeof(sess->stat.peer_sdes_buf_),
+                             *((pj_uint8_t*)pkt+8));
         pj_memcpy(sess->stat.peer_sdes_buf_, ((pj_uint8_t*)pkt+9),
                   reason.slen);

pjproject/branches/1.x/pjmedia/src/pjmedia/rtp.c

@@ -119 +119 @@
                                             const void **rtphdr, int *hdrlen )
 {
-    PJ_UNUSED_ARG(payload_len);
-
     /* Update timestamp */
     ses->out_hdr.ts = pj_htonl(pj_ntohl(ses->out_hdr.ts)+ts_len);

pjproject/branches/1.x/pjmedia/src/pjmedia/transport_srtp.c

@@ -38 +38 @@
 #define MAX_RTP_BUFFER_LEN          1500
 #define MAX_RTCP_BUFFER_LEN         1500
-#define MAX_KEY_LEN                 32
+#define MAX_KEY_LEN                 128
 
 /* Initial value of probation counter. When probation counter > 0, 
@@ -612 +612 @@
     srtp->session_inited = PJ_TRUE;
 
-    PJ_LOG(5, (srtp->pool->obj_name, "TX: %s key=%s", srtp->tx_policy.name.ptr,
-               octet_string_hex_string(tx->key.ptr, tx->key.slen)));
-    if (srtp->tx_policy.flags) {
-        PJ_LOG(5,(srtp->pool->obj_name,"TX: disable%s%s", (cr_tx_idx?"":" enc"),
-                  (au_tx_idx?"":" auth")));
-    }
-
-    PJ_LOG(5, (srtp->pool->obj_name, "RX: %s key=%s", srtp->rx_policy.name.ptr,
-               octet_string_hex_string(rx->key.ptr, rx->key.slen)));
-    if (srtp->rx_policy.flags) {
-        PJ_LOG(5,(srtp->pool->obj_name,"RX: disable%s%s", (cr_rx_idx?"":" enc"),
-                  (au_rx_idx?"":" auth")));
-    }
+    /* Logging stuffs */
+#if PJ_LOG_MAX_LEVEL >= 5
+    {
+        char b64[PJ_BASE256_TO_BASE64_LEN(MAX_KEY_LEN)];
+        int b64_len;
+
+        /* TX crypto and key */
+        b64_len = sizeof(b64);
+        status = pj_base64_encode((pj_uint8_t*)tx->key.ptr, tx->key.slen,
+                                  b64, &b64_len);
+        if (status != PJ_SUCCESS)
+            b64_len = pj_ansi_sprintf(b64, "--key too long--");
+        else
+            b64[b64_len] = '\0';
+        
+        PJ_LOG(5, (srtp->pool->obj_name, "TX: %s key=%s",
+                   srtp->tx_policy.name.ptr, b64));
+        if (srtp->tx_policy.flags) {
+            PJ_LOG(5,(srtp->pool->obj_name, "TX: disable%s%s",
+                      (cr_tx_idx?"":" enc"),
+                      (au_tx_idx?"":" auth")));
+        }
+
+        /* RX crypto and key */
+        b64_len = sizeof(b64);
+        status = pj_base64_encode((pj_uint8_t*)rx->key.ptr, rx->key.slen,
+                                  b64, &b64_len);
+        if (status != PJ_SUCCESS)
+            b64_len = pj_ansi_sprintf(b64, "--key too long--");
+        else
+            b64[b64_len] = '\0';
+
+        PJ_LOG(5, (srtp->pool->obj_name, "RX: %s key=%s",
+                   srtp->rx_policy.name.ptr, b64));
+        if (srtp->rx_policy.flags) {
+            PJ_LOG(5,(srtp->pool->obj_name,"RX: disable%s%s",
+                      (cr_rx_idx?"":" enc"),
+                      (au_rx_idx?"":" auth")));
+        }
+    }
+#endif
 
 on_return:

pjproject/branches/1.x/pjnath/build/Makefile

@@ -98 +98 @@
         $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB)
 
+$$(PJNATH_LIB): pjnath
+
 pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
         $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE)

pjproject/branches/1.x/pjsip-apps/src/python/setup.py

@@ -88 +88 @@
     extra_link_args = ["-framework", "CoreFoundation", 
                        "-framework", "AudioToolbox"]
-    # OS X Lion support
-    if platform.mac_ver()[0].startswith("10.7"):
+    version = platform.mac_ver()[0].split(".")    
+    # OS X Lion (10.7.x) or above support
+    if version[0] == '10' and int(version[1]) >= 7:
         extra_link_args += ["-framework", "AudioUnit"]
 else:

pjproject/branches/1.x/pjsip-apps/src/samples/icedemo.c

@@ -615 +615 @@
 
         /* Enumerate all candidates for this component */
+        cand_cnt = PJ_ARRAY_SIZE(cand);
         status = pj_ice_strans_enum_cands(icedemo.icest, comp+1,
                                           &cand_cnt, cand);

pjproject/branches/1.x/pjsip/build/Makefile

@@ -138 +138 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB)
 
-pjsip-test:
+pjsip-test: pjsip
         $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE)
 

pjproject/branches/1.x/pjsip/include/pjsua-lib/pjsua.h

@@ -654 +654 @@
      *  - it may delay the processing of the request, for example to request
      *    user permission whether to accept or reject the request. In this 
-     *    case, the application MUST set the \a code argument to 202, and 
-     *    later calls #pjsua_pres_notify() to accept or reject the 
-     *    subscription request.
+     *    case, the application MUST set the \a code argument to 202, then
+     *    IMMEDIATELY calls #pjsua_pres_notify() with state
+     *    PJSIP_EVSUB_STATE_PENDING and later calls #pjsua_pres_notify()
+     *    again to accept or reject the subscription request.
      *
      * Any \a code other than 200 and 202 will be treated as 200.
@@ -2241 +2242 @@
     /** 
      * The full SIP URL for the account. The value can take name address or 
-     * URL format, and will look something like "sip:account@serviceprovider".
+     * URL format, and will look something like "sip:account@serviceprovider"
+     * or "\"Display Name\" <sip:account@provider>".
      *
      * This field is mandatory.
@@ -3525 +3527 @@
  *
  * @param call_id       The call id to be transfered.
- * @param dest          Address of new target to be contacted.
+ * @param dest          URI of new target to be contacted. The URI may be
+ *                      in name address or addr-spec format.
  * @param msg_data      Optional message components to be sent with
  *                      the request.

pjproject/branches/1.x/pjsip/src/pjsip/sip_parser.c

@@ -1523 +1523 @@
     /* Get the SIP-URL */
     has_bracket = (*scanner->curptr == '<');
-    if (has_bracket)
+    if (has_bracket) {
         pj_scan_get_char(scanner);
+    } else if (name_addr->display.slen) {
+        /* Must have bracket now (2012-10-26).
+         * Allowing (invalid) name-addr to pass URI verification will
+         * cause us to send invalid URI to the wire.
+         */
+        PJ_THROW( PJSIP_SYN_ERR_EXCEPTION);
+    }
     name_addr->uri = int_parse_uri( scanner, pool, PJ_TRUE );
     if (has_bracket) {

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -34 +34 @@
  */
 #define LOCK_CODEC_MAX_RETRY         5
+
+
+/*
+ * The INFO method.
+ */
+const pjsip_method pjsip_info_method =
+{
+    PJSIP_OTHER_METHOD,
+    { "INFO", 4 }
+};
+
 
 /* This callback receives notification from invite session when the
@@ -175 +186 @@
     pjsip_endpt_add_capability(pjsua_var.endpt, NULL, PJSIP_H_SUPPORTED,
                                NULL, 1, &str_norefersub);
+
+    /* Add "INFO" in Allow header, for DTMF and video key frame request. */
+    pjsip_endpt_add_capability(pjsua_var.endpt, NULL, PJSIP_H_ALLOW,
+                               NULL, 1, &pjsip_info_method.name);
 
     return status;