From: Mike Frysinger <vapier@gentoo.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH] iptables: update gitignore list
Date: Thu, 20 Aug 2015 07:13:02 -0400 [thread overview]
Message-ID: <1440069182-21380-1-git-send-email-vapier@gentoo.org> (raw)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/linux/netfilter_ipv4/ip_tables.h | 2 +-
iptables/.gitignore | 3 +++
libiptc/libiptc.c | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 38542b4..6c73f34 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -212,7 +212,7 @@ struct ipt_get_entries {
/* The entries. */
struct ipt_entry entrytable[0];
-};
+} __attribute__((packed));
/* Helper functions */
static __inline__ struct xt_entry_target *
diff --git a/iptables/.gitignore b/iptables/.gitignore
index 6c0ade1..7438ad1 100644
--- a/iptables/.gitignore
+++ b/iptables/.gitignore
@@ -7,9 +7,12 @@
/iptables-extensions.8
/iptables-extensions.8.tmpl
/iptables-save
+/iptables-save.8
/iptables-restore
+/iptables-restore.8
/iptables-static
/iptables-xml
+/iptables-xml.1
/xtables-multi
/xtables-config-parser.c
/xtables-config-parser.h
diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c
index 9c07bb4..e8091eb 100644
--- a/libiptc/libiptc.c
+++ b/libiptc/libiptc.c
@@ -1302,7 +1302,8 @@ struct xtc_handle *
TC_INIT(const char *tablename)
{
struct xtc_handle *h;
- STRUCT_GETINFO info;
+ __attribute__((packed))
+STRUCT_GETINFO info;
unsigned int tmp;
socklen_t s;
int sockfd;
@@ -1350,6 +1351,7 @@ retry:
tmp = sizeof(STRUCT_GET_ENTRIES) + h->info.size;
+printf("getsockopt(, %i)\n", tmp);
if (getsockopt(h->sockfd, TC_IPPROTO, SO_GET_ENTRIES, h->entries,
&tmp) < 0)
goto error;
--
2.4.4
next reply other threads:[~2015-08-20 11:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-20 11:13 Mike Frysinger [this message]
2015-08-20 11:46 ` [PATCH] iptables: update gitignore list Arturo Borrero Gonzalez
2015-08-20 12:21 ` Mike Frysinger
2015-08-20 12:21 ` [PATCH v2] " Mike Frysinger
2015-08-26 19:09 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440069182-21380-1-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).