Reorder fields of ban_t for better packing.

[umurmur.git] / src / ban.h

diff --git a/src/ban.h b/src/ban.h
index dc1e4c92b57d30c27b253bf61b6e69b09109c845..a8e6532fcadf298b8939814aeb6d73db586c861f 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -37,21 +37,20 @@
 #include "timer.h"
 
 typedef struct {
-       uint8_t hash[20];
-       in_addr_t address;
-       uint32_t mask;
+       struct dlist node;
+       struct sockaddr_storage address;
        char *reason;
        char *name;
        time_t time;
        uint32_t duration;
-       etimer_t startTime;
-       struct dlist node;
+       uint32_t mask;
+       uint8_t hash[20];
 } ban_t;
 
 void Ban_UserBan(client_t *client, char *reason);
 void Ban_pruneBanned();
 bool_t Ban_isBanned(client_t *client);
-bool_t Ban_isBannedAddr(in_addr_t *addr);
+bool_t Ban_isBannedAddr(struct sockaddr_storage *address);
 int Ban_getBanCount(void);
 message_t *Ban_getBanList(void);
 void Ban_putBanList(message_t *msg, int n_bans);