Changeset 254 in Main for 2.03E/Server/server.c

Timestamp:

Oct 4, 2024, 1:08:33 PM (6 weeks ago)

Author:

Nishi

Message:

add 2.03E

Location:

2.03E

Files:

• . (copied) (copied from trunk )
• Server/server.c (copied) (copied from trunk/Server/server.c ) (5 diffs)

2.03E/Server/server.c

@@ -34 +34 @@
 
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
-#ifndef NO_GETADDRINFO
+#ifndef NO_GETNAMEINFO
 #include <ws2tcpip.h>
 #include <wspiapi.h>
@@ -64 +64 @@
 #include <netinet/tcp.h>
 #endif
-#ifndef NO_GETADDRINFO
+#ifndef NO_GETNAMEINFO
 #include <netdb.h>
 #endif
@@ -78 +78 @@
 
 #ifndef S_ISDIR
-#define S_ISDIR(x) ((x) & _S_IFDIR)
+#define S_ISDIR(x) ((x)&_S_IFDIR)
 #endif
 
@@ -494 +494 @@
         struct tw_http_response res;
         struct tw_tool tools;
-#ifndef NO_GETADDRINFO
+        char* addrstr;
+#ifndef NO_GETNAMEINFO
         struct sockaddr* sa = (struct sockaddr*)&addr;
         getnameinfo(sa, sizeof(addr), address, 512, NULL, 0, NI_NUMERICHOST);
 #endif
-        address[0] = 0;
+        addrstr = inet_ntoa(addr.sin_addr);
+        strcpy(address, addrstr);
+        address[strlen(addrstr)] = 0;
 #ifdef FREE_PTR
         free(ptr);
@@ -1050 +1053 @@
                 }
         }
-        for(i = 0; i < sockcount; i++){
+        for(i = 0; i < sockcount; i++) {
                 close_socket(sockets[i]);
         }