Properly decrypt/encrypt RTCPs when they are muxed in.

sippy · Jul 13, 2024 · 6dbdd9c · 6dbdd9c
1 parent f4941fd
commit 6dbdd9c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/modules/dtls_gw/rtpp_dtls_conn.c b/modules/dtls_gw/rtpp_dtls_conn.c
@@ -52,6 +52,7 @@
 #include "rtp.h"
 #include "rtpp_time.h"
 #include "rtp_packet.h"
+#include "rtpp_packetops.h"
 #include "rtpp_proc_async.h"
 #include "rtpp_pthread.h"
 #include "rtpp_ssrc.h"
@@ -449,6 +450,14 @@ rtpp_dtls_conn_dtls_recv(struct rtpp_dtls_conn *self,
     pthread_mutex_unlock(&pvt->state_lock);
 }
 
+#if SRTP_PROTECT_NARGS == 4
+#define SRTP_PROTECT(a, b, c) srtp_protect(a, b, c, 0);
+#define SRTCP_PROTECT(a, b, c) srtp_protect_rtcp(a, b, c, 0);
+#else
+#define SRTP_PROTECT(a, b, c) srtp_protect(a, b, c);
+#define SRTCP_PROTECT(a, b, c) srtp_protect_rtcp(a, b, c);
+#endif
+
 static int
 rtpp_dtls_conn_rtp_send(struct rtpp_dtls_conn *self, struct pkt_proc_ctx *pktxp)
 {
@@ -467,11 +476,11 @@ rtpp_dtls_conn_rtp_send(struct rtpp_dtls_conn *self, struct pkt_proc_ctx *pktxp)
     }
 
     len = pktxp->pktp->size;
-#if SRTP_PROTECT_NARGS == 4
-    status = srtp_protect(pvt->srtp_ctx_out, pktxp->pktp->data.buf, &len, 0);
-#else
-    status = srtp_protect(pvt->srtp_ctx_out, pktxp->pktp->data.buf, &len);
-#endif
+    if (rtpp_is_rtcp_tst(pktxp)) {
+        status = SRTCP_PROTECT(pvt->srtp_ctx_out, pktxp->pktp->data.buf, &len);
+    } else {
+        status = SRTP_PROTECT(pvt->srtp_ctx_out, pktxp->pktp->data.buf, &len);
+    }
     if (status){
        return (-1);
     }
@@ -499,8 +508,12 @@ rtpp_dtls_conn_srtp_recv(struct rtpp_dtls_conn *self, struct pkt_proc_ctx *pktxp
     }
 
     len = pktxp->pktp->size;
-    status = srtp_unprotect(pvt->srtp_ctx_in, pktxp->pktp->data.buf, &len);
-    if (status){
+    if (rtpp_is_rtcp_tst(pktxp)) {
+        status = srtp_unprotect_rtcp(pvt->srtp_ctx_in, pktxp->pktp->data.buf, &len);
+    } else {
+        status = srtp_unprotect(pvt->srtp_ctx_in, pktxp->pktp->data.buf, &len);
+    }
+    if (status) {
        return (-1);
     }
     pktxp->pktp->size = len;
@@ -512,7 +525,6 @@ rtpp_dtls_conn_srtp_recv(struct rtpp_dtls_conn *self, struct pkt_proc_ctx *pktxp
 static int
 bio_write(BIO *b, const char *buf, int len)
 {
-    struct sthread_args *sender;
     struct rtpp_dtls_conn_priv *pvt = BIO_get_data(b);
     struct rtp_packet *packet;
 

diff --git a/modules/dtls_gw/rtpp_dtls_gw.c b/modules/dtls_gw/rtpp_dtls_gw.c
@@ -56,6 +56,7 @@
 #include "rtp.h"
 #include "rtpp_time.h"
 #include "rtp_packet.h"
+#include "rtpp_packetops.h"
 #include "rtpp_command.h"
 #include "rtpp_command_args.h"
 #include "rtpp_command_sub.h"
@@ -107,7 +108,6 @@ static void rtpp_dtls_gw_dtor(struct rtpp_module_priv *);
 static void rtpp_dtls_gw_worker(const struct rtpp_wthrdata *);
 static int rtpp_dtls_gw_handle_command(struct rtpp_module_priv *,
   const struct rtpp_subc_ctx *);
-static bool is_dtls_packet(const struct rtp_packet *);
 static int rtpp_dtls_gw_taste_encrypted(struct pkt_proc_ctx *);
 static int rtpp_dtls_gw_taste_plain(struct pkt_proc_ctx *);
 static enum pproc_action rtpp_dtls_gw_enqueue(const struct pkt_proc_ctx *);
@@ -468,7 +468,7 @@ rtpp_dtls_gw_taste_encrypted(struct pkt_proc_ctx *pktxp)
     static __thread struct rtpp_dtls_gw_aux strp_in = {.direction = SRTP_IN};
     struct rtpp_dtls_gw_aux *rdgap;
 
-    if (!is_dtls_packet(pktxp->pktp))
+    if (!rtpp_is_dtls_tst(pktxp))
         rdgap = &strp_in;
     else
         rdgap = &dtls_in;
@@ -550,16 +550,3 @@ rtpp_dtls_gw_dtor(struct rtpp_module_priv *pvt)
     mod_free(pvt);
     return;
 }
-
-static bool
-is_dtls_packet(const struct rtp_packet *pktp)
-{
-    uint8_t b;
-
-    if (pktp->size < 13)
-        return false;
-
-    b = pktp->data.buf[0];
-
-    return (19 < b && b < 64);
-}