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

Author: Andrei Pelinescu-Onciul andrei@iptel.org Committer: Andrei Pelinescu-Onciul andrei@iptel.org Date: Wed Jan 13 17:20:23 2010 +0100

Merge remote branch 'origin/sr_3.0'

latest sr_3.0 fixes, after kamailio 3.0 release.

* origin/sr_3.0: (58 commits) Backport of the changes (see previous commits). kex: documented missing functions kex: aliased avp_printf to pv_printf auth_diameter(k): remove redundant declaration of find_credentials, now in core - fix bug in encode_contact() - fix bug when RURI was changed before and newuri will be used - remove unused code modules_k/nathelper: removed garbage from documentation (credits to Klaus) modules_k/nathelper: improved handle_ruri_alias() documentation modules/lcr and modules_k/nathelper: fixed compiler warnings modules_k/nathelper: handle_uri_alias() alias handling fix modules_k/usrloc: changed 'Kamailio' to 'SIP Router' in user agent string. tm: safer handling for local transactions and drop_replies!=0 sctp: stats: don't increment ASSOC_SHUTDOWN on COMM_LOST sctp: SCTP_STATS_ASSOC_SHUTDOWN tm doc: local_ack_mode documentation tm: new param: local_ack_mode makefile: fix make bin & basedir core: fix parsing for avps with the same name as a pv class tls: name the certificates based on $MAIN_NAME ...

Conflicts: modules/tm/README modules_k/nathelper/rtpproxy_stream.c pkg/debian/rules

---