diff options
| author | Christian Pointner <equinox@anytun.org> | 2010-01-16 06:32:01 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2010-01-16 06:32:01 +0000 |
| commit | 504f50b6e0e27d9d0cdfd0a782d52a26155b243d (patch) | |
| tree | 13b36cdb321a056ab2905447740b2b576efd5921 | |
| parent | multi sockets work now (diff) | |
got rid of V4_MAPPED stuff
| -rwxr-xr-x | src/configure | 18 | ||||
| -rw-r--r-- | src/options.c | 7 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/configure b/src/configure index 35ed429..792621f 100755 --- a/src/configure +++ b/src/configure @@ -43,7 +43,6 @@ LDFLAGS='-g -Wall -O2' CRYPTO_LIB='gcrypt' PASSPHRASE=1 -V4_MAPPED=1 PREFIX='/usr/local' SBINDIR='' @@ -67,9 +66,6 @@ print_usage() { echo " --no-crypto disable crypto at all (only NULL cipher)" echo " --disable-passphrase disable master key and salt passphrase" echo " --enable-passphrase enable master key and salt passphrase" - echo " --disable-v4-mapped disable V4-Mapped addresses (this means to disable" - echo " simultanious use of IPv4 and IPv6)" - echo " --enable-v4-mapped enable V4-Mapped addresses" } for arg @@ -111,12 +107,6 @@ do --enable-passphrase) PASSPHRASE=1 ;; - --disable-v4-mapped) - V4_MAPPED=0 - ;; - --enable-v4-mapped) - V4_MAPPED=2 - ;; --ebuild-compat) EBUILD_COMPAT=1 ;; @@ -153,9 +143,6 @@ case $TARGET in echo "loading BSD specific TUN Device" CFLAGS=$CFLAGS' -I/usr/local/include' LDFLAGS=$LDFLAGS' -L/usr/local/lib' - if [ $V4_MAPPED -ne 2 ]; then - V4_MAPPED=0 - fi ;; *) echo "platform not supported" @@ -186,11 +173,6 @@ if [ $PASSPHRASE -eq 0 ]; then echo "disabling master key and salt passphrase" fi -if [ $V4_MAPPED -eq 0 ]; then - CFLAGS=$CFLAGS' -DNO_V4MAPPED' - echo "WARNING: disabling V4 mapped addresses, this prevents uanytun from using IPv6 and IPv4 Sockets at the same time" -fi - if [ -z "$SBINDIR" ]; then SBINDIR=$PREFIX/sbin fi diff --git a/src/options.c b/src/options.c index df0d80c..e0dd9f7 100644 --- a/src/options.c +++ b/src/options.c @@ -307,13 +307,6 @@ void options_parse_post(options_t* opt) if(!opt) return; -#ifdef NO_V4MAPPED - if(opt->resolv_addr_type_ == ANY) { - opt->resolv_addr_type_ = IPV4_ONLY; - log_printf(WARNING, "No support for V4-mapped Adresses on this platform, defaulting to only use IPv4 addresses"); - } -#endif - #ifndef NO_CRYPT if(!strcmp(opt->cipher_, "null") && !strcmp(opt->auth_algo_, "null") && strcmp(opt->kd_prf_, "null")) { |