sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

[kamailio/kamailio] New modules (app_ruby) missing from v5.2.0 RPM/DEB packages (#1761)

by Fatih Orhan

### Description Hello. There is no app_ruby RPM package in https://build.opensuse.org/project/show/home:kamailio:v5.2.x-rpms. Based on my slack conversation with Victor Seva, new modules introduced in v5.2 seem to be missed and SPEC didn't get updated. ### Troubleshooting #### Reproduction yum install kamailio have loadmodule "app_ruby.so" in kamailio.cfg try to start kamailio service, it doesn't start #### Log Messages ``` ERROR: <core> [core/sr_module.c:487]: load_module(): could not find module <app_ruby> in </usr/lib64/kamailio/modules> ``` ### Possible Solutions Update kamailio.spec file to compile and package app_ruby.so ### Additional Information ``` version: kamailio 5.2.0 (x86_64/linux) 535e13 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 535e13 compiled on 10:26:34 Nov 28 2018 with gcc 4.8.5 ``` * **Operating System**: ``` Linux servername 3.10.0-327.28.2.el7.x86_64 #1 SMP Wed Aug 3 11:11:39 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1761

5 years, 9 months

Planning Fosdem 2019

by Daniel-Constantin Mierla

Hello, Fosdem 2019 is approaching, so I am writing to see if any of you plans to go to the event. If there is interest, we can try to organize again a dinner on Saturday evening, a tradition for our project at the past 10 editions or even more. Henning Westerholt will give a presentation about Kamailio in the RTC Devroom, I will be around as well. I know few more developers that plan to go to the event, so let's see who else from the community wants to join us. As usual, at Fosdem will be developers from other VoIP projects, like Asterisk, Janus, CGRates, Homer, Jitsi, ... At the past editions we typically had two "kamailio" events: 1) an "ad-hoc" developers meeting in the cantina (or other available room around) to discuss about short term plans for Kamailio -- time and place being decided as we meet there between us (expected in the afternoon of Saturday or during Sunday). 2) a dinner at a place nearby, with other VoIP folks joining us Reply if you plan to go to Fosdem and say if you want to join for a dinner. Just be aware that you have to pay for your food and drinks at the dinner, unless we are going to be surprised again by a generous sponsor that covers partially or completely to dinner. If you need more details about Fosdem, the website is: - https://fosdem.org Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

5 years, 9 months

[kamailio/kamailio] ims_isc : fixed P-associated-uri header constructing (#1825)

by Yasin CANER

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  fixed P-associated-uri header construncting. it now creates sip and tel uri and appending them to P-header You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1825 -- Commit Summary -- * ims_isc : fixed memory leak * ims_isc : fixed P-associated-uri header constructing -- File Changes -- M src/modules/ims_isc/third_party_reg.c (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1825.patch https://github.com/kamailio/kamailio/pull/1825.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/1825

5 years, 9 months

[kamailio/kamailio] core: dns slow queries reporting (#1824)

by Julien Chavanton

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I remember there was some discussion about adding DNS statistics, I think I remember a discussion involving @ngvoice Carsten ? This is adding a parameter to the core `dns_slow_query_ms` Example: ``` dns_slow_query_ms=100 ``` When using the internal resolver any query taking more than `dns_slow_query_ms` will be lodged as a warning : ``` dns_slow_query_ms=10 (example with 10ms) 5(5960) WARNING: <core> [core/resolve.c:752]: get_record(): res_search[35][us-west-wa.sip.flowroute.com]elapsed[12ms] 5(5960) WARNING: <core> [core/resolve.c:752]: get_record(): res_search[1][ep-us-west-wa-01.flowroute.com]elapsed[12ms] ``` and a statistic counter will be incremented : ``` kamcmd stats.fetch dns:slow_dns_request { dns.slow_dns_request: 1 } ``` I think this will be a good start to monitor the impact of slow DNS queries on Kamailio. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1824 -- Commit Summary -- * core: dns slow queries reporting -- File Changes -- M src/core/cfg.lex (3) M src/core/cfg.y (3) M src/core/cfg_core.c (3) M src/core/cfg_core.h (1) M src/core/resolve.c (17) M src/core/resolve.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1824.patch https://github.com/kamailio/kamailio/pull/1824.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/1824

5 years, 9 months

[kamailio/kamailio] [5.1] set of cherry-pick to properly package on alpine dists (#1826)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1826 -- Commit Summary -- * pkg/docker: Updated submodule * pkg/kamailio/alpine: Update APKBUILD * pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container * kamdbctl: Merged patch from alpine packaging (#1786) -- File Changes -- M pkg/docker (2) D pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch (20) M pkg/kamailio/alpine/APKBUILD (12) M pkg/kamailio/alpine/kamailio.initd (2) D pkg/kamailio/alpine/kamctl_build.patch (236) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1826.patch https://github.com/kamailio/kamailio/pull/1826.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/1826

5 years, 9 months

[kamailio/kamailio] bug: RPCFIFOPATH / DEFINE_FIFO_NAME invalid acces due changed to root at run (#1827)

by PICCORO Lenz McKAY

### Description the /var/run/kamailio directory for the fifo and crtl files are denied for acces to the service as i can see directory are owed byt root and only ower and group have access kamailio 4.4 backported by me for Debian jessie have this: `drwxr-xr-x 2 kamailio kamailio 100 Aug 15 17:33 kamailio` kamailio 5.2 installed on buster/testing build from sources: `drwxr-x--- 2 root root 120 Jan 30 09:35 kamailio` **NOTE** no definiton are setup, and surprise if i defined some, the only working dir are /tmp !!! ### Troubleshooting kamailio 4.4 backported by me for Debian jessie have this: `drwxr-xr-x 2 kamailio kamailio 100 Aug 15 17:33 kamailio` kamailio 5.2 installed on buster/testing build from sources: `drwxr-x--- 2 root root 120 Jan 30 09:35 kamailio` due that several issues are happened if we started using some modules due unable to manage the socket control: ``` Jan 31 15:35:51 venenux-debian kamailio[16861]: 17(16889) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(7, 0x7f6ed6f88d88, 0, 5000): Invalid argument [22] Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: ctl [ctl.c:390]: mod_destroy(): ERROR: ctl: could not delete unix socket /var/run/kamailio//kamailio_ctl: Permission denied (13) Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_sock.c:516]: jsonrpc_dgram_destroy(): socket stat failed: Permission denied ``` #### Reproduction build from sources with default values enable dialog, blf support and asterisk and start service.. when try to control using socket kamailio cannot comunicate with itselft! very ironic! #### Log Messages ``` Jan 31 15:35:51 venenux-debian kamailio[16861]: 17(16889) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(7, 0x7f6ed6f88d88, 0, 5000): Invalid argument [22] Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: ctl [ctl.c:390]: mod_destroy(): ERROR: ctl: could not delete unix socket /var/run/kamailio//kamailio_ctl: Permission denied (13) Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_sock.c:516]: jsonrpc_dgram_destroy(): socket stat failed: Permission denied ``` #### SIP Traffic NOT RELATED ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian buster/testing ``` -- 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/1827

5 years, 9 months

git:master:ddbf1835: src/Makefile: added target to install files for systemd on debian

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ddbf18352f189b8aa1ae5e5f1d83d42db6fcc0d2 URL: https://github.com/kamailio/kamailio/commit/ddbf18352f189b8aa1ae5e5f1d83d42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T20:02:26+01:00 src/Makefile: added target to install files for systemd on debian * make install-systemd-debian --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ddbf18352f189b8aa1ae5e5f1d83d42… Patch: https://github.com/kamailio/kamailio/commit/ddbf18352f189b8aa1ae5e5f1d83d42… --- diff --git a/src/Makefile b/src/Makefile index 5b67d7ad67..593da28166 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1019,6 +1019,29 @@ install_initd_centos install-initd-centos: -d /var/run/$(NAME) $(NAME) chown $(NAME):$(NAME) /var/run/$(NAME) +.PHONY: install_systemd_debian install-systemd-debian +install_systemd_debian install-systemd-debian: + sed -e "s#ExecStart=/usr/sbin/kamailio#ExecStart=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ + -e "s#Description=Kamailio#Description=$(NAME)#g" \ + -e "s#/var/run/kamailio/kamailio.pid#/var/run/$(NAME)/$(NAME).pid#g" \ + -e "s#EnvironmentFile=-/etc/default/kamailio#EnvironmentFile=-/etc/default/$(NAME)#g" \ + -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ + < ../pkg/kamailio/deb/debian/kamailio.service \ + > /etc/systemd/system/$(NAME).service + sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ + < ../pkg/kamailio/deb/debian/kamailio.default \ + > /etc/default/$(NAME) + mkdir -p /var/run/$(NAME) + adduser --quiet --system --group --disabled-password \ + --shell /bin/false --gecos "$(NAME)" \ + --home /var/run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /var/run/$(NAME) + echo "D /run/$(NAME) 0700 $(NAME) $(NAME) -" > /etc/tmpfiles.d/$(NAME).conf + @echo + @echo "* to enable kamailio service run:" + @echo " systemctl enable kamailio" + @echo " systemctl daemon-reload" + .PHONY: dbschema dbschema: -@echo "Build database schemas"

5 years, 9 months

git:master:870de70c: modules: readme files regenerated - htable ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 870de70cb574ab0b0b902529fdcd469c95af80d2 URL: https://github.com/kamailio/kamailio/commit/870de70cb574ab0b0b902529fdcd469… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-31T20:01:34+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/870de70cb574ab0b0b902529fdcd469… Patch: https://github.com/kamailio/kamailio/commit/870de70cb574ab0b0b902529fdcd469… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index c003e524b2..cb9a9e761a 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -82,8 +82,9 @@ Ovidiu Sas 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.listTables - 6.8. htable.stats + 6.7. htable.flush htable + 6.8. htable.listTables + 6.9. htable.stats 7. Event routes @@ -182,8 +183,9 @@ Chapter 1. Admin Guide 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.listTables - 6.8. htable.stats + 6.7. htable.flush htable + 6.8. htable.listTables + 6.9. htable.stats 7. Event routes @@ -960,8 +962,9 @@ if(sht_has_str_value("ha", "eq", "alice")) { 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.listTables - 6.8. htable.stats + 6.7. htable.flush htable + 6.8. htable.listTables + 6.9. htable.stats 6.1. htable.get htable key @@ -1069,7 +1072,21 @@ kamcmd htable.dump ipban kamcmd htable.reload ipban ... -6.7. htable.listTables +6.7. htable.flush htable + + Empty the hash table + + Name: htable.flush + + Parameters: + * htable : Name of the hash table to flush + + Example: +... +kamcmd htable.flush ipban +... + +6.8. htable.listTables Lists all defined tables @@ -1083,7 +1100,7 @@ kamcmd htable.reload ipban kamcmd htable.listTables ... -6.8. htable.stats +6.9. htable.stats Get statistics for hash tables - name, number of slots, number of items, max number of items per slot, min number of items per slot.

5 years, 9 months

git:master:4fe81fe0: Merge pull request #1828 from gaaf/htable-flush

by GitHub

Module: kamailio Branch: master Commit: 4fe81fe0c31f2578659c3fe02079eadc3af36f46 URL: https://github.com/kamailio/kamailio/commit/4fe81fe0c31f2578659c3fe02079ead… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-31T19:59:01+01:00 Merge pull request #1828 from gaaf/htable-flush htable: Add RPC htable.flush <htable> --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/4fe81fe0c31f2578659c3fe02079ead… Patch: https://github.com/kamailio/kamailio/commit/4fe81fe0c31f2578659c3fe02079ead… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 708973a045..859f7787ca 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1390,6 +1390,29 @@ kamcmd htable.dump ipban ... kamcmd htable.reload ipban ... +</programlisting> + </section> + <section id="htable.rpc.flush"> + <title> + <function moreinfo="none">htable.flush htable</function> + </title> + <para> + Empty the hash table + </para> + <para> + Name: <emphasis>htable.flush</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table to flush</para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.flush ipban +... </programlisting> </section> <section id="htable.rpc.listTables"> diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1da1ba7928..580e3bc881 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1123,6 +1123,10 @@ static const char* htable_stats_doc[2] = { "Statistics about htables.", 0 }; +static const char* htable_flush_doc[2] = { + "Flush hash table.", + 0 +}; static const char* htable_reload_doc[2] = { "Reload hash table.", 0 @@ -1474,6 +1478,25 @@ static void htable_rpc_stats(rpc_t* rpc, void* c) return; } +/*! \brief RPC htable.flush command to empty a hash table */ +static void htable_rpc_flush(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + ht_reset_content(ht); +} /*! \brief RPC htable.reload command to reload content of a hash table */ static void htable_rpc_reload(rpc_t* rpc, void* c) @@ -1583,6 +1606,7 @@ rpc_export_t htable_rpc[] = { {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, + {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {0, 0, 0, 0} };

5 years, 9 months

git:master:19d25bac: htable: Add RPC htable.flush <htable>

by Alex Hermann

Module: kamailio Branch: master Commit: 19d25bacb8d15473e0e9f11a50484ba669430e0c URL: https://github.com/kamailio/kamailio/commit/19d25bacb8d15473e0e9f11a50484ba… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2019-01-31T19:08:28+01:00 htable: Add RPC htable.flush <htable> Empties the entire specified hash table --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/19d25bacb8d15473e0e9f11a50484ba… Patch: https://github.com/kamailio/kamailio/commit/19d25bacb8d15473e0e9f11a50484ba… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 708973a045..859f7787ca 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1390,6 +1390,29 @@ kamcmd htable.dump ipban ... kamcmd htable.reload ipban ... +</programlisting> + </section> + <section id="htable.rpc.flush"> + <title> + <function moreinfo="none">htable.flush htable</function> + </title> + <para> + Empty the hash table + </para> + <para> + Name: <emphasis>htable.flush</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table to flush</para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.flush ipban +... </programlisting> </section> <section id="htable.rpc.listTables"> diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1da1ba7928..580e3bc881 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1123,6 +1123,10 @@ static const char* htable_stats_doc[2] = { "Statistics about htables.", 0 }; +static const char* htable_flush_doc[2] = { + "Flush hash table.", + 0 +}; static const char* htable_reload_doc[2] = { "Reload hash table.", 0 @@ -1474,6 +1478,25 @@ static void htable_rpc_stats(rpc_t* rpc, void* c) return; } +/*! \brief RPC htable.flush command to empty a hash table */ +static void htable_rpc_flush(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + ht_reset_content(ht); +} /*! \brief RPC htable.reload command to reload content of a hash table */ static void htable_rpc_reload(rpc_t* rpc, void* c) @@ -1583,6 +1606,7 @@ rpc_export_t htable_rpc[] = { {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, + {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {0, 0, 0, 0} };

5 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019