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.36 2000/10/15 00:59:34 guus Exp $
+ $Id: net.c,v 1.35.4.44 2000/10/22 13:37:15 zarq Exp $
*/
#include "config.h"
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
+#include <linux/sockios.h>
+#include <net/if.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdio.h>
#include <syslog.h>
#include <unistd.h>
-/* Next two includes are for tun/tap support */
-#include <net/if.h>
-#include "/usr/src/linux/include/linux/if_tun.h"
+#ifdef HAVE_TUNTAP
+#include LINUX_IF_TUN_H
+#endif
#include <utils.h>
#include <xalloc.h>
#include "system.h"
int tap_fd = -1;
-
+int taptype = 0;
int total_tap_in = 0;
int total_tap_out = 0;
int total_socket_in = 0;
EVP_EncryptFinal(cl->cipher_pktctx, outpkt.data + outlen, &outpad);
outlen += outpad;
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
outlen, cl->name, cl->hostname);
vpn_packet_t outpkt;
int outlen, outpad;
cp
- if(debug_lvl > 3)
+ if(debug_lvl > DEBUG_TRAFFIC)
syslog(LOG_ERR, _("Receiving packet of %d bytes"),
inpkt->len);
p = next;
}
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Queue flushed"));
cp
}
cp
if(cl->sq)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
cl->name, cl->hostname);
flush_queue(cl, &(cl->sq), xsend);
if(cl->rq)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
cl->name, cl->hostname);
flush_queue(cl, &(cl->rq), xrecv);
cp
if((cl = lookup_conn_list_ipv4(to)) == NULL)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
IP_ADDR_V(to));
if(!cl->status.validkey)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
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.active)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"),
cl->name, cl->hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
int nfd;
const char *tapfname;
config_t const *cfg;
+ char *envvar;
struct ifreq ifr;
+
cp
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)
{
cp
tap_fd = nfd;
+ taptype = 0;
+
+#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;
+ ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
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);
+ taptype = 1;
+
if((cfg = get_config_val(config, tapsubnet)) == NULL)
syslog(LOG_INFO, _("tun/tap device will be left unconfigured"));
else
/* Setup inetaddr/netmask etc */;
}
+#endif
+
+ /* Add name of network interface to environment (for scripts) */
+
+ ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr);
+ asprintf(&envvar, "IFNAME=%s", ifr.ifr_name);
+ putenv(envvar);
+ free(envvar);
cp
return 0;
struct sockaddr_in a;
config_t const *cfg;
cp
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
if((cfg = get_config_val(cl->config, port)) == NULL)
return -1;
}
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->hostname, cl->port);
+
+ cl->status.meta = 1;
cp
return 0;
}
an authentication sequence during which
we will do just that.
*/
-int setup_outgoing_connection(char *hostname)
+int setup_outgoing_connection(char *name)
{
conn_list_t *ncn;
struct hostent *h;
+ config_t *cfg;
cp
- if(!(h = gethostbyname(hostname)))
+ if(check_id(name))
{
- syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+ syslog(LOG_ERR, _("Invalid name for outgoing connection"));
return -1;
}
ncn = new_conn_list();
+ asprintf(&ncn->name, "%s", name);
+
+ if(read_host_config(ncn))
+ {
+ syslog(LOG_ERR, _("Error reading host configuration file for %s"));
+ free_conn_list(ncn);
+ return -1;
+ }
+
+ if(!(cfg = get_config_val(ncn->config, address)))
+ {
+ syslog(LOG_ERR, _("No address specified for %s"));
+ free_conn_list(ncn);
+ return -1;
+ }
+
+ if(!(h = gethostbyname(cfg->data.ptr)))
+ {
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
+ free_conn_list(ncn);
+ return -1;
+ }
+
ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
ncn->hostname = hostlookup(htonl(ncn->address));
return -1;
}
- ncn->status.meta = 1;
ncn->status.outgoing = 1;
- ncn->next = conn_list;
- conn_list = ncn;
+ ncn->buffer = xmalloc(MAXBUFSIZE);
+ ncn->buflen = 0;
+ ncn->last_ping_time = time(NULL);
+ ncn->want_ping = 0;
+
+ conn_list_add(ncn);
+
+ send_id(ncn);
cp
return 0;
}
return -1;
}
else
- myself->name = (char*)cfg->data.val;
+ asprintf(&myself->name, "%s", (char*)cfg->data.val);
if(check_id(myself->name))
{
syslog(LOG_ERR, _("Invalid name for myself!"));
return -1;
}
+cp
+ if(!(cfg = get_config_val(config, privatekey)))
+ {
+ syslog(LOG_ERR, _("Private key for tinc daemon required!"));
+ return -1;
+ }
+ else
+ {
+ myself->rsa_key = RSA_new();
+ BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr);
+ BN_hex2bn(&myself->rsa_key->e, "FFFF");
+ }
if(read_host_config(myself))
{
syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
return -1;
}
-
+cp
+ if(!(cfg = get_config_val(myself->config, publickey)))
+ {
+ syslog(LOG_ERR, _("Public key for tinc daemon required!"));
+ return -1;
+ }
+ else
+ {
+ BN_hex2bn(&myself->rsa_key->n, cfg->data.ptr);
+ }
+/*
+ if(RSA_check_key(myself->rsa_key) != 1)
+ {
+ syslog(LOG_ERR, _("Invalid public/private keypair!"));
+ return -1;
+ }
+*/
if(!(cfg = get_config_val(myself->config, port)))
myself->port = 655;
else
{
config_t const *cfg;
cp
-/* FIXME! Use name instead of upstreamip.
- cfg = get_next_config_val(config, upstreamip, upstreamindex++);
-*/
+ cfg = get_next_config_val(config, connectto, upstreamindex++);
+
+ if(!upstreamindex && !cfg)
+ /* No upstream IP given, we're listen only. */
+ return;
+
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(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+ cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
int setup_network_connections(void)
{
config_t const *cfg;
+ char *scriptname;
cp
if((cfg = get_config_val(config, pingtimeout)) == NULL)
timeout = 5;
if(setup_myself() < 0)
return -1;
-// if((cfg = get_next_config_val(config, upstreamip, upstreamindex++)) == NULL)
+ /* Run tinc-up script to further initialize the tap interface */
+
+ asprintf(&scriptname, "%s/tinc-up", confbase);
+
+ if(!fork())
+ {
+
+ execl(scriptname, NULL);
+
+ if(errno != ENOENT)
+ syslog(LOG_WARNING, _("Error while executing %s: %m"), scriptname);
+
+ exit(0);
+ }
+
+ free(scriptname);
+
+ if((cfg = get_next_config_val(config, connectto, 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(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+ cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
void close_network_connections(void)
{
conn_list_t *p;
+ char *scriptname;
cp
for(p = conn_list; p != NULL; p = p->next)
{
close(myself->socket);
}
+ /* Execute tinc-down script right before shutting down the interface */
+
+ asprintf(&scriptname, "%s/tinc-down", confbase);
+
+ if(!fork())
+ {
+ execl(scriptname, NULL);
+
+ if(errno != ENOENT)
+ syslog(LOG_WARNING, _("Error while executing %s: %m"), scriptname);
+
+ exit(0);
+ }
+
+ free(scriptname);
+
close(tap_fd);
destroy_conn_list();
int nfd, flags;
struct sockaddr_in a;
cp
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
p->last_ping_time = time(NULL);
p->want_ping = 0;
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
- if(send_id(p) < 0)
- {
- free_conn_list(p);
- return NULL;
- }
+ p->allow_request = ID;
cp
return p;
}
if(cl->status.remove)
return;
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
cl->name, cl->hostname);
{
if(p->status.pinged && !p->status.got_pong)
{
- if(debug_lvl > 1)
+ if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
p->name, p->hostname);
p->status.timeout = 1;
int ether_type, lenin;
cp
memset(&vp, 0, sizeof(vp));
- if((lenin = read(tap_fd, &vp, MTU)) <= 0)
+
+ if(taptype = 1)
{
- syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
- return;
+ if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
+ {
+ syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
+ return;
+ }
+ vp.len = lenin;
+ }
+ else
+ {
+ if((lenin = read(tap_fd, &vp, MTU)) <= 0)
+ {
+ syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
+ return;
+ }
+ vp.len = lenin - 2;
}
total_tap_in += lenin;
ether_type = ntohs(*((unsigned short*)(&vp.data[12])));
if(ether_type != 0x0800)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"), ether_type, MAC_ADDR_V(vp.data[6]));
return;
}
if(lenin < 32)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"), MAC_ADDR_V(vp.data[6]));
return;
}
from = ntohl(*((unsigned long*)(&vp.data[26])));
to = ntohl(*((unsigned long*)(&vp.data[30])));
- vp.len = (length_t)lenin - 2;
-
- strip_mac_addresses(&vp);
-
send_packet(to, &vp);
cp
}
projects / tinc / blobdiff