Changeset 5855 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

Timestamp:

Aug 15, 2018 2:44:53 AM (6 years ago)

Author:

nanang

Message:

Re #2096: Answer with one SRTP keying only when offered both (thanks Wei-Wei for the feedback).

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -190 +190 @@
 
     pj_ansi_strncpy(ds->base.name, pool->obj_name, PJ_MAX_OBJ_NAME);
-    ds->base.type = PJMEDIA_TRANSPORT_TYPE_SRTP;
+    ds->base.type = PJMEDIA_SRTP_KEYING_DTLS_SRTP;
     ds->base.op = &dtls_op;
     ds->base.user_data = srtp;
@@ -1075 +1075 @@
          */
         pjmedia_sdp_media *m_rem = sdp_remote->media[media_index];
-        pjmedia_sdp_attr *attr_setup, *attr_fp;
+        pjmedia_sdp_attr *attr_fp;
         pj_uint32_t rem_proto = 0;
 
@@ -1095 +1095 @@
         }
 
-        /* Check for a=setup in remote SDP. */
-        attr_setup = pjmedia_sdp_media_find_attr(m_rem, &ID_SETUP, NULL);
-        if (!attr_setup)
-            attr_setup = pjmedia_sdp_attr_find(sdp_remote->attr_count,
-                                      sdp_remote->attr, &ID_SETUP, NULL);
+        /* Check for a=fingerprint in remote SDP. */
         switch (ds->srtp->setting.use) {
             case PJMEDIA_SRTP_DISABLED:
-                if (attr_setup) {
+                if (attr_fp) {
                     status = PJMEDIA_SRTP_ESDPINTRANSPORT;
                     goto on_return;
@@ -1110 +1106 @@
                 break;
             case PJMEDIA_SRTP_MANDATORY:
-                if (!attr_setup) {
+                if (!attr_fp) {
+                    /* Should never reach here, this is already checked */
                     status = PJMEDIA_SRTP_ESDPINTRANSPORT;
                     goto on_return;