backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

DirectPlay: Improve SP_Reply() diagnostics

Browse Source
This commit is contained in:
Daniel Collins 2015-08-21 22:17:59 +01:00
parent 384542defe
commit 59a9f090d5
1 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/directplay.c
View File

@ -240,23 +240,68 @@ static HRESULT WINAPI IPX_Reply(LPDPSP_REPLYDATA data) {
struct sp_data *sp_data = get_sp_data(data->lpISP); struct sp_data *sp_data = get_sp_data(data->lpISP);
if(sp_data->ns_id != data->idNameServer) { /* Stash the address of the name server if the name server ID has
* changed.
*
* TODO: Store the ID and resolve the address at each xmit, probably
* more reliable than assuming the address is known at this point.
*/
if(sp_data->ns_id != data->idNameServer)
{
log_printf(LOG_DEBUG, "IPX_Reply: Name server update (%u -> %u)",
(unsigned int)(sp_data->ns_id), (unsigned int)(data->idNameServer));
struct sockaddr_ipx *addr_p; struct sockaddr_ipx *addr_p;
DWORD size; DWORD size;
HRESULT r = IDirectPlaySP_GetSPPlayerData(data->lpISP, data->idNameServer, (void**)&addr_p, &size, 0); HRESULT r = IDirectPlaySP_GetSPPlayerData(data->lpISP, data->idNameServer, (void**)&addr_p, &size, 0);
if(r != DP_OK) { if(r != DP_OK)
log_printf(LOG_ERROR, "GetSPPlayerData: %d", (int)r); {
}else if(addr_p) { log_printf(LOG_DEBUG, "IPX_Reply: GetSPPlayerData: %x", (unsigned int)(r));
}
else if(addr_p == NULL)
{
log_printf(LOG_DEBUG, "IPX_Reply: Cannot update name server, no shared data");
}
else if(size != sizeof(struct sockaddr_ipx))
{
log_printf(LOG_DEBUG,
"IPX_Reply: Cannot update name server, shared data is %u bytes (expected %u)",
(unsigned int)(size), (unsigned int)(sizeof(struct sockaddr_ipx)));
}
else{
memcpy(&(sp_data->ns_addr), addr_p, sizeof(struct sockaddr_ipx)); memcpy(&(sp_data->ns_addr), addr_p, sizeof(struct sockaddr_ipx));
sp_data->ns_id = data->idNameServer; sp_data->ns_id = data->idNameServer;
IPX_STRING_ADDR(str_addr,
addr32_in(sp_data->ns_addr.sa_netnum),
addr48_in(sp_data->ns_addr.sa_nodenum),
sp_data->ns_addr.sa_socket);
log_printf(LOG_DEBUG, "IPX_Reply: New name server address is %s", str_addr);
} }
} }
/* Do the actual sending */ /* Check we are being called in a context where we actually have an
* address to send the reply to.
*/
if(sendto(sp_data->sock, data->lpMessage + API_HEADER_SIZE, data->dwMessageSize - API_HEADER_SIZE, 0, (struct sockaddr*)data->lpSPMessageHeader, sizeof(struct sockaddr_ipx)) == -1) { struct sockaddr_ipx *to_addr = (struct sockaddr_ipx*)(data->lpSPMessageHeader);
log_printf(LOG_ERROR, "sendto failed: %s", w32_error(WSAGetLastError()));
if(to_addr == NULL)
{
log_printf(LOG_DEBUG, "Attempted SP_Reply with NULL lpSPMessageHeader");
return DPERR_GENERIC;
}
/* Send the message. */
if(sendto(sp_data->sock,
data->lpMessage + API_HEADER_SIZE, data->dwMessageSize - API_HEADER_SIZE, 0,
(struct sockaddr*)(to_addr), sizeof(*to_addr)) == -1)
{
log_printf(LOG_ERROR, "IPX_Reply: sendto failed: %s", w32_error(WSAGetLastError()));
release_sp_data(sp_data); release_sp_data(sp_data);
return DPERR_GENERIC; return DPERR_GENERIC;