quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some l_net warnings

Browse Source
This commit is contained in:
Garux 2020-01-24 02:47:33 +03:00
parent eb70faddc8
commit 4317ea2ab0
3 changed files with 39 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/l_net/l_net.c
View File

@ -36,9 +36,6 @@
#include "l_net.h" #include "l_net.h"
#include "l_net_wins.h" #include "l_net_wins.h"
#define GetMemory malloc
#define FreeMemory free
#ifdef _DEBUG #ifdef _DEBUG
void WinPrint( const char *str, ... ){ void WinPrint( const char *str, ... ){
va_list argptr; va_list argptr;
@ -48,7 +45,7 @@ void WinPrint( const char *str, ... ){
vsprintf( text, str, argptr ); vsprintf( text, str, argptr );
va_end( argptr ); va_end( argptr );
printf( text ); printf( "%s", text );
} }
#else #else
void WinPrint( const char *str, ... ){ void WinPrint( const char *str, ... ){
@ -178,11 +175,7 @@ int Net_Receive( socket_t *sock, netmessage_t *msg ){
// Changes Globals: - // Changes Globals: -
//=========================================================================== //===========================================================================
socket_t *Net_AllocSocket( void ){ socket_t *Net_AllocSocket( void ){
socket_t *sock; return calloc( 1, sizeof( socket_t ) );
sock = (socket_t *) GetMemory( sizeof( socket_t ) );
memset( sock, 0, sizeof( socket_t ) );
return sock;
} //end of the function Net_AllocSocket } //end of the function Net_AllocSocket
//=========================================================================== //===========================================================================
// //
@ -191,7 +184,7 @@ socket_t *Net_AllocSocket( void ){
// Changes Globals: - // Changes Globals: -
//=========================================================================== //===========================================================================
void Net_FreeSocket( socket_t *sock ){ void Net_FreeSocket( socket_t *sock ){
FreeMemory( sock ); free( sock );
} //end of the function Net_FreeSocket } //end of the function Net_FreeSocket
//=========================================================================== //===========================================================================
// //

51
libs/l_net/l_net_berkley.c
View File

@ -566,46 +566,27 @@ int WINS_Broadcast( int socket, byte *buf, int len ){
// Changes Globals: - // Changes Globals: -
//=========================================================================== //===========================================================================
bool WINS_Write( int socket, byte *buf, int len, struct sockaddr_s *addr ){ bool WINS_Write( int socket, byte *buf, int len, struct sockaddr_s *addr ){
int ret, written; int ret = 0, written = 0;
ret = 0;
if ( addr ) { while ( written < len )
written = 0;
while ( written < len )
{
ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
if ( ret == SOCKET_ERROR ) {
if ( WSAGetLastError() != EAGAIN ) {
return false;
}
//++timo FIXME: what is this used for?
// Sleep(1000);
} //end if
else
{
written += ret;
}
}
} //end if
else
{ {
written = 0; if ( addr )
while ( written < len ) ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
{ else
ret = send( socket, buf, len, 0 ); ret = send( socket, buf, len, 0 );
if ( ret == SOCKET_ERROR ) {
if ( WSAGetLastError() != EAGAIN ) { if ( ret == SOCKET_ERROR ) {
return false; if ( WSAGetLastError() != EAGAIN ) {
} return false;
//++timo FIXME: what is this used for?
// Sleep(1000);
} //end if
else
{
written += ret;
} }
//++timo FIXME: what is this used for?
// Sleep(1000);
} }
} //end else else
{
written += ret;
}
}
if ( ret == SOCKET_ERROR ) { if ( ret == SOCKET_ERROR ) {
WinPrint( "WINS_Write: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); WinPrint( "WINS_Write: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
} //end if } //end if

57
libs/l_net/l_net_wins.c
View File

@ -506,14 +506,14 @@ int WINS_CheckNewConnections( void ){
//=========================================================================== //===========================================================================
int WINS_Read( int socket, byte *buf, int len, struct sockaddr_s *addr ){ int WINS_Read( int socket, byte *buf, int len, struct sockaddr_s *addr ){
int addrlen = sizeof( struct sockaddr_s ); int addrlen = sizeof( struct sockaddr_s );
int ret, errno; int ret, error;
if ( addr ) { if ( addr ) {
ret = recvfrom( socket, buf, len, 0, (struct sockaddr *)addr, &addrlen ); ret = recvfrom( socket, buf, len, 0, (struct sockaddr *)addr, &addrlen );
if ( ret == -1 ) { if ( ret == -1 ) {
errno = WSAGetLastError(); error = WSAGetLastError();
if ( errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED ) { if ( error == WSAEWOULDBLOCK || error == WSAECONNREFUSED ) {
return 0; return 0;
} }
} //end if } //end if
@ -522,9 +522,9 @@ int WINS_Read( int socket, byte *buf, int len, struct sockaddr_s *addr ){
{ {
ret = recv( socket, buf, len, 0 ); ret = recv( socket, buf, len, 0 );
if ( ret == SOCKET_ERROR ) { if ( ret == SOCKET_ERROR ) {
errno = WSAGetLastError(); error = WSAGetLastError();
if ( errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED ) { if ( error == WSAEWOULDBLOCK || error == WSAECONNREFUSED ) {
return 0; return 0;
} }
} //end if } //end if
@ -581,43 +581,26 @@ int WINS_Broadcast( int socket, byte *buf, int len ){
// Changes Globals: - // Changes Globals: -
//=========================================================================== //===========================================================================
bool WINS_Write( int socket, byte *buf, int len, struct sockaddr_s *addr ){ bool WINS_Write( int socket, byte *buf, int len, struct sockaddr_s *addr ){
int ret, written; int ret = 0, written = 0;
if ( addr ) { while ( written < len )
written = 0;
while ( written < len )
{
ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
if ( ret == SOCKET_ERROR ) {
if ( WSAGetLastError() != WSAEWOULDBLOCK ) {
return false;
}
Sleep( 1000 );
} //end if
else
{
written += ret;
}
}
} //end if
else
{ {
written = 0; if ( addr )
while ( written < len ) ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
{ else
ret = send( socket, buf, len, 0 ); ret = send( socket, buf, len, 0 );
if ( ret == SOCKET_ERROR ) {
if ( WSAGetLastError() != WSAEWOULDBLOCK ) { if ( ret == SOCKET_ERROR ) {
return false; if ( WSAGetLastError() != WSAEWOULDBLOCK ) {
} return false;
Sleep( 1000 );
} //end if
else
{
written += ret;
} }
Sleep( 1000 );
} //end if
else
{
written += ret;
} }
} //end else }
if ( ret == SOCKET_ERROR ) { if ( ret == SOCKET_ERROR ) {
WinPrint( "WINS_Write: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); WinPrint( "WINS_Write: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
} //end if } //end if