add tests

diff --git a/morep.c b/morep.c
index b5b27bf30875ce7e7b0178f99b4ed9e2416305b6..172be169698d7317eef3d039bc40e07a0e922c99 100644 (file)
--- a/morep.c
+++ b/morep.c
@@ -100,6 +100,8 @@ void free_all_moreps (void)
 
     int i;
     for (i = 0; i < MAX_MOREP_NUMBER; i++) {
+        MOREP_Close (i);
+
         if (MOREP_list[i]) {
             free (MOREP_list[i]->tx_buffer);
             free (MOREP_list[i]->rx_buffer);
@@ -273,13 +275,6 @@ int find_unused_morep ()
     return i;
 }
 
-void release_morep (int i)
-{
-    VERBOSE (morep, TRACE, PRINTF ("release_morep\n"));
-
-    MOREP_list[i]->used = 0;
-}
-
 int MOREP_Connect (char *url)
 {
     VERBOSE (morep, TRACE, PRINTF ("MOREP_Connect\n"));
@@ -493,8 +488,10 @@ int MOREP_Close (int index)
         return -1;
     }
 
-    close (MOREP_list[index]->sock);
-    MOREP_list[index]->used = 0;
+    if (MOREP_list[index]->used) {
+        close (MOREP_list[index]->sock);
+        MOREP_list[index]->used = 0;
+    }
 
     return 0;
 }

diff --git a/morep_server.c b/morep_server.c
index 625ca98a27106eecc3507d4bbde23cdf2ecf4d25..c7e284913f64cbeecd788009cf6904e472b7ef2f 100644 (file)
--- a/morep_server.c
+++ b/morep_server.c
@@ -312,8 +312,17 @@ int main (int argc, char **argv)
 
 /* test-depend: morep_valid */
 
-/* test: morep_server.exe -h */
-/* test: morep_server.exe wlan0://74:f0:6d:3e:ce:f9/0808 -l -f morep.h -s 42 -v 3 */
-/* test: morep_server.exe wlan0://74:f0:6d:3e:ce:f9/0808 -b -f morep.c -s 42 -v 3 */
+/* 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" */
+/* test: morep_server.exe lo://du:mm:yi:nt:er:fa/0808 2>&1 | grep  "can't parse mac" */
+/* test: morep_server.exe lo://00:00:00:00:00:00/foo 2>&1 | grep  "can't parse ethertype" */
+/* test: morep_server.exe foo://00:00:00:00:00:00/0808 2>&1 | grep  "No such device" */
+/* test: morep_server.exe lo://00:00:00:00:00:00/0808 -l -f foobar -s 42 2>&1 | grep "can't open file" */
+/* 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: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" */
 
 /* vim: set tabstop=4 expandtab shiftwidth=4: */