sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

git:master:fa0517f8: debugger: update doku for rpc commands
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: fa0517f83a09625d14ec0dd3f349a1033f274f86 URL: https://github.com/kamailio/kamailio/commit/fa0517f83a09625d14ec0dd3f349a10… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-06T14:06:07+02:00 debugger: update doku for rpc commands Update doku for rpc commands. --- Modified: modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fa0517f83a09625d14ec0dd3f349a10… Patch: https://github.com/kamailio/kamailio/commit/fa0517f83a09625d14ec0dd3f349a10… --- diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index 0ae70a2..04ba4ee 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -874,7 +874,85 @@ $ &ctltool; fifo get_dbg_mod_facility debugger </programlisting> </section> + <section id="dbg.r.set_mod_level"> + <title> + <function moreinfo="none">dbg.set_mod_level</function> + </title> + <para> + Set the module log level. + If module does not exist in kamailio, the entry in the level hashtable is still added for the bogus module. + </para> + <para> + Name: <emphasis>dbg.set_mod_level</emphasis> + </para> + <para> + Examples of use with &sercmd;: + </para> + <programlisting format="linespecific"> + dbg.set_mod_level core 1 + </programlisting> + </section> + + <section id="dbg.r.set_mod_facility"> + <title> + <function moreinfo="none">dbg.set_mod_facility</function> + </title> + <para> + Set the module log facility. + If module does not exist in kamailio, the entry in the facility hashtable is still added for the bogus module. + </para> + <para> + Name: <emphasis>dbg.set_mod_facility</emphasis> + </para> + <para> + Examples of use with &sercmd;: + </para> + <programlisting format="linespecific"> + dbg.set_mod_facility core LOG_LOCAL1 + </programlisting> + </section> + + <section id="dbg.r.get_mod_level"> + <title> + <function moreinfo="none">dbg.get_mod_level</function> + </title> + <para> + Get the module log level. + If module does not exist in kamailio, the entry in the level hashtable is still added for the bogus module. + </para> + <para> + Name: <emphasis>dbg.get_mod_level</emphasis> + </para> + <para> + Examples of use with &sercmd;: + </para> + <programlisting format="linespecific"> + dbg.get_mod_level core + </programlisting> + </section> + + <section id="dbg.r.get_mod_facility"> + <title> + <function moreinfo="none">dbg.get_mod_facility</function> + </title> + <para> + Get the module log facility. + If module does not exist in kamailio, the entry in the facility hashtable is still added for the bogus module. + </para> + <para> + Name: <emphasis>dbg.get_mod_facility</emphasis> + </para> + <para> + Examples of use with &sercmd;: + </para> + <programlisting format="linespecific"> + dbg.get_mod_facility core + </programlisting> + </section> + </section> + + <section> <title>Usage</title> <para>

1 0

git:master:144b3c54: debugger: rpc module level/facility getters
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 144b3c54e4fc23e95e5601e38165defa7c377ba8 URL: https://github.com/kamailio/kamailio/commit/144b3c54e4fc23e95e5601e38165def… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T14:37:34+02:00 debugger: rpc module level/facility getters Add kamcmd rpc module level/facility getters. --- Modified: modules/debugger/debugger_api.c --- Diff: https://github.com/kamailio/kamailio/commit/144b3c54e4fc23e95e5601e38165def… Patch: https://github.com/kamailio/kamailio/commit/144b3c54e4fc23e95e5601e38165def… --- diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index 0e28b54..566be68 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -1039,6 +1039,55 @@ static void dbg_rpc_set_mod_facility(rpc_t* rpc, void* ctx) { /** * */ +static const char* dbg_rpc_get_mod_level_doc[2] = { + "Get module log level", + 0 +}; + +static void dbg_rpc_get_mod_level(rpc_t* rpc, void* ctx){ + int l; + str value = {0,0}; + + if (rpc->scan(ctx, "S", &value) < 1) + { + rpc->fault(ctx, 500, "invalid parameters"); + return; + } + + l = get_debug_level(value.s, value.len); + + rpc->add(ctx, "d", l); +} + +/** + * + */ +static const char* dbg_rpc_get_mod_facility_doc[2] = { + "Get module log facility", + 0 +}; + +static void dbg_rpc_get_mod_facility(rpc_t* rpc, void* ctx) { + int fl; + str value = {0, 0}; + str facility = {0, 0}; + + if (rpc->scan(ctx, "S", &value) < 1) + { + rpc->fault(ctx, 500, "invalid parameters"); + return; + } + + fl = get_debug_facility(value.s, value.len); + facility.s = facility2str(fl, &facility.len); + + rpc->add(ctx, "S", &facility); +} + + +/** + * + */ static const char* dbg_rpc_reset_msgid_doc[2] = { "Reset msgid on all process", 0 @@ -1078,6 +1127,8 @@ rpc_export_t dbg_rpc[] = { {"dbg.trace", dbg_rpc_trace, dbg_rpc_trace_doc, 0}, {"dbg.set_mod_level", dbg_rpc_set_mod_level, dbg_rpc_set_mod_level_doc, 0}, {"dbg.set_mod_facility", dbg_rpc_set_mod_facility, dbg_rpc_set_mod_facility_doc, 0}, + {"dbg.get_mod_level", dbg_rpc_get_mod_level, dbg_rpc_get_mod_level_doc, 0}, + {"dbg.get_mod_facility", dbg_rpc_get_mod_facility, dbg_rpc_get_mod_facility_doc, 0}, {"dbg.reset_msgid", dbg_rpc_reset_msgid, dbg_rpc_reset_msgid_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:66943de4: debugger: rpc module level/facility setters
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 66943de4344c30fefa361f24213f01f8ef58d2c3 URL: https://github.com/kamailio/kamailio/commit/66943de4344c30fefa361f24213f01f… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T14:02:43+02:00 debugger: rpc module level/facility setters Rename kamcmd rpc module level/facility setters. --- Modified: modules/debugger/debugger_api.c --- Diff: https://github.com/kamailio/kamailio/commit/66943de4344c30fefa361f24213f01f… Patch: https://github.com/kamailio/kamailio/commit/66943de4344c30fefa361f24213f01f… --- diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index f060b36..0e28b54 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -981,12 +981,12 @@ static void dbg_rpc_trace(rpc_t* rpc, void* ctx) /** * */ -static const char* dbg_rpc_mod_level_doc[2] = { - "Specify module log level", +static const char* dbg_rpc_set_mod_level_doc[2] = { + "Set module log level", 0 }; -static void dbg_rpc_mod_level(rpc_t* rpc, void* ctx){ +static void dbg_rpc_set_mod_level(rpc_t* rpc, void* ctx){ int l; str value = {0,0}; @@ -1007,12 +1007,12 @@ static void dbg_rpc_mod_level(rpc_t* rpc, void* ctx){ /** * */ -static const char* dbg_rpc_mod_facility_doc[2] = { - "Specify module log facility", +static const char* dbg_rpc_set_mod_facility_doc[2] = { + "Set module log facility", 0 }; -static void dbg_rpc_mod_facility(rpc_t* rpc, void* ctx) { +static void dbg_rpc_set_mod_facility(rpc_t* rpc, void* ctx) { int fl; str value = {0, 0}; str facility = {0, 0}; @@ -1076,8 +1076,8 @@ rpc_export_t dbg_rpc[] = { {"dbg.bp", dbg_rpc_bp, dbg_rpc_bp_doc, 0}, {"dbg.ls", dbg_rpc_list, dbg_rpc_list_doc, 0}, {"dbg.trace", dbg_rpc_trace, dbg_rpc_trace_doc, 0}, - {"dbg.mod_level", dbg_rpc_mod_level, dbg_rpc_mod_level_doc, 0}, - {"dbg.mod_facility", dbg_rpc_mod_facility, dbg_rpc_mod_facility_doc, 0}, + {"dbg.set_mod_level", dbg_rpc_set_mod_level, dbg_rpc_set_mod_level_doc, 0}, + {"dbg.set_mod_facility", dbg_rpc_set_mod_facility, dbg_rpc_set_mod_facility_doc, 0}, {"dbg.reset_msgid", dbg_rpc_reset_msgid, dbg_rpc_reset_msgid_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:33e082dd: debugger: destroy debugger shm hashtable
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 33e082dd314a333c62bfbc176a392702cfd9f4cd URL: https://github.com/kamailio/kamailio/commit/33e082dd314a333c62bfbc176a39270… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T13:26:32+02:00 debugger: destroy debugger shm hashtable Add a dbg_destroy_mod_levels() functions to be called on mod_destroy(), thus avoiding shm leaks. --- Modified: modules/debugger/debugger_api.c Modified: modules/debugger/debugger_api.h Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/33e082dd314a333c62bfbc176a39270… Patch: https://github.com/kamailio/kamailio/commit/33e082dd314a333c62bfbc176a39270… --- diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index 014d5be..f060b36 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -1161,6 +1161,63 @@ int dbg_init_mod_levels(int dbg_mod_hash_size) return 0; } +/** + * + */ +int dbg_destroy_mod_levels() +{ + int i; + dbg_mod_level_t *itl = NULL; + dbg_mod_level_t *itlp = NULL; + + dbg_mod_facility_t *itf = NULL; + dbg_mod_facility_t *itfp = NULL; + + if (_dbg_mod_table_size <= 0) + return 0; + + if (_dbg_mod_table == NULL) + return 0; + + for (i = 0; i < _dbg_mod_table_size; i++) { + // destroy level list + lock_get(&_dbg_mod_table[i].lock); + itl = _dbg_mod_table[i].first; + while (itl) { + itlp = itl; + itl = itl->next; + shm_free(itlp); + } + lock_release(&_dbg_mod_table[i].lock); + + // destroy facility list + lock_get(&_dbg_mod_table[i].lock_ft); + itf = _dbg_mod_table[i].first_ft; + while (itf) { + itfp = itf; + itf = itf->next; + shm_free(itfp); + } + lock_release(&_dbg_mod_table[i].lock_ft); + + // destroy locks + lock_destroy(&_dbg_mod_table[i].lock); + lock_destroy(&_dbg_mod_table[i].lock_ft); + + // reset all + _dbg_mod_table[i].first = NULL; + _dbg_mod_table[i].first_ft = NULL; + } + + // free table + shm_free(_dbg_mod_table); + _dbg_mod_table = NULL; + + LM_DBG("Destroyed _dbg_mod_table, size %d\n", _dbg_mod_table_size); + + return 0; +} + /* * case insensitive hashing - clone here to avoid usage of LOG*() * - s1 - str to hash diff --git a/modules/debugger/debugger_api.h b/modules/debugger/debugger_api.h index e41b15a..7d034c2 100644 --- a/modules/debugger/debugger_api.h +++ b/modules/debugger/debugger_api.h @@ -34,6 +34,7 @@ int dbg_init_mypid(void); int dbg_init_rpc(void); int dbg_init_mod_levels(int _dbg_mod_hash_size); +int dbg_destroy_mod_levels(); int dbg_set_mod_debug_level(char *mname, int mnlen, int *mlevel); int dbg_set_mod_debug_facility(char *mname, int mnlen, int *mfacility); void dbg_enable_mod_levels(void); diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index e779825..e37ab83 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -507,6 +507,7 @@ static int child_init(int rank) static void mod_destroy(void) { dbg_cfg = NULL; + dbg_destroy_mod_levels(); } /**

1 0

git:master:70b3dc76: debugger: update doku for fifo commands
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 70b3dc76a1eac47dc70d5624f27c7f39717ecb7e URL: https://github.com/kamailio/kamailio/commit/70b3dc76a1eac47dc70d5624f27c7f3… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T13:26:32+02:00 debugger: update doku for fifo commands Update doku for fifo commands. --- Modified: modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/70b3dc76a1eac47dc70d5624f27c7f3… Patch: https://github.com/kamailio/kamailio/commit/70b3dc76a1eac47dc70d5624f27c7f3… --- diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index cddfc26..0ae70a2 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -616,6 +616,83 @@ P-Hint: My hint </section> + + <section> + <title>Exported MI Functions</title> + + <section id="debugger.m.set_dbg_mod_level mod_name level"> + <title><function moreinfo="none">set_dbg_mod_level mod_name level</function></title> + <para> + Set the module log level. + If module does not exist in kamailio, the entry in the level hashtable is still added for the bogus module. + </para> + <example> + <title><function moreinfo="none">set_dbg_mod_level</function> usage</title> + <programlisting format="linespecific"> +... +$ &ctltool; fifo set_dbg_mod_level core 2 +$ &ctltool; fifo set_dbg_mod_level debugger 3 +... + </programlisting> + </example> + </section> + + <section id="debugger.m.set_dbg_mod_facility mod_name facility"> + <title><function moreinfo="none">set_dbg_mod_facility mod_name facility</function></title> + <para> + Set the mod_name log facility. + If mod_name does not exist in kamailio, the entry in the facility hashtable is still added for the bogus mod_name. + </para> + <example> + <title><function moreinfo="none">set_dbg_mod_facility</function> usage</title> + <programlisting format="linespecific"> +... +$ &ctltool; fifo set_dbg_mod_facility core LOG_LOCAL1 +$ &ctltool; fifo set_dbg_mod_facility debugger LOG_LOCAL0 +... + </programlisting> + </example> + </section> + + <section id="debugger.m.get_dbg_mod_level mod_name"> + <title><function moreinfo="none">get_dbg_mod_level mod_name</function></title> + <para> + Get the mod_name log level. + If mod_name does not exist in the level hashtable, returns the config file value. + </para> + <example> + <title><function moreinfo="none">get_dbg_mod_level</function> usage</title> + <programlisting format="linespecific"> +... +$ &ctltool; fifo get_dbg_mod_level core +$ &ctltool; fifo get_dbg_mod_level debugger +... + </programlisting> + </example> + </section> + + <section id="debugger.m.get_dbg_mod_facility mod_name"> + <title><function moreinfo="none">get_dbg_mod_facility mod_name</function></title> + <para> + Get the mod_name log facility. + If mod_name does not exist in the facility hashtable, returns the config file value. + </para> + <example> + <title><function moreinfo="none">get_dbg_mod_facility</function> usage</title> + <programlisting format="linespecific"> +... +$ &ctltool; fifo get_dbg_mod_facility core +$ &ctltool; fifo get_dbg_mod_facility debugger +... + </programlisting> + </example> + </section> + + </section> + + + + <section> <title>Exported RPC Functions</title>

1 0

git:master:2bd153ce: debugger: fifo module level/facility getters
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 2bd153ce083c81c78b58019cf7acae12646e14e3 URL: https://github.com/kamailio/kamailio/commit/2bd153ce083c81c78b58019cf7acae1… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T13:26:32+02:00 debugger: fifo module level/facility getters Add kamctl fifo module level/facility getters. --- Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2bd153ce083c81c78b58019cf7acae1… Patch: https://github.com/kamailio/kamailio/commit/2bd153ce083c81c78b58019cf7acae1…

1 0

git:master:f8a6d4e3: core: add facility2str() function
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: f8a6d4e370bfe95d4968a1c29d275a91cdda12ce URL: https://github.com/kamailio/kamailio/commit/f8a6d4e370bfe95d4968a1c29d275a9… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T13:24:08+02:00 core: add facility2str() function Add support to get the facility number given the facility string. --- Modified: dprint.c Modified: dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/f8a6d4e370bfe95d4968a1c29d275a9… Patch: https://github.com/kamailio/kamailio/commit/f8a6d4e370bfe95d4968a1c29d275a9… --- diff --git a/dprint.c b/dprint.c index 0a5c0c3..269dd83 100644 --- a/dprint.c +++ b/dprint.c @@ -90,13 +90,27 @@ int str2facility(char *s) { int i; - for( i=0; str_fac[i] ; i++) { + for (i=0; str_fac[i]; i++) { if (!strcasecmp(s,str_fac[i])) return int_fac[i]; } return -1; } +char* facility2str(int fl, int *len) +{ + int i; + + for (i=0; str_fac[i]; i++) { + if (fl == int_fac[i]) { + *len = strlen(str_fac[i]); + return str_fac[i]; + } + } + + return NULL; +} + /* fixup function for log_facility cfg parameter */ int log_facility_fixup(void *handle, str *gname, str *name, void **val) { diff --git a/dprint.h b/dprint.h index 35d5a0d..5f03445 100644 --- a/dprint.h +++ b/dprint.h @@ -160,6 +160,8 @@ extern volatile int dprint_crit; #endif int str2facility(char *s); +char* facility2str(int fl, int *len); + int log_facility_fixup(void *handle, str *gname, str *name, void **val); void dprint_color(int level);

1 0

git:master:36629c11: debugger: fifo module level/facility setters
by Stefan Mititelu 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 36629c11ff9fb3999f3ebf298a9e87bb2abc4885 URL: https://github.com/kamailio/kamailio/commit/36629c11ff9fb3999f3ebf298a9e87b… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-05T11:47:16+02:00 debugger: fifo module level/facility setters Add kamctl fifo module level/facility setters. --- Modified: modules/debugger/Makefile Modified: modules/debugger/debugger_api.c Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/36629c11ff9fb3999f3ebf298a9e87b… Patch: https://github.com/kamailio/kamailio/commit/36629c11ff9fb3999f3ebf298a9e87b…

1 0

[kamailio] debugger: add fifos to set/get level/facility (#462)
by Stefan Mititelu 06 Jan '16

06 Jan '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/462 -- Commit Summary -- * debugger: fifo module level/facility setters * debugger: fifo module level/facility getters * debugger: update doku for fifo commands * debugger: destroy debugger shm hashtable -- File Changes -- M dprint.c (16) M dprint.h (2) M modules/debugger/Makefile (1) M modules/debugger/debugger_api.c (58) M modules/debugger/debugger_api.h (1) M modules/debugger/debugger_mod.c (272) M modules/debugger/doc/debugger_admin.xml (77) -- Patch Links -- https://github.com/kamailio/kamailio/pull/462.patch https://github.com/kamailio/kamailio/pull/462.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/462

2 4

git:master:ddb9171c: siptrace: coherent indentation
by Daniel-Constantin Mierla 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: ddb9171c96ef54ceeeb984cb0d9dc6695d206cc6 URL: https://github.com/kamailio/kamailio/commit/ddb9171c96ef54ceeeb984cb0d9dc66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-06T11:47:33+01:00 siptrace: coherent indentation --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ddb9171c96ef54ceeeb984cb0d9dc66… Patch: https://github.com/kamailio/kamailio/commit/ddb9171c96ef54ceeeb984cb0d9dc66…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016