sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:aea932ba: jansson: Add en-/decode to/from xavp

by Alex Hermann

Module: kamailio Branch: master Commit: aea932ba841416091b5ec93ef23011cd4257da68 URL: https://github.com/kamailio/kamailio/commit/aea932ba841416091b5ec93ef23011c… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:17:02+02:00 jansson: Add en-/decode to/from xavp Nested objects/arrays are not supported with the exception of decoding a root array with only objects as items to multiple xavps. --- Modified: src/modules/jansson/doc/jansson_admin.xml Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c Modified: src/modules/jansson/jansson_utils.c Modified: src/modules/jansson/jansson_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/aea932ba841416091b5ec93ef23011c… Patch: https://github.com/kamailio/kamailio/commit/aea932ba841416091b5ec93ef23011c…

3 years, 8 months

[kamailio/kamailio] Fixes/janssonrpcc (#2512)

by Alex Hermann

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix invalid memory access (beyond the string). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2512 -- Commit Summary -- * janssonrpcc: Zero-terminate all string copies * janssonrpcc: Remove unused variable and redundant assignment -- File Changes -- M src/modules/janssonrpcc/janssonrpc.h (32) M src/modules/janssonrpcc/janssonrpc_funcs.c (15) M src/modules/janssonrpcc/janssonrpc_server.c (14) M src/modules/janssonrpcc/janssonrpc_srv.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2512.patch https://github.com/kamailio/kamailio/pull/2512.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2512

3 years, 8 months

git:master:61771b05: janssonrpcc: cleanups (#2512)

by GitHub

Module: kamailio Branch: master Commit: 61771b0595c126d884e8c1eb392a54b5786a8fa8 URL: https://github.com/kamailio/kamailio/commit/61771b0595c126d884e8c1eb392a54b… Author: Alex Hermann <alex(a)hexla.nl> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:32:02+02:00 janssonrpcc: cleanups (#2512) * janssonrpcc: Remove unused variable and redundant assignment * janssonrpc: No need for copying options The address stay valid until free_params is called. And before that happens, mod_jsonrpc_request() makes its own copy. --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/61771b0595c126d884e8c1eb392a54b… Patch: https://github.com/kamailio/kamailio/commit/61771b0595c126d884e8c1eb392a54b… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 93e62bd53d..70b3e9413e 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -44,7 +44,6 @@ int jsonrpc_request(struct sip_msg* _m, str params; str options; str route; - param_hooks_t phooks; param_t* pit=NULL; param_t* freeme=NULL; int retry; @@ -85,7 +84,7 @@ int jsonrpc_request(struct sip_msg* _m, options.len--; } - if (parse_params(&options, CLASS_ANY, &phooks, &pit)<0) { + if (parse_params(&options, CLASS_ANY, NULL, &pit)<0) { ERR("failed parsing params value\n"); return -1; } @@ -95,8 +94,7 @@ int jsonrpc_request(struct sip_msg* _m, for (; pit;pit=pit->next) { if PIT_MATCHES("route") { - pkg_str_dup(&route, &pit->body); - CHECK_MALLOC_GOTO(route.s, end); + route = pit->body; } else if PIT_MATCHES("timeout") { timeout = atoi(pit->body.s); @@ -123,8 +121,6 @@ int jsonrpc_request(struct sip_msg* _m, goto end; } - retval = 0; - retval = mod_jsonrpc_request( _m, /* sip_msg */ conn, /* connection group */ @@ -138,7 +134,6 @@ int jsonrpc_request(struct sip_msg* _m, end: if(freeme) free_params(freeme); - if(route.s) pkg_free(route.s); return retval; }

3 years, 8 months

git:master:b09a0f12: Merge pull request #2526 from smititelu/master

by GitHub

Module: kamailio Branch: master Commit: b09a0f12a721a257fae8009d6c475a71c011ed52 URL: https://github.com/kamailio/kamailio/commit/b09a0f12a721a257fae8009d6c475a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:26:27+02:00 Merge pull request #2526 from smititelu/master textops: fix append_hf function --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/b09a0f12a721a257fae8009d6c475a7… Patch: https://github.com/kamailio/kamailio/commit/b09a0f12a721a257fae8009d6c475a7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6dcbeedb0b..7f11999cc0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3361,7 +3361,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3372,6 +3372,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3384,20 +3385,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

3 years, 8 months

git:master:4adea97a: textops: fix append_hf function

by Stefan Mititelu

Module: kamailio Branch: master Commit: 4adea97a4f8a9b35273d4d28b0518964abb7f0d8 URL: https://github.com/kamailio/kamailio/commit/4adea97a4f8a9b35273d4d28b051896… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-10-22T16:54:04+03:00 textops: fix append_hf function Before: append_hf adds header after first header occurance After: append_hf adds header after last header occurance --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4adea97a4f8a9b35273d4d28b051896… Patch: https://github.com/kamailio/kamailio/commit/4adea97a4f8a9b35273d4d28b051896… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6dcbeedb0b..7f11999cc0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3361,7 +3361,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3372,6 +3372,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3384,20 +3385,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

3 years, 8 months

git:master:432c7dd3: core: kemi - use parse_hname2_str() to avoid cloning header name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 432c7dd30976d1e4be9db35de39d67cc0e1a5e95 URL: https://github.com/kamailio/kamailio/commit/432c7dd30976d1e4be9db35de39d67c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T09:28:14+02:00 core: kemi - use parse_hname2_str() to avoid cloning header name --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/432c7dd30976d1e4be9db35de39d67c… Patch: https://github.com/kamailio/kamailio/commit/432c7dd30976d1e4be9db35de39d67c… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index b69499dfb5..4060ad9d4d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2275,8 +2275,6 @@ static int sr_kemi_hdr_append_to_reply(sip_msg_t *msg, str *txt) static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, int rmode) { - char hbuf[256]; - str s; hdr_field_t shdr; hdr_field_t *ihdr; #define SR_KEMI_VHDR_SIZE 256 @@ -2296,23 +2294,12 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if(hname->len>=252) { - LM_ERR("header name too long\n"); + if (parse_hname2_str(hname, &shdr)==0) { + LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - memcpy(hbuf, hname->s, hname->len); - hbuf[hname->len] = ':'; - hbuf[hname->len+1] = '\0'; - s.s = hbuf; - s.len = hname->len + 1; - - if (parse_hname2_short(s.s, s.s + s.len, &shdr)==0) { - LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); - sr_kemi_xval_null(&_sr_kemi_xval, rmode); - return &_sr_kemi_xval; - } n = 0; for (ihdr=msg->headers; ihdr; ihdr=ihdr->next) { hmatch = 0;

3 years, 8 months

git:master:8bf1935c: rtpengine: support new codec flags

by Richard Fuchs

Module: kamailio Branch: master Commit: 8bf1935c4e9cb0081784dbd8bd951148b8865381 URL: https://github.com/kamailio/kamailio/commit/8bf1935c4e9cb0081784dbd8bd95114… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-10-21T14:05:20-04:00 rtpengine: support new codec flags Adds explicit support for codec-set and codec-except. Also eliminates code redundancy. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8bf1935c4e9cb0081784dbd8bd95114… Patch: https://github.com/kamailio/kamailio/commit/8bf1935c4e9cb0081784dbd8bd95114… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 95726fa4a1..c3e7e75601 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -119,7 +119,8 @@ struct ng_flags_parse { int via, to, packetize, transport, directional; bencode_item_t *dict, *flags, *direction, *replace, *rtcp_mux, *sdes, *t38, - *codec, *codec_strip, *codec_offer, *codec_transcode, *codec_mask; + *codec, *codec_strip, *codec_offer, *codec_transcode, *codec_mask, + *codec_set, *codec_except; str call_id, from_tag, to_tag; }; @@ -2082,6 +2083,29 @@ static const char *transports[] = { [0x06] = "UDP/TLS/RTP/SAVPF", }; +static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, const str *val, + const char *cmp1, const char *cmp2, + bencode_item_t **dictp) +{ + str s; + + if (!str_key_val_prefix(key, cmp1, val, &s)) { + if (!cmp2) + return 0; + if (!str_key_val_prefix(key, cmp2, val, &s)) + return 0; + } + + if (!*dictp) { + *dictp = bencode_list(ng_flags->dict->buffer); + bencode_dictionary_add(ng_flags->codec, "transcode", + *dictp); + } + bencode_list_add_str(*dictp, &s); + + return 1; +} + static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enum rtpe_operation *op, const char *flags_str) { @@ -2135,47 +2159,18 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu goto next; } - if (str_key_val_prefix(&key, "transcode", &val, &s) - || str_key_val_prefix(&key, "codec-transcode", &val, &s)) - { - if (!ng_flags->codec_transcode) { - ng_flags->codec_transcode = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "transcode", - ng_flags->codec_transcode); - } - bencode_list_add_str(ng_flags->codec_transcode, &s); + if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", &ng_flags->codec_transcode)) goto next; - } - - if (str_key_val_prefix(&key, "codec-strip", &val, &s)) { - if (!ng_flags->codec_strip) { - ng_flags->codec_strip = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "strip", - ng_flags->codec_strip); - } - bencode_list_add_str(ng_flags->codec_strip, &s); + if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, &ng_flags->codec_strip)) goto next; - } - - if (str_key_val_prefix(&key, "codec-offer", &val, &s)) { - if (!ng_flags->codec_offer) { - ng_flags->codec_offer = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "offer", - ng_flags->codec_offer); - } - bencode_list_add_str(ng_flags->codec_offer, &s); + if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, &ng_flags->codec_offer)) goto next; - } - - if (str_key_val_prefix(&key, "codec-mask", &val, &s)) { - if (!ng_flags->codec_mask) { - ng_flags->codec_mask = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "mask", - ng_flags->codec_mask); - } - bencode_list_add_str(ng_flags->codec_mask, &s); + if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, &ng_flags->codec_mask)) + goto next; + if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, &ng_flags->codec_set)) + goto next; + if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, &ng_flags->codec_except)) goto next; - } /* check for specially handled items */ switch (key.len) {

3 years, 8 months

git:master:b999e086: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b999e086d51202916a4cdfaf143150e3b8fa10cf URL: https://github.com/kamailio/kamailio/commit/b999e086d51202916a4cdfaf143150e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-22T17:46:28+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b999e086d51202916a4cdfaf143150e… Patch: https://github.com/kamailio/kamailio/commit/b999e086d51202916a4cdfaf143150e… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 00e3746ffe..b72a92de2a 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2088,13 +2088,19 @@ rtpengine_offer(); engaged. Only codecs that are supported for both decoding and encoding can be added in this manner. More details about this are found in the rtpengine README. + + codec-set=... - set codec options (bitrate etc) for codecs + that are implicitly accepted for transcoding from the offering + side. + codec-strip=... - strips given codec from sdp + codec-offer=... - offer given codec from sdp. More details about this are found in the rtpengine README. + + codec-except=... - same as codec-offer but preserves original + order + codec-mask=... - Similar to strip except that codecs listed here will still be accepted and used for transcoding on the - offering side.Useful only in combination with codec-transcode. - all keyword can be used to mask all offered codecs + offering side. Useful only in combination with + codec-transcode. all keyword can be used to mask all offered + codecs + T.38=decode - If the offered SDP contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section over RTP. By default, PCMU and PCMA will be used

3 years, 8 months

git:master:4de33ea9: rtpengine: update README for 8bf1935c

by Richard Fuchs

Module: kamailio Branch: master Commit: 4de33ea963b40a5150f34fac8f63d04c5992515e URL: https://github.com/kamailio/kamailio/commit/4de33ea963b40a5150f34fac8f63d04… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-10-22T11:40:47-04:00 rtpengine: update README for 8bf1935c --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4de33ea963b40a5150f34fac8f63d04… Patch: https://github.com/kamailio/kamailio/commit/4de33ea963b40a5150f34fac8f63d04… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 362fa58910..db7e7334b9 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2392,6 +2392,11 @@ rtpengine_offer(); this manner. More details about this are found in the rtpengine README. </para></listitem> + <listitem><para> + <emphasis>codec-set=...</emphasis> - set codec options (bitrate etc) for codecs that are implicitly + accepted for transcoding from the offering side. + </para></listitem> + <listitem><para> <emphasis>codec-strip=...</emphasis> - strips given codec from sdp </para></listitem> @@ -2401,9 +2406,13 @@ rtpengine_offer(); More details about this are found in the rtpengine README. </para></listitem> + <listitem><para> + <emphasis>codec-except=...</emphasis> - same as <emphasis>codec-offer</emphasis> but preserves original order + </para></listitem> + <listitem><para> <emphasis>codec-mask=...</emphasis> - Similar to strip except that codecs listed here will still be accepted - and used for transcoding on the offering side.Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword + and used for transcoding on the offering side. Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword can be used to mask all offered codecs </para></listitem> <listitem><para>

3 years, 8 months

[kamailio/kamailio] Wrong callid in ACK for negative reply(hop by hop ACK) (#2525)

by korithi

Hello guys, My kamailio version is: version: kamailio 5.1.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. I am facing a strange bug with TM in case of negative replies. A party sends the invite B party connects the call B party after a few time sends in dialog invite with t38 media. A party rejects the in-dialog invite with 488 Kamailio send ACK to A party(since it is an ACK for negative replies it is build in each hop) The problem in this case is that the ACK sent by kamailio to A party has the callid of kamailio - B party. Since it has a different callid the A party does not recognize the ACK. How can I resolve this issue? Thanks and regards, Rafael -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2525

3 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020