projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use cvs2cl instead of rcs2log to generate the ChangeLog.
[oweals/tinc.git]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index 7d81176a76d2cda89fd57f853305c1a1b1ca4bdd..c16a261b4da01fba0cb5c11443dcde22e2126da3 100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.
75 2000/11/16 17:54:27 zarq
Exp $
+ $Id: net.c,v 1.35.4.
80 2000/11/20 23:29:46 guus
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-67,7
+67,7
@@
#include <xalloc.h>
#include "conf.h"
#include <xalloc.h>
#include "conf.h"
-#include "conn
list
.h"
+#include "conn
ection
.h"
#include "list.h"
#include "meta.h"
#include "net.h"
#include "list.h"
#include "meta.h"
#include "net.h"
@@
-95,7
+95,7
@@
char *unknown = NULL;
subnet_t mymac;
subnet_t mymac;
-int xsend(conn
_list
_t *cl, vpn_packet_t *inpkt)
+int xsend(conn
ection
_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
{
vpn_packet_t outpkt;
int outlen, outpad;
@@
-131,7
+131,7
@@
cp
return 0;
}
return 0;
}
-int xrecv(conn
_list
_t *cl, vpn_packet_t *inpkt)
+int xrecv(conn
ection
_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
{
vpn_packet_t outpkt;
int outlen, outpad;
@@
-254,8
+254,8
@@
cp
each packet, and removing it when that
returned a zero exit code
*/
each packet, and removing it when that
returned a zero exit code
*/
-void flush_queue(conn
_list
_t *cl, packet_queue_t **pq,
- int (*function)(conn
_list
_t*,vpn_packet_t*))
+void flush_queue(conn
ection
_t *cl, packet_queue_t **pq,
+ int (*function)(conn
ection
_t*,vpn_packet_t*))
{
queue_element_t *p, *next = NULL;
cp
{
queue_element_t *p, *next = NULL;
cp
@@
-279,7
+279,7
@@
cp
void because nothing goes wrong here, packets
remain in the queue if something goes wrong
*/
void because nothing goes wrong here, packets
remain in the queue if something goes wrong
*/
-void flush_queues(conn
_list
_t *cl)
+void flush_queues(conn
ection
_t *cl)
{
cp
if(cl->sq)
{
cp
if(cl->sq)
@@
-305,7
+305,7
@@
cp
*/
int send_packet(ip_t to, vpn_packet_t *packet)
{
*/
int send_packet(ip_t to, vpn_packet_t *packet)
{
- conn
_list
_t *cl;
+ conn
ection
_t *cl;
subnet_t *subnet;
cp
if((subnet = lookup_subnet_ipv4(to)) == NULL)
subnet_t *subnet;
cp
if((subnet = lookup_subnet_ipv4(to)) == NULL)
@@
-384,7
+384,9
@@
int setup_tap_fd(void)
int nfd;
const char *tapfname;
config_t const *cfg;
int nfd;
const char *tapfname;
config_t const *cfg;
+#ifdef HAVE_TUNTAP
struct ifreq ifr;
struct ifreq ifr;
+#endif
cp
if((cfg = get_config_val(config, config_tapdevice)))
cp
if((cfg = get_config_val(config, config_tapdevice)))
@@
-564,7
+566,7
@@
cp
/*
setup an outgoing meta (tcp) socket
*/
/*
setup an outgoing meta (tcp) socket
*/
-int setup_outgoing_meta_socket(conn
_list
_t *cl)
+int setup_outgoing_meta_socket(conn
ection
_t *cl)
{
int flags;
struct sockaddr_in a;
{
int flags;
struct sockaddr_in a;
@@
-624,7
+626,7
@@
cp
*/
int setup_outgoing_connection(char *name)
{
*/
int setup_outgoing_connection(char *name)
{
- conn
_list
_t *ncn;
+ conn
ection
_t *ncn;
struct hostent *h;
config_t const *cfg;
cp
struct hostent *h;
config_t const *cfg;
cp
@@
-634,27
+636,27
@@
cp
return -1;
}
return -1;
}
- ncn = new_conn
_list
();
+ ncn = new_conn
ection
();
asprintf(&ncn->name, "%s", name);
if(read_host_config(ncn))
{
syslog(LOG_ERR, _("Error reading host configuration file for %s"));
asprintf(&ncn->name, "%s", name);
if(read_host_config(ncn))
{
syslog(LOG_ERR, _("Error reading host configuration file for %s"));
- free_conn
_list
(ncn);
+ free_conn
ection
(ncn);
return -1;
}
if(!(cfg = get_config_val(ncn->config, config_address)))
{
syslog(LOG_ERR, _("No address specified for %s"));
return -1;
}
if(!(cfg = get_config_val(ncn->config, config_address)))
{
syslog(LOG_ERR, _("No address specified for %s"));
- free_conn
_list
(ncn);
+ free_conn
ection
(ncn);
return -1;
}
if(!(h = gethostbyname(cfg->data.ptr)))
{
syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
return -1;
}
if(!(h = gethostbyname(cfg->data.ptr)))
{
syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
- free_conn
_list
(ncn);
+ free_conn
ection
(ncn);
return -1;
}
return -1;
}
@@
-665,7
+667,7
@@
cp
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
ncn->hostname);
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
ncn->hostname);
- free_conn
_list
(ncn);
+ free_conn
ection
(ncn);
return -1;
}
return -1;
}
@@
-674,7
+676,7
@@
cp
ncn->buflen = 0;
ncn->last_ping_time = time(NULL);
ncn->buflen = 0;
ncn->last_ping_time = time(NULL);
- conn
_list
_add(ncn);
+ conn
ection
_add(ncn);
send_id(ncn);
cp
send_id(ncn);
cp
@@
-682,7
+684,7
@@
cp
}
/*
}
/*
- Configure conn
_list
_t myself and set up the local sockets (listen only)
+ Configure conn
ection
_t myself and set up the local sockets (listen only)
*/
int setup_myself(void)
{
*/
int setup_myself(void)
{
@@
-690,7
+692,7
@@
int setup_myself(void)
config_t *next;
subnet_t *net;
cp
config_t *next;
subnet_t *net;
cp
- myself = new_conn
_list
();
+ myself = new_conn
ection
();
asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
myself->flags = 0;
asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
myself->flags = 0;
@@
-850,6
+852,9
@@
int setup_network_connections(void)
{
config_t const *cfg;
cp
{
config_t const *cfg;
cp
+ init_connections();
+ init_subnets();
+
if((cfg = get_config_val(config, config_pingtimeout)) == NULL)
timeout = 60;
else
if((cfg = get_config_val(config, config_pingtimeout)) == NULL)
timeout = 60;
else
@@
-896,10
+901,12
@@
cp
*/
void close_network_connections(void)
{
*/
void close_network_connections(void)
{
- conn_list_t *p;
+ rbl_t *rbl;
+ connection_t *p;
cp
cp
-
for(p = conn_list; p != NULL; p = p->next
)
+
RBL_FOREACH(connection_tree, rbl
)
{
{
+ p = (connection_t *)rbl->data;
p->status.active = 0;
terminate_connection(p);
}
p->status.active = 0;
terminate_connection(p);
}
@@
-908,7
+915,7
@@
cp
if(myself->status.active)
{
close(myself->meta_socket);
if(myself->status.active)
{
close(myself->meta_socket);
- free_conn
_list
(myself);
+ free_conn
ection
(myself);
myself = NULL;
}
myself = NULL;
}
@@
-917,7
+924,7
@@
cp
/* Execute tinc-down script right after shutting down the interface */
execute_script("tinc-down");
/* Execute tinc-down script right after shutting down the interface */
execute_script("tinc-down");
- destroy_conn
_list
();
+ destroy_conn
ection_tree
();
syslog(LOG_NOTICE, _("Terminating"));
cp
syslog(LOG_NOTICE, _("Terminating"));
cp
@@
-927,7
+934,7
@@
cp
/*
create a data (udp) socket
*/
/*
create a data (udp) socket
*/
-int setup_vpn_connection(conn
_list
_t *cl)
+int setup_vpn_connection(conn
ection
_t *cl)
{
int nfd, flags;
struct sockaddr_in a;
{
int nfd, flags;
struct sockaddr_in a;
@@
-1003,13
+1010,13
@@
cp
handle an incoming tcp connect call and open
a connection to it.
*/
handle an incoming tcp connect call and open
a connection to it.
*/
-conn
_list
_t *create_new_connection(int sfd)
+conn
ection
_t *create_new_connection(int sfd)
{
{
- conn
_list
_t *p;
+ conn
ection
_t *p;
struct sockaddr_in ci;
int len = sizeof(ci);
cp
struct sockaddr_in ci;
int len = sizeof(ci);
cp
- p = new_conn
_list
();
+ p = new_conn
ection
();
if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
{
if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
{
@@
-1041,16
+1048,18
@@
cp
*/
void build_fdset(fd_set *fs)
{
*/
void build_fdset(fd_set *fs)
{
- conn_list_t *p;
+ rbl_t *rbl;
+ connection_t *p;
cp
FD_ZERO(fs);
cp
FD_ZERO(fs);
-
for(p = conn_list; p != NULL; p = p->next
)
+
RBL_FOREACH(connection_tree, rbl
)
{
{
+ p = (connection_t *)rbl->data;
if(p->status.meta)
if(p->status.meta)
- FD_SET(p->meta_socket, fs);
+
FD_SET(p->meta_socket, fs);
if(p->status.dataopen)
if(p->status.dataopen)
- FD_SET(p->socket, fs);
+
FD_SET(p->socket, fs);
}
FD_SET(myself->meta_socket, fs);
}
FD_SET(myself->meta_socket, fs);
@@
-1063,7
+1072,7
@@
cp
udp socket and write it to the ethertap
device after being decrypted
*/
udp socket and write it to the ethertap
device after being decrypted
*/
-int handle_incoming_vpn_data(conn
_list
_t *cl)
+int handle_incoming_vpn_data(conn
ection
_t *cl)
{
vpn_packet_t pkt;
int x, l = sizeof(x);
{
vpn_packet_t pkt;
int x, l = sizeof(x);
@@
-1101,10
+1110,11
@@
cp
terminate a connection and notify the other
end before closing the sockets
*/
terminate a connection and notify the other
end before closing the sockets
*/
-void terminate_connection(conn
_list
_t *cl)
+void terminate_connection(conn
ection
_t *cl)
{
{
- conn_list_t *p;
- subnet_t *s;
+ connection_t *p;
+ subnet_t *subnet;
+ rbl_t *rbl;
cp
if(cl->status.remove)
return;
cp
if(cl->status.remove)
return;
@@
-1120,26
+1130,34
@@
cp
if(cl->status.meta)
close(cl->meta_socket);
if(cl->status.meta)
close(cl->meta_socket);
-cp
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
if(cl->status.meta)
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
if(cl->status.meta)
- for(p = conn_list; p != NULL; p = p->next)
- if((p->nexthop == cl) && (p != cl))
- terminate_connection(p); /* Sounds like recursion, but p does not have a meta connection :) */
+ RBL_FOREACH(connection_tree, rbl)
+ {
+ p = (connection_t *)rbl->data;
+ if(p->nexthop == cl && p != cl)
+ terminate_connection(p);
+ }
/* Inform others of termination if it was still active */
if(cl->status.active)
/* Inform others of termination if it was still active */
if(cl->status.active)
- for(p = conn_list; p != NULL; p = p->next)
- if(p->status.meta && p->status.active && p!=cl)
- send_del_host(p, cl);
+ RBL_FOREACH(connection_tree, rbl)
+ {
+ p = (connection_t *)rbl->data;
+ if(p->status.meta && p->status.active && p!=cl)
+ send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
+ }
/* Remove the associated subnets */
/* Remove the associated subnets */
- for(s = cl->subnets; s; s = s->next)
- subnet_del(s);
+ RBL_FOREACH(cl->subnet_tree, rbl)
+ {
+ subnet = (subnet_t *)rbl->data;
+ subnet_del(subnet);
+ }
/* Check if this was our outgoing connection */
/* Check if this was our outgoing connection */
@@
-1165,35
+1183,37
@@
cp
end does not reply in time, we consider them dead
and close the connection.
*/
end does not reply in time, we consider them dead
and close the connection.
*/
-
int
check_dead_connections(void)
+
void
check_dead_connections(void)
{
{
- conn_list_t *p;
time_t now;
time_t now;
+ rbl_t *rbl;
+ connection_t *cl;
cp
now = time(NULL);
cp
now = time(NULL);
- for(p = conn_list; p != NULL; p = p->next)
+
+ RBL_FOREACH(connection_tree, rbl)
{
{
- if(p->status.active && p->status.meta)
- {
- if(p->last_ping_time + timeout < now)
+ cl = (connection_t *)rbl->data;
+ if(cl->status.active && cl->status.meta)
+ {
+ if(cl->last_ping_time + timeout < now)
{
{
- if(
p
->status.pinged)
+ if(
cl
->status.pinged)
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
-
p->name, p
->hostname);
-
p
->status.timeout = 1;
- terminate_connection(
p
);
+
cl->name, cl
->hostname);
+
cl
->status.timeout = 1;
+ terminate_connection(
cl
);
}
else
{
}
else
{
- send_ping(
p
);
+ send_ping(
cl
);
}
}
}
}
- }
+
}
}
cp
}
cp
- return 0;
}
/*
}
/*
@@
-1202,7
+1222,7
@@
cp
*/
int handle_new_meta_connection()
{
*/
int handle_new_meta_connection()
{
- conn
_list
_t *ncn;
+ conn
ection
_t *ncn;
struct sockaddr client;
int nfd, len = sizeof(client);
cp
struct sockaddr client;
int nfd, len = sizeof(client);
cp
@@
-1220,7
+1240,7
@@
cp
return 0;
}
return 0;
}
- conn
_list
_add(ncn);
+ conn
ection
_add(ncn);
cp
return 0;
}
cp
return 0;
}
@@
-1231,12
+1251,15
@@
cp
*/
void check_network_activity(fd_set *f)
{
*/
void check_network_activity(fd_set *f)
{
- conn_list_t *p;
+ connection_t *p;
+ rbl_t *rbl;
cp
cp
-
for(p = conn_list; p != NULL; p = p->next
)
+
RBL_FOREACH(connection_tree, rbl
)
{
{
+ p = (connection_t *)rbl->data;
+
if(p->status.remove)
if(p->status.remove)
-
continue
;
+
return
;
if(p->status.dataopen)
if(FD_ISSET(p->socket, f))
if(p->status.dataopen)
if(FD_ISSET(p->socket, f))
@@
-1261,7
+1284,7
@@
cp
return;
}
}
return;
}
}
-
+
if(FD_ISSET(myself->meta_socket, f))
handle_new_meta_connection();
cp
if(FD_ISSET(myself->meta_socket, f))
handle_new_meta_connection();
cp
@@
-1331,7
+1354,7
@@
cp
tv.tv_sec = timeout;
tv.tv_usec = 0;
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_conn
_list
();
+ prune_conn
ection_tree
();
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)