diff options
| author | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
|---|---|---|
| committer | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
| commit | cef0be0b4f866c9283eaf696fbc23b8120e40443 (patch) | |
| tree | ff54448f7354e56235d22dabaf0fb03597790c98 /pkg/linux | |
| parent | a9173e8e2816b767028787735e4a84b2576f258d (diff) | |
| parent | 465c0b89ca61279eb036afec2de3b4d24b257311 (diff) | |
Merge branch '0.6.1-rc' into deb-0.6.1-rc
Conflicts:
pkg/linux/bitmask-root
src/leap/bitmask/gui/login.py
Diffstat (limited to 'pkg/linux')
| -rw-r--r--[-rwxr-xr-x] | pkg/linux/bitmask-root | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root index 56202b5f..c9034b0d 100755..100644 --- a/pkg/linux/bitmask-root +++ b/pkg/linux/bitmask-root @@ -34,7 +34,6 @@ not be teared down in the case of an error during launch. """ # TODO should be tested with python3, which can be the default on some distro. from __future__ import print_function -import atexit import os import re import signal @@ -42,7 +41,6 @@ import socket import syslog import subprocess import sys -import time import traceback cmdcheck = subprocess.check_output @@ -51,7 +49,7 @@ cmdcheck = subprocess.check_output # CONSTANTS # -VERSION = "1" +VERSION = "2" SCRIPT = "bitmask-root" NAMESERVER = "10.42.0.1" BITMASK_CHAIN = "bitmask" @@ -659,17 +657,6 @@ def firewall_start(args): ip4tables("--append", BITMASK_CHAIN, "-o", default_device, "--jump", "REJECT") - # workaround for ipv6 servers being blocked and not falling back to ipv4. - # See #5693 - ip6tables("--append", "OUTPUT", "--jump", "REJECT", - "-s", "::/0", "-d", "::/0", - "-p", "tcp", - "--reject-with", "icmp6-port-unreachable") - ip6tables("--append", "OUTPUT", "--jump", "REJECT", - "-s", "::/0", "-d", "::/0", - "-p", "udp", - "--reject-with", "icmp6-port-unreachable") - def firewall_stop(): """ |