diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 11:23:04 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 11:23:04 +0200 |
| commit | ec40b897289745da3d67de2cb14be30353003922 (patch) | |
| tree | 2b9bb5bf0ced141a8b434712eef54d9f0f06adf6 /include | |
| parent | d637ead63658d741501974c381889b3857073308 (diff) | |
| parent | 0d701631625898ac33fb53c67ed2b529668fe0d7 (diff) | |
Merge branch 'master' of git://git.inai.de/iptables
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/xtables-version.h.in | 2 | ||||
| -rw-r--r-- | include/xtables.h (renamed from include/xtables.h.in) | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 6f7da598..e6951209 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,7 @@ # -*- Makefile -*- include_HEADERS = -nobase_include_HEADERS = xtables.h +nobase_include_HEADERS = xtables.h xtables-version.h if ENABLE_LIBIPQ include_HEADERS += libipq/libipq.h diff --git a/include/xtables-version.h.in b/include/xtables-version.h.in new file mode 100644 index 00000000..cb13827c --- /dev/null +++ b/include/xtables-version.h.in @@ -0,0 +1,2 @@ +#define XTABLES_VERSION "libxtables.so.@libxtables_vmajor@" +#define XTABLES_VERSION_CODE @libxtables_vmajor@ diff --git a/include/xtables.h.in b/include/xtables.h index db69c03b..2cc1a028 100644 --- a/include/xtables.h.in +++ b/include/xtables.h @@ -31,8 +31,7 @@ #define IPPROTO_UDPLITE 136 #endif -#define XTABLES_VERSION "libxtables.so.@libxtables_vmajor@" -#define XTABLES_VERSION_CODE @libxtables_vmajor@ +#include <xtables-version.h> struct in_addr; @@ -214,6 +213,7 @@ struct xtables_match struct xtables_match *next; const char *name; + const char *real_name; /* Revision of match (0 by default). */ u_int8_t revision; @@ -283,6 +283,9 @@ struct xtables_target const char *name; + /* Real target behind this, if any. */ + const char *real_name; + /* Revision of target (0 by default). */ u_int8_t revision; |