psd: reduce size of struct host

We can use u16, saving 8 bytes total (weight cannot exceed
PSD_MAX_RATE, 10000). Also re-format comments & struct initializers.

No functional changes.
This commit is contained in:
Florian Westphal
2012-06-14 10:33:15 +02:00
committed by Jan Engelhardt
parent 5b2649b1a2
commit 3736a265d8
2 changed files with 16 additions and 15 deletions

View File

@@ -137,19 +137,19 @@ static void psd_mt_save(const void *ip, const struct xt_entry_match *match)
} }
static struct xtables_match psd_mt_reg = { static struct xtables_match psd_mt_reg = {
.name = "psd", .name = "psd",
.version = XTABLES_VERSION, .version = XTABLES_VERSION,
.revision = 1, .revision = 1,
.family = NFPROTO_IPV4, .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_psd_info)), .size = XT_ALIGN(sizeof(struct xt_psd_info)),
.userspacesize = XT_ALIGN(sizeof(struct xt_psd_info)), .userspacesize = XT_ALIGN(sizeof(struct xt_psd_info)),
.help = psd_mt_help, .help = psd_mt_help,
.init = psd_mt_init, .init = psd_mt_init,
.parse = psd_mt_parse, .parse = psd_mt_parse,
.final_check = psd_mt_final_check, .final_check = psd_mt_final_check,
.print = psd_mt_print, .print = psd_mt_print,
.save = psd_mt_save, .save = psd_mt_save,
.extra_opts = psd_mt_opts, .extra_opts = psd_mt_opts,
}; };
static __attribute__((constructor)) void psd_mt_ldr(void) static __attribute__((constructor)) void psd_mt_ldr(void)

View File

@@ -61,9 +61,9 @@ struct host {
unsigned long timestamp; unsigned long timestamp;
struct in_addr src_addr; struct in_addr src_addr;
struct in_addr dest_addr; struct in_addr dest_addr;
unsigned short src_port; __be16 src_port;
int count; uint16_t count;
int weight; uint8_t weight;
struct port ports[SCAN_MAX_COUNT-1]; struct port ports[SCAN_MAX_COUNT-1];
}; };
@@ -77,6 +77,7 @@ static struct {
spinlock_t lock; spinlock_t lock;
struct host list[LIST_SIZE]; struct host list[LIST_SIZE];
struct host *hash[HASH_SIZE]; struct host *hash[HASH_SIZE];
int index;
} state; } state;
/* /*