- Update to 8.1

PR:		229655
Submitted by:	kevinz5000@gmail.com(maintainer)
This commit is contained in:
Wen Heping 2018-07-13 07:01:09 +00:00
parent ba0451ba80
commit ad56690396
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=474556
4 changed files with 4 additions and 65 deletions

View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= openclonk
DISTVERSION= 8.0
DISTVERSION= 8.1
DISTVERSIONSUFFIX= -src
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.openclonk.org/builds/release/${DISTVERSION}/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1517953047
SHA256 (openclonk-8.0-src.tar.bz2) = 6fc88e8c9bb0ca7eb3e3c8f60af80f77bd6d8f23632bb03f4f5e6ac4e97ae354
SIZE (openclonk-8.0-src.tar.bz2) = 121422616
TIMESTAMP = 1531177508
SHA256 (openclonk-8.1-src.tar.bz2) = 337677f25457e7137eac7818adb4ad02992d562593386c19b885738aaec4b346
SIZE (openclonk-8.1-src.tar.bz2) = 120149164

View File

@ -1,50 +0,0 @@
--- src/network/C4NetIO.cpp.orig 2018-02-04 15:39:08 UTC
+++ src/network/C4NetIO.cpp
@@ -523,6 +523,11 @@ C4NetIO::HostAddress::AddressFamily C4Ne
gen.sa_family == AF_INET6 ? IPv6 : UnknownFamily;
}
+size_t C4NetIO::HostAddress::GetAddrLen() const
+{
+ return GetFamily() == IPv4 ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
+}
+
void C4NetIO::EndpointAddress::SetPort(uint16_t port)
{
switch (gen.sa_family)
@@ -1195,7 +1200,7 @@ bool C4NetIOTCP::Connect(const C4NetIO::
#endif
// connect (async)
- if (::connect(nsock, &addr, sizeof addr) == SOCKET_ERROR)
+ if (::connect(nsock, &addr, addr.GetAddrLen()) == SOCKET_ERROR)
{
if (!HaveWouldBlockError()) // expected
{
@@ -1368,7 +1373,7 @@ C4NetIOTCP::Peer *C4NetIOTCP::Accept(SOC
addr_t caddr = ConnectAddr;
// accept incoming connection?
- C4NetIO::addr_t addr; socklen_t iAddrSize = sizeof addr;
+ C4NetIO::addr_t addr; socklen_t iAddrSize = addr.GetAddrLen();
if (nsock == INVALID_SOCKET)
{
// accept from listener
@@ -1497,7 +1502,7 @@ bool C4NetIOTCP::Listen(uint16_t inListe
// bind listen socket
addr_t addr = addr_t::Any;
addr.SetPort(inListenPort);
- if (::bind(lsock, &addr, sizeof(addr)) == SOCKET_ERROR)
+ if (::bind(lsock, &addr, addr.GetAddrLen()) == SOCKET_ERROR)
{
SetError("socket bind failed", true);
closesocket(lsock); lsock = INVALID_SOCKET;
@@ -2122,7 +2127,7 @@ bool C4NetIOSimpleUDP::Send(const C4NetI
// send it
C4NetIO::addr_t addr = rPacket.getAddr();
if (::sendto(sock, getBufPtr<char>(rPacket), rPacket.getSize(), 0,
- &addr, sizeof(addr))
+ &addr, addr.GetAddrLen())
!= int(rPacket.getSize()) &&
!HaveWouldBlockError())
{

View File

@ -1,10 +0,0 @@
--- src/network/C4NetIO.h.orig 2018-02-04 15:39:08 UTC
+++ src/network/C4NetIO.h
@@ -94,6 +94,7 @@ public:
HostAddress(const sockaddr *addr) { SetHost(addr); }
AddressFamily GetFamily() const;
+ size_t GetAddrLen() const;
void SetScopeId(int scopeId);
int GetScopeId() const;