wip

diff --git a/morep.c b/morep.c
index 2f4f0e79ea329f7f9d0138973eb0bb796f150eda..7c93f23c1f46b209225d75fc84ec526d47fd000c 100644 (file)
--- a/morep.c
+++ b/morep.c
@@ -83,7 +83,7 @@ int parse_ifname (MOREP_addr_t *addr, char *url)
 
     char *pt = strchr (url, ':');
     if ((pt == NULL) || (pt[1] != '/') || (pt[2] != '/')) {
-        VERBOSE (morep, WARNING, PRINTF ("can't parse interface name '%s'(%d) \n", url));
+        VERBOSE (morep, WARNING, PRINTF ("can't parse interface name '%s'\n", url));
         return NULL;
     }
 

diff --git a/morep.h b/morep.h
index 6c91bb63e895c4aba50446f64d018dae1c5d4a8a..9b96997469343e35ef89f64fc02e5409e49f5146 100644 (file)
--- a/morep.h
+++ b/morep.h
@@ -80,7 +80,7 @@ uint8_t *MOREP_Get_Tx_Buffer (int index);
 
    @see MOREP_Connect()
 */
-int MOREP_Send (int morep, unsigned long msgtype, unsigned char *data, int len);
+int MOREP_Send (int index, uint8_t msgtype, int len);
 
 /**
    @ingroup MOREP
@@ -98,7 +98,7 @@ int MOREP_Send (int morep, unsigned long msgtype, unsigned char *data, int len);
 
    @see MOREP_Connect()
 */
-int MOREP_Receive (int morep, unsigned long *msgtype, unsigned char *buffer, int buflen);
+int MOREP_Receive (int sock);
 
 /**
    @ingroup MOREP

diff --git a/morep_server.c b/morep_server.c
index abef2538c72164517c21bb901f914da4141ddbb7..c9a5e15e1f31752b88255a41395baef4fc0bf877 100644 (file)
--- a/morep_server.c
+++ b/morep_server.c
@@ -22,14 +22,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "debug.h"
-
 #include "morep.h"
+#include "verbose.h"
 
 char *progname = NULL;
 
 int stop = 0;
 
+DECLARE_VERBOSE_LEVEL (morep, INFO);
+
 void sig_handler (int sig)
 {
     switch (sig) {
@@ -42,20 +43,18 @@ void sig_handler (int sig)
     }
 }
 
-int morep_server (char *url) {
+int server (char *url)
 {
     VERBOSE (morep, TRACE, PRINTF ("morep_server\n"));
 
-    int fd = MOREP_Connect (url);
-
-    VERBOSE (morep, INFO, PRINTF ("server started at '%s'\n", url));
-
-    int morep = MOREP_Connect (local_address, remote_address);
+    int morep = MOREP_Connect (url);
     if (morep < 0) {
         VERBOSE (morep, ERROR, PRINTF ("can't connect on url '%s'\n", url));
         return -1;
     }
 
+    VERBOSE (morep, INFO, PRINTF ("server started at '%s'\n", url));
+
     signal(SIGINT, sig_handler);
     signal(SIGTERM, sig_handler);
 
@@ -63,16 +62,16 @@ int morep_server (char *url) {
     char *words[] = {"Quo", "cognito", "Constantius", "ultra", "mortalem", "modum", "exarsit", "ac", "nequo", "casu", "idem", "Gallus", "de", "futuris", "incertus", "agitare", "quaedam", "conducentia", "saluti", "suae", "per", "itinera", "conaretur,", "remoti", "sunt", "omnes", "de", "industria", "milites", "agentes", "in", "civitatibus", "perviis.", NULL};
     while (stop) {
 
-        int len = MOREP_Receive (fd)
+        int len = MOREP_Receive (morep);
         VERBOSE (morep, INFO, PRINTF ("receive %d bytes\n", len));
 
-        uint8_t buffer = MOREP_Get_Tx_Buffer (fd);
+        uint8_t *buffer = MOREP_Get_Tx_Buffer (morep);
         len = strlen (words[i]);
         memcpy (buffer, words[i++], len);
         if (words[i] == NULL) {
             i = 0;
         }
-        len = MOREP_Send (fd);
+        len = MOREP_Send (morep, 0x01, len);
         VERBOSE (morep, INFO, PRINTF ("send %d bytes\n", len));
 
     }
@@ -80,11 +79,6 @@ int morep_server (char *url) {
     return 0;
 }
 
-/**
-   Verbose level
-*/
-DECLARE_VERBOSE_LEVEL (morep, INFO);
-
 int main (int argc, char **argv)
 {
     char *url = NULL;
@@ -102,7 +96,7 @@ int main (int argc, char **argv)
     while (argc-- > 1) {
         char *arg = *(++argv);
         if (arg[0] != '-') {
-            url = arg[0];
+            url = arg;
         }
         char c = arg[1];
         switch (c) {
@@ -110,7 +104,7 @@ int main (int argc, char **argv)
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
                 VERBOSE (ERROR, fprintf (stderr, "%s: verbose level not specified\n", progname));
-                return usage (1);
+                return 1;
             }
             CHANGE_VERBOSE_LEVEL (morep, atoi (arg));
             break;

diff --git a/morep_test.c b/morep_test.c
index b9d3544cdb0c1d664dd12889964abf88b1641426..7213b0297ffb2a604f369cceecafb55e62622226 100644 (file)
--- a/morep_test.c
+++ b/morep_test.c
@@ -25,9 +25,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "verbose.h"
-
 #include "morep.h"
+#include "verbose.h"
 
 #define UNUSED __attribute__ ((unused))