COMMON: Fixes 'Socket Client doesn't receive byte with value 13' #112

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2021-06-05 (12.22)
+	COMMON: Fixes 'Socket Client doesn't receive byte with value 13' #112
+
 2021-05-03 (12.22)
 	COMMON: Fix array access regression
 

src/common/fs_socket_client.c

@@ -202,8 +202,16 @@ int sockcl_write(dev_file_t *f, byte *data, uint32_t size) {
  * read from a socket
  */
 int sockcl_read(dev_file_t *f, byte *data, uint32_t size) {
-  f->drv_dw[0] = (uint32_t) net_input((socket_t) (long) f->handle, (char *)data, size, NULL);
-  return (((long) f->drv_dw[0]) <= 0) ? 0 : (long) f->drv_dw[0];
+  int result;
+  if (f->handle != -1) {
+    f->drv_dw[0] = (uint32_t) net_input((socket_t) (long) f->handle, (char *)data, size, NULL);
+    result = (((long) f->drv_dw[0]) <= 0) ? 0 : (long) f->drv_dw[0];
+  } else {
+    err_network();
+    data[0] = 0;
+    result = 0;
+  }
+  return result;
 }
 
 /*

src/common/inet2.c

@@ -169,10 +169,8 @@ int net_input(socket_t s, char *buf, int size, const char *delim) {
           return count;         // delimiter found
         }
       }
-      if (ch != '\015') {       // ignore it
-        buf[count] = ch;
-        count += bytes;         // actually ++
-      }
+      buf[count] = ch;
+      count += bytes;
     }
   }
 

src/common/sberr.c

@@ -351,6 +351,10 @@ void err_memory() {
   rt_raise(ERR_MEMORY);
 }
 
+void err_network() {
+  rt_raise(ERR_NETWORK);
+}
+
 /**
  * the DONE message
  */

src/common/sberr.h

@@ -78,6 +78,7 @@ void err_ref_circ_var();
 void err_array();
 void err_form_input();
 void err_memory();
+void err_network();
 void err_throw(const char *fmt, ...);
 int  err_handle_error(const char *err, var_p_t var);
 void inf_done(void);