Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove use of pointers to 32bit values #667

Merged
merged 2 commits into from
Dec 20, 2023

Conversation

pabuhler
Copy link
Member

There is no reason to use pointers to 32bit values, all operations are based on bytes. So This removes alot of extra casting and potential pointer arithmetic errors.
Also provide some functions for calculating header values to reduce duplication and improve readability.

@pabuhler pabuhler requested a review from paulej December 19, 2023 10:23
There is no reason to use pointers to 32bit values, all operations are
based on bytes. So This removes alot of extra casting and potential
pointer arithmetic errors.
Also provide some functions for calculating header values to reduce
duplication and improve readability.
@pabuhler pabuhler force-pushed the remove-32bit-pointers branch from 6c2b8fb to 8f10fac Compare December 19, 2023 11:44
#define octets_in_rtp_extn_hdr 4
#define octets_in_rtp_xtn_hdr 4

static uint32_t srtp_get_rtp_hdr_len(const srtp_hdr_t *hdr)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's semantically right to use uint32_t for byte lengths? I'd suggest size_t. (Not that this matters practically.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I totally agree and plan to convert to size_t both in the public API and internally, at the moment the mix of size_t, uint32_t, int and unsigned int is just staggering in this project. But such a change in the public API needs a major version bump which is why I have been putting it off. I think it might be a goal for the Christmass break to start.

srtp/srtp.c Show resolved Hide resolved
srtp_get_rtp_xtn_hdr & srtp_get_rtp_xtn_hdr_len both
assume that the caller has verified that the input arguments
are valid, ie that there is an extension present by previously
checking the x bit of the RTP header.
@pabuhler pabuhler merged commit 9a139f5 into cisco:main Dec 20, 2023
33 checks passed
@pabuhler pabuhler deleted the remove-32bit-pointers branch December 20, 2023 13:14
mwalbeck pushed a commit to mwalbeck/docker-janus-gateway that referenced this pull request Feb 4, 2025
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [cisco/libsrtp](https://github.com/cisco/libsrtp) | minor | `v2.5.0` -> `v2.6.0` |

---

### Release Notes

<details>
<summary>cisco/libsrtp (cisco/libsrtp)</summary>

### [`v2.6.0`](https://github.com/cisco/libsrtp/releases/tag/v2.6.0): libSRTP 2.6.0

[Compare Source](cisco/libsrtp@v2.5.0...v2.6.0)

#### What's Changed

-   cmake: Support configuring as subproject by [@&#8203;yangskyboxlabs](https://github.com/yangskyboxlabs) in cisco/libsrtp#640
-   cmake: Rename TEST_APPS as LIBSRTP_TEST_APPS option by [@&#8203;yangskyboxlabs](https://github.com/yangskyboxlabs) in cisco/libsrtp#641
-   Add a missing typedef for stream list ctx by [@&#8203;Lastique](https://github.com/Lastique) in cisco/libsrtp#643
-   Add x86 SIMD optimizations to crypto datatypes by [@&#8203;Lastique](https://github.com/Lastique) in cisco/libsrtp#507
-   fix typo by [@&#8203;uniontech-lilinjie](https://github.com/uniontech-lilinjie) in cisco/libsrtp#648
-   iv length is constant so set only once by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#649
-   Fix library version in Doxygen docs by [@&#8203;Lastique](https://github.com/Lastique) in cisco/libsrtp#654
-   remove comma from srtp_profile_t enum value. by [@&#8203;melchi45](https://github.com/melchi45) in cisco/libsrtp#658
-   meson.build: implement mbedtls support by [@&#8203;iameli](https://github.com/iameli) in cisco/libsrtp#660
-   remove travis reference from README.md by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#661
-   try to use ubuntu-latest by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#664
-   Some srtp_driver fixes by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#662
-   Some cipher_driver fixes by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#663
-   start using const on internal arguments by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#665
-   Cleaning up cmake and enabled more warnings. by [@&#8203;palerikm](https://github.com/palerikm) in cisco/libsrtp#666
-   fix line break in stream_list.yml by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#668
-   remove use of pointers to 32bit values by [@&#8203;pabuhler](https://github.com/pabuhler) in cisco/libsrtp#667

#### New Contributors

-   [@&#8203;yangskyboxlabs](https://github.com/yangskyboxlabs) made their first contribution in cisco/libsrtp#640
-   [@&#8203;uniontech-lilinjie](https://github.com/uniontech-lilinjie) made their first contribution in cisco/libsrtp#648
-   [@&#8203;melchi45](https://github.com/melchi45) made their first contribution in cisco/libsrtp#658
-   [@&#8203;iameli](https://github.com/iameli) made their first contribution in cisco/libsrtp#660
-   [@&#8203;palerikm](https://github.com/palerikm) made their first contribution in cisco/libsrtp#666

**Full Changelog**: cisco/libsrtp@v2.5.0...v2.6.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMDIuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE1Ni4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Reviewed-on: https://git.walbeck.it/walbeck-it/docker-janus-gateway/pulls/132
Co-authored-by: renovate-bot <[email protected]>
Co-committed-by: renovate-bot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants