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

TT#92250 fix incorrect strings in rtpengine codec flags

Browse Source 
Change-Id: I3d41e99da1314c3b6e9a81c4d8a81ef808503612
mr9.1
Richard Fuchs 6 years ago
parent 0554b31b6e
commit 950199a80c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
debian/patches/sipwise/rtpengine-codec-set-except.patch vendored
Unescape View File

@ -15,7 +15,7 @@
}; };
+static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, const str *val, +static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, const str *val,
+ const char *cmp1, const char *cmp2, + const char *cmp1, const char *cmp2, const char *dictstr,
+ bencode_item_t **dictp) + bencode_item_t **dictp)
+{ +{
+ str s; + str s;
@ -29,7 +29,7 @@
+ +
+ if (!*dictp) { + if (!*dictp) {
+ *dictp = bencode_list(ng_flags->dict->buffer); + *dictp = bencode_list(ng_flags->dict->buffer);
+ bencode_dictionary_add(ng_flags->codec, "transcode", + bencode_dictionary_add(ng_flags->codec, dictstr,
+ *dictp); + *dictp);
+ } + }
+ bencode_list_add_str(*dictp, &s); + bencode_list_add_str(*dictp, &s);
@ -53,7 +53,7 @@
- ng_flags->codec_transcode); - ng_flags->codec_transcode);
- } - }
- bencode_list_add_str(ng_flags->codec_transcode, &s); - bencode_list_add_str(ng_flags->codec_transcode, &s);
+ if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", &ng_flags->codec_transcode)) + if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", "transcode", &ng_flags->codec_transcode))
goto next; goto next;
- } - }
- -
@ -64,7 +64,7 @@
- ng_flags->codec_strip); - ng_flags->codec_strip);
- } - }
- bencode_list_add_str(ng_flags->codec_strip, &s); - bencode_list_add_str(ng_flags->codec_strip, &s);
+ if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, &ng_flags->codec_strip)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, "strip", &ng_flags->codec_strip))
goto next; goto next;
- } - }
- -
@ -75,7 +75,7 @@
- ng_flags->codec_offer); - ng_flags->codec_offer);
- } - }
- bencode_list_add_str(ng_flags->codec_offer, &s); - bencode_list_add_str(ng_flags->codec_offer, &s);
+ if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, &ng_flags->codec_offer)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, "offer", &ng_flags->codec_offer))
goto next; goto next;
- } - }
- -
@ -86,11 +86,11 @@
- ng_flags->codec_mask); - ng_flags->codec_mask);
- } - }
- bencode_list_add_str(ng_flags->codec_mask, &s); - bencode_list_add_str(ng_flags->codec_mask, &s);
+ if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, &ng_flags->codec_mask)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, "mask", &ng_flags->codec_mask))
+ goto next; + goto next;
+ if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, &ng_flags->codec_set)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, "set", &ng_flags->codec_set))
+ goto next; + goto next;
+ if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, &ng_flags->codec_except)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, "except", &ng_flags->codec_except))
goto next; goto next;
- } - }

Write Preview
Loading…
Cancel
Save