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

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun Feb 12 10:57:57 2012
New Revision: 9491

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9491
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/trunk/debian/patches/02-reject-with-ip-in-log.diff
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/patches/series

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=9491&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Feb 12 10:57:57 2012
@@ -2,8 +2,11 @@
 
   * Add Dutch debconf translation.
     Closes: #657632
-
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 11:49:41 +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 11:56:57 +0100
 
 mumble (1.2.3-192-g683d39b-1) experimental; urgency=low
 

Added: mumble/trunk/debian/patches/02-reject-with-ip-in-log.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/02-reject-with-ip-in-log.diff?rev=9491&op=file
==============================================================================
--- mumble/trunk/debian/patches/02-reject-with-ip-in-log.diff (added)
+++ mumble/trunk/debian/patches/02-reject-with-ip-in-log.diff Sun Feb 12 10:57:57 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-277-g98f4ac1.orig/src/murmur/Messages.cpp mumble-1.2.3-277-g98f4ac1/src/murmur/Messages.cpp
+--- mumble-1.2.3-277-g98f4ac1.orig/src/murmur/Messages.cpp	2012-02-05 14:00:59.000000000 +0100
++++ mumble-1.2.3-277-g98f4ac1/src/murmur/Messages.cpp	2012-02-12 11:54:05.492791875 +0100
+@@ -175,7 +175,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/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=9491&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Sun Feb 12 10:57:57 2012
@@ -1,1 +1,2 @@
 01-fix-spelling-error.diff
+02-reject-with-ip-in-log.diff