|
 |
d8a888d |
From 4c30ed220bbcc4a8060b382b536a615dd296a6fa Mon Sep 17 00:00:00 2001
|
|
|
d8a888d |
From: Zhang Chunyu <zhangcy@cn.fujitsu.com>
|
|
|
d8a888d |
Date: Sun, 29 Mar 2015 22:35:47 -0400
|
|
|
d8a888d |
Subject: [PATCH] arptables: Add revision field for arptables userspace
|
|
|
d8a888d |
|
|
|
d8a888d |
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
|
|
|
d8a888d |
Signed-off-by: Zhang Chunyu <zhangcy@cn.fujitsu.com>
|
|
|
d8a888d |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
d8a888d |
(cherry picked from commit dbbe9f7de36aa3c7dd61dc89092c03f7902e474e)
|
|
|
d8a888d |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
d8a888d |
---
|
|
|
d8a888d |
arptables.c | 2 ++
|
|
|
d8a888d |
extensions/arpt_CLASSIFY.c | 1 +
|
|
|
d8a888d |
extensions/arpt_mangle.c | 1 +
|
|
|
d8a888d |
extensions/arpt_standard.c | 1 +
|
|
|
d8a888d |
include/arptables.h | 6 ++++++
|
|
|
d8a888d |
libarptc/libarptc_incl.c | 2 +-
|
|
|
d8a888d |
6 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
d8a888d |
|
|
|
d8a888d |
diff --git a/arptables.c b/arptables.c
|
|
|
d8a888d |
index f820ffa894e00..fbe7350be3f32 100644
|
|
|
d8a888d |
--- a/arptables.c
|
|
|
d8a888d |
+++ b/arptables.c
|
|
|
d8a888d |
@@ -2067,6 +2067,7 @@ int do_command(int argc, char *argv[], char **table, arptc_handle_t *handle)
|
|
|
d8a888d |
target->t->u.target_size = size;
|
|
|
d8a888d |
strncpy(target->t->u.user.name, jumpto, sizeof(target->t->u.user.name));
|
|
|
d8a888d |
target->t->u.user.name[sizeof(target->t->u.user.name)-1] = '\0';
|
|
|
d8a888d |
+ target->t->u.user.revision = target->revision;
|
|
|
d8a888d |
/*
|
|
|
d8a888d |
target->init(target->t, &fw.nfcache);
|
|
|
d8a888d |
*/
|
|
|
d8a888d |
@@ -2392,6 +2393,7 @@ int do_command(int argc, char *argv[], char **table, arptc_handle_t *handle)
|
|
|
d8a888d |
target->t = fw_calloc(1, size);
|
|
|
d8a888d |
target->t->u.target_size = size;
|
|
|
d8a888d |
strcpy(target->t->u.user.name, jumpto);
|
|
|
d8a888d |
+ target->t->u.user.revision = target->revision;
|
|
|
d8a888d |
target->init(target->t);
|
|
|
d8a888d |
}
|
|
|
d8a888d |
|
|
|
d8a888d |
diff --git a/extensions/arpt_CLASSIFY.c b/extensions/arpt_CLASSIFY.c
|
|
|
d8a888d |
index cb5770be8053c..7893aed31c057 100644
|
|
|
d8a888d |
--- a/extensions/arpt_CLASSIFY.c
|
|
|
d8a888d |
+++ b/extensions/arpt_CLASSIFY.c
|
|
|
d8a888d |
@@ -105,6 +105,7 @@ struct arptables_target classify
|
|
|
d8a888d |
ARPTABLES_VERSION,
|
|
|
d8a888d |
ARPT_ALIGN(sizeof(struct xt_classify_target_info)),
|
|
|
d8a888d |
ARPT_ALIGN(sizeof(struct xt_classify_target_info)),
|
|
|
d8a888d |
+ 0,
|
|
|
d8a888d |
&help,
|
|
|
d8a888d |
&init,
|
|
|
d8a888d |
&parse,
|
|
|
d8a888d |
diff --git a/extensions/arpt_mangle.c b/extensions/arpt_mangle.c
|
|
|
d8a888d |
index c38fc1668236d..c7c3a7a42fc36 100644
|
|
|
d8a888d |
--- a/extensions/arpt_mangle.c
|
|
|
d8a888d |
+++ b/extensions/arpt_mangle.c
|
|
|
d8a888d |
@@ -199,6 +199,7 @@ struct arptables_target change
|
|
|
d8a888d |
ARPTABLES_VERSION,
|
|
|
d8a888d |
ARPT_ALIGN(sizeof(struct arpt_mangle)),
|
|
|
d8a888d |
ARPT_ALIGN(sizeof(struct arpt_mangle)),
|
|
|
d8a888d |
+ 0,
|
|
|
d8a888d |
&help,
|
|
|
d8a888d |
&init,
|
|
|
d8a888d |
&parse,
|
|
|
d8a888d |
diff --git a/extensions/arpt_standard.c b/extensions/arpt_standard.c
|
|
|
d8a888d |
index cb3891d871102..6c2b1874acb59 100644
|
|
|
d8a888d |
--- a/extensions/arpt_standard.c
|
|
|
d8a888d |
+++ b/extensions/arpt_standard.c
|
|
|
d8a888d |
@@ -54,6 +54,7 @@ struct arptables_target standard
|
|
|
d8a888d |
ARPTABLES_VERSION,
|
|
|
d8a888d |
ARPT_ALIGN(sizeof(int)),
|
|
|
d8a888d |
ARPT_ALIGN(sizeof(int)),
|
|
|
d8a888d |
+ 0,
|
|
|
d8a888d |
&help,
|
|
|
d8a888d |
&init,
|
|
|
d8a888d |
&parse,
|
|
|
d8a888d |
diff --git a/include/arptables.h b/include/arptables.h
|
|
|
d8a888d |
index 820b66460cfbe..82e6e9a80445e 100644
|
|
|
d8a888d |
--- a/include/arptables.h
|
|
|
d8a888d |
+++ b/include/arptables.h
|
|
|
d8a888d |
@@ -32,6 +32,9 @@ struct arptables_match
|
|
|
d8a888d |
/* Size of match data relevent for userspace comparison purposes */
|
|
|
d8a888d |
size_t userspacesize;
|
|
|
d8a888d |
|
|
|
d8a888d |
+ /* Revision of target (0 by default). */
|
|
|
d8a888d |
+ u_int8_t revision;
|
|
|
d8a888d |
+
|
|
|
d8a888d |
/* Function which prints out usage message. */
|
|
|
d8a888d |
void (*help)(void);
|
|
|
d8a888d |
|
|
|
d8a888d |
@@ -81,6 +84,9 @@ struct arptables_target
|
|
|
d8a888d |
/* Size of target data relevent for userspace comparison purposes */
|
|
|
d8a888d |
size_t userspacesize;
|
|
|
d8a888d |
|
|
|
d8a888d |
+ /* Revision of target (0 by default). */
|
|
|
d8a888d |
+ u_int8_t revision;
|
|
|
d8a888d |
+
|
|
|
d8a888d |
/* Function which prints out usage message. */
|
|
|
d8a888d |
void (*help)(void);
|
|
|
d8a888d |
|
|
|
d8a888d |
diff --git a/libarptc/libarptc_incl.c b/libarptc/libarptc_incl.c
|
|
|
d8a888d |
index a034930600344..87404ce185d77 100644
|
|
|
d8a888d |
--- a/libarptc/libarptc_incl.c
|
|
|
d8a888d |
+++ b/libarptc/libarptc_incl.c
|
|
|
d8a888d |
@@ -872,7 +872,7 @@ map_target(const TC_HANDLE_T handle,
|
|
|
d8a888d |
/* memset to all 0 for your memcmp convenience. */
|
|
|
d8a888d |
memset(t->u.user.name + strlen(t->u.user.name),
|
|
|
d8a888d |
0,
|
|
|
d8a888d |
- FUNCTION_MAXNAMELEN - strlen(t->u.user.name));
|
|
|
d8a888d |
+ FUNCTION_MAXNAMELEN - 1 - strlen(t->u.user.name));
|
|
|
d8a888d |
return 1;
|
|
|
d8a888d |
}
|
|
|
d8a888d |
|
|
|
d8a888d |
--
|
|
|
d8a888d |
2.21.0
|
|
|
d8a888d |
|