Changeset 1760

Timestamp:

Jan 30, 2008 9:47:57 AM (16 years ago)

Author:

bennylp

Message:

Ticket #61: undo r1759 and replace it with other patches to fix unable to accept RTP/AVP offer with a=crypto attribute when use_sdp is set to zero. Also minor fix to streamutil

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_srtp.c (modified) (6 diffs)
• pjsip-apps/src/samples/streamutil.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -297 +297 @@
 
     /* Check crypto availability */
-    if (opt->crypto_count == 0 && 
+    if (opt && opt->crypto_count == 0 && 
         opt->use == PJMEDIA_SRTP_MANDATORY)
         return PJMEDIA_SRTP_ESDPREQCRYPTO;
 
     /* Check crypto */
-    if (opt->use != PJMEDIA_SRTP_DISABLED) {
+    if (opt && opt->use != PJMEDIA_SRTP_DISABLED) {
         for (i=0; i < opt->crypto_count; ++i) {
             int cs_idx = get_crypto_idx(&opt->crypto[i].name);
@@ -970 +970 @@
                 return PJMEDIA_SRTP_ESDPINTRANSPORT;
             }
+            goto BYPASS_SRTP;
         } else if (srtp->setting.use == PJMEDIA_SRTP_OPTIONAL) {
                 m_loc->desc.transport = m_rem->desc.transport;
@@ -1013 +1014 @@
             if (pj_stricmp(&m_rem->attr[i]->name, &ID_CRYPTO) != 0)
                 continue;
-
-            /* SRTP is disabled but there is crypto attr in remote media */
-            /* Put the checking here to save a bit memory for parsing */
-            if (srtp->setting.use == PJMEDIA_SRTP_DISABLED) {
-                //DEACTIVATE_MEDIA(pool, m_loc);
-                //return PJMEDIA_SRTP_ESDPINTRANSPORT;
-                continue;
-            }
 
             has_crypto_attr = PJ_TRUE;
@@ -1046 +1039 @@
 
                         /* Force to use test key */
+                        /* bad keys for snom: */
                         //char *hex_test_key = "58b29c5c8f42308120ce857e439f2d"
                         //                   "7810a8b10ad0b1446be5470faea496";
-                        //pj_str_t* test_key = &srtp->setting.crypto[j].key;
+                        //char *hex_test_key = "20a26aac7ba062d356ff52b61e3993"
+                        //                   "ccb78078f12c64db94b9c294927fd0";
+                        //pj_str_t *test_key = &srtp->setting.crypto[j].key;
                         //char  *raw_test_key = pj_pool_zalloc(srtp->pool, 64);
                         //hex_string_to_octet_string(
@@ -1056 +1052 @@
                         //pj_strset(test_key, raw_test_key, 
                         //        crypto_suites[cs_idx].cipher_key_len);
+                        /* EO Force to use test key */
 
                         if (tmp_rx_crypto.key.slen != 
@@ -1072 +1069 @@
 
         if (srtp->setting.use == PJMEDIA_SRTP_DISABLED) {
-            /* At this point, it is ensured remote has no crypto attr */
+            /* bypass when remote uses RTP/AVP and we disable SRTP */
             goto BYPASS_SRTP;
         } else if (srtp->setting.use == PJMEDIA_SRTP_OPTIONAL) {

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

@@ -29 +29 @@
  * \includelineno streamutil.c
  */
+
+#include <pjlib.h>
+#include <pjlib-util.h>
+#include <pjmedia.h>
+#include <pjmedia-codec.h>
+#include <pjmedia/transport_srtp.h>
+
+#include <stdlib.h>     /* atoi() */
+#include <stdio.h>
+
+#include "util.h"
 
 
@@ -71 +82 @@
 
 
-
-#include <pjlib.h>
-#include <pjlib-util.h>
-#include <pjmedia.h>
-#include <pjmedia-codec.h>
-#include <pjmedia/transport_srtp.h>
-
-#include <stdlib.h>     /* atoi() */
-#include <stdio.h>
-
-#include "util.h"