Connect client (#12)

* clear weapon_target in ship_init (fixes phoboslab#141)

* clear `expected` state in `input_bind` so remapped controls actually work (fixes phoboslab#132)

* `vec3_is_on_face` angle value test updated to match original code.

* remove erroneous division by 64 in `magnitude` calculation for nose collision
this makes ship nose swing back out toward center of track again (noticeably)

* remove erroneous division by 16 in `magnitude` calculation (wing collision)
this restores the behavior of ship rolling on wing collision with side of track
there may still be other code to tweak as this seems more sensitive than PSX behavior

* use reciprocal multiply as seen in many other lines of rewrite

* another place where angle comparison to 30000 was converted differently

* angular z component computation did not match original source DYNAM.C

* 2 * pi, I also messed up

* scale face normal contribution consistently in floor collision code

* reimplement camera shake

* mistake, messed up roll

* LONG/SHORT_SHAKE -> CAMERA_SHAKE_LONG/SHORT

* fix indentation

* adjust face->normal scaling constant for collision with floor

* another fixed point scaling issue?

* restore original attract mode/demo behavior

With a very small reordering, the original PSX demo behavior is restored (countdown at starting line). Gets rid of the need for the "FIXME" part in the ship loop as well.

* Adjust scaling values in ship to ship collision code

* Update QOA lib

* Add menu option for screen shake

* Allow A_MENU_START for highscore entry; close phoboslab#133

* Better analog controls; thanks @mickski56; close phoboslab#77

* add wipegame.exe to .gitignore

* Use sdl2-config for L_FLAGS_SDL

Additional flags passed by 'sdl2-config --libs' fix an undefined reference to WinMain that prevents the target from successfully linking.

* Correct L_FLAGS_SOKOL for MSYS2

libdl and libasound don't exist on Windows. The Sokol build needs gdi32 and ole32 to successfully link.

* Remove unnecessary MSYS define

'__MSYS__' is pre-defined by the MSYS2 environment's toolchains, and should NOT be defined for MINGW32/64, UCRT64, etc.

* Rename client com file for consistency with server com

* Tidy up tests a little

* Address some minor warnings

* Remove unused param

* Add unit tests

* Move away from custom network structs

* Add test for connecting client and too many clients

* Account for forgetting to init client array somehow

* Remove header

* Forward declare server info type

* Grab server address in discovery loop

* Fix data (server index)

* Comment this out for now

* Send and receive connect status on client side

---------

Co-authored-by: jnmartin84 <[email protected]>
Co-authored-by: Dominic Szablewski <[email protected]>
Co-authored-by: J.Ingram <[email protected]>

Author: 4 people

.gitignore

@@ -13,6 +13,7 @@ coverage-report/
 *.info
 
 /wipegame
-
-# misc OS stuff
-.DS_STORE
+/wipegame.exe
+/save.dat
+.DS_STORE
+gamecontrollerdb.txt

network/network.c

@@ -64,7 +64,7 @@ static const char *network_get_last_error(void)
 #endif
 }
 
-static void system_send_packet(int sockfd, int length, const void *data, netadr_t dest_net)
+static void system_send_packet(int sockfd, int length, const void *data, struct sockaddr_in dest_net)
 {
 
     if(sockfd == INVALID_SOCKET)
@@ -73,52 +73,15 @@ static void system_send_packet(int sockfd, int length, const void *data, netadr_
         return;
     }
 
-    struct sockaddr_in dest_addr;
 
-    netadr_to_sockadr(&dest_net, &dest_addr);
-
-    int ret = wrap_sendto(sockfd, data, length, 0, (struct sockaddr *)&dest_addr, sizeof(dest_addr));
+    int ret = wrap_sendto(sockfd, data, length, 0, (struct sockaddr *)&dest_net, sizeof(dest_net));
 
     if (ret == -1)
     {
-        printf("unable to send packet to %s: %s\n", addr_to_string(dest_net), network_get_last_error());
+       // printf("unable to send packet to %s: %s\n", addr_to_string(dest_net), network_get_last_error());
     }
 }
 
-static bool system_get_packet(netadr_t *net_from, msg_t *net_msg)
-{
-    struct sockaddr_in from;
-
-    if (client_sockfd == INVALID_SOCKET) {
-        return false;
-    }
-
-    unsigned int fromlen = sizeof(from);
-    int ret = wrap_recvfrom(client_sockfd, net_msg->data, net_msg->maxsize, 0, (struct sockaddr *)&from, &fromlen);
-
-    sockadr_to_netadr(&from, net_from);
-    net_msg->readcount = 0;
-
-    if (ret == -1)
-    {
-        int err = errno;
-
-        if (err == EWOULDBLOCK || err == ECONNREFUSED) {
-            return false;
-        }
-        
-        printf("%s from %s\n", network_get_last_error(), addr_to_string(*net_from));
-    }
-
-    if (ret == net_msg->maxsize)
-    {
-        printf("oversize packet from %s\n", addr_to_string(*net_from));
-        return false;
-    }
-
-    net_msg->cursize = ret;
-    return true;
-}
 
 #if defined(WIN32)
 bool system_init_winsock(void) {
@@ -204,7 +167,7 @@ int network_get_client_socket(void) {
     return new_socket;
 }
 
-bool network_bind_socket(int sockfd, char *ip_addr, char* port)
+bool network_bind_socket(int sockfd, char* port)
 {
     if(client_sockfd != INVALID_SOCKET)
     {
@@ -271,7 +234,7 @@ void network_close_socket(int* sockfd) {
     *sockfd = INVALID_SOCKET;
 }
 
-static void network_add_msg_queue_item(const char *buf, int numbytes, const struct sockaddr_storage *their_addr) {
+static void network_add_msg_queue_item(const char *buf, const struct sockaddr_in* their_addr) {
     msg_queue_item_t *item = (msg_queue_item_t *)malloc(sizeof(msg_queue_item_t));
     if (!item) {
         perror("Failed to allocate memory for message queue item");
@@ -285,7 +248,7 @@ static void network_add_msg_queue_item(const char *buf, int numbytes, const stru
         return;
     }
 
-    memcpy(&item->dest_addr, their_addr, sizeof(struct sockaddr_storage));
+    memcpy(&item->dest_addr, their_addr, sizeof(struct sockaddr_in));
     msg_queue[msg_queue_size++] = *item;
 }
 
@@ -327,8 +290,6 @@ bool network_get_packet()
     socklen_t addr_len = sizeof their_addr;
     int numbytes = 0;
 
-    char s[INET_ADDRSTRLEN];
-
     if ((numbytes = wrap_recvfrom(client_sockfd, buf, MAXBUFLEN-1 , 0,
         (struct sockaddr *)&their_addr, &addr_len)) == -1) {
         if (errno == EAGAIN || errno == EWOULDBLOCK) {
@@ -340,36 +301,17 @@ bool network_get_packet()
         }
     }
 
-    struct sockaddr* addr = &((struct sockaddr_in*)&their_addr)->sin_addr;
-
-    /*
-    printf("listener: got packet from %s\n",
-    inet_ntop(their_addr.ss_family,
-            addr,
-            s, sizeof s));
-    printf("listener: packet is %d bytes long\n", numbytes);
-
-    printf("listener: packet contains \"%s\"\n", buf);
-    */
-
     buf[numbytes] = '\0';
-    network_add_msg_queue_item(buf, numbytes, &their_addr);
+    network_add_msg_queue_item(buf, (struct sockaddr_in*)&their_addr);
 
     return true;
 }
 
-void network_send_packet(int sockfd, int length, const void *data, netadr_t dest_net)
+void network_send_packet(int sockfd, int length, const void *data, struct sockaddr_in dest_net)
 {
     system_send_packet(sockfd, length, data, dest_net);
 }
 
-void network_send_command(const char *command, netadr_t dest)
-{
-    if(strcmp(command, "server_info") == 0) {
-        network_send_packet(network_get_bound_ip_socket(), strlen(command), "server_info", dest);
-    }
-}
-
 int network_sleep(int msec)
 {
     struct timeval timeout;

network/network.h

@@ -11,13 +11,13 @@
 #define INVALID_SOCKET -1
 #endif
 
-static int WIPEOUT_PORT = 8000;
-static int WIPEOUT_CLIENT_PORT = 8001;
-static int CLIENT_SOCKET_TIMEOUT = 3000; // 3 seconds
+#define WIPEOUT_PORT 8000
+#define WIPEOUT_CLIENT_PORT 8001
+#define CLIENT_SOCKET_TIMEOUT 3000 // 3 seconds
 
 typedef struct {
     const char* command;
-    struct sockaddr_storage dest_addr;
+    struct sockaddr_in dest_addr;
 } msg_queue_item_t;
 
 #if defined(WIN32)
@@ -79,10 +79,9 @@ void network_close_socket(int* sockfd);
  * listen for incoming packets.
  * 
  * @param sockfd the socket file descriptor
- * @param ip_addr the IP address to bind to
  * @param port the port to bind to
  */
-bool network_bind_socket(int sockfd, char *ip_addr, char* port);
+bool network_bind_socket(int sockfd, char* port);
 
 bool network_get_packet(void);
 
@@ -94,12 +93,7 @@ bool network_get_packet(void);
  * @param data the data to send
  * @param dest_net the destination netadr_t
  */
-void network_send_packet(int sockfd, int length, const void* data, netadr_t dest_net);
-
-/**
- * @brief Send a command to the server or to a client
- */
-void network_send_command(const char* command, netadr_t dest);
+void network_send_packet(int sockfd, int length, const void* data, struct sockaddr_in dest_net);
 
 /**
  * @brief clears the current message queue

server/main.c

@@ -1,5 +1,5 @@
 
-#include <client.h>
+#include <client_com.h>
 
 #include <msg.h>
 #include <network.h>
@@ -24,6 +24,8 @@ static void server_init()
 {
     server.name = "master blaster";
     server.num_clients = 0;
+
+    client_com_init();
 }
 
 int main(int argc, char** argv)
@@ -34,14 +36,13 @@ int main(int argc, char** argv)
     printf("welcome to the server!\n");
 
     server_init();
-    char my_ip[16];
-    network_get_my_ip(my_ip, sizeof(my_ip));
+
     int sockfd = network_get_client_socket();
     if(sockfd == INVALID_SOCKET) {
         printf("could not create socket, quitting\n");
         return 1;
     }
-    if(!network_bind_socket(sockfd, my_ip, "8000")) {
+    if(!network_bind_socket(sockfd, "8000")) {
         printf("could not start server, quitting\n");
         return 1;
     }

server/serverlib/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_library(serverlib STATIC
-    client.c
+    client_com.c
 )
 
 target_include_directories(serverlib PUBLIC