summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2012-04-16 18:11:11 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2012-04-16 18:11:11 +0800
commit0501ea80ca9657c16300787fb7b6a01feec2bad8 (patch)
tree2cca85f9fa16590d77446624f4282070dcfe0aeb
parentc7ff4ad3e1c5d71669d27ed5ae0ff46894cf7bb2 (diff)
downloadpttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.tar
pttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.tar.gz
pttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.tar.bz2
pttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.tar.lz
pttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.tar.xz
pttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.tar.zst
pttbbs-0501ea80ca9657c16300787fb7b6a01feec2bad8.zip
Change banip address type to in_addr_t.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5662 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/UPDATING5
-rw-r--r--pttbbs/common/bbs/banip.c2
-rw-r--r--pttbbs/include/cmbbs.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/pttbbs/UPDATING b/pttbbs/UPDATING
index f8170027..a0747cc4 100644
--- a/pttbbs/UPDATING
+++ b/pttbbs/UPDATING
@@ -23,6 +23,11 @@ https://opensvn.csie.org/traccgi/pttbbs/changeset/2273
make r4871_uflag
-----------------------------------------------------------------------------
+r5662: [banip]
+banip 的 record size 由 unsigned long 改為 in_addr_t.
+在 64-bit 環境上使用的人請全部 (common, util, mbbsd) make clean 再 make all.
+~bbs/tmp/banip.cache 也要記得砍掉重建。
+
r5653: [banip]
util/banip.pl 跟 include/banip.h 改由 etc/banip.conf 取代,以後加 banip 不用
再重新編譯程式,只要修改 banip.conf 並重啟 bbs (bbsctl restart) 即可。
diff --git a/pttbbs/common/bbs/banip.c b/pttbbs/common/bbs/banip.c
index dc27a9e0..81d39a14 100644
--- a/pttbbs/common/bbs/banip.c
+++ b/pttbbs/common/bbs/banip.c
@@ -22,7 +22,7 @@ static const char *str_banned = "YOUR ARE USING A BANNED IP.\n\r";
typedef struct {
IPv4 addr;
- size_t msg_offset;
+ uint32_t msg_offset;
} BanRecord;
typedef struct {
diff --git a/pttbbs/include/cmbbs.h b/pttbbs/include/cmbbs.h
index 762009c8..4b5b4012 100644
--- a/pttbbs/include/cmbbs.h
+++ b/pttbbs/include/cmbbs.h
@@ -43,7 +43,7 @@ int log_payment(const char *filename, int money, int oldm, int newm,
const char *reason, time4_t now);
/* banip.c */
-typedef unsigned long IPv4; // derived from in_addr.s_addr
+typedef in_addr_t IPv4; // derived from in_addr.s_addr
typedef void BanIpList;
const char *in_banip_list(const BanIpList *list, const char *ip);
const char *in_banip_list_addr(const BanIpList *list, IPv4 addr);