This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: receiveing UDP packets
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Cc: tromey at redhat dot com
- Date: Fri, 7 May 2004 15:15:17 +0200
- Subject: Patch: receiveing UDP packets
Hi list,
I write the attached patch to fix the last failure related to UDP packet
handling in our Mauve testsuite.
Ok to commit to trunk ?
This should probably go into 3.4 too ?
Regards
Michael
2004-05-07 Michael Koch <konqueror@gmx.de>
* gnu/java/net/natPlainDatagramSocketImplPosix.cc
(peekData): Fix maximal length of data to receive.
(receive): Likewise.
* gnu/java/net/natPlainDatagramSocketImplWin32.cc
(peekData): Likewise.
(receive): Likewise.
Index: gnu/java/net/natPlainDatagramSocketImplPosix.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc,v
retrieving revision 1.7
diff -u -r1.7 natPlainDatagramSocketImplPosix.cc
--- gnu/java/net/natPlainDatagramSocketImplPosix.cc 17 Mar 2004 08:10:28 -0000 1.7
+++ gnu/java/net/natPlainDatagramSocketImplPosix.cc 7 May 2004 13:12:17 -0000
@@ -210,7 +210,6 @@
union SockAddr u;
socklen_t addrlen = sizeof(u);
jbyte *dbytes = elements (p->getData()) + p->getOffset();
- jint maxlen = p->maxlen - p->getOffset();
ssize_t retlen = 0;
// Do timeouts via select since SO_RCVTIMEO is not always available.
@@ -231,7 +230,7 @@
}
retlen =
- ::recvfrom (native_fd, (char *) dbytes, maxlen, MSG_PEEK, (sockaddr*) &u,
+ ::recvfrom (native_fd, (char *) dbytes, p->maxlen, MSG_PEEK, (sockaddr*) &u,
&addrlen);
if (retlen < 0)
goto error;
@@ -335,7 +334,6 @@
union SockAddr u;
socklen_t addrlen = sizeof(u);
jbyte *dbytes = elements (p->getData()) + p->getOffset();
- jint maxlen = p->maxlen - p->getOffset();
ssize_t retlen = 0;
// Do timeouts via select since SO_RCVTIMEO is not always available.
@@ -356,7 +354,7 @@
}
retlen =
- ::recvfrom (native_fd, (char *) dbytes, maxlen, 0, (sockaddr*) &u,
+ ::recvfrom (native_fd, (char *) dbytes, p->maxlen, 0, (sockaddr*) &u,
&addrlen);
if (retlen < 0)
goto error;
Index: gnu/java/net/natPlainDatagramSocketImplWin32.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc,v
retrieving revision 1.8
diff -u -r1.8 natPlainDatagramSocketImplWin32.cc
--- gnu/java/net/natPlainDatagramSocketImplWin32.cc 17 Mar 2004 08:10:28 -0000 1.8
+++ gnu/java/net/natPlainDatagramSocketImplWin32.cc 7 May 2004 13:12:17 -0000
@@ -202,7 +202,6 @@
union SockAddr u;
socklen_t addrlen = sizeof(u);
jbyte *dbytes = elements (p->getData()) + p->getOffset();
- jint maxlen = p->maxlen - p->getOffset();
ssize_t retlen = 0;
if (timeout > 0)
@@ -214,7 +213,7 @@
}
retlen =
- ::recvfrom (native_fd, (char *) dbytes, maxlen, MSG_PEEK, (sockaddr*) &u,
+ ::recvfrom (native_fd, (char *) dbytes, p->maxlen, MSG_PEEK, (sockaddr*) &u,
&addrlen);
if (retlen == SOCKET_ERROR)
goto error;
@@ -321,7 +320,6 @@
union SockAddr u;
socklen_t addrlen = sizeof(u);
jbyte *dbytes = elements (p->getData()) + p->getOffset();
- jint maxlen = p->maxlen - p->getOffset();
ssize_t retlen = 0;
if (timeout > 0)
@@ -336,7 +334,7 @@
}
retlen =
- ::recvfrom (native_fd, (char *) dbytes, maxlen, 0, (sockaddr*) &u,
+ ::recvfrom (native_fd, (char *) dbytes, p->maxlen, 0, (sockaddr*) &u,
&addrlen);
if (retlen < 0)
goto error;