X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=759dbe7b59b820a8b447d421ed7828b7207716b9;hp=8762db3841912c5395dfdbe68a8c1d9710cf1512;hb=63f8303a5dc1758876451a580a8317dbc3d295d6;hpb=e16ead8dd9d4600664058069f0695832dfe068b2

diff --git a/src/net.c b/src/net.c
index 8762db38..759dbe7b 100644
--- a/src/net.c
+++ b/src/net.c
@@ -75,7 +75,7 @@ static void purge(void) {
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
 				s = snode->data;
-				send_del_subnet(broadcast, s);
+				send_del_subnet(everyone, s);
 				if(!strictsubnets)
 					subnet_del(n, s);
 			}
@@ -84,7 +84,7 @@ static void purge(void) {
 				enext = enode->next;
 				e = enode->data;
 				if(!tunnelserver)
-					send_del_edge(broadcast, e);
+					send_del_edge(everyone, e);
 				edge_del(e);
 			}
 		}
@@ -183,7 +183,7 @@ void terminate_connection(connection_t *c, bool report) {
 
 	if(c->edge) {
 		if(report && !tunnelserver)
-			send_del_edge(broadcast, c->edge);
+			send_del_edge(everyone, c->edge);
 
 		edge_del(c->edge);
 
@@ -198,7 +198,7 @@ void terminate_connection(connection_t *c, bool report) {
 			e = lookup_edge(c->node, myself);
 			if(e) {
 				if(!tunnelserver)
-					send_del_edge(broadcast, e);
+					send_del_edge(everyone, e);
 				edge_del(e);
 			}
 		}
@@ -289,7 +289,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 
 	/* check input from kernel */
 	if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
-		if(read_packet(&packet)) {
+		if(devops.read(&packet)) {
 			errors = 0;
 			packet.priority = 0;
 			route(myself, &packet);
@@ -343,7 +343,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 
 	for(i = 0; i < listen_sockets; i++) {
 		if(FD_ISSET(listen_socket[i].udp, readset))
-			handle_incoming_vpn_data(listen_socket[i].udp);
+			handle_incoming_vpn_data(i);
 
 		if(FD_ISSET(listen_socket[i].tcp, readset))
 			handle_new_meta_connection(listen_socket[i].tcp);
@@ -576,14 +576,14 @@ int main_loop(void) {
 					next = node->next;
 					subnet = node->data;
 					if(subnet->expires == 1) {
-						send_del_subnet(broadcast, subnet);
+						send_del_subnet(everyone, subnet);
 						if(subnet->owner->status.reachable)
 							subnet_update(subnet->owner, subnet, false);
 						subnet_del(subnet->owner, subnet);
 					} else if(subnet->expires == -1) {
 						subnet->expires = 0;
 					} else {
-						send_add_subnet(broadcast, subnet);
+						send_add_subnet(everyone, subnet);
 						if(subnet->owner->status.reachable)
 							subnet_update(subnet->owner, subnet, true);
 					}