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.32 2000/09/26 14:06:04 guus Exp $
+ $Id: net.c,v 1.35.4.37 2000/10/15 19:53:15 zarq Exp $
*/
#include "config.h"
#include <syslog.h>
#include <unistd.h>
-#include <cipher.h>
+/* Next two includes are for tun/tap support */
+#include <net/if.h>
+
+#ifdef HAVE_LINUX_IF_TUN_H
+#include <linux/if_tun.h>
+#endif
+
#include <utils.h>
#include <xalloc.h>
int upstreamindex = 0;
static int seconds_till_retry;
-/* The global list of existing connections */
-conn_list_t *conn_list = NULL;
-conn_list_t *myself = NULL;
+char *unknown = NULL;
/*
strip off the MAC adresses of an ethernet frame
*/
void strip_mac_addresses(vpn_packet_t *p)
{
- unsigned char tmp[MAXSIZE];
cp
- memcpy(tmp, p->data, p->len);
- p->len -= 12;
- memcpy(p->data, &tmp[12], p->len);
+ memmove(p->data, p->data + 12, p->len -= 12);
cp
}
*/
void add_mac_addresses(vpn_packet_t *p)
{
- unsigned char tmp[MAXSIZE];
cp
- memcpy(&tmp[12], p->data, p->len);
+ memcpy(p->data + 12, p->data, p->len);
p->len += 12;
- tmp[0] = tmp[6] = 0xfe;
- tmp[1] = tmp[7] = 0xfd;
- *((ip_t*)(&tmp[2])) = (ip_t)(htonl(myself->vpn_ip));
- *((ip_t*)(&tmp[8])) = *((ip_t*)(&tmp[26]));
- memcpy(p->data, &tmp[0], p->len);
+ p->data[0] = p->data[6] = 0xfe;
+ p->data[1] = p->data[7] = 0xfd;
+ /* Really evil pointer stuff just below! */
+ *((ip_t*)(&p->data[2])) = (ip_t)(htonl(myself->address));
+ *((ip_t*)(&p->data[8])) = *((ip_t*)(&p->data[26]));
cp
}
-int xsend(conn_list_t *cl, void *packet)
+int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
{
- real_packet_t rp;
+ vpn_packet_t outpkt;
+ int outlen, outpad;
cp
- do_encrypt((vpn_packet_t*)packet, &rp, cl->datakey);
- rp.from = htonl(myself->vpn_ip);
- rp.data.len = htons(rp.data.len);
- rp.len = htons(rp.len);
-
+ outpkt.len = inpkt->len;
+ EVP_EncryptInit(cl->cipher_pktctx, cl->cipher_pkttype, cl->cipher_pktkey, NULL);
+ EVP_EncryptUpdate(cl->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
+ EVP_EncryptFinal(cl->cipher_pktctx, outpkt.data + outlen, &outpad);
+ outlen += outpad;
+
if(debug_lvl > 3)
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
- ntohs(rp.len), cl->name, cl->hostname);
+ outlen, cl->name, cl->hostname);
- total_socket_out += ntohs(rp.len);
+ total_socket_out += outlen;
cl->want_ping = 1;
- if((cl->flags | myself->flags) & TCPONLY)
- return send_tcppacket(cl, (void*)&rp, ntohs(rp.len));
-
- if((send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
+ if((send(cl->socket, (char *) &(outpkt.len), outlen + 2, 0)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->name, cl->hostname);
return 0;
}
-int xrecv(conn_list_t *cl, void *packet)
+int xrecv(vpn_packet_t *inpkt)
{
- vpn_packet_t vp;
- int lenin;
+ vpn_packet_t outpkt;
+ int outlen, outpad;
cp
- do_decrypt((real_packet_t*)packet, &vp, cl->datakey);
- add_mac_addresses(&vp);
-
if(debug_lvl > 3)
- syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
- ((real_packet_t*)packet)->len, cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Receiving packet of %d bytes"),
+ inpkt->len);
+
+ outpkt.len = inpkt->len;
+ EVP_DecryptInit(myself->cipher_pktctx, myself->cipher_pkttype, myself->cipher_pktkey, NULL);
+ EVP_DecryptUpdate(myself->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
+ /* FIXME: grok DecryptFinal
+ EVP_DecryptFinal(myself->cipher_pktctx, outpkt.data + outlen, &outpad);
+ */
+
+ add_mac_addresses(&outpkt);
- if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
+ if(write(tap_fd, outpkt.data, outpkt.len) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m"));
else
- total_tap_out += lenin;
-
- cl->want_ping = 0;
- cl->last_ping_time = time(NULL);
+ total_tap_out += outpkt.len;
cp
return 0;
}
{
conn_list_t *cl;
cp
- if((cl = lookup_conn(to)) == NULL)
+ if((cl = lookup_conn_list_ipv4(to)) == NULL)
{
if(debug_lvl > 3)
{
}
/* If we ourselves have indirectdata flag set, we should send only to our uplink! */
-
- /* The next few lines will be obsoleted, if we are going indirect, matching subnet_t
- should point to only our uplink as the recepient
- */
-
- if(myself->flags & EXPORTINDIRECTDATA)
- {
- for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next);
- if(!cl)
- { /* No open outgoing connection has been found. */
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("There is no remote host I can send this packet to!"));
- return -1;
- }
- }
- else
-
- /* If indirectdata flag is set for the destination we just looked up,
- * then real_ip is actually the vpn_ip of the gateway tincd
- * it is behind.
- */
-
- if(cl->flags & INDIRECTDATA)
- {
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect packet to %s via %s"),
- cl->name, cl->hostname);
- if((cl = lookup_conn(cl->real_ip)) == NULL)
- {
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect look up %d.%d.%d.%d in connection list failed!"), IP_ADDR_V(to));
-
- /* Gateway tincd dead? Should we kill it? (GS) */
-
- return -1;
- }
- if(cl->flags & INDIRECTDATA) /* This should not happen */
- {
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"), IP_ADDR_V(to));
- return -1;
- }
- }
-
- if(my_key_expiry <= time(NULL))
- regenerate_keys();
+ /* FIXME - check for indirection and reprogram it The Right Way(tm) this time. */
+
if(!cl->status.dataopen)
if(setup_vpn_connection(cl) < 0)
{
if(!cl->status.validkey)
{
if(debug_lvl > 3)
- syslog(LOG_INFO, _("%s (%s) has no valid key, queueing packet"),
+ syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
cl->name, cl->hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
if(!cl->status.waitingforkey)
- send_key_request(cl->vpn_ip); /* Keys should be sent to the host running the tincd */
+ send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
return 0;
}
int nfd;
const char *tapfname;
config_t const *cfg;
+
+#ifdef HAVE_TUNTAP
+ struct ifreq ifr;
+#endif
cp
- if((cfg = get_config_val(tapdevice)) == NULL)
- tapfname = "/dev/tap0";
- else
+ if((cfg = get_config_val(config, tapdevice)))
tapfname = cfg->data.ptr;
-
+ else
+#ifdef HAVE_TUNTAP
+ tapfname = "/dev/misc/net/tun";
+#else
+ tapfname = "/dev/tap0";
+#endif
+cp
if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
{
syslog(LOG_ERR, _("Could not open %s: %m"), tapfname);
return -1;
}
-
+cp
tap_fd = nfd;
+
+#ifdef HAVE_TUNTAP
+ /* Ok now check if this is an old ethertap or a new tun/tap thingie */
+ memset(&ifr, 0, sizeof(ifr));
+cp
+ ifr.ifr_flags = IFF_TAP;
+ if (netname)
+ strncpy(ifr.ifr_name, netname, IFNAMSIZ);
+cp
+ if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
+ {
+ syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
+ if((cfg = get_config_val(config, tapsubnet)) == NULL)
+ syslog(LOG_INFO, _("tun/tap device will be left unconfigured"));
+ else
+ /* Setup inetaddr/netmask etc */;
+ }
+#endif
+
cp
return 0;
}
return -1;
}
- if((cfg = get_config_val(interface)))
+ if((cfg = get_config_val(config, interface)))
{
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
{
a.sin_family = AF_INET;
a.sin_port = htons(port);
- if((cfg = get_config_val(interfaceip)))
+ if((cfg = get_config_val(config, interfaceip)))
a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
else
a.sin_addr.s_addr = htonl(INADDR_ANY);
if(debug_lvl > 0)
syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
- if((cfg = get_config_val(upstreamport)) == NULL)
+ if((cfg = get_config_val(cl->config, port)) == NULL)
cl->port = 655;
else
cl->port = cfg->data.val;
a.sin_family = AF_INET;
a.sin_port = htons(cl->port);
- a.sin_addr.s_addr = htonl(cl->real_ip);
+ a.sin_addr.s_addr = htonl(cl->address);
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
}
ncn = new_conn_list();
- ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
- ncn->hostname = hostlookup(htonl(ncn->real_ip));
+ ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
+ ncn->hostname = hostlookup(htonl(ncn->address));
if(setup_outgoing_meta_socket(ncn) < 0)
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
ncn->hostname);
- free_conn_element(ncn);
+ free_conn_list(ncn);
return -1;
}
cp
myself = new_conn_list();
- if(!(cfg = get_config_val(myvpnip)))
+ asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
+ myself->flags = 0;
+ myself->protocol_version = PROT_CURRENT;
+
+ if(!(cfg = get_config_val(config, tincname))) /* Not acceptable */
{
- syslog(LOG_ERR, _("No value for my VPN IP given"));
+ syslog(LOG_ERR, _("Name for tinc daemon required!"));
return -1;
}
-
- myself->vpn_ip = cfg->data.ip->ip;
- myself->hostname = hostlookup(htonl(myself->vpn_ip));
- myself->vpn_mask = cfg->data.ip->mask;
- myself->flags = 0;
-
- if(!(cfg = get_config_val(tincname)))
- asprintf(&(myself->name), IP_ADDR_S, IP_ADDR_V(myself->vpn_ip));
else
myself->name = (char*)cfg->data.val;
+
+ if(check_id(myself->name))
+ {
+ syslog(LOG_ERR, _("Invalid name for myself!"));
+ return -1;
+ }
+
+ if(read_host_config(myself))
+ {
+ syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
+ return -1;
+ }
- if(!(cfg = get_config_val(listenport)))
+ if(!(cfg = get_config_val(myself->config, port)))
myself->port = 655;
else
myself->port = cfg->data.val;
- if((cfg = get_config_val(indirectdata)))
+ if((cfg = get_config_val(myself->config, indirectdata)))
if(cfg->data.val == stupid_true)
myself->flags |= EXPORTINDIRECTDATA;
- if((cfg = get_config_val(tcponly)))
+ if((cfg = get_config_val(myself->config, tcponly)))
if(cfg->data.val == stupid_true)
myself->flags |= TCPONLY;
if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
{
- syslog(LOG_ERR, _("Unable to set up a listening socket"));
+ syslog(LOG_ERR, _("Unable to set up a listening socket!"));
return -1;
}
if((myself->socket = setup_vpn_in_socket(myself->port)) < 0)
{
- syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket"));
+ syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket!"));
close(myself->meta_socket);
return -1;
}
{
config_t const *cfg;
cp
- cfg = get_next_config_val(upstreamip, upstreamindex++);
-
+/* FIXME! Use name instead of upstreamip.
+ cfg = get_next_config_val(config, upstreamip, upstreamindex++);
+*/
while(cfg)
{
if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
signal(SIGALRM, SIG_IGN);
return;
}
- cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+// cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
{
config_t const *cfg;
cp
- if((cfg = get_config_val(pingtimeout)) == NULL)
+ if((cfg = get_config_val(config, pingtimeout)) == NULL)
timeout = 5;
else
timeout = cfg->data.val;
if(setup_myself() < 0)
return -1;
- if((cfg = get_next_config_val(upstreamip, upstreamindex++)) == NULL)
+// if((cfg = get_next_config_val(config, upstreamip, upstreamindex++)) == NULL)
/* No upstream IP given, we're listen only. */
return 0;
{
if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
return 0;
- cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+// cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
a.sin_family = AF_INET;
a.sin_port = htons(cl->port);
- a.sin_addr.s_addr = htonl(cl->real_ip);
+ a.sin_addr.s_addr = htonl(cl->address);
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
return NULL;
}
- p->real_ip = ntohl(ci.sin_addr.s_addr);
+ p->name = unknown;
+ p->address = ntohl(ci.sin_addr.s_addr);
p->hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
p->status.meta = 1;
+ p->buffer = xmalloc(MAXBUFSIZE);
p->buflen = 0;
p->last_ping_time = time(NULL);
p->want_ping = 0;
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
- if(send_basic_info(p) < 0)
+ if(send_id(p) < 0)
{
- free_conn_element(p);
+ free_conn_list(p);
return NULL;
}
cp
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()
{
- real_packet_t rp;
+ vpn_packet_t pkt;
int lenin;
int x, l = sizeof(x);
- conn_list_t *f;
cp
- if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+ if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"),
- __FILE__, __LINE__, cl->socket,
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
+ __FILE__, __LINE__, myself->socket);
return -1;
}
if(x)
{
- syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
- cl->name, cl->hostname, strerror(x));
+ syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
return -1;
}
- rp.len = -1;
- lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
- if(lenin <= 0)
+ if(recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, NULL, NULL) <= 0)
{
- syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Receiving packet failed: %m"));
return -1;
}
- total_socket_in += lenin;
-
- rp.data.len = ntohs(rp.data.len);
- rp.len = ntohs(rp.len);
- rp.from = ntohl(rp.from);
-
- if(rp.len >= 0)
- {
- f = lookup_conn(rp.from);
- if(!f)
- {
- syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
- cl->name, cl->hostname, IP_ADDR_V(rp.from));
- return -1;
- }
- if(f->status.validkey)
- xrecv(f, &rp);
- else
- {
- add_queue(&(f->rq), &rp, rp.len);
- if(!cl->status.waitingforkey)
- send_key_request(rp.from);
- }
-
- if(my_key_expiry <= time(NULL))
- regenerate_keys();
- }
cp
- return 0;
+ return xrecv(&pkt);
}
/*
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
cl->name, cl->hostname);
-
- if(cl->status.timeout)
- send_timeout(cl);
-/* else if(!cl->status.termreq)
- send_termreq(cl);
- */
if(cl->socket)
close(cl->socket);
cl->status.remove = 1;
/* If this cl isn't active, don't send any DEL_HOSTs. */
+
+/* FIXME: reprogram this.
if(cl->status.active)
notify_others(cl,NULL,send_del_host);
+*/
cp
/* Find all connections that were lost because they were behind cl
if((p->nexthop == cl) && (p != cl))
{
if(cl->status.active && p->status.active)
+/* FIXME: reprogram this
notify_others(p,cl,send_del_host);
+*/;
if(cl->socket)
close(cl->socket);
p->status.active = 0;
accept a new tcp connect and create a
new connection
*/
-int handle_new_meta_connection(conn_list_t *cl)
+int handle_new_meta_connection()
{
conn_list_t *ncn;
struct sockaddr client;
int nfd, len = sizeof(client);
cp
- if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
+ if((nfd = accept(myself->meta_socket, &client, &len)) < 0)
{
syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
return -1;
}
if(FD_ISSET(myself->socket, f))
- handle_incoming_vpn_data(myself);
+ handle_incoming_vpn_data();
if(FD_ISSET(myself->meta_socket, f))
- handle_new_meta_connection(myself);
+ handle_new_meta_connection();
cp
}
if(sighup)
{
sighup = 0;
+/* FIXME: reprogram this.
if(debug_lvl > 1)
syslog(LOG_INFO, _("Rereading configuration file"));
close_network_connections();
clear_config();
- if(read_config_file(configfilename))
+ if(read_config_file(&config, configfilename))
{
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
sleep(5);
setup_network_connections();
+*/
continue;
}
projects / tinc / blobdiff