spelling fixes

ProxyChannel.cxx

@@ -2429,7 +2429,7 @@ ProxySocket::Result CallSignalSocket::ReceiveData()
 		}
 	}
 	if (disableH245Tunneling && uuie && uuie->m_h323_uu_pdu.HasOptionalField(H225_H323_UU_PDU::e_h245Tunneling)) {
-		// if the h245Tunnelling field isn't present, that means no tunneling anyway
+		// if the h245Tunneling field isn't present, that means no tunneling anyway
 		uuie->m_h323_uu_pdu.m_h245Tunneling.SetValue(false);
 		msg->SetUUIEChanged();
 	}
@@ -2876,7 +2876,7 @@ void CallSignalSocket::SendPostDialDigits()
 	// TODO: add check if master/slave and TCS have already been exchanged
 	if (m_call && m_call->HasPostDialDigits()) {
 		bool sendOK = false;
-		PTRACE(3, "H245\tSending PostDialDigts " << m_call->GetPostDialDigits());
+		PTRACE(3, "H245\tSending PostDialDigits " << m_call->GetPostDialDigits());
 		for (PINDEX i = 0; i < m_call->GetPostDialDigits().GetLength(); i++) {
 			H245_MultimediaSystemControlMessage ui;
 			ui.SetTag(H245_MultimediaSystemControlMessage::e_indication);
@@ -3624,7 +3624,7 @@ bool CallSignalSocket::HandleH235OLC(H245_OpenLogicalChannel & olc)
 
     if ((toRemove && (rawCap.GetTag() != H245_DataType::e_h235Media))
 		|| (!toRemove && (rawCap.GetTag() == H245_DataType::e_h235Media))) {
-			PTRACE(1, "H235\tOLC Logic Error! ABORTIING REWRITE!");
+			PTRACE(1, "H235\tOLC Logic Error! ABORTING REWRITE!");
 			return false;
     }
 
@@ -3644,7 +3644,7 @@ bool CallSignalSocket::HandleH235OLC(H245_OpenLogicalChannel & olc)
     } else {
         PStringList m_capList;
         if (m_call && !m_call->GetAuthenticators().GetAlgorithms(m_capList)) {
-            PTRACE(1, "H235\tOLC No Algorithms! ABORTIING REWRITE!");
+            PTRACE(1, "H235\tOLC No Algorithms! ABORTING REWRITE!");
             return false;
         }
 
@@ -4245,7 +4245,7 @@ void CallSignalSocket::OnSetup(SignalingMsg * msg)
 				);
 
 			/// we should perform accounting here for this new call
-			// TODO: refector to use SendReleaseComplete() ?
+			// TODO: refactor to use SendReleaseComplete() ?
 			H225_H323_UserInformation userInfo;
 			H225_H323_UU_PDU_h323_message_body & msgBody = userInfo.m_h323_uu_pdu.m_h323_message_body;
 			msgBody.SetTag(H225_H323_UU_PDU_h323_message_body::e_releaseComplete);
@@ -4815,7 +4815,7 @@ void CallSignalSocket::OnSetup(SignalingMsg * msg)
 				rejectCall = true;
 			}
 		} else
-			PTRACE(5, Type() << "\tSupressing accounting start event for call #"
+			PTRACE(5, Type() << "\tSuppressing accounting start event for call #"
 				<< m_call->GetCallNumber());
 
         PString statusCallID = callid;
@@ -5199,7 +5199,7 @@ void CallSignalSocket::OnSetup(SignalingMsg * msg)
 		auth.SetEncryptionPolicy(1);	// request encryption
 		auth.SetMaxCipherLength(128);
 		if (setupBody.HasOptionalField(H225_Setup_UUIE::e_tokens) && SupportsH235Media(setupBody.m_tokens)) {
-			// make sure clear and crypto token fields are pesent, at least with 0 size
+			// make sure clear and crypto token fields are present, at least with 0 size
 			if (!setupBody.HasOptionalField(H225_Setup_UUIE::e_tokens)) {
 				setupBody.IncludeOptionalField(H225_Setup_UUIE::e_tokens);
 				setupBody.m_tokens.SetSize(0);
@@ -5631,7 +5631,7 @@ void CallSignalSocket::OnSetup(SignalingMsg * msg)
 #ifdef HAS_H46018
 	else {
 		// call to H.460.18 traversal client
-		// can't connect the 2 sockets now, remember the calling socket until the called has pinholed throuth the NAT
+		// can't connect the 2 sockets now, remember the calling socket until the called has pinholed through the NAT
 		// this may set the wrong localAddr, because we don't know the peerAddr, yet, updated later in OnFacility()
 		localAddr = RasServer::Instance()->GetLocalAddress(peerAddr);
 		UnmapIPv4Address(localAddr);
@@ -6310,7 +6310,7 @@ void CallSignalSocket::OnConnect(SignalingMsg *msg)
 			m_call->SetMediaEncryption(CallRec::none);
 			PTRACE(3, "H235\tNo Media Encryption Support Detected: Disabling!");
 			if (Toolkit::Instance()->Config()->GetBoolean(RoutedSec, "RequireH235HalfCallMedia", false)) {
-				PTRACE(1, "H235\tDiconnection call because of missing H.235 support");
+				PTRACE(1, "H235\tDisconnecting call because of missing H.235 support");
 				m_call->SetDisconnectCause(Q931::NormalUnspecified); //Q.931 code for reason=SecurityDenied
 				m_result = Error;
 				return;
@@ -6320,7 +6320,7 @@ void CallSignalSocket::OnConnect(SignalingMsg *msg)
 		  && connectBody.HasOptionalField(H225_Connect_UUIE::e_tokens) && SupportsH235Media(connectBody.m_tokens)) {
 			// there were no tokens in Setup (but we added some), but there are in Connect
 
-			// make sure crypto token fields are pesent, at least with 0 size
+			// make sure crypto token fields are present, at least with 0 size
 			if (!connectBody.HasOptionalField(H225_Connect_UUIE::e_cryptoTokens)) {
 				connectBody.IncludeOptionalField(H225_Connect_UUIE::e_cryptoTokens);
 				connectBody.m_cryptoTokens.SetSize(0);
@@ -7731,7 +7731,7 @@ void CallSignalSocket::OnFacility(SignalingMsg * msg)
 		H225_H323_UserInformation * uuie = facility->GetUUIE();
 		if ( uuie && ((uuie->m_h323_uu_pdu.m_h323_message_body.GetTag() == H225_H323_UU_PDU_h323_message_body::e_empty)
 			|| (facilityBody.m_reason.GetTag() == H225_FacilityReason::e_transportedInformation)) ) {
-			// filter out Facility messages with reason transportedInformation, but without h245Control or h4501SuplementaryService
+			// filter out Facility messages with reason transportedInformation, but without h245Control or h4501SupplementaryService
 			// needed for Avaya interop
 			if (   !uuie->m_h323_uu_pdu.HasOptionalField(H225_H323_UU_PDU::e_h245Control)
 				&& !uuie->m_h323_uu_pdu.HasOptionalField(H225_H323_UU_PDU::e_h4501SupplementaryService) ) {
@@ -10405,7 +10405,7 @@ MultiplexRTPListener::MultiplexRTPListener(WORD pt, WORD buffSize)
 	if (Toolkit::Instance()->IsPortNotificationActive())
 		Toolkit::Instance()->PortNotification(RTPPort, PortOpen, "udp", GNUGK_INADDR_ANY, pt);
 
-	// Set the IP Type Of Service field for prioritisation of media UDP / RTP packets
+	// Set the IP Type Of Service field for prioritization of media UDP / RTP packets
 	int dscp = GkConfig()->GetInteger(ProxySection, "RTPDiffServ", 4);	// default: IPTOS_LOWDELAY
 	if (dscp > 0) {
 		int rtpIpTypeofService = (dscp << 2);
@@ -10463,7 +10463,7 @@ void MultiplexRTPListener::ReceiveData()
 		multiplexID = ((int)wbuffer[0] * 16777216) + ((int)wbuffer[1] * 65536) + ((int)wbuffer[2] * 256) + (int)wbuffer[3];
 
 	if (multiplexID == INVALID_MULTIPLEX_ID) {
-		PTRACE(1, "RTPM\tInvalid multiplexID reveived - ignoring packet on port " << localPort << " from " << AsString(fromIP, fromPort));
+		PTRACE(1, "RTPM\tInvalid multiplexID received - ignoring packet on port " << localPort << " from " << AsString(fromIP, fromPort));
 		return;
 	}
 
@@ -11489,7 +11489,7 @@ bool UDPProxySocket::Bind(const Address & localAddr, WORD pt)
 #endif
 		return false;
 
-	// Set the IP Type Of Service field for prioritisation of media UDP / RTP packets
+	// Set the IP Type Of Service field for prioritization of media UDP / RTP packets
 	int dscp = GkConfig()->GetInteger(ProxySection, "RTPDiffServ", 4);	// default: IPTOS_LOWDELAY
 	if (dscp > 0) {
 		int rtpIpTypeofService = (dscp << 2);
@@ -13036,7 +13036,7 @@ bool RTPLogicalChannel::ProcessH235Media(BYTE * buffer, WORD & len, bool encrypt
 		if (payloadType == m_cipherPayloadType) {
 			processed = m_H235CryptoEngine->Decrypt(data, ivsequence, rtpPadding);
 		} else {
-			PTRACE(1, "H235\tUnexpected chipher payload type " << (int)payloadType << " expecting " << (int)m_cipherPayloadType);
+			PTRACE(1, "H235\tUnexpected cipher payload type " << (int)payloadType << " expecting " << (int)m_cipherPayloadType);
 			SNMP_TRAP(10, SNMPWarning, Authentication, "H.235.6 payload type mismatch");
 		}
 		payloadType = m_plainPayloadType;

ProxyChannel.h

@@ -300,7 +300,7 @@ class UDPProxySocket : public UDPSocket, public ProxySocket {
 #ifdef HAS_H235_MEDIA
 	bool m_haveShownPTWarning;	// flag to show the PayloadType warning only once (not for every RTP packet)
 #endif
-    bool m_ignoreSignaledIPs;   // ignore all RTP/RTCP IPs in signalling, do full auto-detect
+    bool m_ignoreSignaledIPs;   // ignore all RTP/RTCP IPs in signaling, do full auto-detect
     bool m_ignoreSignaledPrivateH239IPs;   // also ignore private IPs signaled in H239 streams
     list<NetworkAddress> m_keepSignaledIPs;   // don't do auto-detect on this network
     bool m_restrictRTPSources;

RasSrv.cxx

@@ -146,8 +146,8 @@ const char *RasName[] = {
 	"RIP",				// Request In Progress
 	"RAI",				// Resources Available Indicate
 	"RAC",				// Resources Available Confirm
-	"IACK",				// Information Request Acknowledgement
-	"INAK",				// Information Request Negative Acknowledgement
+	"IACK",				// Information Request Acknowledgment
+	"INAK",				// Information Request Negative Acknowledgment
 	"SCI",				// Service Control Indication
 	"SCR",				// Service Control Response
 	"NotRecognized"		// for new messages not recognized by the supported
@@ -860,7 +860,7 @@ void RasServer::SetRoutedMode(bool routedSignaling, bool routedH245)
 
 	const char *modemsg = GKRoutedSignaling ? "Routed" : "Direct";
 	const char *h245msg = GKRoutedH245 ? "Enabled" : "Disabled";
-	PTRACE(2, "GK\tUsing " << modemsg << " Signalling");
+	PTRACE(2, "GK\tUsing " << modemsg << " Signaling");
 	PTRACE(2, "GK\tH.245 Routed " << h245msg);
 	const char * h245tunnelingmsg = GkConfig()->GetBoolean("RoutedMode", "H245TunnelingTranslation", false) ? "Enabled" : "Disabled";
 	PTRACE(2, "GK\tH.245 tunneling translation " << h245tunnelingmsg);
@@ -2795,7 +2795,7 @@ bool RegistrationRequestPDU::Process()
 					natfs.Add(Std23_STUNAddr, H460_FeatureContent(stunaddr));
 				} else {
 					// If not NAT then provide the RAS address to the client to determine
-					// whether there is an ALG (or someother device) making things appear as they are not
+					// whether there is an ALG (or some other device) making things appear as they are not
 					natfs.Add(Std23_DetRASAddr, H460_FeatureContent(H323TransportAddress(request.m_rasAddress[0])));
 				}
 
@@ -3672,7 +3672,7 @@ bool AdmissionRequestPDU::Process()
 				 natoffloadsupport == CallRec::e_natRemoteProxy ||
 				 natoffloadsupport == CallRec::e_natAnnexB)) {
 					// Where the remote will handle the NAT Traversal
-					// the local gatekeeper may not receive any signalling so
+					// the local gatekeeper may not receive any signaling so
 					// set the call as connected.
 					if (!RasSrv->IsGKRouted())
 						pCallRec->SetConnected();
@@ -3962,7 +3962,7 @@ template<> bool RasPDU<H225_BandwidthRequest>::Process()
 			}
 		} else {
 			// the endpoint has requested to lower the bandwidth
-			// fow now we just agree, we could also reduce update the current total, per call and per endpoint usage
+			// for now we just agree, we could also reduce update the current total, per call and per endpoint usage
 		}
 	}
 	if (bReject) {
@@ -4218,11 +4218,11 @@ template<> bool RasPDU<H225_LocationRequest>::Process()
 					if (Toolkit::Instance()->IsTLSEnabled()) {
 						// enable TLS by config file
 						bool useTLS = RasSrv->GetNeighbors()->GetNeighborTLSBySigAdr(request.m_replyAddress);
-						// include H.460.22 if UseTLS configured for this neighbotr or if H.460.22 in LRQ
+						// include H.460.22 if UseTLS configured for this neighbor or if H.460.22 in LRQ
 						if (useTLS || senderSupportsH46022) {
 							// tell endpoint to use the TLS port
 							WORD tlsSignalPort = (WORD)GkConfig()->GetInteger(RoutedSec, "TLSCallSignalPort", GK_DEF_TLS_CALL_SIGNAL_PORT);
-							// force TLS signalling port if UseTLS switch was set
+							// force TLS signaling port if UseTLS switch was set
 							if (useTLS) {
 								SetH225Port(lcf.m_callSignalAddress, tlsSignalPort);
 							}
@@ -4574,7 +4574,7 @@ template<> bool RasPDU<H225_ServiceControlIndication>::Process()
 					if (incomingIndication.Decode(raw)) {
 						incomingCall = true;
 						H225_TransportAddress sigAddr = incomingIndication.m_callSignallingAddress;
-						PTRACE(2, "Incomming H.460.18 call from neighbor/parent sigAdr=" << AsDotString(sigAddr)
+						PTRACE(2, "Incoming H.460.18 call from neighbor/parent sigAdr=" << AsDotString(sigAddr)
 							<< " callID=" << AsString(incomingIndication.m_callID) << " TLS=" << useTLS);
 						CallSignalSocket * outgoingSocket = NULL;
 #ifdef HAS_TLS

RasTbl.h

@@ -834,7 +834,7 @@ class CallRec {
 	/** Set the NATStrategy */
 	void SetNATStrategy(NatStrategy strategy) { m_natstrategy = strategy; }
 
-	/** Can Signalling be offloaded
+	/** Can signaling be offloaded
 	  */
 	bool NATSignallingOffload(bool isAnswer) const;
 
@@ -847,12 +847,12 @@ class CallRec {
 	 */
 	PBoolean H46024AMessage();
 
-	/** GetSignallingSocket */
+	/** GetSignalingSocket */
 	CallSignalSocket * H46024ASignalSocket();
 #endif // HAS_H46024A
 
 #ifdef HAS_H46024B
-    /** GetSignallingSocket */
+    /** GetSignalingSocket */
     CallSignalSocket * H46024BSignalSocket(bool response);
 
 	/** Initiate Probe */
@@ -1134,7 +1134,7 @@ class CallRec {
 	}
 
 	/* Reset timeout
-       Used when switching from routed to direct mode to avoid signalling timeouts
+       Used when switching from routed to direct mode to avoid signaling timeouts
 	*/
 	void ResetTimeOut();
 
@@ -1175,7 +1175,7 @@ class CallRec {
 	time_t GetRingTime() const;
 
 	/** @return
-		A string that identifies uniquelly this call for accounting
+		A string that identifies uniquely this call for accounting
 		purposes. This string should be unique across subsequent GK
 		start/stop events.
 	*/

gksql.cxx

@@ -4,7 +4,7 @@
  * Generic interface to access SQL databases
  *
  * Copyright (c) 2004, Michal Zygmuntowicz
- * Copyright (c) 2006-2018, Jan Willamowius
+ * Copyright (c) 2006-2019, Jan Willamowius
  *
  * This work is published under the GNU Public License version 2 (GPLv2)
  * see file COPYING for details.
@@ -132,7 +132,7 @@ GkSQLConnection::~GkSQLConnection()
 	const PTime timeStart;
 
 	m_destroying = true;
-	// wakeup any waiting threads
+	// wake up any waiting threads
 	m_connectionAvailable.Signal();
 
 	// wait for still active connections (should not happen, but...)

gksql_odbc.cxx

@@ -3,7 +3,7 @@
  *
  * native ODBC / unixODBC driver module for GnuGk
  *
- * Copyright (c) 2008-2015, Jan Willamowius
+ * Copyright (c) 2008-2019, Jan Willamowius
  *
  * This work is published under the GNU Public License version 2 (GPLv2)
  * see file COPYING for details.
@@ -84,7 +84,7 @@ static SQLRETURN (SQL_API *g_SQLSetStmtAttr)(SQLHSTMT StatementHandle,
 PString GetODBCDiagMsg(SQLRETURN result, SQLSMALLINT handleType, SQLHANDLE handle)
 {
 	if (result == SQL_SUCCESS)
-		return "Sucesss";
+		return "Success";
 	if (result == SQL_INVALID_HANDLE)
 		return "Invalid ODBC handle passed";
 	if (result == SQL_NO_DATA)

h460presence.cxx

@@ -3,7 +3,7 @@
 // Presence in H.323 gatekeeper
 //
 // Copyright (c) 2009-2012, Simon Horne
-// Copyright (c) 2009-2018, Jan Willamowius
+// Copyright (c) 2009-2019, Jan Willamowius
 //
 // This work is published under the GNU Public License (GPL)
 // see file COPYING for details.
@@ -603,14 +603,14 @@ bool GkPresence::DatabaseLoad(PBoolean incremental)
 	GkSQLResult* result = m_sqlConn->ExecuteQuery(m_queryList,params, m_timeout);
 	if (result == NULL) {
 		PTRACE(2, "H460PSQL\tSubList failed - timeout or fatal error");
-		SNMP_TRAP(5, SNMPError, Database, "Presense SQL query failed");
+		SNMP_TRAP(5, SNMPError, Database, "Presence SQL query failed");
 		return false;
 	}
 
 	int fieldCount = 7;
 	if (result->GetNumRows() > 0 && result->GetNumFields() < fieldCount) {
 		PTRACE(2, "H460PSQL\tBad-formed query - insufficient columns found in the result set expect " << fieldCount);
-		SNMP_TRAP(5, SNMPError, Database, "Presense SQL query failed");
+		SNMP_TRAP(5, SNMPError, Database, "Presence SQL query failed");
 		delete result;
 		return false;
 	}
@@ -639,7 +639,7 @@ bool GkPresence::DatabaseLoad(PBoolean incremental)
 	while (result->FetchRow(retval)) {
 		if (retval[0].IsEmpty()) {
 			PTRACE(1, "H460PSQL\tQuery Invalid value found.");
-			SNMP_TRAP(5, SNMPError, Database, "Presense SQL query failed");
+			SNMP_TRAP(5, SNMPError, Database, "Presence SQL query failed");
 			continue;
 		}
 
@@ -970,7 +970,7 @@ void GkPresence::ProcessPresenceElement(const PASN_OctetString & pdu)
 
 	if (!ReceivedPDU(pdu)) {
 		PTRACE(4, "H460P\tError processing PDU");
-		SNMP_TRAP(9, SNMPError, Network, "Error decoding Presense PDU");
+		SNMP_TRAP(9, SNMPError, Network, "Error decoding Presence PDU");
 	}
 }
 
@@ -1696,7 +1696,7 @@ void GkPresence::OnNotification(MsgType tag, const H460P_PresenceNotification &
 			notification.m_subscribers.SetSize(1);
 			notification.m_subscribers[0] = notify.m_subscribers[i];
 			if (!HandleForwardPresence(notification.m_subscribers[0], msg)) {
-				PTRACE(4, "PRES\tUnknown Notification received " << notification.m_subscribers[0] << " from " << ip << " disgarding.");
+				PTRACE(4, "PRES\tUnknown Notification received " << notification.m_subscribers[0] << " from " << ip << " disregarding.");
 			}
 		}
 	}
@@ -1709,7 +1709,7 @@ void GkPresence::OnSubscription(MsgType tag,const H460P_PresenceSubscription & s
 		H460P_PresencePDU msg;
 		BuildSubscriptionMsg(subscription,msg);
 		if (!HandleForwardPresence(subscription.m_identifier, msg)) {
-			PTRACE(4, "PRES\tUnknown Subscription received " << subscription.m_identifier << " from " << ip << " disgarding.");
+			PTRACE(4, "PRES\tUnknown Subscription received " << subscription.m_identifier << " from " << ip << " disregarding.");
 			return;
 		}
 	}
@@ -1737,7 +1737,7 @@ void GkPresence::OnIdentifiers(MsgType tag, const H460P_PresenceIdentifier & ide
 		H460P_PresencePDU msg;
 		BuildIdentifierMsg(identifier,msg);
 		if (!HandleForwardPresence(identifier, msg)) {
-			PTRACE(4, "PRES\tUnknown Identifier received " << identifier << " from " << ip << " disgarding.");
+			PTRACE(4, "PRES\tUnknown Identifier received " << identifier << " from " << ip << " disregarding.");
 		}
 	}
 }