rtp

.drone.yml

@@ -4,14 +4,15 @@ name: unit-tests
 
 steps:
     - name: bootstrap
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       commands:
       - cat /proc/sys/kernel/core_pattern
+      - apt-get update && apt-get -yq install autoconf
       - ./bootstrap.sh -j
 
     - name: configure
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       environment:
         REPOTOKEN:
@@ -33,7 +34,7 @@ steps:
       - ./configure --enable-address-sanitizer --enable-fake-dlclose
 
     - name: build
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       environment:
         REPOTOKEN:
@@ -50,7 +51,7 @@ steps:
       - ./build.sh
 
     - name: run-tests
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       environment:
         REPOTOKEN:
@@ -87,6 +88,7 @@ steps:
 trigger:
   branch:
   - master
+  - sb14
   event:
   - pull_request
   - push
@@ -97,13 +99,14 @@ name: scan-build
 
 steps:
     - name: bootstrap
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       commands:
+      - apt-get update && apt-get -yq install autoconf
       - ./bootstrap.sh -j
 
     - name: configure
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       environment:
         REPOTOKEN:
@@ -140,7 +143,7 @@ steps:
       - ./configure
 
     - name: scan-build
-      image: signalwire/freeswitch-public-base:bullseye
+      image: signalwire/freeswitch-public-base:bookworm
       pull: always
       environment:
         REPOTOKEN:
@@ -152,7 +155,7 @@ steps:
       - export REPOTOKEN=''
       - rm -rf /etc/apt/auth.conf
       - mkdir -p scan-build
-      - echo '#!/bin/bash\nscan-build-11 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
+      - echo '#!/bin/bash\nscan-build-14 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
       - chmod +x scan.sh
       - ./scan.sh
       - exitstatus=`cat ./scan-build-status.txt`
@@ -172,12 +175,13 @@ steps:
 trigger:
   branch:
   - master
+  - sb14
   event:
   - pull_request
   - push
 
 ---
 kind: signature
-hmac: 780e4aaee61e3683ea4a8d6fe5131f7c9e62ebad727546013f18df0fca80d705
+hmac: 65bc1e76ae74ca7c8df9e4b790e3ec096f84184020ebdab280dc1d80b6932560
 
 ...

src/switch_rtp.c

@@ -185,6 +185,11 @@ typedef struct {
 	char body[SWITCH_RTCP_MAX_BUF_LEN];
 } rtcp_msg_t;
 
+typedef struct {
+	switch_rtcp_hdr_t header;
+	uint32_t ssrc;
+} sdes_ssrc_t;
+
 
 typedef enum {
 	VAD_FIRE_TALK = (1 << 0),
@@ -2072,9 +2077,9 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 		struct switch_rtcp_report_block *rtcp_report_block = NULL;
 		switch_size_t rtcp_bytes = sizeof(struct switch_rtcp_hdr_s)+sizeof(uint32_t); /* add size of the packet header and the ssrc */
 		switch_rtcp_hdr_t *sdes;
+		sdes_ssrc_t *sdes_ssrc;
 		uint8_t *p;
 		switch_size_t sdes_bytes = sizeof(struct switch_rtcp_hdr_s);
-		uint32_t *ssrc;
 		switch_rtcp_sdes_unit_t *unit;
 		switch_bool_t is_only_receiver = FALSE;
 
@@ -2270,14 +2275,13 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 
 		//SDES + CNAME
 		p = (uint8_t *) (&rtp_session->rtcp_send_msg) + rtcp_bytes;
-		sdes = (switch_rtcp_hdr_t *) p;
+		sdes_ssrc = (sdes_ssrc_t *) p;
+		sdes = &sdes_ssrc->header;
 		sdes->version = 2;
 		sdes->type = _RTCP_PT_SDES;
 		sdes->count = 1;
 		sdes->p = 0;
-		p = (uint8_t *) (sdes) + sdes_bytes;
-		ssrc = (uint32_t *) p;
-		*ssrc = htonl(rtp_session->ssrc);
+		sdes_ssrc->ssrc = htonl(rtp_session->ssrc);
 		sdes_bytes += sizeof(uint32_t);