netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] libxt_osf: fix missing --ttl and --log in save output
@ 2013-03-24 10:09 pablo
  2013-03-24 10:09 ` [PATCH 2/2] libxt_osf: fix bad location for location in --genre pablo
  0 siblings, 1 reply; 2+ messages in thread
From: pablo @ 2013-03-24 10:09 UTC (permalink / raw)
  To: netfilter-devel

From: Pablo Neira Ayuso <pablo@netfilter.org>

closes http://bugzilla.netfilter.org/show_bug.cgi?id=805

Reported-by: Bourne Without <blackhole@airposte.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 extensions/libxt_osf.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extensions/libxt_osf.c b/extensions/libxt_osf.c
index 88274a0..4e2139a 100644
--- a/extensions/libxt_osf.c
+++ b/extensions/libxt_osf.c
@@ -93,6 +93,10 @@ static void osf_save(const void *ip, const struct xt_entry_match *match)
 	const struct xt_osf_info *info = (const struct xt_osf_info*) match->data;
 
 	printf(" --genre %s%s", (info->flags & XT_OSF_INVERT) ? "! ": "", info->genre);
+	if (info->flags & XT_OSF_TTL)
+		printf(" --ttl %u", info->ttl);
+	if (info->flags & XT_OSF_LOG)
+		printf(" --log %u", info->loglevel);
 }
 
 static struct xtables_match osf_match = {
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH 2/2] libxt_osf: fix bad location for location in --genre
  2013-03-24 10:09 [PATCH 1/2] libxt_osf: fix missing --ttl and --log in save output pablo
@ 2013-03-24 10:09 ` pablo
  0 siblings, 0 replies; 2+ messages in thread
From: pablo @ 2013-03-24 10:09 UTC (permalink / raw)
  To: netfilter-devel

From: Pablo Neira Ayuso <pablo@netfilter.org>

closes http://bugzilla.netfilter.org/show_bug.cgi?id=805

Reported-by: Bourne Without <blackhole@airposte.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 extensions/libxt_osf.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/libxt_osf.c b/extensions/libxt_osf.c
index 4e2139a..52dba47 100644
--- a/extensions/libxt_osf.c
+++ b/extensions/libxt_osf.c
@@ -92,7 +92,10 @@ static void osf_save(const void *ip, const struct xt_entry_match *match)
 {
 	const struct xt_osf_info *info = (const struct xt_osf_info*) match->data;
 
-	printf(" --genre %s%s", (info->flags & XT_OSF_INVERT) ? "! ": "", info->genre);
+	if (info->flags & XT_OSF_INVERT)
+		printf(" !");
+
+	printf(" --genre %s", info->genre);
 	if (info->flags & XT_OSF_TTL)
 		printf(" --ttl %u", info->ttl);
 	if (info->flags & XT_OSF_LOG)
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-03-24 10:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-24 10:09 [PATCH 1/2] libxt_osf: fix missing --ttl and --log in save output pablo
2013-03-24 10:09 ` [PATCH 2/2] libxt_osf: fix bad location for location in --genre pablo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).