[PATCH] iptables: update gitignore list

[PATCH] iptables: update gitignore list

[Mike Frysinger]

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

Re: [PATCH] iptables: update gitignore list

[Arturo Borrero Gonzalez]

On 20 August 2015 at 13:13, Mike Frysinger <vapier@gentoo.org> wrote:
> 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(-)
>

Perhaps this change doesn't belong to this patch:

> 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 *


same here:

> 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;


-- 
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] iptables: update gitignore list

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

On 20 Aug 2015 13:46, Arturo Borrero Gonzalez wrote:
> On 20 August 2015 at 13:13, Mike Frysinger <vapier@gentoo.org> wrote:
> > 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(-)
> 
> Perhaps this change doesn't belong to this patch:

yes, i did `git add` to extract the ignore, but then used -a w/commit
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH v2] iptables: update gitignore list

[Mike Frysinger]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 iptables/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
2.4.4

Re: [PATCH v2] iptables: update gitignore list

[Pablo Neira Ayuso]

Applied, thanks.