diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-07 13:14:25 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-07 13:14:25 +0100 |
| commit | d53dba59e78da865c4fe820386ff2f4f76925f3b (patch) | |
| tree | 69dba40b01a44d44e2d7f667ca91294c568cdb94 /include | |
| parent | 20c8675ba46bda97330a4117c459a59a9f1c465e (diff) | |
New upstream version 2.4~rc1upstream/2.4_rc1
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.in | 6 | ||||
| -rw-r--r-- | include/openvpn-msg.h | 7 | ||||
| -rw-r--r-- | include/openvpn-plugin.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/include/Makefile.in b/include/Makefile.in index 051cf1f..f381a43 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -392,8 +392,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): openvpn-plugin.h: stamp-h2 - @if test ! -f $@; then rm -f stamp-h2; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi + @test -f $@ || rm -f stamp-h2 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2 stamp-h2: $(srcdir)/openvpn-plugin.h.in $(top_builddir)/config.status @rm -f stamp-h2 diff --git a/include/openvpn-msg.h b/include/openvpn-msg.h index 4c13acf..f7fbdd2 100644 --- a/include/openvpn-msg.h +++ b/include/openvpn-msg.h @@ -79,10 +79,9 @@ typedef struct { message_header_t header; interface_t iface; char domains[512]; - struct in_addr primary_ipv4; - struct in_addr secondary_ipv4; - struct in_addr6 primary_ipv6; - struct in_addr6 secondary_ipv6; + short family; + int addr_len; + inet_address_t addr[4]; /* support up to 4 dns addresses */ } dns_cfg_message_t; typedef struct { diff --git a/include/openvpn-plugin.h b/include/openvpn-plugin.h index 9df3fb4..dc5887b 100644 --- a/include/openvpn-plugin.h +++ b/include/openvpn-plugin.h @@ -55,7 +55,7 @@ extern "C" { */ #define OPENVPN_VERSION_MAJOR 2 #define OPENVPN_VERSION_MINOR 4 -#define OPENVPN_VERSION_PATCH "_beta1" +#define OPENVPN_VERSION_PATCH "_rc1" /* * Plug-in types. These types correspond to the set of script callbacks |