sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
306 discussions

[kamailio/kamailio] textops: RFC2543 is broken (#2844)

by lazedo

commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51 broke RFC2543 hold there's no need to check for sendrecv_mode, is_on_hold is either set or not in sdp_stream and/or sdp_session   #### 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] Small 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  removed the check for `sendrecv_mode` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2844 -- Commit Summary -- * textops: RFC2543 is broken -- File Changes -- M src/modules/textops/textops.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2844.patch https://github.com/kamailio/kamailio/pull/2844.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/2844

3 years, 3 months

git:master:3ee0670e: textops: RFC2543 is broken

by lazedo

Module: kamailio Branch: master Commit: 3ee0670ee9ca5e2812fd90cccef3a7ae4e55a3b4 URL: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:12:12+01:00 textops: RFC2543 is broken commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51 broke RFC2543 hold there's no need to check for sendrecv_mode, is_on_hold is either set or not in sdp_stream and/or sdp_session --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… Patch: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 84e93f30ed..bfb5a54941 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4517,13 +4517,10 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - !sdp_stream->sendrecv_mode.len && - sdp_session->sendrecv_mode.len && sdp_session->is_on_hold) return sdp_session->is_on_hold; sdp_stream_num++;

3 years, 3 months

[kamailio/kamailio] xlog: add prefix_mode (#2845)

by lazedo

allows pv_format specifier in prefix param   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  add `prefix_mode` param to xlog to optionally interpret `prefix` as a `pv_format` specifier. `config`: ``` mod_param("xlog", "prefix", "$_s([$(cfg(file):$cfg(line)] $ci $(cfg(route){s.tolower}) )") mod_param("xlog", "prefix_mode", 1) ... xlog("L_INFO", "hello") ... ``` `output:` <pre><code> 66(307) INFO: <b>[my-file.cfg:5]</b> 62795aa2-9696c27c <b>my_route</b> hello </code> </pre> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2845 -- Commit Summary -- * xlog: add prefix_mode -- File Changes -- M src/modules/xlog/doc/xlog_admin.xml (22) M src/modules/xlog/xlog.c (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2845.patch https://github.com/kamailio/kamailio/pull/2845.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/2845

3 years, 3 months

git:master:88e5f613: xlog: add prefix_mode

by lazedo

Module: kamailio Branch: master Commit: 88e5f6130a26f37e4e5dfa515ef640443bbc6873 URL: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:11:47+01:00 xlog: add prefix_mode allows pv_format specifier in prefix param --- Modified: src/modules/xlog/doc/xlog_admin.xml Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… Patch: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3a6b029c6e..3fcda4c105 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -165,6 +165,28 @@ modparam("xlog", "long_format", 1) ... modparam("xlog", "prefix", "-xlog: ") ... +</programlisting> + </example> + </section> + <section id="xlog.p.varname"> + <title><varname>prefix_mode</varname> (str)</title> + <para> + control behaviour of <varname>prefix</varname> value. + if mode = 0 then <varname>prefix</varname> is treated as string (current behaviour). + if mode = 1 then <varname>prefix</varname> is treated as pv_format specifier and value will be evaluated before output. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>prefix_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xlog", "prefix", "$cfg(name):$cfg(line)") +modparam("xlog", "prefix_mode", 1) +... </programlisting> </example> </section> diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index ed167d80ba..ea05e51833 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -60,6 +60,9 @@ MODULE_VERSION char *_xlog_buf = NULL; char *_xlog_prefix = "<script>: "; +int _xlog_prefix_mode = 0; +char *_xlog_prefix_buf = NULL; +pv_elem_t *_xlog_prefix_pvs = NULL; /** parameters */ static int buf_size=4096; @@ -170,6 +173,7 @@ static param_export_t params[]={ {"log_facility", PARAM_STRING, &xlog_facility_name}, {"log_colors", PARAM_STRING|USE_FUNC_PARAM, (void*)xlog_log_colors_param}, {"methods_filter", PARAM_INT, &xlog_default_cfg.methods_filter}, + {"prefix_mode", INT_PARAM, &_xlog_prefix_mode}, {0,0,0} }; @@ -215,6 +219,27 @@ static int mod_init(void) PKG_MEM_ERROR; return -1; } + + if (_xlog_prefix_mode) { + str s; + s.s = _xlog_prefix; + s.len = strlen(s.s); + + if(pv_parse_format(&s, &_xlog_prefix_pvs)<0) + { + LM_ERR("wrong format[%s]\n", s.s); + return -1; + } + + _xlog_prefix_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); + if(_xlog_prefix_buf==NULL) + { + PKG_MEM_ERROR; + return -1; + } + + } + return 0; } @@ -222,12 +247,23 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, int level, int line, int facility) { str txt; + char * _xlog_prefix_val = _xlog_prefix; txt.len = buf_size; + txt.s = _xlog_buf; if(xl_print_log(msg, xm->m, _xlog_buf, &txt.len)<0) return -1; - txt.s = _xlog_buf; + + if (_xlog_prefix_mode) { + str _xlog_prefix_str; + _xlog_prefix_str.s = _xlog_prefix_buf; + _xlog_prefix_str.len = buf_size; + if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s, &_xlog_prefix_str.len) == 0 && _xlog_prefix_str.len > 0) { + _xlog_prefix_val = _xlog_prefix_buf; + } + } + /* if facility is not explicitely defined use the xlog default facility */ if (facility==NOFACILITY) { facility = xlog_facility; @@ -235,7 +271,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, if(line>0) if(long_format==1) - LOG_FN(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix_val, "%s:%d:%.*s", (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", (xm->a)?xm->a->cline:0, txt.len, txt.s); @@ -243,7 +279,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, LOG_FN(facility, level, _xlog_prefix, "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_FN(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix_val, "%.*s", txt.len, txt.s); return 1; } @@ -488,6 +524,10 @@ static void destroy(void) { if(_xlog_buf) pkg_free(_xlog_buf); + if(_xlog_prefix_buf) + pkg_free(_xlog_prefix_buf); + if(_xlog_prefix_pvs) + pv_elem_free_all(_xlog_prefix_pvs); } static int xdbg_fixup_helper(void** param, int param_no, int mode)

3 years, 3 months

git:master:c12ddec3: modules: readme files regenerated - misctest ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c12ddec36c7c321054c188eb8efdccd7bb04e168 URL: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-07T11:01:26+02:00 modules: readme files regenerated - misctest ... [skip ci] --- Modified: src/modules/misctest/README --- Diff: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd… Patch: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd…

3 years, 3 months

git:master:c89d1e92: misctest: added option to perform tests for sip message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c89d1e922742e93913517d245686b552ded40b09 URL: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:41+02:00 misctest: added option to perform tests for sip message --- Modified: src/modules/misctest/doc/misctest_params.xml Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55… Patch: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55…

3 years, 3 months

git:master:d6c52a6a: core: parser contact - link structure once finishing current one

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4 URL: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:40+02:00 core: parser contact - link structure once finishing current one --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… Patch: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 650740b1a1..8c6ebdd6bb 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -262,13 +262,14 @@ int parse_contacts(str* _s, contact_t** _c) _s->len--; trim_leading(_s); + c->next = *_c; + *_c = c; + c = NULL; + if (_s->len == 0) { LM_ERR("text after comma missing\n"); goto error; } - - c->next = *_c; - *_c = c; } error:

3 years, 3 months

git:master:d2dbe98e: core: relocate parse_contact_hader() to parser folder

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d2dbe98e072f59138b9974ab8f147bcfef5f983e URL: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:40+02:00 core: relocate parse_contact_hader() to parser folder --- Modified: src/core/parser/contact/parse_contact.c Modified: src/core/parser/contact/parse_contact.h Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… Patch: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… --- diff --git a/src/core/parser/contact/parse_contact.c b/src/core/parser/contact/parse_contact.c index 37a075a17d..242c4a0756 100644 --- a/src/core/parser/contact/parse_contact.c +++ b/src/core/parser/contact/parse_contact.c @@ -228,7 +228,7 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev) } /** - * + * Parse all contact headers */ int parse_contact_headers(sip_msg_t *msg) { @@ -254,3 +254,20 @@ int parse_contact_headers(sip_msg_t *msg) return 0; } + +/** + * Parse first contact header + */ +int parse_contact_header(sip_msg_t *msg) +{ + if ( !msg->contact && ( parse_headers(msg,HDR_CONTACT_F,0)==-1 + || !msg->contact)) { + LM_DBG("bad msg or missing CONTACT header\n"); + return -1; + } + + if (msg->contact->parsed) + return 0; + + return parse_contact(msg->contact); +} diff --git a/src/core/parser/contact/parse_contact.h b/src/core/parser/contact/parse_contact.h index 4d8e1cd642..e6e38b6e9e 100644 --- a/src/core/parser/contact/parse_contact.h +++ b/src/core/parser/contact/parse_contact.h @@ -75,4 +75,9 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev); */ int parse_contact_headers(sip_msg_t *msg); +/* + * parse first Contact header + */ +int parse_contact_header(sip_msg_t *msg); + #endif /* PARSE_CONTACT_H */ diff --git a/src/core/select_core.c b/src/core/select_core.c index 02d393a6ba..9b6e2df2d9 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -221,18 +221,6 @@ SELECT_uri_header(from) SELECT_uri_header(refer_to) SELECT_uri_header(rpid) -int parse_contact_header( struct sip_msg *msg) -{ - if ( !msg->contact && ( parse_headers(msg,HDR_CONTACT_F,0)==-1 || !msg->contact)) { - LM_DBG("bad msg or missing CONTACT header\n"); - return -1; - } - - if (msg->contact->parsed) - return 0; - - return parse_contact(msg->contact); -} #define get_contact(msg) ((contact_body_t*)(msg->contact->parsed))

3 years, 3 months

Info: Kamailio World 2021 starting soon - live stream

by Daniel-Constantin Mierla

Hello, to sync better on time, Kamailio World 2021 online edition is starting in about 2 hours from now (12:50 UTC Welcome and 13:00UTC the first session) - the agenda is available at: * https://kamailioworld.com/k09-online/ In short: participation is free, no registration is needed. The sessions are live streamed to YouTube KamailioWorld channel: * https://www.youtube.com/c/KamailioWorld/ YouTube chat next to the live stream can be used for addressing questions to speakers -- we will monitor it and ask the speaker inside the video conferencing room. For community interaction via text chatting, you can join the Matrix room #kamailio:matrix.kamailio.dev : * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev Questions for speakers can also be addressed in this chat room. If anyone wants to participate in the live video conferencing room, the URL is: * https://meet.kamailioworld.com/live Just note that we may have to limit the number of participants in the live session in order to ensure proper streaming quality. See you soon online! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 years, 3 months

git:master:afcf3fb4: modules: readme files regenerated - misctest ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: afcf3fb4eff2cebd88d60c31f74ed952f331f729 URL: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T15:31:14+02:00 modules: readme files regenerated - misctest ... [skip ci] --- Modified: src/modules/misctest/README --- Diff: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95… Patch: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95…

3 years, 3 months

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021