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

xt_ACCOUNT: indent reduction

Browse Source 
Invert early terminating conditions so the rest of the block can be
de-indented.
This commit is contained in:
Jan Engelhardt
2015-11-09 22:31:23 +01:00
parent fcb19403bc
commit 60b6b1dbef
1 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
extensions/ACCOUNT/xt_ACCOUNT.c
View File

@@ -631,18 +631,18 @@ static int ipt_acc_handle_prepare_read(char *tablename,
unsigned int b; unsigned int b;
for (b = 0; b <= 255; b++) { for (b = 0; b <= 255; b++) {
if (src_16->mask_24[b]) { if (src_16->mask_24[b] == NULL)
if ((network_16->mask_24[b] = continue;
ipt_acc_zalloc_page()) == NULL) { if ((network_16->mask_24[b] =
printk("ACCOUNT: out of memory during copy of 16 bit " ipt_acc_zalloc_page()) == NULL) {
"network in ipt_acc_handle_prepare_read()\n"); printk("ACCOUNT: out of memory during copy of 16 bit "
ipt_acc_data_free(dest->data, depth); "network in ipt_acc_handle_prepare_read()\n");
return -1; ipt_acc_data_free(dest->data, depth);
} return -1;
memcpy(network_16->mask_24[b], src_16->mask_24[b],
sizeof(struct ipt_acc_mask_24));
} }
memcpy(network_16->mask_24[b], src_16->mask_24[b],
sizeof(struct ipt_acc_mask_24));
} }
} else if (depth == 2) { } else if (depth == 2) {
struct ipt_acc_mask_8 *src_8 = struct ipt_acc_mask_8 *src_8 =
@@ -652,35 +652,35 @@ static int ipt_acc_handle_prepare_read(char *tablename,
unsigned int a, b; unsigned int a, b;
for (a = 0; a <= 255; a++) { for (a = 0; a <= 255; a++) {
if (src_8->mask_16[a]) { if (src_8->mask_16[a] == NULL)
if ((network_8->mask_16[a] = continue;
if ((network_8->mask_16[a] =
ipt_acc_zalloc_page()) == NULL) {
printk("ACCOUNT: out of memory during copy of 24 bit network"
" in ipt_acc_handle_prepare_read()\n");
ipt_acc_data_free(dest->data, depth);
return -1;
}
memcpy(network_8->mask_16[a], src_8->mask_16[a],
sizeof(struct ipt_acc_mask_16));
src_16 = src_8->mask_16[a];
network_16 = network_8->mask_16[a];
for (b = 0; b <= 255; b++) {
if (src_16->mask_24[b] == NULL)
continue;
if ((network_16->mask_24[b] =
ipt_acc_zalloc_page()) == NULL) { ipt_acc_zalloc_page()) == NULL) {
printk("ACCOUNT: out of memory during copy of 24 bit network" printk("ACCOUNT: out of memory during copy of 16 bit"
" in ipt_acc_handle_prepare_read()\n"); " network in ipt_acc_handle_prepare_read()\n");
ipt_acc_data_free(dest->data, depth); ipt_acc_data_free(dest->data, depth);
return -1; return -1;
} }
memcpy(network_8->mask_16[a], src_8->mask_16[a], memcpy(network_16->mask_24[b], src_16->mask_24[b],
sizeof(struct ipt_acc_mask_16)); sizeof(struct ipt_acc_mask_24));
src_16 = src_8->mask_16[a];
network_16 = network_8->mask_16[a];
for (b = 0; b <= 255; b++) {
if (src_16->mask_24[b]) {
if ((network_16->mask_24[b] =
ipt_acc_zalloc_page()) == NULL) {
printk("ACCOUNT: out of memory during copy of 16 bit"
" network in ipt_acc_handle_prepare_read()\n");
ipt_acc_data_free(dest->data, depth);
return -1;
}
memcpy(network_16->mask_24[b], src_16->mask_24[b],
sizeof(struct ipt_acc_mask_24));
}
}
} }
} }
} }
@@ -742,25 +742,26 @@ static int ipt_acc_handle_copy_data(void *to_user, unsigned long *to_user_pos,
unsigned int i; unsigned int i;
for (i = 0; i <= 255; i++) { for (i = 0; i <= 255; i++) {
if (data->ip[i].src_packets || data->ip[i].dst_packets) { if (data->ip[i].src_packets == 0 &&
handle_ip.ip = net_ip | net_OR_mask | i; data->ip[i].dst_packets == 0)
continue;
handle_ip.src_packets = data->ip[i].src_packets; handle_ip.ip = net_ip | net_OR_mask | i;
handle_ip.src_bytes = data->ip[i].src_bytes; handle_ip.src_packets = data->ip[i].src_packets;
handle_ip.dst_packets = data->ip[i].dst_packets; handle_ip.src_bytes = data->ip[i].src_bytes;
handle_ip.dst_bytes = data->ip[i].dst_bytes; handle_ip.dst_packets = data->ip[i].dst_packets;
handle_ip.dst_bytes = data->ip[i].dst_bytes;
/* Temporary buffer full? Flush to userspace */ /* Temporary buffer full? Flush to userspace */
if (*tmpbuf_pos + handle_ip_size >= PAGE_SIZE) { if (*tmpbuf_pos + handle_ip_size >= PAGE_SIZE) {
if (copy_to_user(to_user + *to_user_pos, ipt_acc_tmpbuf, if (copy_to_user(to_user + *to_user_pos, ipt_acc_tmpbuf,
*tmpbuf_pos)) *tmpbuf_pos))
return -EFAULT; return -EFAULT;
*to_user_pos = *to_user_pos + *tmpbuf_pos; *to_user_pos = *to_user_pos + *tmpbuf_pos;
*tmpbuf_pos = 0; *tmpbuf_pos = 0;
}
memcpy(ipt_acc_tmpbuf + *tmpbuf_pos, &handle_ip, handle_ip_size);
*tmpbuf_pos += handle_ip_size;
} }
memcpy(ipt_acc_tmpbuf + *tmpbuf_pos, &handle_ip, handle_ip_size);
*tmpbuf_pos += handle_ip_size;
} }
return 0; return 0;