changing time measurement from milliseconds to microseconds

[oweals/gnunet.git] / src / vpn / gnunet-service-vpn.c

diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 7844df15b16b7c8445b48d606766d6157e04aaf9..e2cf3e5c9a162b8a03b8e4cee634ef454d421db8 100644 (file)
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -785,9 +785,11 @@ handle_regex_result (void *cls,
   GNUNET_REGEX_search_cancel (ts->search);
   ts->search = NULL;
   ts->tunnel = GNUNET_MESH_tunnel_create (mesh_handle,
-                                         ts,
+                                          ts,
                                           id,
-                                         PORT_VPN);
+                                          PORT_VPN,
+                                          GNUNET_YES,
+                                          GNUNET_NO);
 }
 
 
@@ -827,8 +829,10 @@ create_tunnel_to_destination (struct DestinationEntry *de,
   {
     ts->tunnel = GNUNET_MESH_tunnel_create (mesh_handle,
                                            ts,
-                                            &de->details.service_destination.target,
-                                           PORT_VPN);
+                        &de->details.service_destination.target,
+                                           PORT_VPN,
+                        GNUNET_YES,
+                        GNUNET_NO);
     if (NULL == ts->tunnel)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -851,7 +855,7 @@ create_tunnel_to_destination (struct DestinationEntry *de,
     {
       char address[GNUNET_TUN_IPV4_REGEXLEN];
 
-      GNUNET_TUN_ipv4toregex (&de->details.exit_destination.ip.v4,
+      GNUNET_TUN_ipv4toregexsearch (&de->details.exit_destination.ip.v4,
                   "255.255.255.255", address);
       GNUNET_asprintf (&policy, "%s%s%s",
                        GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
@@ -863,7 +867,7 @@ create_tunnel_to_destination (struct DestinationEntry *de,
     {
       char address[GNUNET_TUN_IPV6_REGEXLEN];
       
-      GNUNET_TUN_ipv6toregex (&de->details.exit_destination.ip.v6,
+      GNUNET_TUN_ipv6toregexsearch (&de->details.exit_destination.ip.v6,
                   128, address);
       GNUNET_asprintf (&policy, "%s%s%s",
                        GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
@@ -1116,7 +1120,7 @@ route_packet (struct DestinationEntry *destination,
     ts->destination_port = destination_port;
     ts->heap_node = GNUNET_CONTAINER_heap_insert (tunnel_heap,
                                                  ts,
-                                                 GNUNET_TIME_absolute_get ().abs_value);
+                                                 GNUNET_TIME_absolute_get ().abs_value_us);
     GNUNET_assert (GNUNET_YES ==
                   GNUNET_CONTAINER_multihashmap_put (tunnel_map,
                                                      &key,
@@ -1133,7 +1137,7 @@ route_packet (struct DestinationEntry *destination,
     is_new = GNUNET_NO;
     GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
                                       ts->heap_node,
-                                      GNUNET_TIME_absolute_get ().abs_value);
+                                      GNUNET_TIME_absolute_get ().abs_value_us);
   }
   GNUNET_assert (NULL != ts->tunnel);
   
@@ -2066,7 +2070,7 @@ receive_icmp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
   }
   GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
                                     ts->heap_node,
-                                    GNUNET_TIME_absolute_get ().abs_value);
+                                    GNUNET_TIME_absolute_get ().abs_value_us);
   return GNUNET_OK;
 }
 
@@ -2221,7 +2225,7 @@ receive_udp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
   }
   GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
                                     ts->heap_node,
-                                    GNUNET_TIME_absolute_get ().abs_value);
+                                    GNUNET_TIME_absolute_get ().abs_value_us);
   return GNUNET_OK;
 }
 
@@ -2363,7 +2367,7 @@ receive_tcp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
   }
   GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
                                     ts->heap_node,
-                                    GNUNET_TIME_absolute_get ().abs_value);
+                                    GNUNET_TIME_absolute_get ().abs_value_us);
   return GNUNET_OK;
 }
 
@@ -2704,7 +2708,7 @@ service_redirect_to_ip (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Client *cl
                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
   de->heap_node = GNUNET_CONTAINER_heap_insert (destination_heap,
                                                de,
-                                               GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value);
+                                               GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value_us);
   GNUNET_STATISTICS_update (stats,
                            gettext_noop ("# Active destinations"),
                            1, GNUNET_NO);
@@ -2810,7 +2814,7 @@ service_redirect_to_service (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Clien
                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
   de->heap_node = GNUNET_CONTAINER_heap_insert (destination_heap,
                                                de,
-                                               GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value);
+                                               GNUNET_TIME_absolute_ntoh (msg->expiration_time).abs_value_us);
   while (GNUNET_CONTAINER_multihashmap_size (destination_map) > max_destination_mappings)
     expire_destination (de);
   ts = create_tunnel_to_destination (de,