libiptc.c: remove ipt_error_target

This is a spurious change vs upstream, and it is apparently
no longer needed, presumably due to our kernel header files
catching up.

aosp/bionic$ git grep 'ipt_error_target'

libc/kernel/uapi/linux/netfilter_ipv4/ip_tables.h:35:

aosp/bionic$ git grep -A3 'xt_error_target \{'

libc/kernel/uapi/linux/netfilter/x_tables.h:63:
struct xt_error_target {
  struct xt_entry_target target;
  char errorname[XT_FUNCTION_MAXNAMELEN];
};

compare to iptables own headers

aosp/external/iptables$ git grep ipt_error_target
include/linux/netfilter_ipv4/ip_tables.h:33:#define ipt_error_target xt_error_target
libiptc/libip4tc.c:294:                == ALIGN(sizeof(struct ipt_error_target)));

aosp/external/iptables$ git grep ip6t_error_target
include/linux/netfilter_ipv6/ip6_tables.h:33:#define ip6t_error_target xt_error_target

(Also note that only the #undef is Android specific,
the actual struct was upstream and was later deleted,
it stuck around in Android iptables due to incorrect
merge conflict resolution)

Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Bug: 150112553
Change-Id: I97981de75a8f0bc0cf75306610560f24404d987f
Merged-In: I97981de75a8f0bc0cf75306610560f24404d987f

1 files changed, 0 insertions, 7 deletions

diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c
index c3142424..58882015 100644
--- a/libiptc/libiptc.c
+++ b/libiptc/libiptc.c
@@ -67,13 +67,6 @@ static const char *hooknames[] = {
 };
 
 /* Convenience structures */
-#undef ipt_error_target /* uapi includes this already. */
-struct ipt_error_target
-{
-	STRUCT_ENTRY_TARGET t;
-	char error[TABLE_MAXNAMELEN];
-};
-
 struct chain_head;
 struct rule_head;