X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=97486748a303ff4bc8176f651dbc33fed73be2f0;hb=d54fc24e6cfb62cc2fedfb63d3ae68ff636e3a01;hp=1a88c2411eeacdac071e752845069f17c08e3a80;hpb=262c92c9f620f87500f350b4744d2f31b6de7da5;p=palacios.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 1a88c24..9748674 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -7,9 +7,9 @@
  * and the University of New Mexico.  You can find out more at 
  * http://www.v3vee.org
  *
- * Copyright (c) 2009, Lei Xia <lxia@northwestern.edu> 
+ * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu> 
  * Copyright (c) 2009, Yuan Tang <ytang@northwestern.edu> 
- * Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org> 
+ * Copyright (c) 2010, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
  *
  * Author: Lei Xia <lxia@northwestern.edu>
@@ -23,60 +23,100 @@
 #define __VNET_H__
 
 #include <palacios/vmm.h>
-#include <palacios/vmm_string.h>
-#include <palacios/vmm_types.h>
-#include <palacios/vmm_queue.h>
-#include <palacios/vmm_hashtable.h>
-#include <palacios/vmm_sprintf.h>
+#include <palacios/vmm_ethernet.h>
 
-typedef enum {MAC_ANY, MAC_NOT, MAC_NONE} mac_type_t; //for 'src_mac_qual' and 'dst_mac_qual'
-typedef enum {LINK_INTERFACE, LINK_EDGE, LINK_ANY} link_type_t; //for 'type' and 'src_type' in struct routing
+#define MAC_NOSET 	0
+#define MAC_ANY 	11
+#define MAC_NOT 	12
+#define MAC_NONE 	13 
+#define MAC_ADDR 	14
+
+#define LINK_NOSET	0
+#define LINK_INTERFACE 	11
+#define LINK_EDGE 	12 
+#define LINK_ANY 	13
+
+#define VNET_HASH_SIZE 	17
 
 //routing table entry
 struct v3_vnet_route {
-    char src_mac[6];
-    char dest_mac[6];
+    uint8_t src_mac[ETH_ALEN];
+    uint8_t dst_mac[ETH_ALEN];
 
-    mac_type_t src_mac_qual;
-    mac_type_t dest_mac_qual;
+    uint8_t src_mac_qual;
+    uint8_t dst_mac_qual;
 
-    int link_idx; //link[dest] is the link to be used to send pkt
-    link_type_t link_type; //EDGE|INTERFACE|ANY
+    int dst_id;
+    uint8_t dst_type;
  
-    int src_link_idx;
-    link_type_t src_type; //EDGE|INTERFACE|ANY
+    int src_id;
+    uint8_t src_type;
+} __attribute__((packed));
+
+
+struct v3_vnet_pkt {
+    uint32_t size; 
+    
+    uint8_t dst_type;
+    uint32_t dst_id;
+
+    /*
+     * IMPORTANT The next three fields must be grouped and packed together
+     *  They are used to generate a hash value 
+     */
+    union {
+	uint8_t hash_buf[VNET_HASH_SIZE];
+	struct {
+	    uint8_t src_type;
+	    uint32_t src_id;
+	    uint8_t header[ETHERNET_HEADER_LEN];
+	    uint8_t * data;
+	} __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+struct v3_vnet_bridge_ops {
+    int (*input)(struct v3_vm_info * vm, 
+		struct v3_vnet_pkt * pkt,
+		void * private_data);
+    void (*poll)(struct v3_vm_info * vm,  
+		void * private_data);
 };
 
+#define HOST_LNX_BRIDGE 1
+#define CTL_VM_BRIDGE 	2
 
-int v3_vnet_send_rawpkt(uchar_t *buf, int len, void *private_data);
-int v3_vnet_send_udppkt(uchar_t *buf, int len, void *private_data);
-
-int v3_vnet_add_route(struct v3_vnet_route *route);
-
-//int v3_vnet_del_route();
-//int v3_vnet_get_routes();
-
+int v3_vnet_add_bridge(struct v3_vm_info * vm,
+		struct v3_vnet_bridge_ops * ops,
+		uint8_t type,
+		void * priv_data);
+int v3_vnet_add_route(struct v3_vnet_route route);
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data);
+int v3_vnet_find_dev(uint8_t  * mac);
 
-//int v3_vnet_add_link(struct v3_vnet_link link);
+#ifdef __V3VEE__
 
-// int v3_vnet_del_link();
-//int v3_vnet_get_link(int idx, struct vnet_link * link);
+#define VMM_DRIVERN 	1
+#define GUEST_DRIVERN 	0
 
+struct v3_vnet_dev_ops {
+    int (*input)(struct v3_vm_info * vm, 
+		struct v3_vnet_pkt * pkt, 
+		void * dev_data);
+    void (*poll) (struct v3_vm_info * vm, void * dev_data);
+};
 
-int v3_init_vnet();
+int v3_init_vnet(void);	
+void v3_deinit_vnet(void);
 
-//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
+void v3_vnet_poll(struct v3_vm_info * vm);
 
-int v3_vnet_add_node(struct v3_vm_info *info, 
-	           char * dev_name, 
-	           uchar_t mac[6], 
-		    int (*netif_input)(struct v3_vm_info * vm, uchar_t * pkt, uint_t size, void * private_data), 
+int v3_vnet_add_dev(struct v3_vm_info * info, uint8_t * mac, 
+		    struct v3_vnet_dev_ops * ops,
 		    void * priv_data);
+int v3_vnet_del_dev(int dev_id);
 
-
-// temporary hack
-int v3_vnet_pkt_process();
-
+#endif
 
 #endif