X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=c426f16e696ea8bdc7b163e228ae05168045b14c;hb=7c340cba11b16d3c4a95c274c22f1617ac4711f2;hp=3b0c639315d1b9b95e9ee189d825be70c6c9abdf;hpb=248a14477c435ef28b71df42080ec931b1003e3f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 3b0c63931..c426f16e6 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -61,7 +61,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 #endif
 		}
 	}
-	ret = SE->Bind(sockfd, &servaddr.sa, sizeof(servaddr));
+	ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
 
 	if (ret < 0)
 	{
@@ -117,11 +117,11 @@ int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 	}
 	else
 	{
-		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 		/* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
 		linger.l_onoff = 1;
 		linger.l_linger = 1;
-		setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
+		setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
 		return (sockfd);
 	}
 }
@@ -211,7 +211,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 	return bound;
 }
 
-int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
 {
 	memset(sa, 0, sizeof(*sa));
 	if (!addr || !*addr)
@@ -240,7 +240,7 @@ int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa
 	return false;
 }
 
-int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+bool irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
 	char addrv[INET6_ADDRSTRLEN+1];
 	if (sa->sa.sa_family == AF_INET)
 	{