sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
284 discussions

git:master:acafe707: sanity: Use str_list implementation from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: acafe70708a13ac7f549cb113d99af53ee0ac088 URL: https://github.com/kamailio/kamailio/commit/acafe70708a13ac7f549cb113d99af5… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T14:32:05+02:00 sanity: Use str_list implementation from core * Remove redundant str_list implementation. * Improve docs --- Modified: src/modules/sanity/doc/sanity_admin.xml Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity.h Modified: src/modules/sanity/sanity_mod.c Modified: src/modules/sanity/sanity_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/acafe70708a13ac7f549cb113d99af5… Patch: https://github.com/kamailio/kamailio/commit/acafe70708a13ac7f549cb113d99af5…

2 years, 7 months

git:master:c3091228: topos: restore attributes based on direction for early dialog requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c309122864eaa2bfa58253290bed49084ccc9302 URL: https://github.com/kamailio/kamailio/commit/c309122864eaa2bfa58253290bed490… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T14:28:26+02:00 topos: restore attributes based on direction for early dialog requests - GH #3090 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/c309122864eaa2bfa58253290bed490… Patch: https://github.com/kamailio/kamailio/commit/c309122864eaa2bfa58253290bed490… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c16a0adacb..cd781328e5 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -863,10 +863,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) mtsd.direction = direction; } - tps_storage_lock_release(&lkey); - if(use_branch) { + if(use_branch && direction == TPS_DIR_DOWNSTREAM) { nuri = stsd.b_contact; } else { if(direction == TPS_DIR_UPSTREAM) { @@ -884,7 +883,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(use_branch) { + if(use_branch && direction == TPS_DIR_DOWNSTREAM) { if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1;

2 years, 7 months

git:master:ceb688b3: topos: use direction for loading invite record for other early dialog requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ceb688b3d364bb7b8d9f52b7238d560cb4e30b3d URL: https://github.com/kamailio/kamailio/commit/ceb688b3d364bb7b8d9f52b7238d560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T09:02:01+02:00 topos: use direction for loading invite record for other early dialog requests - GH #3090 --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ceb688b3d364bb7b8d9f52b7238d560… Patch: https://github.com/kamailio/kamailio/commit/ceb688b3d364bb7b8d9f52b7238d560… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c7de5e514f..c16a0adacb 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -803,6 +803,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) uint32_t direction = TPS_DIR_DOWNSTREAM; int ret; int use_branch = 0; + unsigned int metid = 0; LM_DBG("handling incoming request\n"); @@ -835,11 +836,11 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { goto error; } - if(((((get_cseq(msg)->method_id) & (METHOD_PRACK|METHOD_UPDATE)) - && stsd.b_contact.len <= 0)) || (((get_cseq(msg)->method_id) - & (METHOD_BYE) && stsd.b_contact.len <= 0) && (0 == dialog))) { + metid = get_cseq(msg)->method_id; + if((metid & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { + if(metid & (METHOD_BYE|METHOD_UPDATE)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; @@ -917,7 +918,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) goto error; } } - if((get_cseq(msg)->method_id)&(METHOD_SUBSCRIBE)) { + if(metid & METHOD_SUBSCRIBE) { if(tps_storage_update_dialog(msg, &mtsd, &stsd, TPS_DBU_CONTACT|TPS_DBU_TIME)<0) { goto error; } diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 1a67c0252c..56d56776a4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1146,7 +1146,11 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; - db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_tag); + if(md->direction==TPS_DIR_DOWNSTREAM) { + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_tag); + } else { + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_tag); + } nr_keys++; db_keys[nr_keys]=&tt_col_s_method;

2 years, 7 months

git:master:098955e2: xmlops: coherent formatting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 098955e23289b82db40d5cef76ee03bf09e8a0da URL: https://github.com/kamailio/kamailio/commit/098955e23289b82db40d5cef76ee03b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T09:02:01+02:00 xmlops: coherent formatting --- Modified: src/modules/xmlops/pv_xml.c Modified: src/modules/xmlops/pv_xml.h Modified: src/modules/xmlops/xmlops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/098955e23289b82db40d5cef76ee03b… Patch: https://github.com/kamailio/kamailio/commit/098955e23289b82db40d5cef76ee03b…

2 years, 7 months

[kamailio/kamailio] Kamailio tries to parse HTTP replies as SIP ? (Issue #3081)

by Alexandru Pirvulescu

### Description This is a longstanding error when using websockets or the HTTP client (this one is a bit newer, didn't see it for long). Searching the net has led me here: https://lists.kamailio.org/pipermail/sr-users/2018-January/099881.html It looks like Kamailio cannot parse HTTP responses, but that message is ambigous. Why would it try to parse them in the first place? ``` 32(203) ERROR: <core> [core/parser/msg_parser.c:748]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 100 Continue ``` ``` 47(89) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 101 Switching Protocols ```  ### Troubleshooting Except confirming that the messages are legit, there is nothing else that I can do. #### Reproduction  The first error is generated by making HTTP requests using the HTTP client embedded in Kamailio. The second error happens on each WebRTC call served by Kamailio. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  HTTP responses should not go through the core message parser. Not sure if this can be described as a "solution". ### Additional Information * **Kamailio Version** - output of `kamailio -v` For the 100 parsing error. The used HTTP clients are `http_client` and `http_async_client` modules. ``` # kamailio -v version: kamailio 5.5.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` For the 101 parsing error. Kamailio is a WebRTC server for `sipML5` library. ``` # kamailio -v version: kamailio 5.4.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` # uname -a Linux gke-dev-1-sbc-out-dbbddabc-amiw 5.4.0-1054-gke #57-Ubuntu SMP Fri Oct 1 03:16:03 UTC 2021 x86_64 GNU/Linux ``` ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3081 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3081(a)github.com>

2 years, 7 months

[kamailio/kamailio] xhttp: fix typo (PR #3089)

by liviu-rolo

#### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3089 -- Commit Summary -- * fix typo -- File Changes -- M src/modules/xhttp/xhttp_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3089.patch https://github.com/kamailio/kamailio/pull/3089.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3089 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3089(a)github.com>

2 years, 7 months

git:master:f406d036: fix typo

by Henning Westerholt

Module: kamailio Branch: master Commit: f406d036af6abd7330b6b250bba04f2875f073d0 URL: https://github.com/kamailio/kamailio/commit/f406d036af6abd7330b6b250bba04f2… Author: liviu-rolo <82887358+liviu-rolo(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-19T12:06:58+02:00 fix typo --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f406d036af6abd7330b6b250bba04f2… Patch: https://github.com/kamailio/kamailio/commit/f406d036af6abd7330b6b250bba04f2… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 1aec2763d9..31b2efb4d6 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -145,7 +145,7 @@ static int mod_init(void) if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { LM_WARN("tcp_accept_no_cl not set - usually required" - " to handle HTTP requests with no Content-Lenght\n"); + " to handle HTTP requests with no Content-Length\n"); } /* bind the SL API */

2 years, 7 months

git:master:24776e14: modules: readme files regenerated - presence ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 24776e1463742b11cf0201093105129235216d7b URL: https://github.com/kamailio/kamailio/commit/24776e1463742b11cf0201093105129… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-19T12:01:16+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/24776e1463742b11cf0201093105129… Patch: https://github.com/kamailio/kamailio/commit/24776e1463742b11cf0201093105129… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c06ccdd6ec..9e378a5681 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -1340,8 +1340,8 @@ r * each watcher. It either gets the body received by the PUBLISH, or the bod y * generated by the agg_nbody function. - * The module can deceide if it makes a copy of the original body, which is -then + * The module can decide if it makes a copy of the original body, which is t +hen * manipulated, or if it works directly in the original body. If the module makes a * copy of the original body, it also has to register the aux_free_body() to

2 years, 7 months

[kamailio/kamailio] presence: fix typos (PR #3087)

by liviu-rolo

#### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3087 -- Commit Summary -- * fix typos -- File Changes -- M src/modules/presence/doc/presence_devel.xml (2) M src/modules/presence/event_list.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3087.patch https://github.com/kamailio/kamailio/pull/3087.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3087 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3087(a)github.com>

2 years, 7 months

git:master:f63a4645: fix typos

by Henning Westerholt

Module: kamailio Branch: master Commit: f63a4645afe1c52050bbd8050bf3c392acc985b8 URL: https://github.com/kamailio/kamailio/commit/f63a4645afe1c52050bbd8050bf3c39… Author: Liviu Andron <liviu.andron(a)bjtmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-19T11:46:06+02:00 fix typos --- Modified: src/modules/presence/doc/presence_devel.xml Modified: src/modules/presence/event_list.h --- Diff: https://github.com/kamailio/kamailio/commit/f63a4645afe1c52050bbd8050bf3c39… Patch: https://github.com/kamailio/kamailio/commit/f63a4645afe1c52050bbd8050bf3c39… --- diff --git a/src/modules/presence/doc/presence_devel.xml b/src/modules/presence/doc/presence_devel.xml index 608fa6eeb5..2bb1953764 100644 --- a/src/modules/presence/doc/presence_devel.xml +++ b/src/modules/presence/doc/presence_devel.xml @@ -115,7 +115,7 @@ typedef struct pres_ev * If a module registers the aux_body_processing callback, it gets called for * each watcher. It either gets the body received by the PUBLISH, or the body * generated by the agg_nbody function. - * The module can deceide if it makes a copy of the original body, which is then + * The module can decide if it makes a copy of the original body, which is then * manipulated, or if it works directly in the original body. If the module makes a * copy of the original body, it also has to register the aux_free_body() to * free this "per watcher" body. diff --git a/src/modules/presence/event_list.h b/src/modules/presence/event_list.h index 3f30cb8265..7874a1f967 100644 --- a/src/modules/presence/event_list.h +++ b/src/modules/presence/event_list.h @@ -88,7 +88,7 @@ struct pres_ev * 0 - the standard mechanism (allocating new etag for each Publish) * 1 - allocating an etag only for an initial Publish * */ - /* fileds that deal with authorization rules*/ + /* fields that deal with authorization rules*/ /* * req_auth -> flag 0 - if not require * is_watcher_allowed - get subscription state from xcap rules @@ -114,7 +114,7 @@ struct pres_ev * If a module registers the aux_body_processing callback, it gets called for * each watcher. It either gets the body received by the PUBLISH, or the body * generated by the agg_nbody function. - * The module can deceide if it makes a copy of the original body, which is then + * The module can decide if it makes a copy of the original body, which is then * manipulated, or if it works directly in the original body. If the module makes a * copy of the original body, it also has to register the aux_free_body() to * free this "per watcher" body.

2 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022