Changeset 483 for Daodan

Timestamp:

Nov 29, 2009, 9:20:43 AM (15 years ago)

Author:

rossy

Message:

fixed testclient

Location:

Daodan

Files:

• Flatline/build_test.bat (modified) (1 diff)
• Flatline/src/Flatline.c (modified) (1 diff)
• Flatline/src/Flatline.h (modified) (2 diffs)
• Flatline/src/Flatline_Net.c (modified) (3 diffs)
• Flatline/src/testclient.c (modified) (1 diff)
• Flatline/src/testserver.c (modified) (1 diff)
• Flatline/testclient.exe (modified) ( previous)
• Flatline/testserver.exe (modified) ( previous)
• src/Daodan_Win32.c (modified) (1 diff)

Daodan/Flatline/build_test.bat

@@ -1 @@
-gcc -O3 -s -Wall -o testserver src/testserver.c src/Flatline.c src/Flatline_Win32.c -lws2_32
-gcc -O3 -s -Wall -o testclient src/testclient.c src/Flatline.c src/Flatline_Win32.c -lws2_32
+gcc -O3 -s -Wall -o testserver src/testserver.c src/Flatline.c src/Flatline_Net.c src/Flatline_Win32.c -lws2_32
+gcc -O3 -s -Wall -o testclient src/testclient.c src/Flatline.c src/Flatline_Net.c src/Flatline_Win32.c -lws2_32

Daodan/Flatline/src/Flatline.c

@@ -13 +13 @@
 bool FLrServer_Run()
 {
-        return Net_Listen(27777, FLrListen_PacketCallback);
+        return NetUDPServer_Listen(27777, FLrServer_PacketCallback);
 }

Daodan/Flatline/src/Flatline.h

@@ -41 +41 @@
 typedef struct sockaddr sockaddr;
 typedef struct sockaddr_in sockaddr_in;
+typedef sockaddr_storage sockaddr_in6;
 
 bool NetUDPServer_Listen(uint16_t port, bool (*packet_callback)(char* data, int datalen, int from));
-bool NetUDPServer_Send(sockaddr* address, char* data, int datalen)
+bool NetUDPServer_Send(sockaddr* address, char* data, int datalen);
 
 int NetUDPSocket_Create(uint16_t port);
-bool NetUDPSocket_Send(int socket, int ip, uint16_t port, char* data, int datalen);
+bool NetUDPSocket_Send(int socket, const sockaddr* address, const char* data, int datalen);
 void NetUDPSocket_Close(int sock);
 
@@ -66 +67 @@
 
 
-bool FLrListen_PacketCallback(char* data, int datalen, int from);
-bool FLrListen_Run();
+bool FLrServer_PacketCallback(char* data, int datalen, int from);
+bool FLrServer_Run();

Daodan/Flatline/src/Flatline_Net.c

@@ -84 +84 @@
 }
 
-bool NetUDPSocket_Send(int socket, sockaddr* address, char* data, int datalen)
+bool NetUDPSocket_Send(int socket, const sockaddr* address, const char* data, int datalen)
 {
-        uint32_t addr_size;
+        int addr_size;
         switch (address->sa_family)
         {
@@ -95 +95 @@
                         addr_size = sizeof(sockaddr_in6);
                         break;
+                default:
+                        addr_size = sizeof(sockaddr_storage);
         }
         return sendto(socket, data, datalen, 0, address, addr_size);
@@ -101 +103 @@
 bool NetUDPSocket_Recieve(int socket, sockaddr_storage* address, char* data, uint16_t* datalen)
 {
-        uint32_t msg_size = recvfrom(socket, data, 512, 0, address, sizeof(sockaddr_storage));
+        int address_size = sizeof(sockaddr_storage);
+        uint32_t msg_size = recvfrom(socket, data, 512, 0, (sockaddr*)address, &address_size);
         if (msg_size == 0)
                 return false;

Daodan/Flatline/src/testclient.c

@@ -5 +5 @@
 {
         NetPlatform_Initalize();
-        int sock = Net_CreateSocket(0);
+        int sock = NetUDPSocket_Create(0);
         puts("Sending 100 two byte packets . . .");
+        
+        sockaddr_in address = { .sin_family = AF_INET, .sin_port = htons(27777), .sin_addr.S_un.S_addr = inet_addr("192.168.0.100") };
         
         int i;
         for (i = 0; i < 100; i ++)
         {
-                if (Net_Send(sock, inet_addr("127.0.0.1"), 27777, "hi", 3))
+                if (NetUDPSocket_Send(sock, (sockaddr*)&address, "hi", 2))
                         putchar('*');
                 else
                         putchar('x');
         }
-        Net_CloseSocket(sock);
+        NetUDPSocket_Close(sock);
         NetPlatform_Shutdown();
         return 0;

Daodan/Flatline/src/testserver.c

@@ -4 +4 @@
 {
         NetPlatform_Initalize();
-        FLrListen_Run();
+        FLrServer_Run();
         NetPlatform_Shutdown();
         return 0;

Daodan/src/Daodan_Win32.c

@@ -36 +36 @@
         Rect.bottom = Rect.top + Height;
         AdjustWindowRect(&Rect, WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_TILEDWINDOW , FALSE);
-
-        PlatformData->Window = CreateWindowEx(0, "ONI ", "ONI ", WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_TILEDWINDOW , Rect.left, Rect.top, Rect.right - Rect.left, Rect.bottom - Rect.top, NULL, NULL, PlatformData->Instance, NULL);
+        PlatformData->Window = CreateWindowEx(0, "ONI ", "ONI ", WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_OVERLAPPED, Rect.left, Rect.top, Rect.right - Rect.left, Rect.bottom - Rect.top, NULL, NULL, PlatformData->Instance, NULL);
+        
         ShowWindow(PlatformData->Window, SW_SHOWNORMAL);
         UpdateWindow(PlatformData->Window);