sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
292 discussions

git:master: tmx: fixed mix-up between $T(id_index) and $T(id_label)
by Daniel-Constantin Mierla 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: b0a7ef14887814c39f01416d19088982c55324ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0a7ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 16 12:21:14 2011 +0200 tmx: fixed mix-up between $T(id_index) and $T(id_label) - patch by Martin Hoffmann --- modules_k/tmx/t_var.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index ff78f45..366afe3 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -507,8 +507,8 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: - return pv_get_uintval(msg, param, res, t->label); - default: return pv_get_uintval(msg, param, res, t->hash_index); + default: + return pv_get_uintval(msg, param, res, t->label); } }

1 0

10 Years SER Conference - update
by Daniel-Constantin Mierla 15 Aug '11

15 Aug '11

Hello, just wanted to let you know that only few seats are still available for the 10 Years SER Conference, on Sep 2, 2011, in Berlin, Germany -- more details at: * http://sip-router.org/10-years-ser/ If you plan to attend, do not wait any longer and register as soon as possible (form at: http://sip-router.org/registration-form/). The host FhG Fokus Institute has a medium size conference room, with no option to expand -- I expect the registration to be closed very soon. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

freezing for major release 3.2.0
by Daniel-Constantin Mierla 15 Aug '11

15 Aug '11

Hello, based on the last devel IRC meeting, the next major release should happen sometime by end of September, therefore we should freeze the development and go into testing phase about one month before. I propose Monday, August 22, the day to freeze development for version 3.2.0. By then, I hope every developer will be able to push to master branch what he/she wants to have in 3.2.0. Write here to mailing lists if you thing about alternatives. The very good side of 3.2.0 is that we didn't need to touch much the core and main modules, meaning we have a solid tested foundation, further testing should be focused on the new modules and the other enhancements. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 1

git:treimann/acc-cdr: Merge branch 'master' into treimann/acc-cdr
by Timo Reimann 15 Aug '11

15 Aug '11

Module: sip-router Branch: treimann/acc-cdr Commit: 83c9d7187ab144d3f7f7adc31ccbb129a798c521 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83c9d71… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Aug 15 14:58:20 2011 +0200 Merge branch 'master' into treimann/acc-cdr * master: (76 commits) core: new core event for received datagrams Added documentation to the DMQ module htable: docs updated with db_expires parameter htable: control load/save of expires value from db via parameter srdb1: updated the definition of siptrace table to include time_us column modules_k/siptrace: Add time to x-headers modules_k/siptrace: Add column time_us modules_k/siptrace: Add "x-headers" feature modules_k/siptrace: Add trace_to_database configuration parameter modules_k/siptrace: separately store to db and/or send duplicate pua_xmpp: fixes to SIP-XMPP presence status translations Expose terminate_dlg through C API Expose terminate_dlg through C API Added terminate_dlg description Expose terminate_dlg through C API modules_k/dialog: Fix a bug that would cause a segfault when caller bind address information could not be retrieved from database and "dlg_list" was fifo-issued. modules_k/dialog: Improve dialog timer list handling. modules/tm, modules_k/pua: Fix for concurrency issue in PUA module tm: keep internal retr. intervals in ms lib/srdb1/schema: forgot to increase version number of pua table ... Conflicts: modules_k/dialog/dialog.c modules_k/dialog/dlg_load.h ---

1 0

Kamailio 3.1.4 Crash
by Brandon Armstead 15 Aug '11

15 Aug '11

Hello, Any further insight any of you can provide is very much appreciated. Here is the core dump syslog: Aug 9 13:42:10 kernel: [80782620.026999] kamailio[21378]: segfault at 7f269f026e5c ip 7f1c24f72969 sp 7fff3452bbe0 error 4 in dialog.so[7f1c24f53000+3a000] Aug 9 13:42:10 /usr/local/sbin/kamailio[21368]: INFO: <core> [main.c:756]: INFO: terminating due to SIGCHLD Aug 9 13:42:10 /usr/local/sbin/kamailio[21369]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21370]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21376]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21371]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21372]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21377]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21379]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21374]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21373]: INFO: <core> [main.c:807]: INFO: signal 15 received Aug 9 13:42:10 /usr/local/sbin/kamailio[21375]: INFO: <core> [main.c:807]: INFO: signal 15 received Here is the full backtrace from GDB: Program terminated with signal 11, Segmentation fault. [New process 21378] #0 unref_dlg (dlg=0x7f1c15232238, cnt=1) at dlg_hash.c:599 599 dlg_lock( d_table, d_entry); (gdb) bt full #0 unref_dlg (dlg=0x7f1c15232238, cnt=1) at dlg_hash.c:599 d_entry = (struct dlg_entry *) 0x7f269f026e48 #1 0x00007f1c29fd4a82 in run_trans_callbacks_internal (cb_lst=0x7f1c1538b6e0, type=32768, trans=0x7f1c1538b670, params=0x7fff3452bd40) at t_hooks.c:290 cbp = (struct tm_callback *) 0x7f1c1529a170 backup_from = (avp_list_t *) 0x8b4350 backup_to = (avp_list_t *) 0x8b4358 backup_dom_from = (avp_list_t *) 0x8b4360 backup_dom_to = (avp_list_t *) 0x8b4368 backup_uri_from = (avp_list_t *) 0x8b4340 backup_uri_to = (avp_list_t *) 0x8b4348 #2 0x00007f1c29fd4cd6 in run_trans_callbacks (type=32768, trans=<value optimized out>, req=0x1, rpl=0x7f269f026e48, code=622390088) at t_hooks.c:317 params = {req = 0x0, rpl = 0x0, param = 0x7f1c1529a180, code = 0, flags = 0, branch = 0, t_rbuf = 0x0, dst = 0x0, send_buf = {s = 0x0, len = 0}} #3 0x00007f1c29fbab46 in free_cell (dead_cell=0x7f1c1538b670) at h_table.c:152 b = <value optimized out> i = <value optimized out> rpl = <value optimized out> tt = <value optimized out> foo = <value optimized out> cbs = <value optimized out> __FUNCTION__ = "free_cell" #4 0x00007f1c29fd6a71 in wait_handler (ti=<value optimized out>, wait_tl=<value optimized out>, data=<value optimized out>) at timer.c:645 p_cell = (struct cell *) 0x7f1c1538b670 #5 0x000000000051463f in timer_main () at timer.c:894 No locals. #6 0x0000000000465101 in main_loop () at main.c:1630 i = 8 pid = <value optimized out> si = (struct socket_info *) 0x0 si_desc = "udp receiver child=7 sock=67.XXX.XXX.XXX:5060\000\000\000\000\000HÂ\232\000\000\000\000\000\f\000\000\000\000\000\000\000X\023\220", '\0' <repeats 13 times>, "t\000\000\000ÿ\177\000\000\030\205ø\024\001\000\000\000\001\000\000\000\000\000\000\000\002", '\0' <repeats 22 times> #7 0x00000000004680f3 in main (argc=<value optimized out>, argv=0x7fff3452c138) at main.c:2410 cfg_stream = (FILE *) 0x1c86010 c = <value optimized out> r = <value optimized out> tmp = 0x7fff3452de5f "" tmp_len = 32540 port = <value optimized out> proto = <value optimized out> ret = <value optimized out> seed = 3355938686 rfd = 4 debug_save = <value optimized out> debug_flag = 0 dont_fork_cnt = 0 n_lst = <value optimized out> p = <value optimized out> Sincerely, Brandon Armstead

2 7

git:master: core: new core event for received datagrams
by Daniel-Constantin Mierla 14 Aug '11

14 Aug '11

Module: sip-router Branch: master Commit: 178b21cc1f7f7f7a3fa10b6937755f6b72ec84b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=178b21c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 14 22:59:53 2011 +0200 core: new core event for received datagrams - event type defined as SREV_NET_DGRAM_IN - allow modules to get a callback when a udp datagram is received - offers the possibility to handle different content sent via datagram, such as HEP from Homer project, without invading the core with new code --- events.c | 11 +++++++++++ events.h | 2 ++ udp_server.c | 12 ++++++++++++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index fccfd1c..048cb45 100644 --- a/events.c +++ b/events.c @@ -81,6 +81,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.pkg_set_real_used = f; else return -1; break; + case SREV_NET_DGRAM_IN: + if(_sr_events_list.net_dgram_in==0) + _sr_events_list.net_dgram_in = f; + else return -1; + break; default: return -1; } @@ -154,6 +159,12 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.pkg_set_real_used(data); return ret; } else return 1; + case SREV_NET_DGRAM_IN: + if(unlikely(_sr_events_list.net_dgram_in!=0)) + { + ret = _sr_events_list.net_dgram_in(data); + return ret; + } else return 1; default: return -1; } diff --git a/events.h b/events.h index fdbcb45..465976f 100644 --- a/events.h +++ b/events.h @@ -29,6 +29,7 @@ #define SREV_CFG_RUN_ACTION 4 #define SREV_PKG_SET_USED 5 #define SREV_PKG_SET_REAL_USED 6 +#define SREV_NET_DGRAM_IN 7 typedef int (*sr_event_cb_f)(void *data); @@ -39,6 +40,7 @@ typedef struct sr_event_cb { sr_event_cb_f run_action; sr_event_cb_f pkg_set_used; sr_event_cb_f pkg_set_real_used; + sr_event_cb_f net_dgram_in; } sr_event_cb_t; void sr_event_cb_init(void); diff --git a/udp_server.c b/udp_server.c index c2c45bb..3889a65 100644 --- a/udp_server.c +++ b/udp_server.c @@ -75,6 +75,7 @@ #include "mem/mem.h" #include "ip_addr.h" #include "cfg/cfg_struct.h" +#include "events.h" #ifdef USE_RAW_SOCKS #include "raw_sock.h" #endif /* USE_RAW_SOCKS */ @@ -475,6 +476,17 @@ int udp_rcv_loop() su2ip_addr(&ri.src_ip, from); ri.src_port=su_getport(from); + if(unlikely(sr_event_enabled(SREV_NET_DGRAM_IN))) + { + void *sredp[3]; + sredp[0] = (void*)buf; + sredp[1] = (void*)(&len); + sredp[2] = (void*)(&ri); + if(sr_event_exec(SREV_NET_DGRAM_IN, (void*)sredp)<0) { + /* data handled by callback - continue to next packet */ + continue; + } + } #ifndef NO_ZERO_CHECKS #ifdef USE_STUN /* STUN support can be switched off even if it's compiled */

1 0

git:master: Merge branch 'mariusbucur/dmq'
by Marius Ovidiu Bucur 14 Aug '11

14 Aug '11

Module: sip-router Branch: master Commit: 93d10d9e5905f054f631f7354c501b64b8336025 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93d10d9… Author: Marius Bucur <bucur_marius_obidiu(a)yahoo.com> Committer: Marius Bucur <bucur_marius_obidiu(a)yahoo.com> Date: Sat Aug 13 19:20:16 2011 -0700 Merge branch 'mariusbucur/dmq' ---

1 0

git:mariusbucur/dmq: Added documentation to the DMQ module
by Marius Ovidiu Bucur 14 Aug '11

14 Aug '11

Module: sip-router Branch: mariusbucur/dmq Commit: ba56288aad0f8dd50e60c2fb411b305aef198fb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba56288… Author: unknown <mariusb@.(none)> Committer: unknown <mariusb@.(none)> Date: Sat Aug 13 19:02:31 2011 -0700 Added documentation to the DMQ module --- modules_k/dmq/doc/Makefile | 4 ++ modules_k/dmq/doc/dmq.xml | 44 +++++++++++++++++ modules_k/dmq/doc/dmq_admin.xml | 103 +++++++++++++++++++++++++++++++++++++++ modules_k/dmq/doc/dmq_devel.xml | 45 +++++++++++++++++ 4 files changed, 196 insertions(+), 0 deletions(-) diff --git a/modules_k/dmq/doc/Makefile b/modules_k/dmq/doc/Makefile new file mode 100644 index 0000000..d50daab --- /dev/null +++ b/modules_k/dmq/doc/Makefile @@ -0,0 +1,4 @@ +docs = dmq.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_k/dmq/doc/dmq.xml b/modules_k/dmq/doc/dmq.xml new file mode 100644 index 0000000..7d9620a --- /dev/null +++ b/modules_k/dmq/doc/dmq.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>Distributed Message Queue Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Marius Ovidiu</firstname> + <surname>Bucur</surname> + <address> + <email>bucur_marius_ovidiu(a)yahoo.com</email> + </address> + </author> + <editor> + <firstname>Marius Ovidiu</firstname> + <surname>Bucur</surname> + <address> + <email>bucur_marius_ovidiu(a)yahoo.com</email> + </address> + </editor> + </authorgroup> + <copyright> + <year>2011</year> + <holder>Marius Bucur</holder> + </copyright> + </bookinfo> + <toc></toc> + + <xi:include href="dmq_admin.xml"/> + <xi:include href="dmq_devel.xml"/> + +</book> + + diff --git a/modules_k/dmq/doc/dmq_admin.xml b/modules_k/dmq/doc/dmq_admin.xml new file mode 100644 index 0000000..9692d4f --- /dev/null +++ b/modules_k/dmq/doc/dmq_admin.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + +<chapter> + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para> The DMQ module implements a distributed message passing system on top of Kamailio. + The DMQ nodes within the system are grouped in a logical entity called DMQ bus and are able to + communicate with each others by sending/receiving messages (either by broadcast or sending a DMQ + message to a specific node). + The system transparently deals with node discovery, node consistency within the DMQ bus, retransmissions, + etc. + </para> + + </section> + + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>sl</emphasis>. + </para> + </listitem> + <listitem> + <para> + <emphasis>tm</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + + <section> + <title>External Libraries or Applications</title> + <itemizedlist> + <listitem> + <para> + <emphasis> + Each peer needs to use its own serialization mechanism. + Some examples are libtpl, protobuf. + </emphasis>. + </para> + </listitem> + </itemizedlist> + </section> + + <title>Exported Parameters</title> + <section> + <title><varname>dmq_server_address</varname>(str)</title> + <para> + The local server address. + </para> + <para> + The modules needs it to know on which interface the DMQ engine should send and receive messages. + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dmq_server_address</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "dmq_server_address", "&defaultdb;") +... +</programlisting> + </example> + </section> + <section> + <title><varname>dmq_notification_address</varname>(str)</title> + <para> + The address of the DMQ node from which the local node should retrieve initial information. + </para> + <para> + <emphasis> Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dmq_notification_address</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "dmq_notification_address", "&defaultdb;") +... +</programlisting> + </example> + </section> +</chapter> + diff --git a/modules_k/dmq/doc/dmq_devel.xml b/modules_k/dmq/doc/dmq_devel.xml new file mode 100644 index 0000000..afa561b --- /dev/null +++ b/modules_k/dmq/doc/dmq_devel.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + +<chapter> + <title>&develguide;</title> + <para> + The module provides the following functions that can be used + in other &kamailio; modules. + </para> + <section> + <title> + <function moreinfo="none">dmq_load_api(dmq_api_t* api)</function> + </title> + <para> + This function binds the dmq modules and fills the structure + with the exported functions + -> register_dmq_peer - registers an entity as a DMQ peer which permits receiving/sending + messages between nodes which support the same peer, + -> bcast_message - broadcast a DMQ message to all peers available in the DMQ bus, + -> send_message - sends a DMQ message to a specific peer in the local DMQ bus. + </para> + <example> + <title><function>dmq_api_t</function> structure</title> + <programlisting format="linespecific"> +... +typedef struct dmq_api { + register_dmq_peer_t register_dmq_peer; + bcast_message_t bcast_message; + send_message_t send_message; +} dmq_api_t; +... +</programlisting> + </example> + + </section> +</chapter> +

1 0

Exposing additional dialog functions through API
by Jason Penton 13 Aug '11

13 Aug '11

Hi All, We are currently refactoring and cleaning the various IMS modules for inclusion into SR, diameter_rx, diameter_cxdx, diameter_ro, etc. One thing we have noticed is that the use of dialog module functions would make the code alot better and cleaner, so 2 questions: 1. why is the Dialog module not exposing more if its methods? 2. Can we put in a patch to expose the ones we require. Currently, we have exposed and are using the following: lookup_dlg; terminate_dlg; get_dlg; unref_dlg; ref_dlg; Cheers Jason

5 13

git:master: htable: control load/ save of expires value from db via parameter
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: cfea4b3d26d34fb436763516262159023873c473 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfea4b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 14 00:04:25 2011 +0200 htable: control load/save of expires value from db via parameter - db_expires - a new paramter to control if the expires of the items in the hash table should be loaded/saved to database - default is 0 - do not load/save expires value - backward compatibility, since there might be hash tables loaded form database but without expires - if the hash table definition does not have an auto-expires, even if db_expires=1, the expires column is not selected since it is not needed --- modules_k/htable/ht_db.c | 34 +++++++++++++++++++++++----------- modules_k/htable/ht_db.h | 1 + modules_k/htable/htable.c | 2 ++ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 2a349c3..e1a46b2 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -141,6 +141,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) int ret; int cnt; int now; + int ncols; if(ht_db_con==NULL) { @@ -157,9 +158,12 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) LM_DBG("=============== loading hash table [%.*s] from database [%.*s]\n", ht->name.len, ht->name.s, dbtable->len, dbtable->s); cnt = 0; + ncols = 4; + if(ht->htexpire > 0 && ht_db_expires_flag!=0) + ncols = 5; if (DB_CAPABILITY(ht_dbf, DB_CAP_FETCH)) { - if(ht_dbf.query(ht_db_con,0,0,0,db_cols,0,5,db_ord,0) < 0) + if(ht_dbf.query(ht_db_con,0,0,0,db_cols,0,ncols,db_ord,0) < 0) { LM_ERR("Error while querying db\n"); return -1; @@ -179,7 +183,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } } else { if((ret=ht_dbf.query(ht_db_con, NULL, NULL, NULL, db_cols, - 0, 5, db_ord, &db_res))!=0 + 0, ncols, db_ord, &db_res))!=0 || RES_ROW_N(db_res)<=0 ) { if( ret==0) @@ -208,10 +212,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } kname.len = strlen(kname.s); - expires.n = RES_ROWS(db_res)[i].values[4].val.int_val; - if (expires.n > 0 && expires.n < now) { - LM_DBG("skipping expired entry [%.*s] (%d)\n", kname.len, kname.s, expires.n-now); - continue; + expires.n = 0; + if(ht->htexpire > 0 && ht_db_expires_flag!=0) { + expires.n = RES_ROWS(db_res)[i].values[4].val.int_val; + if (expires.n > 0 && expires.n < now) { + LM_DBG("skipping expired entry [%.*s] (%d)\n", kname.len, + kname.s, expires.n-now); + continue; + } } cnt++; @@ -328,6 +336,7 @@ int ht_db_save_table(ht_t *ht, str *dbtable) str tmp; int i; time_t now; + int ncols; if(ht_db_con==NULL) { @@ -390,12 +399,15 @@ int ht_db_save_table(ht_t *ht, str *dbtable) db_vals[3].val.str_val.s = tmp.s; db_vals[3].val.str_val.len = tmp.len; } + ncols = 4; - db_vals[4].type = DB1_INT; - db_vals[4].nul = 0; - db_vals[4].val.int_val = (int)it->expire; - - if(ht_dbf.insert(ht_db_con, db_cols, db_vals, 5) < 0) + if(ht_db_expires_flag!=0 && ht->htexpire > 0) { + db_vals[4].type = DB1_INT; + db_vals[4].nul = 0; + db_vals[4].val.int_val = (int)it->expire; + ncols = 5; + } + if(ht_dbf.insert(ht_db_con, db_cols, db_vals, ncols) < 0) { LM_ERR("failed to store key [%.*s] in table [%.*s]\n", it->name.len, it->name.s, diff --git a/modules_k/htable/ht_db.h b/modules_k/htable/ht_db.h index e205743..40a37c8 100644 --- a/modules_k/htable/ht_db.h +++ b/modules_k/htable/ht_db.h @@ -33,6 +33,7 @@ extern str ht_db_value_column; extern str ht_db_expires_column; extern str ht_array_size_suffix; extern int ht_fetch_rows; +extern int ht_db_expires_flag; int ht_db_init_params(void); int ht_db_init_con(void); diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index adb357f..58e9755 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -48,6 +48,7 @@ MODULE_VERSION int ht_timer_interval = 20; +int ht_db_expires_flag = 0; static int htable_init_rpc(void); @@ -113,6 +114,7 @@ static param_export_t params[]={ {"array_size_suffix", STR_PARAM, &ht_array_size_suffix.s}, {"fetch_rows", INT_PARAM, &ht_fetch_rows}, {"timer_interval", INT_PARAM, &ht_timer_interval}, + {"db_expires", INT_PARAM, &ht_db_expires_flag}, {0,0,0} };

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011