May 2022 - sr-dev - kamailio.org

[kamailio/kamailio] core: add an option to trigger also an RST on tcp connection close (PR #3100)
by Rick Barenthin 03 May '22

03 May '22

- This gives an option to also send RST in case kamailio closes the connection. There are cases where a FIN,ACK back forth leaves the connection in the host in TIME_WAIT state, but the ports on both sides are fixed. This leads to no request can send until the TIME_WAIT state is gone.   #### 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  We have seen that in deployments where there are strict port requirements on both side, there are tcp connections in TIME_WAIT state causing no fresh TCP connections possible until the TIME_WAIT is gone. In a lot of these case the clients are sending from them self a RST after they send a FIN,ACK from there side but some aren't doing this. The basic idea of this PR is to give an extra option for the tcp configuration from the cfg to trigger always an RST on connection close from Kamailio side. This currently done by enabling SO_LINGER with a value of 0 just before close. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3100 -- Commit Summary -- * core: add an option to trigger also an RST on tcp connection close -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/tcp_main.c (7) M src/core/tcp_options.c (3) M src/core/tcp_options.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3100.patch https://github.com/kamailio/kamailio/pull/3100.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3100 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3100(a)github.com>

2 3

git:master:c0b5e627: core: clang format for sip msg clone code
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: c0b5e62782e0c8d5eb10eeb9d8e0952b1cb720d6 URL: https://github.com/kamailio/kamailio/commit/c0b5e62782e0c8d5eb10eeb9d8e0952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T12:09:07+02:00 core: clang format for sip msg clone code --- Modified: src/core/sip_msg_clone.c Modified: src/core/sip_msg_clone.h --- Diff: https://github.com/kamailio/kamailio/commit/c0b5e62782e0c8d5eb10eeb9d8e0952… Patch: https://github.com/kamailio/kamailio/commit/c0b5e62782e0c8d5eb10eeb9d8e0952…

1 0

[kamailio/kamailio] pv_headers: fix possible mem. overflow issue and wrong size string (PR #3095)
by Tomohare 03 May '22

03 May '22

#### 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - remove a variable creation Put two variable accessible to the entire function, renaming one to have some clarity. Remove the useless variable. - Change from using snprintf to memset (no more \0 at last position) This fix possible a memory overflow while using `snprintf`. This also add a \0 at the end of the structure, so a more direct approach with `memset` was used. - change the destination of an allocated space being smaller than the source Elements were being put into a smaller string, this commit makes the destination bigger then the source. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3095 -- Commit Summary -- * pv_headers: fix possible mem. overflow issue and wrong size string -- File Changes -- M src/modules/pv_headers/pvh_func.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3095.patch https://github.com/kamailio/kamailio/pull/3095.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3095 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3095(a)github.com>

4 6

git:master:82f14f54: pv_headers: fix possible mem. overflow issue and wrong size string
by Victor Seva 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 82f14f54a45a2d0ddd4c870d6fb4adae7e1a65f1 URL: https://github.com/kamailio/kamailio/commit/82f14f54a45a2d0ddd4c870d6fb4ada… Author: Fabricio Santolin da Silva <fabricio.santolin-da-silva(a)al-enterprise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-03T10:04:17+02:00 pv_headers: fix possible mem. overflow issue and wrong size string - remove a variable creation - change from using snprintf to memset (no more \0 at last position) - change the destination of a allocated space being smaller than the source --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/82f14f54a45a2d0ddd4c870d6fb4ada… Patch: https://github.com/kamailio/kamailio/commit/82f14f54a45a2d0ddd4c870d6fb4ada… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index c2a3f98e41..dde1b8301b 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -383,13 +383,13 @@ int pvh_header_param_exists(struct sip_msg *msg, str *hname, str *hvalue) int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *elements, str *toRemove) { + int notTarget, writtenChars; int offset = 0; int ret = -1; char *next_token; char *token; char *result = (char*)pkg_malloc(elements->len - toRemove->len); - char *t = (char*)pkg_malloc(elements->len); - int maxSize = elements->len; + char *t = (char*)pkg_malloc(elements->len+1); if (result == NULL || t == NULL) { @@ -397,37 +397,35 @@ int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *eleme goto clean; } - snprintf(result, elements->len - toRemove->len, "%*s", elements->len - toRemove->len, ""); snprintf(t, elements->len+1, "%s", elements->s); token = strtok_r(t, ", ", &next_token); while(token) { - int notTarget = strncmp(token, toRemove->s, toRemove->len); + notTarget = strncmp(token, toRemove->s, toRemove->len); if (notTarget) { - int n = snprintf(result + offset, maxSize - offset, "%s", token); - if (n < 0 || n >= maxSize - offset) + writtenChars = snprintf(result + offset, elements->len - offset, "%s", token); + if (writtenChars < 0 || writtenChars >= elements->len - offset) { break; } - offset += n; + offset += writtenChars; } token = strtok_r(NULL, ", ", &next_token); - if (token && notTarget && maxSize - offset - toRemove->len > 2) + if (token && notTarget && elements->len - offset - toRemove->len > 2) { - int n = snprintf(result + offset, maxSize - offset, ", "); - if (n < 0 || n >= maxSize - offset) + writtenChars = snprintf(result + offset, elements->len - offset, ", "); + if (writtenChars < 0 || writtenChars >= elements->len - offset) { break; } - offset += n; + offset += writtenChars; } } if (elements->len-toRemove->len > 0) { - snprintf(elements->s, elements->len, "%*s", elements->len-toRemove->len, ""); snprintf(elements->s, (strlen(result)%elements->len)+1, "%s", result); elements->len = strlen(result); ret = 1;

1 0

git:master:64d14117: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 64d141170430fad2e9dbe09fc5bec0b96cedf040 URL: https://github.com/kamailio/kamailio/commit/64d141170430fad2e9dbe09fc5bec0b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-02T17:01:19+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/64d141170430fad2e9dbe09fc5bec0b… Patch: https://github.com/kamailio/kamailio/commit/64d141170430fad2e9dbe09fc5bec0b…

1 0

[kamailio/kamailio] userblocklist: add RPC functions (PR #3097)
by Stefan Mititelu 02 May '22

02 May '22

#### 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  Ported mi functions to RPC. Note that in order to send long number strings (e.g. username) from kamcmd one must prefix it with "s:" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3097 -- Commit Summary -- * userblocklist: add RPC functions -- File Changes -- M src/modules/userblocklist/userblocklist.c (348) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3097.patch https://github.com/kamailio/kamailio/pull/3097.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3097 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3097(a)github.com>

3 6

git:master:4192d734: userblocklist: add RPC functions
by Henning Westerholt 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 4192d734640acedbc6509170166876a20675f2a7 URL: https://github.com/kamailio/kamailio/commit/4192d734640acedbc6509170166876a… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:54:00+02:00 userblocklist: add RPC functions --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml Modified: src/modules/userblocklist/userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/4192d734640acedbc6509170166876a… Patch: https://github.com/kamailio/kamailio/commit/4192d734640acedbc6509170166876a…

1 0

[kamailio/kamailio] pua_dialoginfo: Determine dialog event types in mod_init (PR #3079)
by Bastian Triller 02 May '22

02 May '22

Determine dialog event types for dialog callback on module initialization, since these will not change.   #### 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:  - [ ] 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/3079 -- Commit Summary -- * pua_dialoginfo: Determine dialog event types in mod_init -- File Changes -- M src/modules/pua_dialoginfo/pua_dialoginfo.c (29) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3079.patch https://github.com/kamailio/kamailio/pull/3079.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3079 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3079(a)github.com>

2 6

git:master:fa3cf27a: pua_dialoginfo: Determine dialog event types in mod_init
by Henning Westerholt 02 May '22

02 May '22

Module: kamailio Branch: master Commit: fa3cf27abf1f76ef90941f47ef81adef4ffae68e URL: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:42:35+02:00 pua_dialoginfo: Determine dialog event types in mod_init Determine dialog event types for dialog callback on module initialization, since these will not change. --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… Patch: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 7b27e666c5..2dae4d449b 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -101,6 +101,7 @@ int disable_callee_publish_flag = DEF_DISABLE_CALLEE_PUBLISH_FLAG; char * pubruri_caller_avp = DEF_PUBRURI_CALLER_AVP; char * pubruri_callee_avp = DEF_PUBRURI_CALLEE_AVP; int publish_dialog_req_within = DEF_PUBLISH_DIALOG_REQ_WITHIN; +int dialog_event_types = DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_EARLY; int puadinfo_attribute_display = 0; @@ -622,25 +623,12 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } /* register dialog callbacks which triggers sending PUBLISH */ - if (publish_dialog_req_within) { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_REQ_WITHIN | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } else { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } + if (dlg_api.register_dlgcb(dlg, dialog_event_types, + __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { + LM_ERR("cannot register callback for interesting dialog types\n"); + free_dlginfo_cell(dlginfo); + return NULL; + } #ifdef PUA_DIALOGINFO_DEBUG /* dialog callback testing (registered last to be executed first) */ @@ -856,6 +844,9 @@ static int mod_init(void) LM_DBG("configured to use headers for uri values\n"); } + if(publish_dialog_req_within) + dialog_event_types |= DLGCB_REQ_WITHIN; + return 0; }

1 0

[kamailio/kamailio] core/crypto: fix several mismatched bound warnings (PR #3098)
by Ovidiu Sas 02 May '22

02 May '22

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fix for the following compiler warnings: ``` core/crypto/sha256.c:548:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 548 | void sr_SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:86:22: note: previously declared as ‘uint8_t[32]’ {aka ‘unsigned char[32]’} 86 | void sr_SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:611:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 611 | char *sr_SHA256_End(SHA256_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:87:34: note: previously declared as ‘char[65]’ 87 | char* sr_SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:911:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 911 | void sr_SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:98:22: note: previously declared as ‘uint8_t[64]’ {aka ‘unsigned char[64]’} 98 | void sr_SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:940:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 940 | char *sr_SHA512_End(SHA512_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:99:34: note: previously declared as ‘char[129]’ 99 | char* sr_SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:986:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 986 | void sr_SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:92:22: note: previously declared as ‘uint8_t[48]’ {aka ‘unsigned char[48]’} 92 | void sr_SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:1015:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 1015 | char *sr_SHA384_End(SHA384_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:93:34: note: previously declared as ‘char[97]’ 93 | char* sr_SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3098 -- Commit Summary -- * core/crypto: fix several mismatched bound warnings -- File Changes -- M src/core/crypto/sha256.c (16) M src/core/crypto/sha256.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3098.patch https://github.com/kamailio/kamailio/pull/3098.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3098 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3098(a)github.com>

2 2