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.124 2001/07/21 15:34:18 guus Exp $
+ $Id: net.c,v 1.35.4.133 2001/09/25 13:39:11 guus Exp $
*/
#include "config.h"
#endif
#endif
+#ifdef HAVE_SOLARIS
+ #include <sys/sockio.h>
+ #include <sys/stropts.h>
+ #include <net/if_tun.h>
+#endif
+
#include <utils.h>
#include <xalloc.h>
#include <avl_tree.h>
int total_socket_in = 0;
int total_socket_out = 0;
-config_t *upstreamcfg;
int seconds_till_retry = 5;
int keylifetime = 0;
syslog(LOG_DEBUG, _("Writing packet of %d bytes to tap device"),
packet->len);
+#ifdef HAVE_SOLARIS
+ if(write(tap_fd, packet->data + 14, packet->len - 14) < 0)
+ syslog(LOG_ERR, _("Can't write to tun/tap device: %m"));
+ else
+ total_tap_out += packet->len;
+#else
if(taptype == TAP_TYPE_TUNTAP)
{
if(write(tap_fd, packet->data, packet->len) < 0)
else
total_tap_out += packet->len;
}
+#endif
cp
}
*/
void send_packet(connection_t *cl, vpn_packet_t *packet)
{
+ connection_t *hop;
cp
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
return;
}
- /* Check if it has to go via TCP or UDP... */
-cp
- if((cl->options | myself->options) & OPTION_TCPONLY)
+ if(myself->options & OPTION_TCPONLY)
{
- if(send_tcppacket(cl, packet))
- terminate_connection(cl, 1);
+ if(send_tcppacket(cl->nexthop, packet))
+ terminate_connection(cl->nexthop, 1);
}
else
- send_udppacket(cl, packet);
+ {
+ if(myself->options & OPTION_INDIRECT)
+ send_udppacket(cl->nexthop, packet);
+ else
+ {
+ hop = cl;
+
+ while(hop->options & OPTION_INDIRECT)
+ if(hop->lastbutonehop == myself)
+ break;
+ else
+ hop = hop->lastbutonehop;
+
+ send_udppacket(hop, packet);
+ }
+ }
}
/* Broadcast a packet to all active direct connections */
struct ifreq ifr;
# endif
#endif
+#ifdef HAVE_SOLARIS
+ int ip_fd = -1, if_fd = -1;
+ int ppa;
+ char *ptr;
+#endif
cp
if((cfg = get_config_val(config, config_tapdevice)))
cp
tap_fd = nfd;
- taptype = TAP_TYPE_ETHERTAP;
-
/* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC;
cp
if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
{
- syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
+ syslog(LOG_INFO, _("%s is a Linux tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
}
+ else
+ if (!ioctl(tap_fd, (('T'<< 8) | 202), (void *) &ifr))
+ {
+ syslog(LOG_INFO, _("%s is a Linux tun/tap device"), tapfname);
+ syslog(LOG_WARNING, _("Old ioctl() request used"));
+ taptype = TAP_TYPE_TUNTAP;
+ }
+ else
#endif
-#else
+ {
+ syslog(LOG_INFO, _("%s is a Linux ethertap device"), tapfname);
+ taptype = TAP_TYPE_ETHERTAP;
+ }
+#endif
+#ifdef HAVE_FREEBSD
+ syslog(LOG_INFO, _("%s is a FreeBSD tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
#endif
+#ifdef HAVE_SOLARIS
+ ppa = 0;
+
+ ptr = tapfname;
+ while(*ptr && !isdigit((int)*ptr)) ptr++;
+ ppa = atoi(ptr);
+
+ if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){
+ syslog(LOG_ERR, _("Could not open /dev/ip: %m"));
+ return -1;
+ }
+
+ /* Assign a new PPA and get its unit number. */
+ if( (ppa = ioctl(nfd, TUNNEWPPA, ppa)) < 0){
+ syslog(LOG_ERR, _("Can't assign new interface: %m"));
+ return -1;
+ }
+
+ if( (if_fd = open(tapfname, O_RDWR, 0)) < 0){
+ syslog(LOG_ERR, _("Could not open %s twice: %m"), tapfname);
+ return -1;
+ }
+
+ if(ioctl(if_fd, I_PUSH, "ip") < 0){
+ syslog(LOG_ERR, _("Can't push IP module: %m"));
+ return -1;
+ }
+
+ /* Assign ppa according to the unit number returned by tun device */
+ if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){
+ syslog(LOG_ERR, _("Can't set PPA %d: %m"), ppa);
+ return -1;
+ }
+
+ if(ioctl(ip_fd, I_LINK, if_fd) < 0){
+ syslog(LOG_ERR, _("Can't link TUN device to IP: %m"));
+ return -1;
+ }
+
+ syslog(LOG_INFO, _("%s is a Solaris tun device"), tapfname);
+#endif
+
cp
return 0;
}
if((old = lookup_id(name)))
{
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("We are already connected to %s."), name);
- old->status.outgoing = 1;
+ if(!old->status.outgoing)
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("We are already connected to %s."), name);
+
+ old->status.outgoing = 1;
+ }
return 0;
}
cp
/* Done */
+ myself->nexthop = myself;
+ myself->lastbutonehop = myself;
myself->status.active = 1;
id_add(myself);
return 0;
}
+void randomized_alarm(int seconds)
+{
+ unsigned char r;
+ RAND_pseudo_bytes(&r, 1);
+ alarm((seconds * (int)r) / 128 + 1);
+}
+
RETSIGTYPE
-sigalrm_handler(int a)
+try_outgoing_connections(int a)
{
config_t const *cfg;
+ int retry = 0;
cp
- cfg = get_config_val(upstreamcfg, config_connectto);
+ cfg = get_config_val(config, config_connectto);
- if(!cfg)
+ while(cfg)
{
- if(upstreamcfg == config)
- {
- /* No upstream IP given, we're listen only. */
- signal(SIGALRM, SIG_IGN);
- return;
- }
+ if(setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
+ retry = 1;
+ cfg = get_config_val(cfg->next, config_connectto); /* Or else we try the next ConnectTo line */
}
- else
+
+ if(retry)
{
- /* We previously tried all the ConnectTo lines. Now wrap back to the first. */
- cfg = get_config_val(config, config_connectto);
+ seconds_till_retry += 5;
+ if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
+ seconds_till_retry = MAXTIMEOUT;
+
+ syslog(LOG_ERR, _("Failed to setup all outgoing connections, will retry in %d seconds"),
+ seconds_till_retry);
+
+ /* Randomize timeout to avoid global synchronisation effects */
+ randomized_alarm(seconds_till_retry);
}
-
- while(cfg)
+ else
{
- upstreamcfg = cfg->next;
- if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
- {
- signal(SIGALRM, SIG_IGN);
- return;
- }
- cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
+ seconds_till_retry = 5;
}
-
- signal(SIGALRM, sigalrm_handler);
- upstreamcfg = config;
- seconds_till_retry += 5;
- if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
- seconds_till_retry = MAXTIMEOUT;
- syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
- seconds_till_retry);
- alarm(seconds_till_retry);
cp
}
if(setup_myself() < 0)
return -1;
- if(!(cfg = get_config_val(config, config_connectto)))
- /* No upstream IP given, we're listen only. */
- return 0;
-
- while(cfg)
- {
- upstreamcfg = cfg->next;
- if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
- return 0;
- cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
- }
-
- if(do_detach)
- {
- signal(SIGALRM, sigalrm_handler);
- upstreamcfg = config;
- seconds_till_retry = MAXTIMEOUT;
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
- alarm(seconds_till_retry);
- }
- else
- return -1;
-
+ signal(SIGALRM, try_outgoing_connections);
+ alarm(5);
cp
return 0;
}
if(cl->socket)
close(cl->socket);
+ if(cl->meta_socket)
+ close(cl->meta_socket);
connection_del(cl);
syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
cl->name, cl->hostname);
- close(cl->meta_socket);
-
if(cl->status.active)
{
/* Find all connections that were lost because they were behind cl
if(cl->status.outgoing)
{
cl->status.outgoing = 0;
- signal(SIGALRM, sigalrm_handler);
+ signal(SIGALRM, try_outgoing_connections);
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
}
if(FD_ISSET(p->meta_socket, f))
if(receive_meta(p) < 0)
{
- terminate_connection(p, 1);
+ terminate_connection(p, p->status.meta);
return;
}
}
vpn_packet_t vp;
int lenin;
cp
+#ifdef HAVE_SOLARIS
+ if((lenin = read(tap_fd, vp.data + 14, MTU)) <= 0)
+ {
+ syslog(LOG_ERR, _("Error while reading from tun device: %m"));
+ return;
+ }
+ memcpy(vp.data, mymac.net.mac.address.x, 6);
+ memcpy(vp.data + 6, mymac.net.mac.address.x, 6);
+ vp.data[12] = 0x08;
+ vp.data[13] = 0x00;
+ vp.len = lenin + 14;
+#else
if(taptype == TAP_TYPE_TUNTAP)
{
if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
}
vp.len = lenin - 2;
}
+#endif
total_tap_in += vp.len;
projects / tinc / blobdiff