sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:da81321d: app_jsdt: proper jump in the js exports array

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: da81321d73666d9df1f80c92031726af0c16e2a4 URL: https://github.com/kamailio/kamailio/commit/da81321d73666d9df1f80c92031726a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-07T11:04:56+02:00 app_jsdt: proper jump in the js exports array --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/da81321d73666d9df1f80c92031726a… Patch: https://github.com/kamailio/kamailio/commit/da81321d73666d9df1f80c92031726a… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ad5ec342d4..0752e2ad31 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1238,7 +1238,7 @@ duk_ret_t dukopen_KSR(duk_context *J) if(emods_size>1) { for(k=1; k<emods_size; k++) { n++; - _sr_crt_J_KSRMethods += n; + _sr_crt_J_KSRMethods = _sr_J_KSRMethods + n; snprintf(mname, 128, "KSR_%s", emods[k].kexp[0].mname.s); for(i=0; emods[k].kexp[i].func!=NULL; i++) { LM_DBG("exporting %s.%s(...)\n", mname,

7 years, 5 months

git:master:4a3a6a75: lib/srdb1: updated tables descriptions to generate link to module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a3a6a75010de80bc5e41f5cd1d14fabf54b43cf URL: https://github.com/kamailio/kamailio/commit/4a3a6a75010de80bc5e41f5cd1d14fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-06T18:06:04+02:00 lib/srdb1: updated tables descriptions to generate link to module --- Modified: src/lib/srdb1/schema/acc.xml Modified: src/lib/srdb1/schema/acc_cdrs.xml Modified: src/lib/srdb1/schema/address.xml Modified: src/lib/srdb1/schema/aliases.xml Modified: src/lib/srdb1/schema/carrier_name.xml Modified: src/lib/srdb1/schema/carrierfailureroute.xml Modified: src/lib/srdb1/schema/carrierroute.xml Modified: src/lib/srdb1/schema/cpl.xml Modified: src/lib/srdb1/schema/dbaliases.xml Modified: src/lib/srdb1/schema/dialog.xml Modified: src/lib/srdb1/schema/dialog_vars.xml Modified: src/lib/srdb1/schema/dialplan.xml Modified: src/lib/srdb1/schema/dispatcher.xml Modified: src/lib/srdb1/schema/domain.xml Modified: src/lib/srdb1/schema/domain_attrs.xml Modified: src/lib/srdb1/schema/domain_name.xml Modified: src/lib/srdb1/schema/domainpolicy.xml Modified: src/lib/srdb1/schema/dr_gateways.xml Modified: src/lib/srdb1/schema/dr_groups.xml Modified: src/lib/srdb1/schema/dr_gw_lists.xml Modified: src/lib/srdb1/schema/dr_rules.xml Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/globalblacklist.xml Modified: src/lib/srdb1/schema/grp.xml Modified: src/lib/srdb1/schema/htable.xml Modified: src/lib/srdb1/schema/imc_members.xml Modified: src/lib/srdb1/schema/imc_rooms.xml Modified: src/lib/srdb1/schema/lcr_gw.xml Modified: src/lib/srdb1/schema/lcr_rule.xml Modified: src/lib/srdb1/schema/lcr_rule_target.xml Modified: src/lib/srdb1/schema/location.xml Modified: src/lib/srdb1/schema/location_attrs.xml Modified: src/lib/srdb1/schema/matrix.xml Modified: src/lib/srdb1/schema/missed_calls.xml Modified: src/lib/srdb1/schema/mohqcalls.xml Modified: src/lib/srdb1/schema/mohqueues.xml Modified: src/lib/srdb1/schema/mtree.xml Modified: src/lib/srdb1/schema/mtrees.xml Modified: src/lib/srdb1/schema/pdt.xml Modified: src/lib/srdb1/schema/pipelimit.xml Modified: src/lib/srdb1/schema/pr_active_watchers.xml Modified: src/lib/srdb1/schema/pr_presentity.xml Modified: src/lib/srdb1/schema/pr_pua.xml Modified: src/lib/srdb1/schema/pr_watchers.xml Modified: src/lib/srdb1/schema/pr_xcap.xml Modified: src/lib/srdb1/schema/purplemap.xml Modified: src/lib/srdb1/schema/re_grp.xml Modified: src/lib/srdb1/schema/rls_presentity.xml Modified: src/lib/srdb1/schema/rls_watchers.xml Modified: src/lib/srdb1/schema/rtpengine.xml Modified: src/lib/srdb1/schema/rtpproxy.xml Modified: src/lib/srdb1/schema/sca.xml Modified: src/lib/srdb1/schema/silo.xml Modified: src/lib/srdb1/schema/sip_trace.xml Modified: src/lib/srdb1/schema/speed_dial.xml Modified: src/lib/srdb1/schema/subscriber.xml Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml Modified: src/lib/srdb1/schema/trusted.xml Modified: src/lib/srdb1/schema/uacreg.xml Modified: src/lib/srdb1/schema/uri.xml Modified: src/lib/srdb1/schema/userblacklist.xml Modified: src/lib/srdb1/schema/usr_preferences.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a3a6a75010de80bc5e41f5cd1d14fa… Patch: https://github.com/kamailio/kamailio/commit/4a3a6a75010de80bc5e41f5cd1d14fa…

7 years, 5 months

git:master:684d9695: lib/srdb1: updated url to modules docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 684d969551abdf5688c1c841b1e19e86b2324a40 URL: https://github.com/kamailio/kamailio/commit/684d969551abdf5688c1c841b1e19e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-06T17:11:11+02:00 lib/srdb1: updated url to modules docs --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/684d969551abdf5688c1c841b1e19e8… Patch: https://github.com/kamailio/kamailio/commit/684d969551abdf5688c1c841b1e19e8… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index b63d5ed535..fc11ce0e95 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -30,4 +30,4 @@ <!ENTITY DEFAULT_CSEQ "1"> <!ENTITY DEFAULT_DATETIME "2000-01-01 00:00:01">  <!ENTITY DEFAULT_FLAGS "0"> -<!ENTITY KAMAILIO_MOD_DOC "http://www.kamailio.org/docs/modules/devel/"> +<!ENTITY KAMAILIO_MOD_DOC "http://www.kamailio.org/docs/modules/devel/modules/">

7 years, 5 months

benchmark rpc commands causing kamailio to crash

by David Escartín Almudévar

hello all today testing kamailio 5.0.1 version we have seen that some rpc commands of benchmark module are not working fine. when trying to change enable_global parameter, setting 1 for example it says that the parameter is invalid /usr/local/kamailio-5.0/sbin/kamcmd -s udp:127.0.0.1:2046 benchmark.enable_global 1 error: 500 - Invalid Parameter Value besides, it also permits to set a granularity value of 0 without giving error. By doing that, if the kamailio has calls in progress, the kamailio get a crash Core was generated by `/usr/local/kamailio-5.0/sbin/kamailio -P /var/run/kamailio/kamailio_talos.pid -'. Program terminated with signal 8, Arithmetic exception. #0 0x00007f4d55989757 in _bm_log_timer (id=0) at benchmark.c:320 320 if ((bm_mycfg->tindex[id]->calls % bm_mycfg->granularity) == 0) Missing separate debuginfos, use: debuginfo-install glibc-2.12-1.132.el6.x86_64 libxml2-2.7.6-14.el6.x86_64 pcre-7.8-6.el6.x86_64 zlib-1.2.3-29.el6.x86_64 i understand that maybe is trying to divide by 0 to calcutate the benchmark stats. checking the functions, we made a change to fix this problem, by chaning the type of the vars defined as "int", instead of "long int". this way seems the commands work fine /usr/local/kamailio-5.0/sbin/kamcmd -s udp:127.0.0.1:2046 benchmark.enable_global 1 /usr/local/kamailio-5.0/sbin/kamcmd -s udp:127.0.0.1:2046 benchmark.granularity 0 error: 500 - Invalid Parameter Value this are the changes we made index d40469b..5a353d5 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -479,7 +479,8 @@ static inline int fixup_bm_timer(void** param, int param_no) */ void bm_rpc_enable_global(rpc_t* rpc, void* ctx) { - long int v1; + int v1; + /*long int v1;*/ if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -518,7 +519,8 @@ void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) void bm_rpc_granularity(rpc_t* rpc, void* ctx) { - long int v1; + int v1; + /*long int v1;*/ if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -533,7 +535,8 @@ void bm_rpc_granularity(rpc_t* rpc, void* ctx) void bm_rpc_loglevel(rpc_t* rpc, void* ctx) { - long int v1; + int v1; + /*long int v1;*/ if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); could you please check if this fix is enough? and maybe there can be some other functions with this problem? thanks alot and regards david

7 years, 5 months

git:master:efe6966f: core: throw yyerror on invalid cfg var definition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: efe6966fa1691cbb762ec13aa11164b0989e3cb4 URL: https://github.com/kamailio/kamailio/commit/efe6966fa1691cbb762ec13aa11164b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-06T11:19:38+02:00 core: throw yyerror on invalid cfg var definition --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/efe6966fa1691cbb762ec13aa11164b… Patch: https://github.com/kamailio/kamailio/commit/efe6966fa1691cbb762ec13aa11164b… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 890f964cfb..59125a1659 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1594,6 +1594,7 @@ cfg_var_idn: ID | NUMBER { yyerror("cfg var field name - use of number or reserved token not allowed: %s", yy_number_str); + YYERROR; } ;

7 years, 5 months

git:master:fbc6b275: core: catch use of numbers or reserved tokens in cfg var definitions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fbc6b275be1467871e26ea8c72f4ad6df724e2dd URL: https://github.com/kamailio/kamailio/commit/fbc6b275be1467871e26ea8c72f4ad6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-06T11:18:30+02:00 core: catch use of numbers or reserved tokens in cfg var definitions --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/fbc6b275be1467871e26ea8c72f4ad6… Patch: https://github.com/kamailio/kamailio/commit/fbc6b275be1467871e26ea8c72f4ad6… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 2cfc7516e1..890f964cfb 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -594,6 +594,7 @@ extern char *default_routename; %type <intval> avpflag_oper %type <intval> rve_un_op %type <strval> cfg_var_id +%type <strval> cfg_var_idn /* %type <intval> rve_op */ /*%type <route_el> rules; @@ -1588,36 +1589,44 @@ cfg_var_id: ID | DEFAULT { $$="default" ; } /*needed to allow default as cfg var. name*/ ; +cfg_var_idn: ID + | DEFAULT { $$="default" ; } /*needed to allow default as cfg var. name*/ + | NUMBER { + yyerror("cfg var field name - use of number or reserved token not allowed: %s", + yy_number_str); + } + ; + cfg_var: - cfg_var_id DOT cfg_var_id EQUAL NUMBER { + cfg_var_id DOT cfg_var_idn EQUAL NUMBER { if (cfg_declare_int($1, $3, $5, 0, 0, NULL)) { yyerror("variable cannot be declared"); } } - | cfg_var_id DOT cfg_var_id EQUAL STRING { + | cfg_var_id DOT cfg_var_idn EQUAL STRING { if (cfg_declare_str($1, $3, $5, NULL)) { yyerror("variable cannot be declared"); } } - | cfg_var_id DOT cfg_var_id EQUAL NUMBER CFG_DESCRIPTION STRING { + | cfg_var_id DOT cfg_var_idn EQUAL NUMBER CFG_DESCRIPTION STRING { if (cfg_declare_int($1, $3, $5, 0, 0, $7)) { yyerror("variable cannot be declared"); } } - | cfg_var_id DOT cfg_var_id EQUAL STRING CFG_DESCRIPTION STRING { + | cfg_var_id DOT cfg_var_idn EQUAL STRING CFG_DESCRIPTION STRING { if (cfg_declare_str($1, $3, $5, $7)) { yyerror("variable cannot be declared"); } } - | cfg_var_id DOT cfg_var_id EQUAL error { + | cfg_var_id DOT cfg_var_idn EQUAL error { yyerror("number or string expected"); } - | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_id EQUAL NUMBER { + | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_idn EQUAL NUMBER { if (cfg_ginst_var_int($1, $3, $6, $8)) { yyerror("variable cannot be added to the group instance"); } } - | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_id EQUAL STRING { + | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_idn EQUAL STRING { if (cfg_ginst_var_string($1, $3, $6, $8)) { yyerror("variable cannot be added to the group instance"); }

7 years, 5 months

git:master:f0d5c35c: ChangeLog: updates to reflect last major release

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0d5c35c139920630148a946cbaf4375d812730b URL: https://github.com/kamailio/kamailio/commit/f0d5c35c139920630148a946cbaf437… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-06T10:52:18+02:00 ChangeLog: updates to reflect last major release --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/f0d5c35c139920630148a946cbaf437… Patch: https://github.com/kamailio/kamailio/commit/f0d5c35c139920630148a946cbaf437…

7 years, 5 months

git:master:8e65fe4d: Merge pull request #1149 from mslehto/deadcode

by GitHub

Module: kamailio Branch: master Commit: 8e65fe4d7ac055b285798290c68fe378e2addbf6 URL: https://github.com/kamailio/kamailio/commit/8e65fe4d7ac055b285798290c68fe37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-06T09:37:10+02:00 Merge pull request #1149 from mslehto/deadcode Found some obsolete statements in nathelper --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/8e65fe4d7ac055b285798290c68fe37… Patch: https://github.com/kamailio/kamailio/commit/8e65fe4d7ac055b285798290c68fe37… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 61f3747f09..283e75c89b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -102,42 +102,9 @@ MODULE_VERSION #define NAT_UAC_TEST_C_PORT 0x80 -#define DEFAULT_RTPP_SET_ID 0 - -#define MI_SET_NATPING_STATE "nh_enable_ping" -#define MI_DEFAULT_NATPING_STATE 1 - -#define MI_MIN_RECHECK_TICKS 0 -#define MI_MAX_RECHECK_TICKS (unsigned int)-1 - -#define MI_SHOW_RTP_PROXIES "nh_show_rtpp" - -#define MI_RTP_PROXY_NOT_FOUND "RTP proxy not found" -#define MI_RTP_PROXY_NOT_FOUND_LEN (sizeof(MI_RTP_PROXY_NOT_FOUND)-1) -#define MI_PING_DISABLED "NATping disabled from script" -#define MI_PING_DISABLED_LEN (sizeof(MI_PING_DISABLED)-1) -#define MI_SET "set" -#define MI_SET_LEN (sizeof(MI_SET)-1) -#define MI_INDEX "index" -#define MI_INDEX_LEN (sizeof(MI_INDEX)-1) -#define MI_DISABLED "disabled" -#define MI_DISABLED_LEN (sizeof(MI_DISABLED)-1) -#define MI_WEIGHT "weight" -#define MI_WEIGHT_LEN (sizeof(MI_WEIGHT)-1) -#define MI_RECHECK_TICKS "recheck_ticks" -#define MI_RECHECK_T_LEN (sizeof(MI_RECHECK_TICKS)-1) - - - -/* Supported version of the RTP proxy command protocol */ -#define SUP_CPROTOVER 20040107 -/* Required additional version of the RTP proxy command protocol */ -#define REQ_CPROTOVER "20050322" -/* Additional version necessary for re-packetization support */ -#define REP_CPROTOVER "20071116" -#define PTL_CPROTOVER "20081102" - -#define CPORT "22222" +#define DEFAULT_NATPING_STATE 1 + + static int nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2); static int fix_nated_contact_f(struct sip_msg *, char *, char *); static int add_contact_alias_0_f(struct sip_msg *, char *, char *); @@ -190,7 +157,6 @@ static struct { static int ping_nated_only = 0; static const char sbuf[4] = {0, 0, 0, 0}; static str force_socket_str = STR_NULL; -static pid_t mypid; static int sipping_flag = -1; static int natping_disable_flag = -1; static int natping_processes = 1; @@ -201,7 +167,7 @@ static char* rcv_avp_param = NULL; static unsigned short rcv_avp_type = 0; static int_str rcv_avp_name; -static char *natping_socket = 0; +static char* natping_socket = NULL; static int udpping_from_path = 0; static int sdp_oldmediaip = 1; static int raw_sock = -1; @@ -213,7 +179,7 @@ static request_method_t sipping_method_id = 0; static int nh_filter_srvid = 0; /*0-> disabled, 1 ->enabled*/ -unsigned int *natping_state=0; +unsigned int* natping_state = NULL; static cmd_export_t cmds[] = { {"fix_nated_contact", (cmd_function)fix_nated_contact_f, 0, @@ -521,7 +487,7 @@ mod_init(void) LM_ERR("no shmem left\n"); return -1; } - *natping_state = MI_DEFAULT_NATPING_STATE; + *natping_state = DEFAULT_NATPING_STATE; if (ping_nated_only && ul.nat_flag==0) { LM_ERR("bad config - ping_nated_only enabled, but no nat bflag" @@ -596,9 +562,6 @@ child_init(int rank) if (rank<=0 && rank!=PROC_TIMER) return 0; - /* Iterate known RTP proxies - create sockets */ - mypid = getpid(); - return 0; }

7 years, 5 months

git:master:4f417961: modules/nathelper: remove old unused code and macros

by Mikko Lehto

Module: kamailio Branch: master Commit: 4f4179616db5dd3a6e48390a1227b896dd667d29 URL: https://github.com/kamailio/kamailio/commit/4f4179616db5dd3a6e48390a1227b89… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-05T21:58:43+03:00 modules/nathelper: remove old unused code and macros - MI removed completely - RTP proxy logic in modules/rtp[proxy|engine] --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/4f4179616db5dd3a6e48390a1227b89… Patch: https://github.com/kamailio/kamailio/commit/4f4179616db5dd3a6e48390a1227b89… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5a81f57e29..283e75c89b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -102,42 +102,9 @@ MODULE_VERSION #define NAT_UAC_TEST_C_PORT 0x80 -#define DEFAULT_RTPP_SET_ID 0 - -#define MI_SET_NATPING_STATE "nh_enable_ping" -#define MI_DEFAULT_NATPING_STATE 1 - -#define MI_MIN_RECHECK_TICKS 0 -#define MI_MAX_RECHECK_TICKS (unsigned int)-1 - -#define MI_SHOW_RTP_PROXIES "nh_show_rtpp" - -#define MI_RTP_PROXY_NOT_FOUND "RTP proxy not found" -#define MI_RTP_PROXY_NOT_FOUND_LEN (sizeof(MI_RTP_PROXY_NOT_FOUND)-1) -#define MI_PING_DISABLED "NATping disabled from script" -#define MI_PING_DISABLED_LEN (sizeof(MI_PING_DISABLED)-1) -#define MI_SET "set" -#define MI_SET_LEN (sizeof(MI_SET)-1) -#define MI_INDEX "index" -#define MI_INDEX_LEN (sizeof(MI_INDEX)-1) -#define MI_DISABLED "disabled" -#define MI_DISABLED_LEN (sizeof(MI_DISABLED)-1) -#define MI_WEIGHT "weight" -#define MI_WEIGHT_LEN (sizeof(MI_WEIGHT)-1) -#define MI_RECHECK_TICKS "recheck_ticks" -#define MI_RECHECK_T_LEN (sizeof(MI_RECHECK_TICKS)-1) - - - -/* Supported version of the RTP proxy command protocol */ -#define SUP_CPROTOVER 20040107 -/* Required additional version of the RTP proxy command protocol */ -#define REQ_CPROTOVER "20050322" -/* Additional version necessary for re-packetization support */ -#define REP_CPROTOVER "20071116" -#define PTL_CPROTOVER "20081102" - -#define CPORT "22222" +#define DEFAULT_NATPING_STATE 1 + + static int nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2); static int fix_nated_contact_f(struct sip_msg *, char *, char *); static int add_contact_alias_0_f(struct sip_msg *, char *, char *); @@ -190,7 +157,6 @@ static struct { static int ping_nated_only = 0; static const char sbuf[4] = {0, 0, 0, 0}; static str force_socket_str = STR_NULL; -static pid_t mypid; static int sipping_flag = -1; static int natping_disable_flag = -1; static int natping_processes = 1; @@ -521,7 +487,7 @@ mod_init(void) LM_ERR("no shmem left\n"); return -1; } - *natping_state = MI_DEFAULT_NATPING_STATE; + *natping_state = DEFAULT_NATPING_STATE; if (ping_nated_only && ul.nat_flag==0) { LM_ERR("bad config - ping_nated_only enabled, but no nat bflag" @@ -596,9 +562,6 @@ child_init(int rank) if (rank<=0 && rank!=PROC_TIMER) return 0; - /* Iterate known RTP proxies - create sockets */ - mypid = getpid(); - return 0; }

7 years, 5 months

git:master:37b90d1c: modules/nathelper: make variable declaration consistent

by Mikko Lehto

Module: kamailio Branch: master Commit: 37b90d1c91bcaa2281a4fa25980f31d9f2579d17 URL: https://github.com/kamailio/kamailio/commit/37b90d1c91bcaa2281a4fa25980f31d… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-05T21:43:18+03:00 modules/nathelper: make variable declaration consistent --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/37b90d1c91bcaa2281a4fa25980f31d… Patch: https://github.com/kamailio/kamailio/commit/37b90d1c91bcaa2281a4fa25980f31d… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 61f3747f09..5a81f57e29 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -201,7 +201,7 @@ static char* rcv_avp_param = NULL; static unsigned short rcv_avp_type = 0; static int_str rcv_avp_name; -static char *natping_socket = 0; +static char* natping_socket = NULL; static int udpping_from_path = 0; static int sdp_oldmediaip = 1; static int raw_sock = -1; @@ -213,7 +213,7 @@ static request_method_t sipping_method_id = 0; static int nh_filter_srvid = 0; /*0-> disabled, 1 ->enabled*/ -unsigned int *natping_state=0; +unsigned int* natping_state = NULL; static cmd_export_t cmds[] = { {"fix_nated_contact", (cmd_function)fix_nated_contact_f, 0,

7 years, 5 months

← Newer
1
...
26
27
28
29
30
31
32
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017