Fix network ports datatype (unsigned int -> unsigned short). UDPSocket: fix old bug using m_port instead of m_port[x].

This commit is contained in:
Daniel Caujolle-Bert 2021-04-25 07:51:51 +02:00
parent c9660478c5
commit fc76b0f4ab
No known key found for this signature in database
GPG key ID: 51AED7171EC00614
39 changed files with 174 additions and 166 deletions

View file

@ -76,25 +76,25 @@ static bool refComparison(const CYSFReflector* r1, const CYSFReflector* r2)
return false;
}
void CYSFReflectors::setParrot(const std::string& address, unsigned int port)
void CYSFReflectors::setParrot(const std::string& address, unsigned short port)
{
m_parrotAddress = address;
m_parrotPort = port;
}
void CYSFReflectors::setYSF2DMR(const std::string& address, unsigned int port)
void CYSFReflectors::setYSF2DMR(const std::string& address, unsigned short port)
{
m_YSF2DMRAddress = address;
m_YSF2DMRPort = port;
}
void CYSFReflectors::setYSF2NXDN(const std::string& address, unsigned int port)
void CYSFReflectors::setYSF2NXDN(const std::string& address, unsigned short port)
{
m_YSF2NXDNAddress = address;
m_YSF2NXDNPort = port;
}
void CYSFReflectors::setYSF2P25(const std::string& address, unsigned int port)
void CYSFReflectors::setYSF2P25(const std::string& address, unsigned short port)
{
m_YSF2P25Address = address;
m_YSF2P25Port = port;
@ -128,7 +128,7 @@ bool CYSFReflectors::load()
if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL && p5 != NULL && p6 != NULL) {
std::string host = std::string(p4);
unsigned int port = (unsigned int)::atoi(p5);
unsigned short port = (unsigned short)::atoi(p5);
sockaddr_storage addr;
unsigned int addrLen;