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

xt_DNETMAP: style considerations

Browse Source 
Clean up the files a bit. For one, break dangerously right-indented
function headers, and correct some spaces that should be tab.
This commit is contained in:
Jan Engelhardt
2011-01-27 03:22:24 +01:00
parent e82410735a
commit 0a29c1d32f
2 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/libxt_DNETMAP.c
View File

@@ -64,7 +64,7 @@ static int netmask2bits(u_int32_t netmask)
static void DNETMAP_init(struct xt_entry_target *t) static void DNETMAP_init(struct xt_entry_target *t)
{ {
struct xt_DNETMAP_tginfo *tginfo = (struct xt_DNETMAP_tginfo *)&t->data; struct xt_DNETMAP_tginfo *tginfo = (void *)&t->data;
struct nf_nat_multi_range *mr = &tginfo->prefix; struct nf_nat_multi_range *mr = &tginfo->prefix;
/* Actually, it's 0, but it's ignored at the moment. */ /* Actually, it's 0, but it's ignored at the moment. */
@@ -87,14 +87,14 @@ static void parse_prefix(char *arg, struct nf_nat_range *range)
*slash = '\0'; *slash = '\0';
ip = xtables_numeric_to_ipaddr(arg); ip = xtables_numeric_to_ipaddr(arg);
if (!ip) if (ip == NULL)
xtables_error(PARAMETER_PROBLEM, "Bad IP address \"%s\"\n", xtables_error(PARAMETER_PROBLEM, "Bad IP address \"%s\"\n",
arg); arg);
range->min_ip = ip->s_addr; range->min_ip = ip->s_addr;
if (slash) { if (slash) {
if (strchr(slash + 1, '.')) { if (strchr(slash + 1, '.')) {
ip = xtables_numeric_to_ipmask(slash + 1); ip = xtables_numeric_to_ipmask(slash + 1);
if (!ip) if (ip == NULL)
xtables_error(PARAMETER_PROBLEM, xtables_error(PARAMETER_PROBLEM,
"Bad netmask \"%s\"\n", "Bad netmask \"%s\"\n",
slash + 1); slash + 1);
@@ -128,8 +128,7 @@ static void parse_prefix(char *arg, struct nf_nat_range *range)
static int DNETMAP_parse(int c, char **argv, int invert, unsigned int *flags, static int DNETMAP_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 xt_DNETMAP_tginfo *tginfo = struct xt_DNETMAP_tginfo *tginfo = (void *)(*target)->data;
(struct xt_DNETMAP_tginfo *)(*target)->data;
struct nf_nat_multi_range *mr = &tginfo->prefix; struct nf_nat_multi_range *mr = &tginfo->prefix;
char *end; char *end;
@@ -171,8 +170,7 @@ static void DNETMAP_print_addr(const void *ip,
const struct xt_entry_target *target, const struct xt_entry_target *target,
int numeric) int numeric)
{ {
struct xt_DNETMAP_tginfo *tginfo = struct xt_DNETMAP_tginfo *tginfo = (void *)&target->data;
(struct xt_DNETMAP_tginfo *)&target->data;
const struct nf_nat_multi_range *mr = &tginfo->prefix; const struct nf_nat_multi_range *mr = &tginfo->prefix;
const struct nf_nat_range *r = &mr->range[0]; const struct nf_nat_range *r = &mr->range[0];
struct in_addr a; struct in_addr a;
@@ -191,8 +189,7 @@ static void DNETMAP_print_addr(const void *ip,
static void DNETMAP_print(const void *ip, const struct xt_entry_target *target, static void DNETMAP_print(const void *ip, const struct xt_entry_target *target,
int numeric) int numeric)
{ {
struct xt_DNETMAP_tginfo *tginfo = struct xt_DNETMAP_tginfo *tginfo = (void *)&target->data;
(struct xt_DNETMAP_tginfo *)&target->data;
const __u8 *flags = &tginfo->flags; const __u8 *flags = &tginfo->flags;
printf("prefix "); printf("prefix ");
@@ -210,8 +207,7 @@ static void DNETMAP_print(const void *ip, const struct xt_entry_target *target,
static void DNETMAP_save(const void *ip, const struct xt_entry_target *target) static void DNETMAP_save(const void *ip, const struct xt_entry_target *target)
{ {
struct xt_DNETMAP_tginfo *tginfo = struct xt_DNETMAP_tginfo *tginfo = (void *)&target->data;
(struct xt_DNETMAP_tginfo *)&target->data;
const __u8 *flags = &tginfo->flags; const __u8 *flags = &tginfo->flags;
if (*flags & XT_DNETMAP_PREFIX) { if (*flags & XT_DNETMAP_PREFIX) {

69
extensions/xt_DNETMAP.c
View File

@@ -112,9 +112,8 @@ static inline unsigned int dnetmap_entry_hash(const __be32 addr)
return ntohl(addr) & (hash_size - 1); return ntohl(addr) & (hash_size - 1);
} }
static struct dnetmap_entry *dnetmap_entry_lookup(struct dnetmap_net static struct dnetmap_entry *
*dnetmap_net, dnetmap_entry_lookup(struct dnetmap_net *dnetmap_net, const __be32 addr)
const __be32 addr)
{ {
struct dnetmap_entry *e; struct dnetmap_entry *e;
unsigned int h; unsigned int h;
@@ -122,14 +121,13 @@ static struct dnetmap_entry *dnetmap_entry_lookup(struct dnetmap_net
h = dnetmap_entry_hash(addr); h = dnetmap_entry_hash(addr);
list_for_each_entry(e, &dnetmap_net->dnetmap_iphash[h], glist) list_for_each_entry(e, &dnetmap_net->dnetmap_iphash[h], glist)
if (memcmp(&e->prenat_addr, &addr, sizeof(e->prenat_addr)) == 0) if (memcmp(&e->prenat_addr, &addr, sizeof(addr)) == 0)
return e; return e;
return NULL; return NULL;
} }
static struct dnetmap_entry *dnetmap_entry_rlookup(struct dnetmap_net static struct dnetmap_entry *
*dnetmap_net, dnetmap_entry_rlookup(struct dnetmap_net *dnetmap_net, const __be32 addr)
const __be32 addr)
{ {
struct dnetmap_entry *e; struct dnetmap_entry *e;
unsigned int h; unsigned int h;
@@ -137,23 +135,21 @@ static struct dnetmap_entry *dnetmap_entry_rlookup(struct dnetmap_net
h = dnetmap_entry_hash(addr); h = dnetmap_entry_hash(addr);
list_for_each_entry(e, &dnetmap_net->dnetmap_iphash[hash_size + h], list_for_each_entry(e, &dnetmap_net->dnetmap_iphash[hash_size + h],
grlist) grlist)
if (memcmp(&e->postnat_addr, &addr, sizeof(e->postnat_addr)) == 0) if (memcmp(&e->postnat_addr, &addr, sizeof(addr)) == 0)
return e; return e;
return NULL; return NULL;
} }
static struct dnetmap_prefix *dnetmap_prefix_lookup(struct dnetmap_net static struct dnetmap_prefix *
*dnetmap_net, dnetmap_prefix_lookup(struct dnetmap_net *dnetmap_net,
const struct const struct nf_nat_multi_range_compat *mr)
nf_nat_multi_range_compat
*mr)
{ {
struct dnetmap_prefix *p; struct dnetmap_prefix *p;
list_for_each_entry(p, &dnetmap_net->prefixes, list) list_for_each_entry(p, &dnetmap_net->prefixes, list)
if (!memcmp(&p->prefix, mr, sizeof(*mr))) if (memcmp(&p->prefix, mr, sizeof(*mr)) == 0)
return p; return p;
return NULL; return NULL;
} }
@@ -166,14 +162,14 @@ static void dnetmap_prefix_flush(struct dnetmap_net *dnetmap_net,
for (i = 0; i < hash_size; i++) { for (i = 0; i < hash_size; i++) {
list_for_each_entry_safe(e, next, list_for_each_entry_safe(e, next,
&dnetmap_net->dnetmap_iphash[i], glist) &dnetmap_net->dnetmap_iphash[i], glist)
if (e->prefix == p) if (e->prefix == p)
list_del(&e->glist); list_del(&e->glist);
list_for_each_entry_safe(e, next, list_for_each_entry_safe(e, next,
&dnetmap_net-> &dnetmap_net->
dnetmap_iphash[hash_size + i], grlist) dnetmap_iphash[hash_size + i], grlist)
if (e->prefix == p) if (e->prefix == p)
list_del(&e->grlist); list_del(&e->grlist);
list_for_each_entry_safe(e, next, &p->iphash[i], list) { list_for_each_entry_safe(e, next, &p->iphash[i], list) {
list_del(&e->list); list_del(&e->list);
@@ -264,9 +260,9 @@ static int dnetmap_tg_check(const struct xt_tgchk_param *par)
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
/* data */ /* data */
pde_data = pde_data = proc_create_data(proc_str_data, proc_perms,
proc_create_data(proc_str_data, proc_perms, dnetmap_net->xt_dnetmap, dnetmap_net->xt_dnetmap,
&dnetmap_tg_fops, p); &dnetmap_tg_fops, p);
if (pde_data == NULL) { if (pde_data == NULL) {
kfree(p); kfree(p);
ret = -ENOMEM; ret = -ENOMEM;
@@ -276,9 +272,8 @@ static int dnetmap_tg_check(const struct xt_tgchk_param *par)
pde_data->gid = proc_gid; pde_data->gid = proc_gid;
/* statistics */ /* statistics */
pde_stat = pde_stat = create_proc_entry(proc_str_stat, proc_perms,
create_proc_entry(proc_str_stat, proc_perms, dnetmap_net->xt_dnetmap);
dnetmap_net->xt_dnetmap);
if (pde_stat == NULL) { if (pde_stat == NULL) {
kfree(p); kfree(p);
ret = -ENOMEM; ret = -ENOMEM;
@@ -336,10 +331,9 @@ dnetmap_tg(struct sk_buff **pskb, const struct xt_action_param *par)
/* if prefix is specified, we check if /* if prefix is specified, we check if
it matches lookedup entry */ it matches lookedup entry */
if (tginfo->flags & XT_DNETMAP_PREFIX) { if (tginfo->flags & XT_DNETMAP_PREFIX)
if (memcmp(mr, &e->prefix, sizeof(*mr))) if (memcmp(mr, &e->prefix, sizeof(*mr)))
goto no_rev_map; goto no_rev_map;
}
/* don't reset ttl if flag is set */ /* don't reset ttl if flag is set */
if (jttl >= 0) { if (jttl >= 0) {
p = e->prefix; p = e->prefix;
@@ -411,7 +405,7 @@ bind_new_prefix:
} else { } else {
if (!(tginfo->flags & XT_DNETMAP_REUSE)) { if (!(tginfo->flags & XT_DNETMAP_REUSE))
if (time_before(e->stamp, jiffies) && p != e->prefix) { if (time_before(e->stamp, jiffies) && p != e->prefix) {
if (!disable_log) if (!disable_log)
printk(KERN_INFO KBUILD_MODNAME printk(KERN_INFO KBUILD_MODNAME
@@ -424,7 +418,6 @@ bind_new_prefix:
e->prenat_addr = 0; e->prenat_addr = 0;
goto bind_new_prefix; goto bind_new_prefix;
} }
}
/* don't reset ttl if flag is set */ /* don't reset ttl if flag is set */
if (jttl >= 0) { if (jttl >= 0) {
e->stamp = jiffies + jttl; e->stamp = jiffies + jttl;
@@ -503,8 +496,8 @@ __acquires(dnetmap_lock)
spin_lock_bh(&dnetmap_lock); spin_lock_bh(&dnetmap_lock);
list_for_each_entry(e, &prefix->lru_list, lru_list) list_for_each_entry(e, &prefix->lru_list, lru_list)
if (p-- == 0) if (p-- == 0)
return e; return e;
return NULL; return NULL;
} }
@@ -518,7 +511,7 @@ static void *dnetmap_seq_next(struct seq_file *seq, void *v, loff_t * pos)
if (head == &prefix->lru_list) if (head == &prefix->lru_list)
return NULL; return NULL;
(*pos)++; ++*pos;
return list_entry(head, struct dnetmap_entry, lru_list); return list_entry(head, struct dnetmap_entry, lru_list);
} }
@@ -607,7 +600,7 @@ static int __net_init dnetmap_proc_net_init(struct net *net)
struct dnetmap_net *dnetmap_net = dnetmap_pernet(net); struct dnetmap_net *dnetmap_net = dnetmap_pernet(net);
dnetmap_net->xt_dnetmap = proc_mkdir("xt_DNETMAP", net->proc_net); dnetmap_net->xt_dnetmap = proc_mkdir("xt_DNETMAP", net->proc_net);
if (!dnetmap_net->xt_dnetmap) if (dnetmap_net->xt_dnetmap == NULL)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
@@ -633,8 +626,8 @@ static int __net_init dnetmap_net_init(struct net *net)
struct dnetmap_net *dnetmap_net = dnetmap_pernet(net); struct dnetmap_net *dnetmap_net = dnetmap_pernet(net);
int i; int i;
dnetmap_net->dnetmap_iphash = dnetmap_net->dnetmap_iphash = kmalloc(sizeof(struct list_head) *
kmalloc(sizeof(struct list_head) * hash_size * 2, GFP_ATOMIC); hash_size * 2, GFP_ATOMIC);
if (dnetmap_net->dnetmap_iphash == NULL) if (dnetmap_net->dnetmap_iphash == NULL)
return -ENOMEM; return -ENOMEM;