[sr-dev] git:master: Merge remote branch 'origin/sr_3.0'

Andrei Pelinescu-Onciul andrei at iptel.org
Wed Jan 27 11:32:36 CET 2010


Module: sip-router
Branch: master
Commit: 8791fc81eaa6dbcc545eabc648613d961b3c1b90
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8791fc81eaa6dbcc545eabc648613d961b3c1b90

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Wed Jan 27 11:31:25 2010 +0100

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

---






More information about the sr-dev mailing list