X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=10ed889dfc5f7e0711e50a7313821ef959836c36;hb=27b1aab6a0b0f909e8cea27656dbfa05d0335e94;hp=0c2ded995e2afe4b7321964ce282645ae4202a67;hpb=3c073d909a9307685307ec597800fad9cca483cc;p=palacios.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 0c2ded9..10ed889 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -9,15 +9,11 @@
  *
  * Copyright (c) 2009, Lei Xia <lxia@northwestern.edu> 
  * Copyright (c) 2009, Yuan Tang <ytang@northwestern.edu> 
- * Copyright (c) 2009, Jack Lange <jarusl@cs.northwestern.edu> 
- * Copyright (c) 2009, Peter Dinda <pdinda@northwestern.edu
  * Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
  *
  * Author: Lei Xia <lxia@northwestern.edu>
  *		  Yuan Tang <ytang@northwestern.edu>
- *		  Jack Lange <jarusl@cs.northwestern.edu> 
- *		  Peter Dinda <pdinda@northwestern.edu
  *
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
@@ -26,123 +22,78 @@
 #ifndef __VNET_H__
 #define __VNET_H__
 
+#ifdef __V3VEE__
+
 #include <palacios/vmm.h>
-#include <palacios/vmm_string.h>
-#include <palacios/vmm_types.h>
-#include <palacios/vmm_queue.h>
-#include <palacios/vmm_socket.h>
-#include <palacios/vmm_hashtable.h>
-#include <palacios/vmm_sprintf.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 VNET_HASH_SIZE 16
 #define ETHERNET_HEADER_LEN 14
-#define ETHERNET_DATA_MIN   46
 #define ETHERNET_DATA_MAX   1500
 #define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
 
-#define SOCK int
-
-//the routing entry
-struct routing{
-    char src_mac[6];
-    char dest_mac[6];
+//routing table entry
+struct v3_vnet_route {
+    uint8_t src_mac[6];
+    uint8_t dst_mac[6];
 
-    int src_mac_qual;
-    int dest_mac_qual;
+    uint8_t src_mac_qual;
+    uint8_t dst_mac_qual;
 
-    int dest; //link[dest] is the link to be used to send pkt
-    int type; //EDGE|INTERFACE|ANY
+    uint32_t dst_id; //link[dest] is the link to be used to send pkt
+    uint8_t dst_type; //EDGE|INTERFACE|ANY
  
-    int src;
-    int src_type; //EDGE|INTERFACE|ANY
-
-    int use;
-
-    int next;
-    int prev;
-  //  struct list_head entry_list;
-};
-
-//struct  gen_route {
- //   uint_t num_entries;
-  //  struct list_head entries;
-//}
-
- //This is the structure that stores the topology 
-struct topology {
-    SOCK link_sock;
-
-    unsigned long dest;
-
-    // Port for UDP
-    unsigned short remote_port;
-
-    int use;
-    int type; //TCP=0, UDP=1,VTP=2, can be extended so on
+    uint32_t src_id;
+    uint8_t src_type; //EDGE|INTERFACE|ANY
+} __attribute__((packed));
 
-    int next;
-    int prev;
-};
 
-struct sock_list {
-    SOCK sock;
-
-    int next;
-    int prev;
-};
-
-
-#define GENERAL_NIC 0
-
-struct ethAddr{
-  char addr[6];
-};
-
-struct vnet_if_device {
-    char name[50];
-    struct ethAddr device_addr;
+struct v3_vnet_pkt {
+    uint32_t size; 
     
-    int (*input)(uchar_t * pkt, uint_t size);
-    
-    void * data;
-};
+    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 data[ETHERNET_PACKET_LEN];
+	} __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
 
 
-struct device_list {
-    struct vnet_if_device *device;
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt);
 
-    int use;
-    int type;
+int v3_vnet_add_route(struct v3_vnet_route route);
 
-    int next;
-    int prev;
-};
+//int v3_vnet_del_route();
 
-// 14 (ethernet frame) + 20 bytes
-struct HEADERS {
-    char ethernetdest[6];
-    char ethernetsrc[6];
-    unsigned char ethernettype[2]; // indicates layer 3 protocol type
-    char ip[20];
-};
 
-#define FOREACH(iter, list, start) for (iter = start; iter != -1; iter = list[iter].next)
-#define FOREACH_SOCK(iter, socks, start) FOREACH(iter, socks, start)
-#define FOREACH_LINK(iter, links, start) FOREACH(iter, links, start)
-#define FOREACH_ROUTE(iter, routes, start) FOREACH(iter, routes, start)
-#define FOREACH_DEVICE(iter, devices, start) FOREACH(iter, devices, start)
 
+int V3_init_vnet();
 
-int v3_Send_pkt(uchar_t *buf, int length);
-int v3_Register_pkt_event(int (*netif_input)(uchar_t * pkt, uint_t size));
+//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
 
+int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6], 
+		    int (*dev_input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data), 
+		    void * priv_data);
 
-int vnet_send_pkt(char *buf, int length);
-int vnet_register_pkt_event(char *dev_name, int (*netif_input)(uchar_t * pkt, uint_t size), void *data);
 
+// temporary hack
 int v3_vnet_pkt_process();
 
-void v3_vnet_init();
+
+#endif
 
 #endif