sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

git:master:ae23876b: core: dprint - reformatted log macros for better readability
by Daniel-Constantin Mierla 20 Jan '20

20 Jan '20

Module: kamailio Branch: master Commit: ae23876b3091db2e62f651e05fa695d29f540028 URL: https://github.com/kamailio/kamailio/commit/ae23876b3091db2e62f651e05fa695d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T08:50:44+01:00 core: dprint - reformatted log macros for better readability --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/ae23876b3091db2e62f651e05fa695d… Patch: https://github.com/kamailio/kamailio/commit/ae23876b3091db2e62f651e05fa695d… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 255976985e..275671b447 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -259,33 +259,35 @@ void log_prefix_init(void); } while(0) # define LOG_(facility, level, ...) \ - LOG__(facility, level, NULL, __VA_ARGS__, NULL) + LOG__(facility, level, NULL, __VA_ARGS__, NULL) # ifdef LOG_FUNC_NAME # define LOG(level, ...) \ _LOG(level, __VA_ARGS__, NULL) # define _LOG(level, fmt, ...) \ - LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt,\ - _FUNC_NAME_, __VA_ARGS__) + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt,\ + _FUNC_NAME_, __VA_ARGS__) # define LOG_FC(facility, level, ...) \ _LOG_FC(facility, level, __VA_ARGS__, NULL) # define _LOG_FC(facility, level, fmt, ...) \ - LOG_((facility), (level), LOC_INFO, "%s(): " fmt , _FUNC_NAME_, __VA_ARGS__) + LOG_((facility), (level), LOC_INFO, "%s(): " fmt ,\ + _FUNC_NAME_, __VA_ARGS__) # define LOG_LN(level, lname, ...) \ _LOG_LN(level, lname, __VA_ARGS__, NULL) # define _LOG_LN(level, lname, fmt, ...) \ - LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, "%s(): " fmt,\ - _FUNC_NAME_, __VA_ARGS__) + LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, "%s(): " fmt,\ + _FUNC_NAME_, __VA_ARGS__) # else /* LOG_FUNC_NAME */ # define LOG(level, ...) \ - LOG_(DEFAULT_FACILITY, (level), LOC_INFO, __VA_ARGS__, NULL) + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, __VA_ARGS__, NULL) # define LOG_FC(facility, level, ...) \ - LOG_((facility), (level), LOC_INFO, __VA_ARGS__, NULL) + LOG_((facility), (level), LOC_INFO, __VA_ARGS__, NULL) # define LOG_LN(level, lname, ...) \ - LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, __VA_ARGS__, NULL) + LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO,\ + __VA_ARGS__, NULL) # endif /* LOG_FUNC_NAME */ @@ -337,27 +339,28 @@ void log_prefix_init(void); } while(0) # define LOG_(facility, level, prefix, fmt, args...) \ - LOG__(facility, level, NULL, prefix, fmt, ## args) + LOG__(facility, level, NULL, prefix, fmt, ## args) # ifdef LOG_FUNC_NAME # define LOG(level, fmt, args...) \ - LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ - _FUNC_NAME_, ## args) + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ + _FUNC_NAME_, ## args) # define LOG_FC(facility, level, fmt, args...) \ - LOG_((facility), (level), LOC_INFO, "%s(): " fmt , _FUNC_NAME_, ## args) + LOG_((facility), (level), LOC_INFO, "%s(): " fmt ,\ + _FUNC_NAME_, ## args) # define LOG_LN(level, lname, fmt, args...) \ - LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, "%s(): " fmt ,\ - _FUNC_NAME_, ## args) + LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, "%s(): " fmt ,\ + _FUNC_NAME_, ## args) # else /* LOG_FUNC_NAME */ # define LOG(level, fmt, args...) \ - LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt , ## args) + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt , ## args) # define LOG_FC(facility, level, fmt, args...) \ - LOG_((facility), (level), LOC_INFO, fmt , ## args) + LOG_((facility), (level), LOC_INFO, fmt , ## args) # define LOG_LN(level, lname, fmt, args...) \ - LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, fmt , ## args) + LOG__(DEFAULT_FACILITY, (level), (lname), LOC_INFO, fmt , ## args) # endif /* LOG_FUNC_NAME */ # endif /* __SUNPRO_C */

1 0

git:master:53ca8b50: core: check logging protection before the level
by Daniel-Constantin Mierla 20 Jan '20

20 Jan '20

Module: kamailio Branch: master Commit: 53ca8b50207ca35f16a2315efb1ed29448961da8 URL: https://github.com/kamailio/kamailio/commit/53ca8b50207ca35f16a2315efb1ed29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T08:50:44+01:00 core: check logging protection before the level --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/53ca8b50207ca35f16a2315efb1ed29… Patch: https://github.com/kamailio/kamailio/commit/53ca8b50207ca35f16a2315efb1ed29… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index c3096c5555..255976985e 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -214,8 +214,8 @@ void log_prefix_init(void); # ifdef __SUNPRO_C # define LOG__(facility, level, lname, prefix, fmt, ...) \ do { \ - if (get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ - DPRINT_NON_CRIT) { \ + if (DPRINT_NON_CRIT \ + && get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level)) { \ int __llevel; \ __llevel = ((level)<L_ALERT)?L_ALERT:(((level)>L_DBG)?L_DBG:level); \ DPRINT_CRIT_ENTER; \ @@ -292,8 +292,8 @@ void log_prefix_init(void); # else /* ! __SUNPRO_C */ # define LOG__(facility, level, lname, prefix, fmt, args...) \ do { \ - if (get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ - DPRINT_NON_CRIT) { \ + if (DPRINT_NON_CRIT \ + && get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) ) { \ int __llevel; \ __llevel = ((level)<L_ALERT)?L_ALERT:(((level)>L_DBG)?L_DBG:level); \ DPRINT_CRIT_ENTER; \

1 0

git:master:ec0dd71b: log_custom: send processing logs via udp
by Daniel-Constantin Mierla 20 Jan '20

20 Jan '20

Module: kamailio Branch: master Commit: ec0dd71bd963d7bf5959521ff82b6a659efe699a URL: https://github.com/kamailio/kamailio/commit/ec0dd71bd963d7bf5959521ff82b6a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T08:50:44+01:00 log_custom: send processing logs via udp --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec0dd71bd963d7bf5959521ff82b6a6… Patch: https://github.com/kamailio/kamailio/commit/ec0dd71bd963d7bf5959521ff82b6a6… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index 3d68012211..5253dad37e 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -122,7 +122,7 @@ static int w_log_udp(struct sip_msg* msg, char* txt, char* p2) return 1; if(fixup_get_svalue(msg, (gparam_t*)txt, &stxt)!=0) { - LM_ERR("unable to get text parameter\n"); + udp_send(&_lc_udp_dst, "error: unable to get text parameter\n", 36); return -1; } @@ -147,7 +147,7 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); if(udp_send(&_lc_udp_dst, obuf, n)!=0) { - LM_DBG("udp send returned non zero\n"); + udp_send(&_lc_udp_dst, "debug: previous udp send returned non zero\n", 43); } }

1 0

Ann: Registration to Kamailio World 2020 is open!
by Daniel-Constantin Mierla 20 Jan '20

20 Jan '20

Hello, a quick note to the community forums to announce that the registration for the next Kamailio World Conference (April 27-29, 2020, in Berlin, Germany) is now open! More details are available at: * https://www.kamailioworld.com/k08/registration/ Call for presentations is still open, there is already a group of very interesting submissions, we aim to publish details about them in the near future. Looking forward to meeting many of you in Berlin! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 9-11, 2020, Berlin - www.asipto.com Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

1 0

git:master:ac5b1fa3: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 17 Jan '20

17 Jan '20

Module: kamailio Branch: master Commit: ac5b1fa32a2c6c08ce6ca8048eee0064c96746fd URL: https://github.com/kamailio/kamailio/commit/ac5b1fa32a2c6c08ce6ca8048eee006… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-17T13:16:25+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/ac5b1fa32a2c6c08ce6ca8048eee006… Patch: https://github.com/kamailio/kamailio/commit/ac5b1fa32a2c6c08ce6ca8048eee006… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 465f6055af..623d873204 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -60,6 +60,7 @@ Hugh Waite 3.17. query_maxdatasize (int) 3.18. httpcon (string) 3.19. config_file (string) + 3.20. netinterface (string) 4. Functions @@ -122,10 +123,11 @@ Hugh Waite 1.18. Set httpcon parameter 1.19. Set config_file parameter 1.20. Short http_client config file - 1.21. http_connect() usage - 1.22. http_connect_raw() usage - 1.23. http_get_redirect() usage - 1.24. http_client_query() usage + 1.21. Set netinterface parameter + 1.22. http_connect() usage + 1.23. http_connect_raw() usage + 1.24. http_get_redirect() usage + 1.25. http_client_query() usage Chapter 1. Admin Guide @@ -158,6 +160,7 @@ Chapter 1. Admin Guide 3.17. query_maxdatasize (int) 3.18. httpcon (string) 3.19. config_file (string) + 3.20. netinterface (string) 4. Functions @@ -254,6 +257,7 @@ Chapter 1. Admin Guide 3.17. query_maxdatasize (int) 3.18. httpcon (string) 3.19. config_file (string) + 3.20. netinterface (string) 3.1. httpredirect (int) @@ -647,6 +651,19 @@ client_key = default_key.pem client_cert = default_cert.pem http_follow_redirect = no +3.20. netinterface (string) + + Set local network interface to be used for HTTP queries. It can be + interface name or IP address. For more details see: + https://curl.haxx.se/libcurl/c/CURLOPT_INTERFACE.html . + + Default value not set. + + Example 1.21. Set netinterface parameter +... +modparam("http_client", "netinterface", "eth0") +... + 4. Functions 4.1. http_connect(connection, url, [content_type, data,] result) @@ -677,7 +694,7 @@ http_follow_redirect = no This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. - Example 1.21. http_connect() usage + Example 1.22. http_connect() usage ... modparam("http_client", "httpcon", "apiserver=>http://kamailio.org/api/"); ... @@ -718,7 +735,7 @@ xlog("L_INFO", "API-server HTTP connection: $avp(route) Result code $var(res)\n" This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. - Example 1.22. http_connect_raw() usage + Example 1.23. http_connect_raw() usage ... modparam("http_client", "httpcon", "apiserver=>http://kamailio.org/api/"); ... @@ -745,7 +762,7 @@ xlog("L_INFO", "API-server HTTP connection: $avp(route) Result code $var(res)\n" result - The name of a pseudo variable that will contain the last used URL. - Example 1.23. http_get_redirect() usage + Example 1.24. http_get_redirect() usage ... modparam("http_client", "httpredirect", 1); ... @@ -780,7 +797,7 @@ http_get_redirect("apiserver", "$var(targeturl)"); utils module. It is changed to use the same base library and settings as the rest of the functions in this module. - Example 1.24. http_client_query() usage + Example 1.25. http_client_query() usage ... # GET-Request http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(

1 0

git:master:9b9bd62c: http_client: docs for netinterface parameter
by Daniel-Constantin Mierla 17 Jan '20

17 Jan '20

Module: kamailio Branch: master Commit: 9b9bd62ca7a5a99c7db7cdefe523b8a6e7c8a99f URL: https://github.com/kamailio/kamailio/commit/9b9bd62ca7a5a99c7db7cdefe523b8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-17T13:01:46+01:00 http_client: docs for netinterface parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b9bd62ca7a5a99c7db7cdefe523b8a… Patch: https://github.com/kamailio/kamailio/commit/9b9bd62ca7a5a99c7db7cdefe523b8a… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 1079bfe17a..691a995319 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -659,6 +659,28 @@ http_follow_redirect = no </example> </section> + <section id="http_client.p.netinterface"> + <title><varname>netinterface</varname> (string)</title> + <para> + Set local network interface to be used for HTTP queries. It + can be interface name or IP address. For more details see: + https://curl.haxx.se/libcurl/c/CURLOPT_INTERFACE.html . + </para> + <para> + <emphasis> + Default value not set. + </emphasis> + </para> + <example> + <title>Set <varname>netinterface</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "netinterface", "eth0") +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:b384a99d: http_client: new param netinterface to set curl network interface
by Daniel-Constantin Mierla 17 Jan '20

17 Jan '20

Module: kamailio Branch: master Commit: b384a99dc62330a2638fffe07ae1b142ff41d47f URL: https://github.com/kamailio/kamailio/commit/b384a99dc62330a2638fffe07ae1b14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-17T12:39:11+01:00 http_client: new param netinterface to set curl network interface --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/b384a99dc62330a2638fffe07ae1b14… Patch: https://github.com/kamailio/kamailio/commit/b384a99dc62330a2638fffe07ae1b14… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index bfa42ac527..3c99d77f14 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -57,6 +57,7 @@ typedef struct char *failovercon; char *useragent; char *hdrs; + char *netinterface; unsigned int authmethod; unsigned int http_proxy_port; unsigned int tlsversion; @@ -249,7 +250,9 @@ static int curL_query_url(struct sip_msg *_m, const char *_url, str *_dst, if(params->http_follow_redirect) { LM_DBG("Following redirects for this request! \n"); } - + if(params->netinterface != NULL) { + res |= curl_easy_setopt(curl, CURLOPT_INTERFACE, params->netinterface); + } res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)(&stream)); @@ -576,6 +579,7 @@ int curl_con_query_url_f(struct sip_msg *_m, const str *connection, query_params.keep_connections = conn->keep_connections; query_params.oneline = 0; query_params.maxdatasize = maxdatasize; + query_params.netinterface = default_netinterface; query_params.http_proxy_port = conn->http_proxy_port; if(conn->failover.s) { failovercon = as_asciiz(&conn->failover); @@ -654,6 +658,7 @@ int http_client_query( query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = default_query_result; query_params.maxdatasize = default_query_maxdatasize; + query_params.netinterface = default_netinterface; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; } diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index bdc2253b3d..6e2b216c4b 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -100,6 +100,8 @@ unsigned int default_authmethod = CURLAUTH_BASIC | CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */ +char *default_netintrface = 0; /*!< local network interface */ + /*!< Default http query result mode * - 0: return full result * - 1: return first line only */ @@ -204,6 +206,7 @@ static param_export_t params[] = { {"keep_connections", PARAM_INT, &default_keep_connections }, {"query_result", PARAM_INT, &default_query_result }, {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, + {"netinterface", PARAM_STRING, &default_netinterface }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index a3620bd233..29b451ba4d 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -69,6 +69,8 @@ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */ extern counter_handle_t connfail; /* Failed Connection attempts */ +extern char *default_netinterface; + /* Curl stream object */ typedef struct {

1 0

git:5.3:af9c575e: htable: make ht_dmq_init_sync variable extern in ht_dmq.c
by Daniel-Constantin Mierla 16 Jan '20

16 Jan '20

Module: kamailio Branch: 5.3 Commit: af9c575eaa06c3aefa737ceb3fd66116866a4abd URL: https://github.com/kamailio/kamailio/commit/af9c575eaa06c3aefa737ceb3fd6611… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-16T11:26:35+01:00 htable: make ht_dmq_init_sync variable extern in ht_dmq.c - avoiding redeclaration, it is set via modparam (cherry picked from commit 02bff604ec70a51a5ba9faae38e946e556763e08) --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/af9c575eaa06c3aefa737ceb3fd6611… Patch: https://github.com/kamailio/kamailio/commit/af9c575eaa06c3aefa737ceb3fd6611… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 26c6eb859a..ccb67e30d8 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -48,7 +48,7 @@ static str dmq_500_rpl = str_init("Server Internal Error"); static int dmq_cell_group_empty_size = 12; // {"cells":[]} static int dmq_cell_group_max_size = 60000; static ht_dmq_jdoc_cell_group_t ht_dmq_jdoc_cell_group; -int ht_dmq_init_sync; +extern int ht_dmq_init_sync; dmq_api_t ht_dmqb; dmq_peer_t* ht_dmq_peer = NULL; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index be11d4dc49..014dffbc6a 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -31,8 +31,6 @@ extern dmq_api_t ht_dmqb; extern dmq_peer_t* ht_dmq_peer; extern dmq_resp_cback_t ht_dmq_resp_callback; -int ht_dmq_init_sync; - typedef enum { HT_DMQ_NONE, HT_DMQ_SET_CELL, diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 20282a6a4b..443502078d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -224,7 +224,7 @@ static int mod_init(void) } } - if (ht_enable_dmq>0 && ht_dmq_initialize(ht_dmq_init_sync)!=0) { + if (ht_enable_dmq>0 && ht_dmq_initialize()!=0) { LM_ERR("failed to initialize dmq integration\n"); return -1; }

1 0

git:master:02bff604: htable: make ht_dmq_init_sync variable extern in ht_dmq.c
by Daniel-Constantin Mierla 16 Jan '20

16 Jan '20

Module: kamailio Branch: master Commit: 02bff604ec70a51a5ba9faae38e946e556763e08 URL: https://github.com/kamailio/kamailio/commit/02bff604ec70a51a5ba9faae38e946e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-16T11:23:40+01:00 htable: make ht_dmq_init_sync variable extern in ht_dmq.c - avoiding redeclaration, it is set via modparam --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/02bff604ec70a51a5ba9faae38e946e… Patch: https://github.com/kamailio/kamailio/commit/02bff604ec70a51a5ba9faae38e946e… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 26c6eb859a..ccb67e30d8 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -48,7 +48,7 @@ static str dmq_500_rpl = str_init("Server Internal Error"); static int dmq_cell_group_empty_size = 12; // {"cells":[]} static int dmq_cell_group_max_size = 60000; static ht_dmq_jdoc_cell_group_t ht_dmq_jdoc_cell_group; -int ht_dmq_init_sync; +extern int ht_dmq_init_sync; dmq_api_t ht_dmqb; dmq_peer_t* ht_dmq_peer = NULL; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index be11d4dc49..014dffbc6a 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -31,8 +31,6 @@ extern dmq_api_t ht_dmqb; extern dmq_peer_t* ht_dmq_peer; extern dmq_resp_cback_t ht_dmq_resp_callback; -int ht_dmq_init_sync; - typedef enum { HT_DMQ_NONE, HT_DMQ_SET_CELL, diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 20282a6a4b..443502078d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -224,7 +224,7 @@ static int mod_init(void) } } - if (ht_enable_dmq>0 && ht_dmq_initialize(ht_dmq_init_sync)!=0) { + if (ht_enable_dmq>0 && ht_dmq_initialize()!=0) { LM_ERR("failed to initialize dmq integration\n"); return -1; }

1 0

git:5.3:f61b2de3: core: more details on error log on failed comp_num() expression
by Daniel-Constantin Mierla 16 Jan '20

16 Jan '20

Module: kamailio Branch: 5.3 Commit: f61b2de38b10e3eb23b01843aacc2b739b7016d8 URL: https://github.com/kamailio/kamailio/commit/f61b2de38b10e3eb23b01843aacc2b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-16T09:27:15+01:00 core: more details on error log on failed comp_num() expression (cherry picked from commit a85bdf58e3f1933a4a1d231b5de4fd9cf1393366) --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/f61b2de38b10e3eb23b01843aacc2b7… Patch: https://github.com/kamailio/kamailio/commit/f61b2de38b10e3eb23b01843aacc2b7… --- diff --git a/src/core/route.c b/src/core/route.c index 4aa7f25f76..ad2fa66e64 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -1212,7 +1212,8 @@ inline static int comp_num(int op, long left, int rtype, union exp_op* r, } break; default: - LM_CRIT("Invalid right operand (%d)\n", rtype); + LM_CRIT("Invalid right operand (rtype: %d expr-op: %d lval: %ld)\n", + rtype, op, left); return E_BUG; }

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020