Pridani operaci pro praci s fwp_msgb

diff --git a/fwp/fwp_manager/src/core.c b/fwp/fwp_manager/src/core.c
index c08e3e82a9902695c62c3d2ed415ec301a785680..41979d8fe456dfeae980660d08a514fdd0438adb 100644 (file)
--- a/fwp/fwp_manager/src/core.c
+++ b/fwp/fwp_manager/src/core.c
@@ -1,35 +1,27 @@
-#include "fwp_ctabe.h"
+#include "fwp_ctable.h"
 
 #define UN_CRTL_SOCKET "/var/run/fwp_local" 
 
 #define FWP_CONN_MAX 10 
 #define FWP_MTU 2346  
 
+#define FWP_DATAMSG_SIZE_MAX FWP_MTU
+#define FWP_MNGTMSG_SIZE_MAX 128 
+
 #define MNGT_CLIENT_UDP_PORT 33333
 #define MNGT_SERVER_UDP_PORT 33334
 
-#define NEGOTIATE_REQUEST 0x02
-#define NEGOTIATE_RESPONSE 0x03
-
-unsigned char buffer[FWP_MTU];
-
-struct fwp_msg_header{
-       unsigned int code;
-       unsigned int hid; /* /< handshake ID */
-};
+/*
+ * Global variables 
+ * */
 
-struct fwp_negotiate_msg_t
-{
-       struct fwp_msg_header header;
-       unsigned int id;          /*/< global contract_id */ 
-       unsigned int ac_id;       /*/< AC id ~ priority of vres */ 
-       int bandwidth_bps;        /*/< bits per second */
-       long period_usec;         /*/< all time units are in microseconds */
-};
+struct fwp_msgq        msgq_negotiate;
+struct fwp_ctable      ctable_negotiate;
+struct fwp_ctable      ctable_accepted;
 
+unsigned char buffer[FWP_MTU];
 
-struct fwp_msgq negotiate_msgq;
-struct fwp_msgq mngt_msgq;
+/***/
 
 void* recv_thread(void*udp_port)
 {

diff --git a/fwp/libfwp/include/fwp_msgq.h b/fwp/libfwp/include/fwp_msgq.h
index 4397129eeb9050b4921e4e131f9624e5e6f12b91..a67bba24fe2374fae747612e4d97b81952cf136d 100644 (file)
--- a/fwp/libfwp/include/fwp_msgq.h
+++ b/fwp/libfwp/include/fwp_msgq.h
@@ -10,16 +10,12 @@
 
 #include "fwp_conf.h"
 
-typedef enum {
-       LOCAL = 0,
-       REMOTE = 1,
-} fwp_addr_t;
-
-struct fwp_msgq_entry {
+struct fwp_msgb {
        struct sockaddr addr;
        socklen_t addrlen;
-       const void* data;// unsigned char data[FWP_MTU];
-       size_t size;
+       unsigned char* data;// unsigned char data[FWP_MTU];
+       unsigned char* tail;
+       size_t len;
 };
 
 struct fwp_msgq {
@@ -30,7 +26,7 @@ struct fwp_msgq {
        /*struct sockaddr_in dest_addr;*/
        
        /* For simplicity now */
-       struct fwp_msgq_entry queue[FWP_MSGQ_SIZE];
+       struct fwp_msgb queue[FWP_MSGQ_SIZE];
        unsigned int first, last;
 
        /* will be replaced by :*/

diff --git a/fwp/libfwp/src/fwp_msgq.c b/fwp/libfwp/src/fwp_msgq.c
index f13af188adf9b6ec836b92112a3e93fdeed25eea..a7341cfedf22c34e222bd2f5e1d4b8e822ca997d 100644 (file)
--- a/fwp/libfwp/src/fwp_msgq.c
+++ b/fwp/libfwp/src/fwp_msgq.c
@@ -59,3 +59,35 @@ struct fwp_msgq_entry* fwp_msgq_getnum(struct fwp_msgq *msgq)
        return msgq->nr_pending;
 
 }
+
+/*unsigned char* fwp_msgb_put(struct fwp_msgb* msgb, unsigned int len)
+{
+       unsigned char *tmp= msgb->tail;
+       
+       skb->tail+=len;
+       skb->len+=len;
+       return tmp;
+}
+
+unsigned char* fwp_msgb_push(struct fwp_msgb* msgb, unsigned int len)
+{
+       msgb->data-=len;
+       msgb->len+=len;
+       return msgb->data;
+}
+
+unsigned char* fwp_msgb_pull(struct msgb* msgb, unsigned int len)
+{
+       if (len > msgb->len)
+               return NULL;
+       
+       msgb->len -= len;
+       return msgb->data += len;
+}
+
+void fwp_msgb_reserve(struct msgb* msgb, unsigned int len)
+{
+       msgb->data+=len;
+       msgb->tail+=len;
+}
+*/