welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oops

Browse source
This commit is contained in:
Brendan O'Dea 2004-11-29 03:55:19 +00:00
parent 2f5b811429
commit af2489f67a
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli.c
View file

@ -2,7 +2,7 @@
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_name = "$Name: $"; char const *cvs_name = "$Name: $";
char const *cvs_id_cli = "$Id: cli.c,v 1.34 2004-11-29 02:17:17 bodea Exp $"; char const *cvs_id_cli = "$Id: cli.c,v 1.35 2004-11-29 03:55:19 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -3008,6 +3008,9 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
return CLI_OK; return CLI_OK;
} }
if (i)
cli_print(cli, "");
cli_print(cli, "%s IP access list %s", cli_print(cli, "%s IP access list %s",
ip_filters[f].extended ? "Extended" : "Standard", ip_filters[f].extended ? "Extended" : "Standard",
ip_filters[f].name); ip_filters[f].name);

15
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.60 2004-11-29 02:17:17 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.61 2004-11-29 03:55:21 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -4418,18 +4418,17 @@ int ip_filter(u8 *buf, int len, u8 filter)
if (len < 20) // up to end of destination address if (len < 20) // up to end of destination address
return 0; return 0;
if (*buf >> 4) // IPv4 if ((*buf >> 4) != 4) // IPv4
return 0; return 0;
frag_offset = ntohs(*(u16 *) (buf + 6)) & 0x1fff;
frag_offset = ntohs(*(u16 *) (buf + 0)) & 0x1fff;
proto = buf[9]; proto = buf[9];
src_ip = *(u32 *) (buf + 12); src_ip = *(u32 *) (buf + 12);
dst_ip = *(u32 *) (buf + 16); dst_ip = *(u32 *) (buf + 16);
if (frag_offset == 0 && (proto == IPPROTO_TCP || proto == IPPROTO_UDP)) if (frag_offset == 0 && (proto == IPPROTO_TCP || proto == IPPROTO_UDP))
{ {
int l = buf[0] & 0xf; int l = (buf[0] & 0xf) * 4; // length of IP header
if (len < l + 4) // ports if (len < l + 4) // ports
return 0; return 0;
@ -4437,16 +4436,16 @@ int ip_filter(u8 *buf, int len, u8 filter)
dst_port = ntohs(*(u16 *) (buf + l + 2)); dst_port = ntohs(*(u16 *) (buf + l + 2));
if (proto == IPPROTO_TCP) if (proto == IPPROTO_TCP)
{ {
if (len < l + 15) // flags if (len < l + 14) // flags
return 0; return 0;
flags = buf[l + 14] & 0x3f; flags = buf[l + 13] & 0x3f;
} }
} }
for (rule = ip_filters[filter].rules; rule->action; rule++) for (rule = ip_filters[filter].rules; rule->action; rule++)
{ {
if (proto && proto != rule->proto) if (rule->proto != IPPROTO_IP && proto != rule->proto)
continue; continue;
if (rule->src_wild != INADDR_BROADCAST && if (rule->src_wild != INADDR_BROADCAST &&