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

Timestamp:

Jan 17, 2008 5:29:36 PM (16 years ago)

Author:

nanang

Message:

Ticket #452:

• Add directory srtp to third_party/build directory
• Add libsrtp project & integrate it to pjproject vs8 solution
• Add transport_srtp.h & .c
• Modify project dependencies to include libsrtp
• Modify Samples-vc.mak, add libsrtp as third party library
• Modify transport interface
• Modify transport_ice & transport_udp to accomodate new transport interface
• Modify other files that uses transport

File:

• pjproject/branches/users/nanang/pjsip-apps/src/samples/streamutil.c (modified) (13 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"
+ "  --use-srtp[=NAME]     Enable SRTP with crypto suite NAME            \n"
+ "                        e.g: AES_CM_128_HMAC_SHA1_80 (default),       \n"
+ "                             AES_CM_128_HMAC_SHA1_32                  \n"
+ "                        Use this option along with the TX & RX keys,  \n"
+ "                        formated of 60 hex digits (e.g: E148DA..)      \n"
+ "  --srtp-tx-key         SRTP key for transmiting                      \n"
+ "  --srtp-rx-key         SRTP key for receiving                        \n"
  "\n"
 ;
@@ -65 +72 @@
 #include <pjmedia.h>
 #include <pjmedia-codec.h>
+#include <pjmedia/transport_srtp.h>
 
 #include <stdlib.h>     /* atoi() */
@@ -79 +87 @@
 static void print_stream_stat(pjmedia_stream *stream);
 
+/* Prototype for LIBSRTP utility in file datatypes.c */
+int hex_string_to_octet_string(char *raw, char *hex, int len);
 
 /* 
@@ -123 +133 @@
                                   pj_uint16_t local_port,
                                   const pj_sockaddr_in *rem_addr,
+                                  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,
                                   pjmedia_stream **p_stream )
 {
     pjmedia_stream_info info;
-    pjmedia_transport *transport;
+    pjmedia_transport *transport = NULL;
+    pjmedia_transport *srtp_tp = NULL;
     pj_status_t status;
 
@@ -159 +174 @@
         return status;
 
+    /* Check if SRTP enabled */
+    if (use_srtp) {
+        pjmedia_srtp_stream_policy tx_plc, rx_plc;
+
+        status = pjmedia_transport_srtp_create(med_endpt, transport, 
+                            PJMEDIA_SRTP_AUTO_CLOSE_UNDERLYING_TRANSPORT,
+                            &srtp_tp);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        pj_bzero(&tx_plc, sizeof(pjmedia_srtp_stream_policy));
+        pj_bzero(&rx_plc, sizeof(pjmedia_srtp_stream_policy));
+
+        tx_plc.key = *srtp_tx_key;
+        tx_plc.crypto_suite = *crypto_suite;
+        rx_plc.key = *srtp_rx_key;
+        rx_plc.crypto_suite = *crypto_suite;
+        
+        status = pjmedia_transport_srtp_init_session(srtp_tp, &tx_plc, &rx_plc);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
 
     /* Now that the stream info is initialized, we can create the 
@@ -165 +202 @@
 
     status = pjmedia_stream_create( med_endpt, pool, &info, 
-                                    transport, NULL, p_stream);
+                                    (use_srtp?srtp_tp:transport), 
+                                    NULL, p_stream);
 
     if (status != PJ_SUCCESS) {
         app_perror(THIS_FILE, "Error creating stream", status);
-        pjmedia_transport_udp_close(transport);
+        pjmedia_transport_close(transport);
         return status;
     }
@@ -202 +240 @@
     pj_status_t status; 
 
+    /* SRTP variables */
+    pj_bool_t use_srtp = PJ_FALSE;
+    char tmp_tx_key[64];
+    char tmp_rx_key[64];
+    pj_str_t  srtp_tx_key = {NULL, 0};
+    pj_str_t  srtp_rx_key = {NULL, 0};
+    pj_str_t  srtp_crypto_suite = {NULL, 0};
+    int tmp_key_len;
 
     /* Default values */
@@ -221 +267 @@
         OPT_SEND_ONLY   = 's',
         OPT_RECV_ONLY   = 'i',
+        OPT_USE_SRTP    = 'S',
+        OPT_SRTP_TX_KEY = 'x',
+        OPT_SRTP_RX_KEY = 'y',
         OPT_HELP        = 'h',
     };
@@ -233 +282 @@
         { "send-only",      0, 0, OPT_SEND_ONLY },
         { "recv-only",      0, 0, OPT_RECV_ONLY },
+        { "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 },
         { "help",           0, 0, OPT_HELP },
         { NULL, 0, 0, 0 },
@@ -299 +351 @@
             break;
 
+        case OPT_USE_SRTP:
+            use_srtp = PJ_TRUE;
+            if (pj_optarg) {
+                pj_strset(&srtp_crypto_suite, pj_optarg, strlen(pj_optarg));
+            } else {
+                srtp_crypto_suite = pj_str("AES_CM_128_HMAC_SHA1_80");
+            }
+            break;
+
+        case OPT_SRTP_TX_KEY:
+            tmp_key_len = hex_string_to_octet_string(tmp_tx_key, pj_optarg, strlen(pj_optarg));
+            pj_strset(&srtp_tx_key, tmp_tx_key, tmp_key_len/2);
+            break;
+
+        case OPT_SRTP_RX_KEY:
+            tmp_key_len = hex_string_to_octet_string(tmp_rx_key, pj_optarg, strlen(pj_optarg));
+            pj_strset(&srtp_rx_key, tmp_rx_key, tmp_key_len/2);
+            break;
+
         case OPT_HELP:
             usage();
@@ -324 +395 @@
     }
 
+    if (use_srtp) {
+        if (((dir & PJMEDIA_DIR_ENCODING) && !srtp_tx_key.slen) ||
+            ((dir & PJMEDIA_DIR_DECODING) && !srtp_rx_key.slen))
+        {
+            printf("Error: Key for each SRTP stream direction must be set\n");
+            return 1;
+        }
+    }
 
     /* Must create a pool factory before we can allocate any memory. */
@@ -369 +448 @@
     /* Create stream based on program arguments */
     status = create_stream(pool, med_endpt, codec_info, dir, local_port, 
-                           &remote_addr, &stream);
+                           &remote_addr, 
+                           use_srtp, &srtp_crypto_suite, 
+                           &srtp_tx_key, &srtp_rx_key,
+                           &stream);
     if (status != PJ_SUCCESS)
         goto on_exit;
@@ -538 +620 @@
         tp = pjmedia_stream_get_transport(stream);
         pjmedia_stream_destroy(stream);
-        pjmedia_transport_udp_close(tp);
+        
+        pjmedia_transport_close(tp);
     }