From cfd1cbf2bfc023e92c92928aafd10ce074b3affa Mon Sep 17 00:00:00 2001 From: Michael Rash Date: Sat, 7 Mar 2015 19:45:50 -0800 Subject: [PATCH] [server] minor macro usage update for 127.0.0.2 --- server/fw_util.h | 1 + server/fw_util_firewalld.h | 6 +++--- server/fw_util_iptables.h | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/fw_util.h b/server/fw_util.h index 015b2e63..4e737313 100644 --- a/server/fw_util.h +++ b/server/fw_util.h @@ -39,6 +39,7 @@ #define EXPIRE_COMMENT_PREFIX "_exp_" #define TMP_COMMENT "__TMPCOMMENT__" +#define DUMMY_IP "127.0.0.2" #if FIREWALL_FIREWALLD #include "fw_util_firewalld.h" diff --git a/server/fw_util_firewalld.h b/server/fw_util_firewalld.h index b91131d2..98e9852a 100644 --- a/server/fw_util_firewalld.h +++ b/server/fw_util_firewalld.h @@ -47,9 +47,9 @@ #define FIREWD_FWD_RULE_ARGS "-t %s -p %i -s %s -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s" SH_REDIR #define FIREWD_DNAT_RULE_ARGS "-t %s -p %i -s %s -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s --to-destination %s:%i" SH_REDIR #define FIREWD_SNAT_RULE_ARGS "-t %s -p %i -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s %s" SH_REDIR -#define FIREWD_TMP_COMMENT_ARGS "-t %s -I %s %i -s 127.0.0.2 -m comment --comment " TMP_COMMENT " -j %s" SH_REDIR -#define FIREWD_TMP_CHK_RULE_ARGS "-t %s -I %s %i -s 127.0.0.2 -p udp -j %s" SH_REDIR -#define FIREWD_TMP_VERIFY_CHK_ARGS "-t %s -C %s -s 127.0.0.2 -p udp -j %s" SH_REDIR +#define FIREWD_TMP_COMMENT_ARGS "-t %s -I %s %i -s " DUMMY_IP " -m comment --comment " TMP_COMMENT " -j %s" SH_REDIR +#define FIREWD_TMP_CHK_RULE_ARGS "-t %s -I %s %i -s " DUMMY_IP " -p udp -j %s" SH_REDIR +#define FIREWD_TMP_VERIFY_CHK_ARGS "-t %s -C %s -s " DUMMY_IP " -p udp -j %s" SH_REDIR #define FIREWD_DEL_RULE_ARGS "-t %s -D %s %i" SH_REDIR #define FIREWD_NEW_CHAIN_ARGS "-t %s -N %s" SH_REDIR #define FIREWD_FLUSH_CHAIN_ARGS "-t %s -F %s" SH_REDIR diff --git a/server/fw_util_iptables.h b/server/fw_util_iptables.h index 0c290d57..8609685c 100644 --- a/server/fw_util_iptables.h +++ b/server/fw_util_iptables.h @@ -48,9 +48,9 @@ #define IPT_FWD_ALL_RULE_ARGS "-t %s -s %s -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s" SH_REDIR #define IPT_DNAT_RULE_ARGS "-t %s -p %i -s %s -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s --to-destination %s:%i" SH_REDIR #define IPT_SNAT_RULE_ARGS "-t %s -p %i -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s %s" SH_REDIR -#define IPT_TMP_COMMENT_ARGS "-t %s -I %s %i -s 127.0.0.2 -m comment --comment " TMP_COMMENT " -j %s" SH_REDIR -#define IPT_TMP_CHK_RULE_ARGS "-t %s -I %s %i -s 127.0.0.2 -p udp -j %s" SH_REDIR -#define IPT_TMP_VERIFY_CHK_ARGS "-t %s -C %s -s 127.0.0.2 -p udp -j %s" SH_REDIR +#define IPT_TMP_COMMENT_ARGS "-t %s -I %s %i -s " DUMMY_IP " -m comment --comment " TMP_COMMENT " -j %s" SH_REDIR +#define IPT_TMP_CHK_RULE_ARGS "-t %s -I %s %i -s " DUMMY_IP " -p udp -j %s" SH_REDIR +#define IPT_TMP_VERIFY_CHK_ARGS "-t %s -C %s -s " DUMMY_IP " -p udp -j %s" SH_REDIR #define IPT_DEL_RULE_ARGS "-t %s -D %s %i" SH_REDIR #define IPT_NEW_CHAIN_ARGS "-t %s -N %s" SH_REDIR #define IPT_FLUSH_CHAIN_ARGS "-t %s -F %s" SH_REDIR