/*
route.c -- routing
- Copyright (C) 2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2000-2002 Ivo Timmermans <ivo@o2w.nl>,
+ 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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.34 2002/03/15 15:08:21 guus Exp $
+ $Id: route.c,v 1.1.2.43 2002/06/21 10:11:33 guus Exp $
*/
#include "config.h"
-#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD)
+#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#include <sys/socket.h>
#include <netinet/in.h>
-#if defined(HAVE_SOLARIS) || defined(HAVE_OPENBSD)
+#ifdef HAVE_NET_IF_H
#include <net/if.h>
- #define ETHER_ADDR_LEN 6
-#else
+#endif
+#ifdef HAVE_NET_ETHERNET_H
#include <net/ethernet.h>
#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
#include <netinet/if_ether.h>
#include <xalloc.h>
#include <syslog.h>
#include <string.h>
+#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+#endif
#include <avl_tree.h>
#include "system.h"
+#ifndef ETHER_ADDR_LEN
+ #define ETHER_ADDR_LEN 6
+#endif
+
int routing_mode = RMODE_ROUTER;
int priorityinheritance = 0;
int macexpire = 600;
if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_WARNING, _("Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
- ntohs(*(short unsigned int *)&packet->data[38]),
- ntohs(*(short unsigned int *)&packet->data[40]),
- ntohs(*(short unsigned int *)&packet->data[42]),
- ntohs(*(short unsigned int *)&packet->data[44]),
- ntohs(*(short unsigned int *)&packet->data[46]),
- ntohs(*(short unsigned int *)&packet->data[48]),
- ntohs(*(short unsigned int *)&packet->data[50]),
- ntohs(*(short unsigned int *)&packet->data[52]));
+ ntohs(*(uint16_t *)&packet->data[38]),
+ ntohs(*(uint16_t *)&packet->data[40]),
+ ntohs(*(uint16_t *)&packet->data[42]),
+ ntohs(*(uint16_t *)&packet->data[44]),
+ ntohs(*(uint16_t *)&packet->data[46]),
+ ntohs(*(uint16_t *)&packet->data[48]),
+ ntohs(*(uint16_t *)&packet->data[50]),
+ ntohs(*(uint16_t *)&packet->data[52]));
}
return NULL;
return subnet->owner;
}
-unsigned short int inet_checksum(unsigned short int *data, int len, unsigned short int prevsum)
+uint16_t inet_checksum(uint16_t *data, int len, uint16_t prevsum)
{
- unsigned long int checksum = prevsum ^ 0xFFFF;
+ uint32_t checksum = prevsum ^ 0xFFFF;
while(len--)
checksum += ntohs(*data++);
struct nd_neighbor_solicit *ns;
struct nd_opt_hdr *opt;
subnet_t *subnet;
- short unsigned int checksum;
+ uint16_t checksum;
struct {
struct in6_addr ip6_src; /* source address */
/* Generate checksum */
- checksum = inet_checksum((unsigned short int *)&pseudo, sizeof(pseudo)/2, ~0);
- checksum = inet_checksum((unsigned short int *)ns, sizeof(*ns)/2 + 4, checksum);
+ checksum = inet_checksum((uint16_t *)&pseudo, sizeof(pseudo)/2, ~0);
+ checksum = inet_checksum((uint16_t *)ns, sizeof(*ns)/2 + 4, checksum);
if(checksum)
{
if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_WARNING, _("Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
- ntohs(ns->nd_ns_target.s6_addr16[0]), ntohs(ns->nd_ns_target.s6_addr16[1]), ntohs(ns->nd_ns_target.s6_addr16[2]), ntohs(ns->nd_ns_target.s6_addr16[3]),
- ntohs(ns->nd_ns_target.s6_addr16[4]), ntohs(ns->nd_ns_target.s6_addr16[5]), ntohs(ns->nd_ns_target.s6_addr16[6]), ntohs(ns->nd_ns_target.s6_addr16[7]));
+ ntohs(((uint16_t *)&ns->nd_ns_target)[0]), ntohs(((uint16_t *)&ns->nd_ns_target)[1]), ntohs(((uint16_t *)&ns->nd_ns_target)[2]), ntohs(((uint16_t *)&ns->nd_ns_target)[3]),
+ ntohs(((uint16_t *)&ns->nd_ns_target)[4]), ntohs(((uint16_t *)&ns->nd_ns_target)[5]), ntohs(((uint16_t *)&ns->nd_ns_target)[6]), ntohs(((uint16_t *)&ns->nd_ns_target)[7]));
}
return;
/* Generate checksum */
- checksum = inet_checksum((unsigned short int *)&pseudo, sizeof(pseudo)/2, ~0);
- checksum = inet_checksum((unsigned short int *)ns, sizeof(*ns)/2 + 4, checksum);
+ checksum = inet_checksum((uint16_t *)&pseudo, sizeof(pseudo)/2, ~0);
+ checksum = inet_checksum((uint16_t *)ns, sizeof(*ns)/2 + 4, checksum);
- ns->nd_ns_hdr.icmp6_cksum = checksum;
+ ns->nd_ns_hdr.icmp6_cksum = htons(checksum);
write_packet(packet);
cp
{
struct ether_arp *arp;
subnet_t *subnet;
- unsigned char ipbuf[4];
+ uint8_t ipbuf[4];
cp
/* First, snatch the source address from the ARP packet */
if(ntohs(arp->arp_hrd) != ARPHRD_ETHER ||
ntohs(arp->arp_pro) != ETHERTYPE_IP ||
- (int) (arp->arp_hln) != ETHER_ADDR_LEN ||
- (int) (arp->arp_pln) != 4 ||
+ arp->arp_hln != ETHER_ADDR_LEN ||
+ arp->arp_pln != 4 ||
ntohs(arp->arp_op) != ARPOP_REQUEST )
{
if(debug_lvl > DEBUG_TRAFFIC)
void route_outgoing(vpn_packet_t *packet)
{
- unsigned short int type;
+ uint16_t type;
node_t *n = NULL;
cp
/* FIXME: multicast? */
switch(routing_mode)
{
case RMODE_ROUTER:
- type = ntohs(*((unsigned short*)(&packet->data[12])));
+ type = ntohs(*((uint16_t *)(&packet->data[12])));
switch(type)
{
case 0x0800:
n = route_ipv4(packet);
break;
case 0x86DD:
- n = route_ipv6(packet);
- if(!n && packet->data[0] == 0x33 && packet->data[1] == 0x33 && packet->data[2] == 0xff)
+ if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT)
{
route_neighborsol(packet);
return;
}
+ n = route_ipv6(packet);
break;
case 0x0806:
route_arp(packet);
case RMODE_ROUTER:
{
node_t *n = NULL;
- unsigned short int type;
+ uint16_t type;
- type = ntohs(*((unsigned short*)(&packet->data[12])));
+ type = ntohs(*((uint16_t *)(&packet->data[12])));
switch(type)
{
case 0x0800: