sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:2e567ce1: dispatcher: Adding new feature for counting successful requests before placing destination from inactive to active state (code)

by alezzandro

Module: kamailio Branch: master Commit: 2e567ce1baac21d6e063a6924a80aff06da803cf URL: https://github.com/kamailio/kamailio/commit/2e567ce1baac21d6e063a6924a80aff… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2014-12-24T00:52:53+01:00 dispatcher: Adding new feature for counting successful requests before placing destination from inactive to active state (code) --- Modified: modules/dispatcher/config.c Modified: modules/dispatcher/config.h Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/2e567ce1baac21d6e063a6924a80aff… Patch: https://github.com/kamailio/kamailio/commit/2e567ce1baac21d6e063a6924a80aff…

9 years, 6 months

git:master:49cca9c3: dispatcher: declare the inactive threshold variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49cca9c3bdd1cc5213c05d08ddb1ea85fe3ff96e URL: https://github.com/kamailio/kamailio/commit/49cca9c3bdd1cc5213c05d08ddb1ea8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-13T17:55:16+01:00 dispatcher: declare the inactive threshold variable - it was declared as extern only - reported by Ovidiu Sas --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/49cca9c3bdd1cc5213c05d08ddb1ea8… Patch: https://github.com/kamailio/kamailio/commit/49cca9c3bdd1cc5213c05d08ddb1ea8… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 2de3d33..57d3298 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -96,6 +96,8 @@ pv_elem_t * hash_param_model = NULL; int probing_threshold = 1; /* number of failed requests, before a destination is taken into probing */ +int inactive_threshold = 1; /* number of replied requests, before a destination + is taken into back in active state */ str ds_ping_method = str_init("OPTIONS"); str ds_ping_from = str_init("sip:dispatcher@localhost"); static int ds_ping_interval = 0; @@ -227,6 +229,7 @@ static param_export_t params[]={ {"setid_pvname", PARAM_STR, &ds_setid_pvname}, {"attrs_pvname", PARAM_STR, &ds_attrs_pvname}, {"ds_probing_threshold", INT_PARAM, &probing_threshold}, + {"ds_inactive_threshold", INT_PARAM, &inactive_threshold}, {"ds_ping_method", PARAM_STR, &ds_ping_method}, {"ds_ping_from", PARAM_STR, &ds_ping_from}, {"ds_ping_interval", INT_PARAM, &ds_ping_interval}, @@ -306,9 +309,11 @@ static int mod_init(void) return -1; } } - /* Copy Threshhold to Config */ + /* copy threshholds to config */ cfg_get(dispatcher, dispatcher_cfg, probing_threshold) = probing_threshold; + cfg_get(dispatcher, dispatcher_cfg, inactive_threshold) + = inactive_threshold; if(init_data()!= 0)

9 years, 6 months

git:master:c1836c5c: modparam.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: c1836c5c35f8e8fcc033d8d5a417ed700eeebe16 URL: https://github.com/kamailio/kamailio/commit/c1836c5c35f8e8fcc033d8d5a417ed7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T11:47:19-05:00 modparam.c: logging: DBG -> LM_DBG --- Modified: modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/c1836c5c35f8e8fcc033d8d5a417ed7… Patch: https://github.com/kamailio/kamailio/commit/c1836c5c35f8e8fcc033d8d5a417ed7… --- diff --git a/modparam.c b/modparam.c index e3db03d..087f11e 100644 --- a/modparam.c +++ b/modparam.c @@ -78,8 +78,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) mod_found = 0; for(t = modules; t; t = t->next) { if (regexec(&preg, t->exports.name, 0, 0, 0) == 0) { - DBG("set_mod_param_regex: '%s' matches module '%s'\n", - regex, t->exports.name); + LM_DBG("'%s' matches module '%s'\n", regex, t->exports.name); mod_found = 1; /* PARAM_STR (PARAM_STRING) may be assigned also to PARAM_STRING(PARAM_STR) so let get both module param */ ptr = find_param_export(t, name, type | ((type & (PARAM_STR|PARAM_STRING))?PARAM_STR|PARAM_STRING:0), &param_type); @@ -95,8 +94,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } else { val2 = val; } - DBG("set_mod_param_regex: found <%s> in module %s [%s]\n", - name, t->exports.name, t->path); + LM_DBG("found <%s> in module %s [%s]\n", name, t->exports.name, t->path); if (param_type & PARAM_USE_FUNC) { if ( ((param_func_t)(ptr))(param_type, val2) < 0) { regfree(&preg);

9 years, 6 months

git:master:c9dca9b4: receive.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: c9dca9b43a79ab8cca22aa50fb501446dd7fd956 URL: https://github.com/kamailio/kamailio/commit/c9dca9b43a79ab8cca22aa50fb50144… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T11:45:39-05:00 receive.c: logging: DBG -> LM_DBG --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/c9dca9b43a79ab8cca22aa50fb50144… Patch: https://github.com/kamailio/kamailio/commit/c9dca9b43a79ab8cca22aa50fb50144… --- diff --git a/receive.c b/receive.c index e737585..8a633cd 100644 --- a/receive.c +++ b/receive.c @@ -131,7 +131,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } goto error02; } - DBG("After parse_msg...\n"); + LM_DBG("After parse_msg...\n"); /* set log prefix */ log_prefix_set(msg); @@ -174,7 +174,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) #endif /* skip: */ - DBG("preparing to run routing scripts...\n"); + LM_DBG("preparing to run routing scripts...\n"); #ifdef STATS gettimeofday( & tvb, &tz ); #endif @@ -203,7 +203,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) diff = (tve.tv_sec-tvb.tv_sec)*1000000+(tve.tv_usec-tvb.tv_usec); stats->processed_requests++; stats->acc_req_time += diff; - DBG("successfully ran routing scripts...(%d usec)\n", diff); + LM_DBG("successfully ran routing scripts...(%d usec)\n", diff); STATS_RX_REQUEST( msg->first_line.u.request.method_value ); #endif @@ -259,7 +259,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) diff = (tve.tv_sec-tvb.tv_sec)*1000000+(tve.tv_usec-tvb.tv_usec); stats->processed_responses++; stats->acc_res_time+=diff; - DBG("successfully ran reply processing...(%d usec)\n", diff); + LM_DBG("successfully ran reply processing...(%d usec)\n", diff); #endif /* execute post reply-script callbacks */ @@ -275,7 +275,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) #ifdef WITH_XAVP xavp_reset_list(); #endif - DBG("receive_msg: cleaning up\n"); + LM_DBG("cleaning up\n"); free_sip_msg(msg); pkg_free(msg); #ifdef STATS @@ -296,7 +296,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) goto error02; #endif /* NO_ONREPLY_ROUTE_ERROR */ error_req: - DBG("receive_msg: error:...\n"); + LM_DBG("error:...\n"); /* execute post request-script callbacks */ exec_post_script_cb(msg, REQUEST_CB_TYPE); error03:

9 years, 6 months

git:master:cd38f623: md5utils.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: cd38f6233a17235c693dffe2f40833f5c56e5996 URL: https://github.com/kamailio/kamailio/commit/cd38f6233a17235c693dffe2f40833f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T11:42:19-05:00 md5utils.c: logging: DBG -> LM_DBG --- Modified: md5utils.c --- Diff: https://github.com/kamailio/kamailio/commit/cd38f6233a17235c693dffe2f40833f… Patch: https://github.com/kamailio/kamailio/commit/cd38f6233a17235c693dffe2f40833f… --- diff --git a/md5utils.c b/md5utils.c index e415eab..8702f22 100644 --- a/md5utils.c +++ b/md5utils.c @@ -64,6 +64,6 @@ void MD5StringArray (char *dst, str src[], int size) U_MD5Final (digest, &context); string2hex(digest, 16, dst ); - DBG("DEBUG: MD5 calculated: %.*s\n", MD5_LEN, dst ); + LM_DBG("MD5 calculated: %.*s\n", MD5_LEN, dst ); }

9 years, 6 months

git:master:e66bd493: id.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: e66bd493ee1d3147901dcf75990bd65eebe5e98f URL: https://github.com/kamailio/kamailio/commit/e66bd493ee1d3147901dcf75990bd65… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T11:41:18-05:00 id.c: logging: DBG -> LM_DBG --- Modified: id.c --- Diff: https://github.com/kamailio/kamailio/commit/e66bd493ee1d3147901dcf75990bd65… Patch: https://github.com/kamailio/kamailio/commit/e66bd493ee1d3147901dcf75990bd65… --- diff --git a/id.c b/id.c index 1545b41..5f1413b 100644 --- a/id.c +++ b/id.c @@ -136,20 +136,19 @@ int get_to_uid(str* uid, struct sip_msg* msg) if (msg->REQ_METHOD == METHOD_REGISTER) { if ((msg->to==0) && (parse_headers(msg, HDR_TO_F, 0) < 0 || msg->to == 0)) { - DBG("get_to_uid: Error while parsing To URI: " - " to header bad or missing\n"); + LM_DBG("Error while parsing To URI: to header bad or missing\n"); return -1; } to = get_to(msg); if (parse_uri(to->uri.s, to->uri.len, &puri) == -1) { - DBG("get_to_uid: Error while parsing To URI\n"); + LM_DBG("Error while parsing To URI\n"); return -1; } p = puri.user.s; uid->len = puri.user.len; } else { if (!msg->parsed_uri_ok && (parse_sip_msg_uri(msg) < 0)) { - DBG("Error while parsing the Request-URI\n"); + LM_DBG("Error while parsing the Request-URI\n"); return -1; } p = msg->parsed_uri.user.s; @@ -157,11 +156,11 @@ int get_to_uid(str* uid, struct sip_msg* msg) } if (uid->len > MAX_URI_SIZE) { - DBG("get_to_uid: Username too long\n"); + LM_DBG("Username too long\n"); return -1; } if (p == NULL || uid->len == 0) { - DBG("get_to_uid: Username is empty\n"); + LM_DBG("Username is empty\n"); return -1; } memcpy(buf, p, uid->len);

9 years, 6 months

git:master:002879f8: main.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: 002879f87cae0d1fd37fdb8fe24cf5e70d14baca URL: https://github.com/kamailio/kamailio/commit/002879f87cae0d1fd37fdb8fe24cf5e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T11:39:42-05:00 main.c: logging: DBG -> LM_DBG --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/002879f87cae0d1fd37fdb8fe24cf5e… Patch: https://github.com/kamailio/kamailio/commit/002879f87cae0d1fd37fdb8fe24cf5e… --- diff --git a/main.c b/main.c index ec88a1f..3899422 100644 --- a/main.c +++ b/main.c @@ -676,9 +676,9 @@ void handle_sigs(void) case SIGTERM: /* we end the program in all these cases */ if (sig_flag==SIGINT) - DBG("INT received, program terminates\n"); + LM_DBG("INT received, program terminates\n"); else - DBG("SIGTERM received, program terminates\n"); + LM_DBG("SIGTERM received, program terminates\n"); LM_NOTICE("Thank you for flying " NAME "!!!\n"); /* shutdown/kill all the children */ shutdown_children(SIGTERM, 1); @@ -743,12 +743,12 @@ void handle_sigs(void) #endif /* exit */ shutdown_children(SIGTERM, 1); - DBG("terminating due to SIGCHLD\n"); + LM_DBG("terminating due to SIGCHLD\n"); exit(0); break; case SIGHUP: /* ignoring it*/ - DBG("SIGHUP received, ignoring it\n"); + LM_DBG("SIGHUP received, ignoring it\n"); break; default: LM_CRIT("unhandled signal %d\n", sig_flag); @@ -824,7 +824,7 @@ void sig_usr(int signo) case SIGCHLD: #ifndef STOP_JIRIS_CHANGES #ifdef SIG_DEBUG /* signal unsafe stuff follows */ - DBG("SIGCHLD received: " + LM_DBG("SIGCHLD received: " "we do not worry about grand-children\n"); #endif #else @@ -1253,7 +1253,7 @@ int main_loop(void) if (default_core_cfg.udp4_raw < 0) { /* auto-detect => use it */ default_core_cfg.udp4_raw = 1; /* enabled */ - DBG("raw socket possible => turning it on\n"); + LM_DBG("raw socket possible => turning it on\n"); } if (default_core_cfg.udp4_raw_ttl < 0) { /* auto-detect */ @@ -1426,7 +1426,7 @@ int main_loop(void) if (default_core_cfg.udp4_raw < 0) { /* auto-detect => use it */ default_core_cfg.udp4_raw = 1; /* enabled */ - DBG("raw socket possible => turning it on\n"); + LM_DBG("raw socket possible => turning it on\n"); } if (default_core_cfg.udp4_raw_ttl < 0) { /* auto-detect */ @@ -1687,7 +1687,7 @@ int main_loop(void) fprintf(stderr, "% 3d % 5d - %s\n", r, pt[r].pid, pt[r].desc); } #endif - DBG("Expect maximum %d open fds\n", get_max_open_fds()); + LM_DBG("Expect maximum %d open fds\n", get_max_open_fds()); /* in daemonize mode send the exit code back to the parent process */ if (!dont_daemonize) { if (daemon_status_send(0) < 0) { @@ -2029,17 +2029,17 @@ int main(int argc, char** argv) if (errno==EINTR) goto try_again; /* interrupted by signal */ LM_WARN("could not read from /dev/urandom (%d)\n", errno); } - DBG("read %u from /dev/urandom\n", seed); + LM_DBG("read %u from /dev/urandom\n", seed); close(rfd); }else{ LM_WARN("could not open /dev/urandom (%d)\n", errno); } seed+=getpid()+time(0); - DBG("seeding PRNG with %u\n", seed); + LM_DBG("seeding PRNG with %u\n", seed); srand(seed); fastrand_seed(rand()); srandom(rand()+time(0)); - DBG("test random numbers %u %lu %u\n", rand(), random(), fastrand()); + LM_DBG("test random numbers %u %lu %u\n", rand(), random(), fastrand()); /*register builtin modules*/ register_builtin_modules(); @@ -2477,7 +2477,7 @@ int main(int argc, char** argv) * function being called before this point may rely on the * number of processes ! */ - DBG("Expect (at least) %d SER processes in your process list\n", + LM_DBG("Expect (at least) %d kamailio processes in your process list\n", get_max_procs()); #if defined USE_DNS_CACHE && defined USE_DNS_CACHE_STATS

9 years, 6 months

git:master:37eaa968: cfg_parser.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: 37eaa968b6f4da93ae97fdb17b0442916ff510cb URL: https://github.com/kamailio/kamailio/commit/37eaa968b6f4da93ae97fdb17b04429… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T10:50:36-05:00 cfg_parser.c: logging: DBG -> LM_DBG --- Modified: cfg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/37eaa968b6f4da93ae97fdb17b04429… Patch: https://github.com/kamailio/kamailio/commit/37eaa968b6f4da93ae97fdb17b04429… --- diff --git a/cfg_parser.c b/cfg_parser.c index 5b3cc12..d8cb21e 100644 --- a/cfg_parser.c +++ b/cfg_parser.c @@ -283,7 +283,7 @@ static void print_token(cfg_token_t* token) char* buf; if ((buf = pkg_malloc(token->val.len * 2)) == NULL) { - DBG("token(%d, '%.*s', <%d,%d>-<%d,%d>)\n", + LM_DBG("token(%d, '%.*s', <%d,%d>-<%d,%d>)\n", token->type, STR_FMT(&token->val), token->start.line, token->start.col, token->end.line, token->end.col); @@ -298,7 +298,7 @@ static void print_token(cfg_token_t* token) default: buf[j++] = token->val.s[i]; } } - DBG("token(%d, '%.*s', <%d,%d>-<%d,%d>)\n", + LM_DBG("token(%d, '%.*s', <%d,%d>-<%d,%d>)\n", token->type, j, buf, token->start.line, token->start.col, token->end.line, token->end.col);

9 years, 6 months

git:master:57b1c29d: io_wait.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: 57b1c29da455029771361469b99d8c9b7957280c URL: https://github.com/kamailio/kamailio/commit/57b1c29da455029771361469b99d8c9… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T10:48:39-05:00 io_wait.c: logging: DBG -> LM_DBG --- Modified: io_wait.c --- Diff: https://github.com/kamailio/kamailio/commit/57b1c29da455029771361469b99d8c9… Patch: https://github.com/kamailio/kamailio/commit/57b1c29da455029771361469b99d8c9… --- diff --git a/io_wait.c b/io_wait.c index b4f262c..5d2d9fc 100644 --- a/io_wait.c +++ b/io_wait.c @@ -141,7 +141,7 @@ static int init_sigio(io_wait_h* h, int rsig) goto error; } - DBG("init_sigio: trying signal %d... \n", h->signo); + LM_DBG("trying signal %d... \n", h->signo); if (sigaddset(&h->sset, h->signo)==-1){ LM_ERR("sigaddset failed for %d: %s [%d]\n",

9 years, 6 months

git:master:6bd4757c: resolve.c: logging: DBG -> LM_DBG

by Ovidiu Sas

Module: kamailio Branch: master Commit: 6bd4757c431867713d5ee24d2fb3330cb8cd884a URL: https://github.com/kamailio/kamailio/commit/6bd4757c431867713d5ee24d2fb3330… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-13T10:47:29-05:00 resolve.c: logging: DBG -> LM_DBG --- Modified: resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/6bd4757c431867713d5ee24d2fb3330… Patch: https://github.com/kamailio/kamailio/commit/6bd4757c431867713d5ee24d2fb3330…

9 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015