X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=lhnet.c;h=67ccc9a727ac927746b6f0f88ebcbd8462327da3;hb=2df77fd4ec15782a38c4ed2f94c3654bbb6e48cc;hp=e244a6498d273cad15606e8d64ed7525974101a4;hpb=0c54c2b5a3703acc26568605966a324e11c01d5e;p=xonotic%2Fdarkplaces.git diff --git a/lhnet.c b/lhnet.c index e244a649..67ccc9a7 100644 --- a/lhnet.c +++ b/lhnet.c @@ -104,7 +104,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def struct hostent *hostentry; const char *colon; char name[128]; - if (!address || !string) + if (!address || !string || !*string) return 0; memset(address, 0, sizeof(*address)); address->addresstype = LHNETADDRESSTYPE_NONE; @@ -769,7 +769,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng int main(int argc, char **argv) { #if 1 - char *buffer = "socket to socket test successful", buffer2[1024]; + char *buffer = "test", buffer2[1024]; int blen = strlen(buffer); int b2len = 1024; lhnetsocket_t *sock1; @@ -782,8 +782,6 @@ int main(int argc, char **argv) int test1; int test2; - strcpy(buffer2, "socket to socket test failed"); - printf("calling LHNET_Init\n"); LHNET_Init(); @@ -806,8 +804,12 @@ int main(int argc, char **argv) usleep (100000); #endif printf("calling LHNET_Read on the second socket to read the packet sent from the first socket\n"); - test2 = LHNET_Read(sock2, buffer2, b2len, &myaddy3); - Con_Printf("%s\n", buffer2); + test2 = LHNET_Read(sock2, buffer2, b2len - 1, &myaddy3); + if (test2 > 0) + Con_Printf("socket to socket test succeeded\n"); + else + Con_Printf("socket to socket test failed\n"); + #ifdef WIN32 printf("press any key to exit\n"); getchar();