projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix forwarding of IPv6 packets.
[tinc]
/
src
/
route.c
diff --git
a/src/route.c
b/src/route.c
index
77fb7d1
..
f42b6a5
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.2
7 2002/03/01 14:25:10
guus Exp $
+ $Id: route.c,v 1.1.2.2
9 2002/03/10 14:04:48
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-97,6
+97,7
@@
void age_mac(void)
cp
for(node = myself->subnet_tree->head; node; node = next)
{
cp
for(node = myself->subnet_tree->head; node; node = next)
{
+ next = node->next;
s = (subnet_t *)node->data;
if(s->type == SUBNET_MAC && s->net.mac.lastseen && s->net.mac.lastseen + macexpire < now)
{
s = (subnet_t *)node->data;
if(s->type == SUBNET_MAC && s->net.mac.lastseen && s->net.mac.lastseen + macexpire < now)
{
@@
-253,7
+254,7
@@
cp
void route_outgoing(vpn_packet_t *packet)
{
unsigned short int type;
void route_outgoing(vpn_packet_t *packet)
{
unsigned short int type;
- node_t *n;
+ node_t *n
= NULL
;
cp
/* FIXME: multicast? */
cp
/* FIXME: multicast? */
@@
-303,9
+304,22
@@
void route_incoming(node_t *source, vpn_packet_t *packet)
{
case RMODE_ROUTER:
{
{
case RMODE_ROUTER:
{
- node_t *n;
+ node_t *n = NULL;
+ unsigned short int type;
- n = route_ipv4(packet);
+ type = ntohs(*((unsigned short*)(&packet->data[12])));
+ switch(type)
+ {
+ case 0x0800:
+ n = route_ipv4(packet);
+ break;
+ case 0x86DD:
+ n = route_ipv6(packet);
+ break;
+ default:
+ n = myself;
+ break;
+ }
if(n)
{
if(n)
{