Merge pull request #676 from pabuhler/use-uint32-for-ssrc

use uint32_t for ssrc
cisco · Jan 9, 2024 · df1de11 · df1de11
2 parents cce898a + 7c0281b
commit df1de11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/fuzzer/fuzzer.h b/fuzzer/fuzzer.h
@@ -37,7 +37,7 @@ struct fuzz_srtp_params {
     uint16_t window_size;
     uint8_t allow_repeat_tx;
     uint8_t ssrc_type;
-    unsigned int ssrc_value;
+    uint32_t ssrc_value;
     uint8_t key[MAX_KEY_LEN];
     uint8_t mki;
 };

diff --git a/include/srtp.h b/include/srtp.h
@@ -284,7 +284,7 @@ typedef enum {
  */
 typedef struct {
     srtp_ssrc_type_t type; /**< The type of this particular SSRC */
-    unsigned int value;    /**< The value of this SSRC, if it is not a */
+    uint32_t value;        /**< The value of this SSRC, if it is not a */
                            /**< wildcard */
 } srtp_ssrc_t;
 
@@ -636,7 +636,7 @@ srtp_err_status_t srtp_stream_add(srtp_t session, const srtp_policy_t *policy);
  *    - [other]           otherwise.
  *
  */
-srtp_err_status_t srtp_stream_remove(srtp_t session, unsigned int ssrc);
+srtp_err_status_t srtp_stream_remove(srtp_t session, uint32_t ssrc);
 
 /**
  * @brief srtp_update() updates all streams in the session.

diff --git a/test/rtp.c b/test/rtp.c
@@ -147,7 +147,7 @@ ssize_t rtp_recvfrom(rtp_receiver_t receiver, void *msg, size_t *len)
 int rtp_sender_init(rtp_sender_t sender,
                     int sock,
                     struct sockaddr_in addr,
-                    unsigned int ssrc)
+                    uint32_t ssrc)
 {
     /* set header values */
     sender->message.header.ssrc = htonl(ssrc);
@@ -170,7 +170,7 @@ int rtp_sender_init(rtp_sender_t sender,
 int rtp_receiver_init(rtp_receiver_t rcvr,
                       int sock,
                       struct sockaddr_in addr,
-                      unsigned int ssrc)
+                      uint32_t ssrc)
 {
     /* set header values */
     rcvr->message.header.ssrc = htonl(ssrc);

diff --git a/test/rtp.h b/test/rtp.h
@@ -107,12 +107,12 @@ ssize_t rtp_recvfrom(rtp_receiver_t receiver, void *msg, size_t *len);
 int rtp_receiver_init(rtp_receiver_t rcvr,
                       int sock,
                       struct sockaddr_in addr,
-                      unsigned int ssrc);
+                      uint32_t ssrc);
 
 int rtp_sender_init(rtp_sender_t sender,
                     int sock,
                     struct sockaddr_in addr,
-                    unsigned int ssrc);
+                    uint32_t ssrc);
 
 /*
  * srtp_sender_init(...) initializes an rtp_sender_t