projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
What was I thinking? s/vertex/edge/g.
[tinc]
/
src
/
route.c
diff --git
a/src/route.c
b/src/route.c
index
9a555de
..
170f509
100644
(file)
--- a/
src/route.c
+++ b/
src/route.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.
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.
15 2001/07/01 09:21:14
guus Exp $
+ $Id: route.c,v 1.1.2.
20 2001/10/27 13:13:35
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-28,7
+28,7
@@
#include <sys/socket.h>
#include <netinet/in.h>
#ifdef HAVE_SOLARIS
#include <sys/socket.h>
#include <netinet/in.h>
#ifdef HAVE_SOLARIS
- #include <net
inet
/if.h>
+ #include <net/if.h>
#define ETHER_ADDR_LEN 6
#else
#include <net/ethernet.h>
#define ETHER_ADDR_LEN 6
#else
#include <net/ethernet.h>
@@
-46,6
+46,7
@@
#include "subnet.h"
#include "route.h"
#include "protocol.h"
#include "subnet.h"
#include "route.h"
#include "protocol.h"
+#include "device.h"
#include "system.h"
#include "system.h"
@@
-56,7
+57,7
@@
void learn_mac(mac_t *address)
{
subnet_t *subnet;
avl_node_t *node;
{
subnet_t *subnet;
avl_node_t *node;
- connection_t *
p
;
+ connection_t *
c
;
cp
subnet = lookup_subnet_mac(address);
cp
subnet = lookup_subnet_mac(address);
@@
-77,14
+78,14
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
for(node = connection_tree->head; node; node = node->next)
{
-
p
= (connection_t *)node->data;
- if(
p->status.meta && p->status.active && p!= myself
)
- 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
{
subnet_t *subnet;
cp
@@
-102,15
+103,20
@@
cp
return NULL;
}
return NULL;
}
-
connection
_t *route_ipv4(vpn_packet_t *packet)
+
node
_t *route_ipv4(vpn_packet_t *packet)
{
ipv4_t dest;
subnet_t *subnet;
cp
{
ipv4_t dest;
subnet_t *subnet;
cp
+#ifdef HAVE_SOLARIS
+ /* The other form gives bus errors on a SparcStation 20. */
+ dest = ((packet->data[30] * 0x100 + packet->data[31]) * 0x100 + packet->data[32]) * 0x100 + packet->data[33];
+#else
dest = ntohl(*((unsigned long*)(&packet->data[30])));
dest = ntohl(*((unsigned long*)(&packet->data[30])));
-
+#endif
+cp
subnet = lookup_subnet_ipv4(&dest);
subnet = lookup_subnet_ipv4(&dest);
-
+cp
if(!subnet)
{
if(debug_lvl >= DEBUG_TRAFFIC)
if(!subnet)
{
if(debug_lvl >= DEBUG_TRAFFIC)
@@
-125,15
+131,26
@@
cp
return subnet->owner;
}
return subnet->owner;
}
-
connection
_t *route_ipv6(vpn_packet_t *packet)
+
node
_t *route_ipv6(vpn_packet_t *packet)
{
{
+ ipv6_t dest;
+ subnet_t *subnet;
+cp
+ memcpy(&dest, &packet->data[30], sizeof(ipv6_t));
+
+ subnet = lookup_subnet_ipv6(&dest);
cp
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 IPv6 destination address"));
+ }
+
+ return NULL;
+ }
cp
cp
- return
NULL;
+ return
subnet->owner;
}
void route_arp(vpn_packet_t *packet)
}
void route_arp(vpn_packet_t *packet)
@@
-201,14
+218,14
@@
cp
memcpy(arp->arp_sha, packet->data + ETHER_ADDR_LEN, ETHER_ADDR_LEN); /* add fake source hard addr */
arp->arp_op = htons(ARPOP_REPLY);
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;
cp
}
void route_outgoing(vpn_packet_t *packet)
{
unsigned short int type;
-
connection_t *cl
;
+
node_t *n
;
cp
/* FIXME: multicast? */
cp
/* FIXME: multicast? */
@@
-219,10
+236,10
@@
cp
switch(type)
{
case 0x0800:
switch(type)
{
case 0x0800:
-
cl
= route_ipv4(packet);
+
n
= route_ipv4(packet);
break;
case 0x86DD:
break;
case 0x86DD:
-
cl
= route_ipv6(packet);
+
n
= route_ipv6(packet);
break;
case 0x0806:
route_arp(packet);
break;
case 0x0806:
route_arp(packet);
@@
-234,14
+251,14
@@
cp
}
return;
}
}
return;
}
- if(
cl
)
- send_packet(
cl
, packet);
+ if(
n
)
+ send_packet(
n
, packet);
break;
case RMODE_SWITCH:
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;
else
broadcast_packet(myself, packet);
break;
@@
-252,13
+269,13
@@
cp
}
}
}
}
-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 */
{
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:
{
break;
case RMODE_SWITCH:
{
@@
-269,20
+286,20
@@
void route_incoming(connection_t *source, vpn_packet_t *packet)
if(subnet)
{
if(subnet->owner == myself)
if(subnet)
{
if(subnet->owner == myself)
-
accept
_packet(packet);
+
write
_packet(packet);
else
send_packet(subnet->owner, packet);
}
else
{
broadcast_packet(source, packet);
else
send_packet(subnet->owner, packet);
}
else
{
broadcast_packet(source, packet);
-
accept
_packet(packet);
+
write
_packet(packet);
}
}
break;
case RMODE_HUB:
}
}
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;
}
}
break;
}
}