sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
312 discussions

git:5.5:459f40b5: http_client: clone name in http connection structures

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 459f40b52a8a6f8b2ef70a6986c686448ea572a8 URL: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:41:50+02:00 http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names (cherry picked from commit 9429083c87b1323e31983cc71551676c199bf640) --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… Patch: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 7df146493f..b1bfa3bd48 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,8 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) ccp = _curl_con_pkg_root; while(ccp) { - if(ccp->conid == con->conid) { + if(ccp->conid == con->conid && ccp->name.len == con->name.len + && strncmp(ccp->name.s, con->name.s, con->name.len) == 0) { return ccp; } ccp = ccp->next; @@ -814,8 +815,9 @@ curl_con_t *curl_init_con(str *name) cc = cc->next; } - cc = (curl_con_t *)shm_malloc(sizeof( - curl_con_t)); /* Connection structures are shared by all children processes */ + /* Connection structures are shared by all children processes */ + cc = (curl_con_t *)shm_malloc(sizeof(curl_con_t) + + (name->len + 1)*sizeof(char)); if(cc == NULL) { LM_ERR("no shm memory\n"); return NULL; @@ -823,7 +825,8 @@ curl_con_t *curl_init_con(str *name) /* Each structure is allocated in package memory so each process can write into it without any locks or such stuff */ - ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t)); + ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t) + + (name->len + 1)*sizeof(char)); if(ccp == NULL) { /* We failed to allocate ccp, so let's free cc and quit */ shm_free(cc); @@ -831,17 +834,21 @@ curl_con_t *curl_init_con(str *name) return NULL; } - memset(cc, 0, sizeof(curl_con_t)); + memset(cc, 0, sizeof(curl_con_t) + (name->len + 1)*sizeof(char)); cc->next = _curl_con_root; cc->conid = conid; + cc->name.s = (char*)cc + sizeof(curl_con_t); + memcpy(cc->name.s, name->s, name->len); + cc->name.len = name->len; _curl_con_root = cc; - cc->name = *name; /* Put the new ccp first in line */ - memset(ccp, 0, sizeof(curl_con_pkg_t)); + memset(ccp, 0, sizeof(curl_con_pkg_t) + (name->len + 1)*sizeof(char)); ccp->next = _curl_con_pkg_root; ccp->conid = conid; - ccp->curl = NULL; + ccp->name.s = (char*)ccp + sizeof(curl_con_pkg_t); + memcpy(ccp->name.s, name->s, name->len); + ccp->name.len = name->len; _curl_con_pkg_root = ccp; LM_DBG("CURL: Added connection [%.*s]\n", name->len, name->s); diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 29b451ba4d..a37bdbe4a5 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -93,7 +93,7 @@ enum connection_status typedef struct _curl_con { str name; /*!< Connection name */ - unsigned int conid; /*!< Connection ID */ + unsigned int conid; /*!< Connection hash ID */ enum connection_status connstate; /*!< Connection status */ str url; /*!< The URL without schema (host + base URL)*/ str schema; /*!< The URL schema */ @@ -125,7 +125,8 @@ typedef struct _curl_con /*! Per-process copy of connection object -stored in pkg memory */ typedef struct _curl_con_pkg { - unsigned int conid; /*!< Connection ID (referring to core connection id */ + str name; /*!< Connection name */ + unsigned int conid; /*!< Connection hash ID */ char redirecturl [512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ unsigned int last_result; /*!< Last result of accessing this connection */

3 years, 5 months

git:5.5:b27dc141: http_client: check if shm is initialized in curl_parse_param()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b27dc141ccddfb3e0f77399ead8b2b158942de69 URL: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:41:38+02:00 http_client: check if shm is initialized in curl_parse_param() (cherry picked from commit 7741ad7979d54fb4ee1247760d8d5c3666353a96) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… Patch: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index c71df5cd75..7df146493f 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -32,6 +32,7 @@ #include "../../core/dprint.h" #include "../../core/parser/parse_param.h" #include "../../core/usr_avp.h" +#include "../../core/shm_init.h" #include "../../core/cfg_parser.h" #include "http_client.h" #include "curlcon.h" @@ -237,6 +238,11 @@ int curl_parse_param(char *val) LM_DBG("modparam httpcon: %s\n", val); LM_DBG(" *** Default httproxy: %s\n", http_proxy.s); + if(!shm_initialized()) { + LM_ERR("shared memory was not initialized\n"); + return -1; + } + /* parse: name=>http_url*/ in.s = val; in.len = strlen(in.s);

3 years, 5 months

git:master:e04890fe: core: clone value for loadmodulex

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e04890fe90d6e5ce879f968eb689e8616b318d54 URL: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T09:25:30+02:00 core: clone value for loadmodulex --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… Patch: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 03f8feef81..b26fde218c 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -45,6 +45,7 @@ #include "fmsg.h" #include "async_task.h" #include "shm_init.h" +#include "str_list.h" #include "daemonize.h" #include <sys/stat.h> @@ -57,6 +58,8 @@ struct sr_module* modules=0; +static str_list_t *_ksr_loadmod_strlist = NULL; + /*We need to define this symbol on Solaris becuase libcurl relies on libnspr which looks for this symbol. If it is not defined, dynamic module loading (dlsym) fails */ @@ -656,6 +659,7 @@ int load_modulex(char* mod_path) str sfmt; sip_msg_t *fmsg; char* emod; + str_list_t *sb; emod = mod_path; if(strchr(mod_path, '$') != NULL) { @@ -663,7 +667,12 @@ int load_modulex(char* mod_path) sfmt.s = mod_path; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emod = seval.s; + sb = str_list_block_add(&_ksr_loadmod_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle load module: %s\n", mod_path); + return -1; + } + emod = sb->s.s; } }

3 years, 5 months

git:master:68db2457: core: clone modparamx evaluated values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 68db24577dae35de1e9045f994d9a751b50ad14d URL: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T09:18:05+02:00 core: clone modparamx evaluated values --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… Patch: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 041ce841c4..361536691d 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -31,11 +31,14 @@ #include "dprint.h" #include "fmsg.h" #include "pvar.h" +#include "str_list.h" #include "mem/mem.h" #include <sys/types.h> #include <regex.h> #include <string.h> +static str_list_t *_ksr_modparam_strlist = NULL; + static char *get_mod_param_type_str(int ptype) { if(ptype & PARAM_USE_FUNC) { @@ -190,6 +193,7 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) char* epname; pv_spec_t *pvs; pv_value_t pvv; + str_list_t *sb; emname = mname; if(strchr(mname, '$') != NULL) { @@ -197,7 +201,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = mname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + emname = sb->s.s; } } @@ -207,7 +216,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = pname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - epname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + epname = sb->s.s; } } @@ -218,8 +232,13 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = (char*)pval; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)seval.s); + (void*)sb->s.s); } else { LM_ERR("failed to evaluate parameter [%s]\n", (char*)pval); return -1; @@ -267,8 +286,14 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.len, sfmt.s); return -1; } + sb = str_list_block_add(&_ksr_modparam_strlist, pvv.rs.s, pvv.rs.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)pvv.rs.s); + (void*)sb->s.s); default: LM_ERR("invalid parameter type: %d\n", ptype); return -1;

3 years, 5 months

git:master:b92b931c: core: str list - added function to insert a block string in list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b92b931c26c199b756fd08e9c80cc9305469fd2b URL: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:55:32+02:00 core: str list - added function to insert a block string in list --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… Patch: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @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 @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif

3 years, 5 months

git:master:84d245fb: http_client: removed function names from logs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 84d245fb4eda7690a89b4057301f81685a9452d8 URL: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:23:56+02:00 http_client: removed function names from logs --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… Patch: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index b1bfa3bd48..0c00bb97de 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -113,7 +113,7 @@ static cfg_option_t http_client_options[] = { {"keepconnections", .f = cfg_parse_int_opt}, /* 17 */ {0}}; -/*! Count the number of connections +/*! Count the number of connections */ unsigned int curl_connection_count() { @@ -136,7 +136,7 @@ int http_connection_exists(str *name) return 1; } - LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", + LM_DBG("no success in looking for httpcon: [%.*s]\n", name->len, name->s); return 0; } @@ -149,7 +149,7 @@ curl_con_t *curl_get_connection(str *name) unsigned int conid; conid = core_case_hash(name, 0, 0); - LM_DBG("curl_get_connection looking for httpcon: [%.*s] ID %u\n", name->len, + LM_DBG("looking for httpcon: [%.*s] ID %u\n", name->len, name->s, conid); cc = _curl_con_root; @@ -160,8 +160,8 @@ curl_con_t *curl_get_connection(str *name) } cc = cc->next; } - LM_DBG("curl_get_connection no success in looking for httpcon: [%.*s]\n", - name->len, name->s); + LM_DBG("no success in looking for httpcon: [%.*s] (list: %p)\n", + name->len, name->s, _curl_con_root); return NULL; } @@ -178,7 +178,7 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) } ccp = ccp->next; } - LM_ERR("curl_get_pkg_connection no success in looking for pkg memory for " + LM_ERR("no success in looking for pkg memory for " "httpcon: [%.*s]\n", con->name.len, con->name.s); return NULL;

3 years, 5 months

git:master:9429083c: http_client: clone name in http connection structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9429083c87b1323e31983cc71551676c199bf640 URL: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:09:22+02:00 http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… Patch: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 7df146493f..b1bfa3bd48 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,8 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) ccp = _curl_con_pkg_root; while(ccp) { - if(ccp->conid == con->conid) { + if(ccp->conid == con->conid && ccp->name.len == con->name.len + && strncmp(ccp->name.s, con->name.s, con->name.len) == 0) { return ccp; } ccp = ccp->next; @@ -814,8 +815,9 @@ curl_con_t *curl_init_con(str *name) cc = cc->next; } - cc = (curl_con_t *)shm_malloc(sizeof( - curl_con_t)); /* Connection structures are shared by all children processes */ + /* Connection structures are shared by all children processes */ + cc = (curl_con_t *)shm_malloc(sizeof(curl_con_t) + + (name->len + 1)*sizeof(char)); if(cc == NULL) { LM_ERR("no shm memory\n"); return NULL; @@ -823,7 +825,8 @@ curl_con_t *curl_init_con(str *name) /* Each structure is allocated in package memory so each process can write into it without any locks or such stuff */ - ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t)); + ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t) + + (name->len + 1)*sizeof(char)); if(ccp == NULL) { /* We failed to allocate ccp, so let's free cc and quit */ shm_free(cc); @@ -831,17 +834,21 @@ curl_con_t *curl_init_con(str *name) return NULL; } - memset(cc, 0, sizeof(curl_con_t)); + memset(cc, 0, sizeof(curl_con_t) + (name->len + 1)*sizeof(char)); cc->next = _curl_con_root; cc->conid = conid; + cc->name.s = (char*)cc + sizeof(curl_con_t); + memcpy(cc->name.s, name->s, name->len); + cc->name.len = name->len; _curl_con_root = cc; - cc->name = *name; /* Put the new ccp first in line */ - memset(ccp, 0, sizeof(curl_con_pkg_t)); + memset(ccp, 0, sizeof(curl_con_pkg_t) + (name->len + 1)*sizeof(char)); ccp->next = _curl_con_pkg_root; ccp->conid = conid; - ccp->curl = NULL; + ccp->name.s = (char*)ccp + sizeof(curl_con_pkg_t); + memcpy(ccp->name.s, name->s, name->len); + ccp->name.len = name->len; _curl_con_pkg_root = ccp; LM_DBG("CURL: Added connection [%.*s]\n", name->len, name->s); diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 29b451ba4d..a37bdbe4a5 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -93,7 +93,7 @@ enum connection_status typedef struct _curl_con { str name; /*!< Connection name */ - unsigned int conid; /*!< Connection ID */ + unsigned int conid; /*!< Connection hash ID */ enum connection_status connstate; /*!< Connection status */ str url; /*!< The URL without schema (host + base URL)*/ str schema; /*!< The URL schema */ @@ -125,7 +125,8 @@ typedef struct _curl_con /*! Per-process copy of connection object -stored in pkg memory */ typedef struct _curl_con_pkg { - unsigned int conid; /*!< Connection ID (referring to core connection id */ + str name; /*!< Connection name */ + unsigned int conid; /*!< Connection hash ID */ char redirecturl [512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ unsigned int last_result; /*!< Last result of accessing this connection */

3 years, 5 months

git:master:7741ad79: http_client: check if shm is initialized in curl_parse_param()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7741ad7979d54fb4ee1247760d8d5c3666353a96 URL: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T07:31:10+02:00 http_client: check if shm is initialized in curl_parse_param() --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… Patch: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index c71df5cd75..7df146493f 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -32,6 +32,7 @@ #include "../../core/dprint.h" #include "../../core/parser/parse_param.h" #include "../../core/usr_avp.h" +#include "../../core/shm_init.h" #include "../../core/cfg_parser.h" #include "http_client.h" #include "curlcon.h" @@ -237,6 +238,11 @@ int curl_parse_param(char *val) LM_DBG("modparam httpcon: %s\n", val); LM_DBG(" *** Default httproxy: %s\n", http_proxy.s); + if(!shm_initialized()) { + LM_ERR("shared memory was not initialized\n"); + return -1; + } + /* parse: name=>http_url*/ in.s = val; in.len = strlen(in.s);

3 years, 5 months

git:master:c836bca7: Makefile.groups: added build group for nats module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c836bca76551b76836f03a612c2a913284729622 URL: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-28T23:03:47+02:00 Makefile.groups: added build group for nats module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… Patch: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 42c036d670..4eea749671 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -223,6 +223,9 @@ mod_list_kafka=kafka # - modules depending on mqtt mosquitto and ev library mod_list_mqtt=mqtt +# - modules depending on nats and ev library +mod_list_nats=nats + # - modules depending on secsipid library mod_list_secsipid=secsipid secsipid_proc @@ -264,6 +267,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_phonenum) \ $(mod_list_kafka) \ $(mod_list_mqtt) \ + $(mod_list_nats) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ @@ -497,6 +501,9 @@ module_group_kkafka=$(mod_list_kafka) # K mqtt modules module_group_kmqtt=$(mod_list_mqtt) +# K nats modules +module_group_knats=$(mod_list_nats) + # K secsipid modules module_group_ksecsipid=$(mod_list_secsipid)

3 years, 5 months

[kamailio/kamailio] nats: new nats message consumer module (#2790)

by Emmanuel Schmidbauer

#### 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  New Module to consume messages from NATS messaging system. Initial Features: - automatic reconnect with connected/disconnected event routes - connect to up to 10 NATS URLs - subscribe to any number of subjects - receive messages via event route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2790 -- Commit Summary -- * nats: new nats message consumer module -- File Changes -- A src/modules/nats/Makefile (16) A src/modules/nats/doc/Makefile (4) A src/modules/nats/doc/nats.xml (42) A src/modules/nats/doc/nats_admin.xml (207) A src/modules/nats/nats_mod.c (569) A src/modules/nats/nats_mod.h (99) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2790.patch https://github.com/kamailio/kamailio/pull/2790.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2790

3 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021