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.102 2001/03/04 13:59:25 guus Exp $
+ $Id: net.c,v 1.35.4.113 2001/06/05 19:45:47 guus Exp $
*/
#include "config.h"
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
+#ifdef HAVE_LINUX
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int keylifetime = 0;
int keyexpires = 0;
-char *unknown = NULL;
-
void send_udppacket(connection_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
/* Encrypt the packet. */
- outpkt.len = inpkt->len;
+ RAND_bytes(inpkt->salt, sizeof(inpkt->salt));
EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
- EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
- EVP_EncryptFinal(&ctx, outpkt.data + outlen, &outpad);
- outlen += outpad + 2;
+ EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt));
+ EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad);
+ outlen += outpad;
total_socket_out += outlen;
to.sin_addr.s_addr = htonl(cl->address);
to.sin_port = htons(cl->port);
- if((sendto(myself->socket, (char *) &(outpkt.len), outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
+ if((sendto(myself->socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->name, cl->hostname);
int outlen, outpad;
EVP_CIPHER_CTX ctx;
cp
- outpkt.len = inpkt->len;
-
/* Decrypt the packet */
EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->key_len);
- EVP_DecryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len + 8);
- EVP_DecryptFinal(&ctx, outpkt.data + outlen, &outpad);
+ EVP_DecryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len);
+ EVP_DecryptFinal(&ctx, outpkt.salt + outlen, &outpad);
outlen += outpad;
+ outpkt.len = outlen - sizeof(outpkt.salt);
+
+ total_socket_in += outlen;
+
+ receive_packet(cl, &outpkt);
+cp
+}
+
+void receive_tcppacket(connection_t *cl, char *buffer, int len)
+{
+ vpn_packet_t outpkt;
+cp
+ outpkt.len = len;
+ memcpy(outpkt.data, buffer, len);
receive_packet(cl, &outpkt);
cp
if(write(tap_fd, packet->data - 2, packet->len + 2) < 0)
syslog(LOG_ERR, _("Can't write to ethertap device: %m"));
else
- total_tap_out += packet->len + 2;
+ total_tap_out += packet->len;
}
cp
}
send_udppacket(cl, packet);
}
+/* Broadcast a packet to all active connections */
+
+void broadcast_packet(connection_t *from, vpn_packet_t *packet)
+{
+ avl_node_t *node;
+ connection_t *cl;
+cp
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+ packet->len, from->name, from->hostname);
+
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ cl = (connection_t *)node->data;
+ if(cl->status.meta && cl != from)
+ send_packet(cl, packet);
+ }
+cp
+}
+
void flush_queue(connection_t *cl)
{
list_node_t *node, *next;
{
#ifdef HAVE_LINUX
# ifdef HAVE_TUNTAP
- tapfname = "/dev/misc/net/tun";
+ tapfname = "/dev/net/tun";
# else
tapfname = "/dev/tap0";
# endif
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
return -1;
}
}
+#endif
memset(&a, 0, sizeof(a));
a.sin_family = AF_INET;
option = 1;
setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
setsockopt(cl->meta_socket, SOL_IP, IP_TOS, &option, sizeof(option));
-
+#endif
/* Connect */
a.sin_family = AF_INET;
return -1;
}
- ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
+ ncn->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
ncn->hostname = hostlookup(htonl(ncn->address));
if(setup_outgoing_meta_socket(ncn) < 0)
cp
myself = new_connection();
- asprintf(&myself->hostname, "MYSELF");
+ asprintf(&myself->hostname, _("MYSELF"));
myself->options = 0;
myself->protocol_version = PROT_CURRENT;
else
myself->port = cfg->data.val;
- if((cfg = get_config_val(myself->config, config_indirectdata)))
- if(cfg->data.val == stupid_true)
- myself->options |= OPTION_INDIRECT;
-
- if((cfg = get_config_val(myself->config, config_tcponly)))
- if(cfg->data.val == stupid_true)
- myself->options |= OPTION_TCPONLY;
-
/* Read in all the subnets specified in the host configuration file */
for(next = myself->config; (cfg = get_config_val(next, config_subnet)); next = cfg->next)
subnet_add(myself, net);
}
+cp
+ /* Check some options */
+
+ if((cfg = get_config_val(config, config_indirectdata)))
+ if(cfg->data.val == stupid_true)
+ myself->options |= OPTION_INDIRECT;
+
+ if((cfg = get_config_val(config, config_tcponly)))
+ if(cfg->data.val == stupid_true)
+ myself->options |= OPTION_TCPONLY;
+
+ if((cfg = get_config_val(myself->config, config_indirectdata)))
+ if(cfg->data.val == stupid_true)
+ myself->options |= OPTION_INDIRECT;
+
+ if((cfg = get_config_val(myself->config, config_tcponly)))
+ if(cfg->data.val == stupid_true)
+ myself->options |= OPTION_TCPONLY;
+
+ if(myself->options & OPTION_TCPONLY)
+ myself->options |= OPTION_INDIRECT;
+
+ if((cfg = get_config_val(config, config_mode)))
+ {
+ if(!strcasecmp(cfg->data.ptr, "router"))
+ routing_mode = RMODE_ROUTER;
+ else if (!strcasecmp(cfg->data.ptr, "switch"))
+ routing_mode = RMODE_SWITCH;
+ else if (!strcasecmp(cfg->data.ptr, "hub"))
+ routing_mode = RMODE_HUB;
+ else
+ {
+ syslog(LOG_ERR, _("Invalid routing mode!"));
+ return -1;
+ }
+ }
+ else
+ routing_mode = RMODE_ROUTER;
+
+cp
+ /* Open sockets */
+
if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
{
syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len;
myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength);
- RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+ RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
if(!(cfg = get_config_val(config, config_keyexpire)))
keylifetime = 3600;
keyexpires = time(NULL) + keylifetime;
cp
- /* Check some options */
-
- if((cfg = get_config_val(config, config_indirectdata)))
- {
- if(cfg->data.val == stupid_true)
- myself->options |= OPTION_INDIRECT;
- }
-
- if((cfg = get_config_val(config, config_tcponly)))
- {
- if(cfg->data.val == stupid_true)
- myself->options |= OPTION_TCPONLY;
- }
-
- if(myself->options & OPTION_TCPONLY)
- myself->options |= OPTION_INDIRECT;
/* Activate ourselves */
cp
cfg = get_config_val(upstreamcfg, config_connectto);
- if(!cfg && upstreamcfg == config)
- /* No upstream IP given, we're listen only. */
- return;
-
+ if(!cfg)
+ {
+ if(upstreamcfg == config)
+ {
+ /* No upstream IP given, we're listen only. */
+ signal(SIGALRM, SIG_IGN);
+ return;
+ }
+ }
+ else
+ {
+ /* We previously tried all the ConnectTo lines. Now wrap back to the first. */
+ cfg = get_config_val(config, config_connectto);
+ }
+
while(cfg)
{
upstreamcfg = cfg->next;
return NULL;
}
- p->name = unknown;
+ asprintf(&p->name, _("UNKNOWN"));
p->address = ntohl(ci.sin_addr.s_addr);
p->hostname = hostlookup(ci.sin_addr.s_addr);
p->port = htons(ci.sin_port); /* This one will be overwritten later */
{
vpn_packet_t pkt;
int x, l = sizeof(x);
- int lenin;
struct sockaddr_in from;
socklen_t fromlen = sizeof(from);
connection_t *cl;
return;
}
- if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
+ if((pkt.len = recvfrom(myself->socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %m"));
return;
return;
}
+ cl->last_ping_time = time(NULL);
+
receive_udppacket(cl, &pkt);
cp
}
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
}
- /* Inactivate */
+ /* Deactivate */
cl->status.active = 0;
cp
vp.len = lenin - 2;
}
- total_tap_in += lenin;
+ total_tap_in += vp.len;
if(lenin < 32)
{
projects / tinc / blobdiff