sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:master:84c34227: ims_diameter_server: drop cdp session to avoid deadlock

by Riccardo Villa

Module: kamailio Branch: master Commit: 84c342277f2a73196cb377476f2b80e6b4085e7b URL: https://github.com/kamailio/kamailio/commit/84c342277f2a73196cb377476f2b80e… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-02-24T09:55:46+01:00 ims_diameter_server: drop cdp session to avoid deadlock --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/84c342277f2a73196cb377476f2b80e… Patch: https://github.com/kamailio/kamailio/commit/84c342277f2a73196cb377476f2b80e… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 7266f655c6..5b69c8973c 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -310,6 +310,11 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman session = cdpb.AAACreateSession(0); req = cdpb.AAACreateRequest(i_appid, i_commandcode, Flag_Proxyable, session); + if (session) { + cdpb.AAADropSession(session); + session = 0; + } + if (!req) goto error1; if (addAVPsfromJSON(req, &s_message)) {

3 years, 8 months

git:master:eece907a: Merge pull request #2649 from Riccardo-78/master

by GitHub

Module: kamailio Branch: master Commit: eece907aea79808f89b929bb3fc8445ac3ee0639 URL: https://github.com/kamailio/kamailio/commit/eece907aea79808f89b929bb3fc8445… Author: ng-voice GmbH <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2021-03-03T15:51:37+01:00 Merge pull request #2649 from Riccardo-78/master ims_diameter_server: fix errors --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/eece907aea79808f89b929bb3fc8445… Patch: https://github.com/kamailio/kamailio/commit/eece907aea79808f89b929bb3fc8445… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index c7fe941b00..fae5f58ce9 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -280,6 +280,10 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman } LM_DBG("Peer %.*s\n", s_peer.len, s_peer.s); } + if (get_str_fparam(&s_message, msg, (fparam_t*)message) < 0) { + LM_ERR("failed to get Message\n"); + return -1; + } if (get_str_fparam(&s_appid, msg, (fparam_t*)appid) < 0) { LM_ERR("failed to get App-ID\n"); return -1; @@ -306,9 +310,14 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman session = cdpb.AAACreateSession(0); req = cdpb.AAACreateRequest(i_appid, i_commandcode, Flag_Proxyable, session); + if (session) { + cdpb.AAADropSession(session); + session = 0; + } + if (!req) goto error1; - if (addAVPsfromJSON(req, &s_message)) { + if (!addAVPsfromJSON(req, &s_message)) { LM_ERR("Failed to parse JSON Request\n"); return -1; } @@ -322,7 +331,7 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman } else { resp = cdpb.AAASendRecvMessageToPeer(req, &s_peer); LM_DBG("Successfully sent diameter\n"); - if (AAAmsg2json(resp, &responsejson) == 1) { + if (resp && AAAmsg2json(resp, &responsejson) == 1) { return 1; } else { LM_ERR("Failed to convert response to JSON\n"); @@ -337,7 +346,7 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman } else { resp = cdpb.AAASendRecvMessage(req); LM_DBG("Successfully sent diameter\n"); - if (AAAmsg2json(resp, &responsejson) == 1) { + if (resp && AAAmsg2json(resp, &responsejson) == 1) { return 1; } else { LM_ERR("Failed to convert response to JSON\n");

3 years, 8 months

git:master:faf1edab: ims_diameter_server: fix initialization of s_message

by Riccardo Villa

Module: kamailio Branch: master Commit: faf1edabf732af5a24ad0399098ad11e27b3a1ab URL: https://github.com/kamailio/kamailio/commit/faf1edabf732af5a24ad0399098ad11… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-02-24T09:54:47+01:00 ims_diameter_server: fix initialization of s_message --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/faf1edabf732af5a24ad0399098ad11… Patch: https://github.com/kamailio/kamailio/commit/faf1edabf732af5a24ad0399098ad11… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 62b8c3add8..7266f655c6 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -280,6 +280,10 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman } LM_DBG("Peer %.*s\n", s_peer.len, s_peer.s); } + if (get_str_fparam(&s_message, msg, (fparam_t*)message) < 0) { + LM_ERR("failed to get Message\n"); + return -1; + } if (get_str_fparam(&s_appid, msg, (fparam_t*)appid) < 0) { LM_ERR("failed to get App-ID\n"); return -1;

3 years, 8 months

git:master:6968f1df: ims_diameter_server: check response is not null before json conversion

by Riccardo Villa

Module: kamailio Branch: master Commit: 6968f1df9e9d3d66810df910d290f3d9368255fe URL: https://github.com/kamailio/kamailio/commit/6968f1df9e9d3d66810df910d290f3d… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-02-24T09:52:59+01:00 ims_diameter_server: check response is not null before json conversion --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6968f1df9e9d3d66810df910d290f3d… Patch: https://github.com/kamailio/kamailio/commit/6968f1df9e9d3d66810df910d290f3d… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index c7fe941b00..62b8c3add8 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -322,7 +322,7 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman } else { resp = cdpb.AAASendRecvMessageToPeer(req, &s_peer); LM_DBG("Successfully sent diameter\n"); - if (AAAmsg2json(resp, &responsejson) == 1) { + if (resp && AAAmsg2json(resp, &responsejson) == 1) { return 1; } else { LM_ERR("Failed to convert response to JSON\n"); @@ -337,7 +337,7 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman } else { resp = cdpb.AAASendRecvMessage(req); LM_DBG("Successfully sent diameter\n"); - if (AAAmsg2json(resp, &responsejson) == 1) { + if (resp && AAAmsg2json(resp, &responsejson) == 1) { return 1; } else { LM_ERR("Failed to convert response to JSON\n");

3 years, 8 months

git:5.4:0df03a96: ims_charging: renamed str_list_t to str_htlist_t

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 0df03a96e9ed07ff1683690f95598bf44b87701a URL: https://github.com/kamailio/kamailio/commit/0df03a96e9ed07ff1683690f95598bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T09:18:36+01:00 ims_charging: renamed str_list_t to str_htlist_t - fix conflict added by e1dc6dd6d9b206168f6da2929560ca6a64e1b41e (cherry picked from commit 1f751775525fdcdb5a75b45fbf451e2bef3696ec) --- Modified: src/modules/ims_charging/Ro_data.h --- Diff: https://github.com/kamailio/kamailio/commit/0df03a96e9ed07ff1683690f95598bf… Patch: https://github.com/kamailio/kamailio/commit/0df03a96e9ed07ff1683690f95598bf… --- diff --git a/src/modules/ims_charging/Ro_data.h b/src/modules/ims_charging/Ro_data.h index 6ad045c191..ba0aba3420 100644 --- a/src/modules/ims_charging/Ro_data.h +++ b/src/modules/ims_charging/Ro_data.h @@ -131,9 +131,9 @@ typedef struct _str_list_t_slot { struct _str_list_t_slot *prev, *next; } str_list_slot_t; -typedef struct { +typedef struct str_htlist { str_list_slot_t *head, *tail; -} str_list_t; +} str_htlist_t; #define str_list_t_free(x,mem) \ do{\ @@ -163,7 +163,7 @@ typedef struct { typedef struct { str *application_server; - str_list_t application_provided_called_party_address; + str_htlist_t application_provided_called_party_address; } as_info_t; typedef struct _as_info_list_t_slot { @@ -194,7 +194,7 @@ do{\ #define as_info_list_t_copy(dst,src,mem) \ do {\ str_dup_ptr_ptr((dst)->info.application_server,(src)->info.application_server,mem);\ - WL_DUP_ALL(&((dst)->info.application_provided_called_party_address),&((src)->info.application_provided_called_party_address),str_list_t,mem);\ + WL_DUP_ALL(&((dst)->info.application_provided_called_party_address),&((src)->info.application_provided_called_party_address),str_htlist_t,mem);\ } while(0) typedef struct { @@ -268,9 +268,9 @@ typedef struct { str *user_session_id; str *outgoing_session_id; - str_list_t calling_party_address; + str_htlist_t calling_party_address; str *called_party_address; - str_list_t called_asserted_identity; + str_htlist_t called_asserted_identity; str *requested_party_address; str *access_network_info; str *app_provided_party;

3 years, 8 months

git:master:1f751775: ims_charging: renamed str_list_t to str_htlist_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1f751775525fdcdb5a75b45fbf451e2bef3696ec URL: https://github.com/kamailio/kamailio/commit/1f751775525fdcdb5a75b45fbf451e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T09:16:38+01:00 ims_charging: renamed str_list_t to str_htlist_t - fix conflict added by e1dc6dd6d9b206168f6da2929560ca6a64e1b41e --- Modified: src/modules/ims_charging/Ro_data.h --- Diff: https://github.com/kamailio/kamailio/commit/1f751775525fdcdb5a75b45fbf451e2… Patch: https://github.com/kamailio/kamailio/commit/1f751775525fdcdb5a75b45fbf451e2… --- diff --git a/src/modules/ims_charging/Ro_data.h b/src/modules/ims_charging/Ro_data.h index 6ad045c191..ba0aba3420 100644 --- a/src/modules/ims_charging/Ro_data.h +++ b/src/modules/ims_charging/Ro_data.h @@ -131,9 +131,9 @@ typedef struct _str_list_t_slot { struct _str_list_t_slot *prev, *next; } str_list_slot_t; -typedef struct { +typedef struct str_htlist { str_list_slot_t *head, *tail; -} str_list_t; +} str_htlist_t; #define str_list_t_free(x,mem) \ do{\ @@ -163,7 +163,7 @@ typedef struct { typedef struct { str *application_server; - str_list_t application_provided_called_party_address; + str_htlist_t application_provided_called_party_address; } as_info_t; typedef struct _as_info_list_t_slot { @@ -194,7 +194,7 @@ do{\ #define as_info_list_t_copy(dst,src,mem) \ do {\ str_dup_ptr_ptr((dst)->info.application_server,(src)->info.application_server,mem);\ - WL_DUP_ALL(&((dst)->info.application_provided_called_party_address),&((src)->info.application_provided_called_party_address),str_list_t,mem);\ + WL_DUP_ALL(&((dst)->info.application_provided_called_party_address),&((src)->info.application_provided_called_party_address),str_htlist_t,mem);\ } while(0) typedef struct { @@ -268,9 +268,9 @@ typedef struct { str *user_session_id; str *outgoing_session_id; - str_list_t calling_party_address; + str_htlist_t calling_party_address; str *called_party_address; - str_list_t called_asserted_identity; + str_htlist_t called_asserted_identity; str *requested_party_address; str *access_network_info; str *app_provided_party;

3 years, 8 months

Broken: kamailio/kamailio#9920 (5.4 - c85594b)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9920 Status: Broken Duration: 6 mins and 52 secs Commit: c85594b (5.4) Author: Daniel-Constantin Mierla Message: corex: process values for dns_cache params in mod init - ensure the dns cache structure is properly initialized (cherry picked from commit 5126964ebf28af3be1391e8ed2153503b118ff2c) View the changeset: https://github.com/kamailio/kamailio/compare/3945ea2b7e59...c85594b46997 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/761254009?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 8 months

Broken: kamailio/kamailio#9919 (master - 5126964)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9919 Status: Broken Duration: 5 mins and 35 secs Commit: 5126964 (master) Author: Daniel-Constantin Mierla Message: corex: process values for dns_cache params in mod init - ensure the dns cache structure is properly initialized View the changeset: https://github.com/kamailio/kamailio/compare/f82a25630003...5126964ebf28 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/761253932?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 8 months

git:5.4:c85594b4: corex: process values for dns_cache params in mod init

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: c85594b4699763e0e7af8665b8036a6d9fd70090 URL: https://github.com/kamailio/kamailio/commit/c85594b4699763e0e7af8665b8036a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T08:49:16+01:00 corex: process values for dns_cache params in mod init - ensure the dns cache structure is properly initialized (cherry picked from commit 5126964ebf28af3be1391e8ed2153503b118ff2c) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c85594b4699763e0e7af8665b8036a6… Patch: https://github.com/kamailio/kamailio/commit/c85594b4699763e0e7af8665b8036a6… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 8d0e649548..0b091a7b1f 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -31,6 +31,7 @@ #include "../../core/pvar.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/str_list.h" #include "../../core/events.h" #include "../../core/onsend.h" #include "../../core/dns_cache.h" @@ -81,6 +82,10 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); +static str_list_t *corex_dns_cache_list = NULL; + +static int corex_dns_cache_param_add(str *pval); + static int corex_sip_reply_out(sr_event_param_t *evp); static pv_export_t mod_pvs[] = { @@ -182,6 +187,8 @@ struct module_exports exports = { */ static int mod_init(void) { + str_list_t *sit; + if(corex_init_rpc()<0) { LM_ERR("failed to register RPC commands\n"); @@ -194,6 +201,13 @@ static int mod_init(void) return -1; } + for(sit = corex_dns_cache_list; sit!=NULL; sit=sit->next) { + if(corex_dns_cache_param_add(&sit->s)<0) { + LM_ERR("failed to add record: %.*s\n", sit->s.len, sit->s.s); + return -1; + } + } + if((nio_intercept > 0) && (nio_intercept_init() < 0)) { LM_ERR("failed to register network io intercept callback\n"); @@ -326,6 +340,29 @@ int corex_alias_subdomains_param(modparam_t type, void *val) } int corex_dns_cache_param(modparam_t type, void *val) +{ + str_list_t *sit; + + if(val==NULL || ((str*)val)->s==NULL || ((str*)val)->len==0) { + LM_ERR("invalid parameter\n"); + return -1; + } + + sit = (str_list_t*)pkg_mallocxz(sizeof(str_list_t)); + if(sit==NULL) { + PKG_MEM_ERROR; + return -1; + } + sit->s = *((str*)val); + if(corex_dns_cache_list!=NULL) { + sit->next = corex_dns_cache_list; + } + corex_dns_cache_list = sit; + + return 0; +} + +static int corex_dns_cache_param_add(str *pval) { str sval; param_t* params_list = NULL; @@ -337,11 +374,11 @@ int corex_dns_cache_param(modparam_t type, void *val) int dns_ttl = 0; int dns_flags = 0; - if(val==NULL) { + if(pval==NULL) { LM_ERR("invalid parameter\n"); goto error; } - sval = *((str*)val); + sval = *pval; if(sval.s==NULL || sval.len<=0) { LM_ERR("invalid parameter value\n"); goto error;

3 years, 8 months

git:5.4:9de2eb8c: core: typedef for str_list struct

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 9de2eb8c4ef9d815be062d4f2c81db93129b520f URL: https://github.com/kamailio/kamailio/commit/9de2eb8c4ef9d815be062d4f2c81db9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T08:49:08+01:00 core: typedef for str_list struct (cherry picked from commit e1dc6dd6d9b206168f6da2929560ca6a64e1b41e) --- Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/9de2eb8c4ef9d815be062d4f2c81db9… Patch: https://github.com/kamailio/kamailio/commit/9de2eb8c4ef9d815be062d4f2c81db9… --- diff --git a/src/core/str_list.h b/src/core/str_list.h index fe1e53410d..db3fa12887 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -20,7 +20,7 @@ */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions */ @@ -32,15 +32,15 @@ /** * @brief Simple str type list */ -struct str_list { +typedef struct str_list { str s; struct str_list *next; -}; +} str_list_t; /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character

3 years, 8 months

← Newer
1
...
42
43
44
45
46
47
48
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021