anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-07 13:15:12 +02:00
Code Issues Releases Wiki Activity

ACCOUNT: simple reformat, use tabs instead of spaces

Browse Source 
The result is not perfect, but at more manageable.
This commit is contained in:
Jan Engelhardt
2009-09-05 03:01:37 +02:00
parent 06c01131e8
commit dd6cb27da4
3 changed files with 985 additions and 985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
extensions/libxt_ACCOUNT.c
View File

@@ -14,9 +14,9 @@
#include "xt_ACCOUNT.h" #include "xt_ACCOUNT.h"
static struct option opts[] = { static struct option opts[] = {
{ .name = "addr", .has_arg = 1, .flag = 0, .val = 'a' }, { .name = "addr", .has_arg = 1, .flag = 0, .val = 'a' },
{ .name = "tname", .has_arg = 1, .flag = 0, .val = 't' }, { .name = "tname", .has_arg = 1, .flag = 0, .val = 't' },
{ .name = 0 } { .name = 0 }
}; };
/* Compat glue for iptables 1.4.0 */ /* Compat glue for iptables 1.4.0 */
@@ -27,7 +27,7 @@ static struct option opts[] = {
/* Function which prints out usage message. */ /* Function which prints out usage message. */
static void help(void) static void help(void)
{ {
printf( printf(
"ACCOUNT v%s options:\n" "ACCOUNT v%s options:\n"
" --%s ip/netmask\t\tBase network IP and netmask used for this table\n" " --%s ip/netmask\t\tBase network IP and netmask used for this table\n"
" --%s name\t\t\tTable name for the userspace library\n", " --%s name\t\t\tTable name for the userspace library\n",
@@ -38,9 +38,9 @@ XTABLES_VERSION, opts[0].name, opts[1].name);
static void static void
init(struct xt_entry_target *t) init(struct xt_entry_target *t)
{ {
struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)t->data; struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)t->data;
accountinfo->table_nr = -1; accountinfo->table_nr = -1;
} }
#define IPT_ACCOUNT_OPT_ADDR 0x01 #define IPT_ACCOUNT_OPT_ADDR 0x01
@@ -50,149 +50,149 @@ init(struct xt_entry_target *t)
ate an option */ ate an option */
static int parse(int c, char **argv, int invert, unsigned int *flags, static int parse(int c, char **argv, int invert, unsigned int *flags,
const void *entry, struct xt_entry_target **target) const void *entry, struct xt_entry_target **target)
{ {
struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)(*target)->data; struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)(*target)->data;
struct in_addr *addrs = NULL, mask; struct in_addr *addrs = NULL, mask;
unsigned int naddrs = 0; unsigned int naddrs = 0;
switch (c) { switch (c) {
case 'a': case 'a':
if (*flags & IPT_ACCOUNT_OPT_ADDR) if (*flags & IPT_ACCOUNT_OPT_ADDR)
xtables_error(PARAMETER_PROBLEM, "Can't specify --%s twice", xtables_error(PARAMETER_PROBLEM, "Can't specify --%s twice",
opts[0].name); opts[0].name);
if (xtables_check_inverse(optarg, &invert, NULL, 0)) if (xtables_check_inverse(optarg, &invert, NULL, 0))
xtables_error(PARAMETER_PROBLEM, "Unexpected `!' after --%s", xtables_error(PARAMETER_PROBLEM, "Unexpected `!' after --%s",
opts[0].name); opts[0].name);
#ifdef XTABLES_VERSION_CODE #ifdef XTABLES_VERSION_CODE
xtables_ipparse_any(optarg, &addrs, &mask, &naddrs); xtables_ipparse_any(optarg, &addrs, &mask, &naddrs);
#else #else
parse_hostnetworkmask(optarg, &addrs, &mask, &naddrs); parse_hostnetworkmask(optarg, &addrs, &mask, &naddrs);
#endif #endif
if (naddrs > 1) if (naddrs > 1)
xtables_error(PARAMETER_PROBLEM, "multiple IP addresses not allowed"); xtables_error(PARAMETER_PROBLEM, "multiple IP addresses not allowed");
accountinfo->net_ip = addrs[0].s_addr; accountinfo->net_ip = addrs[0].s_addr;
accountinfo->net_mask = mask.s_addr; accountinfo->net_mask = mask.s_addr;
*flags |= IPT_ACCOUNT_OPT_ADDR; *flags |= IPT_ACCOUNT_OPT_ADDR;
break; break;
case 't': case 't':
if (*flags & IPT_ACCOUNT_OPT_TABLE) if (*flags & IPT_ACCOUNT_OPT_TABLE)
xtables_error(PARAMETER_PROBLEM, xtables_error(PARAMETER_PROBLEM,
"Can't specify --%s twice", opts[1].name); "Can't specify --%s twice", opts[1].name);
if (xtables_check_inverse(optarg, &invert, NULL, 0)) if (xtables_check_inverse(optarg, &invert, NULL, 0))
xtables_error(PARAMETER_PROBLEM, xtables_error(PARAMETER_PROBLEM,
"Unexpected `!' after --%s", opts[1].name); "Unexpected `!' after --%s", opts[1].name);
if (strlen(optarg) > ACCOUNT_TABLE_NAME_LEN - 1) if (strlen(optarg) > ACCOUNT_TABLE_NAME_LEN - 1)
xtables_error(PARAMETER_PROBLEM, xtables_error(PARAMETER_PROBLEM,
"Maximum table name length %u for --%s", "Maximum table name length %u for --%s",
ACCOUNT_TABLE_NAME_LEN - 1, opts[1].name); ACCOUNT_TABLE_NAME_LEN - 1, opts[1].name);
strcpy(accountinfo->table_name, optarg); strcpy(accountinfo->table_name, optarg);
*flags |= IPT_ACCOUNT_OPT_TABLE; *flags |= IPT_ACCOUNT_OPT_TABLE;
break; break;
default: default:
return 0; return 0;
} }
return 1; return 1;
} }
/* Final check; nothing. */ /* Final check; nothing. */
static void final_check(unsigned int flags) static void final_check(unsigned int flags)
{ {
if (!(flags&IPT_ACCOUNT_OPT_ADDR) || !(flags&IPT_ACCOUNT_OPT_TABLE)) if (!(flags & IPT_ACCOUNT_OPT_ADDR) || !(flags & IPT_ACCOUNT_OPT_TABLE))
xtables_error(PARAMETER_PROBLEM, "ACCOUNT: needs --%s and --%s", xtables_error(PARAMETER_PROBLEM, "ACCOUNT: needs --%s and --%s",
opts[0].name, opts[1].name); opts[0].name, opts[1].name);
} }
static const char *print_helper_ip(struct in_addr a) static const char *print_helper_ip(struct in_addr a)
{ {
#ifdef XTABLES_VERSION_CODE #ifdef XTABLES_VERSION_CODE
return xtables_ipaddr_to_numeric(&a); return xtables_ipaddr_to_numeric(&a);
#else #else
return addr_to_dotted(&a); return addr_to_dotted(&a);
#endif #endif
} }
static const char *print_helper_mask(struct in_addr a) static const char *print_helper_mask(struct in_addr a)
{ {
#ifdef XTABLES_VERSION_CODE #ifdef XTABLES_VERSION_CODE
return xtables_ipmask_to_numeric(&a); return xtables_ipmask_to_numeric(&a);
#else #else
return mask_to_dotted(&a); return mask_to_dotted(&a);
#endif #endif
} }
static void print_it(const void *ip, static void print_it(const void *ip,
const struct xt_entry_target *target, char do_prefix) const struct xt_entry_target *target, char do_prefix)
{ {
const struct ipt_acc_info *accountinfo const struct ipt_acc_info *accountinfo
= (const struct ipt_acc_info *)target->data; = (const struct ipt_acc_info *)target->data;
struct in_addr a; struct in_addr a;
if (!do_prefix) if (!do_prefix)
printf("ACCOUNT "); printf("ACCOUNT ");
// Network information // Network information
if (do_prefix) if (do_prefix)
printf("--"); printf("--");
printf("%s ", opts[0].name); printf("%s ", opts[0].name);
a.s_addr = accountinfo->net_ip; a.s_addr = accountinfo->net_ip;
printf("%s", print_helper_ip(a)); printf("%s", print_helper_ip(a));
a.s_addr = accountinfo->net_mask; a.s_addr = accountinfo->net_mask;
printf("%s", print_helper_mask(a)); printf("%s", print_helper_mask(a));
printf(" "); printf(" ");
if (do_prefix) if (do_prefix)
printf("--"); printf("--");
printf("%s %s", opts[1].name, accountinfo->table_name); printf("%s %s", opts[1].name, accountinfo->table_name);
} }
static void static void
print(const void *ip, print(const void *ip,
const struct xt_entry_target *target, const struct xt_entry_target *target,
int numeric) int numeric)
{ {
print_it (ip, target, 0); print_it(ip, target, 0);
} }
/* Saves the union ipt_targinfo in parsable form to stdout. */ /* Saves the union ipt_targinfo in parsable form to stdout. */
static void static void
save(const void *ip, const struct xt_entry_target *target) save(const void *ip, const struct xt_entry_target *target)
{ {
print_it(ip, target, 1); print_it(ip, target, 1);
} }
static static
struct xtables_target account struct xtables_target account
= { = {
.next = NULL, .next = NULL,
.name = "ACCOUNT", .name = "ACCOUNT",
.family = AF_INET, .family = AF_INET,
.version = XTABLES_VERSION, .version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct ipt_acc_info)), .size = XT_ALIGN(sizeof(struct ipt_acc_info)),
.userspacesize = offsetof(struct ipt_acc_info, table_nr), .userspacesize = offsetof(struct ipt_acc_info, table_nr),
.help = &help, .help = &help,
.init = &init, .init = &init,
.parse = &parse, .parse = &parse,
.final_check = &final_check, .final_check = &final_check,
.print = &print, .print = &print,
.save = &save, .save = &save,
.extra_opts = opts .extra_opts = opts
}; };
void _init(void) void _init(void)
{ {
xtables_register_target(&account); xtables_register_target(&account);
} }

1702
extensions/xt_ACCOUNT.c
View File

File diff suppressed because it is too large Load Diff

94
extensions/xt_ACCOUNT.h
View File

@@ -13,14 +13,14 @@
#define IPT_SO_SET_ACCOUNT_HANDLE_FREE (IPT_BASE_CTL + 3) #define IPT_SO_SET_ACCOUNT_HANDLE_FREE (IPT_BASE_CTL + 3)
#define IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL (IPT_BASE_CTL + 4) #define IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL (IPT_BASE_CTL + 4)
#define IPT_SO_SET_ACCOUNT_MAX IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL #define IPT_SO_SET_ACCOUNT_MAX IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL
#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 4) #define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 4)
#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 5) #define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 5)
#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 6) #define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 6)
#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 7) #define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 7)
#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 8) #define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 8)
#define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES
#define ACCOUNT_MAX_TABLES 128 #define ACCOUNT_MAX_TABLES 128
#define ACCOUNT_TABLE_NAME_LEN 32 #define ACCOUNT_TABLE_NAME_LEN 32
@@ -28,84 +28,84 @@
/* Structure for the userspace part of ipt_ACCOUNT */ /* Structure for the userspace part of ipt_ACCOUNT */
struct ipt_acc_info { struct ipt_acc_info {
uint32_t net_ip; uint32_t net_ip;
uint32_t net_mask; uint32_t net_mask;
char table_name[ACCOUNT_TABLE_NAME_LEN]; char table_name[ACCOUNT_TABLE_NAME_LEN];
int32_t table_nr; int32_t table_nr;
}; };
/* Internal table structure, generated by check_entry() */ /* Internal table structure, generated by check_entry() */
struct ipt_acc_table { struct ipt_acc_table {
char name[ACCOUNT_TABLE_NAME_LEN]; /* name of the table */ char name[ACCOUNT_TABLE_NAME_LEN]; /* name of the table */
uint32_t ip; /* base IP of network */ uint32_t ip; /* base IP of network */
uint32_t netmask; /* netmask of the network */ uint32_t netmask; /* netmask of the network */
unsigned char depth; /* size of network: unsigned char depth; /* size of network:
0: 8 bit, 1: 16bit, 2: 24 bit */ 0: 8 bit, 1: 16bit, 2: 24 bit */
uint32_t refcount; /* refcount of this table. uint32_t refcount; /* refcount of this table.
if zero, destroy it */ if zero, destroy it */
uint32_t itemcount; /* number of IPs in this table */ uint32_t itemcount; /* number of IPs in this table */
void *data; /* pointer to the actual data, void *data; /* pointer to the actual data,
depending on netmask */ depending on netmask */
}; };
/* Internal handle structure */ /* Internal handle structure */
struct ipt_acc_handle { struct ipt_acc_handle {
uint32_t ip; /* base IP of network. Used for uint32_t ip; /* base IP of network. Used for
caculating the final IP during caculating the final IP during
get_data() */ get_data() */
unsigned char depth; /* size of network. See above for unsigned char depth; /* size of network. See above for
details */ details */
uint32_t itemcount; /* number of IPs in this table */ uint32_t itemcount; /* number of IPs in this table */
void *data; /* pointer to the actual data, void *data; /* pointer to the actual data,
depending on size */ depending on size */
}; };
/* Handle structure for communication with the userspace library */ /* Handle structure for communication with the userspace library */
struct ipt_acc_handle_sockopt { struct ipt_acc_handle_sockopt {
uint32_t handle_nr; /* Used for HANDLE_FREE */ uint32_t handle_nr; /* Used for HANDLE_FREE */
char name[ACCOUNT_TABLE_NAME_LEN]; /* Used for HANDLE_PREPARE_READ/ char name[ACCOUNT_TABLE_NAME_LEN]; /* Used for HANDLE_PREPARE_READ/
HANDLE_READ_FLUSH */ HANDLE_READ_FLUSH */
uint32_t itemcount; /* Used for HANDLE_PREPARE_READ/ uint32_t itemcount; /* Used for HANDLE_PREPARE_READ/
HANDLE_READ_FLUSH */ HANDLE_READ_FLUSH */
}; };
/* Used for every IP entry /* Used for every IP entry
Size is 16 bytes so that 256 (class C network) * 16 Size is 16 bytes so that 256 (class C network) * 16
fits in one kernel (zero) page */ fits in one kernel (zero) page */
struct ipt_acc_ip { struct ipt_acc_ip {
uint32_t src_packets; uint32_t src_packets;
uint32_t src_bytes; uint32_t src_bytes;
uint32_t dst_packets; uint32_t dst_packets;
uint32_t dst_bytes; uint32_t dst_bytes;
}; };
/* /*
Used for every IP when returning data Used for every IP when returning data
*/ */
struct ipt_acc_handle_ip { struct ipt_acc_handle_ip {
uint32_t ip; uint32_t ip;
uint32_t src_packets; uint32_t src_packets;
uint32_t src_bytes; uint32_t src_bytes;
uint32_t dst_packets; uint32_t dst_packets;
uint32_t dst_bytes; uint32_t dst_bytes;
}; };
/* /*
The IPs are organized as an array so that direct slot The IPs are organized as an array so that direct slot
calculations are possible. calculations are possible.
Only 8 bit networks are preallocated, 16/24 bit networks Only 8 bit networks are preallocated, 16/24 bit networks
allocate their slots when needed -> very efficent. allocate their slots when needed -> very efficent.
*/ */
struct ipt_acc_mask_24 { struct ipt_acc_mask_24 {
struct ipt_acc_ip ip[256]; struct ipt_acc_ip ip[256];
}; };
struct ipt_acc_mask_16 { struct ipt_acc_mask_16 {
struct ipt_acc_mask_24 *mask_24[256]; struct ipt_acc_mask_24 *mask_24[256];
}; };
struct ipt_acc_mask_8 { struct ipt_acc_mask_8 {
struct ipt_acc_mask_16 *mask_16[256]; struct ipt_acc_mask_16 *mask_16[256];
}; };
#endif /*_IPT_ACCOUNT_H*/ #endif /* _IPT_ACCOUNT_H */