Module: sip-router Branch: oej/permissionsrpc Commit: 10e06eb7b38cfb0909b07ac2e3e4bc9bfb7f2e9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10e06eb7...

Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: Tue Jan 8 08:52:17 2013 +0100

Merge branch 'master' into oej/permissionsrpc

* master: (90 commits) modules_k/registrar: documented new "flow_timer" modparam modules_k/registrar: Added modparam to allow Flow-Timer: to be set in 200 OK response to REGISTER requests modules/rtpproxy: removed LM_DBG that caused compiler warnings modules_k/outbound: Updated the module documentation modules_k/registrar: Updated registrar module documentation to describe the outbound_mode parameter modules_k/registrar: New outbound_mode parameter core: when printing the listening sockets on startup print also the advertise-port pkg/kamailio/(centos|fedora): Updated ver and rel in .spec modules_k/outbound: Updates to outbound module documentation modules_k/outbound: Fixes to outbound code arising from testing modules_k/rr: Updates to rr module documentation for outbound modules_k/rr: Fixes to loose.c from outbound testing sl: fix compilation warnings in sl_forward_reply() dialog: fixed ka_timer linking core: command line option -v replaced with -K msrp: new parameter use_path_addr msrp: added rpc command to list active connections msrp: added internal map table to track msrp connections pipelimit: implemented support for RPC commands Makefile.defs: major version base updated to 4.0.0 ...

---