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 ---