sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#55283 allow alternative list/string usage

Browse Source 
so that certain options can be given as SDES=off instead of SDES-off and
still work.

Change-Id: Iba0c70f8c239ac68d52bfa40e015e8a79bf27e39
pull/1611/head
Richard Fuchs 2 years ago
parent f1e856b2d3
commit d02e825683
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File

16
daemon/call_interfaces.c
Unescape View File

@ -672,13 +672,19 @@ INLINE void ng_t38_option(struct sdp_ng_flags *out, str *s, void *dummy) {
static void call_ng_flags_list(struct sdp_ng_flags *out, bencode_item_t *list, static void call_ng_flags_list(struct sdp_ng_flags *out, bencode_item_t *list,
void (*callback)(struct sdp_ng_flags *, str *, void *), void *parm) void (*callback)(struct sdp_ng_flags *, str *, void *), void *parm)
{ {
if (list->type != BENCODE_LIST) str s;
if (list->type != BENCODE_LIST) {
if (bencode_get_str(list, &s))
callback(out, &s, parm);
else
ilog(LOG_DEBUG, "Ignoring non-list non-string value");
return; return;
}
for (bencode_item_t *it = list->child; it; it = it->sibling) { for (bencode_item_t *it = list->child; it; it = it->sibling) {
str s; if (bencode_get_str(it, &s))
if (!bencode_get_str(it, &s)) callback(out, &s, parm);
continue; else
callback(out, &s, parm); ilog(LOG_DEBUG, "Ignoring non-string value in list");
} }
} }
static void call_ng_flags_rtcp_mux(struct sdp_ng_flags *out, str *s, void *dummy) { static void call_ng_flags_rtcp_mux(struct sdp_ng_flags *out, str *s, void *dummy) {

24
t/auto-daemon-tests.pl
Unescape View File

@ -8840,18 +8840,6 @@ a=rtpmap:0 PCMU/8000
a=sendrecv a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=rtcp-mux a=rtcp-mux
a=crypto:1 AEAD_AES_256_GCM inline:CRYPTO256S
a=crypto:2 AEAD_AES_128_GCM inline:CRYPTO128S
a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:CRYPTO256
a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:CRYPTO256
a=crypto:5 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
a=crypto:6 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
a=crypto:7 AES_CM_128_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:8 AES_CM_128_HMAC_SHA1_32 inline:CRYPTO128
a=crypto:9 F8_128_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:10 F8_128_HMAC_SHA1_32 inline:CRYPTO128
a=crypto:11 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID a=tls-id:TLS_ID
@ -8959,18 +8947,6 @@ a=rtpmap:0 PCMU/8000
a=sendrecv a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=rtcp-mux a=rtcp-mux
a=crypto:1 AEAD_AES_256_GCM inline:CRYPTO256S
a=crypto:2 AEAD_AES_128_GCM inline:CRYPTO128S
a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:CRYPTO256
a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:CRYPTO256
a=crypto:5 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
a=crypto:6 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
a=crypto:7 AES_CM_128_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:8 AES_CM_128_HMAC_SHA1_32 inline:CRYPTO128
a=crypto:9 F8_128_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:10 F8_128_HMAC_SHA1_32 inline:CRYPTO128
a=crypto:11 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID a=tls-id:TLS_ID

Write Preview
Loading…
Cancel
Save