*/
#include <string.h>
+#include <assert.h>
+#include <limits.h>
#include "secnet.h"
#include "util.h"
#include "ipaddr.h"
#define ICMP_CODE_TTL_EXCEEDED 0
/* Generic IP checksum routine */
-static inline uint16_t ip_csum(uint8_t *iph,uint32_t count)
+static inline uint16_t ip_csum(uint8_t *iph,int32_t count)
{
register uint32_t sum=0;
* By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by
* Arnt Gulbrandsen.
*/
-static inline uint16_t ip_fast_csum(uint8_t *iph, uint32_t ihl) {
+static inline uint16_t ip_fast_csum(uint8_t *iph, int32_t ihl) {
uint32_t sum;
__asm__ __volatile__(
return sum;
}
#else
-static inline uint16_t ip_fast_csum(uint8_t *iph, uint32_t ihl)
+static inline uint16_t ip_fast_csum(uint8_t *iph, int32_t ihl)
{
+ assert(ihl < INT_MAX/4);
return ip_csum(iph,ihl*4);
}
#endif
/* Fill in the ICMP checksum field correctly */
static void netlink_icmp_csum(struct icmphdr *h)
{
- uint32_t len;
+ int32_t len;
len=ntohs(h->iph.tot_len)-(4*h->iph.ihl);
h->check=0;
static bool_t netlink_check(struct netlink *st, struct buffer_if *buf)
{
struct iphdr *iph=(struct iphdr *)buf->start;
- uint32_t len;
+ int32_t len;
if (iph->ihl < 5 || iph->version != 4) return False;
if (buf->size < iph->ihl*4) return False;
netlink_icmp_simple(st,buf,client,ICMP_TYPE_UNREACHABLE,
ICMP_CODE_NET_PROHIBITED);
BUF_FREE(buf);
- }
- if (best_quality>0) {
- /* XXX Fragment if required */
- st->routes[best_match]->deliver(
- st->routes[best_match]->dst, buf);
- st->routes[best_match]->outcount++;
- BUF_ASSERT_FREE(buf);
} else {
- /* Generate ICMP destination unreachable */
- netlink_icmp_simple(st,buf,client,ICMP_TYPE_UNREACHABLE,
- ICMP_CODE_NET_UNREACHABLE); /* client==NULL */
- BUF_FREE(buf);
+ if (best_quality>0) {
+ /* XXX Fragment if required */
+ st->routes[best_match]->deliver(
+ st->routes[best_match]->dst, buf);
+ st->routes[best_match]->outcount++;
+ BUF_ASSERT_FREE(buf);
+ } else {
+ /* Generate ICMP destination unreachable */
+ netlink_icmp_simple(st,buf,client,ICMP_TYPE_UNREACHABLE,
+ ICMP_CODE_NET_UNREACHABLE); /* client==NULL */
+ BUF_FREE(buf);
+ }
}
}
BUF_ASSERT_FREE(buf);
static void netlink_output_subnets(struct netlink *st, uint32_t loglevel,
struct subnet_list *snets)
{
- uint32_t i;
+ int32_t i;
string_t net;
for (i=0; i<snets->entries; i++) {
for (i=0; i<st->n_clients; i++) {
netlink_output_subnets(st,c,st->routes[i]->subnets);
Message(c,"-> tunnel %s (%s,mtu %d,%s routes,%s,"
- "quality %d,use %d)\n",
+ "quality %d,use %d,pri %lu)\n",
st->routes[i]->name,
st->routes[i]->up?"up":"down",
st->routes[i]->mtu,
st->routes[i]->options&OPT_SOFTROUTE?"soft":"hard",
st->routes[i]->options&OPT_ALLOWROUTE?"free":"restricted",
st->routes[i]->link_quality,
- st->routes[i]->outcount);
+ st->routes[i]->outcount,
+ (unsigned long)st->routes[i]->priority);
}
net=ipaddr_to_string(st->secnet_address);
Message(c,"%s/32 -> netlink \"%s\" (use %d)\n",
{
struct netlink *st=sst;
struct netlink_client *c;
- uint32_t i;
+ int32_t i;
/* All the networks serviced by the various tunnels should now
* have been registered. We build a routing table by sorting the
* clients by priority. */
- st->routes=safe_malloc(st->n_clients*sizeof(*st->routes),
- "netlink_phase_hook");
+ st->routes=safe_malloc_ary(sizeof(*st->routes),st->n_clients,
+ "netlink_phase_hook");
/* Fill the table */
i=0;
- for (c=st->clients; c; c=c->next)
+ for (c=st->clients; c; c=c->next) {
+ assert(i<INT_MAX);
st->routes[i++]=c;
+ }
/* Sort the table in descending order of priority */
qsort(st->routes,st->n_clients,sizeof(*st->routes),
netlink_compare_client_priority);
return True;
}
-static void netlink_inst_set_mtu(void *sst, uint32_t new_mtu)
+static void netlink_inst_set_mtu(void *sst, int32_t new_mtu)
{
struct netlink_client *c=sst;
}
static void netlink_inst_reg(void *sst, netlink_deliver_fn *deliver,
- void *dst, uint32_t max_start_pad,
- uint32_t max_end_pad)
+ void *dst, int32_t max_start_pad,
+ int32_t max_end_pad)
{
struct netlink_client *c=sst;
struct netlink *st=c->nst;
struct netlink_client *c;
string_t name;
struct ipset *networks;
- uint32_t options,priority,mtu;
+ uint32_t options,priority;
+ int32_t mtu;
list_t *l;
name=dict_read_string(dict, "name", True, st->name, loc);
c->kup=False;
c->next=st->clients;
st->clients=c;
+ assert(st->n_clients < INT_MAX);
st->n_clients++;
return &c->cl;
return new_closure(&st->nl.cl);
}
-init_module netlink_module;
void netlink_module(dict_t *dict)
{
add_closure(dict,"null-netlink",null_apply);