diff options
| author | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-23 01:38:31 +0000 |
|---|---|---|
| committer | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-23 01:38:31 +0000 |
| commit | f600fa3fb809296709de29deadf468a11daad561 (patch) | |
| tree | 1ff853f8f58898b54d30065be8b294cce97ba655 /libjava/gnu/java/net | |
| parent | 168dbf42fb8c8497867394fb24c90608e1e26721 (diff) | |
| download | ppe42-gcc-f600fa3fb809296709de29deadf468a11daad561.tar.gz ppe42-gcc-f600fa3fb809296709de29deadf468a11daad561.zip | |
* gnu/java/net/natPlainDatagramSocketImplWin32.cc
(peekData): Use offset and maximal free space in datagram packet.
(receive): Likewise.
(send): Use offset in datagram packet.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73848 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/net')
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc index 4a4ec986c61..15105b963cb 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc @@ -202,7 +202,8 @@ gnu::java::net::PlainDatagramSocketImpl::peekData(::java::net::DatagramPacket *p // FIXME: Deal with Multicast and if the socket is connected. union SockAddr u; socklen_t addrlen = sizeof(u); - jbyte *dbytes = elements (p->getData()); + jbyte *dbytes = elements (p->getData()) + p->getOffset(); + jint maxlen = p->getData()->length - p->getOffset(); ssize_t retlen = 0; if (timeout > 0) @@ -214,7 +215,7 @@ gnu::java::net::PlainDatagramSocketImpl::peekData(::java::net::DatagramPacket *p } retlen = - ::recvfrom (native_fd, (char *) dbytes, p->getLength(), MSG_PEEK, (sockaddr*) &u, + ::recvfrom (native_fd, (char *) dbytes, maxlen, MSG_PEEK, (sockaddr*) &u, &addrlen); if (retlen == SOCKET_ERROR) goto error; @@ -280,7 +281,7 @@ gnu::java::net::PlainDatagramSocketImpl::send (::java::net::DatagramPacket *p) jbyte *bytes = elements (haddress); int len = haddress->length; struct sockaddr *ptr = (struct sockaddr *) &u.address; - jbyte *dbytes = elements (p->getData()); + jbyte *dbytes = elements (p->getData()) + p->getOffset(); if (len == 4) { u.address.sin_family = AF_INET; @@ -316,7 +317,8 @@ gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *p // FIXME: Deal with Multicast and if the socket is connected. union SockAddr u; socklen_t addrlen = sizeof(u); - jbyte *dbytes = elements (p->getData()); + jbyte *dbytes = elements (p->getData()) + p->getOffset(); + jint maxlen = p->getData()->length - p->getOffset(); ssize_t retlen = 0; if (timeout > 0) @@ -331,7 +333,7 @@ gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *p } retlen = - ::recvfrom (native_fd, (char *) dbytes, p->getLength(), 0, (sockaddr*) &u, + ::recvfrom (native_fd, (char *) dbytes, maxlen, 0, (sockaddr*) &u, &addrlen); if (retlen < 0) goto error; |
