From: Jan Engelhardt <jengelh@medozas.de>
Date: Sat, 7 Mar 2009 00:15:48 +0000 (+0100)
Subject: xt_LOGMARK: print incoming interface index
X-Git-Tag: v1.12~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b9ca945d4be0d6a12511a434ab329f3ad2b218d;p=thirdparty%2Fxtables-addons.git

xt_LOGMARK: print incoming interface index
---

diff --git a/doc/changelog.txt b/doc/changelog.txt
index bd76702..e1f8d53 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,7 @@
 - ipset: fix for compilation with 2.6.29-rt
 - rename xt_portscan to xt_lscan ("low-level scan") because
   "portscan" as a wor caused confusion
+- xt_LOGMARK: print incoming interface index
 - revert "TEE: do not use TOS for routing"
 - xt_TEE: resolve unknown symbol error with CONFIG_IPV6=n
 
diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index a0d4591..43c5fd1 100644
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -38,9 +38,10 @@ logmark_tg(struct sk_buff **pskb, const struct xt_target_param *par)
 	enum ip_conntrack_info ctinfo;
 	bool prev = false;
 
-	printk("<%u>%.*s""hook=%s nfmark=0x%x secmark=0x%x classify=0x%x",
+	printk("<%u>%.*s""iif=%d hook=%s nfmark=0x%x "
+	       "secmark=0x%x classify=0x%x",
 	       info->level, (unsigned int)sizeof(info->prefix), info->prefix,
-	       hook_names[par->hooknum],
+	       skb->iif, hook_names[par->hooknum],
 	       skb_nfmark(skb), skb_secmark(skb), skb->priority);
 
 	ct = nf_ct_get(skb, &ctinfo);