Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed several issues pointed out by Olivier "Methe" Milla. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20645 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-04-10 21:21:36 +00:00
parent 646dadb991
commit 6cde6beba7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/kits/network/libnetapi/NetEndpoint.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2006, Haiku, Inc. All Rights Reserved. * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@ -216,8 +216,8 @@ int
BNetEndpoint::SetOption(int32 option, int32 level, BNetEndpoint::SetOption(int32 option, int32 level,
const void* data, unsigned int length) const void* data, unsigned int length)
{ {
if (fSocket < 0) if (fInit < B_OK)
return B_ERROR; return fInit;
if (setsockopt(fSocket, level, option, data, length) < 0) { if (setsockopt(fSocket, level, option, data, length) < 0) {
fLastError = errno; fLastError = errno;
@ -297,6 +297,9 @@ BNetEndpoint::Close()
status_t status_t
BNetEndpoint::Bind(const BNetAddress& address) BNetEndpoint::Bind(const BNetAddress& address)
{ {
if (fInit < B_OK)
return fInit;
struct sockaddr_in addr; struct sockaddr_in addr;
status_t status = address.GetAddr(addr); status_t status = address.GetAddr(addr);
if (status != B_OK) if (status != B_OK)
@ -316,6 +319,7 @@ BNetEndpoint::Bind(const BNetAddress& address)
} }
if (addr.sin_addr.s_addr == 0) { if (addr.sin_addr.s_addr == 0) {
// TODO: does this still apply?
// Grrr, buggy getsockname! // Grrr, buggy getsockname!
char hostname[MAXHOSTNAMELEN]; char hostname[MAXHOSTNAMELEN];
gethostname(hostname, sizeof(hostname)); gethostname(hostname, sizeof(hostname));
@ -340,6 +344,9 @@ BNetEndpoint::Bind(int port)
status_t status_t
BNetEndpoint::Connect(const BNetAddress& address) BNetEndpoint::Connect(const BNetAddress& address)
{ {
if (fInit < B_OK)
return fInit;
sockaddr_in addr; sockaddr_in addr;
if (address.GetAddr(addr) != B_OK) if (address.GetAddr(addr) != B_OK)
return B_ERROR; return B_ERROR;
@ -353,6 +360,7 @@ BNetEndpoint::Connect(const BNetAddress& address)
socklen_t addrSize = sizeof(addr); socklen_t addrSize = sizeof(addr);
if (getpeername(fSocket, (sockaddr *) &addr, &addrSize) < 0) { if (getpeername(fSocket, (sockaddr *) &addr, &addrSize) < 0) {
Close(); Close();
fLastError = errno;
return B_ERROR; return B_ERROR;
} }
@ -372,6 +380,9 @@ BNetEndpoint::Connect(const char *hostname, int port)
status_t status_t
BNetEndpoint::Listen(int backlog) BNetEndpoint::Listen(int backlog)
{ {
if (fInit < B_OK)
return fInit;
if (listen(fSocket, backlog) < 0) { if (listen(fSocket, backlog) < 0) {
Close(); Close();
fLastError = errno; fLastError = errno;
@ -408,8 +419,8 @@ BNetEndpoint::Accept(int32 timeout)
endpoint->fPeer.SetTo(addr); endpoint->fPeer.SetTo(addr);
if (getsockname(socket, (struct sockaddr *)&addr, &addrSize) < 0) { if (getsockname(socket, (struct sockaddr *)&addr, &addrSize) < 0) {
endpoint->Close();
delete endpoint; delete endpoint;
fLastError = errno;
return NULL; return NULL;
} }