[Pkg-voip-commits] r9504 - in /mumble/branches/sid/debian: changelog patches/02-reject-with-ip-in-log.diff patches/series

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun Feb 12 16:03:39 2012
New Revision: 9504

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9504
Log:
* Add patch 02-reject-with-ip-in-log to show up the IP address of a rejected
  connection in the mumble-server log.
  Closes: #627139

Added:
    mumble/branches/sid/debian/patches/02-reject-with-ip-in-log.diff
Modified:
    mumble/branches/sid/debian/changelog
    mumble/branches/sid/debian/patches/series

Modified: mumble/branches/sid/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/sid/debian/changelog?rev=9504&op=diff
==============================================================================
--- mumble/branches/sid/debian/changelog (original)
+++ mumble/branches/sid/debian/changelog Sun Feb 12 16:03:39 2012
@@ -6,8 +6,11 @@
     the source code.
   * Add patch 05-lsb-description which fixes the lintian warning
     init.d-script-missing-lsb-description.
-
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 16:59:59 +0100
+  * Add patch 02-reject-with-ip-in-log to show up the IP address of a rejected
+    connection in the mumble-server log.
+    Closes: #627139
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 17:03:11 +0100
 
 mumble (1.2.3-2) unstable; urgency=low
 

Added: mumble/branches/sid/debian/patches/02-reject-with-ip-in-log.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/sid/debian/patches/02-reject-with-ip-in-log.diff?rev=9504&op=file
==============================================================================
--- mumble/branches/sid/debian/patches/02-reject-with-ip-in-log.diff (added)
+++ mumble/branches/sid/debian/patches/02-reject-with-ip-in-log.diff Sun Feb 12 16:03:39 2012
@@ -1,0 +1,17 @@
+# Show the IP address of the rejected connection in the mumble-server log.
+# Closes: #627139
+
+diff -Naur mumble-1.2.3.orig/src/murmur/Messages.cpp mumble-1.2.3/src/murmur/Messages.cpp
+--- mumble-1.2.3.orig/src/murmur/Messages.cpp	2011-02-19 22:35:19.000000000 +0100
++++ mumble-1.2.3/src/murmur/Messages.cpp	2012-02-12 17:01:02.194962393 +0100
+@@ -172,7 +172,9 @@
+ 	}
+ 
+ 	if (! ok) {
+-		log(uSource, QString("Rejected connection: %1").arg(reason));
++		log(uSource, QString("Rejected connection from %1: %2").
++			arg(addressToString(uSource->peerAddress(),
++			uSource->peerPort()), reason));
+ 		MumbleProto::Reject mpr;
+ 		mpr.set_reason(u8(reason));
+ 		mpr.set_type(rtType);

Modified: mumble/branches/sid/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/sid/debian/patches/series?rev=9504&op=diff
==============================================================================
--- mumble/branches/sid/debian/patches/series (original)
+++ mumble/branches/sid/debian/patches/series Sun Feb 12 16:03:39 2012
@@ -1,4 +1,5 @@
 0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch
 0002-remove-opengl-for-client
 01-fix-spelling-error.diff
+02-reject-with-ip-in-log.diff
 05-lsb-description.diff