@@ -214,7 +214,7 @@ static bool SetGetAddrInfoErrorBool(const char *msg, int err)
214
214
}
215
215
216
216
// this blocks!
217
- static int ResolveAddress (NET_Address * addr )
217
+ static enum NET_TriState ResolveAddress (NET_Address * addr )
218
218
{
219
219
SDL_assert (addr != NULL ); // we control all this, so this shouldn't happen.
220
220
struct addrinfo * ainfo = NULL ;
@@ -225,23 +225,23 @@ static int ResolveAddress(NET_Address *addr)
225
225
//SDL_Log("rc=%d", rc);
226
226
if (rc != 0 ) {
227
227
addr -> errstr = CreateGetAddrInfoErrorString (rc );
228
- return -1 ; // error
228
+ return NET_FAILURE ; // error
229
229
} else if (ainfo == NULL ) {
230
230
addr -> errstr = SDL_strdup ("Unknown error (query succeeded but result was NULL!)" );
231
- return -1 ;
231
+ return NET_FAILURE ;
232
232
}
233
233
234
234
char buf [128 ];
235
235
rc = getnameinfo (ainfo -> ai_addr , ainfo -> ai_addrlen , buf , sizeof (buf ), NULL , 0 , NI_NUMERICHOST );
236
236
if (rc != 0 ) {
237
237
addr -> errstr = CreateGetAddrInfoErrorString (rc );
238
238
freeaddrinfo (ainfo );
239
- return -1 ; // error
239
+ return NET_FAILURE ; // error
240
240
}
241
241
242
242
addr -> human_readable = SDL_strdup (buf );
243
243
addr -> ainfo = ainfo ;
244
- return 1 ; // success (zero means "still in progress").
244
+ return NET_SUCCESS ; // success (zero means "still in progress").
245
245
}
246
246
247
247
static int SDLCALL ResolverThread (void * data )
@@ -1335,11 +1335,11 @@ NET_DatagramSocket *NET_CreateDatagramSocket(NET_Address *addr, Uint16 port)
1335
1335
return sock ;
1336
1336
}
1337
1337
1338
- static int SendOneDatagram (NET_DatagramSocket * sock , NET_Address * addr , Uint16 port , const void * buf , int buflen )
1338
+ static enum NET_TriState SendOneDatagram (NET_DatagramSocket * sock , NET_Address * addr , Uint16 port , const void * buf , int buflen )
1339
1339
{
1340
1340
struct addrinfo * addrwithport = MakeAddrInfoWithPort (addr , SOCK_DGRAM , port );
1341
1341
if (!addrwithport ) {
1342
- return -1 ;
1342
+ return NET_FAILURE ;
1343
1343
}
1344
1344
const int rc = sendto (sock -> handle , buf , (size_t ) buflen , 0 , addrwithport -> ai_addr , addrwithport -> ai_addrlen );
1345
1345
freeaddrinfo (addrwithport );
@@ -1350,15 +1350,15 @@ static int SendOneDatagram(NET_DatagramSocket *sock, NET_Address *addr, Uint16 p
1350
1350
}
1351
1351
1352
1352
SDL_assert (rc == buflen );
1353
- return 1 ;
1353
+ return NET_SUCCESS ;
1354
1354
}
1355
1355
1356
1356
// see if any pending data can finally be sent, etc
1357
1357
static int PumpDatagramSocket (NET_DatagramSocket * sock )
1358
1358
{
1359
1359
if (!sock ) {
1360
1360
SDL_InvalidParamError ("sock" );
1361
- return -1 ;
1361
+ return NET_FAILURE ;
1362
1362
}
1363
1363
1364
1364
while (sock -> pending_output_len > 0 ) {
@@ -1367,7 +1367,7 @@ static int PumpDatagramSocket(NET_DatagramSocket *sock)
1367
1367
const int rc = SendOneDatagram (sock , dgram -> addr , dgram -> port , dgram -> buf , dgram -> buflen );
1368
1368
if (rc < 0 ) { // failure!
1369
1369
return -1 ;
1370
- } else if (rc == 0 ) { // wouldblock
1370
+ } else if (rc == NET_WOULDBLOCK ) {
1371
1371
break ; // stop trying to send packets for now.
1372
1372
}
1373
1373
0 commit comments