projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove checkpoint tracing.
[tinc]
/
src
/
route.c
diff --git
a/src/route.c
b/src/route.c
index
a200983
..
7538bec
100644
(file)
--- a/
src/route.c
+++ b/
src/route.c
@@
-51,8
+51,7
@@
static const size_t opt_size = sizeof(struct nd_opt_hdr);
/* RFC 1071 */
/* RFC 1071 */
-static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
-{
+static uint16_t inet_checksum(void *data, int len, uint16_t prevsum) {
uint16_t *p = data;
uint32_t checksum = prevsum ^ 0xFFFF;
uint16_t *p = data;
uint32_t checksum = prevsum ^ 0xFFFF;
@@
-100,14
+99,11
@@
static void swap_mac_addresses(vpn_packet_t *packet) {
memcpy(&packet->data[6], &tmp, sizeof tmp);
}
memcpy(&packet->data[6], &tmp, sizeof tmp);
}
-static void learn_mac(mac_t *address)
-{
+static void learn_mac(mac_t *address) {
subnet_t *subnet;
avl_node_t *node;
connection_t *c;
subnet_t *subnet;
avl_node_t *node;
connection_t *c;
- cp();
-
subnet = lookup_subnet_mac(address);
/* If we don't know this MAC address yet, store it */
subnet = lookup_subnet_mac(address);
/* If we don't know this MAC address yet, store it */
@@
-136,14
+132,11
@@
static void learn_mac(mac_t *address)
subnet->expires = now + macexpire;
}
subnet->expires = now + macexpire;
}
-void age_subnets(void)
-{
+void age_subnets(void) {
subnet_t *s;
connection_t *c;
avl_node_t *node, *next, *node2;
subnet_t *s;
connection_t *c;
avl_node_t *node, *next, *node2;
- cp();
-
for(node = myself->subnet_tree->head; node; node = next) {
next = node->next;
s = node->data;
for(node = myself->subnet_tree->head; node; node = next) {
next = node->next;
s = node->data;
@@
-167,8
+160,7
@@
void age_subnets(void)
/* RFC 792 */
/* RFC 792 */
-static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code)
-{
+static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code) {
struct ip ip = {0};
struct icmp icmp = {0};
struct ip ip = {0};
struct icmp icmp = {0};
@@
-179,8
+171,6
@@
static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
if(ratelimit(3))
return;
if(ratelimit(3))
return;
- cp();
-
/* Swap Ethernet source and destination addresses */
swap_mac_addresses(packet);
/* Swap Ethernet source and destination addresses */
swap_mac_addresses(packet);
@@
-250,8
+240,6
@@
static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) {
uint8_t *offset;
uint16_t ip_off, origf;
uint8_t *offset;
uint16_t ip_off, origf;
- cp();
-
memcpy(&ip, packet->data + ether_size, ip_size);
fragment.priority = packet->priority;
memcpy(&ip, packet->data + ether_size, ip_size);
fragment.priority = packet->priority;
@@
-293,14
+281,11
@@
static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) {
}
}
}
}
-static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
-{
+static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
subnet_t *subnet;
node_t *via;
ipv4_t dest;
subnet_t *subnet;
node_t *via;
ipv4_t dest;
- cp();
-
memcpy(&dest, &packet->data[30], sizeof dest);
subnet = lookup_subnet_ipv4(&dest);
memcpy(&dest, &packet->data[30], sizeof dest);
subnet = lookup_subnet_ipv4(&dest);
@@
-344,10
+329,7
@@
static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
send_packet(subnet->owner, packet);
}
send_packet(subnet->owner, packet);
}
-static void route_ipv4(node_t *source, vpn_packet_t *packet)
-{
- cp();
-
+static void route_ipv4(node_t *source, vpn_packet_t *packet) {
if(!checklength(source, packet, ether_size + ip_size))
return;
if(!checklength(source, packet, ether_size + ip_size))
return;
@@
-363,8
+345,7
@@
static void route_ipv4(node_t *source, vpn_packet_t *packet)
/* RFC 2463 */
/* RFC 2463 */
-static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code)
-{
+static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code) {
struct ip6_hdr ip6;
struct icmp6_hdr icmp6 = {0};
uint16_t checksum;
struct ip6_hdr ip6;
struct icmp6_hdr icmp6 = {0};
uint16_t checksum;
@@
-379,8
+360,6
@@
static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
if(ratelimit(3))
return;
if(ratelimit(3))
return;
- cp();
-
/* Swap Ethernet source and destination addresses */
swap_mac_addresses(packet);
/* Swap Ethernet source and destination addresses */
swap_mac_addresses(packet);
@@
-444,14
+423,11
@@
static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
send_packet(source, packet);
}
send_packet(source, packet);
}
-static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
-{
+static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) {
subnet_t *subnet;
node_t *via;
ipv6_t dest;
subnet_t *subnet;
node_t *via;
ipv6_t dest;
- cp();
-
memcpy(&dest, &packet->data[38], sizeof dest);
subnet = lookup_subnet_ipv6(&dest);
memcpy(&dest, &packet->data[38], sizeof dest);
subnet = lookup_subnet_ipv6(&dest);
@@
-493,8
+469,7
@@
static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
/* RFC 2461 */
/* RFC 2461 */
-static void route_neighborsol(node_t *source, vpn_packet_t *packet)
-{
+static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
struct ip6_hdr ip6;
struct nd_neighbor_solicit ns;
struct nd_opt_hdr opt;
struct ip6_hdr ip6;
struct nd_neighbor_solicit ns;
struct nd_opt_hdr opt;
@@
-509,8
+484,6
@@
static void route_neighborsol(node_t *source, vpn_packet_t *packet)
uint32_t next;
} pseudo;
uint32_t next;
} pseudo;
- cp();
-
if(!checklength(source, packet, ether_size + ip6_size + ns_size))
return;
if(!checklength(source, packet, ether_size + ip6_size + ns_size))
return;
@@
-635,10
+608,7
@@
static void route_neighborsol(node_t *source, vpn_packet_t *packet)
send_packet(source, packet);
}
send_packet(source, packet);
}
-static void route_ipv6(node_t *source, vpn_packet_t *packet)
-{
- cp();
-
+static void route_ipv6(node_t *source, vpn_packet_t *packet) {
if(!checklength(source, packet, ether_size + ip6_size))
return;
if(!checklength(source, packet, ether_size + ip6_size))
return;
@@
-655,14
+625,11
@@
static void route_ipv6(node_t *source, vpn_packet_t *packet)
/* RFC 826 */
/* RFC 826 */
-static void route_arp(node_t *source, vpn_packet_t *packet)
-{
+static void route_arp(node_t *source, vpn_packet_t *packet) {
struct ether_arp arp;
subnet_t *subnet;
struct in_addr addr;
struct ether_arp arp;
subnet_t *subnet;
struct in_addr addr;
- cp();
-
if(!checklength(source, packet, ether_size + arp_size))
return;
if(!checklength(source, packet, ether_size + arp_size))
return;
@@
-722,14
+689,10
@@
static void route_arp(node_t *source, vpn_packet_t *packet)
send_packet(source, packet);
}
send_packet(source, packet);
}
-static void route_mac(node_t *source, vpn_packet_t *packet)
-{
+static void route_mac(node_t *source, vpn_packet_t *packet) {
subnet_t *subnet;
mac_t dest;
subnet_t *subnet;
mac_t dest;
- cp();
-
-
/* Learn source address */
if(source == myself) {
/* Learn source address */
if(source == myself) {
@@
-778,11
+741,7
@@
static void route_mac(node_t *source, vpn_packet_t *packet)
send_packet(subnet->owner, packet);
}
send_packet(subnet->owner, packet);
}
-
-void route(node_t *source, vpn_packet_t *packet)
-{
- cp();
-
+void route(node_t *source, vpn_packet_t *packet) {
if(!checklength(source, packet, ether_size))
return;
if(!checklength(source, packet, ether_size))
return;