Date: Sun, 30 Jan 2000 02:50:02 -0800 (PST) From: Alexander Langer <alex@big.endian.de> To: freebsd-ports@FreeBSD.org Subject: Re: ports/16443: fix net/libsocket++ (bentofied) Message-ID: <200001301050.CAA71666@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/16443; it has been noted by GNATS.
From: Alexander Langer <alex@big.endian.de>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc:
Subject: Re: ports/16443: fix net/libsocket++ (bentofied)
Date: Sun, 30 Jan 2000 11:41:14 +0100
*sigh*
I didn't thought of -stable.
here are the new ones:
--- sockstream.C.old Sat Jan 29 16:47:41 2000
+++ sockstream.C Sun Jan 30 11:28:18 2000
@@ -43,6 +43,7 @@
#include <config.h>
#include <sockstream.h>
+#include <osreldate.h>
EXTERN_C_BEGIN
#include <sys/time.h>
@@ -275,8 +276,13 @@
{
int len = sa.size ();
int soc = -1;
+#if (__FreeBSD_version < 400000)
while ((soc = ::accept (rep->sock, sa.addr (), &len)) == -1
&& errno == EINTR)
+#else
+ while ((soc = ::accept (rep->sock, sa.addr (), (socklen_t *) &len)) == -1
+ && errno == EINTR)
+#endif
errno = 0;
if (soc == -1)
error ("sockbuf::accept");
@@ -321,8 +327,13 @@
int rval;
int sa_len = sa.size ();
+#if (__FreeBSD_version < 400000)
if ((rval = ::recvfrom (rep->sock, (char*) buf, len,
msgf, sa.addr (), &sa_len)) == -1)
+#else
+ if ((rval = ::recvfrom (rep->sock, (char*) buf, len,
+ msgf, sa.addr (), (socklen_t *) &sa_len)) == -1)
+#endif
error ("sockbuf::recvfrom");
return (rval==0) ? EOF: rval;
}
@@ -491,7 +502,11 @@
int sockbuf::getopt (option op, void* buf, int len, level l) const
{
int rlen = len;
+#if (__FreeBSD_version < 400000)
if (::getsockopt (rep->sock, l, op, (char*) buf, &rlen) == -1)
+#else
+ if (::getsockopt (rep->sock, l, op, (char*) buf, (socklen_t *) &rlen) == -1)
+#endif
perror ("sockbuf::getopt");
return rlen;
}
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
--- sockinet.C.old Sat Jan 29 16:57:13 2000
+++ sockinet.C Sun Jan 30 11:30:02 2000
@@ -10,6 +10,7 @@
#include <config.h>
#include <sockinet.h>
+#include <osreldate.h>
EXTERN_C_BEGIN
#include <netdb.h>
@@ -144,7 +145,11 @@
{
sockinetaddr sin;
int len = sin.size();
+#if (__FreeBSD_version < 400000)
if (::getsockname(rep->sock, sin.addr (), &len) == -1)
+#else
+ if (::getsockname(rep->sock, sin.addr (), (socklen_t *) &len) == -1)
+#endif
perror("sockinetbuf::localaddr()");
return sin;
}
@@ -168,7 +173,11 @@
{
sockinetaddr sin;
int len = sin.size();
+#if (__FreeBSD_version < 400000)
if (::getpeername(rep->sock, sin.addr (), &len) == -1)
+#else
+ if (::getpeername(rep->sock, sin.addr (), (socklen_t *) &len) == -1)
+#endif
perror("sockinetbuf::peeraddr()");
return sin;
}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001301050.CAA71666>