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.122 2001/07/20 13:54:19 guus Exp $
+ $Id: net.c,v 1.35.4.127 2001/07/24 20:14:30 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>
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
}
if((cl->options | myself->options) & OPTION_TCPONLY)
{
if(send_tcppacket(cl, packet))
- terminate_connection(cl);
+ terminate_connection(cl, 1);
}
else
send_udppacket(cl, packet);
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 tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
}
+ else
#endif
-#else
+ {
+ syslog(LOG_INFO, _("%s is an ethertap device"), tapfname);
+ taptype = TAP_TYPE_ETHERTAP;
+ }
+#endif
+#ifdef HAVE_FREEBSD
+ syslog(LOG_INFO, _("%s is a tun/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 tun/tap device"), tapfname);
+#endif
+
cp
return 0;
}
keyexpires = time(NULL) + keylifetime;
cp
-
- /* Activate ourselves */
+ /* Done */
myself->status.active = 1;
+ id_add(myself);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
*/
void close_network_connections(void)
{
- avl_node_t *node;
+ avl_node_t *node, *next;
connection_t *p;
cp
- for(node = connection_tree->head; node; node = node->next)
+ for(node = connection_tree->head; node; node = next)
{
+ next = node->next;
p = (connection_t *)node->data;
p->status.outgoing = 0;
- p->status.active = 0;
- terminate_connection(p);
+ terminate_connection(p, 0);
}
- if(myself)
- if(myself->status.active)
- {
- close(myself->meta_socket);
- free_connection(myself);
- myself = NULL;
- }
+ terminate_connection(myself, 0);
+
+ destroy_trees();
execute_script("tinc-down");
close(tap_fd);
-
- destroy_connection_tree();
cp
return;
}
}
/*
- terminate a connection and notify the other
- end before closing the sockets
+ Terminate a connection:
+ - Close the sockets
+ - Remove associated hosts and subnets
+ - Deactivate the host
+ - Since it might still be referenced, put it on the prune list.
+ - If report == 1, then send DEL_HOST messages to the other tinc daemons.
*/
-void terminate_connection(connection_t *cl)
+void terminate_connection(connection_t *cl, int report)
{
connection_t *p;
subnet_t *subnet;
cp
if(cl->status.remove)
return;
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
- cl->name, cl->hostname);
-
- cl->status.remove = 1;
+ else
+ cl->status.remove = 1;
if(cl->socket)
close(cl->socket);
- if(cl->status.meta)
+ if(cl->meta_socket)
close(cl->meta_socket);
+ connection_del(cl);
+
if(cl->status.meta)
{
- /* Find all connections that were lost because they were behind cl
- (the connection that was dropped). */
-
- for(node = active_tree->head; node; node = node->next)
- {
- p = (connection_t *)node->data;
- if(p->nexthop == cl && p != cl)
- terminate_connection(p);
- }
-
- /* Inform others of termination if it was still active */
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ cl->name, cl->hostname);
if(cl->status.active)
- for(node = connection_tree->head; node; node = node->next)
- {
- p = (connection_t *)node->data;
- if(p->status.active && p != cl)
- send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
- }
+ {
+ /* Find all connections that were lost because they were behind cl
+ (the connection that was dropped). */
+
+ for(node = active_tree->head; node; node = next)
+ {
+ next = node->next;
+ p = (connection_t *)node->data;
+ if(p->nexthop == cl)
+ terminate_connection(p, report);
+ }
+ }
}
+ /* Inform others of termination if needed */
+
+ if(report)
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ p = (connection_t *)node->data;
+ if(p->status.active)
+ send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
+ }
+
/* Remove the associated subnets */
for(node = cl->subnet_tree->head; node; node = next)
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
}
-
- /* Deactivate */
-
- cl->status.active = 0;
cp
+ /* Schedule it for pruning */
+
+ prune_add(cl);
}
/*
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
cl->name, cl->hostname);
cl->status.timeout = 1;
- terminate_connection(cl);
+ terminate_connection(cl, 1);
}
else
{
if(FD_ISSET(p->meta_socket, f))
if(receive_meta(p) < 0)
{
- terminate_connection(p);
+ terminate_connection(p, 1);
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;
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_connection_tree();
+ prune_flush();
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
projects / tinc / blobdiff