Merge remote branch 'origin/sr_3.0'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Wed, 27 Jan 2010 10:31:25 +0000 (11:31 +0100)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Wed, 27 Jan 2010 10:31:25 +0000 (11:31 +0100)
commit8791fc81eaa6dbcc545eabc648613d961b3c1b90
treec8419cc350acb59a1d3e44ec7e6ebb9441a4694f
parent482db59aa2788737d9c6c0294a625bd3002d54c3
parent0e1baf00ab3419fe08f99680b9e4ca72623a15d8
Merge remote branch 'origin/sr_3.0'

latest sr_3.0 and kamailio_3.0 backports

* origin/sr_3.0: (90 commits)
  usrloc(k): rpc version for ul.dump
  core: init the len of sock_str attribute
  ctl: added parameters to control buffer size
  htable(k): rpc commad to dump htable
  pv(k): fixed $shv engine
  sanity: print From hdr in warning message
  nathelper(k): print bad contact uri
  core: more verbose when error parsing hdr
  kamailio.cfg: updated cfg with sample PSTN gw routing
  nathelper(k): fix for swap scenario
  presence(k): aliased MLA to SLA
  core: event parsing enahced for dialog;ma
  tm: documented t_relay_to() function
  tm: added t_relay_to(proxy, flags)
  tm: documented t_replicate() functions
  tm: t_replicate() can take avps & select as params
  tm: added t_replicate(uri)
  db_oracle: use PARAM_TYPE_MASK when checking param type
  snmpstats: fix param type checking
  core: define module_loaded to use find_module_by_name
  ...

Conflicts:
lib/srdb1/schema/dr_gateways.xml
lib/srdb1/schema/dr_groups.xml
lib/srdb1/schema/dr_gw_lists.xml
lib/srdb1/schema/dr_rules.xml
lib/srdb1/schema/kamailio-drouting.xml
modules/ctl/README
modules/topoh/README
modules_k/uac/auth.c
modules_k/uac/uac_send.c
parser/parse_param.h
utils/kamctl/mysql/drouting-create.sql
utils/kamctl/oracle/drouting-create.sql
utils/kamctl/postgres/drouting-create.sql
17 files changed:
Makefile
main.c
modules/ctl/README
modules/ctl/doc/params.xml
modules/tm/README
modules/tm/tm.c
modules/topoh/README
modules/topoh/doc/topoh_admin.xml
modules/topoh/topoh_mod.c
modules_k/nathelper/nathelper.c
modules_k/presence_xml/doc/presence_xml_admin.xml
modules_k/uac/auth.c
parser/msg_parser.c
parser/parse_param.c
parser/parse_param.h
socket_info.c
sr_module.c