X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fvnet.h;h=1e23169ed5a9819262e3f13f6a9f2b0cc616188d;hb=445de568353835d155ea96a163bb3459405b6446;hp=f76dbd1cfbbf787fc52ddab40a0cbda77abdcab2;hpb=e67f90ff8dbf5b58cd4930eba8b9907ea6a12d03;p=palacios.git diff --git a/palacios/include/devices/vnet.h b/palacios/include/devices/vnet.h index f76dbd1..1e23169 100644 --- a/palacios/include/devices/vnet.h +++ b/palacios/include/devices/vnet.h @@ -37,13 +37,8 @@ #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 ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX) -struct ethAddr{ - char addr[6]; -}; - -#define SOCK int #define TCP_TYPE 0 #define UDP_TYPE 1 @@ -56,24 +51,6 @@ struct ethAddr{ #define HANDLER_SUCCESS 0 */ -#define ANY "any" -#define NOT "not" -#define NONE "none" -#define EMPTY "empty" - -#define ANY_TYPE 0 -#define NOT_TYPE 1 -#define NONE_TYPE 2 -#define EMPTY_TYPE 3 - -#define INTERFACE "INTERFACE" -#define EDGE "EDGE" -#define ANY_SRC "ANY" - -#define INTERFACE_TYPE 0 -#define EDGE_TYPE 1 -#define ANY_SRC_TYPE 2 - //the routing entry struct routing { char src_mac[6]; @@ -145,10 +122,10 @@ struct device_list { // 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]; + 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)