sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: modules_k/rr: updated README
by Jason Penton 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: fca96b0b6383198bbd95f0421e66bfb9cb1956f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fca96b0… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Jan 9 11:17:03 2013 +0200 modules_k/rr: updated README --- modules_k/rr/README | 266 +++++++++++++++++++++------------------------------ 1 files changed, 108 insertions(+), 158 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fca…

1 0

git:master: modules_k/rr: added feature to set custom username for Record-Route URI
by Jason Penton 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: ead52752c9b61c0fcadd95d3d39042498068c73c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ead5275… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Jan 9 10:31:51 2013 +0200 modules_k/rr: added feature to set custom username for Record-Route URI - this is an AVP param that can be used to customise the default username (Request-URI) added to the Record-Route URI before calling record_route. --- modules_k/rr/doc/rr_admin.xml | 987 ++++++++++++++++++++--------------------- modules_k/rr/record.c | 42 ++- modules_k/rr/record.h | 4 +- modules_k/rr/rr_mod.c | 15 + 4 files changed, 542 insertions(+), 506 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ead…

2 2

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Richard Good 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: d923afb1737651cbb7e4aac2517445afd4625c6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d923afb… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 9 10:35:22 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:master: examples/scscf/kamailio.cfg - fixed IMS modules names
by Richard Good 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: d645d525cc6e67ef17af31cbe7a54099134794e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d645d52… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 9 10:34:05 2013 +0200 examples/scscf/kamailio.cfg - fixed IMS modules names Updated SCSCF example cfg to use new IMS module naming convention --- examples/scscf/kamailio.cfg | 80 +++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index 972dfc8..4fa09b0 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -96,7 +96,7 @@ loadmodule "tm.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "rr.so" -loadmodule "dialog2.so" +loadmodule "dialog_ng.so" loadmodule "textops.so" loadmodule "maxfwd.so" loadmodule "xlog.so" @@ -120,13 +120,13 @@ loadmodule "xmlrpc" loadmodule "cdp.so" loadmodule "cdp_avp.so" #!ifdef WITH_RO -loadmodule "diameter_ro.so" +loadmodule "ims_diameter_ro.so" #!endif -loadmodule "usrloc_scscf.so" -loadmodule "registrar_scscf.so" -loadmodule "auth_ims.so" -loadmodule "isc.so" +loadmodule "ims_usrloc_scscf.so" +loadmodule "ims_registrar_scscf.so" +loadmodule "ims_auth.so" +loadmodule "ims_isc.so" #!ifdef CAPTURE_NODE loadmodule "siptrace.so" @@ -186,18 +186,18 @@ modparam("rr", "add_username", 1) modparam("rr", "custom_user_avp", "$avp(RR_CUSTOM_USER_AVP)") # -- usrloc params -- -modparam("usrloc_scscf", "enable_debug_file", 1) -modparam("usrloc_scscf", "usrloc_debug_file", "/var/log/usrloc_debug") -modparam("usrloc_scscf", "matching_mode", 0) +modparam("ims_usrloc_scscf", "enable_debug_file", 1) +modparam("ims_usrloc_scscf", "usrloc_debug_file", "/var/log/usrloc_debug") +modparam("ims_usrloc_scscf", "matching_mode", 0) # -- CDP params -- modparam("cdp","config_file","/etc/kamailio/scscf.xml") -# -- dialog2 params -- -modparam("dialog2", "dlg_flag", FLT_DIALOG) -modparam("dialog2", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)") -modparam("dialog2", "detect_spirals", 1) -modparam("dialog2", "profiles_no_value", "orig ; term") +# -- dialog_ng params -- +modparam("dialog_ng", "dlg_flag", FLT_DIALOG) +modparam("dialog_ng", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)") +modparam("dialog_ng", "detect_spirals", 1) +modparam("dialog_ng", "profiles_no_value", "orig ; term") #!ifdef WITH_XMLRPC # ----- xmlrpc params ----- @@ -220,44 +220,44 @@ modparam("siptrace", "trace_flag", FLT_CAPTURE) modparam("siptrace", "hep_mode_on", 1) #!endif -# -- auth_ims params -- -modparam("auth_ims", "name", URI) -modparam("auth_ims", "registration_default_algorithm", REG_AUTH_DEFAULT_ALG) -modparam("auth_ims","ignore_failed_auth",1) +# -- ims_auth params -- +modparam("ims_auth", "name", URI) +modparam("ims_auth", "registration_default_algorithm", REG_AUTH_DEFAULT_ALG) +modparam("ims_auth","ignore_failed_auth",1) #!ifdef CXDX_FORCED_PEER -modparam("auth_ims", "cxdx_forced_peer", CXDX_FORCED_PEER) +modparam("ims_auth", "cxdx_forced_peer", CXDX_FORCED_PEER) #!endif -modparam("auth_ims", "cxdx_dest_realm", NETWORKNAME) +modparam("ims_auth", "cxdx_dest_realm", NETWORKNAME) -# -- registrar_scscf params -- +# -- ims_registrar_scscf params -- #!ifdef WITH_DEBUG -modparam("registrar_scscf", "default_expires", 60) -modparam("registrar_scscf", "min_expires", 60) -modparam("registrar_scscf", "max_expires", 60) +modparam("ims_registrar_scscf", "default_expires", 60) +modparam("ims_registrar_scscf", "min_expires", 60) +modparam("ims_registrar_scscf", "max_expires", 60) #!else -modparam("registrar_scscf", "default_expires", 604800) -modparam("registrar_scscf", "min_expires", 3600) -modparam("registrar_scscf", "max_expires", 604800) +modparam("ims_registrar_scscf", "default_expires", 604800) +modparam("ims_registrar_scscf", "min_expires", 3600) +modparam("ims_registrar_scscf", "max_expires", 604800) #!endif -modparam("registrar_scscf", "use_path", 1) -modparam("registrar_scscf", "support_wildcardPSI",1) -modparam("registrar_scscf", "user_data_xsd","/etc/kamailio/CxDataType_Rel7.xsd") -modparam("registrar_scscf", "scscf_name", URI) -modparam("registrar_scscf", "cxdx_dest_realm", NETWORKNAME) +modparam("ims_registrar_scscf", "use_path", 1) +modparam("ims_registrar_scscf", "support_wildcardPSI",1) +modparam("ims_registrar_scscf", "user_data_xsd","/etc/kamailio/CxDataType_Rel7.xsd") +modparam("ims_registrar_scscf", "scscf_name", URI) +modparam("ims_registrar_scscf", "cxdx_dest_realm", NETWORKNAME) -# ----- isc params ----- -modparam("isc", "my_uri", HOSTNAME) +# ----- ims_isc params ----- +modparam("ims_isc", "my_uri", HOSTNAME) #!ifdef WITH_RO -# ----- diameter_ro params ----- -modparam("diameter_ro", "ro_origin_host", HOSTNAME); +# ----- ims_diameter_ro params ----- +modparam("ims_diameter_ro", "ro_origin_host", HOSTNAME); #!ifdef RO_FORCED_PEER -modparam("diameter_ro", "ro_forced_peer", RO_FORCED_PEER); +modparam("ims_diameter_ro", "ro_forced_peer", RO_FORCED_PEER); #!endif -modparam("diameter_ro", "ro_dest_realm", NETWORKNAME); +modparam("ims_diameter_ro", "ro_dest_realm", NETWORKNAME); -modparam("diameter_ro","interim_request_credits",30); -modparam("diameter_ro","timer_buffer",5); +modparam("ims_diameter_ro","interim_request_credits",30); +modparam("ims_diameter_ro","timer_buffer",5); #!endif # ----- enum params -----

1 0

git:master: examples/pcscf/kamailio.cfg - fixed IMS modules names
by Richard Good 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 9d394f9844b6043372b72539c69e9d56b0861d6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d394f9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 9 10:29:25 2013 +0200 examples/pcscf/kamailio.cfg - fixed IMS modules names Updated PCSCF example cfg to use new IMS module naming convention --- examples/pcscf/kamailio.cfg | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index d20cd34..f573733 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -131,15 +131,15 @@ loadmodule "tm" loadmodule "pv" loadmodule "sl" loadmodule "rr" -loadmodule "dialog2" -loadmodule "usrloc_pcscf" +loadmodule "dialog_ng" +loadmodule "ims_usrloc_pcscf" loadmodule "textops" loadmodule "textopsx" loadmodule "maxfwd" loadmodule "xlog" loadmodule "pua" loadmodule "db_sqlite" -loadmodule "registrar_pcscf" +loadmodule "ims_registrar_pcscf" loadmodule "sanity" loadmodule "siputils" loadmodule "kex" @@ -156,7 +156,7 @@ loadmodule "xmlrpc" #!ifdef WITH_RX loadmodule "cdp" loadmodule "cdp_avp" -loadmodule "diameter_rx" +loadmodule "ims_qos" #!endif #!ifdef CAPTURE_NODE @@ -224,24 +224,24 @@ modparam("path", "use_received", 1) # -- usrloc params -- #!ifdef WITH_DEBUG -modparam("usrloc_pcscf", "enable_debug_file", 1) -modparam("usrloc_pcscf", "usrloc_debug_file", "/var/log/usrloc_debug") +modparam("ims_usrloc_pcscf", "enable_debug_file", 1) +modparam("ims_usrloc_pcscf", "usrloc_debug_file", "/var/log/usrloc_debug") #!else -modparam("usrloc_pcscf", "enable_debug_file", 0) +modparam("ims_usrloc_pcscf", "enable_debug_file", 0) #!endif #!ifdef WITH_RX # -- CDP params -- modparam("cdp","config_file","/etc/kamailio/pcscf.xml") # -- diameter_rx params -- -modparam("diameter_rx", "rx_dest_realm", NETWORKNAME) +modparam("ims_qos", "rx_dest_realm", NETWORKNAME) #!endif -# -- dialog2 params -- -modparam("dialog2", "dlg_flag", FLT_DIALOG) -modparam("dialog2", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)") -modparam("dialog2", "detect_spirals", 0) -modparam("dialog2", "profiles_no_value", "orig ; term") +# -- dialog_ng params -- +modparam("dialog_ng", "dlg_flag", FLT_DIALOG) +modparam("dialog_ng", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)") +modparam("dialog_ng", "detect_spirals", 0) +modparam("dialog_ng", "profiles_no_value", "orig ; term") #!ifdef WITH_TLS # ----- tls params -----

1 0

git:master: examples/icscf/kamailio.cfg - fixed IMS modules names
by Richard Good 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: d3dee2b4579310fde42cfc727ebd5dc7537d8446 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3dee2b… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 9 10:19:47 2013 +0200 examples/icscf/kamailio.cfg - fixed IMS modules names Updated ICSCF example cfg to use new IMS module naming convention --- examples/icscf/kamailio.cfg | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/icscf/kamailio.cfg b/examples/icscf/kamailio.cfg index a7420e2..7314377 100644 --- a/examples/icscf/kamailio.cfg +++ b/examples/icscf/kamailio.cfg @@ -110,7 +110,7 @@ loadmodule "cdp.so" loadmodule "cdp_avp.so" loadmodule "xlog.so" -loadmodule "icscf.so" +loadmodule "ims_icscf.so" #!ifdef CAPTURE_NODE loadmodule "siptrace.so" @@ -145,19 +145,19 @@ modparam("cdp","config_file","/etc/kamailio/icscf.xml") # ----- icscf params ----- # Comment the following line to enable realm routing #!ifdef CXDX_FORCED_PEER -modparam("icscf", "cxdx_forced_peer", CXDX_FORCED_PEER) +modparam("ims_icscf", "cxdx_forced_peer", CXDX_FORCED_PEER) #!endif -modparam("icscf","cxdx_dest_realm", NETWORKNAME) +modparam("ims_icscf","cxdx_dest_realm", NETWORKNAME) # DB-URL, where information about S-CSCF-Server can be found: -modparam("icscf","db_url", DB_URL) -modparam("icscf","cxdx_dest_realm", NETWORKNAME) +modparam("ims_icscf","db_url", DB_URL) +modparam("ims_icscf","cxdx_dest_realm", NETWORKNAME) #!ifdef PEERING # Route which is executed, in case HSS returned "User-Unknown" on LIR request -modparam("icscf","route_lir_user_unknown", "lir_term_user_unknown") +modparam("ims_icscf","route_lir_user_unknown", "lir_term_user_unknown") #!endif #!ifdef FALLBACK_AUTH # Route which is executed, in case HSS returned "User-Unknown" on UAR request -modparam("icscf","route_uar_user_unknown", "uar_term_user_unknown") +modparam("ims_icscf","route_uar_user_unknown", "uar_term_user_unknown") #!endif #!ifdef WITH_TLS

1 0

git:master: Added sample configuration files for Kamailio IMS Setup. IMS Rocks!
by admin＠sip-router.org 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 85ee107929a80b54d47eaabef6f25d7b2f0659e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85ee107… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Jan 8 20:58:03 2013 +0100 Added sample configuration files for Kamailio IMS Setup. IMS Rocks! Greetings from the Dolomites, Italy, Carsten --- examples/icscf/icscf.cfg | 47 ++ examples/icscf/icscf.mysql.sql | 137 +++++ examples/icscf/icscf.postgres.sql | 64 +++ examples/icscf/icscf.xml | 25 + examples/icscf/kamailio.cfg | 551 +++++++++++++++++++ examples/pcscf/kamailio.cfg | 1061 ++++++++++++++++++++++++++++++++++++ examples/pcscf/pcscf.cfg | 58 ++ examples/pcscf/pcscf.xml | 26 + examples/pcscf/tls.cfg | 15 + examples/scscf/CxDataType_Rel6.xsd | 293 ++++++++++ examples/scscf/CxDataType_Rel7.xsd | 301 ++++++++++ examples/scscf/db/dialplan | 5 + examples/scscf/db/version | 2 + examples/scscf/dispatcher.list | 3 + examples/scscf/kamailio.cfg | 749 +++++++++++++++++++++++++ examples/scscf/scscf.cfg | 54 ++ examples/scscf/scscf.xml | 28 + 17 files changed, 3419 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=85e…

2 1

git:master: snmpstats(k) Change from OpenSER to Kamailio
by Olle E. Johansson 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 68d7468cf77e1831186ea0017ead15adb73c1328 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68d7468… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Jan 9 08:37:41 2013 +0100 snmpstats(k) Change from OpenSER to Kamailio Note: Apart from code name changes, the MIB files and the objects has changed names. This will affect all systems monitoring your SIP server as you upgrade to 4.0.0 --- modules_k/snmpstats/Makefile | 2 +- modules_k/snmpstats/README | 166 ++++---- modules_k/snmpstats/alarm_checks.c | 12 +- modules_k/snmpstats/alarm_checks.h | 4 +- modules_k/snmpstats/doc/snmpstats.xml | 2 +- modules_k/snmpstats/doc/snmpstats_admin.xml | 114 +++--- modules_k/snmpstats/doc/snmpstats_faq.xml | 22 +- modules_k/snmpstats/hashTable.c | 6 +- modules_k/snmpstats/hashTable.h | 12 +- modules_k/snmpstats/interprocess_buffer.c | 8 +- modules_k/snmpstats/interprocess_buffer.h | 4 +- .../snmpstats/mibs/{OPENSER-MIB => KAMAILIO-MIB} | 411 ++++++++++---------- .../mibs/{OPENSER-REG-MIB => KAMAILIO-REG-MIB} | 82 ++-- ...NSER-SIP-COMMON-MIB => KAMAILIO-SIP-COMMON-MIB} | 396 ++++++++++---------- ...NSER-SIP-SERVER-MIB => KAMAILIO-SIP-SERVER-MIB} | 340 ++++++++-------- .../snmpstats/mibs/{OPENSER-TC => KAMAILIO-TC} | 26 +- modules_k/snmpstats/snmpMIBNotifications.c | 130 +++--- modules_k/snmpstats/snmpMIBNotifications.h | 38 +- modules_k/snmpstats/snmpObjects.c | 246 ++++++------ modules_k/snmpstats/snmpObjects.h | 44 +- modules_k/snmpstats/snmpSIPCommonObjects.c | 204 +++++----- modules_k/snmpstats/snmpSIPCommonObjects.h | 34 +- modules_k/snmpstats/snmpSIPContactTable.c | 114 +++--- modules_k/snmpstats/snmpSIPContactTable.h | 74 ++-- modules_k/snmpstats/snmpSIPMethodSupportedTable.c | 84 ++-- modules_k/snmpstats/snmpSIPMethodSupportedTable.h | 58 ++-- modules_k/snmpstats/snmpSIPPortTable.c | 88 ++-- modules_k/snmpstats/snmpSIPPortTable.h | 54 ++-- modules_k/snmpstats/snmpSIPRegUserLookupTable.c | 304 +++++++------- modules_k/snmpstats/snmpSIPRegUserLookupTable.h | 120 +++--- modules_k/snmpstats/snmpSIPRegUserTable.c | 106 +++--- modules_k/snmpstats/snmpSIPRegUserTable.h | 60 ++-- modules_k/snmpstats/snmpSIPServerObjects.c | 174 ++++---- modules_k/snmpstats/snmpSIPServerObjects.h | 34 +- modules_k/snmpstats/snmpSIPStatusCodesTable.c | 318 ++++++++-------- modules_k/snmpstats/snmpSIPStatusCodesTable.h | 130 +++--- modules_k/snmpstats/snmpstats.c | 12 +- modules_k/snmpstats/snmpstats.h | 4 +- modules_k/snmpstats/snmpstats_globals.h | 4 +- modules_k/snmpstats/sub_agent.c | 24 +- modules_k/snmpstats/sub_agent.h | 2 +- modules_k/snmpstats/utilities.c | 2 +- modules_k/snmpstats/utilities.h | 2 +- 43 files changed, 2046 insertions(+), 2025 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=68d…

1 0

git:master: htable(k) Add new RPC htable.listTables
by Olle E. Johansson 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 2b09c72457a1c84508d74feb9dbc2d86f682508c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b09c72… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Jan 9 07:56:14 2013 +0100 htable(k) Add new RPC htable.listTables This RPC list all defined tables and their settings --- modules_k/htable/README | 17 +++++++++++ modules_k/htable/doc/htable_admin.xml | 25 ++++++++++++++++ modules_k/htable/ht_api.c | 7 ++++- modules_k/htable/ht_api.h | 1 + modules_k/htable/htable.c | 52 +++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index cc7d5ff..4a48560 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -64,6 +64,7 @@ Alex Balashov 7.1. htable.get htable key 7.2. htable.delete htable key 7.3. htable.dump htable + 7.4. htable.listTables 8. Event routes @@ -133,6 +134,7 @@ Chapter 1. Admin Guide 7.1. htable.get htable key 7.2. htable.delete htable key 7.3. htable.dump htable + 7.4. htable.listTables 8. Event routes @@ -550,6 +552,7 @@ sht_rm_value_re("ha=>.*"); 7.1. htable.get htable key 7.2. htable.delete htable key 7.3. htable.dump htable + 7.4. htable.listTables 7.1. htable.get htable key @@ -597,6 +600,20 @@ kamcmd htable.get students anna kamcmd htable.dump ipban ... +7.4. htable.listTables + + Lists all defined tables + + Name: dhtable.listTables + + Parameters: + * None + + Example: +... +kamcmd htable.listTables +... + 8. Event routes 8.1. htable:mod-init diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index 4b6a89f..d652c8f 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -758,6 +758,31 @@ kamcmd htable.dump ipban ... </programlisting> </section> + <section> + <title> + <function moreinfo="none">htable.listTables</function> + </title> + <para> + Lists all defined tables + </para> + <para> + Name: <emphasis>dhtable.listTables</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>None</para> + </listitem> + + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.listTables +... +</programlisting> + </section> </section> diff --git a/modules_k/htable/ht_api.c b/modules_k/htable/ht_api.c index f4c87cd..cad2e86 100644 --- a/modules_k/htable/ht_api.c +++ b/modules_k/htable/ht_api.c @@ -194,6 +194,11 @@ int ht_cell_pkg_free(ht_cell_t *cell) } +ht_t *ht_get_root(void) +{ + return _ht_root; +} + ht_t* ht_get_table(str *name) { unsigned int htid; @@ -736,7 +741,7 @@ int ht_table_spec(char *spec) LM_ERR("shared memory was not initialized\n"); return -1; } - /* parse: name=>dbtable=abc;autoexpire=123;size=123*/ + /* parse: name=>dbtable=abc;autoexpire=123;size=123 */ in.s = spec; in.len = strlen(in.s); if(keyvalue_parse_str(&in, KEYVALUE_TYPE_PARAMS, &kval)<0) diff --git a/modules_k/htable/ht_api.h b/modules_k/htable/ht_api.h index 4f7f9b6..c8b88f7 100644 --- a/modules_k/htable/ht_api.h +++ b/modules_k/htable/ht_api.h @@ -95,5 +95,6 @@ int ht_get_cell_expire(ht_t *ht, str *name, unsigned int *val); int ht_rm_cell_re(str *sre, ht_t *ht, int mode); int ht_count_cells_re(str *sre, ht_t *ht, int mode); +ht_t *ht_get_root(void); #endif diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 1aa5326..2b22542 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -530,6 +530,10 @@ static const char* htable_get_doc[2] = { "Get one key from a hash table.", 0 }; +static const char* htable_list_doc[2] = { + "List all htables.", + 0 +}; static void htable_rpc_delete(rpc_t* rpc, void* c) { str htname, keyname; @@ -686,10 +690,58 @@ error: lock_release(&ht->entries[i].lock); } +static void htable_rpc_list(rpc_t* rpc, void* c) +{ + ht_t *ht; + void* th; + char dbname[128]; + + ht = ht_get_root(); + if(ht==NULL) + { + rpc->fault(c, 500, "No htables"); + return; + } + while (ht != NULL) + { + int len = 0; + /* add entry node */ + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating structure rpc"); + goto error; + } + if (ht->dbtable.len > 0) { + len = ht->dbtable.len > 127 ? 127 : ht->dbtable.len; + memcpy(dbname, ht->dbtable.s, len); + dbname[ht->dbtable.len] = '\0'; + } else { + dbname[0] = '\0'; + } + + if(rpc->struct_add(th, "Ssdddd", + "name", &ht->name, /* String */ + "dbtable", &dbname , /* Char * */ + "dbmode", (int) ht->dbmode, /* u int */ + "expire", (int) ht->htexpire, /* u int */ + "updateexpire", ht->updateexpire, /* int */ + "size", (int) ht->htsize /* u int */ + ) < 0) { + rpc->fault(c, 500, "Internal error creating data rpc"); + goto error; + } + ht = ht->next; + } + +error: + return; +} + rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, 0}, {"htable.delete", htable_rpc_delete, htable_delete_doc, 0}, {"htable.get", htable_rpc_get, htable_get_doc, 0}, + {"htable.listTables", htable_rpc_list, htable_list_doc, 0}, {0, 0, 0, 0} };

1 0

htable.list
by Olle E. Johansson 08 Jan '13

08 Jan '13

I've created a new rpc command in htable called htable.list that lists all htables defined. Any objections to commit? /usr/local/sbin/kamcmd htable.list { name: skrep dbtable: dbmode: 0 expire: 1202 updateexpire: 1 size: 16384 } { name: cfilter dbtable: contactfilter dbmode: 1 expire: 0 updateexpire: 1 size: 16384 } { name: lastnumbers dbtable: dbmode: 0 expire: 0 updateexpire: 1 size: 16384 } /O

2 2

← Newer
1
...
20
21
22
23
24
25
26
...
33
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 2013