From c1fa7c07c66a16e1c0038301d160b70326765915 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <timfelgentreff@gmail.com>
Date: Tue, 15 Dec 2020 20:27:49 +0100
Subject: [PATCH] NetSocketAddr doesn't need a socket, so don't accept it
---
src/include/net_lowlevel.h | 4 ++--
src/network/net_lowlevel.cpp | 6 +++---
src/network/netsockets.cpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/include/net_lowlevel.h b/src/include/net_lowlevel.h
index 42611a323..9c1a9b377 100644
--- a/src/include/net_lowlevel.h
+++ b/src/include/net_lowlevel.h
@@ -112,8 +112,8 @@ extern void NetExit();
/// Resolve host in name or or colon dot notation.
extern unsigned long NetResolveHost(const std::string &host);
-/// Get local IP from network file descriptor
-extern int NetSocketAddr(const Socket sock, unsigned long *ips, int maxAddr);
+/// Get local IPs
+extern int NetSocketAddr(unsigned long *ips, int maxAddr);
/// Open a UDP Socket port. (param in network format)
extern Socket NetOpenUDP(unsigned long ip, int port);
diff --git a/src/network/net_lowlevel.cpp b/src/network/net_lowlevel.cpp
index fdfc64c80..976b72b67 100644
--- a/src/network/net_lowlevel.cpp
+++ b/src/network/net_lowlevel.cpp
@@ -219,7 +219,7 @@ unsigned long NetResolveHost(const std::string &host)
#ifndef MIB_IF_TYPE_IEEE80211
#define MIB_IF_TYPE_IEEE80211 71
#endif
-int NetSocketAddr(const Socket sock, unsigned long *ips, int maxAddr)
+int NetSocketAddr(unsigned long *ips, int maxAddr)
{
int idx = 0;
PIP_ADAPTER_ADDRESSES pAddresses = NULL;
@@ -245,7 +245,7 @@ int NetSocketAddr(const Socket sock, unsigned long *ips, int maxAddr)
return idx;
}
#elif defined(USE_LINUX) || defined(USE_MAC)
-int NetSocketAddr(const Socket sock, unsigned long *ips, int maxAddr)
+int NetSocketAddr(unsigned long *ips, int maxAddr)
{
struct ifaddrs *ifAddrStruct = NULL;
struct ifaddrs *ifa = NULL;
@@ -268,7 +268,7 @@ int NetSocketAddr(const Socket sock, unsigned long *ips, int maxAddr)
}
#else // } {
// more??
-int NetSocketAddr(const Socket sock, unsigned long *ips, int maxAddr)
+int NetSocketAddr(unsigned long *ips, int maxAddr)
{
ips[0] = htonl(0x7f000001);
return 1;
diff --git a/src/network/netsockets.cpp b/src/network/netsockets.cpp
index 265147bf5..b3ae4c916 100644
--- a/src/network/netsockets.cpp
+++ b/src/network/netsockets.cpp
@@ -85,7 +85,7 @@ public:
void SetNonBlocking() { NetSetNonBlocking(socket); }
int HasDataToRead(int timeout) { return NetSocketReady(socket, timeout); }
bool IsValid() const { return socket != Socket(-1); }
- int GetSocketAddresses(unsigned long *ips, int maxAddr) { return NetSocketAddr(socket, ips, maxAddr); }
+ int GetSocketAddresses(unsigned long *ips, int maxAddr) { return NetSocketAddr(ips, maxAddr); }
private:
Socket socket;
};