#35 Use AmbeData sock_addr_storage

F4FXL · Dec 2, 2023 · 4227151 · 4227151
1 parent 4bd7345
commit 4227151
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Common/CCSProtocolHandler.cpp b/Common/CCSProtocolHandler.cpp
@@ -62,7 +62,7 @@ bool CCCSProtocolHandler::writeData(const CAMBEData& data)
 	CUtils::dump("Sending Data", buffer, length);
 #endif
 
-	return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
+	return m_socket.write(buffer, length, data.getYourAddressAndPort()); //data.getYourAddress(), data.getYourPort());
 }
 
 bool CCCSProtocolHandler::writePoll(const CPollData& poll)

diff --git a/Common/DCSProtocolHandler.cpp b/Common/DCSProtocolHandler.cpp
@@ -61,7 +61,7 @@ bool CDCSProtocolHandler::writeData(const CAMBEData& data)
 	CUtils::dump("Sending Data", buffer, length);
 #endif
 
-	return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
+	return m_socket.write(buffer, length, data.getYourAddressAndPort());
 }
 
 bool CDCSProtocolHandler::writePoll(const CPollData& poll)

diff --git a/Common/DPlusProtocolHandler.cpp b/Common/DPlusProtocolHandler.cpp
@@ -80,7 +80,7 @@ bool CDPlusProtocolHandler::writeAMBE(const CAMBEData& data)
 	CUtils::dump("Sending Data", buffer, length);
 #endif
 
-	return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
+	return m_socket.write(buffer, length, data.getYourAddressAndPort());
 }
 
 bool CDPlusProtocolHandler::writePoll(const CPollData& poll)

diff --git a/Common/HBRepeaterProtocolHandler.cpp b/Common/HBRepeaterProtocolHandler.cpp
@@ -73,7 +73,7 @@ bool CHBRepeaterProtocolHandler::writeAMBE(CAMBEData& data)
 	CUtils::dump("Sending Data", buffer, length);
 	return true;
 #else
-	return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
+	return m_socket.write(buffer, length, data.getYourAddressAndPort());
 #endif
 }
 

diff --git a/DGWTextTransmit/TextTransmit.cpp b/DGWTextTransmit/TextTransmit.cpp
@@ -202,5 +202,5 @@ bool CTextTransmit::sendData(const CAMBEData& data)
 	unsigned char buffer[40U];
 	unsigned int length = data.getG2Data(buffer, 40U);
 
-	return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
+return m_socket.write(buffer, length, data.getYourAddressAndPort());
 }
diff --git a/DGWTimeServer/TimeServerThread.cpp b/DGWTimeServer/TimeServerThread.cpp
@@ -1248,6 +1248,6 @@ bool CTimeServerThread::sendData(CUDPReaderWriter& socket, const CAMBEData& data
 	CUtils::dump(("Sending Data"), buffer, length);
 	return true;
 #else
-	return socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
+	return socket.write(buffer, length, data.getYourAddressAndPort());
 #endif
 }
diff --git a/DGWVoiceTransmit/VoiceTransmit.cpp b/DGWVoiceTransmit/VoiceTransmit.cpp
@@ -228,5 +228,5 @@ bool CVoiceTransmit::sendData(CAMBEData* data)
 	unsigned char buffer[40U];
 	unsigned int length = data->getG2Data(buffer, 40U);
 
-	return m_socket.write(buffer, length, data->getYourAddress(), data->getYourPort());
+	return m_socket.write(buffer, length, data->getYourAddressAndPort());
 }