fix tracing of port notifications

kodakkey · Sep 8, 2022 · db83d73 · db83d73
1 parent 1ff119e
commit db83d73
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Neighbor.cxx b/Neighbor.cxx
@@ -3,7 +3,7 @@
 // Neighboring System for GNU Gatekeeper
 //
 // Copyright (c) Citron Network Inc. 2002-2003
-// Copyright (c) 2004-2020, Jan Willamowius
+// Copyright (c) 2004-2022, Jan Willamowius
 //
 // This work is published under the GNU Public License version 2 (GPLv2)
 // see file COPYING for details.

diff --git a/RasTbl.cxx b/RasTbl.cxx
@@ -2,7 +2,7 @@
 //
 // bookkeeping for RAS-Server in H.323 gatekeeper
 //
-// Copyright (c) 2000-2021, Jan Willamowius
+// Copyright (c) 2000-2022, Jan Willamowius
 //
 // This work is published under the GNU Public License version 2 (GPLv2)
 // see file COPYING for details.
@@ -70,7 +70,7 @@ const long DEFAULT_ALERTING_TIMEOUT = 180000;
 const int DEFAULT_IRQ_POLL_COUNT = 1;
 }
 
-PString AsString(PortType t)
+PString PortTypeAsString(PortType t)
 {
     switch (t) {
         case 1: return "RAS";

diff --git a/RasTbl.h b/RasTbl.h
@@ -2,7 +2,7 @@
 //
 // bookkeeping for RAS-Server in H.323 gatekeeper
 //
-// Copyright (c) 2000-2021, Jan Willamowius
+// Copyright (c) 2000-2022, Jan Willamowius
 //
 // This work is published under the GNU Public License version 2 (GPLv2)
 // see file COPYING for details.
@@ -56,7 +56,7 @@ const unsigned WAIT_DELETE_AFTER_DISCONNECT = 30;   // time to wait after discon
 enum PortType { RASPort=1, Q931Port=2, H245Port=3, RTPPort=4, T120Port=5, RadiusPort=6, StatusPort=7 };
 enum PortAction { PortOpen=1, PortClose=2 };
 
-PString AsString(PortType t);
+PString PortTypeAsString(PortType t);
 
 class DynamicPort
 {

diff --git a/Toolkit.cxx b/Toolkit.cxx
@@ -2,7 +2,7 @@
 //
 // Toolkit base class for the GnuGk
 //
-// Copyright (c) 2000-2021, Jan Willamowius
+// Copyright (c) 2000-2022, Jan Willamowius
 //
 // This work is published under the GNU Public License version 2 (GPLv2)
 // see file COPYING for details.
@@ -3713,7 +3713,7 @@ bool Toolkit::IsPortNotificationActive()	// not const to allow simple map access
 void Toolkit::PortNotification(PortType type, PortAction action, const PString & protocol,
 								const PIPSocket::Address & addr, WORD port, PINDEX callNo)
 {
-	PTRACE(5, "Port Notification " << ((action == PortOpen) ? "OPEN " : "CLOSE ") << AsString(type) << " " << protocol << " " << ::AsString(addr, port));
+	PTRACE(5, "Port Notification " << ((action == PortOpen) ? "OPEN " : "CLOSE ") << PortTypeAsString(type) << " " << protocol << " " << ::AsString(addr, port));
 
 	// book keeping for status port command
 	if (callNo != 0) {
@@ -3741,7 +3741,7 @@ void Toolkit::PortNotification(PortType type, PortAction action, const PString &
 	cmd.Replace("%p", protocol);
 	cmd.Replace("%n", PString(port));
 	cmd.Replace("%i", ::AsString(addr));
-	cmd.Replace("%t", ::AsString(type));
+	cmd.Replace("%t", PortTypeAsString(type));
 
 	if(system(cmd) == -1) {
 		PTRACE(1, "Error executing port notification: " << cmd);

diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,6 @@
 Changes from 5.10 to 5.11
 =========================
+- BUGFIX(Toolkit.cxx) fix tracing of port notifications
 - new switch: [RasSrv::LRQFeatures] PreserveDestination=1
 
 Changes from 5.9 to 5.10