Changeset 1723 for pjproject/branches/users/nanang/pjsip-apps/src/samples/streamutil.c

Timestamp:

Jan 21, 2008 9:20:58 PM (16 years ago)

Author:

nanang

Message:

Ticket #452:

• Applied preprocessor PJMEDIA_HAS_SRTP in PJMEDIA & PJSUA.
• Applied preprocessor PJSUA_DEFAULT_USE_SRTP and PJSUA_DEFAULT_SRTP_SECURE_SIGNALING in PJSUA

File:

• pjproject/branches/users/nanang/pjsip-apps/src/samples/streamutil.c (modified) (15 diffs)

pjproject/branches/users/nanang/pjsip-apps/src/samples/streamutil.c

@@ -56 +56 @@
  "  --send-only           Set stream direction to send only             \n"
  "  --recv-only           Set stream direction to recv only (default)   \n"
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
  "  --use-srtp[=NAME]     Enable SRTP with crypto suite NAME            \n"
  "                        e.g: AES_CM_128_HMAC_SHA1_80 (default),       \n"
@@ -63 +65 @@
  "  --srtp-tx-key         SRTP key for transmiting                      \n"
  "  --srtp-rx-key         SRTP key for receiving                        \n"
+#endif
+
  "\n"
 ;
@@ -133 +137 @@
                                   pj_uint16_t local_port,
                                   const pj_sockaddr_in *rem_addr,
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
                                   pj_bool_t use_srtp,
                                   const pj_str_t *crypto_suite,
                                   const pj_str_t *srtp_tx_key,
                                   const pj_str_t *srtp_rx_key,
+#endif
                                   pjmedia_stream **p_stream )
 {
     pjmedia_stream_info info;
     pjmedia_transport *transport = NULL;
+    pj_status_t status;
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     pjmedia_transport *srtp_tp = NULL;
-    pj_status_t status;
+#endif
 
 
@@ -174 +182 @@
         return status;
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /* Check if SRTP enabled */
     if (use_srtp) {
@@ -194 +203 @@
         if (status != PJ_SUCCESS)
             return status;
-    }
+
+        transport = srtp_tp;
+    }
+#endif
 
     /* Now that the stream info is initialized, we can create the 
@@ -201 +213 @@
 
     status = pjmedia_stream_create( med_endpt, pool, &info, 
-                                    (use_srtp?srtp_tp:transport), 
+                                    transport, 
                                     NULL, p_stream);
 
@@ -239 +251 @@
     pj_status_t status; 
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /* SRTP variables */
     pj_bool_t use_srtp = PJ_FALSE;
@@ -247 +260 @@
     pj_str_t  srtp_crypto_suite = {NULL, 0};
     int tmp_key_len;
+#endif
 
     /* Default values */
@@ -266 +280 @@
         OPT_SEND_ONLY   = 's',
         OPT_RECV_ONLY   = 'i',
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         OPT_USE_SRTP    = 'S',
+#endif
         OPT_SRTP_TX_KEY = 'x',
         OPT_SRTP_RX_KEY = 'y',
@@ -281 +297 @@
         { "send-only",      0, 0, OPT_SEND_ONLY },
         { "recv-only",      0, 0, OPT_RECV_ONLY },
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         { "use-srtp",       2, 0, OPT_USE_SRTP },
         { "srtp-tx-key",    1, 0, OPT_SRTP_TX_KEY },
         { "srtp-rx-key",    1, 0, OPT_SRTP_RX_KEY },
+#endif
         { "help",           0, 0, OPT_HELP },
         { NULL, 0, 0, 0 },
@@ -350 +368 @@
             break;
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         case OPT_USE_SRTP:
             use_srtp = PJ_TRUE;
@@ -368 +387 @@
             pj_strset(&srtp_rx_key, tmp_rx_key, tmp_key_len/2);
             break;
+#endif
 
         case OPT_HELP:
@@ -394 +414 @@
     }
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    /* SRTP validation */
     if (use_srtp) {
-        if (((dir & PJMEDIA_DIR_ENCODING) && !srtp_tx_key.slen) ||
-            ((dir & PJMEDIA_DIR_DECODING) && !srtp_rx_key.slen))
+        if (!srtp_tx_key.slen || !srtp_rx_key.slen)
         {
             printf("Error: Key for each SRTP stream direction must be set\n");
@@ -402 +423 @@
         }
     }
+#endif
 
     /* Must create a pool factory before we can allocate any memory. */
@@ -448 +470 @@
     status = create_stream(pool, med_endpt, codec_info, dir, local_port, 
                            &remote_addr, 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
                            use_srtp, &srtp_crypto_suite, 
                            &srtp_tx_key, &srtp_rx_key,
+#endif
                            &stream);
     if (status != PJ_SUCCESS)