Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Minor fix on vnet
[palacios.git] / palacios / src / palacios / vmm_vnet.c
index d68610c..bf3b2c6 100644 (file)
 
 
 struct ethernet_pkt {
-  uint32_t size;
-  uint16_t type;
-  char data[ETHERNET_PACKET_LEN];
+    uint32_t size; //size of data
+    uint16_t type;
+    struct udp_link_header ext_hdr; //possible externel header to applied to data before sent
+    char data[ETHERNET_PACKET_LEN];
 };
 
 
@@ -44,7 +45,7 @@ struct ethernet_pkt {
 struct in_pkt_header {
     char ethernetdest[6];
     char ethernetsrc[6];
-    unsigned char ethernettype[2]; // indicates layer 3 protocol type
+    unsigned char ethernettype[2]; //layer 3 protocol type
     char ip[20];
 };
 
@@ -57,18 +58,18 @@ struct in_pkt_header {
 static const uint_t hash_key_size = 16;
 
 struct link_table {
-    struct link_entry *links[MAX_LINKS];
+    struct link_entry * links[MAX_LINKS];
     uint16_t size;
 };
 
 struct routing_table {
-    struct routing_entry *routes[MAX_ROUTES];
+    struct routing_entry * routes[MAX_ROUTES];
     uint16_t size;
 };
 
 static struct link_table g_links;
 static struct routing_table g_routes;
-static struct gen_queue *g_inpkt_q;
+static struct gen_queue * g_inpkt_q;
 
 /* Hash key format:
  * 0-5:     src_eth_addr
@@ -76,7 +77,7 @@ static struct gen_queue *g_inpkt_q;
  * 12:      src type
  * 13-16:   src index
  */
-typedef char *route_hashkey_t;
+typedef char * route_hashkey_t;
 
 // This is the hash value, Format: 0: num_matched_routes, 1...n: matches[] -- TY
 struct route_cache_entry {
@@ -84,17 +85,17 @@ struct route_cache_entry {
     int * matches; 
 };
 
-//the route cache
-static struct hashtable *g_route_cache; 
+// the route cache
+static struct hashtable * g_route_cache; 
 
 
-static void print_packet(char *pkt, int size) {
+static void print_packet(uchar_t *pkt, int size) {
     PrintDebug("Vnet: print_data_packet: size: %d\n", size);
     v3_hexdump(pkt, size, NULL, 0);
 }
 
 #if 0
-static void print_packet_addr(char *pkt) {
+static void print_packet_addr(char * pkt) {
     PrintDebug("Vnet: print_packet_destination_addr: ");
     v3_hexdump(pkt + 8, 6, NULL, 0);
     
@@ -102,38 +103,52 @@ static void print_packet_addr(char *pkt) {
     v3_hexdump(pkt + 14, 6, NULL, 0);
 }
 
-static void print_device_addr(char *ethaddr) {
+static void print_device_addr(char * ethaddr) {
     PrintDebug("Vnet: print_device_addr: ");
     v3_hexdump(ethaddr, 6, NULL, 0);
 } 
 #endif
 
+static uint16_t ip_xsum(struct ip_header *ip_hdr, int hdr_len){
+    long sum = 0;
 
-//network connection functions 
-static inline void ethernet_packet_init(struct ethernet_pkt *pt, const char *data, const size_t size) 
-{
+    uint16_t *p = (uint16_t*) ip_hdr;
+    while(hdr_len > 1){
+        sum += *(p++);
+        if(sum & 0x80000000)
+            sum = (sum & 0xFFFF) + (sum >> 16);
+            hdr_len -= 2;
+        }
+    if(hdr_len) 
+        sum += (uint16_t) *(uchar_t *)p;
+          
+    while(sum>>16)
+        sum = (sum & 0xFFFF) + (sum >> 16);
+
+    return (uint16_t)~sum;
+}
+
+static inline void ethernet_packet_init(struct ethernet_pkt *pt, uchar_t *data, const size_t size) {
     pt->size = size;
     memcpy(pt->data, data, size);
 }
 
-static uint_t hash_from_key_fn(addr_t hashkey) 
-{    
+static uint_t hash_from_key_fn(addr_t hashkey) {    
     uint8_t * key = (uint8_t *)hashkey;
     return v3_hash_buffer(key, HASH_KEY_LEN);
 }
 
-static int hash_key_equal(addr_t key1, addr_t key2) 
-{
+static int hash_key_equal(addr_t key1, addr_t key2) {
     uint8_t * buf1 = (uint8_t *)key1;
     uint8_t * buf2 = (uint8_t *)key2;
     return (memcmp(buf1, buf2, HASH_KEY_LEN) == 0);
 }
 
-static int init_route_cache() 
-{
+static int init_route_cache() {
     g_route_cache = v3_create_htable(MIN_CACHE_SIZE, &hash_from_key_fn, &hash_key_equal);
 
-    if (g_route_cache == NULL){
+    if (g_route_cache == NULL) {
         PrintError("Vnet: Route Cache Initiate Failurely\n");
         return -1;
     }
@@ -142,11 +157,10 @@ static int init_route_cache()
 }
 
 static void make_hash_key(route_hashkey_t hashkey,
-                                                     char src_addr[6],
-                                                     char dest_addr[6],
-                                                     char src_type,
-                                                     int src_index) 
-{
+                         char src_addr[6],
+                         char dest_addr[6],
+                         char src_type,
+                         int src_index) {
     int j;
 
     for (j = 0; j < 6; j++) {
@@ -159,13 +173,12 @@ static void make_hash_key(route_hashkey_t hashkey,
     *(int *)(hashkey + 12) = src_index;
 }
 
-static int add_route_to_cache(route_hashkey_t hashkey, int num_matched_r, int *matches) 
-{
+static int add_route_to_cache(route_hashkey_t hashkey, int num_matched_r, int * matches) {
     struct route_cache_entry * new_entry = NULL;
     int i;
     
     new_entry = (struct route_cache_entry *)V3_Malloc(sizeof(struct route_cache_entry));
-    if (new_entry == NULL){
+    if (new_entry == NULL) {
        PrintError("Vnet: Malloc fails\n");
        return -1;
     }
@@ -174,7 +187,7 @@ static int add_route_to_cache(route_hashkey_t hashkey, int num_matched_r, int *m
 
     new_entry->matches = (int *)V3_Malloc(num_matched_r * sizeof(int));
     
-    if (new_entry->matches == NULL){
+    if (new_entry->matches == NULL) {
        PrintError("Vnet: Malloc fails\n");
        return -1;
     }
@@ -183,8 +196,8 @@ static int add_route_to_cache(route_hashkey_t hashkey, int num_matched_r, int *m
        new_entry->matches[i] = matches[i];
     }
     
-    //here, when v3_htable_insert return 0, it means insert fails
-    if (v3_htable_insert(g_route_cache, (addr_t)hashkey, (addr_t)new_entry) == 0){
+    // here, when v3_htable_insert return 0, it means insert fails
+    if (v3_htable_insert(g_route_cache, (addr_t)hashkey, (addr_t)new_entry) == 0) {
        PrintError("Vnet: Insert new route entry to cache failed\n");
        V3_Free(new_entry->matches);
        V3_Free(new_entry);
@@ -193,13 +206,12 @@ static int add_route_to_cache(route_hashkey_t hashkey, int num_matched_r, int *m
     return 0;
 }
 
-static int clear_hash_cache() 
-{
+static int clear_hash_cache() {
     v3_free_htable(g_route_cache, 1, 1);
                
     g_route_cache = v3_create_htable(MIN_CACHE_SIZE, hash_from_key_fn, hash_key_equal);
     
-    if (g_route_cache == NULL){
+    if (g_route_cache == NULL) {
         PrintError("Vnet: Route Cache Create Failurely\n");
         return -1;
     }
@@ -207,11 +219,10 @@ static int clear_hash_cache()
     return 0;
 }
 
-static int look_into_cache(route_hashkey_t hashkey, int *matches) 
-{
+static int look_into_cache(route_hashkey_t hashkey, int * matches) {
+    struct route_cache_entry * found = NULL;
     int n_matches = -1;
     int i = 0;
-    struct route_cache_entry * found = NULL;
     
     found = (struct route_cache_entry *)v3_htable_search(g_route_cache, (addr_t)hashkey);
    
@@ -226,8 +237,8 @@ static int look_into_cache(route_hashkey_t hashkey, int *matches)
     return n_matches;
 }
 
-static inline uint8_t hex_nybble_to_nybble(const uint8_t hexnybble) 
-{
+#ifdef CONFIG_DEBUG_VNET
+static inline uint8_t hex_nybble_to_nybble(const uint8_t hexnybble) {
     uint8_t x = toupper(hexnybble);
 
     if (isdigit(x)) {
@@ -237,14 +248,12 @@ static inline uint8_t hex_nybble_to_nybble(const uint8_t hexnybble)
     }
 }
 
-static inline uint8_t hex_byte_to_byte(const uint8_t hexbyte[2]) 
-{
+static inline uint8_t hex_byte_to_byte(const uint8_t hexbyte[2]) {
     return ((hex_nybble_to_nybble(hexbyte[0]) << 4) + 
            (hex_nybble_to_nybble(hexbyte[1]) & 0xf));
 }
 
-static inline void string_to_mac(const char *str, uint8_t mac[6]) 
-{
+static inline void string_to_mac(const char *str, uint8_t mac[6]) {
     int k;
 
     for (k = 0; k < 6; k++) {
@@ -252,56 +261,56 @@ static inline void string_to_mac(const char *str, uint8_t mac[6])
     }
 }
 
-static inline void mac_to_string(char mac[6], char * buf) 
-{
+static inline void mac_to_string(char mac[6], char * buf) {
     snprintf(buf, 20, "%x:%x:%x:%x:%x:%x", 
             mac[0], mac[1], mac[2],
             mac[3], mac[4], mac[5]);
 }
+#endif
 
-static int add_link_entry(struct link_entry *link)
-{ 
+static int __add_link_entry(struct link_entry * link) {
     int idx;
     
     for (idx = 0; idx < MAX_LINKS; idx++) {
        if (g_links.links[idx] == NULL) {
            g_links.links[idx] = link;
-           g_links.size ++;
+           g_links.size++;
            
            return idx;
        }
     }
-    
+
+    PrintError("No available Link entry\n");
     return -1;
 }
 
-static int add_route_entry(struct routing_entry *route)
-{ 
+static int __add_route_entry(struct routing_entry * route) {
     int idx;
     
     for (idx = 0; idx < MAX_ROUTES; idx++) {
        if (g_routes.routes[idx] == NULL) {
            g_routes.routes[idx] = route;
-           g_routes.size ++;
+           g_routes.size++;
            
            return idx;
        }
     }
-    
+
+    PrintError("No available route entry\n");
     return -1;
 }
 
 
-int vnet_add_route_entry(char src_mac[6],
-                                                       char dest_mac[6],
-                                                       int src_mac_qual,
-                                                       int dest_mac_qual,
-                                                       int link_idx,
-                                                       link_type_t link_type,
-                                                       int src,
-                                                       link_type_t src_type)
-{
-    struct routing_entry *new_route = (struct routing_entry *)V3_Malloc(sizeof(struct routing_entry));
+static int vnet_add_route_entry(char src_mac[6],
+                               char dest_mac[6],
+                               int src_mac_qual,
+                               int dest_mac_qual,
+                               int link_idx,
+                               link_type_t link_type,
+                               int src,
+                               link_type_t src_type) {
+    struct routing_entry * new_route = (struct routing_entry *)V3_Malloc(sizeof(struct routing_entry));
+    int idx = -1;
 
     memset(new_route, 0, sizeof(struct routing_entry));
 
@@ -320,35 +329,36 @@ int vnet_add_route_entry(char src_mac[6],
     new_route->src_link_idx = src;
     new_route->src_type = src_type;
 
-    int idx = -1;
-    if ((idx = add_route_entry(new_route)) == -1)
+    if ((idx = __add_route_entry(new_route)) == -1) {
+       PrintError("Could not add route entry\n");
         return -1;
+    }
     
     clear_hash_cache();
     
     return idx;
 }
 
-static void * delete_link_entry(int index) 
-{
-    struct link_entry *link = NULL;
-    void *ret = NULL;
+static void * __delete_link_entry(int index) {
+    struct link_entry * link = NULL;
+    void * ret = NULL;
     link_type_t type;
   
-    if (index >= MAX_LINKS || g_links.links[index] == NULL) {
+    if ((index >= MAX_LINKS) || (g_links.links[index] == NULL)) {
        return NULL;
     }
 
     link = g_links.links[index];
     type = g_links.links[index]->type;
 
-    if (type == LINK_INTERFACE)        
+    if (type == LINK_INTERFACE) {
        ret = (void *)g_links.links[index]->dst_dev;
-    else if (type == LINK_EDGE)
+    } else if (type == LINK_EDGE) {
        ret = (void *)g_links.links[index]->dst_link;
+    }
 
     g_links.links[index] = NULL;
-    g_links.size --;
+    g_links.size--;
 
     V3_Free(link);
        
@@ -362,8 +372,7 @@ static int find_route_entry(char src_mac[6],
                            int link_idx, 
                            link_type_t link_type, 
                            int src, 
-                           link_type_t src_type) 
-{
+                           link_type_t src_type) {
     int i;
     char temp_src_mac[6];
     char temp_dest_mac[6];
@@ -380,16 +389,16 @@ static int find_route_entry(char src_mac[6],
        memset(temp_dest_mac, 0, 6);
     }
     
-    for (i = 0; i<MAX_ROUTES; i++) {
+    for (i = 0; i < MAX_ROUTES; i++) {
        if (g_routes.routes[i] != NULL) {
            if ((memcmp(temp_src_mac, g_routes.routes[i]->src_mac, 6) == 0) && 
-                 (memcmp(temp_dest_mac, g_routes.routes[i]->dest_mac, 6) == 0) &&
-                 (g_routes.routes[i]->src_mac_qual == src_mac_qual) &&
-                 (g_routes.routes[i]->dest_mac_qual == dest_mac_qual)  &&
-                 ((link_type == LINK_ANY) || 
-                 ((link_type == g_routes.routes[i]->link_type) && (g_routes.routes[i]->link_idx == link_idx))) &&
-                 ((src_type == LINK_ANY) || 
-                 ((src_type == g_routes.routes[i]->src_type) && (g_routes.routes[i]->src_link_idx == src)))) {
+               (memcmp(temp_dest_mac, g_routes.routes[i]->dest_mac, 6) == 0) &&
+               (g_routes.routes[i]->src_mac_qual == src_mac_qual) &&
+               (g_routes.routes[i]->dest_mac_qual == dest_mac_qual)  &&
+               ( (link_type == LINK_ANY) || 
+                 ((link_type == g_routes.routes[i]->link_type) && (g_routes.routes[i]->link_idx == link_idx))) &&
+               ( (src_type == LINK_ANY) || 
+                 ((src_type == g_routes.routes[i]->src_type) && (g_routes.routes[i]->src_link_idx == src)))) {
                return i;
            }
         } 
@@ -398,16 +407,17 @@ static int find_route_entry(char src_mac[6],
     return -1;
 }
 
-static int delete_route_entry(int index) 
-{
-    struct routing_entry *route;
+static int __delete_route_entry(int index) {
+    struct routing_entry * route;
 
-    if (index >= MAX_ROUTES || g_routes.routes[index] == NULL)
-               return -1;
+    if ((index >= MAX_ROUTES) || (g_routes.routes[index] == NULL)) {
+       PrintDebug("VNET: wrong index in delete route entry %d\n", index);
+       return -1;
+    }
 
     route = g_routes.routes[index];
     g_routes.routes[index] = NULL;
-    g_routes.size --;
+    g_routes.size--;
 
     V3_Free(route);
 
@@ -416,27 +426,30 @@ static int delete_route_entry(int index)
     return 0;
 }
 
-int vnet_delete_route_entry_by_addr(char src_mac[6], 
-                                   char dest_mac[6], 
-                                   int src_mac_qual, 
-                                   int dest_mac_qual, 
-                                   int link_idx, 
-                                   link_type_t type, 
-                                   int src, 
-                                   link_type_t src_type) 
-{
+static int vnet_delete_route_entry_by_addr(char src_mac[6], 
+                                          char dest_mac[6], 
+                                          int src_mac_qual, 
+                                          int dest_mac_qual, 
+                                          int link_idx, 
+                                          link_type_t type, 
+                                          int src, 
+                                          link_type_t src_type) {
     int index = find_route_entry(src_mac, dest_mac, src_mac_qual, 
                                 dest_mac_qual, link_idx, type, src, src_type);
     
     if (index == -1) {
+       PrintDebug("VNET: wrong in delete route entry %d\n", index);
        return -1;
     }
     
-    return delete_route_entry(index);
+    return __delete_route_entry(index);
 }
 
-static int match_route(uint8_t *src_mac, uint8_t *dst_mac, link_type_t src_type, int src_index, int *matches)
-{ 
+static int match_route(uint8_t * src_mac, 
+                      uint8_t * dst_mac, 
+                      link_type_t src_type, 
+                      int src_index, 
+                      int * matches) { 
     int values[MAX_ROUTES];
     int matched_routes[MAX_ROUTES];
     
@@ -446,21 +459,22 @@ static int match_route(uint8_t *src_mac, uint8_t *dst_mac, link_type_t src_type,
     int no = 0;
     int exact_match = 0;
 
-    for(i = 0; i<MAX_ROUTES; i++) {
+    for(i = 0; i < MAX_ROUTES; i++) {
        if (g_routes.routes[i] != NULL){
-           if ((g_routes.routes[i]->src_type != LINK_ANY) &&
-                ((g_routes.routes[i]->src_type != src_type) ||
-                ((g_routes.routes[i]->src_link_idx != src_index) &&
-                  (g_routes.routes[i]->src_link_idx != -1)))) {
+           if ( (g_routes.routes[i]->src_type != LINK_ANY) &&
+                ( (g_routes.routes[i]->src_type != src_type) ||
+                  ( (g_routes.routes[i]->src_link_idx != src_index) &&
+                    (g_routes.routes[i]->src_link_idx != -1)))) {
                PrintDebug("Vnet: MatchRoute: Source route is on and does not match\n");
                continue;
            }
        
-           if ((g_routes.routes[i]->dest_mac_qual == MAC_ANY) &&
-                (g_routes.routes[i]->src_mac_qual == MAC_ANY)) {      
-                 matched_routes[num_matches] = i;
-                 values[num_matches] = 3;
-                 num_matches++;
+           if ( (g_routes.routes[i]->dest_mac_qual == MAC_ANY) &&
+                (g_routes.routes[i]->src_mac_qual == MAC_ANY)) {      
+
+               matched_routes[num_matches] = i;
+               values[num_matches] = 3;
+               num_matches++;
            }
        
            if (memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) == 0) {
@@ -468,14 +482,14 @@ static int match_route(uint8_t *src_mac, uint8_t *dst_mac, link_type_t src_type,
                    if (g_routes.routes[i]->dest_mac_qual == MAC_ANY) {
                        matched_routes[num_matches] = i;
                        values[num_matches] = 6;
-                   
+                       
                        num_matches++;
                    } else if (memcmp((void *)&g_routes.routes[i]->dest_mac, (void *)dst_mac, 6) == 0) {
                        if (g_routes.routes[i]->dest_mac_qual != MAC_NOT) {   
-                            matched_routes[num_matches] = i;
-                            values[num_matches] = 8;    
-                            exact_match = 1;
-                            num_matches++;
+                           matched_routes[num_matches] = i;
+                           values[num_matches] = 8;    
+                           exact_match = 1;
+                           num_matches++;
                        }
                    }
                }
@@ -486,7 +500,7 @@ static int match_route(uint8_t *src_mac, uint8_t *dst_mac, link_type_t src_type,
                    if (g_routes.routes[i]->src_mac_qual == MAC_ANY) {
                        matched_routes[num_matches] = i;
                        values[num_matches] = 6;
-                   
+                       
                        num_matches++;
                    } else if (memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) == 0) {
                        if (g_routes.routes[i]->src_mac_qual != MAC_NOT) {
@@ -500,45 +514,45 @@ static int match_route(uint8_t *src_mac, uint8_t *dst_mac, link_type_t src_type,
                }
            }
        
-           if ((g_routes.routes[i]->dest_mac_qual == MAC_NOT) &&
-                 (memcmp((void *)&g_routes.routes[i]->dest_mac, (void *)dst_mac, 6) != 0)) {
+           if ( (g_routes.routes[i]->dest_mac_qual == MAC_NOT) &&
+                (memcmp((void *)&g_routes.routes[i]->dest_mac, (void *)dst_mac, 6) != 0)) {
                if (g_routes.routes[i]->src_mac_qual == MAC_ANY) {
-                    matched_routes[num_matches] = i;
-                    values[num_matches] = 5;               
-                    num_matches++;    
+                   matched_routes[num_matches] = i;
+                   values[num_matches] = 5;                
+                   num_matches++;    
                } else if (memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) == 0) {
-                    if (g_routes.routes[i]->src_mac_qual != MAC_NOT) {      
-                        matched_routes[num_matches] = i;
-                        values[num_matches] = 7;                     
-                        num_matches++;
-                    }
+                   if (g_routes.routes[i]->src_mac_qual != MAC_NOT) {      
+                       matched_routes[num_matches] = i;
+                       values[num_matches] = 7;                      
+                       num_matches++;
+                   }
                }
            }
-       
-           if ((g_routes.routes[i]->src_mac_qual == MAC_NOT) &&
-               (memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) != 0)) {
-                if (g_routes.routes[i]->dest_mac_qual == MAC_ANY) {
-                     matched_routes[num_matches] = i;
-                     values[num_matches] = 5;      
-                     num_matches++;
-                } else if (memcmp((void *)&g_routes.routes[i]->dest_mac, (void *)dst_mac, 6) == 0) {
-                     if (g_routes.routes[i]->dest_mac_qual != MAC_NOT) { 
-                         matched_routes[num_matches] = i;
-                         values[num_matches] = 7;
-                         num_matches++;
-                     }
-                }
+           
+           if ( (g_routes.routes[i]->src_mac_qual == MAC_NOT) &&
+                (memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) != 0)) {
+               if (g_routes.routes[i]->dest_mac_qual == MAC_ANY) {
+                   matched_routes[num_matches] = i;
+                   values[num_matches] = 5;        
+                   num_matches++;
+               } else if (memcmp((void *)&g_routes.routes[i]->dest_mac, (void *)dst_mac, 6) == 0) {
+                   if (g_routes.routes[i]->dest_mac_qual != MAC_NOT) { 
+                       matched_routes[num_matches] = i;
+                       values[num_matches] = 7;
+                       num_matches++;
+                   }
+               }
            }
        }
-    }//end for
+    } // end for
     
-    for(i = 0; i<MAX_ROUTES; i++) {
-       if ((memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) == 0) &&
+    for (i = 0; i < MAX_ROUTES; i++) {
+       if ( (memcmp((void *)&g_routes.routes[i]->src_mac, (void *)src_mac, 6) == 0) &&
             (g_routes.routes[i]->dest_mac_qual == MAC_NONE) &&
-            ((g_routes.routes[i]->src_type == LINK_ANY) ||
-            ((g_routes.routes[i]->src_type == src_type) &&
-            ((g_routes.routes[i]->src_link_idx == src_index) ||
-             (g_routes.routes[i]->src_link_idx == -1))))) {
+            ( (g_routes.routes[i]->src_type == LINK_ANY) ||
+              ( (g_routes.routes[i]->src_type == src_type) &&
+                ( (g_routes.routes[i]->src_link_idx == src_index) ||
+                  (g_routes.routes[i]->src_link_idx == -1))))) {
            matched_routes[num_matches] = i;
            values[num_matches] = 4;
            PrintDebug("Vnet: MatchRoute: We matched a default route (%d)\n", i);
@@ -566,102 +580,7 @@ static int match_route(uint8_t *src_mac, uint8_t *dst_mac, link_type_t src_type,
     return no;
 }
 
-#if 0
-// TODO: To be removed
-static int process_udpdata() 
-{
-    struct ethernet_pkt * pt;
-
-    uint32_t dest = 0;
-    uint16_t remote_port = 0;
-    SOCK link_sock = g_udp_sockfd;
-    int length = sizeof(struct ethernet_pkt) - (2 * sizeof(int));   //minus the "size" and "type" 
-
-    //run in a loop to get packets from outside network, adding them to the incoming packet queue
-    while (1) {
-       pt = (struct ethernet_pkt *)V3_Malloc(sizeof(struct ethernet_pkt));
-
-       if (pt == NULL){
-           PrintError("Vnet: process_udp: Malloc fails\n");
-           continue;
-       }
-       
-       PrintDebug("Vnet: route_thread: socket: [%d]. ready to receive from ip [%x], port [%d] or from VMs\n", link_sock, (uint_t)dest, remote_port);
-       pt->size = V3_RecvFrom_IP( link_sock, dest, remote_port, pt->data, length);
-       PrintDebug("Vnet: route_thread: socket: [%d] receive from ip [%x], port [%d]\n", link_sock, (uint_t)dest, remote_port);
-       
-       if (pt->size <= 0) {
-           PrintDebug("Vnet: process_udp: receiving packet from UDP fails\n");
-           V3_Free(pt);
-           return -1;
-       }
-       
-       PrintDebug("Vnet: process_udp: get packet\n");
-       print_packet(pt->data, pt->size);
-    }
-}
-
-// TODO: To be removed
-static int indata_handler( )
-{
-      if (!use_tcp)
-          process_udpdata();     
-
-      return 0;   
-}
-
-// TODO: To be removed
-static int start_recv_data()
-{
-       if (use_tcp){
-               
-       } else {
-               SOCK udp_data_socket;
-  
-               if ((udp_data_socket = V3_Create_UDP_Socket()) < 0){
-                       PrintError("VNET: Can't setup udp socket\n");
-                       return -1; 
-               }
-               PrintDebug("Vnet: vnet_setup_udp: get socket: %d\n", udp_data_socket);
-               g_udp_sockfd = udp_data_socket;
-
-               store_topologies(udp_data_socket);
-
-               if (V3_Bind_Socket(udp_data_socket, vnet_udp_port) < 0){ 
-                       PrintError("VNET: Can't bind socket\n");
-                       return -1;
-               }
-               PrintDebug("VNET: vnet_setup_udp: bind socket successful\n");
-       }
-
-       V3_CREATE_THREAD(&indata_handler, NULL, "VNET_DATA_HANDLER");
-       return 0;
-}
-
-static void store_test_topologies(SOCK fd) 
-{
-    int i;
-    int src_mac_qual = MAC_ANY;
-    int dest_mac_qual = MAC_ANY;
-    uint_t dest;
-#ifndef VNET_SERVER
-    dest = (0 | 172 << 24 | 23 << 16 | 1 );
-    PrintDebug("VNET: store_topologies. NOT VNET_SERVER, dest = %x\n", dest);
-#else
-    dest = (0 | 172 << 24 | 23 << 16 | 2 );
-    PrintDebug("VNET: store_topologies. VNET_SERVER, dest = %x\n", dest);
-#endif
-
-    int type = UDP_TYPE;
-    int src = 0;
-    int src_type= LINK_ANY; //ANY_SRC_TYPE
-    int data_port = 22;
-}
-
-#endif
-
-static int handle_one_pkt(struct ethernet_pkt * pkt) 
-{
+static int handle_one_pkt(struct ethernet_pkt *pkt) {
     int src_link_index = -1;   //the value of src_link_index of udp always is 0
     int i;
     char src_mac[6];
@@ -671,6 +590,8 @@ static int handle_one_pkt(struct ethernet_pkt * pkt)
     int num_matched_routes = 0;
 
     struct in_pkt_header header;
+
+    char hash_key[hash_key_size];
   
     // get the ethernet and ip headers from the packet
     memcpy((void *)&header, (void *)pkt->data, sizeof(header));
@@ -686,111 +607,148 @@ static int handle_one_pkt(struct ethernet_pkt * pkt)
     
     PrintDebug("Vnet: HandleDataOverLink. SRC(%s), DEST(%s)\n", src_str, dest_str);
 #endif
-    
-    char hash_key[hash_key_size];
-    make_hash_key(hash_key, src_mac, dst_mac, LINK_EDGE, src_link_index);//link_edge -> pt->type???
+
+    // link_edge -> pt->type???
+    make_hash_key(hash_key, src_mac, dst_mac, LINK_EDGE, src_link_index); 
     
     num_matched_routes = look_into_cache((route_hashkey_t)hash_key, matches);
     
-    if (num_matched_routes == -1) {  //no match
+    if (num_matched_routes == -1) {  
+    // no match in the cache
         num_matched_routes = match_route(src_mac, dst_mac, LINK_ANY, src_link_index, matches);
        
-        if (num_matched_routes > 0) {
+        if (num_matched_routes > 0) {
             add_route_to_cache(hash_key, num_matched_routes,matches);      
         }
     }
     
     PrintDebug("Vnet: HandleDataOverLink: Matches=%d\n", num_matched_routes);
     
-    for (i = 0; i < num_matched_routes; i++) {
+    for (i = 0; i < num_matched_routes; i++) {//send packet to all destinations
         int route_index = -1;
         int link_index = -1;
-        int pkt_len = 0;
-       
+        int pkt_len = 0;
+        struct link_entry * link = NULL;
+
         route_index = matches[i];
        
         PrintDebug("Vnet: HandleDataOverLink: Forward packet from link according to Route entry %d\n", route_index);
+       
+        link_index = g_routes.routes[route_index]->link_idx;
 
-        link_index = g_routes.routes[route_index]->link_idx;
-        if (link_index < 0 || link_index > MAX_LINKS)
+        if ((link_index < 0) || 
+            (link_index > MAX_LINKS) || 
+            (g_links.links[link_index] == NULL)) {
             continue;
-        
-        struct link_entry *link = g_links.links[link_index];
-        if (link == NULL)
-            continue;
-        
-        pkt_len = pkt->size;
+        }
+       
+        link = g_links.links[link_index];
+        pkt_len = pkt->size;
         if (g_routes.routes[route_index]->link_type == LINK_EDGE) {
 
-            // TODO: apply the header in the beginning of the packet to be sent
-            if ((link->dst_link->input(pkt->data, pkt_len, NULL)) != pkt_len)
-                return -1;
+             //apply the header in the beginning of the packet to be sent
+            if (link->dst_link->pro_type == UDP_TYPE) {
+                struct udp_link_header *hdr = &(link->dst_link->vnet_header);
+                struct ip_header *ip = &hdr->ip_hdr;
+                struct udp_header *udp = &hdr->udp_hdr;
+                  udp->len = pkt_len + sizeof(struct udp_header);
+                  ip->total_len = pkt_len + sizeof(struct udp_header) + sizeof(struct ip_header);
+                  ip->cksum = ip_xsum(ip, sizeof(struct ip_header));
+               
+                int hdr_size = sizeof(struct udp_link_header);
+                memcpy(&pkt->ext_hdr, hdr, hdr_size);
+
+                pkt_len += hdr_size;
+                if ((link->dst_link->input((uchar_t *)&pkt->ext_hdr, pkt_len, link->dst_link->private_data)) != pkt_len) {
+                    PrintDebug("VNET: Packet not sent properly\n");
+                    return -1;
+                }
+            }else {
+                PrintDebug("VNET: Link protocol type not support\n");
+                return -1;
+            }
         } else if (g_routes.routes[route_index]->link_type == LINK_INTERFACE) {
-          
-      
-            if ((link->dst_link->input(pkt->data, pkt_len, NULL)) != pkt_len)
-                return -1;
+            if ((link->dst_dev->input(pkt->data, pkt_len, link->dst_dev->private_data)) != pkt_len) {
+                  PrintDebug("VNET: Packet not sent properly\n");
+                  return -1;
+            }
         } else {
-            PrintError("Vnet: Wrong Edge type\n");
-            return -1;
+            PrintDebug("Vnet: Wrong Edge type\n");
+            return -1;
         }
     }
-
-     return 0;
+    
+    return 0;
 }
 
-static int send_ethernet_pkt(char *buf, int length) 
-{
-       struct ethernet_pkt *pt;
+static int send_ethernet_pkt(uchar_t *data, int len) {
+    struct ethernet_pkt *pkt;
 
-       pt = (struct ethernet_pkt *)V3_Malloc(sizeof(struct ethernet_pkt));
-       ethernet_packet_init(pt, buf, length);  //====here we copy sending data once 
+    pkt = (struct ethernet_pkt *)V3_Malloc(sizeof(struct ethernet_pkt));
+    memset(pkt, 0, sizeof(struct ethernet_pkt));
+
+    if(pkt == NULL){
+        PrintError("VNET: Memory allocate fails\n");
+        return -1;
+    }
        
-       PrintDebug("VNET: vm_send_pkt: transmitting packet: (size:%d)\n", (int)pt->size);
-       print_packet((char *)buf, length);
+    ethernet_packet_init(pkt, data, len);  //====here we copy sending data once 
        
-       v3_enqueue(g_inpkt_q, (addr_t)pt);
+    PrintDebug("VNET: vm_send_pkt: transmitting packet: (size:%d)\n", (int)pkt->size);
+    print_packet((char *)data, len);
+    
+    v3_enqueue(g_inpkt_q, (addr_t)pkt);
 
-       return 0;
+    return 0;
 }
 
-int v3_vnet_send_pkt(uchar_t *buf, int length) 
-{
-    PrintDebug("VNET: In V3_Send_pkt: pkt length %d\n", length);
+//send raw ethernet packet
+int v3_vnet_send_rawpkt(uchar_t * buf, int len, void *private_data) {
+    PrintDebug("VNET: In V3_Send_pkt: pkt length %d\n", len);
     
-    return send_ethernet_pkt((char *)buf, length);
+    return send_ethernet_pkt(buf, len);
+}
+
+//sending the packet from Dom0, should remove the link header
+int v3_vnet_send_udppkt(uchar_t * buf, int len, void *private_data) {
+    PrintDebug("VNET: In V3_Send_pkt: pkt length %d\n", len);
+
+    uint_t hdr_len = sizeof(struct udp_link_header);
+   
+    return send_ethernet_pkt((uchar_t *)(buf+hdr_len), len - hdr_len);
 }
 
-static int search_device(char *device_name) 
-{
+static int search_device(char * device_name) {
     int i;
 
     for (i = 0; i < MAX_LINKS; i++) {
-        if (g_links.links[i] != NULL && g_links.links[i]->type == LINK_INTERFACE) {
-           if (!strcmp(device_name, g_links.links[i]->dst_dev->name)) {
+        if ((g_links.links[i] != NULL) && (g_links.links[i]->type == LINK_INTERFACE)) {
+           if (strcmp(device_name, g_links.links[i]->dst_dev->name) == 0) {
                return i;
            }
         }
     }
-    
+
     return -1;
 }
 
-int vnet_register_device(struct vm_device *vdev, 
-                                                  char *dev_name, 
-                                                  uchar_t mac[6], 
-                                                  int (*netif_input)(uchar_t * pkt, uint_t size, void *private_data), 
-                                                  void *data) 
-{
-    struct vnet_if_device *if_dev;
+int vnet_register_device(struct vm_device * vdev, 
+                        char * dev_name, 
+                        uchar_t mac[6], 
+                        int (*netif_input)(uchar_t * pkt, uint_t size, void * private_data), 
+                        void * data) {
+    struct vnet_if_device * if_dev;
 
     int idx = search_device(dev_name);
-    if (idx != -1)
+
+    if (idx != -1) {
+       PrintDebug("VNET: register device: Already has device with the name %s\n", dev_name);
        return -1;
+    }
     
-    if_dev = (struct vnet_if_device *)V3_Malloc(sizeof(struct vnet_if_device));
+    if_dev = (struct vnet_if_device *)(sizeof(struct vnet_if_device));
     
-    if (if_dev == NULL){
+    if (if_dev == NULL) {
        PrintError("VNET: Malloc fails\n");
        return -1;
     }
@@ -801,28 +759,32 @@ int vnet_register_device(struct vm_device *vdev,
     if_dev->input = netif_input;
     if_dev->private_data = data;
 
-    struct link_entry *link = (struct link_entry *)V3_Malloc(sizeof(struct link_entry));
+    struct link_entry * link = (struct link_entry *)(sizeof(struct link_entry));
 
     link->type = LINK_INTERFACE;
     link->dst_dev = if_dev;
 
-    idx = add_link_entry(link);
+    idx = __add_link_entry(link);
+
+    PrintDebug("VNET: Add device %s to link table, idx %d", dev_name, idx);
     
     return idx;
 }
 
-int vnet_unregister_device(char *dev_name) 
-{
+#if 0
+static int vnet_unregister_device(char * dev_name) {
     int idx;
 
     idx = search_device(dev_name);
     
     if (idx == -1) {
+       PrintDebug("VNET: No device with name %s found\n", dev_name);
         return -1;
     }
 
-    struct vnet_if_device *device = (struct vnet_if_device *)delete_link_entry(idx);
+    struct vnet_if_device * device = (struct vnet_if_device *)__delete_link_entry(idx);
     if (device == NULL) {
+       PrintError("VNET: Device %s not in the link table %d, something may be wrong in link table\n", dev_name, idx);
        return -1;
     }
 
@@ -831,46 +793,46 @@ int vnet_unregister_device(char *dev_name)
     return idx;
 }
 
-int v3_vnet_pkt_process() 
-{
-    struct ethernet_pkt *pt;
+#endif
+
+int v3_vnet_pkt_process() {
+    struct ethernet_pkt * pkt;
 
     PrintDebug("VNET: In vnet_check\n");
        
-    while ((pt = (struct ethernet_pkt *)v3_dequeue(g_inpkt_q)) != NULL) {
-       PrintDebug("VNET: In vnet_check: pt length %d, pt type %d\n", (int)pt->size, (int)pt->type);
-       v3_hexdump(pt->data, pt->size, NULL, 0);
+    while ((pkt = (struct ethernet_pkt *)v3_dequeue(g_inpkt_q)) != NULL) {
+       PrintDebug("VNET: In vnet_check: pt length %d, pt type %d\n", (int)pkt->size, (int)pkt->type);
+       v3_hexdump(pkt->data, pkt->size, NULL, 0);
        
-       if(handle_one_pkt(pt)) {
+       if (handle_one_pkt(pkt)) {
            PrintDebug("VNET: vnet_check: handle one packet!\n");  
-       }else {
+       } else {
            PrintError("VNET: vnet_check: fail to forward one packet, discard it!\n"); 
        }
        
-       V3_Free(pt); //be careful here
+       V3_Free(pkt); // be careful here
     }
     
     return 0;
 }
 
 
-static void init_empty_link_table() 
-{
+static void init_empty_link_table() {
     int i;
 
-    for (i = 0; i < MAX_LINKS; i++)
+    for (i = 0; i < MAX_LINKS; i++) {
         g_links.links[i] = NULL;
+    }
 
-       
     g_links.size = 0;
 }
 
-static void init_empty_route_table() 
-{      
+static void init_empty_route_table() { 
     int i;
 
-    for (i = 0; i < MAX_ROUTES; i++) 
+    for (i = 0; i < MAX_ROUTES; i++) {
         g_routes.routes[i] = NULL;
+    }
 
     g_links.size = 0;
 }
@@ -881,35 +843,125 @@ static void init_tables() {
     init_route_cache();
 }
 
-static void init_pkt_queue()
-{
+static void init_pkt_queue() {
     PrintDebug("VNET Init package receiving queue\n");
 
     g_inpkt_q = v3_create_queue();
     v3_init_queue(g_inpkt_q);
 }
 
-#if 0
-// TODO: 
-static int init_routing_tables(struct routing_entry *route_tab, uint16_t size)
-{
-    //struct routing_entry *route;
+static void free_link_mem(struct link_entry *link){
+    V3_Free(link->dst_dev);
+    V3_Free(link);
+}
 
+// TODO:
+static int addto_routing_link_tables(struct routing_entry *route_tab, 
+                                                       uint16_t num_routes,
+                                                       struct link_entry *link_tab,
+                                                       uint16_t num_links){
+    struct routing_entry *route, *new_route;
+    struct link_entry *link, *new_link;
+    int new_idx;
+    int i;
+    int link_idxs[MAX_LINKS];
 
-    return 0;
-}
+    //add all of the links first, record their new indexs
+    for (i = 0; i < num_links; i++) {
+       link_idxs[i] = -1;
+       link = &link_tab[i];
+       new_link = (struct link_entry *)V3_Malloc(sizeof(struct link_entry));
+
+       if (new_link == NULL){
+           PrintError("VNET: Memory allocate error\n");
+           return -1;
+       }
 
+       new_link->type = link->type;
+       
+       //TODO: how to set the input parameters here
+       if (link->type == LINK_EDGE){
+           struct vnet_if_device *ifdev = (struct vnet_if_device *)V3_Malloc(sizeof(struct vnet_if_device));
+
+           if (ifdev == NULL){
+               PrintError("VNET: Memory allocate fails\n");
+               return -1;
+           }
+           
+           memcpy(ifdev->name, link->dst_dev->name, DEVICE_NAME_LEN);
+
+           // TODO:
+           //ifdev->mac_addr
+           //ifdev->input
+           //ifdev->private_data
+
+           new_link->dst_dev = ifdev;    
+       }else if (link->type == LINK_INTERFACE){
+           struct vnet_if_link *iflink = (struct vnet_if_link *)V3_Malloc(sizeof(struct vnet_if_link));
+
+           if (iflink == NULL){
+               PrintError("VNET: Memory allocate fails\n");
+               return -1;
+           }
+           iflink->pro_type = link->dst_link->pro_type;
+           iflink->dest_ip = link->dst_link->dest_ip;
+           iflink->dest_port = link->dst_link->dest_port;
+           memcpy(&iflink->vnet_header, &link->dst_link->vnet_header, sizeof(struct udp_link_header));
+
+           // TODO:
+           //iflink->input = 
+           //iflink->private_data = 
+           
+           new_link->dst_link = iflink;
+       }else{
+           PrintDebug("VNET: invalid link type\n");
+           V3_Free(new_link);
+           continue;
+       }
+       
+       new_idx = __add_link_entry(new_link);
+       if (new_idx < 0) {
+           PrintError("VNET: Adding link fails\n");
+           free_link_mem(new_link);
+           continue;
+       }       
+       link_idxs[i] = new_idx;
+    }
+
+    //add all of routes, replace with new link indexs
+    for (i = 0; i < num_routes; i++) {
+       route = &route_tab[i];
+       if (route->link_idx < 0 || route->link_idx >= num_links || 
+           ((route->src_link_idx != -1) && 
+             (route->src_link_idx < 0 || route->src_link_idx >= num_links))){
+           PrintError("VNET: There is error in the intial tables data from guest\n");
+           continue;
+       }
+
+       new_route = (struct routing_entry *)V3_Malloc(sizeof(struct routing_entry));
+
+       if (new_route == NULL){
+           PrintError("VNET: Memory allocate fails\n");
+           return -1;
+       }
+       memcpy(new_route, route, sizeof(struct routing_entry));
+       
+       new_route->link_idx = link_idxs[new_route->link_idx];
+               
+       if (route->src_link_idx != -1)
+           new_route->src_link_idx = link_idxs[new_route->src_link_idx];
+
+       if((__add_route_entry(new_route)) == -1){
+           PrintDebug("VNET: Adding route fails");
+           V3_Free(new_route);
+       }
+       new_route = NULL;       
+    }
 
-// TODO: 
-static int init_link_tables(struct link_entry *link_tab, uint16_t size)
-{
-    //struct link_entry *link;
 
     return 0;
 }
 
-#endif
-
 struct table_init_info {
     addr_t routing_table_start;
     uint16_t routing_table_size;
@@ -917,33 +969,46 @@ struct table_init_info {
     uint16_t link_table_size;
 };
 
-static int handle_init_tables_hcall(struct guest_info * info, uint_t hcall_id, void *priv_data) 
-{
-    uint8_t *buf = NULL;
-    addr_t info_addr = (addr_t)info->vm_regs.rcx;
+//add the guest specified routes and links to the tables
+static int handle_init_tables_hcall(struct guest_info * info, uint_t hcall_id, void * priv_data) {
+    addr_t guest_addr = (addr_t)info->vm_regs.rcx;
+    addr_t info_addr, route_addr, link_addr;
+    struct table_init_info *init_info;
+    struct link_entry *link_array;
+    struct routing_entry *route_array;   
 
-    if (guest_va_to_host_va(info, info_addr, (addr_t *)&(buf)) == -1) {
-       PrintError("Could not translate buffer address\n");
+    if (guest_va_to_host_va(info, guest_addr, &info_addr) == -1) {
+       PrintError("VNET: Could not translate guest address\n");
        return -1;
     }
 
-    //struct table_init_info *init_info = (struct table_init_info *)buf;
-    
+    init_info = (struct table_init_info *)info_addr;
+
+    if (guest_va_to_host_va(info, init_info->routing_table_start, &route_addr) == -1) {
+       PrintError("VNET: Could not translate guest address\n");
+       return -1;
+    }
+    route_array = (struct routing_entry *)route_addr;
+
+    if (guest_va_to_host_va(info, init_info->link_table_start, &link_addr) == -1) {
+       PrintError("VNET: Could not translate guest address\n");
+       return -1;
+    }  
+    link_array = (struct link_entry *)link_addr;
+
+    addto_routing_link_tables(route_array, init_info->routing_table_size, link_array, init_info->link_table_size);
     
     return 0;
 }
 
 
-void v3_vnet_init(struct guest_info *vm) 
-{
+void v3_vnet_init(struct guest_info * vm) {
     init_tables();
     init_pkt_queue();
        
     v3_register_hypercall(vm, VNET_INITAB_HCALL, handle_init_tables_hcall, NULL);
 
-    //store_test_topologies(udp_data_socket); 
-
-    PrintDebug("VNET Initied\n");
+    PrintDebug("VNET Initialized\n");
 }