sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
269 discussions

git:master:c3e7b1e4: Merge pull request #2935 from kamailio/vseva/dlg_rpc

by GitHub

Module: kamailio Branch: master Commit: c3e7b1e4f402081b122ca6f0967f92005e1cfeaf URL: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T09:20:03+01:00 Merge pull request #2935 from kamailio/vseva/dlg_rpc dialog: add local_only paramter to RPC dlg.stats_active --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… Patch: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 243bb9bd9fe..7361887fe59 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2858,16 +2858,21 @@ static void rpc_dlg_stats_active(rpc_t *rpc, void *c) { dlg_cell_t *dlg; unsigned int i; + int dlg_own = 0; int dlg_starting = 0; int dlg_connecting = 0; int dlg_answering = 0; int dlg_ongoing = 0; void *h; + if(rpc->scan(c, "*d", &dlg_own) < 1) + dlg_own = 0; for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if(dlg_own != 0 && dlg->bind_addr[0] == NULL) + continue; switch(dlg->state) { case DLG_STATE_UNCONFIRMED: dlg_starting++; diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd545450..745efb51f07 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2801,7 +2801,13 @@ dlg_reset_property("timeout-noreset"); (not relying on core stats framework). </para> <para>Name: <emphasis>dlg.stats_active</emphasis></para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>local_only</emphasis> (optional) - if not 0 then filter out + non local dialogues. No bind_addr info in memory. + </para></listitem> + </itemizedlist> <para>Returned fields</para> <itemizedlist> <listitem><para>

2 years, 4 months

git:master:506672e5: dialog: add local_only paramter to RPC dlg.stats_active

by Victor Seva

Module: kamailio Branch: master Commit: 506672e523a48985f89e2c35bdab3d024df0a34d URL: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T18:23:10+01:00 dialog: add local_only paramter to RPC dlg.stats_active allows to filter out non local dialogs from stats fix #2920 --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… Patch: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 243bb9bd9fe..7361887fe59 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2858,16 +2858,21 @@ static void rpc_dlg_stats_active(rpc_t *rpc, void *c) { dlg_cell_t *dlg; unsigned int i; + int dlg_own = 0; int dlg_starting = 0; int dlg_connecting = 0; int dlg_answering = 0; int dlg_ongoing = 0; void *h; + if(rpc->scan(c, "*d", &dlg_own) < 1) + dlg_own = 0; for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if(dlg_own != 0 && dlg->bind_addr[0] == NULL) + continue; switch(dlg->state) { case DLG_STATE_UNCONFIRMED: dlg_starting++; diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd545450..745efb51f07 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2801,7 +2801,13 @@ dlg_reset_property("timeout-noreset"); (not relying on core stats framework). </para> <para>Name: <emphasis>dlg.stats_active</emphasis></para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>local_only</emphasis> (optional) - if not 0 then filter out + non local dialogues. No bind_addr info in memory. + </para></listitem> + </itemizedlist> <para>Returned fields</para> <itemizedlist> <listitem><para>

2 years, 4 months

[kamailio/kamailio] ims_usrloc_scscf: Add capability to skip a specific realm (PR #2951)

by alexyosifov

Capability to skip realm in NOTIFY's Message body reginfo tag. Added realm(string) and skip_realm(int) parameters.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2951 -- Commit Summary -- * ims_usrloc_scscf: Add capability to skip a specific realm -- File Changes -- M src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (28) M src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c (5) M src/modules/ims_usrloc_scscf/udomain.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2951.patch https://github.com/kamailio/kamailio/pull/2951.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/2951

2 years, 4 months

git:master:d39bbb08: ims_usrloc_scscf: Add capability to skip a specific realm (#2951)

by GitHub

Module: kamailio Branch: master Commit: d39bbb080ba9e3d44cc66a35a7934732c5a5e058 URL: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473… Author: alexyosifov <47529095+alexyosifov(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T09:19:00+01:00 ims_usrloc_scscf: Add capability to skip a specific realm (#2951) * ims_usrloc_scscf: Add capability to skip a specific realm Capability to skip realm in NOTIFY's Message body reginfo tag. Added realm(string) and skip_realm(int) parameters. * Update ims_usrloc_scscf_admin.xml Revert changes for user_data_xsd --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473… Patch: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473…

2 years, 4 months

git:master:f42b6c5c: presence: info logs instead of error for not maching conditions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854 URL: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T08:31:07+01:00 presence: info logs instead of error for not maching conditions --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… Patch: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a7629a4e92..0ba00f0197 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1369,10 +1369,10 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, send_412: if(!ruid) { - LM_ERR("No E_Tag match %*s\n", presentity->etag.len, + LM_INFO("No E-Tag match %*s\n", presentity->etag.len, presentity->etag.s); } else { - LM_ERR("No ruid match %*s\n", ruid->len, ruid->s); + LM_INFO("No ruid match %*s\n", ruid->len, ruid->s); } if(msg != NULL) {

2 years, 4 months

git:master:b83810eb: core: parser/sdp - check for delimiter size done before comparison

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b83810eb1eb70f326698db874a1f67cf6a8d06cf URL: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T13:29:00+01:00 core: parser/sdp - check for delimiter size done before comparison --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… Patch: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 144d63b537..c62a347ddc 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -794,12 +794,12 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) return NULL; /* We matched '--', * now let's match the boundary delimiter */ + if(cp1+2+delimiter.len >= plimit) + return NULL; if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) break; else cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; } if (cp1[-1] == '\n' || cp1[-1] == '\r') return cp1;

2 years, 4 months

git:master:1b5756ae: core: parser/sdp - coherent indentation of two functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1b5756ae9f67c3907c134eb725f19c875cccd913 URL: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T13:13:32+01:00 core: parser/sdp - coherent indentation of two functions --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… Patch: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e118b4ac33..144d63b537 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -742,7 +742,7 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) } /* eliminate leading whitespace */ - tmp=eat_lws_end(tmp, end); + tmp=eat_lws_end(tmp, end); if (tmp>=end) { LM_ERR("hf empty\n"); goto error; @@ -781,32 +781,32 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) { - static char delimiterhead[3] = "--"; - char *cp, *cp1; - /* Iterate through body */ - cp = p; - for (;;) { - if (cp >= plimit) - return NULL; - for(;;) { - cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); - if (cp1 == NULL) - return NULL; - /* We matched '--', - * now let's match the boundary delimiter */ - if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) - break; - else - cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; - } - if (cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; - if (plimit - cp1 < 2 + delimiter.len) - return NULL; - cp = cp1 + 2 + delimiter.len; - } + static char delimiterhead[3] = "--"; + char *cp, *cp1; + /* Iterate through body */ + cp = p; + for (;;) { + if (cp >= plimit) + return NULL; + for(;;) { + cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); + if (cp1 == NULL) + return NULL; + /* We matched '--', + * now let's match the boundary delimiter */ + if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) + break; + else + cp = cp1 + 2 + delimiter.len; + if (cp >= plimit) + return NULL; + } + if (cp1[-1] == '\n' || cp1[-1] == '\r') + return cp1; + if (plimit - cp1 < 2 + delimiter.len) + return NULL; + cp = cp1 + 2 + delimiter.len; + } } @@ -815,10 +815,10 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) */ char *find_next_sdp_line_delimiter(char* p, char* plimit, str delimiter, char* defptr) { - char *t; - if (p >= plimit || plimit - p < 3) - return defptr; - t = find_sdp_line_delimiter(p + 2, plimit, delimiter); - return t ? t : defptr; + char *t; + if (p >= plimit || plimit - p < 3) + return defptr; + t = find_sdp_line_delimiter(p + 2, plimit, delimiter); + return t ? t : defptr; }

2 years, 4 months

git:master:c1ec3857: core: parser/sdp - cast to unsigned for left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c1ec3857f360c806b7cc856b8e6ae3d5362ef49f URL: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T12:31:29+01:00 core: parser/sdp - cast to unsigned for left shifting --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… Patch: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 8f189cf2072..e118b4ac331 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -52,7 +52,10 @@ static struct { #define READ(val) \ - (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + ((unsigned int)(*(val + 0)) \ + + ((unsigned int)(*(val + 1)) << 8) \ + + ((unsigned int)(*(val + 2)) << 16) \ + + ((unsigned int)(*(val + 3)) << 24)) #define advance(_ptr,_n,_str,_error) \ do{\ if ((_ptr)+(_n)>(_str).s+(_str).len)\

2 years, 4 months

git:master:48dc90df: core: parser - print start of buffer on error for identity info

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48dc90dfa1839a405e7d090b23c1fdc907107731 URL: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-11T18:40:51+01:00 core: parser - print start of buffer on error for identity info --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… Patch: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index e58bcd26ff..6aaabf2377 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -313,7 +313,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p<end) { LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p, status, (int)(p-buffer), ZSW(p)); + *p, status, (int)(p-buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

2 years, 4 months

[kamailio/kamailio] ims_charging: fix charging reply route with kemi (PR #2972)

by Riccardo-78

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2972 -- Commit Summary -- * ims_charging: fix charging reply route with kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (30) M src/modules/ims_charging/ims_ro.c (35) M src/modules/ims_charging/ims_ro.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2972.patch https://github.com/kamailio/kamailio/pull/2972.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/2972

2 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021