X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=c047f6985d3f9526cc45eb4fa845be77ad9677e2;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=095577d32e1d84fa0d68a89eb31d41a6ac5a76e1;hpb=024b404c0db59dc6651b1c8f3d379c2797654fdf;p=plomrogue

diff --git a/src/client/io.c b/src/client/io.c
index 095577d..c047f69 100644
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -1,24 +1,25 @@
 /* src/client/io.c */
 
+#define _POSIX_C_SOURCE 1 /* PIPE_BUF */
 #include "io.h"
-#include <errno.h> /* global errno */
-#include <fcntl.h> /* open() */
 #include <limits.h> /* PIPE_BUF */
 #include <ncurses.h> /* halfdelay(), getch() */
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t */
-#include <stdio.h> /* FILE, sprintf(), fseek() */
+#include <stdio.h> /* FILE, sprintf(), fseek(), fflush() */
 #include <string.h> /* strcmp(), strlen(), memcpy() */
 #include <stdlib.h> /* free(), atoi() */
 #include <sys/stat.h> /* stat() */
-#include <unistd.h> /* access(), write() */
+#include <sys/types.h> /* time_t */
+#include <time.h> /* time() */
+#include <unistd.h> /* access() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/rexit.h" /* exit_trouble(), exit_err() */
 #include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(),
-                                  * try_fgetc()
+                                  * try_fgetc(), textfile_width(), try_fputc()
                                   */
 #include "control.h" /* try_key() */
-#include "map_window.h" /* map_center() */
-#include "misc.h" /* reset_windows() */
+#include "map.h" /* map_center() */
 #include "windows.h" /* reset_windows_on_winch(), draw_all_wins() */
 #include "world.h" /* world global */
 
@@ -30,7 +31,7 @@
 static void read_inventory(char * read_buf, uint32_t linemax, FILE * file);
 
 /* Read the next characters in "file" into world.map.cells. In detail: Read
- * world.map.size.y times world.map.size.x characters, followed by one ignored
+ * world.map.length times world.map.length characters, followed by one ignored
  * character (that we assume is a newline).
  */
 static void read_map_cells(FILE * file);
@@ -46,8 +47,8 @@ static void read_log(char * read_buf, uint32_t linemax, FILE * file);
 static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
                                      FILE * file);
 
-/* If the server's out file has changed since the last read_world(), return a
- * pointer to its file descriptor; else, return NULL.
+/* If the server's worldstate file has changed since the last read_world(),
+ * return a pointer to its file descriptor; else, return NULL.
  *
  * Two tests are performed to check for a file change. The file's last data
  * modification time in seconds via stat() is compared against world.last_update
@@ -60,17 +61,28 @@ static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
  * the new world also starts in turn 1, not signifying any world change to the
  * turn check. The stat() check detects this change with at most 1 second delay.
  */
-static FILE * changed_server_out_file(char * path);
+static FILE * changed_worldstate_file(char * path);
 
-/* Attempt to read the server's out file as representation of the game world in
- * a hard-coded serialization format. Returns 1 on success and 0 if the out file
- * wasn't read for supposedly not having changed since a last read_world() call.
+/* Attempt to read the server's worldstate file as representation of the game
+ * world in a hard-coded serialization format. Returns 1 on success and 0 if the
+ * out file wasn't read for supposedly not having changed since a last
+ * read_world() call.
  *
- * Note that the first successful read_world() triggers map_center(), so that on
- * start the client focuses the map window on the player.
+ * map_center() is triggered by either, the first successful read_world() (thus
+ * on client start), or on turn 1 (thus on world start).
  */
 static uint8_t read_world();
 
+/* If "last_server_answer_time" is too old, send a PING to the server; or, if a
+ * previous PING has not sparked any answer after a while, abort the client.
+ */
+static void test_ping_pong(time_t last_server_answer_time);
+
+/* Update "last_server_answer_time" if new stuff has been written to the
+ * server's out file.
+ */
+static void test_server_activity(time_t * last_server_answer_time);
+
 
 
 static void read_inventory(char * read_buf, uint32_t linemax, FILE * file)
@@ -78,7 +90,7 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file)
     char * f_name = "read_inventory()";
     char * delimiter = "%\n";
     free(world.player_inventory);
-    world.player_inventory = NULL;
+    world.player_inventory = NULL;          /* Avoids illegal strlen() below. */
     while (1)
     {
         try_fgets(read_buf, linemax + 1, file, f_name);
@@ -94,7 +106,8 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file)
         int new_size = strlen(read_buf);
         char * new_inventory = try_malloc(old_size + new_size + 1, f_name);
         memcpy(new_inventory, world.player_inventory, old_size);
-        sprintf(new_inventory + old_size, "%s", read_buf);
+        int test = sprintf(new_inventory + old_size, "%s", read_buf);
+        exit_trouble(test < 0, f_name, "sprintf()");
         free(world.player_inventory);
         world.player_inventory = new_inventory;
     }
@@ -108,14 +121,14 @@ static void read_map_cells(FILE * file)
 {
     char * f_name = "read_map_cells()";
     free(world.map.cells);
-    world.map.cells = try_malloc(world.map.size.y * world.map.size.x, f_name);
+    world.map.cells = try_malloc(world.map.length * world.map.length, f_name);
     uint16_t y, x;
-    for (y = 0; y < world.map.size.y; y++)
+    for (y = 0; y < world.map.length; y++)
     {
-        for (x = 0; x < world.map.size.x; x++)
+        for (x = 0; x < world.map.length; x++)
         {
             char c = try_fgetc(file, f_name);
-            world.map.cells[(y * world.map.size.x) + x] = c;
+            world.map.cells[(y * world.map.length) + x] = c;
         }
         try_fgetc(file, f_name);
     }
@@ -138,7 +151,8 @@ static void read_log(char * read_buf, uint32_t linemax, FILE * file)
         int new_size = strlen(read_buf);
         char * new_log = try_malloc(old_size + new_size + 1, f_name);
         memcpy(new_log, world.log, old_size);
-        sprintf(new_log + old_size, "%s", read_buf);
+        int test = sprintf(new_log + old_size, "%s", read_buf);
+        exit_trouble(test < 0, f_name, "sprintf()");
         free(world.log);
         world.log = new_log;
     }
@@ -156,9 +170,9 @@ static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
 
 
 
-static FILE * changed_server_out_file(char * path)
+static FILE * changed_worldstate_file(char * path)
 {
-    char * f_name = "changed_server_out_file()";
+    char * f_name = "changed_worldstate_file()";
     struct stat stat_buf;
     exit_trouble(stat(path, &stat_buf), f_name, "stat()");
     if (stat_buf.st_mtime != world.last_update)
@@ -183,30 +197,28 @@ static FILE * changed_server_out_file(char * path)
 static uint8_t read_world()
 {
     char * f_name = "read_world()";
-    char * path = "server/out";
-    char * quit_msg = "No server out file found to read. Server may be down.";
+    char * path = "server/worldstate";
+    char * quit_msg = "No worldstate file found to read. Server may be down.";
     static uint8_t first_read = 1;
     exit_err(access(path, F_OK), quit_msg);
-    FILE * file = changed_server_out_file(path);
+    FILE * file = changed_worldstate_file(path);
     if (!file)
     {
         return 0;
     }
-    uint32_t linemax = textfile_sizes(file, NULL);
+    uint32_t linemax = textfile_width(file);
     char * read_buf = try_malloc(linemax + 1, f_name);
     world.turn = read_value_from_line(read_buf, linemax, file);
-    world.score = read_value_from_line(read_buf, linemax, file);
     world.player_lifepoints = read_value_from_line(read_buf, linemax, file);
     read_inventory(read_buf, linemax, file);
     world.player_pos.y = read_value_from_line(read_buf, linemax, file);
     world.player_pos.x = read_value_from_line(read_buf, linemax, file);
-    if (first_read)
+    if (1 == world.turn || first_read)
     {
         map_center();
         first_read = 0;
     }
-    world.map.size.y = read_value_from_line(read_buf, linemax, file);
-    world.map.size.x = read_value_from_line(read_buf, linemax, file);
+    world.map.length = read_value_from_line(read_buf, linemax, file);
     read_map_cells(file);
     read_log(read_buf, linemax, file);
     free(read_buf);
@@ -216,37 +228,52 @@ static uint8_t read_world()
 
 
 
-extern void try_send(char * msg)
+static void test_ping_pong(time_t last_server_answer_time)
 {
-    char * f_name = "try_send()";
-    uint32_t msg_size = strlen(msg) + 1;
-    char * err = "try_send() tries to send message larger than PIPE_BUF bytes.";
-    exit_err(msg_size > PIPE_BUF, err);
-    int fd_out;
-    uint16_t j = 1;
-    while (0 != j)
+    static uint8_t ping_sent = 0;
+    time_t now = time(0);
+    if (ping_sent && last_server_answer_time > now - 3)
     {
-        fd_out = open(world.path_server_in, O_WRONLY | O_NONBLOCK);
-        if (fd_out > 0)
-        {
-            break;
-        }
-        exit_err(-1 == fd_out && ENXIO != errno, "Server fifo not found.");
-        j++;
+        ping_sent = 0;
     }
-    exit_err(0 == j, "Failed to open server fifo for writing.");
-    j = 1;
-    while (0 != j)
+    if (!ping_sent && last_server_answer_time < now - 3)
     {
-        int test = write(fd_out, msg, msg_size);
-        if (test > 0)
-        {
-            break;
-        }
-        j++;
+        send("PING");
+        ping_sent = 1;
+        return;
+    }
+    exit_err(last_server_answer_time < now - 6, "Server not answering.");
+}
+
+
+
+static void test_server_activity(time_t * last_server_answer_time)
+{
+    char * f_name = "test_server_activity()";
+    int test = try_fgetc(world.file_server_out, f_name);
+    if (EOF == test)
+    {
+        return;
     }
-    exit_err(0 == j, "Failed to write to server fifo.");
-    exit_trouble(-1 == close(fd_out), f_name, "close()");
+    do
+    {
+        ;
+    }
+    while (EOF != (test = try_fgetc(world.file_server_out, f_name)));
+    * last_server_answer_time = time(0);
+}
+
+
+
+extern void send(char * msg)
+{
+    char * f_name = "send()";
+    uint32_t msg_size = strlen(msg) + 1;
+    char * err = "send() tries to send message larger than PIPE_BUF bytes.";
+    exit_err(msg_size > PIPE_BUF, err);
+    try_fwrite(msg, strlen(msg), 1, world.file_server_in, f_name);
+    try_fputc('\n', world.file_server_in, f_name);
+    fflush(world.file_server_in);
 }
 
 
@@ -256,16 +283,25 @@ extern char * io_loop()
     world.halfdelay = 1;            /* Ensures read_world() is only called 10 */
     halfdelay(world.halfdelay);     /* times a second during user inactivity. */
     uint8_t change_in_client = 0;
+    uint16_t last_focused_turn = world.turn;
+    time_t last_server_answer_time = time(0);
     while (1)
     {
+        test_server_activity(&last_server_answer_time);
+        test_ping_pong(last_server_answer_time);
         if (world.winch)
         {
             reset_windows_on_winch();
             world.winch = 0;
             change_in_client++;
         }
-        if (read_world() || change_in_client)
+        if (change_in_client || read_world())
         {
+            if (world.turn != last_focused_turn && world.focus_each_turn)
+            {
+                last_focused_turn = world.turn;
+                map_center();
+            }
             draw_all_wins();
         }
         change_in_client = 0;
@@ -279,6 +315,6 @@ extern char * io_loop()
             }
         }
     }
-    try_send("QUIT");
+    send("QUIT");
     return "Sent QUIT to server.";
 }