[Pkg-voip-commits] r9712 - in /kamailio/trunk/debian: changelog patches/series patches/upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch patches/upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Tue May 22 15:16:59 UTC 2012
Author: maniac-guest
Date: Tue May 22 15:16:59 2012
New Revision: 9712
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9712
Log:
upstream patches
Added:
kamailio/trunk/debian/patches/upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch
kamailio/trunk/debian/patches/upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/patches/series
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9712&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue May 22 15:16:59 2012
@@ -23,7 +23,7 @@
* debian/copyright
+ using copyright-format/1.0/
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Tue, 08 May 2012 16:12:56 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Tue, 22 May 2012 17:16:02 +0200
kamailio (1.5.1-2) unstable; urgency=low
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9712&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Tue May 22 15:16:59 2012
@@ -5,6 +5,8 @@
upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch
upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch
+upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch
+upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
spelling-errors.patch
Added: kamailio/trunk/debian/patches/upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch?rev=9712&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch Tue May 22 15:16:59 2012
@@ -1,0 +1,42 @@
+From c554684986be936ae1d76513fdc7202b0c117db9 Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Wed, 9 May 2012 07:42:14 +0300
+Subject: [PATCH] modules_k/auth_radius: fixed typo in README
+
+- Fixed authorization return code for authorization failed. It should
+ be 2 instead of 3. Reported by Ricardo Martinez.
+(cherry picked from commit 7665aefc966409588cca8e2a70d8a03e4d7a6fa1)
+---
+ modules_k/auth_radius/README | 2 +-
+ modules_k/auth_radius/doc/auth_radius_admin.xml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/auth_radius/README b/modules_k/auth_radius/README
+index f44d94e..1875408 100644
+--- a/modules_k/auth_radius/README
++++ b/modules_k/auth_radius/README
+@@ -227,7 +227,7 @@ modparam("auth_radius", "use_ruri_flag", 22)
+ * -6 (nonce reused) - nonce is used more than once;
+ * -5 (no credentials) - credentials were not found in request;
+ * -4 (stale nonce) - stale nonce;
+- * -3 (authorization failed) - RADIUS responded with Access Reject
++ * -2 (authorization failed) - RADIUS responded with Access Reject
+ which may be, for example, due to user not found or wrong password;
+ * -1 (error) - some error occured during authorization (see syslog);
+
+diff --git a/modules_k/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml
+index becb3fe..5deb681 100644
+--- a/modules_k/auth_radius/doc/auth_radius_admin.xml
++++ b/modules_k/auth_radius/doc/auth_radius_admin.xml
+@@ -226,7 +226,7 @@ modparam("auth_radius", "use_ruri_flag", 22)
+ <emphasis>-4 (stale nonce)</emphasis> - stale nonce;
+ </para></listitem>
+ <listitem><para>
+- <emphasis>-3 (authorization failed)</emphasis> - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password;
++ <emphasis>-2 (authorization failed)</emphasis> - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password;
+ </para></listitem>
+ <listitem><para>
+ <emphasis>-1 (error)</emphasis> - some error occured during authorization (see syslog);
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch?rev=9712&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch Tue May 22 15:16:59 2012
@@ -1,0 +1,48 @@
+From 850afebb30470a075423d0e721b678d82261d1be Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 17 May 2012 08:19:10 +0200
+Subject: [PATCH] rtpproxy: handle UPDATE in rtpproxy_manage()
+
+- UPDATE can carry SDB body
+- reported by Spencer Thomason
+(cherry picked from commit 24ff0d9aa060d183fbe40b1fcb5910d60940585b)
+---
+ modules/rtpproxy/rtpproxy.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
+index b6aa316..ba66e54 100644
+--- a/modules/rtpproxy/rtpproxy.c
++++ b/modules/rtpproxy/rtpproxy.c
+@@ -1706,7 +1706,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip)
+ method = get_cseq(msg)->method_id;
+
+ if(!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL
+- || method==METHOD_BYE))
++ || method==METHOD_BYE || method==METHOD_UPDATE))
+ return -1;
+
+ if(method==METHOD_CANCEL || method==METHOD_BYE)
+@@ -1727,6 +1727,9 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip)
+ if(method==METHOD_ACK && nosdp==0)
+ return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0,
+ (ip!=NULL)?1:0);
++ if(method==METHOD_UPDATE && nosdp==0)
++ return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1,
++ (ip!=NULL)?1:0);
+ if(method==METHOD_INVITE && nosdp==0) {
+ msg->msg_flags |= FL_SDP_BODY;
+ if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL
+@@ -1741,6 +1744,9 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip)
+ if(msg->first_line.u.reply.statuscode>=300)
+ return unforce_rtp_proxy_f(msg, 0, 0);
+ if(nosdp==0) {
++ if(method==METHOD_UPDATE)
++ return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0,
++ (ip!=NULL)?1:0);
+ if(tmb.t_gett==NULL || tmb.t_gett()==NULL
+ || tmb.t_gett()==T_UNDEFINED)
+ return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0,
+--
+1.7.9.5
+
More information about the Pkg-voip-commits
mailing list