diff -r eac7427958e9 -r 909e9eb2124e src/node/socket.h --- a/src/node/socket.h Tue Jul 31 11:42:25 2007 +0200 +++ b/src/node/socket.h Wed Aug 01 08:58:18 2007 +0200 @@ -52,7 +52,9 @@ ERROR_AGAIN, ERROR_SHUTDOWN, ERROR_OPNOTSUPP, + ERROR_AFNOSUPPORT, ERROR_INVAL, + ERROR_BADF, SOCKET_ERRNO_LAST }; @@ -92,7 +94,7 @@ * After the Close call, the socket is no longer valid, and cannot * safely be used for subsequent operations. */ - void Close(Callback > closeCompleted = MakeCallback (&Socket::DummyCallbackVoidSocket)); + int Close(Callback > closeCompleted = MakeCallback (&Socket::DummyCallbackVoidSocket)); /** * \returns zero on success, -1 on failure. @@ -122,10 +124,10 @@ * \param halfClose XXX When exactly is this callback invoked ? If it invoked when the * other side closes the connection ? Or when I call Close ? */ - void Connect(const Address &address, - Callback > connectionSucceeded = MakeCallback(&Socket::DummyCallbackVoidSocket), - Callback > connectionFailed = MakeCallback(&Socket::DummyCallbackVoidSocket), - Callback > halfClose = MakeCallback(&Socket::DummyCallbackVoidSocket)); + int Connect(const Address &address, + Callback > connectionSucceeded = MakeCallback(&Socket::DummyCallbackVoidSocket), + Callback > connectionFailed = MakeCallback(&Socket::DummyCallbackVoidSocket), + Callback > halfClose = MakeCallback(&Socket::DummyCallbackVoidSocket)); /** * \brief Accept connection requests from remote hosts @@ -201,11 +203,11 @@ MakeCallback (&Socket::DummyCallbackVoidSocketUi32Address)); private: - virtual void DoClose(Callback > closeCompleted) = 0; - virtual void DoConnect(const Address & address, - Callback > connectionSucceeded, - Callback > connectionFailed, - Callback > halfClose) = 0; + virtual int DoClose(Callback > closeCompleted) = 0; + virtual int DoConnect(const Address & address, + Callback > connectionSucceeded, + Callback > connectionFailed, + Callback > halfClose) = 0; virtual int DoAccept(Callback, const Address&> connectionRequest, Callback, const Address&> newConnectionCreated, Callback > closeRequested) = 0;