From 2fd0d178f5a3e0b296919db49c6cf3bd7bc7e7c4 Mon Sep 17 00:00:00 2001
From: Tobias Blomberg <sm0svx@users.noreply.github.com>
Date: Fri, 3 Jan 2020 14:26:07 +0100
Subject: [PATCH] Better warning printouts for illegal UDP datagrams

---
 src/svxlink/reflector/Reflector.cpp | 12 ++++++++----
 src/versions                        |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/svxlink/reflector/Reflector.cpp b/src/svxlink/reflector/Reflector.cpp
index 0b708303..8ae63762 100644
--- a/src/svxlink/reflector/Reflector.cpp
+++ b/src/svxlink/reflector/Reflector.cpp
@@ -398,21 +398,24 @@ void Reflector::udpDatagramReceived(const IpAddress& addr, uint16_t port,
   ReflectorUdpMsg header;
   if (!header.unpack(ss))
   {
-    cout << "*** WARNING: Unpacking failed for UDP message header\n";
+    cout << "*** WARNING: Unpacking message header failed for UDP datagram "
+            "from " << addr << ":" << port << endl;
     return;
   }
 
   ReflectorClientMap::iterator it = m_client_map.find(header.clientId());
   if (it == m_client_map.end())
   {
-    cerr << "*** WARNING: Incoming UDP packet has invalid client id" << endl;
+    cerr << "*** WARNING: Incoming UDP datagram from " << addr << ":" << port
+         << " has invalid client id " << header.clientId() << endl;
     return;
   }
   ReflectorClient *client = (*it).second;
   if (addr != client->remoteHost())
   {
     cerr << "*** WARNING[" << client->callsign()
-         << "]: Incoming UDP packet has the wrong source ip" << endl;
+         << "]: Incoming UDP packet has the wrong source ip, "
+         << addr << " instead of " << client->remoteHost() << endl;
     return;
   }
   if (client->remoteUdpPort() == 0)
@@ -424,7 +427,8 @@ void Reflector::udpDatagramReceived(const IpAddress& addr, uint16_t port,
   {
     cerr << "*** WARNING[" << client->callsign()
          << "]: Incoming UDP packet has the wrong source UDP "
-            "port number" << endl;
+            "port number, " << port << " instead of "
+         << client->remoteUdpPort() << endl;
     return;
   }
 
diff --git a/src/versions b/src/versions
index 3cb2dd35..18a99e13 100644
--- a/src/versions
+++ b/src/versions
@@ -37,4 +37,4 @@ DEVCAL=1.0.2.99.0
 SVXSERVER=0.0.6
 
 # Version for SvxReflector
-SVXREFLECTOR=1.99.1
+SVXREFLECTOR=1.99.2