- sr-dev - kamailio.org

git:master:a0285e6d: modules: readme files regenerated - cfgutils ... [skip ci]
by Kamailio Dev 03 May '22

03 May '22

Module: kamailio Branch: master Commit: a0285e6d6f1aec539e89df60cf5aeb78c6a0409b URL: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-03T20:01:15+02:00 modules: readme files regenerated - cfgutils ... [skip ci] --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… Patch: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… --- diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index 3d46af3ba3..890952c7c5 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -757,11 +757,11 @@ $ kamcmd cfgutils.get_gflags Example 1.34. RANDOM pseudo-variable usage ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git:master:79b2e4b0: cfgutils: improve example for $RANDOM
by Henning Westerholt 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 79b2e4b00ebf7a7cdf0ed3b9c4ab7f0176d78686 URL: https://github.com/kamailio/kamailio/commit/79b2e4b00ebf7a7cdf0ed3b9c4ab7f0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-03T17:45:49Z cfgutils: improve example for $RANDOM --- Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79b2e4b00ebf7a7cdf0ed3b9c4ab7f0… Patch: https://github.com/kamailio/kamailio/commit/79b2e4b00ebf7a7cdf0ed3b9c4ab7f0… --- diff --git a/src/modules/cfgutils/doc/cfgutils_admin.xml b/src/modules/cfgutils/doc/cfgutils_admin.xml index 5f411a272a..7df0a2a87e 100644 --- a/src/modules/cfgutils/doc/cfgutils_admin.xml +++ b/src/modules/cfgutils/doc/cfgutils_admin.xml @@ -839,11 +839,11 @@ $ &kamcmd; cfgutils.get_gflags <programlisting format="linespecific"> ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git:master:e5efcbdd: msilo: skip invalid stored records
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: e5efcbdd7be9897cf169b28a7a52c45bff24cac3 URL: https://github.com/kamailio/kamailio/commit/e5efcbdd7be9897cf169b28a7a52c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T19:19:52+02:00 msilo: skip invalid stored records --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/e5efcbdd7be9897cf169b28a7a52c45… Patch: https://github.com/kamailio/kamailio/commit/e5efcbdd7be9897cf169b28a7a52c45… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 0bf53ecc5a..f7218bfa61 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -1406,6 +1406,10 @@ void m_send_ontimer(unsigned int ticks, void *param) SET_STR_VAL(str_vals[0], db_res, i, 1); /* user */ SET_STR_VAL(str_vals[1], db_res, i, 2); /* host */ SET_STR_VAL(str_vals[2], db_res, i, 3); /* body */ + if(str_vals[0].s==NULL || str_vals[1].s==NULL || str_vals[2].s==NULL) { + LM_DBG("message[%d] mid=%d has no user, host or body\n", i, mid); + continue; + } SET_STR_VAL(str_vals[3], db_res, i, 4); /* ctype */ extra_hdrs_str.len = 0;

1 0

git:master:0c99fed4: snmpstats: fix allocator sizeof operand mismatch
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 0c99fed48403e2cc4f24441901b81b7c51411511 URL: https://github.com/kamailio/kamailio/commit/0c99fed48403e2cc4f24441901b81b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T19:07:41+02:00 snmpstats: fix allocator sizeof operand mismatch --- Modified: src/modules/snmpstats/snmpSIPRegUserLookupTable.c Modified: src/modules/snmpstats/snmpSIPRegUserTable.c --- Diff: https://github.com/kamailio/kamailio/commit/0c99fed48403e2cc4f24441901b81b7… Patch: https://github.com/kamailio/kamailio/commit/0c99fed48403e2cc4f24441901b81b7… --- diff --git a/src/modules/snmpstats/snmpSIPRegUserLookupTable.c b/src/modules/snmpstats/snmpSIPRegUserLookupTable.c index 9ded597b83..f00dde9ac7 100644 --- a/src/modules/snmpstats/snmpSIPRegUserLookupTable.c +++ b/src/modules/snmpstats/snmpSIPRegUserLookupTable.c @@ -520,7 +520,7 @@ void kamailioSIPRegUserLookupTable_set_action(netsnmp_request_group *rg) case COLUMN_KAMAILIOSIPREGUSERLOOKUPURI: row_ctx->kamailioSIPRegUserLookupURI = - pkg_malloc(sizeof(char) * (var->val_len + 1)); + pkg_malloc(sizeof(unsigned char) * (var->val_len + 1)); memcpy(row_ctx->kamailioSIPRegUserLookupURI, var->val.string, var->val_len); @@ -776,4 +776,4 @@ kamailioSIPRegUserLookupTable_get_by_idx(netsnmp_index *hdr) { return (const kamailioSIPRegUserLookupTable_context *)CONTAINER_FIND( cb.container, hdr); -} \ No newline at end of file +} diff --git a/src/modules/snmpstats/snmpSIPRegUserTable.c b/src/modules/snmpstats/snmpSIPRegUserTable.c index 4ad5bf3307..6d4270a188 100644 --- a/src/modules/snmpstats/snmpSIPRegUserTable.c +++ b/src/modules/snmpstats/snmpSIPRegUserTable.c @@ -248,7 +248,7 @@ int createRegUserRow(char *stringToRegister) theRow->kamailioSIPUserIndex = index; theRow->kamailioSIPUserUri = - (unsigned char *)pkg_malloc(stringLength * sizeof(char)); + (unsigned char *)pkg_malloc(stringLength * sizeof(unsigned char)); if(theRow->kamailioSIPUserUri == NULL) { pkg_free(OIDIndex); free(theRow); @@ -378,4 +378,4 @@ const kamailioSIPRegUserTable_context *kamailioSIPRegUserTable_get_by_idx( { return (const kamailioSIPRegUserTable_context *)CONTAINER_FIND( cb.container, hdr); -} \ No newline at end of file +}

1 0

[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

git:master:b4daf059: core/crypto: fix several mismatched bound warnings
by Henning Westerholt 02 May '22

02 May '22

Module: kamailio Branch: master Commit: b4daf05991f5fd5faae0defcf8802b650d6a4d24 URL: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:42:21+02:00 core/crypto: fix several mismatched bound warnings --- Modified: src/core/crypto/sha256.c Modified: src/core/crypto/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6… Patch: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6…

1 0

git:master:3de5a781: snmpstats: use same type as the pointer for sizeof
by Daniel-Constantin Mierla 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 3de5a781a3d0333352ab72c6b790f472f393df2b URL: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-30T17:21:42+02:00 snmpstats: use same type as the pointer for sizeof --- Modified: src/modules/snmpstats/snmpSIPContactTable.c --- Diff: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… Patch: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… --- diff --git a/src/modules/snmpstats/snmpSIPContactTable.c b/src/modules/snmpstats/snmpSIPContactTable.c index d23f8557ac..e953bae6a3 100644 --- a/src/modules/snmpstats/snmpSIPContactTable.c +++ b/src/modules/snmpstats/snmpSIPContactTable.c @@ -203,7 +203,7 @@ int createContactRow(int userIndex, int contactIndex, char *contactName, /* Fill in the rest of the rows columns */ theRow->kamailioSIPContactURI = - (unsigned char *)pkg_malloc((stringLength + 1) * sizeof(char)); + (unsigned char *)pkg_malloc((stringLength + 1) * sizeof(unsigned char)); if(theRow->kamailioSIPContactURI == NULL) { pkg_free(OIDIndex); free(theRow);

1 0

git:master:47169b67: cdp: use same data type for size computing as pointer type
by Daniel-Constantin Mierla 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 47169b6774759131e9e535f2b9d358772b777b9c URL: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-01T16:28:41+02:00 cdp: use same data type for size computing as pointer type --- Modified: src/modules/cdp/acceptor.c --- Diff: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… Patch: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… --- diff --git a/src/modules/cdp/acceptor.c b/src/modules/cdp/acceptor.c index 003f531fe2..4821ddd38e 100644 --- a/src/modules/cdp/acceptor.c +++ b/src/modules/cdp/acceptor.c @@ -79,12 +79,12 @@ void acceptor_process(dp_config *cfg) unsigned int sock; LM_INFO("Acceptor process starting up...\n"); - listening_socks = pkg_malloc((cfg->acceptors_cnt+1)*sizeof(int)); + listening_socks = pkg_malloc((cfg->acceptors_cnt+1)*sizeof(unsigned int)); if (!listening_socks){ - LOG_NO_MEM("pkg",(cfg->acceptors_cnt+1)*sizeof(int)); + LOG_NO_MEM("pkg",(cfg->acceptors_cnt+1)*sizeof(unsigned int)); goto done; } - memset(listening_socks,0,(cfg->acceptors_cnt+1)*sizeof(int)); + memset(listening_socks,0,(cfg->acceptors_cnt+1)*sizeof(unsigned int)); k=0; for(i=0;i<cfg->acceptors_cnt;i++) if (create_socket(cfg->acceptors[i].port,cfg->acceptors[i].bind,&sock)){

1 0

git:master:69c004ee: core: modparam - safety check for str s pointer
by Daniel-Constantin Mierla 29 Apr '22

29 Apr '22

Module: kamailio Branch: master Commit: 69c004eec161c14d957f9e4011aeff4163af858d URL: https://github.com/kamailio/kamailio/commit/69c004eec161c14d957f9e4011aeff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-29T14:04:12+02:00 core: modparam - safety check for str s pointer - deal with the case of argument with 'nonnull' attribute passed null --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/69c004eec161c14d957f9e4011aeff4… Patch: https://github.com/kamailio/kamailio/commit/69c004eec161c14d957f9e4011aeff4… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 361536691d..0ccecf7c90 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -147,6 +147,12 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) break; case PARAM_STR: + if( ((str*)val2)->s==NULL) { + LM_ERR("null value\n"); + regfree(&preg); + pkg_free(reg); + return -1; + } ((str*)ptr)->s = pkg_malloc(((str*)val2)->len+1); if (!((str*)ptr)->s) { PKG_MEM_ERROR;

1 0

git:master:dfc407c4: core: main - check the debug cli param value
by Daniel-Constantin Mierla 29 Apr '22

29 Apr '22

Module: kamailio Branch: master Commit: dfc407c4009acbd6e05ecfaf4e727b0636ab92a4 URL: https://github.com/kamailio/kamailio/commit/dfc407c4009acbd6e05ecfaf4e727b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-29T09:44:46+02:00 core: main - check the debug cli param value --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/dfc407c4009acbd6e05ecfaf4e727b0… Patch: https://github.com/kamailio/kamailio/commit/dfc407c4009acbd6e05ecfaf4e727b0… --- diff --git a/src/main.c b/src/main.c index 2a268a689b..cb0c92e357 100644 --- a/src/main.c +++ b/src/main.c @@ -2100,6 +2100,10 @@ int main(int argc, char** argv) ksr_slog_init(optarg); break; case KARGOPTVAL+8: + if (optarg == NULL) { + fprintf(stderr, "bad debug level value\n"); + goto error; + } debug_flag = 1; default_core_cfg.debug=(int)strtol(optarg, &tmp, 10); if ((tmp==0) || (*tmp)){

1 0

Kamailio functionality clarification - call forwarding no replay (call is ringing but not answered)
by VESELOVSKY Pavel 29 Apr '22

29 Apr '22

Hallo all, I would need help with Kamailio. I hope, you can give me some hints. I would like use Kamailio for CFNRy feature call forward no replay, i.e. * call is forked to multiple destination * 180 is received, call is ringing, but not answered, no 200 OK is received from some destination * after predefined time (CFNRy timer), only this specific branch has to be rerouted to another destination Expected behaviour is described in this flow: [cid:image001.png@01D85B0C.FCF06DE0] My current behavior: * Kamailio TM module is involved for parallel forking (https://www.kamailio.org/docs/modules/stable/modules/tm.html#:~:text=1.-,Ov…) * all branches are CANCEL-ed, it is not possible send CANCEL just to one specific branch [cid:image002.png@01D85B0C.FCF06DE0] My questions: * is it possible to CANCEL just specific branch? * is it possible start timer just for specific branch? * do you think is it possible somehow implement this feature with Kamailio? Thanks a lot in advance for any comment. Pavel.

2 1

git:master:89495b85: db_redis: free db vals on error
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 89495b8595d37f4d24e10e5ed1177614b2979d82 URL: https://github.com/kamailio/kamailio/commit/89495b8595d37f4d24e10e5ed117761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T14:09:13+02:00 db_redis: free db vals on error --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/89495b8595d37f4d24e10e5ed117761… Patch: https://github.com/kamailio/kamailio/commit/89495b8595d37f4d24e10e5ed117761… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 68536816a8..254e0f6b3e 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2164,6 +2164,8 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con if (db_redis_build_type_keys(con, CON_TABLE(_h), db_keys, db_vals, all_type_keys_count, &type_keys, &set_keys, &type_keys_count) != 0) { LM_ERR("failed to build type keys\n"); + pkg_free(db_vals); + db_vals = NULL; goto error; } pkg_free(db_keys); @@ -2306,7 +2308,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con if (scard != 0) continue; - + if (db_redis_key_add_string(&query_v, "SREM", 4) != 0) { LM_ERR("Failed to add srem command to post-delete query\n"); goto error;

1 0

git:master:eba6c7d7: presence_xml: free uri for http xcap auth
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: eba6c7d78088cde411f5cd1b7730ba458e62a69e URL: https://github.com/kamailio/kamailio/commit/eba6c7d78088cde411f5cd1b7730ba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T14:03:55+02:00 presence_xml: free uri for http xcap auth --- Modified: src/modules/presence_xml/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/eba6c7d78088cde411f5cd1b7730ba4… Patch: https://github.com/kamailio/kamailio/commit/eba6c7d78088cde411f5cd1b7730ba4… --- diff --git a/src/modules/presence_xml/xcap_auth.c b/src/modules/presence_xml/xcap_auth.c index 0cf0669ca1..c40f0a899e 100644 --- a/src/modules/presence_xml/xcap_auth.c +++ b/src/modules/presence_xml/xcap_auth.c @@ -521,7 +521,7 @@ int get_rules_doc( int http_get_rules_doc(str user, str domain, str *rules_doc) { - str uri; + str uri = STR_NULL; xcap_doc_sel_t doc_sel; char *doc = NULL; xcap_serv_t *xs; @@ -559,6 +559,8 @@ int http_get_rules_doc(str user, str domain, str *rules_doc) rules_doc->s = doc; rules_doc->len = doc ? strlen(doc) : 0; + pkg_free(uri.s); + return 0; error:

1 0

git:master:33921b79: cfgt: free dest.s before return on error
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 33921b79a4f5849f85a588332fe8debfb4d27c0e URL: https://github.com/kamailio/kamailio/commit/33921b79a4f5849f85a588332fe8deb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:42:21+02:00 cfgt: free dest.s before return on error --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/33921b79a4f5849f85a588332fe8deb… Patch: https://github.com/kamailio/kamailio/commit/33921b79a4f5849f85a588332fe8deb… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index b8345b4565..489fdfe445 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -394,6 +394,7 @@ void cfgt_save_node(cfgt_node_p node) LM_DBG("dir [%s] already exists\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); + pkg_free(dest.s); return; } dest.s[dir] = '/';

1 0

git:master:cacae7fc: sms: use unsigned int for bit shifting for compiler warnings
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: cacae7fc5db5418a67d543995273280d57f027c6 URL: https://github.com/kamailio/kamailio/commit/cacae7fc5db5418a67d543995273280… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:31:41+02:00 sms: use unsigned int for bit shifting for compiler warnings --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/cacae7fc5db5418a67d543995273280… Patch: https://github.com/kamailio/kamailio/commit/cacae7fc5db5418a67d543995273280… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index e8c7590456..a98cfd80d8 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -55,7 +55,7 @@ mailto:s.frings@mail.isis.de /* converts an octet to a 8-Bit value */ static inline int octet2bin(char* octet) { - int result=0; + unsigned int result=0; if (octet[0]>57) result=octet[0]-55; @@ -66,7 +66,7 @@ static inline int octet2bin(char* octet) result+=octet[1]-55; else result+=octet[1]-48; - return result; + return (int)result; }

1 0

git:master:9fd0cae9: lrkproxy: init value for compiler warning
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 9fd0cae960b0795a5e511c37f768f0962b7a15c1 URL: https://github.com/kamailio/kamailio/commit/9fd0cae960b0795a5e511c37f768f09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:10:23+02:00 lrkproxy: init value for compiler warning --- Modified: src/modules/lrkproxy/lrkproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/9fd0cae960b0795a5e511c37f768f09… Patch: https://github.com/kamailio/kamailio/commit/9fd0cae960b0795a5e511c37f768f09… --- diff --git a/src/modules/lrkproxy/lrkproxy.c b/src/modules/lrkproxy/lrkproxy.c index e30f4e976b..157048c350 100644 --- a/src/modules/lrkproxy/lrkproxy.c +++ b/src/modules/lrkproxy/lrkproxy.c @@ -1284,7 +1284,7 @@ static int change_media_sdp(sip_msg_t *msg, struct lrkproxy_hash_entry *e, const e->snat_ipv4.len = strlen(e->snat_ipv4.s); str current_port; - unsigned int snat_port; + unsigned int snat_port = 0; str2int(&e->dst_port, &snat_port);

1 0

git:master:cfb50124: xcap_client: init structure
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: cfb50124e67b68552520e418a20ad2dfec96117b URL: https://github.com/kamailio/kamailio/commit/cfb50124e67b68552520e418a20ad2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:04:37+02:00 xcap_client: init structure --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cfb50124e67b68552520e418a20ad2d… Patch: https://github.com/kamailio/kamailio/commit/cfb50124e67b68552520e418a20ad2d… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index 607628dbb4..efd434c2ab 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -309,6 +309,7 @@ int parse_doc_url(str doc_url, char** serv_addr, xcap_doc_sel_t* doc_sel) { char* sl, *str_type; + memset(doc_sel, 0, sizeof(xcap_doc_sel_t)); sl= strchr(doc_url.s, '/'); if(sl==NULL) { return -1;

1 0

git:master:b5aae4f5: rls: safety check for dialog structur
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: b5aae4f5afd07db114c3ff7712b484f743663b26 URL: https://github.com/kamailio/kamailio/commit/b5aae4f5afd07db114c3ff7712b484f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T12:15:12+02:00 rls: safety check for dialog structur --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/b5aae4f5afd07db114c3ff7712b484f… Patch: https://github.com/kamailio/kamailio/commit/b5aae4f5afd07db114c3ff7712b484f… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index d3ad4fd1fc..0343a5c665 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -420,8 +420,9 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, if(rlmi_doc) { - LM_DBG("timer_send_notify at end len_est = %d resource_added = %d\n", len_est, resource_added); - if (resource_added == 1) + LM_DBG("timer notify at end len_est = %d resource_added = %d dlg = %p\n", + len_est, resource_added, dialog); + if (resource_added == 1 && dialog != NULL) { send_notify(&rlmi_doc, buf, buf_len, bstr, dialog, hash_code); }

1 0

git:master:f6620aa5: pkg/kamailio/deb: set version 5.6.0~pre1
by Victor Seva 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: f6620aa5fe7ef65ddd7fa232829ea9cfb3f0f774 URL: https://github.com/kamailio/kamailio/commit/f6620aa5fe7ef65ddd7fa232829ea9c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-28T09:46:31+02:00 pkg/kamailio/deb: set version 5.6.0~pre1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/f6620aa5fe7ef65ddd7fa232829ea9c… Patch: https://github.com/kamailio/kamailio/commit/f6620aa5fe7ef65ddd7fa232829ea9c…

1 0

git:master:67da7301: topos: catch INFO requests during early dialog phase
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 67da7301f1eb74b6fff9e6e73b43f08dbc9c53bf URL: https://github.com/kamailio/kamailio/commit/67da7301f1eb74b6fff9e6e73b43f08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T09:36:09+02:00 topos: catch INFO requests during early dialog phase --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/67da7301f1eb74b6fff9e6e73b43f08… Patch: https://github.com/kamailio/kamailio/commit/67da7301f1eb74b6fff9e6e73b43f08… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index cd781328e5..83d5f5fddf 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -837,7 +837,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) goto error; } metid = get_cseq(msg)->method_id; - if((metid & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + if((metid & (METHOD_BYE|METHOD_INFO|METHOD_PRACK|METHOD_UPDATE)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ if(metid & (METHOD_BYE|METHOD_UPDATE)) {

1 0

git:master:dc2ef8ed: async: proper pv function name
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: dc2ef8edaacb6947019cbde0a4c3ca238bee56c2 URL: https://github.com/kamailio/kamailio/commit/dc2ef8edaacb6947019cbde0a4c3ca2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T09:20:08+02:00 async: proper pv function name --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2ef8edaacb6947019cbde0a4c3ca2… Patch: https://github.com/kamailio/kamailio/commit/dc2ef8edaacb6947019cbde0a4c3ca2… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index b51887e351..02c3b8d488 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -649,7 +649,7 @@ int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) /** * */ -int pv_parse_geoip_name(pv_spec_t *sp, str *in) +int pv_parse_async_name(pv_spec_t *sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) return -1;

1 0

git:master:bd71add6: Makefile.defs: version set to 5.6.0-pre1
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: bd71add6616e283f9f60a28785170c41c439f905 URL: https://github.com/kamailio/kamailio/commit/bd71add6616e283f9f60a28785170c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T09:02:07+02:00 Makefile.defs: version set to 5.6.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bd71add6616e283f9f60a28785170c4… Patch: https://github.com/kamailio/kamailio/commit/bd71add6616e283f9f60a28785170c4… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 90aa777782..41c7b31652 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

dlg_isflagset not working on CANCEL request
by David Escartín 27 Apr '22

27 Apr '22

hello all Using kamailio 5.4 version, we have seen that dlg_isflagset is not detecting a dialog flag set in the request route for the initial INVITE, when a CANCEL request arrives. We have applied this change to set the dialog context unique ide for this request. Since it's done on dlg_onreply, dlg_onroute and dlg_ontimeout functions. This way, dlg_get_by_iuid(&dctx->iuid) in the function ki_dlg_isflagset is not NULL and dialog flags are detected. Is this change correct? Or can it generate any kind of issues? diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 3f8adefb79..f1df4a76c5 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1255,6 +1255,9 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) msg->callid->body.len, msg->callid->body.s); return NULL; } + if(msg->first_line.u.request.method_value == METHOD_CANCEL) { + dlg_set_ctx_iuid(dlg); + } if(dir) *dir = vdir; return dlg; } thanks a lot and regards David -- <http://www.sonoc.io/> David Escartín NOC engineer *www.sonoc.io* <http://www.sonoc.io/> [image: LinkedIn] <https://www.linkedin.com/company/sonoc> [image: Twitter] <https://twitter.com/sonoc_> [image: Facebook] <https://www.facebook.com/SONOCio/> This e-mail is for the exclusive use of its recipients and may contain business secrets or other confidential or privileged information. Any unauthorised use, copying, publication or distribution of this e-mail is strictly prohibited. If you are not the intended recipient, please inform us immediately by replying to this e-mail and delete it, including any attachments or copies on your system. In accordance with the GDPR (EU) 2016/679 and the LOPDGDD 3/2018, we inform you that this e-mail address and/or any other personal data you have provided us with will be treated by SONOC with absolute confidentiality and with the only purpose of providing you with the requested services, due to your condition as a client, supplier or because you have requested information from us at any time. These data will only be kept for as long as required to comply with legal obligations. You can exercise your rights at any time by sending an e-mail to: *dataprotection(a)sonoc.io* <dataprotection(a)sonoc.io>*.* <dataprotection(a)sonoc.io>

2 1

git:master:cfca8106: cfgt: improve detection of dynamic format
by Victor Seva 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: cfca81063c36ff2f1fe5578f89ccf9c0701e818a URL: https://github.com/kamailio/kamailio/commit/cfca81063c36ff2f1fe5578f89ccf9c… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-27T15:59:43+02:00 cfgt: improve detection of dynamic format * skip tm vars $T_* --- Modified: src/modules/cfgt/cfgt_json.c --- Diff: https://github.com/kamailio/kamailio/commit/cfca81063c36ff2f1fe5578f89ccf9c… Patch: https://github.com/kamailio/kamailio/commit/cfca81063c36ff2f1fe5578f89ccf9c… --- diff --git a/src/modules/cfgt/cfgt_json.c b/src/modules/cfgt/cfgt_json.c index b3dea63de4..d3aca8d305 100644 --- a/src/modules/cfgt/cfgt_json.c +++ b/src/modules/cfgt/cfgt_json.c @@ -43,6 +43,10 @@ int _cfgt_get_array_avp_vals(struct sip_msg *msg, pv_param_t *param, LM_ERR("invalid name\n"); return -1; } + if(name_type == 0 && avp_name.n == 0) { + LM_DBG("skip name_type:%d avp_name:%d\n", name_type, avp_name.n); + return 0; + } *jobj = srjson_CreateArray(jdoc); if(*jobj == NULL) { LM_ERR("cannot create json object\n"); @@ -286,8 +290,8 @@ int cfgt_get_json(struct sip_msg *msg, unsigned int mask, srjson_doc_t *jdoc, el = el->next; continue; } - if(srjson_GetArraySize(jdoc, jobj) == 0 - && !(mask & CFGT_DP_NULL)) { + if(jobj == NULL || (srjson_GetArraySize(jdoc, jobj) == 0 + && !(mask & CFGT_DP_NULL))) { el = el->next; continue; } @@ -314,6 +318,16 @@ int cfgt_get_json(struct sip_msg *msg, unsigned int mask, srjson_doc_t *jdoc, } snprintf(iname, 128, "$xavp(%.*s)", item_name.len, item_name.s); } else { + if(el->pvname.len > 3 && strncmp("$T_", el->pvname.s, 3) == 0) { + LM_DBG("skip tm var[%.*s]\n", el->pvname.len, el->pvname.s); + el = el->next; + continue; + } + if(strchr(el->pvname.s + 1, 36) != NULL) { + LM_DBG("skip dynamic format [%.*s]\n", el->pvname.len, el->pvname.s); + el = el->next; + continue; + } if(pv_get_spec_value(msg, &el->spec, &value) != 0) { LM_WARN("can't get value[%.*s]\n", el->pvname.len, el->pvname.s);

1 0

git:master:a49a0177: cfgt: fix memory leaks
by Victor Seva 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: a49a017764bf7a6cdb3ff4ecd885b0a51c87dc15 URL: https://github.com/kamailio/kamailio/commit/a49a017764bf7a6cdb3ff4ecd885b0a… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-27T15:59:44+02:00 cfgt: fix memory leaks - free parsed message - free srjson object left behind + remove unused headers + remove unused function + parse only HDR_CALLID_F --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_json.c --- Diff: https://github.com/kamailio/kamailio/commit/a49a017764bf7a6cdb3ff4ecd885b0a… Patch: https://github.com/kamailio/kamailio/commit/a49a017764bf7a6cdb3ff4ecd885b0a…

1 0

git:master:563ea056: siprepo: removed sip msg parameter when not used
by Daniel-Constantin Mierla 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: 563ea05637da475bdaed789d9530e3221e2e7296 URL: https://github.com/kamailio/kamailio/commit/563ea05637da475bdaed789d9530e32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-27T15:22:39+02:00 siprepo: removed sip msg parameter when not used - filled async pull --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/563ea05637da475bdaed789d9530e32… Patch: https://github.com/kamailio/kamailio/commit/563ea05637da475bdaed789d9530e32…

1 0

git:master:1465a9b6: Revert "dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog"
by Carsten Bock 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: 1465a9b6e9fda36617b7b198ae051f0957803550 URL: https://github.com/kamailio/kamailio/commit/1465a9b6e9fda36617b7b198ae051f0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2022-04-27T14:43:55+02:00 Revert "dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog" This reverts commit 26ef622ff3621c8a82c1c3560a32e8d735e30c4e. --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_req_within.c Modified: src/modules/dialog/dlg_req_within.h Modified: src/modules/dialog/doc/dialog.xml Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1465a9b6e9fda36617b7b198ae051f0… Patch: https://github.com/kamailio/kamailio/commit/1465a9b6e9fda36617b7b198ae051f0…

1 0

git:master:d3ec6057: Revert "modules: readme files regenerated - dialog ... [skip ci]"
by Carsten Bock 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: d3ec6057d8ab2875476f7b87d2b64265fd3c31f2 URL: https://github.com/kamailio/kamailio/commit/d3ec6057d8ab2875476f7b87d2b6426… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2022-04-27T14:43:01+02:00 Revert "modules: readme files regenerated - dialog ... [skip ci]" This reverts commit 4704f53593d3e810c159a2825df61b47143ce1f7. --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/d3ec6057d8ab2875476f7b87d2b6426… Patch: https://github.com/kamailio/kamailio/commit/d3ec6057d8ab2875476f7b87d2b6426…

1 0

git:master:4704f535: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: 4704f53593d3e810c159a2825df61b47143ce1f7 URL: https://github.com/kamailio/kamailio/commit/4704f53593d3e810c159a2825df61b4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-27T11:46:20+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/4704f53593d3e810c159a2825df61b4… Patch: https://github.com/kamailio/kamailio/commit/4704f53593d3e810c159a2825df61b4…

1 0

git:master:cd201b8a: siprepo: removed extra empty comment header lines
by Daniel-Constantin Mierla 26 Apr '22

26 Apr '22

Module: kamailio Branch: master Commit: cd201b8a8e6c059fdac599c8498873395f8e89e6 URL: https://github.com/kamailio/kamailio/commit/cd201b8a8e6c059fdac599c84988733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-26T14:16:28+02:00 siprepo: removed extra empty comment header lines --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cd201b8a8e6c059fdac599c84988733… Patch: https://github.com/kamailio/kamailio/commit/cd201b8a8e6c059fdac599c84988733… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index aedc3cc735..6a151caa44 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -119,9 +119,6 @@ static void mod_destroy(void) { } -/** - * - */ /** * */

1 0

git:master:d3ba4209: core: async task - fix typo in log message
by Daniel-Constantin Mierla 26 Apr '22

26 Apr '22

Module: kamailio Branch: master Commit: d3ba42097af410b5395f03edd1f8a95c61f7b041 URL: https://github.com/kamailio/kamailio/commit/d3ba42097af410b5395f03edd1f8a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-26T14:21:28+02:00 core: async task - fix typo in log message --- Modified: src/core/async_task.c --- Diff: https://github.com/kamailio/kamailio/commit/d3ba42097af410b5395f03edd1f8a95… Patch: https://github.com/kamailio/kamailio/commit/d3ba42097af410b5395f03edd1f8a95… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index a96eb90286..bacb9ce994 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -440,7 +440,7 @@ int async_task_group_push(str *gname, async_task_t *task) gname->len, gname->s); return -1; } - LM_DBG("task [%p] sent to groupt [%.*s]\n", task, gname->len, gname->s); + LM_DBG("task [%p] sent to group [%.*s]\n", task, gname->len, gname->s); return 0; }

1 0

git:5.4:604dc459: pkg/kamailio/deb: fix lintian warnings [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 604dc459f5413b8ecc35f2b5b50585f73da6ae8b URL: https://github.com/kamailio/kamailio/commit/604dc459f5413b8ecc35f2b5b50585f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T12:17:47+02:00 pkg/kamailio/deb: fix lintian warnings [skip ci] (cherry picked from commit dfbeb92a956009fc57070ac988cb0177f9c8192f) (cherry picked from commit c8af56f46822504e0cd1cfa79f12c6f20e335ccb) --- Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/604dc459f5413b8ecc35f2b5b50585f… Patch: https://github.com/kamailio/kamailio/commit/604dc459f5413b8ecc35f2b5b50585f…

1 0

git:5.4:8ec4d583: pkg/kamailio/deb: remove python*-dev dependency for module package [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 8ec4d583bd0836dd1e0dd94dd3896f1d4351de8d URL: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:38:41+02:00 pkg/kamailio/deb: remove python*-dev dependency for module package [skip ci] (cherry picked from commit 39a0a5d6f43ab265f1003f7bbb6e981bcd2e3b72) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1… Patch: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1…

1 0

git:5.4:10be3004: pkg: fix debian lintian error after kamailio scripts changed to python3 [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 10be300458db9c6e9e1800c080bd7665ba5d7f62 URL: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:38:31+02:00 pkg: fix debian lintian error after kamailio scripts changed to python3 [skip ci] (cherry picked from commit b7b33ad13942a7f0ef48ed9487541cd418f137f6) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… Patch: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/bionic/control +++ b/pkg/kamailio/deb/bionic/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/buster/control b/pkg/kamailio/deb/buster/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/buster/control +++ b/pkg/kamailio/deb/buster/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b0233c812b..73bdf702cc 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -74,7 +74,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/focal/control b/pkg/kamailio/deb/focal/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/focal/control +++ b/pkg/kamailio/deb/focal/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index ef10eef8b4..2c3993b5e8 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -70,7 +70,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 89da6133a9..5d5dabc02b 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -61,7 +61,6 @@ Pre-Depends: Depends: adduser, lsb-base, - python, python3, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 26c5daca3f..50087da12d 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -73,7 +73,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 3d35498cf1..f6ac6fd860 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -65,7 +65,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 89da6133a9..5d5dabc02b 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -61,7 +61,6 @@ Pre-Depends: Depends: adduser, lsb-base, - python, python3, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index b4ecf0870d..2850a659ee 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -76,7 +76,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces:

1 0

git:5.5:c8af56f4: pkg/kamailio/deb: fix lintian warnings [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.5 Commit: c8af56f46822504e0cd1cfa79f12c6f20e335ccb URL: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:21:39+02:00 pkg/kamailio/deb: fix lintian warnings [skip ci] (cherry picked from commit dfbeb92a956009fc57070ac988cb0177f9c8192f) --- Added: pkg/kamailio/deb/bionic/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f… Patch: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f…

1 0

[kamailio/kamailio] Building APKs fail due to rename of malloc_test module (Issue #3091)
by Ben Kaufman 25 Apr '22

25 Apr '22

In 5.6, the module `malloc_test` was renamed to `misctest`, but the refernce in `pkg/kamailio/alpine/APKBUILD` was not changed to reflect this, so following the APK build instructions `/pkg/kamailio/README.md` fail. I admittedly know very little about the APK package building process, but this looks very straight forward. I'll submit a PR once I've finished testing it out. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3091 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3091(a)github.com>

2 1

[kamailio/kamailio] pkg alpine renamed malloc_test to misctest (PR #3093)
by Ben Kaufman 25 Apr '22

25 Apr '22

FIX #3091 Building APKs fail due to rename of malloc_test module  #### 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 - [x] Related to issue FIX #3091 #### Description Refactored reference to `malloc_test` in `pkg/kamailio/alpine/APKBUILDER` to `misctest` due to module rename. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3093 -- Commit Summary -- * pkg alpine renamed malloc_test to misctest -- File Changes -- M pkg/kamailio/alpine/APKBUILD (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3093.patch https://github.com/kamailio/kamailio/pull/3093.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3093 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3093(a)github.com>

2 2

git:master:96c402b9: pkg alpine renamed malloc_test to misctest
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 96c402b94ada3556218d9924d89d53bf5663b203 URL: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… Author: Kaufman <bkaufman(a)nexvortex.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T18:16:14+02:00 pkg alpine renamed malloc_test to misctest - Fix #3091 Building APKs fail due to rename of malloc_test module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… Patch: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f23ad03308..6bf221630d 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -77,7 +77,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db" # - modules for devel purposes -_mod_list_devel="malloc_test print print_lib" +_mod_list_devel="misctest print print_lib" # - modules depending on pcre3 library _mod_list_pcre="dialplan lcr regex"

1 0

git:master:5e274713: siprepo: unlink item from hash table based on rmode
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 5e27471312c110ce19cfa0bfa5a29abcd03daec6 URL: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T15:08:15+02:00 siprepo: unlink item from hash table based on rmode --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h --- Diff: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… Patch: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 0c9873e3c2..603d3744c1 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -108,6 +108,25 @@ siprepo_msg_t *siprepo_msg_find(sip_msg_t *msg, str *callid, str *msgid, int lmo return 0; } +/** + * + */ +void siprepo_msg_unlink(siprepo_msg_t *it, unsigned int slotid) +{ + if(it->prev==NULL) { + _siprepo_table[slotid].plist = it->next; + if(_siprepo_table[slotid].plist) { + _siprepo_table[slotid].plist->prev = NULL; + } + } else { + it->prev->next = it->next; + } + if(it->next!=NULL) { + it->next->prev = it->prev; + } + return; +} + /** * */ @@ -334,9 +353,15 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname, lmsg.set_global_address = default_global_address; lmsg.set_global_port = default_global_port; + if(rmode & SIPREPO_RMODE_RM) { + siprepo_msg_unlink(it, slotid); + shm_free(it); + } + + lock_release(&_siprepo_table[slotid].lock); + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { LM_ERR("failed to parse msg id [%.*s]\n", msgid->len, msgid->s); - lock_release(&_siprepo_table[slotid].lock); return 1; } if(unlikely(parse_headers(&lmsg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) @@ -394,17 +419,7 @@ void siprepo_timer_exec(unsigned int ticks, int worker, void *param) lock_get(&_siprepo_table[i].lock); for(it=_siprepo_table[i].plist; it!=NULL; it=it->next) { if(it->itime+_siprepo_expire < tnow) { - if(it->prev==NULL) { - _siprepo_table[i].plist = it->next; - if(_siprepo_table[i].plist) { - _siprepo_table[i].plist->prev = NULL; - } - } else { - it->prev->next = it->next; - } - if(it->next!=NULL) { - it->next->prev = it->prev; - } + siprepo_msg_unlink(it, slotid); if(elist) { it->next = elist; elist = it; diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index 2750189ae0..683348c8b0 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -27,6 +27,8 @@ #include "../../core/parser/msg_parser.h" +#define SIPREPO_RMODE_RM 1 + typedef struct siprepo_msg { unsigned int hid; int mtype;

1 0

git:master:72443722: rls: free resources in case of errors
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 72443722d7fda4289390ef8bc20ad91990b895a7 URL: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T12:04:06+02:00 rls: free resources in case of errors --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… Patch: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index 0f31e7c877..d3ad4fd1fc 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -146,6 +146,9 @@ int send_notify(xmlDocPtr * rlmi_doc, char * buf, int buf_len, int result = 0; str rlmi_cont= {0, 0}, multi_cont; + if(rlmi_doc==NULL || *rlmi_doc==NULL) { + return -1; + } xmlDocDumpFormatMemory(*rlmi_doc,(xmlChar**)(void*)&rlmi_cont.s, &rlmi_cont.len, 0); @@ -183,7 +186,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, subs_t* dialog= NULL; int len_est = 0; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ - int ok = 0; /* generate the boundary string */ boundary_string= generate_string(BOUNDARY_STRING_LEN); @@ -431,7 +433,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, } done: - ok = 1; if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) @@ -456,11 +457,10 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, LM_ERR("in abort_transaction\n"); } - if(ok==0) { - if(rlmi_doc!=NULL) { - xmlFreeDoc(rlmi_doc); - } + if(rlmi_doc!=NULL) { + xmlFreeDoc(rlmi_doc); } + return; }

1 0

git:master:3553ee0b: janssonrpcc: free resources in case of errors
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 3553ee0b4e2e973a742c5c73f43d848496959723 URL: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T11:39:10+02:00 janssonrpcc: free resources in case of errors --- Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_server.c Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… Patch: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… --- diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 5e9d01d004..830c2b9611 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -442,6 +442,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) if (sent) { if (notify_only == true) { // free the request if using janssonrpc_notification function free_req_cmd(req->cmd); + req->cmd = NULL; free_request(req); } else { struct timeval tv; diff --git a/src/modules/janssonrpcc/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c index ecd43c1476..758c56b61d 100644 --- a/src/modules/janssonrpcc/janssonrpc_request.c +++ b/src/modules/janssonrpcc/janssonrpc_request.c @@ -217,7 +217,7 @@ void retry_cb(int fd, short event, void* arg) DEBUG("retrying request: id=%d\n", req->id); - if(jsonrpc_send(req->cmd->conn, req, 0)<0) { + if(jsonrpc_send(req->cmd->conn, req, false)<0) { goto error; } diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 6c4b999b50..16365fe214 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -278,7 +278,7 @@ int jsonrpc_server_from_srv(str conn, str srv, DBG("server %s\n", srv_record->name); server = create_server(); - CHECK_MALLOC(server); + CHECK_MALLOC_GOTO(server, error); shm_str_dup(&server->conn, &conn); CHECK_MALLOC_GOTO(server->conn.s, error); diff --git a/src/modules/janssonrpcc/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c index 3ce7e28676..e29767ffa7 100644 --- a/src/modules/janssonrpcc/janssonrpc_srv.c +++ b/src/modules/janssonrpcc/janssonrpc_srv.c @@ -89,6 +89,7 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) continue; srv_record = (struct srv_rdata*)l->rdata; if (srv_record == NULL) { + free_rdata_list(head); ERR("BUG: null rdata\n"); return -1; } @@ -109,16 +110,16 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) jsonrpc_server_group_t* cgroup = NULL; for(cgroup=conn_group; cgroup!=NULL; cgroup=cgroup->next) { new_server = create_server(); - CHECK_MALLOC(new_server); + CHECK_MALLOC_GOTO(new_server, errdup); shm_str_dup(&new_server->conn, &cgroup->conn); - CHECK_MALLOC(new_server->conn.s); + CHECK_MALLOC_GOTO(new_server->conn.s, errdup); shm_str_dup(&new_server->addr, &name); - CHECK_MALLOC(new_server->addr.s); + CHECK_MALLOC_GOTO(new_server->addr.s, errdup); shm_str_dup(&new_server->srv, &srv); - CHECK_MALLOC(new_server->srv.s); + CHECK_MALLOC_GOTO(new_server->srv.s, errdup); new_server->port = srv_record->port; new_server->priority = srv_record->priority; @@ -129,6 +130,7 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) addto_server_list(new_server, &new_servers); } } + free_rdata_list(head); if(iter <= 0) goto end; @@ -204,6 +206,12 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) free_server_list(rm_servers); return retval; + +errdup: + free_rdata_list(head); + free_server_list(new_servers); + free_server(new_server); + return -1; } void free_srv(jsonrpc_srv_t* srv)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev