along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: route.c,v 1.1.2.17 2001/07/20 20:25:10 guus Exp $
+ $Id: route.c,v 1.1.2.21 2001/11/16 17:40:50 zarq Exp $
*/
#include "config.h"
#include <sys/socket.h>
#include <netinet/in.h>
#ifdef HAVE_SOLARIS
- #include <netinet/if.h>
+ #include <net/if.h>
#define ETHER_ADDR_LEN 6
#else
#include <net/ethernet.h>
#include "subnet.h"
#include "route.h"
#include "protocol.h"
+#include "device.h"
#include "system.h"
{
subnet_t *subnet;
avl_node_t *node;
- connection_t *p;
+ connection_t *c;
cp
subnet = lookup_subnet_mac(address);
for(node = connection_tree->head; node; node = node->next)
{
- p = (connection_t *)node->data;
- if(p->status.active)
- send_add_subnet(p, subnet);
+ c = (connection_t *)node->data;
+ if(c->status.active)
+ send_add_subnet(c, subnet);
}
}
}
-connection_t *route_mac(vpn_packet_t *packet)
+node_t *route_mac(vpn_packet_t *packet)
{
subnet_t *subnet;
cp
return NULL;
}
-connection_t *route_ipv4(vpn_packet_t *packet)
-{
- ipv4_t dest;
- subnet_t *subnet;
-cp
- dest = ntohl(*((unsigned long*)(&packet->data[30])));
-
- subnet = lookup_subnet_ipv4(&dest);
-
if(!subnet)
{
if(debug_lvl >= DEBUG_TRAFFIC)
{
- syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %d.%d.%d.%d"),
- packet->data[30], packet->data[31], packet->data[32], packet->data[33]);
}
return NULL;
return subnet->owner;
}
-connection_t *route_ipv6(vpn_packet_t *packet)
+node_t *route_ip(vpn_packet_t *packet)
{
+ struct addrinfo *dest;
+ subnet_t *subnet;
+cp
+#warning FIXME
+ memcpy(&dest, &packet->data[30], 0);
+
+ subnet = lookup_subnet_ip(&dest);
cp
- if(debug_lvl > DEBUG_NOTHING)
+ if(!subnet)
{
- syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not yet implemented"));
- }
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ {
+ syslog(LOG_WARNING, _("Cannot route packet: unknown IP destination address"));
+ }
+
+ return NULL;
+ }
cp
- return NULL;
+ return subnet->owner;
}
void route_arp(vpn_packet_t *packet)
struct ether_arp *arp;
subnet_t *subnet;
unsigned char ipbuf[4];
- ipv4_t dest;
+ struct addrinfo *dest;
cp
/* First, snatch the source address from the ARP packet */
}
/* Check if the IP address exists on the VPN */
-
+#warning FIXME
dest = ntohl(*((unsigned long*)(arp->arp_tpa)));
- subnet = lookup_subnet_ipv4(&dest);
+ subnet = lookup_subnet_ip(&dest);
if(!subnet)
{
memcpy(arp->arp_sha, packet->data + ETHER_ADDR_LEN, ETHER_ADDR_LEN); /* add fake source hard addr */
arp->arp_op = htons(ARPOP_REPLY);
- accept_packet(packet);
+ write_packet(packet);
cp
}
void route_outgoing(vpn_packet_t *packet)
{
unsigned short int type;
- connection_t *cl;
+ node_t *n;
cp
/* FIXME: multicast? */
switch(type)
{
case 0x0800:
- cl = route_ipv4(packet);
+ n = route_ipv4(packet);
break;
case 0x86DD:
- cl = route_ipv6(packet);
+ n = route_ipv6(packet);
break;
case 0x0806:
route_arp(packet);
}
return;
}
- if(cl)
- send_packet(cl, packet);
+ if(n)
+ send_packet(n, packet);
break;
case RMODE_SWITCH:
- cl = route_mac(packet);
- if(cl)
- send_packet(cl, packet);
+ n = route_mac(packet);
+ if(n)
+ send_packet(n, packet);
else
broadcast_packet(myself, packet);
break;
}
}
-void route_incoming(connection_t *source, vpn_packet_t *packet)
+void route_incoming(node_t *source, vpn_packet_t *packet)
{
switch(routing_mode)
{
case RMODE_ROUTER:
memcpy(packet->data, mymac.net.mac.address.x, 6); /* Override destination address to make the kernel accept it */
- accept_packet(packet);
+ write_packet(packet);
break;
case RMODE_SWITCH:
{
if(subnet)
{
if(subnet->owner == myself)
- accept_packet(packet);
+ write_packet(packet);
else
send_packet(subnet->owner, packet);
}
else
{
broadcast_packet(source, packet);
- accept_packet(packet);
+ write_packet(packet);
}
}
break;
case RMODE_HUB:
- broadcast_packet(source,packet); /* Spread it on */
- accept_packet(packet);
+ broadcast_packet(source, packet); /* Spread it on */
+ write_packet(packet);
break;
}
}