Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/devdoc/socket_transport_linux_requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ MOCKABLE_FUNCTION(, void, socket_transport_disconnect, SOCKET_TRANSPORT_HANDLE,

**SRS_SOCKET_TRANSPORT_LINUX_11_025: [** `socket_transport_disconnect` shall call `shutdown` to stop both the transmit and reception of the connected socket. **]**

**SRS_SOCKET_TRANSPORT_LINUX_11_026: [** If `shutdown` does not return 0, the socket is not valid therefore `socket_transport_disconnect` shall not call 'close' **]**
**SRS_SOCKET_TRANSPORT_LINUX_11_026: [** If `shutdown` does not return 0, `socket_transport_disconnect` shall log the error. **]**

**SRS_SOCKET_TRANSPORT_LINUX_11_023: [** `socket_transport_disconnect` shall call `close` to disconnect the connected socket. **]**

Expand Down
12 changes: 5 additions & 7 deletions linux/src/socket_transport_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,16 +340,14 @@ void socket_transport_disconnect(SOCKET_TRANSPORT_HANDLE socket_transport)
// Codes_SRS_SOCKET_TRANSPORT_LINUX_11_025: [ socket_transport_disconnect shall call shutdown to stop both the transmit and reception of the connected socket. ]
if (shutdown(socket_transport->socket, 2) != 0)
{
// Codes_SRS_SOCKET_TRANSPORT_LINUX_11_026: [ If shutdown does not return 0, the socket is not valid therefore socket_transport_disconnect shall not call 'close' ]
// Codes_SRS_SOCKET_TRANSPORT_LINUX_11_026: [ If shutdown does not return 0, socket_transport_disconnect shall log the error. ]
LogErrorNo("shutdown failed on socket: %" PRI_SOCKET "", socket_transport->socket);
}
else

// Codes_SRS_SOCKET_TRANSPORT_LINUX_11_023: [ socket_transport_disconnect shall call close to disconnect the connected socket. ]
if (close(socket_transport->socket) != 0)
{
// Codes_SRS_SOCKET_TRANSPORT_LINUX_11_023: [ socket_transport_disconnect shall call close to disconnect the connected socket. ]
if (close(socket_transport->socket) != 0)
{
LogErrorNo("Close failure on socket: %" PRI_SOCKET "", socket_transport->socket);
}
LogErrorNo("Close failure on socket: %" PRI_SOCKET "", socket_transport->socket);
}
// Codes_SRS_SOCKET_TRANSPORT_LINUX_11_024: [ socket_transport_disconnect shall call sm_close_end. ]
sm_close_end(socket_transport->sm);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ TEST_FUNCTION(socket_transport_disconnect_close_fail_succeed)
socket_transport_destroy(socket_handle);
}

/*Tests_SRS_SOCKET_TRANSPORT_LINUX_11_026: [ If shutdown does not return 0, the socket is not valid therefore socket_transport_disconnect shall not call 'close' ]*/
/*Tests_SRS_SOCKET_TRANSPORT_LINUX_11_026: [ If shutdown does not return 0, socket_transport_disconnect shall log the error. ]*/
TEST_FUNCTION(socket_transport_disconnect_shutdown_fail_succeed)
{
//arrange
Expand All @@ -529,6 +529,8 @@ TEST_FUNCTION(socket_transport_disconnect_shutdown_fail_succeed)
STRICT_EXPECTED_CALL(sm_close_begin(IGNORED_ARG));
STRICT_EXPECTED_CALL(shutdown(IGNORED_ARG, 2))
.SetReturn(MU_FAILURE);
STRICT_EXPECTED_CALL(close(IGNORED_ARG))
.SetReturn(0);
STRICT_EXPECTED_CALL(sm_close_end(IGNORED_ARG));

//act
Expand Down
2 changes: 1 addition & 1 deletion win32/devdoc/socket_transport_win32_requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ MOCKABLE_FUNCTION(, void, socket_transport_disconnect, SOCKET_TRANSPORT_HANDLE,

**SRS_SOCKET_TRANSPORT_WIN32_09_029: [** If `sm_close_begin` does not return `SM_EXEC_GRANTED`, `socket_transport_disconnect` shall fail and return. **]**

**SRS_SOCKET_TRANSPORT_WIN32_09_083: [** If `shutdown` does not return 0 on a socket that is not a binding socket, the socket is not valid therefore `socket_transport_disconnect` shall not call `close` **]**
**SRS_SOCKET_TRANSPORT_WIN32_09_083: [** If the type is not `SOCKET_BINDING`, `socket_transport_disconnect` shall call `shutdown`. **]**

**SRS_SOCKET_TRANSPORT_WIN32_09_030: [** `socket_transport_disconnect` shall call `closesocket` to disconnect the connected socket. **]**

Expand Down
19 changes: 10 additions & 9 deletions win32/src/socket_transport_win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,19 +382,20 @@ void socket_transport_disconnect(SOCKET_TRANSPORT_HANDLE socket_transport)
SM_RESULT close_result = sm_close_begin(socket_transport->sm);
if (close_result == SM_EXEC_GRANTED)
{
// Codes_SRS_SOCKET_TRANSPORT_WIN32_09_083: [ If shutdown does not return 0 on a socket that is not a binding socket, the socket is not valid therefore socket_transport_disconnect shall not call close ]
if (socket_transport->type != SOCKET_BINDING && shutdown(socket_transport->socket, SD_BOTH) != 0)
// Codes_SRS_SOCKET_TRANSPORT_WIN32_09_083: [ If the type is not SOCKET_BINDING, socket_transport_disconnect shall call shutdown. ]
if (socket_transport->type != SOCKET_BINDING)
{
LogLastError("shutdown failed on socket: %" PRI_SOCKET "", socket_transport->socket);
}
else
{
// Codes_SRS_SOCKET_TRANSPORT_WIN32_09_030: [ socket_transport_disconnect shall call closesocket to disconnect the connected socket. ]
if (closesocket(socket_transport->socket) != 0)
if (shutdown(socket_transport->socket, SD_BOTH) != 0)
{
LogLastError("Failure in closesocket %" PRI_SOCKET "", socket_transport->socket);
LogLastError("shutdown failed on socket: %" PRI_SOCKET "", socket_transport->socket);
}
}

// Codes_SRS_SOCKET_TRANSPORT_WIN32_09_030: [ socket_transport_disconnect shall call closesocket to disconnect the connected socket. ]
if (closesocket(socket_transport->socket) != 0)
{
LogLastError("Failure in closesocket %" PRI_SOCKET "", socket_transport->socket);
}
// Codes_SRS_SOCKET_TRANSPORT_WIN32_09_031: [ socket_transport_disconnect shall call sm_close_end. ]
sm_close_end(socket_transport->sm);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ TEST_FUNCTION(socket_transport_disconnect_invalid_arguments)

}

/*Tests_SRS_SOCKET_TRANSPORT_WIN32_09_083: [ If shutdown does not return 0 on a socket that is not a binding socket, the socket is not valid therefore socket_transport_disconnect shall not call close]*/
/*Tests_SRS_SOCKET_TRANSPORT_WIN32_09_083: [ If the type is not SOCKET_BINDING, socket_transport_disconnect shall call shutdown. ]*/
TEST_FUNCTION(socket_transport_disconnect_shutdown_fail)
{
//arrange
Expand All @@ -692,6 +692,8 @@ TEST_FUNCTION(socket_transport_disconnect_shutdown_fail)
STRICT_EXPECTED_CALL(sm_close_begin(IGNORED_ARG));
STRICT_EXPECTED_CALL(shutdown(IGNORED_ARG, 2))
.SetReturn(MU_FAILURE);
STRICT_EXPECTED_CALL(closesocket(IGNORED_ARG))
.SetReturn(0);
STRICT_EXPECTED_CALL(sm_close_end(IGNORED_ARG));

//act
Expand Down Expand Up @@ -736,7 +738,7 @@ TEST_FUNCTION(socket_transport_disconnect_failure_closesocket)
socket_transport_destroy(socket_handle);
}

/*Tests_SRS_SOCKET_TRANSPORT_WIN32_09_083: [ If shutdown does not return 0 on a socket that is not a binding socket, the socket is not valid therefore socket_transport_disconnect shall not call close ]*/
/*Tests_SRS_SOCKET_TRANSPORT_WIN32_09_083: [ If the type is not SOCKET_BINDING, socket_transport_disconnect shall call shutdown. ]*/
TEST_FUNCTION(socket_transport_disconnect_binding_socket_closesocket)
{
//arrange
Expand Down