update tests

diff --git a/morep.c b/morep.c
index 172be169698d7317eef3d039bc40e07a0e922c99..2e10bb7420f638f91c2956e1dcad0869ef43e215 100644 (file)
--- a/morep.c
+++ b/morep.c
@@ -179,7 +179,7 @@ int parse_mac (MOREP_addr_t *addr, char *url)
         return -1;
     }
 
-    VERBOSE (morep, DEBUG, PRINTF ("mac: %02x:%02x:%02x:%02x:%02x:%02x\n", addr->mac[0], addr->mac[1], addr->mac[2], addr->mac[3], addr->mac[4], addr->mac[4]));
+    VERBOSE (morep, DEBUG, PRINTF ("mac: %02x:%02x:%02x:%02x:%02x:%02x\n", addr->mac[0], addr->mac[1], addr->mac[2], addr->mac[3], addr->mac[4], addr->mac[5]));
 
     return 0;
 }
@@ -236,7 +236,7 @@ int get_mac_address (int sock, char *ifname, uint8_t *mac)
         mac[i] = *p++;
     }
 
-    VERBOSE (morep, DEBUG, PRINTF ("mac: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[4]));
+    VERBOSE (morep, DEBUG, PRINTF ("mac: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]));
 
     return 0;
 }
@@ -351,9 +351,12 @@ int MOREP_Send (int index, uint8_t msgtype, uint8_t *buffer, int len)
      *  padding l<46 : zeros
      */
 
-    if ((len < 0) ||
-        ((len + MAX_ETHER_SIZE - MOREP_PREAMBLE - 1) / (MAX_ETHER_SIZE - MOREP_PREAMBLE) > MAX_FRAGMENTS) ||
-        (index < 0) || (index >= MAX_MOREP_NUMBER) || (MOREP_list[index] == NULL)) {
+    if ((len < 0) |
+        ((len + MAX_ETHER_SIZE - MOREP_PREAMBLE - 1) / (MAX_ETHER_SIZE - MOREP_PREAMBLE) > (MAX_FRAGMENTS + 1))) {
+        VERBOSE (morep, ERROR, PRINTF ("too large buffer to send (%d)\n", len));
+        return -1;
+    }
+    if ((index < 0) || (index >= MAX_MOREP_NUMBER) || (MOREP_list[index] == NULL)) {
         VERBOSE (morep, ERROR, PRINTF ("incorrect MOREP descriptor (%d)\n", index));
         return -1;
     }

diff --git a/morep_server.c b/morep_server.c
index c7e284913f64cbeecd788009cf6904e472b7ef2f..45e913dbe93e6d8cdfe71fee20390ca0fc54315f 100644 (file)
--- a/morep_server.c
+++ b/morep_server.c
@@ -310,8 +310,6 @@ int main (int argc, char **argv)
     return rc;
 }
 
-/* test-depend: morep_valid */
-
 /* test: morep_server.exe -h | grep usage */
 /* test: morep_server.exe 2>&1 | grep  "missing url" */
 /* test: morep_server.exe lo:/du:mm:yi:nt:er:fa/0808 2>&1 | grep  "can't parse interface" */
@@ -322,7 +320,9 @@ int main (int argc, char **argv)
 /* test: morep_server.exe lo://00:00:00:00:00:00/0808 -b -f foobar -s 42 2>&1 | grep "can't open file" */
 /* test: morep_server.exe lo://00:00:00:00:00:00/0808 -l -f makefile -s 42 -v 3 */
 /* test: morep_server.exe lo://00:00:00:00:00:00/0808 -l -f makefile -s 42 -v 4 | grep "rx msg: '$(tail -1 makefile)" */
+/* test: morep_server.exe lo://00:00:00:00:00:00/0808 -l -f makefile -s 42 -v 4 | grep -v "WARNING" */
 /* test: morep_server.exe lo://00:00:00:00:00:f9/0808 -b -f morep.c -s 42 -v 3 */
 /* test: morep_server.exe lo://00:00:00:00:00:00/0808 -b -f morep.c -s 42 -v 3 | grep "rx $(cat morep.c | wc -c) bytes" */
+/* test: morep_server.exe lo://00:00:00:00:00:00/0808 -b -f morep.c -s 42 -v 3 | grep -v "WARNING" */
 
-/* vim: set tabstop=4 expandtab shiftwidth=4: */
+/* vim: set ts=4 sw=4 et: */