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.115 2001/06/21 16:16:31 guus Exp $
+ $Id: net.c,v 1.35.4.122 2001/07/20 13:54:19 guus Exp $
*/
#include "config.h"
#include <sys/socket.h>
#include <net/if.h>
-#ifdef HAVE_OPENSSL_RAND_H
-# include <openssl/rand.h>
-#else
-# include <rand.h>
-#endif
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
#endif
-#ifdef HAVE_OPENSSL_ERR_H
-# include <openssl/err.h>
-#else
-# include <err.h>
-#endif
-
-#ifdef HAVE_OPENSSL_PEM_H
-# include <openssl/pem.h>
-#else
-# include <pem.h>
-#endif
-
-#warning oi1
#ifdef HAVE_TUNTAP
-#warning oi2
-#include LINUX_IF_TUN_H
+ #ifdef HAVE_LINUX
+ #ifdef LINUX_IF_TUN_H
+ #include LINUX_IF_TUN_H
+ #else
+ #include <linux/if_tun.h>
+ #endif
+ #else
+ #include <net/if_tun.h>
+ #endif
#endif
-#warning oi3
#include <utils.h>
#include <xalloc.h>
/* 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));
send_udppacket(cl, packet);
}
-/* Broadcast a packet to all active connections */
+/* Broadcast a packet to all active direct connections */
void broadcast_packet(connection_t *from, vpn_packet_t *packet)
{
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
- if(cl->status.meta && cl != from)
+ if(cl->status.active && cl != from)
send_packet(cl, packet);
}
cp
/* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC;
- mymac.net.mac.address.x[0] = 0xff;
- mymac.net.mac.address.x[1] = 0xff;
- mymac.net.mac.address.x[2] = 0xff;
- mymac.net.mac.address.x[3] = 0xff;
- mymac.net.mac.address.x[4] = 0xff;
- mymac.net.mac.address.x[5] = 0xff;
+ mymac.net.mac.address.x[0] = 0xfe;
+ mymac.net.mac.address.x[1] = 0xfd;
+ mymac.net.mac.address.x[2] = 0x00;
+ mymac.net.mac.address.x[3] = 0x00;
+ mymac.net.mac.address.x[4] = 0x00;
+ mymac.net.mac.address.x[5] = 0x00;
#ifdef HAVE_LINUX
#ifdef HAVE_TUNTAP
taptype = TAP_TYPE_TUNTAP;
}
#endif
-#endif
-#ifdef HAVE_FREEBSD
+#else
taptype = TAP_TYPE_TUNTAP;
#endif
cp
*/
int setup_outgoing_connection(char *name)
{
- connection_t *ncn;
+ connection_t *ncn, *old;
struct hostent *h;
config_t const *cfg;
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);
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;
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
- if(p->status.meta)
- FD_SET(p->meta_socket, fs);
+ FD_SET(p->meta_socket, fs);
}
FD_SET(myself->meta_socket, fs);
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)
{
if(cl->status.meta)
{
-
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
- for(node = connection_tree->head; node; node = node->next)
+ for(node = active_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
if(p->nexthop == cl && p != cl)
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p != cl)
+ if(p->status.active && p != cl)
send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
}
}
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
- if(cl->status.active && cl->status.meta)
+ if(cl->status.active)
{
if(cl->last_ping_time + timeout < now)
{
if(p->status.remove)
return;
- if(p->status.meta)
- if(FD_ISSET(p->meta_socket, f))
- if(receive_meta(p) < 0)
- {
- terminate_connection(p);
- return;
- }
+ if(FD_ISSET(p->meta_socket, f))
+ if(receive_meta(p) < 0)
+ {
+ terminate_connection(p);
+ return;
+ }
}
if(FD_ISSET(myself->meta_socket, f))
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;
}