sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

git:master:3310aa31: uac: uac.reg_refresh doc is supplemented
by Dmitri Savolainen 19 May '16

19 May '16

Module: kamailio Branch: master Commit: 3310aa311b76d44f33cf784d20b874db259b61b2 URL: https://github.com/kamailio/kamailio/commit/3310aa311b76d44f33cf784d20b874d… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2016-05-18T20:07:38+03:00 uac: uac.reg_refresh doc is supplemented --- Modified: modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3310aa311b76d44f33cf784d20b874d… Patch: https://github.com/kamailio/kamailio/commit/3310aa311b76d44f33cf784d20b874d… --- diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index db5f695..b1dc06f 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -995,9 +995,9 @@ event_route[uac:reply] { </title> <para> Load one record by l_uuid from database for remote registrations. - If the record exists in memory, its authentication password is - updated, otherwise a new record is added. The command has a - parameter, which is the value of l_uuid field. + If the record exists in memory, its authentication password, flags + and proxy are updated, otherwise a new record is added. + The command has a parameter, which is the value of l_uuid field. </para> <example> <title><function>uac.reg_refresh</function> usage</title>

1 0

[kamailio/kamailio] uac: uac.reg_refresh doc is supplemented (#629)
by Dmitri Savolainen 19 May '16

19 May '16

flags and proxy You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/629 -- Commit Summary -- * uac: uac.reg_refresh doc is supplemented -- File Changes -- M modules/uac/doc/uac_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/629.patch https://github.com/kamailio/kamailio/pull/629.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/629

2 2

Kamailio 5-0 - Executing event routes in embedded languages
by Daniel-Constantin Mierla 18 May '16

18 May '16

Hello, as announced earlier this morning, most of the routing blocks can be written directly in an embedded language (right now supported being Lua and Python). The missing blocks are (most of) the event routes. The event route from tm for branch failure route is already supported, as the name has to be set via t_on_branch_failure(...). In the native configuration, event routes are executed if they are defined. Their names (as in event_route[name]) are not valid function names for the other programming languages to be used directly corresponding callback function name. I was thinking of the alternative, next are the ones I came up with, more suggestions are welcome. 1) add parameters for event route callback names, like: modparam("htable", "evrtcb_mod_init", "ksr_htable_mod_init") would define the name of the function for the alternative to event_route[htable:mod-init]. This has a benefit in speed, if the parameter is not defined, then there is no overhead in trying to execute a callback function in an embedded language. The drawback is that there is need to code a bit of C to add those parameters to the components executing event routes. 2) do a direct mapping using some translation rules, like: - prefix with ksr_ - replace ':' and '-' with underscore '_' So event_route[htable:mod-init] will have automatically the correspondent function ksr_htable_mod_init(). The drawback is that each time the even route should be called, a lookup on embedded language symbols table needs to be done to see if it exists, then execute it. There is still some C code to do, but less than adding parameters like for 1). 3) like 2), but instead of an automatic translation, keep a mapping table: struct mapping { str kname; str ename; } table[] = { str_init("htable:mod-init"), str_init("ksr_htable_mod_init"), } Adding a new event route will require adding a new record in the mapping table. The benefit is that the function name in embedded language can be selected to be whatever, with or without ties to the event_route name. Opinions? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, Berlin, May 18-20, 2016 - http://www.kamailioworld.com

3 2

git:master:45039140: modules/ims_dialog: support for dlg_vars in ims_dialog. taken from orig. dialog module
by jaybeepee 18 May '16

18 May '16

Module: kamailio Branch: master Commit: 4503914030dd59e28df8c14bab070a0433d10482 URL: https://github.com/kamailio/kamailio/commit/4503914030dd59e28df8c14bab070a0… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-05-18T15:17:15+02:00 modules/ims_dialog: support for dlg_vars in ims_dialog. taken from orig. dialog module --- Modified: modules/ims_dialog/dlg_ng_stats.h Modified: modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/4503914030dd59e28df8c14bab070a0… Patch: https://github.com/kamailio/kamailio/commit/4503914030dd59e28df8c14bab070a0… --- diff --git a/modules/ims_dialog/dlg_ng_stats.h b/modules/ims_dialog/dlg_ng_stats.h index b9ed67f..978a223 100644 --- a/modules/ims_dialog/dlg_ng_stats.h +++ b/modules/ims_dialog/dlg_ng_stats.h @@ -11,6 +11,8 @@ struct dialog_ng_counters_h { }; +struct dialog_ng_counters_h dialog_ng_cnts_h; + int dialog_ng_stats_init(); void dialog_ng_stats_destroy(); diff --git a/modules/ims_dialog/ims_dialog.c b/modules/ims_dialog/ims_dialog.c index 3562235..3074427 100644 --- a/modules/ims_dialog/ims_dialog.c +++ b/modules/ims_dialog/ims_dialog.c @@ -87,6 +87,8 @@ static int w_dlg_setflag(struct sip_msg *msg, char *flag, char *s2); static int w_dlg_terminate(struct sip_msg*, char*, char*); static int w_dlg_get(struct sip_msg*, char*, char*, char*); static int w_is_known_dlg(struct sip_msg *); +static int pv_get_dlg_count( struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); static cmd_export_t cmds[] = { {"set_dlg_profile", (cmd_function) w_set_dlg_profile, 1, fixup_profile, @@ -155,6 +157,22 @@ static mi_export_t mi_cmds[] = { static rpc_export_t rpc_methods[]; +static pv_export_t mod_items[] = { + { {"DLG_count", sizeof("DLG_count")-1}, PVT_OTHER, pv_get_dlg_count, 0, + 0, 0, 0, 0 }, + { {"DLG_lifetime",sizeof("DLG_lifetime")-1}, PVT_OTHER, pv_get_dlg_lifetime, 0, + 0, 0, 0, 0 }, + { {"DLG_status", sizeof("DLG_status")-1}, PVT_OTHER, pv_get_dlg_status, 0, + 0, 0, 0, 0 }, + { {"dlg_ctx", sizeof("dlg_ctx")-1}, PVT_OTHER, pv_get_dlg_ctx, + pv_set_dlg_ctx, pv_parse_dlg_ctx_name, 0, 0, 0 }, + { {"dlg", sizeof("dlg")-1}, PVT_OTHER, pv_get_dlg, + 0, pv_parse_dlg_name, 0, 0, 0 }, + { {"dlg_var", sizeof("dlg_var")-1}, PVT_OTHER, pv_get_dlg_variable, + pv_set_dlg_variable, pv_parse_dialog_var_name, 0, 0, 0}, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + struct module_exports exports = { "ims_dialog", /* module's name */ DEFAULT_DLFLAGS, /* dlopen flags */ @@ -162,7 +180,7 @@ struct module_exports exports = { mod_params, /* param exports */ 0, /* exported statistics */ mi_cmds, /* exported MI functions */ - 0, /* exported pseudo-variables */ + mod_items, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* reply processing function */ @@ -346,6 +364,30 @@ int load_dlg(struct dlg_binds *dlgb) { return 1; } +static int pv_get_dlg_count(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + int n; + int l; + char *ch; + + if(msg==NULL || res==NULL) + return -1; + + n = counter_get_val(dialog_ng_cnts_h.active); + l = 0; + ch = int2str( n, &l); + + res->rs.s = ch; + res->rs.len = l; + + res->ri = n; + res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; + + return 0; +} + + static int mod_init(void) { unsigned int n;

1 0

[kamailio] kamailio crash when use http_query (#468)
by situnan 18 May '16

18 May '16

1file:modules/utils/functionsc 2Problem Description：Array Overflow and View Code Label：wsong@grandstreamcn size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr) { http_res_stream_t *stream = (http_res_stream_t *) stream_ptr; stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + (size * nmemb) + 1); if (stream->buf == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; } memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb)); stream->curr_size += ((size * nmemb) + 1); stream->pos += (size * nmemb); //begin modify wsong@grandstreamcn // reason:stream->buf size begin with 0 // stream->buf[stream->pos + 1] = '\0'; stream->buf[stream->pos ] = '\0'; //end modify wsong@grandstreamcn return size * nmemb; } --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/468

4 3

git:master:5261d61f: Merge pull request #626 from mslehto/strict-aliasing
by Daniel-Constantin Mierla 18 May '16

18 May '16

Module: kamailio Branch: master Commit: 5261d61f8202689204242c218fdd17ce3b2e461b URL: https://github.com/kamailio/kamailio/commit/5261d61f8202689204242c218fdd17c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-18T07:10:55+02:00 Merge pull request #626 from mslehto/strict-aliasing lib/srutils: fix gcc warning GH#612 --- Modified: lib/srutils/sha256.c --- Diff: https://github.com/kamailio/kamailio/commit/5261d61f8202689204242c218fdd17c… Patch: https://github.com/kamailio/kamailio/commit/5261d61f8202689204242c218fdd17c… --- diff --git a/lib/srutils/sha256.c b/lib/srutils/sha256.c index 90efd15..2b40551 100644 --- a/lib/srutils/sha256.c +++ b/lib/srutils/sha256.c @@ -610,7 +610,7 @@ void sr_SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { *context->buffer = 0x80; } /* Set the bit count: */ - *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; + MEMCPY_BCOPY(&(context->buffer[SHA256_SHORT_BLOCK_LENGTH]), &(context->bitcount), sizeof(sha2_word64)); /* Final transform: */ SHA256_Transform(context, (sha2_word32*)context->buffer); @@ -927,8 +927,8 @@ void SHA512_Last(SHA512_CTX* context) { *context->buffer = 0x80; } /* Store the length of input data (in bits): */ - *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; - *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; + MEMCPY_BCOPY(&(context->buffer[SHA512_SHORT_BLOCK_LENGTH+0]), &(context->bitcount[1]), sizeof(sha2_word64)); + MEMCPY_BCOPY(&(context->buffer[SHA512_SHORT_BLOCK_LENGTH+8]), &(context->bitcount[0]), sizeof(sha2_word64)); /* Final transform: */ SHA512_Transform(context, (sha2_word64*)context->buffer);

1 0

git:master:cfccbfa8: lib/srutils: fix gcc warning GH#612
by Mikko Lehto 18 May '16

18 May '16

Module: kamailio Branch: master Commit: cfccbfa8590dffe9a1282dba6ce757f686f55599 URL: https://github.com/kamailio/kamailio/commit/cfccbfa8590dffe9a1282dba6ce757f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-05-17T15:18:01+03:00 lib/srutils: fix gcc warning GH#612 > sha256.c: In function 'sr_SHA256_Final': > sha256.c:613:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] > *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; > ^ > sha256.c: In function 'SHA512_Last': > sha256.c:930:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] > *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; > ^ > sha256.c:931:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] > *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; > ^ --- Modified: lib/srutils/sha256.c --- Diff: https://github.com/kamailio/kamailio/commit/cfccbfa8590dffe9a1282dba6ce757f… Patch: https://github.com/kamailio/kamailio/commit/cfccbfa8590dffe9a1282dba6ce757f… --- diff --git a/lib/srutils/sha256.c b/lib/srutils/sha256.c index 90efd15..2b40551 100644 --- a/lib/srutils/sha256.c +++ b/lib/srutils/sha256.c @@ -610,7 +610,7 @@ void sr_SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { *context->buffer = 0x80; } /* Set the bit count: */ - *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; + MEMCPY_BCOPY(&(context->buffer[SHA256_SHORT_BLOCK_LENGTH]), &(context->bitcount), sizeof(sha2_word64)); /* Final transform: */ SHA256_Transform(context, (sha2_word32*)context->buffer); @@ -927,8 +927,8 @@ void SHA512_Last(SHA512_CTX* context) { *context->buffer = 0x80; } /* Store the length of input data (in bits): */ - *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; - *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; + MEMCPY_BCOPY(&(context->buffer[SHA512_SHORT_BLOCK_LENGTH+0]), &(context->bitcount[1]), sizeof(sha2_word64)); + MEMCPY_BCOPY(&(context->buffer[SHA512_SHORT_BLOCK_LENGTH+8]), &(context->bitcount[0]), sizeof(sha2_word64)); /* Final transform: */ SHA512_Transform(context, (sha2_word64*)context->buffer);

1 0

[kamailio/kamailio] lib/srutils: fix gcc warning GH#612 (#626)
by Mikko Lehto 18 May '16

18 May '16

> sha256.c: In function 'sr_SHA256_Final': > sha256.c:613:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] > *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; > ^ > sha256.c: In function 'SHA512_Last': > sha256.c:930:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] > *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; > ^ > sha256.c:931:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] > *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; > ^ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/626 -- Commit Summary -- * lib/srutils: fix gcc warning GH#612 -- File Changes -- M lib/srutils/sha256.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/626.patch https://github.com/kamailio/kamailio/pull/626.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/626

2 3

[kamailio/kamailio] compilation warnings (#612)
by Victor Seva 18 May '16

18 May '16

>From travis gcc build https://s3.amazonaws.com/archive.travis-ci.org/jobs/129410409/log.txt clang build https://s3.amazonaws.com/archive.travis-ci.org/jobs/129410410/log.txt ``` CC (gcc) [M corex.so] corex_mod.o corex_mod.c: In function 'w_file_read': corex_mod.c:352:2: warning: ignoring return value of 'fread', declared with attribute warn_unused_result [-Wunused-result] fread(content, fsize, 1, f); ^ CC (gcc) [M corex.so] corex_rpc.o ``` ``` CC (clang) [M corex.so] corex_mod.o corex_mod.c:352:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] fread(content, fsize, 1, f); ^~~~~ ~~~~~~~~~~~~~~~~~~~~ 1 warning generated. ``` ``` CC (clang) [M mediaproxy.so] mediaproxy.o mediaproxy.c:1929:27: warning: expression which evaluates to zero treated as a null pointer constant of type 'void *' [-Wnon-literal-null-conversion] *_params->param = MPInactive; ^~~~~~~~~~ 1 warning generated. ``` ``` CC (gcc) [L libsrutils.so.1.0] sha256.o sha256.c: In function 'sr_SHA256_Final': sha256.c:613:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; ^ sha256.c: In function 'SHA512_Last': sha256.c:930:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; ^ sha256.c:931:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; ^ LD (gcc) [L libsrutils.so.1.0] libsrutils.so.1.0 ``` ``` CC (gcc) [M sms.so] libsms_modem.o libsms_modem.c: In function 'put_command': libsms_modem.c:77:2: warning: ignoring return value of 'write', declared with attribute warn_unused_result [-Wunused-result] write(mdm->fd,cmd,cmd_len); ^ CC (gcc) [M sms.so] sms_funcs.o ``` ``` CC (clang) [M sms.so] libsms_modem.o libsms_modem.c:77:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] write(mdm->fd,cmd,cmd_len); ^~~~~ ~~~~~~~~~~~~~~~~~~~ 1 warning generated. ``` ``` CC (gcc) [M dmq_usrloc.so] usrloc_sync.o usrloc_sync.c: In function 'usrloc_dmq_handle_msg': usrloc_sync.c:403:12: warning: 'reg_id' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.reg_id = reg_id; ^ usrloc_sync.c:401:13: warning: 'methods' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.methods = methods; ^ usrloc_sync.c:405:19: warning: 'last_modified' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.last_modified = last_modified; ^ usrloc_sync.c:394:7: warning: 'q' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.q = q; ^ usrloc_sync.c:399:12: warning: 'cflags' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.cflags = cflags; ^ usrloc_sync.c:397:11: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.flags = flags; ^ usrloc_sync.c:396:10: warning: 'cseq' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.cseq = cseq; ^ usrloc_sync.c:393:13: warning: 'expires' may be used uninitialized in this function [-Wmaybe-uninitialized] ci.expires = expires; ^ usrloc_sync.c:407:2: warning: 'action' may be used uninitialized in this function [-Wmaybe-uninitialized] switch(action) { ^ make[3]: 'libsrutils.so.1.0' is up to date. ``` ``` CC (gcc) [M dispatcher.so] dispatch.o dispatch.c: In function 'ds_set_attrs': dispatch.c:263:8: warning: 'tmp_rweight' may be used uninitialized in this function [-Wmaybe-uninitialized] int tmp_rweight; ^ make[3]: 'libkmi.so.1.0' is up to date. ``` --- 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/issues/612

2 2

git:master:ca7f6b2e: Merge pull request #625 from phil-lavin/presence-local-log-facility
by Daniel-Constantin Mierla 18 May '16

18 May '16

Module: kamailio Branch: master Commit: ca7f6b2e46158d74cd629260de7276a8dffda943 URL: https://github.com/kamailio/kamailio/commit/ca7f6b2e46158d74cd629260de7276a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-18T07:09:08+02:00 Merge pull request #625 from phil-lavin/presence-local-log-facility presence: Add local_log_facility configuration parameter --- Modified: modules/presence/doc/presence_admin.xml Modified: modules/presence/notify.c Modified: modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/ca7f6b2e46158d74cd629260de7276a… Patch: https://github.com/kamailio/kamailio/commit/ca7f6b2e46158d74cd629260de7276a… --- diff --git a/modules/presence/doc/presence_admin.xml b/modules/presence/doc/presence_admin.xml index 7558955..f1b8b6e 100644 --- a/modules/presence/doc/presence_admin.xml +++ b/modules/presence/doc/presence_admin.xml @@ -698,6 +698,25 @@ modparam("presence", "local_log_level", 3) </programlisting> </example> </section> + <section id="presence.p.local_log_facility"> + <title><varname>local_log_facility</varname> (int)</title> + <para> + Control syslog facility for some debug messages inside the module. + </para> + <para> + <emphasis> + Default value is taken from the core log_facility configuration parameter. + </emphasis> + </para> + <example> + <title>Set <varname>local_log_facility</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "local_log_facility", "LOG_LOCAL3") +... +</programlisting> + </example> + </section> <section id="presence.p.subs_remove_match"> <title><varname>subs_remove_match</varname> (int)</title> <para> diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 7e7b0b2..93d4274 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -54,6 +54,7 @@ int goto_on_notify_reply=-1; extern int pres_local_log_level; +extern int pres_local_log_facility; c_back_param* shm_dup_cbparam(subs_t*); void free_cbparam(c_back_param* cb_param); @@ -1613,7 +1614,7 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, goto error; } - LM_GEN1(pres_local_log_level, + LM_GEN2(pres_local_log_facility, pres_local_log_level, "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s : %.*s\n", td->rem_uri.len, td->rem_uri.s, td->hooks.next_hop->len, td->hooks.next_hop->s, diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 92602b7..0b62527 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -84,6 +84,9 @@ static int clean_period=100; static int db_update_period=100; int pres_local_log_level = L_INFO; +static char * pres_log_facility_str = 0; /*!< Syslog: log facility that is used */ +int pres_local_log_facility; + /* database connection */ db1_con_t *pa_db = NULL; db_func_t pa_dbf; @@ -217,6 +220,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, + { "local_log_facility", PARAM_STR, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order}, @@ -436,6 +440,21 @@ static int mod_init(void) if (pres_force_delete > 0) pres_force_delete = 1; + if (pres_log_facility_str) { + int tmp = str2facility(pres_log_facility_str); + + if (tmp != -1) { + pres_local_log_facility = tmp; + } + else { + LM_ERR("invalid log facility configured\n"); + return -1; + } + } + else { + pres_local_log_facility = cfg_get(core, core_cfg, log_facility); + } + if (db_table_lock_type != 1) db_table_lock = DB_LOCKING_NONE;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2016