X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=9048d507f54fe1ec92925b2c54e0c9cc46303868;hp=266dbab7b7048199cc1d3bbae187d59846e7cab2;hb=5e2ded68bfc7b3a1bfa600c1ce46144eb50e57a2;hpb=4f9dad0972ac0f665a1b6050b059bd52f93e6221 diff --git a/src/net.c b/src/net.c index 266dbab7..9048d507 100644 --- 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. - $Id: net.c,v 1.35.4.111 2001/06/05 16:09:55 guus Exp $ + $Id: net.c,v 1.35.4.121 2001/07/19 12:29:40 guus Exp $ */ #include "config.h" @@ -45,32 +45,24 @@ #include #include -#ifdef HAVE_OPENSSL_RAND_H -# include -#else -# include -#endif - -#ifdef HAVE_OPENSSL_EVP_H -# include -#else -# include -#endif +#include +#include +#include -#ifdef HAVE_OPENSSL_ERR_H -# include -#else -# include -#endif - -#ifdef HAVE_OPENSSL_PEM_H -# include -#else -# include +#ifndef HAVE_RAND_PSEUDO_BYTES +#define RAND_pseudo_bytes RAND_bytes #endif #ifdef HAVE_TUNTAP -#include LINUX_IF_TUN_H + #ifdef HAVE_LINUX + #ifdef LINUX_IF_TUN_H + #include LINUX_IF_TUN_H + #else + #include + #endif + #else + #include + #endif #endif #include @@ -99,7 +91,7 @@ int total_socket_in = 0; int total_socket_out = 0; config_t *upstreamcfg; -static int seconds_till_retry; +int seconds_till_retry = 5; int keylifetime = 0; int keyexpires = 0; @@ -134,7 +126,7 @@ cp /* Encrypt the packet. */ - RAND_bytes(inpkt->salt, sizeof(inpkt->salt)); + RAND_pseudo_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.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt)); @@ -180,6 +172,8 @@ cp outlen += outpad; outpkt.len = outlen - sizeof(outpkt.salt); + total_socket_in += outlen; + receive_packet(cl, &outpkt); cp } @@ -364,8 +358,7 @@ cp taptype = TAP_TYPE_TUNTAP; } #endif -#endif -#ifdef HAVE_FREEBSD +#else taptype = TAP_TYPE_TUNTAP; #endif cp @@ -575,7 +568,7 @@ cp */ int setup_outgoing_connection(char *name) { - connection_t *ncn; + connection_t *ncn, *old; struct hostent *h; config_t const *cfg; cp @@ -585,6 +578,16 @@ cp return -1; } + /* Make sure we don't make an outgoing connection to a host that is already in our connection list */ + + if((old = lookup_id(name))) + { + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("We are already connected to %s."), name); + old->status.outgoing = 1; + return 0; + } + ncn = new_connection(); asprintf(&ncn->name, "%s", name); @@ -792,14 +795,6 @@ cp 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) @@ -820,6 +815,48 @@ cp 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!")); @@ -848,22 +885,6 @@ cp 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 */ @@ -999,11 +1020,10 @@ cp myself = NULL; } - close(tap_fd); - - /* Execute tinc-down script right after shutting down the interface */ execute_script("tinc-down"); + close(tap_fd); + destroy_connection_tree(); cp return; @@ -1103,7 +1123,7 @@ cp return; } - cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); + cl = lookup_active(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); if(!cl) { @@ -1180,9 +1200,8 @@ cp { cl->status.outgoing = 0; signal(SIGALRM, sigalrm_handler); - seconds_till_retry = 5; alarm(seconds_till_retry); - syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry); } /* Deactivate */ @@ -1409,7 +1428,7 @@ cp if(debug_lvl >= DEBUG_STATUS) syslog(LOG_INFO, _("Regenerating symmetric key")); - RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength); + RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength); send_key_changed(myself, NULL); keyexpires = time(NULL) + keylifetime; }