diff --git a/Makefile b/Makefile index aecee6929e..d3c51761e9 100644 --- a/Makefile +++ b/Makefile @@ -82,12 +82,6 @@ endif # check prerequisites before starting to build prereq: $(target/stamp-prereq) tmp/.prereq_packages - @if [ ! -f "$(INCLUDE_DIR)/site/$(ARCH)" ]; then \ - echo 'ERROR: Missing site config for architecture "$(ARCH)" !'; \ - echo ' The missing file will cause configure scripts to fail during compilation.'; \ - echo ' Please provide a "$(INCLUDE_DIR)/site/$(ARCH)" file and restart the build.'; \ - exit 1; \ - fi $(BIN_DIR)/profiles.json: FORCE $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \ diff --git a/include/autotools.mk b/include/autotools.mk index eb52b55924..1686f69f87 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -2,6 +2,9 @@ # # Copyright (C) 2007-2020 OpenWrt.org +ifneq ($(__autotools_inc),1) +__autotools_inc=1 + autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2)) # delete *.la-files from staging_dir - we can not yet remove respective lines within all package @@ -152,12 +155,8 @@ define patch_libtool_host $(HOST_BUILD_DIR))) endef -ifneq ($(filter patch-libtool,$(PKG_FIXUP)),) - Hooks/HostConfigure/Pre += patch_libtool_host -endif - ifneq ($(filter patch-libtool,$(HOST_FIXUP)),) - Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR))) + Hooks/HostConfigure/Pre += patch_libtool_host endif ifneq ($(filter libtool,$(HOST_FIXUP)),) @@ -177,3 +176,5 @@ ifneq ($(filter autoreconf,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += autoreconf_host endif endif + +endif #__autotools_inc diff --git a/include/download.mk b/include/download.mk index c69d84939c..4bf055e611 100644 --- a/include/download.mk +++ b/include/download.mk @@ -27,7 +27,7 @@ define dl_method $(strip \ $(if $(filter git,$(2)),$(call dl_method_git,$(1),$(2)), $(if $(2),$(2), \ - $(if $(filter @OPENWRT @APACHE/% @GITHUB/% @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ + $(if $(filter @OPENWRT @APACHE/% @DEBIAN/% @GITHUB/% @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ $(if $(filter git://%,$(1)),$(call dl_method_git,$(1),$(2)), \ $(if $(filter svn://%,$(1)),svn, \ $(if $(filter cvs://%,$(1)),cvs, \ diff --git a/include/package.mk b/include/package.mk index fc1bb7d67e..f91785ede2 100644 --- a/include/package.mk +++ b/include/package.mk @@ -116,7 +116,7 @@ include $(INCLUDE_DIR)/autotools.mk _pkg_target:=$(if $(QUILT),,.) override MAKEFLAGS= -CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH) +CONFIG_SITE:=$(TOOLCHAIN_DIR)/config.site CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST))) SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE)) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig diff --git a/include/site/aarch64 b/include/site/aarch64 deleted file mode 100644 index c5aa9c5543..0000000000 --- a/include/site/aarch64 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=8 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=8 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=8 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=8 -ac_cv_sizeof_ssize_t=8 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=8 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=8 diff --git a/include/site/aarch64_be b/include/site/aarch64_be deleted file mode 100644 index 19e75ab991..0000000000 --- a/include/site/aarch64_be +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=8 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=8 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=8 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=8 -ac_cv_sizeof_ssize_t=8 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=8 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=8 diff --git a/include/site/arc b/include/site/arc deleted file mode 100644 index 72a3805c64..0000000000 --- a/include/site/arc +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/arm b/include/site/arm deleted file mode 100644 index 72a3805c64..0000000000 --- a/include/site/arm +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/armeb b/include/site/armeb deleted file mode 100644 index a5626a722b..0000000000 --- a/include/site/armeb +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/i386 b/include/site/i386 deleted file mode 100644 index 78f1557b79..0000000000 --- a/include/site/i386 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/i486 - diff --git a/include/site/i486 b/include/site/i486 deleted file mode 100644 index 72a3805c64..0000000000 --- a/include/site/i486 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/i686 b/include/site/i686 deleted file mode 100644 index 78f1557b79..0000000000 --- a/include/site/i686 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/i486 - diff --git a/include/site/linux b/include/site/linux deleted file mode 100644 index b193d25c45..0000000000 --- a/include/site/linux +++ /dev/null @@ -1,78 +0,0 @@ -ac_atomic_add=yes -ac_atomic_sub=yes -ac_cv_c_gettext_without_libintl=yes -ac_cv_c_long_double=no -ac_cv_conv_longlong_to_float=yes -ac_cv_file__dev_zero=yes -ac_cv_func___va_copy=no -ac_cv_func__exit=yes -ac_cv_func_bcopy=yes -ac_cv_func_bzero=yes -ac_cv_func_bcmp=yes -ac_cv_func_creal=yes -ac_cv_func_cimag=yes -ac_cv_func_fchmod=yes -ac_cv_func_getaddrinfo=yes -ac_cv_func_getcwd=yes -ac_cv_func_getdomainname=yes -ac_cv_func_getpgrp_void=yes -ac_cv_func_getpwuid_r=yes -ac_cv_func_gettimeofday=yes -ac_cv_func_index=yes -ac_cv_func_lstat_dereferences_slashed_symlink=yes -ac_cv_func_lstat_empty_string_bug=no -ac_cv_func_lstat=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes -ac_cv_func_memcmp_clean=yes -ac_cv_func_memcmp_working=yes -ac_cv_func_posix_getgrgid_r=yes -ac_cv_func_posix_getpwuid_r=yes -ac_cv_func_psignal=yes -ac_cv_func_pthread_key_delete=yes -ac_cv_func_realloc_0_nonnull=yes -ac_cv_func_realloc_works=yes -ac_cv_func_rename=yes -ac_cv_func_rindex=yes -ac_cv_func_setlocale=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setresuid=no -ac_cv_func_setvbuf_reversed=no -ac_cv_func_stat_empty_string_bug=no -ac_cv_func_stat_ignores_trailing_slash=no -ac_cv_func_strerror=yes -ac_cv_func_strftime=yes -ac_cv_func_utimes=yes -ac_cv_func___adjtimex=yes -ac_cv_func_va_copy=no -ac_cv_func_vsnprintf=yes -ac_cv_have_accrights_in_msghdr=no -ac_cv_have_broken_snprintf=no -ac_cv_have_control_in_msghdr=yes -ac_cv_have_decl_sys_siglist=no -ac_cv_have_openpty_ctty_bug=yes -ac_cv_have_space_d_name_in_struct_dirent=yes -ac_cv_header_netinet_sctp_h=no -ac_cv_header_netinet_sctp_uio_h=no -ac_cv_int64_t=yes -ac_cv_lbl_unaligned_fail=no -ac_cv_linux_kernel_pppoe=yes -ac_cv_linux_vers=2 -ac_cv_pack_bitfields_reversed=yes -ac_cv_path_LDCONFIG= -ac_cv_regexec_segfault_emptystr=no -ac_cv_sctp=no -ac_cv_sys_restartable_syscalls=yes -ac_cv_time_r_type=POSIX -ac_cv_type_suseconds_t=yes -ac_cv_uchar=no -ac_cv_uint=yes -ac_cv_uint64_t=yes -ac_cv_ulong=yes -ac_cv_ushort=yes -ac_cv_va_copy=C99 -ac_cv_va_val_copy=yes -as_cv_unaligned_access=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_realloc_0_nonnull=yes diff --git a/include/site/m68k b/include/site/m68k deleted file mode 100644 index 0037600a09..0000000000 --- a/include/site/m68k +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/mips b/include/site/mips deleted file mode 100644 index a5626a722b..0000000000 --- a/include/site/mips +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/mips64 b/include/site/mips64 deleted file mode 100644 index 19e75ab991..0000000000 --- a/include/site/mips64 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=8 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=8 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=8 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=8 -ac_cv_sizeof_ssize_t=8 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=8 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=8 diff --git a/include/site/mips64el b/include/site/mips64el deleted file mode 100644 index c5aa9c5543..0000000000 --- a/include/site/mips64el +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=8 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=8 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=8 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=8 -ac_cv_sizeof_ssize_t=8 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=8 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=8 diff --git a/include/site/mipsel b/include/site/mipsel deleted file mode 100644 index 72a3805c64..0000000000 --- a/include/site/mipsel +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/powerpc b/include/site/powerpc deleted file mode 100644 index a5626a722b..0000000000 --- a/include/site/powerpc +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/powerpc64 b/include/site/powerpc64 deleted file mode 100644 index 6a66346b42..0000000000 --- a/include/site/powerpc64 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof_char=1 -ac_cv_sizeof_char_p=8 -ac_cv_sizeof_double=8 -ac_cv_sizeof_float=4 -ac_cv_sizeof_int=4 -ac_cv_sizeof_long=8 -ac_cv_sizeof_long_double=16 -ac_cv_sizeof_long_int=8 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long_long_int=8 -ac_cv_sizeof_short=2 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_signed_char=1 -ac_cv_sizeof_unsigned_char=1 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=8 -ac_cv_sizeof_unsigned_long_int=8 -ac_cv_sizeof_unsigned_long_long_int=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_unsigned_short_int=2 -ac_cv_sizeof_void_p=8 diff --git a/include/site/sparc b/include/site/sparc deleted file mode 100644 index a5626a722b..0000000000 --- a/include/site/sparc +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=no} -ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=4 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=4 diff --git a/include/site/x86_64 b/include/site/x86_64 deleted file mode 100644 index b8d581d448..0000000000 --- a/include/site/x86_64 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. $TOPDIR/include/site/linux -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} - -ac_cv_sizeof___int64=0 -ac_cv_sizeof_char=1 -ac_cv_sizeof_int=4 -ac_cv_sizeof_int16_t=2 -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_int64_t=8 -ac_cv_sizeof_long_int=8 -ac_cv_sizeof_long_long=8 -ac_cv_sizeof_long=8 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_short_int=2 -ac_cv_sizeof_short=2 -ac_cv_sizeof_size_t=8 -ac_cv_sizeof_ssize_t=8 -ac_cv_sizeof_u_int16_t=2 -ac_cv_sizeof_u_int32_t=4 -ac_cv_sizeof_u_int64_t=8 -ac_cv_sizeof_uint16_t=2 -ac_cv_sizeof_uint32_t=4 -ac_cv_sizeof_uint64_t=8 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=8 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_sizeof_void_p=8 diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index f1b0afeb03..20bb8b52dd 100755 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -4,10 +4,11 @@ do_mount_root() { mount_root boot_run_hook preinit_mount_root - [ -f /sysupgrade.tgz ] && { + [ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && { echo "- config restore -" cd / - tar xzf /sysupgrade.tgz + [ -f /sysupgrade.tgz ] && tar xzf /sysupgrade.tgz + [ -f /tmp/sysupgrade.tar ] && tar xf /tmp/sysupgrade.tar # Prevent configuration corruption on a power loss sync } diff --git a/package/ctcgfw/ChinaDNS/Makefile b/package/ctcgfw/ChinaDNS/Makefile index 83b7cd0bcd..bfd0294a1d 100644 --- a/package/ctcgfw/ChinaDNS/Makefile +++ b/package/ctcgfw/ChinaDNS/Makefile @@ -3,7 +3,7 @@ # Copyright (C) 2014-2018 Jian Chang # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/annie/Makefile b/package/ctcgfw/annie/Makefile index 7416ab24bb..63d804a191 100644 --- a/package/ctcgfw/annie/Makefile +++ b/package/ctcgfw/annie/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE.txt for more information. @@ -18,7 +18,7 @@ PKG_SOURCE_DATE:=2020-12-15 PKG_SOURCE_VERSION:=abc3c9df18173c91a5ca7a77fecc0665dea01aa1 PKG_MIRROR_HASH:=d49d79c342377a1edbf6870f7dd49cb4de70718934151793298004db72fc538a -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/package/ctcgfw/baidupcs-web/patches/001-add-missing-go-sum.patch b/package/ctcgfw/baidupcs-web/patches/001-add-missing-go-sum.patch new file mode 100644 index 0000000000..820d443539 --- /dev/null +++ b/package/ctcgfw/baidupcs-web/patches/001-add-missing-go-sum.patch @@ -0,0 +1,21 @@ +--- a/go.sum ++++ b/go.sum +@@ -45,6 +45,7 @@ github.com/daaku/go.zipexe v1.0.1 h1:wV4zMsDOI2SZ2m7Tdz1Ps96Zrx+TzaK15VbUaGozw0M + github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= + github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= + github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= + github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= +--- a/pcsutil/jwted25519/jwted25519.go ++++ b/pcsutil/jwted25519/jwted25519.go +@@ -2,7 +2,7 @@ package jwted25519 + + import ( + "github.com/dgrijalva/jwt-go" +- "golang.org/x/crypto/ed25519" ++ "crypto/ed25519" + "unsafe" + ) + diff --git a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile index c2d36c1b7b..525b00891f 100644 --- a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile +++ b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/brook/Makefile b/package/ctcgfw/brook/Makefile index b1b2249e8e..0c1cc9d491 100644 --- a/package/ctcgfw/brook/Makefile +++ b/package/ctcgfw/brook/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=brook -PKG_VERSION:=20210101 -PKG_RELEASE:=2 +PKG_VERSION:=20210214 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/txthinking/brook/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=2848b6ef06867268ba4a6495cbf700d80145f023ddafb3e92943aed1f88eeb5a +PKG_HASH:=a8e2e989f6d09e36c1fbe8593404d53a0615dc93e91a0be94dda898f0d55ff1d -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=LICENSE diff --git a/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch b/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch index 00d57ac183..2324eb056c 100644 --- a/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch +++ b/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch @@ -1,19 +1,15 @@ -From 4b60c0151ef9e0b5901ba3825033c78269c1442f Mon Sep 17 00:00:00 2001 +From bd7bc7ae9f46a8678c05dca78081033d6e2af497 Mon Sep 17 00:00:00 2001 From: CN_SZTL -Date: Fri, 29 Jan 2021 06:43:12 +0000 +Date: Sat, 27 Feb 2021 15:05:31 +0800 Subject: [PATCH] cli: bump to v2.3.0 Signed-off-by: CN_SZTL --- - cli/brook/main.go | 2 +- - go.mod | 21 ++++++++++++++++ - go.sum | 63 +++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 85 insertions(+), 1 deletion(-) - create mode 100644 go.mod - create mode 100644 go.sum + cli/brook/main.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/brook/main.go b/cli/brook/main.go -index 54d3f5f..4360eb2 100644 +index 1f715ea..3c88eb2 100644 --- a/cli/brook/main.go +++ b/cli/brook/main.go @@ -28,7 +28,7 @@ import ( @@ -25,102 +21,6 @@ index 54d3f5f..4360eb2 100644 ) var debug bool -diff --git a/go.mod b/go.mod -new file mode 100644 -index 0000000..2740019 ---- /dev/null -+++ b/go.mod -@@ -0,0 +1,21 @@ -+module github.com/txthinking/brook -+ -+go 1.15 -+ -+require ( -+ github.com/gorilla/mux v1.8.0 -+ github.com/gorilla/websocket v1.4.2 -+ github.com/mdp/qrterminal v1.0.1 -+ github.com/miekg/dns v1.1.35 -+ github.com/patrickmn/go-cache v2.1.0+incompatible -+ github.com/tdewolff/minify v2.3.6+incompatible -+ github.com/tdewolff/parse v2.3.4+incompatible // indirect -+ github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9 -+ github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997 -+ github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e -+ github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c -+ github.com/urfave/cli/v2 v2.3.0 -+ github.com/urfave/negroni v1.0.0 -+ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad -+ golang.org/x/net v0.0.0-20210119194325-5f4716e94777 -+) -diff --git a/go.sum b/go.sum -new file mode 100644 -index 0000000..69b0435 ---- /dev/null -+++ b/go.sum -@@ -0,0 +1,63 @@ -+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= -+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -+github.com/mdp/qrterminal v1.0.1 h1:07+fzVDlPuBlXS8tB0ktTAyf+Lp1j2+2zK3fBOL5b7c= -+github.com/mdp/qrterminal v1.0.1/go.mod h1:Z33WhxQe9B6CdW37HaVqcRKzP+kByF3q/qLxOGe12xQ= -+github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= -+github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= -+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -+github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo= -+github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs= -+github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38= -+github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ= -+github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9 h1:nqqcrK76wxumtdrYsK9dNRpBbXKk0DPGOe2sTPKu25k= -+github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9/go.mod h1:78N4pHirvbuhX3U2MJ3G0nxjmQtfaqHeYjvkHbw5Ho0= -+github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997 h1:vlDgnShahmE2XLslpr0hnzxfAmSj3JLX2CYi8Xct7G4= -+github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997/go.mod h1:CLUSJbazqETbaR+i0YAhXBICV9TrKH93pziccMhmhpM= -+github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e h1:SUWQViHyUHr766NlUKB1Wr8QRVTaxez9sLl3pwobiHw= -+github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e/go.mod h1:d3n8NJ6QMRb6I/WAlp4z5ZPAoaeqDmX5NgVZA0mhe+I= -+github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c h1:n3om7+DhvxNoBTcYul3jpeOTavBGKRjGW1GaLc8JsWc= -+github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c/go.mod h1:WgqbSEmUYSjEV3B1qmee/PpP2NYEz4bL9/+mF1ma+s4= -+github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= -+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= -+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= -+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= -+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= -+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= -+rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= -- 2.17.1 diff --git a/package/ctcgfw/brook/patches/110-go-init-go-modules.patch b/package/ctcgfw/brook/patches/110-go-init-go-modules.patch new file mode 100644 index 0000000000..3a33309d5e --- /dev/null +++ b/package/ctcgfw/brook/patches/110-go-init-go-modules.patch @@ -0,0 +1,139 @@ +From d626d772dd2ab02678c62714885e388966f09f55 Mon Sep 17 00:00:00 2001 +From: CN_SZTL +Date: Sat, 27 Feb 2021 15:05:49 +0800 +Subject: [PATCH] go: init go modules + +Signed-off-by: CN_SZTL +--- + go.mod | 25 +++++++++++++++++ + go.sum | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 111 insertions(+) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..7354e7d +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,25 @@ ++module github.com/txthinking/brook ++ ++go 1.16 ++ ++require ( ++ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect ++ github.com/gorilla/mux v1.8.0 ++ github.com/gorilla/websocket v1.4.2 ++ github.com/mdp/qrterminal v1.0.1 ++ github.com/miekg/dns v1.1.40 ++ github.com/patrickmn/go-cache v2.1.0+incompatible ++ github.com/russross/blackfriday/v2 v2.1.0 // indirect ++ github.com/tdewolff/minify v2.3.6+incompatible ++ github.com/tdewolff/parse v2.3.4+incompatible // indirect ++ github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9 ++ github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997 ++ github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e ++ github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c ++ github.com/urfave/cli/v2 v2.3.0 ++ github.com/urfave/negroni v1.0.0 ++ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 ++ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 ++ golang.org/x/sys v0.0.0-20210227040730-b0d1d43c014d // indirect ++ golang.org/x/text v0.3.5 // indirect ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..051ce2d +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,86 @@ ++github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= ++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= ++github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= ++github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= ++github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= ++github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= ++github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= ++github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= ++github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= ++github.com/mdp/qrterminal v1.0.1 h1:07+fzVDlPuBlXS8tB0ktTAyf+Lp1j2+2zK3fBOL5b7c= ++github.com/mdp/qrterminal v1.0.1/go.mod h1:Z33WhxQe9B6CdW37HaVqcRKzP+kByF3q/qLxOGe12xQ= ++github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= ++github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= ++github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA= ++github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= ++github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= ++github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= ++github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= ++github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= ++github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= ++github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= ++github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= ++github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo= ++github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs= ++github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38= ++github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ= ++github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9 h1:nqqcrK76wxumtdrYsK9dNRpBbXKk0DPGOe2sTPKu25k= ++github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9/go.mod h1:78N4pHirvbuhX3U2MJ3G0nxjmQtfaqHeYjvkHbw5Ho0= ++github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997 h1:vlDgnShahmE2XLslpr0hnzxfAmSj3JLX2CYi8Xct7G4= ++github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997/go.mod h1:CLUSJbazqETbaR+i0YAhXBICV9TrKH93pziccMhmhpM= ++github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e h1:SUWQViHyUHr766NlUKB1Wr8QRVTaxez9sLl3pwobiHw= ++github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e/go.mod h1:d3n8NJ6QMRb6I/WAlp4z5ZPAoaeqDmX5NgVZA0mhe+I= ++github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c h1:n3om7+DhvxNoBTcYul3jpeOTavBGKRjGW1GaLc8JsWc= ++github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c/go.mod h1:WgqbSEmUYSjEV3B1qmee/PpP2NYEz4bL9/+mF1ma+s4= ++github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= ++github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= ++github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= ++github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= ++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= ++golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= ++golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= ++golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= ++golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E= ++golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= ++golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= ++golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= ++golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= ++golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= ++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20210227040730-b0d1d43c014d h1:9fH9JvLNoSpsDWcXJ4dSE3lZW99Z3OCUZLr07g60U6o= ++golang.org/x/sys v0.0.0-20210227040730-b0d1d43c014d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= ++golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= ++golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= ++golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= ++golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA= ++golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= ++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= ++gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= ++rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= +-- +2.17.1 + diff --git a/package/ctcgfw/cdnspeedtest/Makefile b/package/ctcgfw/cdnspeedtest/Makefile index df92a21f2f..8b97e50d9b 100644 --- a/package/ctcgfw/cdnspeedtest/Makefile +++ b/package/ctcgfw/cdnspeedtest/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=5e822fb24348dbb75aeb33c3e9f558d629892089bc918186d5e68c3341e70049 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_CONFIG_DEPENDS:= \ CONFIG_CDNSPEEDTEST_COMPRESS_GOPROXY \ diff --git a/package/ctcgfw/chinadns-ng/Makefile b/package/ctcgfw/chinadns-ng/Makefile index f470a2f484..60d1a411d9 100644 --- a/package/ctcgfw/chinadns-ng/Makefile +++ b/package/ctcgfw/chinadns-ng/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/cxxopts/Makefile b/package/ctcgfw/cxxopts/Makefile index 10b21e2bb0..cafea7bada 100644 --- a/package/ctcgfw/cxxopts/Makefile +++ b/package/ctcgfw/cxxopts/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# (https://project-openwrt.eu.org) +# (https://immortalwrt.org) # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -17,7 +17,7 @@ PKG_HASH:=984aa3c8917d649b14d7f6277104ce38dd142ce378a9198ec926f03302399681 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 diff --git a/package/ctcgfw/duktape/Makefile b/package/ctcgfw/duktape/Makefile index e29f3bf406..67ca1ae451 100644 --- a/package/ctcgfw/duktape/Makefile +++ b/package/ctcgfw/duktape/Makefile @@ -19,7 +19,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/ctcgfw/filebrowser/Makefile b/package/ctcgfw/filebrowser/Makefile index c3719e7063..8cd7295be8 100644 --- a/package/ctcgfw/filebrowser/Makefile +++ b/package/ctcgfw/filebrowser/Makefile @@ -17,7 +17,7 @@ PKG_MIRROR_HASH:=4a7a38a873129313ee53747774ca5371dd1d4790616bb0558d98fcf5555911c PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=golang/host node/host PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/go-nats/Makefile b/package/ctcgfw/go-nats/Makefile index cd34c5c82a..bd0f019d31 100644 --- a/package/ctcgfw/go-nats/Makefile +++ b/package/ctcgfw/go-nats/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -20,7 +20,7 @@ PKG_MIRROR_HASH:=52156d096ba21fdc18316040749b20868e500d7bd785a0d33533610ba7f7169 PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_CONFIG_DEPENDS:= \ CONFIG_GO_NATS_COMPRESS_GOPROXY \ diff --git a/package/ctcgfw/gost/Makefile b/package/ctcgfw/gost/Makefile index 1cb085d632..b7bb98a2d7 100644 --- a/package/ctcgfw/gost/Makefile +++ b/package/ctcgfw/gost/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=d94b570a7a84094376b8c299d740528f51b540d9162f1db562247a15a89340bf PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_CONFIG_DEPENDS:= \ CONFIG_GOST_COMPRESS_GOPROXY \ diff --git a/package/ctcgfw/gotop/Makefile b/package/ctcgfw/gotop/Makefile index d04b5c2280..cd2c4484ad 100644 --- a/package/ctcgfw/gotop/Makefile +++ b/package/ctcgfw/gotop/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_CONFIG_DEPENDS:= \ CONFIG_GOTOP_COMPRESS_GOPROXY \ diff --git a/package/ctcgfw/gowebdav/Makefile b/package/ctcgfw/gowebdav/Makefile index 561cdf548c..5e0576cd1f 100644 --- a/package/ctcgfw/gowebdav/Makefile +++ b/package/ctcgfw/gowebdav/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/1715173329/gowebdav/tar.gz/v$(PKG_VERSION)? PKG_HASH:=64867ab2925c79d8d8ff9851729bafd1270cd72b981e422136fdd4d82dc75506 -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_CONFIG_DEPENDS:= \ CONFIG_GOWEBDAV_COMPRESS_GOPROXY \ diff --git a/package/ctcgfw/ipt2socks-alt/Makefile b/package/ctcgfw/ipt2socks-alt/Makefile index cbb7ab1b18..8b0c40a50a 100644 --- a/package/ctcgfw/ipt2socks-alt/Makefile +++ b/package/ctcgfw/ipt2socks-alt/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/jpcre2/Makefile b/package/ctcgfw/jpcre2/Makefile index 2a021e86e2..ee3d9286f4 100644 --- a/package/ctcgfw/jpcre2/Makefile +++ b/package/ctcgfw/jpcre2/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# (https://project-openwrt.eu.org) +# (https://immortalwrt.org) # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -17,7 +17,7 @@ PKG_HASH:=668cbc6d2c0a065bb6abe8494d5a1bb3549a14cd956a44a2df9095045623ea47 PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=pcre2 PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/lua-maxminddb/Makefile b/package/ctcgfw/lua-maxminddb/Makefile index 404323560e..20acc39214 100644 --- a/package/ctcgfw/lua-maxminddb/Makefile +++ b/package/ctcgfw/lua-maxminddb/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020 jerryk # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/luci-app-dockerman/Makefile b/package/ctcgfw/luci-app-dockerman/Makefile index 9aa6c629c2..c9554d758e 100644 --- a/package/ctcgfw/luci-app-dockerman/Makefile +++ b/package/ctcgfw/luci-app-dockerman/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Docker Manager interface for LuCI -LUCI_DEPENDS:=+luci-lib-docker +docker +e2fsprogs +fdisk +ttyd +LUCI_DEPENDS:=+luci-lib-docker +docker +dockerd +e2fsprogs +fdisk +ttyd PKG_NAME:=luci-app-dockerman PKG_VERSION:=v0.4.7 PKG_RELEASE:=leanmod diff --git a/package/ctcgfw/luci-app-filebrowser/Makefile b/package/ctcgfw/luci-app-filebrowser/Makefile index 765e781c1f..3abe46bba8 100644 --- a/package/ctcgfw/luci-app-filebrowser/Makefile +++ b/package/ctcgfw/luci-app-filebrowser/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # diff --git a/package/ctcgfw/luci-app-gowebdav/Makefile b/package/ctcgfw/luci-app-gowebdav/Makefile index 32aa0425ea..1c79b62158 100644 --- a/package/ctcgfw/luci-app-gowebdav/Makefile +++ b/package/ctcgfw/luci-app-gowebdav/Makefile @@ -15,7 +15,7 @@ LUCI_TITLE:=LuCI support for GoWebDav LUCI_DEPENDS:=+gowebdav LUCI_PKGARCH:=all -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh index 1dddea94cd..7e2732a801 100755 --- a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh @@ -60,7 +60,7 @@ add_cron() { # Run Script notify() { - grep "Cookie失效" ${LOG_FILE} >/dev/null + grep "】: Cookie失效" ${LOG_FILE} >/dev/null if [ $? -eq 0 ]; then title="$(date '+%Y年%m月%d日') 京东签到 Cookie 失效" else @@ -87,7 +87,7 @@ notify() { \`\`\` "$desc" -==================================== +=============================== 本消息来自京东签到插件 jd-dailybonus \`\`\`" wget-ssl -q --output-document=/dev/null --post-data="chat_id=$TG_USER_ID&text=$text&parse_mode=markdownv2" $API_URL diff --git a/package/ctcgfw/luci-app-naiveproxy/Makefile b/package/ctcgfw/luci-app-naiveproxy/Makefile index 74ddc5be2a..d7fe0754cc 100644 --- a/package/ctcgfw/luci-app-naiveproxy/Makefile +++ b/package/ctcgfw/luci-app-naiveproxy/Makefile @@ -14,7 +14,7 @@ LUCI_TITLE:=LuCI support for NaiveProxy LUCI_DEPENDS:=+naiveproxy LUCI_PKGARCH:=all -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index 630e9c9338..717afd564e 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.42.01 +PKG_VERSION:=0.42.02 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version index 207c15ac3a..ee7b7e5090 100644 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version @@ -1,2 +1,2 @@ -v0.42.01-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAACEAtzLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjQwRjBBMkVCNzQzRjExRUJCQTA0OTg4QTY3QTI3NkM5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjQwRjBBMkVDNzQzRjExRUJCQTA0OTg4QTY3QTI3NkM5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NDBGMEEyRTk3NDNGMTFFQkJBMDQ5ODhBNjdBMjc2QzkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NDBGMEEyRUE3NDNGMTFFQkJBMDQ5ODhBNjdBMjc2QzkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7Y6zRPAAADAFBMVEWCsc0FXI7C3u51tdkJca1ISEilpaWKioqStcqxytllrNQ6lsoFbanv9PcccaLR0dE9PT3h7/cHX5EjhLyenp6CgoJFgKIGVYI1dZre3t61tbUVapoGcKw/Pz8bhcFubm7R5vIGZp1Fkr7a2trn5+fOzs5Ui6vR4emRkZFFRUVLS0tycnKCrsYIZZqizORXlbgkapKy0eIEU4B3d3eFhYVFmsoIXY0keqqcnJxYpdJiYmJjnLyz1uoEYJSixtpkpsu/v7+srKx4eHihoaHg4OCUxuJDQ0MFZZtBQUGUlJQJYpXCwsIJaqBqamo0faa6urrIyMiiwNEHVoQEWYrFxcVAQEAXgL3w9PfAwMA2kcYqjMW2trbB1eDKyspilLAKdbJ0sdUJbabQ3+cgdaYXYoxlZWVHnMyDqsEFaaJllrJgYGDB2ecYbZ5Kn8+NjY2EtNCkzuZJns4FcrCTxOAnisIZfLWiv9Cvr68FYpd0dHQFa6UJWIWJweJzn7mTvtYmb5k1h7UKebkBcrNZWVlTU1NRUVFUVFRVVVUKe7xSUlILfL0FdrcHeLlWVlYOf8ADdLQEdrYEdbYDdLUDdbUOgMASg8MSg8QShMQAcrIThMUGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0Je7sJersJeroIeboIebk6OjqqqqrV1dXU1NSrq6vw9/upqak7OzuAgIB+fn719fWCqcCBgYHq6uqEvd2EvN2DvNzz8/P09PSGvt+Fvt5MTEzB3u5/f3/B3e1Gm8uGv99Hm8zo6OiHv9/g6u/B3e6Xl5cIV4SFvd6Fvd3W1tbA1N83k8iCutsJeLgsj8eErMIUXolEf6EHbKTB2+oFdLTg6vBEmcpVos8HdbKDr8hInc2Dq8KEq8IIaJ+ixNfC3OtHirGjo6Nortd1qMVHmsnB1+NInc4wk8u4uLgHd7Yvkssoh70FZ6AIWYgCc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////+7DQ95AAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADDtJREFUeNrsVwl0U1Uafl3S0gVIQ0JpaWlZCiSsdoGhgkJb0kLLVkYQCEX2AiK0oOI2yhBKWprR2R3rMoBNl1RJaaEFKiCrCyrugo64j+OoM84ICtivc5f38t5L2tozeo4mh+8c3v3X7973f0luEdraXLcP+9ofMPYvPohP73a2tQltWf4hARHhzz6JTxPbBNewi36CsX/yTXzqFG6/6Dci/NFHcbcw7Dt/wdh/+yj+KXx3VYSfHP4kwn98FcI3foOrIvwMsPQrX4Xwrd/gqgg/BxH+4KsQ/us3WPobX0W7IhgmTZp0S8KPP6blBsNyt5NgMHSlJ8OQ0VURHu4QL3147Nja9lMRa1/ixlcRQceOjevnXbH22LEPX1KSrfUuOoIjD///ELZ4In2BCwxZJ9O3/EAYJhlUvgsn3XYuFnaF4jk818XNlj7SESaz94mKaCc1DjjCjCAnf+sjHgURUSw8WY4EosiL5ohXn4yiI0WPdA4vETIagIG1en0S2dnwQ0WYhElK1z4RWW6tgaE/sgiPdoD9mPvR+6OugbOfVyqCjH4/swLxxqwzZ4ZIroR+Tlwz6v2P5rrDReOBona22P9ox9t3nOMQrqiRnoWmBC2FSd9kuPIDQURQ+QlAgmieRFNpVyiMWmMXN1v6WPuYD/S5i8CC9V4pJ8h4mTlyFa25axacqor1CKPh3sB86u5nX4sirz32iyztobMch+A1tqZ0rVljMhm1Wvu0rg47xaDSy2BIaF8EzSBkimY1FrS21yvJJXHIIqQbDOnKj4vaJSL8tX0EIezLxYuCR/SG0yPTLxGrLDjA7Kl3jRmRl6dbRkasLHGiz9TgRYu/tCCIukUH1p3xqGA4QFnmF0UouIuK5ityIoqKlDUSPEVwQR+/lVl2EzWqsYd5e1AtPk9mAbVXalGbXkt+uWi2ll4irlpWB6QztzqdORxu9q16NMjfCbu6Vya/Ysiiba4bCUktOHFKNQ1Vp4iVCTdSd4Hy6D0eK+PoRz623FqPyWVl4/G3RdTRARFlKgRi1qlPcIDZIxbzBfi7oiICmErX4DMYT9e8U6dOqSs4yKDH0csjapzYF0iPF0j3k4ZAgvx6cR7w7BYqVNgDVJRKTklJRQURQUxUs2cWm0VtRS0WNlBrTwX5AXPNCJnhwo20DmiAK2kgudaJU92AhmoCmX8LkMKMTAzSVKh7ZfJbgJ4hITMpO9moltanuBATEhIDVwqrdLlwNGkQUUGmvtLD/VLrxcGWOakaiRhF7ceCh2Cc6t3JT82pxYFQzeQ0cKvCHYchTMCyUUhkHHl5ecDb7YhALpc1Foi5D4HEdeuGwElUCIxCVCBBWdnbiDq/bt11TvrJ6EwEMhuTKuApApozD2o16WQ2OBp6g3bbNxWxGKghV4imiY2XhomXzjytHnp6vch0poGIZUYWqi5XqHtl8gbepqmSRWjAAhpagAZ+jJ7DiJcKl+KoPWwiNvdGFDPCYelvswEDyphrwTM2BYKwZNkIW6A6uB6WYIX7DCzcGABIMWCFzRPPwCksy89ftoTtTK6aVfkE72C8zUae71DHZvu8N13z+wD91N2CXYVaJFlVgWo8ydYnUc2eRy+w8ZDCX8ZT6zL5K6dEa9QYtUMRSyoAk1ZrztHmotZuN2ci00wg01lT0UzXFPIbZbere2Vy8lNl1pCw9jI9ESGyT0GTNkejySFyTaGVA7XaeHO8tkk8HYNbBNuINzCOroFYtYgO7WMefg/PKt48HHOXTaU1yuAKoPdmhf8s3uPGx52L8CyG5+frdPmjgdM222TMyh+Tlzcmfy4Zt+4czukIbLbgaHrtjCD3y4rvEaGnvVMRkrSaEnuJlRTq4w+SoZaEYmBOCUmVJLAKgIbt5Me/1i5NUIkLQChZ6FfAblf3yuSDEJNCwxq3CLHINdJ2Yy6XK8lMUvaDSSoRdkgIvgfrybIRc3VkIUPj4UA0ukt2nHbO7TPmRa8gVup2KNCIQG4QdaSYm+90IMNkVjf8XUL24pg3EL5jRyIGL6YF71poaaO0w6LgHSsaG8evmSsRSBC2qVCFGHWAiMBWIgJ79rRKhSGS4QatAHhBCKpYskpNt+1gLiaSpQFDSz17ZfJUEmhYWHXHNjdFNfQsY9Xzyhpe2FM8HUOPnW7cC8zZubMR3RYTB3iaR8m85ZJADD71okeQaHBbdPBOBYgI3HgakGJuvqf50QNZHWdZZKGG/Fq0tNG9Q6NTjirhIUIGsLpTEardalVJRkMVQ4g+lImgzHuLYM1A82rCgwtevTJ5fEIuO+tChQii5iFchGr16bgIu9zIC0PQrl1RuHczcY7jMI+24Pqd7pIWxaTAQ0yDd3cpcT1auHEYx6UYJL5bezNMJ+Ze7OWxNdQARu5lOLfyc0VuA3D+2vfv1X0iEUgQStQApqj8GjzF1qdQ435SkNlIxsAnROSwfmXeXSXDTH7VSyYiV+PVK5ObSGB1Kvk/u16imIlYnorFTEWldDqGHo+7cXYwoh4/DMsI6liwl0fJDS2X/MrSwuBEVEsLixwmv0XRmx5XgdzH3NgLixQjInAjOJpBx9LiHom4iVYMjhYRLOfmAPewmEUikOAhQiv58+Nryfl6Gn3N0M5FIN+d7zQcpq6IcHABFpY0I7XUq1cmL2k1U2EW0ACn+AAxPBODDzoUoVLGBPLxH4mCs9Q+h5EsNg94Va7QiVOykMlH00A4UBC9qVKNV4GNzBiPc1KMiMCNz+IYijdXVu7DPhbaCNxXWWnB+f4izsq5w0D0plfjzla2SAQSBKsKpVYg5iK3Q5t3W60zMJHaFyeihiy72ZOiDnXcIP8JninG7iD/yJ2gyOt5twrkTyI9mszevTK5nvy7ZMqpo1lO9C2w28oOgG8VlTU8yo/eo1xG5EqMR/cAZk+Hcw5dNyAsjizzTpwIJ0t2AMcnGB5A60ai+yvR/d0EG06coEtcGPbRlXyKp0spIK3cE/t4GWE5XlheXgDM43G63ISRzE4DxrJYlCeBhwhWM7kUm2NDd++ui2HvTd66bvfu2GZ0JMIF8nGeSQqH6RvqvESYBiLkxSnqHQahGbEm716ZHA1TppG2ZnoATqSpQzOhIaE6TQciWG+uVLwXuZrR7U5m9g9D4rzyOUHAK+Is9ikKD3GPRMNWCvsYeBgsTf6oD5pTPi8RzzOBNqalkcqbDqfN8xTBueGttPATZI/g8vKAJXCGbyyf89ZISnIfnGnlc8LL444jMTyNxPB9IlxyTBsk3lZN+i1kZLHMPjqlIxGs2owmseEXXiJoeLdqh9ahJLK6nV6ZXDpBnVkiuuTgTIh1XOpQhIcUyA4DRnMz7uUlvLdAR903iQiKwkPce1NxTfMwWx7SFfDYkpfjqLtPqjn0kApSvHvBbOIVvhwm+cT74jbOGtmnOzN+NQRvqruFUg9oHI4MfVJSUl2Gw3GwtNTkSM1Nyk3VWvWhJLmcPSlS9CmiZXIYU/9RUzNjitVIPL1emW8l3TUzM9U72PV6vbmdXpnckZHZs6ZnptVhcm9kdEyrqqmpmuYwKo8Rql8u86pEKO5Tf88m0dYlF1x36LXho5Mjqdervn7AdrnwWu6RqBs8XM8VTB49/LVD1xUkBzB3wDpBqK8/JwjXb1eNcUB978Hnn3++m7jH7OQ+w9cceu3c4GRGURDWcs1wEh3djZRMTy6o7/VZ5yKUHtQ6OJ4wXiaumdlajeMGmmNPPhSj1GB6QmzQ0Pk5VHne7SWz40I7vTK5dAKjYiPO5GDquStvoJ8TtwjbFXhAl5xcLNqvz05mKGReZHJytqIwgHuRyTJ4OJnnC3ls9uvMy5ZqArarIMWj+R736ySfehM46wNx0czYNDs5Ut0tbPWGyRgfH280iZ4mJz5Hs7XVqCE2f/Iak7v+ssYcH2/WtFLbaFTnabdRTd9qNBrb65XJxRO0qjaiMdF2V2p4DYdKhO1x2V/ITuGEgIBsUZPi7GzlDAq5R6Ju8LCkVDG5wicUik6kVFOoHmNkduSdZI9NxfL25NLPvlPcQxcwgdIVbyIlcYS7+PtF8FHc/ICvQrjsN7j5t74KfxLh974K4ZLfoO/vfBX+JML9vgpheau/oO+/fBS9hJCrIvzUeEFo9puvQt9f+yZ6OYW2mPQL/gHfFOHBXoltQltbc4h/yND3QR9Erxe6t7X9T4ABAOtagpOzUgswAAAAAElFTkSuQmCC \ No newline at end of file +v0.42.02-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAACEAtzLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNTc4NThFNzU4MTExRUJBNjhEQjI0MUFERTQ3NDY0IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNTc4NThGNzU4MTExRUJBNjhEQjI0MUFERTQ3NDY0Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RTM1Nzg1OEM3NTgxMTFFQkE2OERCMjQxQURFNDc0NjQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RTM1Nzg1OEQ3NTgxMTFFQkE2OERCMjQxQURFNDc0NjQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz48qIiDAAADAFBMVEWhoaE6lsqUxeEFaaLv9Pc1dZqStcq6uroFXI6y0eJISEilpaWKioqxytllrNQGcKwHXpEFbakccaLR0dE9PT3h7/dJns4jhLwJdbOenp6CgoLR5vOizOVFgKIGVYIbhcLe3t5Fkb12ttq1tbUVapo/Pz8JZZpubm4GZp3a2trn5+fOzs5Ui6sIXY3R4elYptKRkZFjnL1FRUVLS0sIca5ycnKDrsZXlbgHVoQEU4AkapJ3d3eFhYUkeqoqjMWcnJxiYmIEYJSixtq/v7+srKx4eHjw9PeiwNHg4OAJYpQFZZtDQ0MXYYxBQUGUlJTCwsIXgb5qamo0faZFmsrIyMgJaqGz1enQ3+cEWYrFxcVAQEDAwMA2kcaCqsC2trbB1ODKyspilLAIbKUgdaZlZWWDsMtllrKTvtZgYGDB2ecYbZ4JWIWCudmNjY2kzuaiv9AFcrBHnMxHi7IZfLWvr68nicEFYpd0dHSJweJzn7l0sdUmbpgUXok1h7UKebkBcrNZWVlTU1NRUVFUVFRVVVULfL1SUlIKe7wFdrcHeLlWVlYEdrYDdLQDdLUOf8AOgMAEdbYDdbUSg8MSg8QShMQThMUAcrIGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0Je7sJersJeroIeboIebk6OjqqqqrV1dXU1NSrq6vw9/uCqcCpqak7OzuAgIB+fn7C3u6DvNz19fWBgYHq6uqEvd2EvN309PTz8/NMTEyGvt+Fvt7B3u5/f3/B3e2Hv9+Gv9/o6OhGm8vg6u/B3e6Xl5dHm8yEtNCErMLA1N+Fvd7W1taFvd03k8iDu9zC3u8JeLgLdK9Ef6HB2+oHdbLg6vAFdLQsj8eDr8iDq8JVos9EmcqEq8J1qMV0s9gIV4QIaJ/C3OvB1eBlp82ixNfB1+NortdHmsnC3+8Lcaswk8sKbqjQ5PB/uNhFia8IWIcFZ6ACc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////9oBH8RAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADFtJREFUeNrsVwtYVGUaPqAoDbdBB3QGRBQBFRWbQQUhF1MQGRG8u6WuoJnmZlhpF611REDGtvaa1LZqDpeREhEElcRr2lUtK7tak92s1vaWlhov+1/OmXPODCjP1vPUzOP7PMz/fe93+f/zvcP5QWhrq7t3xLfegJv+6oE4d7+9rU1oy/IOCYgIf/FInItoE+pGXPQS3PRnz8Q5u3DvRa8R4U8eivuFET94C276l4finPDDdRF+dniTCP/xVAjfeQ2ui/ALwIJ/eyqE770G10X4JYjwmKdC+K/XYMGjnop2RTCMHz/+zviffkwLDYaFTifeYOhMTYYho7MiPNEh3vq0pSW8/ZBP+FuS1b+lJbGve0Z4S8unUs5jfRNbWvr7uOXsx/4n/n8Ia1yRPq8ODFlH0tf8SBjGG1R+HY447VzM70yLl/BSJzdb8GRH8GXPE+bTTigR2M+M/nb+1PtdEnzCGO37KHXe+pwnRbi22u9WJyN8f/iTV4ebCBn1wKBqvT6B7GX4sSKMx3ilax2HLKfWwPCfWIS/dYA9yHz/7lE3wN7XLeRDRr+HWZ/jjQnHjg2TXAl97bhh1N3vZ3I6HHAcOzYh063VHpeyzsY4hCtqpGehKV5HYdI3Ga78SBARVH48EC+aR9BU0pkWRp2xk5steKp9jAH8lhI4sMwtZAcZLzMjF9GcpRNgV2UsQxCl+wBjiBc+YRX1/Ozor260R+zSHq4W4xDcxtaUrjNrTCajTmed0tlhpxpUehkM8e2LoBkMacNKzGttr1aSS+ohi5BuMKQrvy5ql4jw9/bRH0HnC05+EdcHdpdI3wgscmAvsycuHRo3Y4Z2EhCuTLHDb+IXJ78870B/4p08s3TijBlx57vhc3WnvbTLmHAfRe/w8DGKmIjwcGWOBFcR6qCPXcssq4kaldjJvJ2oFD+PZAHVV6pRnV5N3lw0Wk0vkbpqlgekM7cynTkczu5r9aiXfyes6lq5+RVDFi2ru5U0qQZvnFpJqcpUMTP+VurOUx69x1PFHH3J15Zby+BbXDwT7/WmjhbwKVbhOCac+QR7mR33JV+ICIoMH2AiXU++h5l0iTtBvd4jcVzdiQw6kV4eYYli3XF6vON0P2kIhOTXi31vsQuEchV2AuUlklNUVF5ORBADlewzi82iurwa8+uptbOcvMDqugd0r8OtNA+oR13CIHKtE6eyHvWVBHL/NUAqMwQM1pSra+XmdwI9AwKm0+5ko2qan1qH6ICAaNSlssy6OhxIGExUkFtf6eF8qGXiYIvtVI0IjGLOyWFIVD07edWc+bIWqpm8AtyjcBMxjAlYPAoRCnombncVgVwuSxwQJfwU+Oro0WGwExVqwxBWS1BcHI6ws0eP3myn34yriUBmY1IRriKgUdit06ST2eBA4C26dd+Vx2CQhlwhmiY2XkoTL515Oj309HqR25kGIYYZWai4XK6ulZvX8zJNhSxCPeZRah7q+TF6jiBeGuoUR+1RKuLhPghjRjAccaWlQL9i5jrwYqkC/TFrUlxprZpcBkeSwn0RDm70A2SW3DJ3l6rwIuy3TTqTPGkW25lcNYuSCd7GzNJS8vk2dUpLV7xG12Q/oK+6WrCqUI0Ei4qoxLNsfRaV7PPABTYekvjrWGpdJn/lFOmMGqNuOGJIBmDS6cw5ulxUW61mAYKZQG5nSUMjXVPJO8pqVdfKzcmryqwhtO4yPRFpZJ2MJl2ORpND5JpMMwfpdLHmWF2TeDoGpwilcW8gka61WNSbivAZpz/Cy4onD0bmpIk0R0kuB/o8rPBfxkfc+EwpQi0cA9VjfBkjk5O12uTRwCulpb6YkDx0xoyhyZlk3NrTOK0lKC1NiqLXThy5X5ZfQ4Se1quKkKDTFFmLLCRRH7ubDLUoEINyikioKJ5lAJS2kpd/tVWaoBIXgECy0F8Bq1VdKzcfjOhUSmucIsQg10jLjblcrgQzCVl3J6hE2CQh6QEsI8sYZGrJAizndC0anCmbXrFn+g094UZirnaTAg2o5QZRx0kuI/Il0exaBl+WN/JD0uzE0DcQvGlTBIYU0MQPHXTrBmmH3kmbljc0zFySKR1IgrBOhQpEqwkiAluJCOyzp0VKDJAMJ2gGwBMCUMGCFep263bnYhxZ6jG8xLVWbp5GiPr5Ffetc7aohJ5FLHqeWcUTe4qnY+ix2YlVQN7mzQ3oVkAc4HnOknnLKbUYcv6EC0k0uCsqabMCRARuPA9IHNHATytyFLUsj3fp7aCG/Fh06wbnDg12mVXCRYQMYPFVRah0qlUhGfUVDAH6QCaCMu4ugiUDjYtJH1xwq5Wbx8bnsrPOV4ggah7ARahUn46LsMWJGUH4YMuWMKyiziEc5GwzPpZTmhWTAqeYBh9uUeJjNHPjIA6JVCS6+p05Qa17+jBMJeYu7OLRJdQAIncxnJ7ba5McI/+4n73xH6u0n0gHkiAUqQFMVvlVeI6tz6HK+UlBZiMZg54RkcPqlXFnlgwzeasXjUOuxq1Wbm4ixOI08j+7XmoxHTE8FIPpikzpdAw9nnbi1BCEPX0QjmzqOLCLs+SGllNudzQz2BHW3MyYg+RdFLXyaRXIfcyNXXCwNS8Ss/zOJzE7JIpBy8LiHhF4kG40JEpEkhzLAx5gnAMH1bu4iNBK/vz4VnK+nUIfM/DqIpDfnR80HKbOiLB7HuYXNSKtxK1Wbl7UaqbCzKMEbyEgmkeiIazrSIStMsaSr38k8k9R+zQiGTcHKJAztOKUHGTyUZQIBvKjVm5VowBYwYyZOE2XvAjMWn2mkAc3hjAkEXMHdjBqBfDQ1q0OnB0o4pQcOwhErSwIObW1GQfVuwgWFUosQPRFbgc2brdYumMctS+OQxVZtrNPihrUcIP8Ezxd5O4jP+ROUMT1vFoF8ieRHk1m91q5uZ78XDLl1NAob/Q9sN3CDoDvFZlVnOVH71EmI3QuZqKrP7Onwp5HV18EhZBlzuHDwWTJ9uf4BCP9aR55y7wWNdDZwPfwYbqEBGEHXcm3eCqtJS+s1f5JZW7YwdNIl0NdysrygTmcp8uDiGT2NOAmxoVhmrraRQSLmVyKjTGB27fXRLPnJk9ds317TCM6EuEC+TpPJ4kj9PU1biJMARHy4mT1DoPRiBiTe63cHPWTp5CyRnoA3khTg0bShlA1mg5EsNyxVfFc5Gom1zIzBwYhYk5Z3gfAa+IsdigS93GPsEFzb9vBwGmwMPmj/oO8sjkR+M1AxnadO/e3LGmaiwh233emBR8mexCJ/GfBHryiLO+dSNrkIdinleUFl4UcQkTwNMLhWiJcsk0ZLN5WTfo1ZGQxzD4wuSMRLLqMJrHgV24iaHi1aofW4YRZ3E6t3Fw6QY1ZanTJxjshxnapQxE2KpAdBIzmZsjqWbw2X0vdd4FXFYn7uPeu4prmNFs2avM5N2t1CGclKHts3PiqyHbNn028LquDJJ9439zFu4b6dWXG7cPwrqp4o1DiAo3NlqFPSEioybDZdpeUmGxpuQm5aTqLPpAEF7JPilR9qmiZbMa07lVV3SdbjMTT65XxVlJdNd1lD6terze3Uys3t2UIPat6ChabybmR0TaloqqqYorNqDxGoH6h3FclQqHftgdWirY2Jf/mfa+PHJ0SSr1e27b1UyTeyD3COsHpbVzBlNEjX993c36Kv8hK6KcaY79tfYacfeGFbuIes1P8Ri7Z9/ptQ1JYi/yg5htOE3Z0N5IyNSV/W69riFCyW2fjeMZ4mbhmZus0tltojH3yoRilAtMzYoGGzs+mivNqN5ltF9qplZtLJzAqNuKdbEw9Z+Yt9HviFGG9Ahu0KSmFov3m7BSGLswLTUnJViT6cy80RQanU3i8C+dmvymyEpQ91q/PFtkovscjWsmn3ljedUNIFDNWzk4JVRWvF9a6w2SMjY01mkRPkxObo1nbatQQm3/yHJMz/7LGHBtr1rRS22hUx2m1Ud2+1Wg0tlcrNxdP0KraiHKi7czU8BwOlQjrQ7K/kZ0uY/39s0VNCrOzlTPowj3COsFpacqF5Aof20VKdkI9x9Ds0AKyx8pCeXty6WcXbOBlWv+xtF3hSpISQroUXlsED8UdGzwVwmWvwR1/8FR4kwh/9FQIl7wGA37vqfAmER7xVAgLW70FA/7poeglBFwX4efG10Kj1/wqDPidZ6KXXWiLTr/gHfBMER7v9VWb0NbWGOAdMgx43APR62t7W9v/BBgAciw52UrfNuoAAAAASUVORK5CYII= \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/root/www/luci-static/resources/openclash/lib/codemirror.js b/package/ctcgfw/luci-app-openclash/root/www/luci-static/resources/openclash/lib/codemirror.js index 2a2f54e4c9..1f313cffbb 100644 --- a/package/ctcgfw/luci-app-openclash/root/www/luci-static/resources/openclash/lib/codemirror.js +++ b/package/ctcgfw/luci-app-openclash/root/www/luci-static/resources/openclash/lib/codemirror.js @@ -1,3 +1,9800 @@ -import { CodeMirror } from "./edit/main.js" +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE -export default CodeMirror +// This is CodeMirror (https://codemirror.net), a code editor +// implemented in JavaScript on top of the browser's DOM. +// +// You can find some technical background for some of the code below +// at http://marijnhaverbeke.nl/blog/#cm-internals . + +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global = global || self, global.CodeMirror = factory()); +}(this, (function () { 'use strict'; + + // Kludges for bugs and behavior differences that can't be feature + // detected are enabled based on userAgent etc sniffing. + var userAgent = navigator.userAgent; + var platform = navigator.platform; + + var gecko = /gecko\/\d/i.test(userAgent); + var ie_upto10 = /MSIE \d/.test(userAgent); + var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent); + var edge = /Edge\/(\d+)/.exec(userAgent); + var ie = ie_upto10 || ie_11up || edge; + var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]); + var webkit = !edge && /WebKit\//.test(userAgent); + var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent); + var chrome = !edge && /Chrome\//.test(userAgent); + var presto = /Opera\//.test(userAgent); + var safari = /Apple Computer/.test(navigator.vendor); + var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent); + var phantom = /PhantomJS/.test(userAgent); + + var ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2); + var android = /Android/.test(userAgent); + // This is woefully incomplete. Suggestions for alternative methods welcome. + var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent); + var mac = ios || /Mac/.test(platform); + var chromeOS = /\bCrOS\b/.test(userAgent); + var windows = /win/i.test(platform); + + var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/); + if (presto_version) { presto_version = Number(presto_version[1]); } + if (presto_version && presto_version >= 15) { presto = false; webkit = true; } + // Some browsers use the wrong event properties to signal cmd/ctrl on OS X + var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)); + var captureRightClick = gecko || (ie && ie_version >= 9); + + function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") } + + var rmClass = function(node, cls) { + var current = node.className; + var match = classTest(cls).exec(current); + if (match) { + var after = current.slice(match.index + match[0].length); + node.className = current.slice(0, match.index) + (after ? match[1] + after : ""); + } + }; + + function removeChildren(e) { + for (var count = e.childNodes.length; count > 0; --count) + { e.removeChild(e.firstChild); } + return e + } + + function removeChildrenAndAdd(parent, e) { + return removeChildren(parent).appendChild(e) + } + + function elt(tag, content, className, style) { + var e = document.createElement(tag); + if (className) { e.className = className; } + if (style) { e.style.cssText = style; } + if (typeof content == "string") { e.appendChild(document.createTextNode(content)); } + else if (content) { for (var i = 0; i < content.length; ++i) { e.appendChild(content[i]); } } + return e + } + // wrapper for elt, which removes the elt from the accessibility tree + function eltP(tag, content, className, style) { + var e = elt(tag, content, className, style); + e.setAttribute("role", "presentation"); + return e + } + + var range; + if (document.createRange) { range = function(node, start, end, endNode) { + var r = document.createRange(); + r.setEnd(endNode || node, end); + r.setStart(node, start); + return r + }; } + else { range = function(node, start, end) { + var r = document.body.createTextRange(); + try { r.moveToElementText(node.parentNode); } + catch(e) { return r } + r.collapse(true); + r.moveEnd("character", end); + r.moveStart("character", start); + return r + }; } + + function contains(parent, child) { + if (child.nodeType == 3) // Android browser always returns false when child is a textnode + { child = child.parentNode; } + if (parent.contains) + { return parent.contains(child) } + do { + if (child.nodeType == 11) { child = child.host; } + if (child == parent) { return true } + } while (child = child.parentNode) + } + + function activeElt() { + // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement. + // IE < 10 will throw when accessed while the page is loading or in an iframe. + // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable. + var activeElement; + try { + activeElement = document.activeElement; + } catch(e) { + activeElement = document.body || null; + } + while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement) + { activeElement = activeElement.shadowRoot.activeElement; } + return activeElement + } + + function addClass(node, cls) { + var current = node.className; + if (!classTest(cls).test(current)) { node.className += (current ? " " : "") + cls; } + } + function joinClasses(a, b) { + var as = a.split(" "); + for (var i = 0; i < as.length; i++) + { if (as[i] && !classTest(as[i]).test(b)) { b += " " + as[i]; } } + return b + } + + var selectInput = function(node) { node.select(); }; + if (ios) // Mobile Safari apparently has a bug where select() is broken. + { selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; }; } + else if (ie) // Suppress mysterious IE10 errors + { selectInput = function(node) { try { node.select(); } catch(_e) {} }; } + + function bind(f) { + var args = Array.prototype.slice.call(arguments, 1); + return function(){return f.apply(null, args)} + } + + function copyObj(obj, target, overwrite) { + if (!target) { target = {}; } + for (var prop in obj) + { if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop))) + { target[prop] = obj[prop]; } } + return target + } + + // Counts the column offset in a string, taking tabs into account. + // Used mostly to find indentation. + function countColumn(string, end, tabSize, startIndex, startValue) { + if (end == null) { + end = string.search(/[^\s\u00a0]/); + if (end == -1) { end = string.length; } + } + for (var i = startIndex || 0, n = startValue || 0;;) { + var nextTab = string.indexOf("\t", i); + if (nextTab < 0 || nextTab >= end) + { return n + (end - i) } + n += nextTab - i; + n += tabSize - (n % tabSize); + i = nextTab + 1; + } + } + + var Delayed = function() { + this.id = null; + this.f = null; + this.time = 0; + this.handler = bind(this.onTimeout, this); + }; + Delayed.prototype.onTimeout = function (self) { + self.id = 0; + if (self.time <= +new Date) { + self.f(); + } else { + setTimeout(self.handler, self.time - +new Date); + } + }; + Delayed.prototype.set = function (ms, f) { + this.f = f; + var time = +new Date + ms; + if (!this.id || time < this.time) { + clearTimeout(this.id); + this.id = setTimeout(this.handler, ms); + this.time = time; + } + }; + + function indexOf(array, elt) { + for (var i = 0; i < array.length; ++i) + { if (array[i] == elt) { return i } } + return -1 + } + + // Number of pixels added to scroller and sizer to hide scrollbar + var scrollerGap = 50; + + // Returned or thrown by various protocols to signal 'I'm not + // handling this'. + var Pass = {toString: function(){return "CodeMirror.Pass"}}; + + // Reused option objects for setSelection & friends + var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"}; + + // The inverse of countColumn -- find the offset that corresponds to + // a particular column. + function findColumn(string, goal, tabSize) { + for (var pos = 0, col = 0;;) { + var nextTab = string.indexOf("\t", pos); + if (nextTab == -1) { nextTab = string.length; } + var skipped = nextTab - pos; + if (nextTab == string.length || col + skipped >= goal) + { return pos + Math.min(skipped, goal - col) } + col += nextTab - pos; + col += tabSize - (col % tabSize); + pos = nextTab + 1; + if (col >= goal) { return pos } + } + } + + var spaceStrs = [""]; + function spaceStr(n) { + while (spaceStrs.length <= n) + { spaceStrs.push(lst(spaceStrs) + " "); } + return spaceStrs[n] + } + + function lst(arr) { return arr[arr.length-1] } + + function map(array, f) { + var out = []; + for (var i = 0; i < array.length; i++) { out[i] = f(array[i], i); } + return out + } + + function insertSorted(array, value, score) { + var pos = 0, priority = score(value); + while (pos < array.length && score(array[pos]) <= priority) { pos++; } + array.splice(pos, 0, value); + } + + function nothing() {} + + function createObj(base, props) { + var inst; + if (Object.create) { + inst = Object.create(base); + } else { + nothing.prototype = base; + inst = new nothing(); + } + if (props) { copyObj(props, inst); } + return inst + } + + var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/; + function isWordCharBasic(ch) { + return /\w/.test(ch) || ch > "\x80" && + (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)) + } + function isWordChar(ch, helper) { + if (!helper) { return isWordCharBasic(ch) } + if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { return true } + return helper.test(ch) + } + + function isEmpty(obj) { + for (var n in obj) { if (obj.hasOwnProperty(n) && obj[n]) { return false } } + return true + } + + // Extending unicode characters. A series of a non-extending char + + // any number of extending chars is treated as a single unit as far + // as editing and measuring is concerned. This is not fully correct, + // since some scripts/fonts/browsers also treat other configurations + // of code points as a group. + var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/; + function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) } + + // Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range. + function skipExtendingChars(str, pos, dir) { + while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) { pos += dir; } + return pos + } + + // Returns the value from the range [`from`; `to`] that satisfies + // `pred` and is closest to `from`. Assumes that at least `to` + // satisfies `pred`. Supports `from` being greater than `to`. + function findFirst(pred, from, to) { + // At any point we are certain `to` satisfies `pred`, don't know + // whether `from` does. + var dir = from > to ? -1 : 1; + for (;;) { + if (from == to) { return from } + var midF = (from + to) / 2, mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF); + if (mid == from) { return pred(mid) ? from : to } + if (pred(mid)) { to = mid; } + else { from = mid + dir; } + } + } + + // BIDI HELPERS + + function iterateBidiSections(order, from, to, f) { + if (!order) { return f(from, to, "ltr", 0) } + var found = false; + for (var i = 0; i < order.length; ++i) { + var part = order[i]; + if (part.from < to && part.to > from || from == to && part.to == from) { + f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i); + found = true; + } + } + if (!found) { f(from, to, "ltr"); } + } + + var bidiOther = null; + function getBidiPartAt(order, ch, sticky) { + var found; + bidiOther = null; + for (var i = 0; i < order.length; ++i) { + var cur = order[i]; + if (cur.from < ch && cur.to > ch) { return i } + if (cur.to == ch) { + if (cur.from != cur.to && sticky == "before") { found = i; } + else { bidiOther = i; } + } + if (cur.from == ch) { + if (cur.from != cur.to && sticky != "before") { found = i; } + else { bidiOther = i; } + } + } + return found != null ? found : bidiOther + } + + // Bidirectional ordering algorithm + // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm + // that this (partially) implements. + + // One-char codes used for character types: + // L (L): Left-to-Right + // R (R): Right-to-Left + // r (AL): Right-to-Left Arabic + // 1 (EN): European Number + // + (ES): European Number Separator + // % (ET): European Number Terminator + // n (AN): Arabic Number + // , (CS): Common Number Separator + // m (NSM): Non-Spacing Mark + // b (BN): Boundary Neutral + // s (B): Paragraph Separator + // t (S): Segment Separator + // w (WS): Whitespace + // N (ON): Other Neutrals + + // Returns null if characters are ordered as they appear + // (left-to-right), or an array of sections ({from, to, level} + // objects) in the order in which they occur visually. + var bidiOrdering = (function() { + // Character types for codepoints 0 to 0xff + var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"; + // Character types for codepoints 0x600 to 0x6f9 + var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111"; + function charType(code) { + if (code <= 0xf7) { return lowTypes.charAt(code) } + else if (0x590 <= code && code <= 0x5f4) { return "R" } + else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) } + else if (0x6ee <= code && code <= 0x8ac) { return "r" } + else if (0x2000 <= code && code <= 0x200b) { return "w" } + else if (code == 0x200c) { return "b" } + else { return "L" } + } + + var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/; + var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/; + + function BidiSpan(level, from, to) { + this.level = level; + this.from = from; this.to = to; + } + + return function(str, direction) { + var outerType = direction == "ltr" ? "L" : "R"; + + if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { return false } + var len = str.length, types = []; + for (var i = 0; i < len; ++i) + { types.push(charType(str.charCodeAt(i))); } + + // W1. Examine each non-spacing mark (NSM) in the level run, and + // change the type of the NSM to the type of the previous + // character. If the NSM is at the start of the level run, it will + // get the type of sor. + for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) { + var type = types[i$1]; + if (type == "m") { types[i$1] = prev; } + else { prev = type; } + } + + // W2. Search backwards from each instance of a European number + // until the first strong type (R, L, AL, or sor) is found. If an + // AL is found, change the type of the European number to Arabic + // number. + // W3. Change all ALs to R. + for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) { + var type$1 = types[i$2]; + if (type$1 == "1" && cur == "r") { types[i$2] = "n"; } + else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R"; } } + } + + // W4. A single European separator between two European numbers + // changes to a European number. A single common separator between + // two numbers of the same type changes to that type. + for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) { + var type$2 = types[i$3]; + if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1"; } + else if (type$2 == "," && prev$1 == types[i$3+1] && + (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1; } + prev$1 = type$2; + } + + // W5. A sequence of European terminators adjacent to European + // numbers changes to all European numbers. + // W6. Otherwise, separators and terminators change to Other + // Neutral. + for (var i$4 = 0; i$4 < len; ++i$4) { + var type$3 = types[i$4]; + if (type$3 == ",") { types[i$4] = "N"; } + else if (type$3 == "%") { + var end = (void 0); + for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {} + var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"; + for (var j = i$4; j < end; ++j) { types[j] = replace; } + i$4 = end - 1; + } + } + + // W7. Search backwards from each instance of a European number + // until the first strong type (R, L, or sor) is found. If an L is + // found, then change the type of the European number to L. + for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) { + var type$4 = types[i$5]; + if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L"; } + else if (isStrong.test(type$4)) { cur$1 = type$4; } + } + + // N1. A sequence of neutrals takes the direction of the + // surrounding strong text if the text on both sides has the same + // direction. European and Arabic numbers act as if they were R in + // terms of their influence on neutrals. Start-of-level-run (sor) + // and end-of-level-run (eor) are used at level run boundaries. + // N2. Any remaining neutrals take the embedding direction. + for (var i$6 = 0; i$6 < len; ++i$6) { + if (isNeutral.test(types[i$6])) { + var end$1 = (void 0); + for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {} + var before = (i$6 ? types[i$6-1] : outerType) == "L"; + var after = (end$1 < len ? types[end$1] : outerType) == "L"; + var replace$1 = before == after ? (before ? "L" : "R") : outerType; + for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1; } + i$6 = end$1 - 1; + } + } + + // Here we depart from the documented algorithm, in order to avoid + // building up an actual levels array. Since there are only three + // levels (0, 1, 2) in an implementation that doesn't take + // explicit embedding into account, we can build up the order on + // the fly, without following the level-based algorithm. + var order = [], m; + for (var i$7 = 0; i$7 < len;) { + if (countsAsLeft.test(types[i$7])) { + var start = i$7; + for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {} + order.push(new BidiSpan(0, start, i$7)); + } else { + var pos = i$7, at = order.length, isRTL = direction == "rtl" ? 1 : 0; + for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {} + for (var j$2 = pos; j$2 < i$7;) { + if (countsAsNum.test(types[j$2])) { + if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); at += isRTL; } + var nstart = j$2; + for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {} + order.splice(at, 0, new BidiSpan(2, nstart, j$2)); + at += isRTL; + pos = j$2; + } else { ++j$2; } + } + if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)); } + } + } + if (direction == "ltr") { + if (order[0].level == 1 && (m = str.match(/^\s+/))) { + order[0].from = m[0].length; + order.unshift(new BidiSpan(0, 0, m[0].length)); + } + if (lst(order).level == 1 && (m = str.match(/\s+$/))) { + lst(order).to -= m[0].length; + order.push(new BidiSpan(0, len - m[0].length, len)); + } + } + + return direction == "rtl" ? order.reverse() : order + } + })(); + + // Get the bidi ordering for the given line (and cache it). Returns + // false for lines that are fully left-to-right, and an array of + // BidiSpan objects otherwise. + function getOrder(line, direction) { + var order = line.order; + if (order == null) { order = line.order = bidiOrdering(line.text, direction); } + return order + } + + // EVENT HANDLING + + // Lightweight event framework. on/off also work on DOM nodes, + // registering native DOM handlers. + + var noHandlers = []; + + var on = function(emitter, type, f) { + if (emitter.addEventListener) { + emitter.addEventListener(type, f, false); + } else if (emitter.attachEvent) { + emitter.attachEvent("on" + type, f); + } else { + var map = emitter._handlers || (emitter._handlers = {}); + map[type] = (map[type] || noHandlers).concat(f); + } + }; + + function getHandlers(emitter, type) { + return emitter._handlers && emitter._handlers[type] || noHandlers + } + + function off(emitter, type, f) { + if (emitter.removeEventListener) { + emitter.removeEventListener(type, f, false); + } else if (emitter.detachEvent) { + emitter.detachEvent("on" + type, f); + } else { + var map = emitter._handlers, arr = map && map[type]; + if (arr) { + var index = indexOf(arr, f); + if (index > -1) + { map[type] = arr.slice(0, index).concat(arr.slice(index + 1)); } + } + } + } + + function signal(emitter, type /*, values...*/) { + var handlers = getHandlers(emitter, type); + if (!handlers.length) { return } + var args = Array.prototype.slice.call(arguments, 2); + for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args); } + } + + // The DOM events that CodeMirror handles can be overridden by + // registering a (non-DOM) handler on the editor for the event name, + // and preventDefault-ing the event in that handler. + function signalDOMEvent(cm, e, override) { + if (typeof e == "string") + { e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; } + signal(cm, override || e.type, cm, e); + return e_defaultPrevented(e) || e.codemirrorIgnore + } + + function signalCursorActivity(cm) { + var arr = cm._handlers && cm._handlers.cursorActivity; + if (!arr) { return } + var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []); + for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1) + { set.push(arr[i]); } } + } + + function hasHandler(emitter, type) { + return getHandlers(emitter, type).length > 0 + } + + // Add on and off methods to a constructor's prototype, to make + // registering events on such objects more convenient. + function eventMixin(ctor) { + ctor.prototype.on = function(type, f) {on(this, type, f);}; + ctor.prototype.off = function(type, f) {off(this, type, f);}; + } + + // Due to the fact that we still support jurassic IE versions, some + // compatibility wrappers are needed. + + function e_preventDefault(e) { + if (e.preventDefault) { e.preventDefault(); } + else { e.returnValue = false; } + } + function e_stopPropagation(e) { + if (e.stopPropagation) { e.stopPropagation(); } + else { e.cancelBubble = true; } + } + function e_defaultPrevented(e) { + return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false + } + function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);} + + function e_target(e) {return e.target || e.srcElement} + function e_button(e) { + var b = e.which; + if (b == null) { + if (e.button & 1) { b = 1; } + else if (e.button & 2) { b = 3; } + else if (e.button & 4) { b = 2; } + } + if (mac && e.ctrlKey && b == 1) { b = 3; } + return b + } + + // Detect drag-and-drop + var dragAndDrop = function() { + // There is *some* kind of drag-and-drop support in IE6-8, but I + // couldn't get it to work yet. + if (ie && ie_version < 9) { return false } + var div = elt('div'); + return "draggable" in div || "dragDrop" in div + }(); + + var zwspSupported; + function zeroWidthElement(measure) { + if (zwspSupported == null) { + var test = elt("span", "\u200b"); + removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")])); + if (measure.firstChild.offsetHeight != 0) + { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); } + } + var node = zwspSupported ? elt("span", "\u200b") : + elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px"); + node.setAttribute("cm-text", ""); + return node + } + + // Feature-detect IE's crummy client rect reporting for bidi text + var badBidiRects; + function hasBadBidiRects(measure) { + if (badBidiRects != null) { return badBidiRects } + var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA")); + var r0 = range(txt, 0, 1).getBoundingClientRect(); + var r1 = range(txt, 1, 2).getBoundingClientRect(); + removeChildren(measure); + if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780) + return badBidiRects = (r1.right - r0.right < 3) + } + + // See if "".split is the broken IE version, if so, provide an + // alternative way to split lines. + var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) { + var pos = 0, result = [], l = string.length; + while (pos <= l) { + var nl = string.indexOf("\n", pos); + if (nl == -1) { nl = string.length; } + var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl); + var rt = line.indexOf("\r"); + if (rt != -1) { + result.push(line.slice(0, rt)); + pos += rt + 1; + } else { + result.push(line); + pos = nl + 1; + } + } + return result + } : function (string) { return string.split(/\r\n?|\n/); }; + + var hasSelection = window.getSelection ? function (te) { + try { return te.selectionStart != te.selectionEnd } + catch(e) { return false } + } : function (te) { + var range; + try {range = te.ownerDocument.selection.createRange();} + catch(e) {} + if (!range || range.parentElement() != te) { return false } + return range.compareEndPoints("StartToEnd", range) != 0 + }; + + var hasCopyEvent = (function () { + var e = elt("div"); + if ("oncopy" in e) { return true } + e.setAttribute("oncopy", "return;"); + return typeof e.oncopy == "function" + })(); + + var badZoomedRects = null; + function hasBadZoomedRects(measure) { + if (badZoomedRects != null) { return badZoomedRects } + var node = removeChildrenAndAdd(measure, elt("span", "x")); + var normal = node.getBoundingClientRect(); + var fromRange = range(node, 0, 1).getBoundingClientRect(); + return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1 + } + + // Known modes, by name and by MIME + var modes = {}, mimeModes = {}; + + // Extra arguments are stored as the mode's dependencies, which is + // used by (legacy) mechanisms like loadmode.js to automatically + // load a mode. (Preferred mechanism is the require/define calls.) + function defineMode(name, mode) { + if (arguments.length > 2) + { mode.dependencies = Array.prototype.slice.call(arguments, 2); } + modes[name] = mode; + } + + function defineMIME(mime, spec) { + mimeModes[mime] = spec; + } + + // Given a MIME type, a {name, ...options} config object, or a name + // string, return a mode config object. + function resolveMode(spec) { + if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) { + spec = mimeModes[spec]; + } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) { + var found = mimeModes[spec.name]; + if (typeof found == "string") { found = {name: found}; } + spec = createObj(found, spec); + spec.name = found.name; + } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) { + return resolveMode("application/xml") + } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) { + return resolveMode("application/json") + } + if (typeof spec == "string") { return {name: spec} } + else { return spec || {name: "null"} } + } + + // Given a mode spec (anything that resolveMode accepts), find and + // initialize an actual mode object. + function getMode(options, spec) { + spec = resolveMode(spec); + var mfactory = modes[spec.name]; + if (!mfactory) { return getMode(options, "text/plain") } + var modeObj = mfactory(options, spec); + if (modeExtensions.hasOwnProperty(spec.name)) { + var exts = modeExtensions[spec.name]; + for (var prop in exts) { + if (!exts.hasOwnProperty(prop)) { continue } + if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop]; } + modeObj[prop] = exts[prop]; + } + } + modeObj.name = spec.name; + if (spec.helperType) { modeObj.helperType = spec.helperType; } + if (spec.modeProps) { for (var prop$1 in spec.modeProps) + { modeObj[prop$1] = spec.modeProps[prop$1]; } } + + return modeObj + } + + // This can be used to attach properties to mode objects from + // outside the actual mode definition. + var modeExtensions = {}; + function extendMode(mode, properties) { + var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {}); + copyObj(properties, exts); + } + + function copyState(mode, state) { + if (state === true) { return state } + if (mode.copyState) { return mode.copyState(state) } + var nstate = {}; + for (var n in state) { + var val = state[n]; + if (val instanceof Array) { val = val.concat([]); } + nstate[n] = val; + } + return nstate + } + + // Given a mode and a state (for that mode), find the inner mode and + // state at the position that the state refers to. + function innerMode(mode, state) { + var info; + while (mode.innerMode) { + info = mode.innerMode(state); + if (!info || info.mode == mode) { break } + state = info.state; + mode = info.mode; + } + return info || {mode: mode, state: state} + } + + function startState(mode, a1, a2) { + return mode.startState ? mode.startState(a1, a2) : true + } + + // STRING STREAM + + // Fed to the mode parsers, provides helper functions to make + // parsers more succinct. + + var StringStream = function(string, tabSize, lineOracle) { + this.pos = this.start = 0; + this.string = string; + this.tabSize = tabSize || 8; + this.lastColumnPos = this.lastColumnValue = 0; + this.lineStart = 0; + this.lineOracle = lineOracle; + }; + + StringStream.prototype.eol = function () {return this.pos >= this.string.length}; + StringStream.prototype.sol = function () {return this.pos == this.lineStart}; + StringStream.prototype.peek = function () {return this.string.charAt(this.pos) || undefined}; + StringStream.prototype.next = function () { + if (this.pos < this.string.length) + { return this.string.charAt(this.pos++) } + }; + StringStream.prototype.eat = function (match) { + var ch = this.string.charAt(this.pos); + var ok; + if (typeof match == "string") { ok = ch == match; } + else { ok = ch && (match.test ? match.test(ch) : match(ch)); } + if (ok) {++this.pos; return ch} + }; + StringStream.prototype.eatWhile = function (match) { + var start = this.pos; + while (this.eat(match)){} + return this.pos > start + }; + StringStream.prototype.eatSpace = function () { + var start = this.pos; + while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this.pos; } + return this.pos > start + }; + StringStream.prototype.skipToEnd = function () {this.pos = this.string.length;}; + StringStream.prototype.skipTo = function (ch) { + var found = this.string.indexOf(ch, this.pos); + if (found > -1) {this.pos = found; return true} + }; + StringStream.prototype.backUp = function (n) {this.pos -= n;}; + StringStream.prototype.column = function () { + if (this.lastColumnPos < this.start) { + this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue); + this.lastColumnPos = this.start; + } + return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0) + }; + StringStream.prototype.indentation = function () { + return countColumn(this.string, null, this.tabSize) - + (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0) + }; + StringStream.prototype.match = function (pattern, consume, caseInsensitive) { + if (typeof pattern == "string") { + var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; }; + var substr = this.string.substr(this.pos, pattern.length); + if (cased(substr) == cased(pattern)) { + if (consume !== false) { this.pos += pattern.length; } + return true + } + } else { + var match = this.string.slice(this.pos).match(pattern); + if (match && match.index > 0) { return null } + if (match && consume !== false) { this.pos += match[0].length; } + return match + } + }; + StringStream.prototype.current = function (){return this.string.slice(this.start, this.pos)}; + StringStream.prototype.hideFirstChars = function (n, inner) { + this.lineStart += n; + try { return inner() } + finally { this.lineStart -= n; } + }; + StringStream.prototype.lookAhead = function (n) { + var oracle = this.lineOracle; + return oracle && oracle.lookAhead(n) + }; + StringStream.prototype.baseToken = function () { + var oracle = this.lineOracle; + return oracle && oracle.baseToken(this.pos) + }; + + // Find the line object corresponding to the given line number. + function getLine(doc, n) { + n -= doc.first; + if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") } + var chunk = doc; + while (!chunk.lines) { + for (var i = 0;; ++i) { + var child = chunk.children[i], sz = child.chunkSize(); + if (n < sz) { chunk = child; break } + n -= sz; + } + } + return chunk.lines[n] + } + + // Get the part of a document between two positions, as an array of + // strings. + function getBetween(doc, start, end) { + var out = [], n = start.line; + doc.iter(start.line, end.line + 1, function (line) { + var text = line.text; + if (n == end.line) { text = text.slice(0, end.ch); } + if (n == start.line) { text = text.slice(start.ch); } + out.push(text); + ++n; + }); + return out + } + // Get the lines between from and to, as array of strings. + function getLines(doc, from, to) { + var out = []; + doc.iter(from, to, function (line) { out.push(line.text); }); // iter aborts when callback returns truthy value + return out + } + + // Update the height of a line, propagating the height change + // upwards to parent nodes. + function updateLineHeight(line, height) { + var diff = height - line.height; + if (diff) { for (var n = line; n; n = n.parent) { n.height += diff; } } + } + + // Given a line object, find its line number by walking up through + // its parent links. + function lineNo(line) { + if (line.parent == null) { return null } + var cur = line.parent, no = indexOf(cur.lines, line); + for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { + for (var i = 0;; ++i) { + if (chunk.children[i] == cur) { break } + no += chunk.children[i].chunkSize(); + } + } + return no + cur.first + } + + // Find the line at the given vertical position, using the height + // information in the document tree. + function lineAtHeight(chunk, h) { + var n = chunk.first; + outer: do { + for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) { + var child = chunk.children[i$1], ch = child.height; + if (h < ch) { chunk = child; continue outer } + h -= ch; + n += child.chunkSize(); + } + return n + } while (!chunk.lines) + var i = 0; + for (; i < chunk.lines.length; ++i) { + var line = chunk.lines[i], lh = line.height; + if (h < lh) { break } + h -= lh; + } + return n + i + } + + function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size} + + function lineNumberFor(options, i) { + return String(options.lineNumberFormatter(i + options.firstLineNumber)) + } + + // A Pos instance represents a position within the text. + function Pos(line, ch, sticky) { + if ( sticky === void 0 ) sticky = null; + + if (!(this instanceof Pos)) { return new Pos(line, ch, sticky) } + this.line = line; + this.ch = ch; + this.sticky = sticky; + } + + // Compare two positions, return 0 if they are the same, a negative + // number when a is less, and a positive number otherwise. + function cmp(a, b) { return a.line - b.line || a.ch - b.ch } + + function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 } + + function copyPos(x) {return Pos(x.line, x.ch)} + function maxPos(a, b) { return cmp(a, b) < 0 ? b : a } + function minPos(a, b) { return cmp(a, b) < 0 ? a : b } + + // Most of the external API clips given positions to make sure they + // actually exist within the document. + function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))} + function clipPos(doc, pos) { + if (pos.line < doc.first) { return Pos(doc.first, 0) } + var last = doc.first + doc.size - 1; + if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) } + return clipToLen(pos, getLine(doc, pos.line).text.length) + } + function clipToLen(pos, linelen) { + var ch = pos.ch; + if (ch == null || ch > linelen) { return Pos(pos.line, linelen) } + else if (ch < 0) { return Pos(pos.line, 0) } + else { return pos } + } + function clipPosArray(doc, array) { + var out = []; + for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]); } + return out + } + + var SavedContext = function(state, lookAhead) { + this.state = state; + this.lookAhead = lookAhead; + }; + + var Context = function(doc, state, line, lookAhead) { + this.state = state; + this.doc = doc; + this.line = line; + this.maxLookAhead = lookAhead || 0; + this.baseTokens = null; + this.baseTokenPos = 1; + }; + + Context.prototype.lookAhead = function (n) { + var line = this.doc.getLine(this.line + n); + if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; } + return line + }; + + Context.prototype.baseToken = function (n) { + if (!this.baseTokens) { return null } + while (this.baseTokens[this.baseTokenPos] <= n) + { this.baseTokenPos += 2; } + var type = this.baseTokens[this.baseTokenPos + 1]; + return {type: type && type.replace(/( |^)overlay .*/, ""), + size: this.baseTokens[this.baseTokenPos] - n} + }; + + Context.prototype.nextLine = function () { + this.line++; + if (this.maxLookAhead > 0) { this.maxLookAhead--; } + }; + + Context.fromSaved = function (doc, saved, line) { + if (saved instanceof SavedContext) + { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) } + else + { return new Context(doc, copyState(doc.mode, saved), line) } + }; + + Context.prototype.save = function (copy) { + var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state; + return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state + }; + + + // Compute a style array (an array starting with a mode generation + // -- for invalidation -- followed by pairs of end positions and + // style strings), which is used to highlight the tokens on the + // line. + function highlightLine(cm, line, context, forceToEnd) { + // A styles array always starts with a number identifying the + // mode/overlays that it is based on (for easy invalidation). + var st = [cm.state.modeGen], lineClasses = {}; + // Compute the base array of styles + runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); }, + lineClasses, forceToEnd); + var state = context.state; + + // Run overlays, adjust style array. + var loop = function ( o ) { + context.baseTokens = st; + var overlay = cm.state.overlays[o], i = 1, at = 0; + context.state = true; + runMode(cm, line.text, overlay.mode, context, function (end, style) { + var start = i; + // Ensure there's a token end at the current position, and that i points at it + while (at < end) { + var i_end = st[i]; + if (i_end > end) + { st.splice(i, 1, end, st[i+1], i_end); } + i += 2; + at = Math.min(end, i_end); + } + if (!style) { return } + if (overlay.opaque) { + st.splice(start, i - start, end, "overlay " + style); + i = start + 2; + } else { + for (; start < i; start += 2) { + var cur = st[start+1]; + st[start+1] = (cur ? cur + " " : "") + "overlay " + style; + } + } + }, lineClasses); + context.state = state; + context.baseTokens = null; + context.baseTokenPos = 1; + }; + + for (var o = 0; o < cm.state.overlays.length; ++o) loop( o ); + + return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null} + } + + function getLineStyles(cm, line, updateFrontier) { + if (!line.styles || line.styles[0] != cm.state.modeGen) { + var context = getContextBefore(cm, lineNo(line)); + var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state); + var result = highlightLine(cm, line, context); + if (resetState) { context.state = resetState; } + line.stateAfter = context.save(!resetState); + line.styles = result.styles; + if (result.classes) { line.styleClasses = result.classes; } + else if (line.styleClasses) { line.styleClasses = null; } + if (updateFrontier === cm.doc.highlightFrontier) + { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); } + } + return line.styles + } + + function getContextBefore(cm, n, precise) { + var doc = cm.doc, display = cm.display; + if (!doc.mode.startState) { return new Context(doc, true, n) } + var start = findStartLine(cm, n, precise); + var saved = start > doc.first && getLine(doc, start - 1).stateAfter; + var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start); + + doc.iter(start, n, function (line) { + processLine(cm, line.text, context); + var pos = context.line; + line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null; + context.nextLine(); + }); + if (precise) { doc.modeFrontier = context.line; } + return context + } + + // Lightweight form of highlight -- proceed over this line and + // update state, but don't save a style array. Used for lines that + // aren't currently visible. + function processLine(cm, text, context, startAt) { + var mode = cm.doc.mode; + var stream = new StringStream(text, cm.options.tabSize, context); + stream.start = stream.pos = startAt || 0; + if (text == "") { callBlankLine(mode, context.state); } + while (!stream.eol()) { + readToken(mode, stream, context.state); + stream.start = stream.pos; + } + } + + function callBlankLine(mode, state) { + if (mode.blankLine) { return mode.blankLine(state) } + if (!mode.innerMode) { return } + var inner = innerMode(mode, state); + if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) } + } + + function readToken(mode, stream, state, inner) { + for (var i = 0; i < 10; i++) { + if (inner) { inner[0] = innerMode(mode, state).mode; } + var style = mode.token(stream, state); + if (stream.pos > stream.start) { return style } + } + throw new Error("Mode " + mode.name + " failed to advance stream.") + } + + var Token = function(stream, type, state) { + this.start = stream.start; this.end = stream.pos; + this.string = stream.current(); + this.type = type || null; + this.state = state; + }; + + // Utility for getTokenAt and getLineTokens + function takeToken(cm, pos, precise, asArray) { + var doc = cm.doc, mode = doc.mode, style; + pos = clipPos(doc, pos); + var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise); + var stream = new StringStream(line.text, cm.options.tabSize, context), tokens; + if (asArray) { tokens = []; } + while ((asArray || stream.pos < pos.ch) && !stream.eol()) { + stream.start = stream.pos; + style = readToken(mode, stream, context.state); + if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); } + } + return asArray ? tokens : new Token(stream, style, context.state) + } + + function extractLineClasses(type, output) { + if (type) { for (;;) { + var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/); + if (!lineClass) { break } + type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length); + var prop = lineClass[1] ? "bgClass" : "textClass"; + if (output[prop] == null) + { output[prop] = lineClass[2]; } + else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop])) + { output[prop] += " " + lineClass[2]; } + } } + return type + } + + // Run the given mode's parser over a line, calling f for each token. + function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) { + var flattenSpans = mode.flattenSpans; + if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; } + var curStart = 0, curStyle = null; + var stream = new StringStream(text, cm.options.tabSize, context), style; + var inner = cm.options.addModeClass && [null]; + if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); } + while (!stream.eol()) { + if (stream.pos > cm.options.maxHighlightLength) { + flattenSpans = false; + if (forceToEnd) { processLine(cm, text, context, stream.pos); } + stream.pos = text.length; + style = null; + } else { + style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses); + } + if (inner) { + var mName = inner[0].name; + if (mName) { style = "m-" + (style ? mName + " " + style : mName); } + } + if (!flattenSpans || curStyle != style) { + while (curStart < stream.start) { + curStart = Math.min(stream.start, curStart + 5000); + f(curStart, curStyle); + } + curStyle = style; + } + stream.start = stream.pos; + } + while (curStart < stream.pos) { + // Webkit seems to refuse to render text nodes longer than 57444 + // characters, and returns inaccurate measurements in nodes + // starting around 5000 chars. + var pos = Math.min(stream.pos, curStart + 5000); + f(pos, curStyle); + curStart = pos; + } + } + + // Finds the line to start with when starting a parse. Tries to + // find a line with a stateAfter, so that it can start with a + // valid state. If that fails, it returns the line with the + // smallest indentation, which tends to need the least context to + // parse correctly. + function findStartLine(cm, n, precise) { + var minindent, minline, doc = cm.doc; + var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100); + for (var search = n; search > lim; --search) { + if (search <= doc.first) { return doc.first } + var line = getLine(doc, search - 1), after = line.stateAfter; + if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier)) + { return search } + var indented = countColumn(line.text, null, cm.options.tabSize); + if (minline == null || minindent > indented) { + minline = search - 1; + minindent = indented; + } + } + return minline + } + + function retreatFrontier(doc, n) { + doc.modeFrontier = Math.min(doc.modeFrontier, n); + if (doc.highlightFrontier < n - 10) { return } + var start = doc.first; + for (var line = n - 1; line > start; line--) { + var saved = getLine(doc, line).stateAfter; + // change is on 3 + // state on line 1 looked ahead 2 -- so saw 3 + // test 1 + 2 < 3 should cover this + if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) { + start = line + 1; + break + } + } + doc.highlightFrontier = Math.min(doc.highlightFrontier, start); + } + + // Optimize some code when these features are not used. + var sawReadOnlySpans = false, sawCollapsedSpans = false; + + function seeReadOnlySpans() { + sawReadOnlySpans = true; + } + + function seeCollapsedSpans() { + sawCollapsedSpans = true; + } + + // TEXTMARKER SPANS + + function MarkedSpan(marker, from, to) { + this.marker = marker; + this.from = from; this.to = to; + } + + // Search an array of spans for a span matching the given marker. + function getMarkedSpanFor(spans, marker) { + if (spans) { for (var i = 0; i < spans.length; ++i) { + var span = spans[i]; + if (span.marker == marker) { return span } + } } + } + // Remove a span from an array, returning undefined if no spans are + // left (we don't store arrays for lines without spans). + function removeMarkedSpan(spans, span) { + var r; + for (var i = 0; i < spans.length; ++i) + { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } } + return r + } + // Add a span to a line. + function addMarkedSpan(line, span) { + line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]; + span.marker.attachLine(line); + } + + // Used for the algorithm that adjusts markers for a change in the + // document. These functions cut an array of spans at a given + // character position, returning an array of remaining chunks (or + // undefined if nothing remains). + function markedSpansBefore(old, startCh, isInsert) { + var nw; + if (old) { for (var i = 0; i < old.length; ++i) { + var span = old[i], marker = span.marker; + var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh); + if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) { + var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh) + ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to)); + } + } } + return nw + } + function markedSpansAfter(old, endCh, isInsert) { + var nw; + if (old) { for (var i = 0; i < old.length; ++i) { + var span = old[i], marker = span.marker; + var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh); + if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) { + var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh) + ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh, + span.to == null ? null : span.to - endCh)); + } + } } + return nw + } + + // Given a change object, compute the new set of marker spans that + // cover the line in which the change took place. Removes spans + // entirely within the change, reconnects spans belonging to the + // same marker that appear on both sides of the change, and cuts off + // spans partially within the change. Returns an array of span + // arrays with one element for each line in (after) the change. + function stretchSpansOverChange(doc, change) { + if (change.full) { return null } + var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans; + var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans; + if (!oldFirst && !oldLast) { return null } + + var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0; + // Get the spans that 'stick out' on both sides + var first = markedSpansBefore(oldFirst, startCh, isInsert); + var last = markedSpansAfter(oldLast, endCh, isInsert); + + // Next, merge those two ends + var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0); + if (first) { + // Fix up .to properties of first + for (var i = 0; i < first.length; ++i) { + var span = first[i]; + if (span.to == null) { + var found = getMarkedSpanFor(last, span.marker); + if (!found) { span.to = startCh; } + else if (sameLine) { span.to = found.to == null ? null : found.to + offset; } + } + } + } + if (last) { + // Fix up .from in last (or move them into first in case of sameLine) + for (var i$1 = 0; i$1 < last.length; ++i$1) { + var span$1 = last[i$1]; + if (span$1.to != null) { span$1.to += offset; } + if (span$1.from == null) { + var found$1 = getMarkedSpanFor(first, span$1.marker); + if (!found$1) { + span$1.from = offset; + if (sameLine) { (first || (first = [])).push(span$1); } + } + } else { + span$1.from += offset; + if (sameLine) { (first || (first = [])).push(span$1); } + } + } + } + // Make sure we didn't create any zero-length spans + if (first) { first = clearEmptySpans(first); } + if (last && last != first) { last = clearEmptySpans(last); } + + var newMarkers = [first]; + if (!sameLine) { + // Fill gap with whole-line-spans + var gap = change.text.length - 2, gapMarkers; + if (gap > 0 && first) + { for (var i$2 = 0; i$2 < first.length; ++i$2) + { if (first[i$2].to == null) + { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); } } } + for (var i$3 = 0; i$3 < gap; ++i$3) + { newMarkers.push(gapMarkers); } + newMarkers.push(last); + } + return newMarkers + } + + // Remove spans that are empty and don't have a clearWhenEmpty + // option of false. + function clearEmptySpans(spans) { + for (var i = 0; i < spans.length; ++i) { + var span = spans[i]; + if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false) + { spans.splice(i--, 1); } + } + if (!spans.length) { return null } + return spans + } + + // Used to 'clip' out readOnly ranges when making a change. + function removeReadOnlyRanges(doc, from, to) { + var markers = null; + doc.iter(from.line, to.line + 1, function (line) { + if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) { + var mark = line.markedSpans[i].marker; + if (mark.readOnly && (!markers || indexOf(markers, mark) == -1)) + { (markers || (markers = [])).push(mark); } + } } + }); + if (!markers) { return null } + var parts = [{from: from, to: to}]; + for (var i = 0; i < markers.length; ++i) { + var mk = markers[i], m = mk.find(0); + for (var j = 0; j < parts.length; ++j) { + var p = parts[j]; + if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue } + var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to); + if (dfrom < 0 || !mk.inclusiveLeft && !dfrom) + { newParts.push({from: p.from, to: m.from}); } + if (dto > 0 || !mk.inclusiveRight && !dto) + { newParts.push({from: m.to, to: p.to}); } + parts.splice.apply(parts, newParts); + j += newParts.length - 3; + } + } + return parts + } + + // Connect or disconnect spans from a line. + function detachMarkedSpans(line) { + var spans = line.markedSpans; + if (!spans) { return } + for (var i = 0; i < spans.length; ++i) + { spans[i].marker.detachLine(line); } + line.markedSpans = null; + } + function attachMarkedSpans(line, spans) { + if (!spans) { return } + for (var i = 0; i < spans.length; ++i) + { spans[i].marker.attachLine(line); } + line.markedSpans = spans; + } + + // Helpers used when computing which overlapping collapsed span + // counts as the larger one. + function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 } + function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 } + + // Returns a number indicating which of two overlapping collapsed + // spans is larger (and thus includes the other). Falls back to + // comparing ids when the spans cover exactly the same range. + function compareCollapsedMarkers(a, b) { + var lenDiff = a.lines.length - b.lines.length; + if (lenDiff != 0) { return lenDiff } + var aPos = a.find(), bPos = b.find(); + var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b); + if (fromCmp) { return -fromCmp } + var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b); + if (toCmp) { return toCmp } + return b.id - a.id + } + + // Find out whether a line ends or starts in a collapsed span. If + // so, return the marker for that span. + function collapsedSpanAtSide(line, start) { + var sps = sawCollapsedSpans && line.markedSpans, found; + if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) { + sp = sps[i]; + if (sp.marker.collapsed && (start ? sp.from : sp.to) == null && + (!found || compareCollapsedMarkers(found, sp.marker) < 0)) + { found = sp.marker; } + } } + return found + } + function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) } + function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) } + + function collapsedSpanAround(line, ch) { + var sps = sawCollapsedSpans && line.markedSpans, found; + if (sps) { for (var i = 0; i < sps.length; ++i) { + var sp = sps[i]; + if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) && + (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; } + } } + return found + } + + // Test whether there exists a collapsed span that partially + // overlaps (covers the start or end, but not both) of a new span. + // Such overlap is not allowed. + function conflictingCollapsedRange(doc, lineNo, from, to, marker) { + var line = getLine(doc, lineNo); + var sps = sawCollapsedSpans && line.markedSpans; + if (sps) { for (var i = 0; i < sps.length; ++i) { + var sp = sps[i]; + if (!sp.marker.collapsed) { continue } + var found = sp.marker.find(0); + var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker); + var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker); + if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue } + if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) || + fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0)) + { return true } + } } + } + + // A visual line is a line as drawn on the screen. Folding, for + // example, can cause multiple logical lines to appear on the same + // visual line. This finds the start of the visual line that the + // given line is part of (usually that is the line itself). + function visualLine(line) { + var merged; + while (merged = collapsedSpanAtStart(line)) + { line = merged.find(-1, true).line; } + return line + } + + function visualLineEnd(line) { + var merged; + while (merged = collapsedSpanAtEnd(line)) + { line = merged.find(1, true).line; } + return line + } + + // Returns an array of logical lines that continue the visual line + // started by the argument, or undefined if there are no such lines. + function visualLineContinued(line) { + var merged, lines; + while (merged = collapsedSpanAtEnd(line)) { + line = merged.find(1, true).line + ;(lines || (lines = [])).push(line); + } + return lines + } + + // Get the line number of the start of the visual line that the + // given line number is part of. + function visualLineNo(doc, lineN) { + var line = getLine(doc, lineN), vis = visualLine(line); + if (line == vis) { return lineN } + return lineNo(vis) + } + + // Get the line number of the start of the next visual line after + // the given line. + function visualLineEndNo(doc, lineN) { + if (lineN > doc.lastLine()) { return lineN } + var line = getLine(doc, lineN), merged; + if (!lineIsHidden(doc, line)) { return lineN } + while (merged = collapsedSpanAtEnd(line)) + { line = merged.find(1, true).line; } + return lineNo(line) + 1 + } + + // Compute whether a line is hidden. Lines count as hidden when they + // are part of a visual line that starts with another line, or when + // they are entirely covered by collapsed, non-widget span. + function lineIsHidden(doc, line) { + var sps = sawCollapsedSpans && line.markedSpans; + if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) { + sp = sps[i]; + if (!sp.marker.collapsed) { continue } + if (sp.from == null) { return true } + if (sp.marker.widgetNode) { continue } + if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp)) + { return true } + } } + } + function lineIsHiddenInner(doc, line, span) { + if (span.to == null) { + var end = span.marker.find(1, true); + return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker)) + } + if (span.marker.inclusiveRight && span.to == line.text.length) + { return true } + for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) { + sp = line.markedSpans[i]; + if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to && + (sp.to == null || sp.to != span.from) && + (sp.marker.inclusiveLeft || span.marker.inclusiveRight) && + lineIsHiddenInner(doc, line, sp)) { return true } + } + } + + // Find the height above the given line. + function heightAtLine(lineObj) { + lineObj = visualLine(lineObj); + + var h = 0, chunk = lineObj.parent; + for (var i = 0; i < chunk.lines.length; ++i) { + var line = chunk.lines[i]; + if (line == lineObj) { break } + else { h += line.height; } + } + for (var p = chunk.parent; p; chunk = p, p = chunk.parent) { + for (var i$1 = 0; i$1 < p.children.length; ++i$1) { + var cur = p.children[i$1]; + if (cur == chunk) { break } + else { h += cur.height; } + } + } + return h + } + + // Compute the character length of a line, taking into account + // collapsed ranges (see markText) that might hide parts, and join + // other lines onto it. + function lineLength(line) { + if (line.height == 0) { return 0 } + var len = line.text.length, merged, cur = line; + while (merged = collapsedSpanAtStart(cur)) { + var found = merged.find(0, true); + cur = found.from.line; + len += found.from.ch - found.to.ch; + } + cur = line; + while (merged = collapsedSpanAtEnd(cur)) { + var found$1 = merged.find(0, true); + len -= cur.text.length - found$1.from.ch; + cur = found$1.to.line; + len += cur.text.length - found$1.to.ch; + } + return len + } + + // Find the longest line in the document. + function findMaxLine(cm) { + var d = cm.display, doc = cm.doc; + d.maxLine = getLine(doc, doc.first); + d.maxLineLength = lineLength(d.maxLine); + d.maxLineChanged = true; + doc.iter(function (line) { + var len = lineLength(line); + if (len > d.maxLineLength) { + d.maxLineLength = len; + d.maxLine = line; + } + }); + } + + // LINE DATA STRUCTURE + + // Line objects. These hold state related to a line, including + // highlighting info (the styles array). + var Line = function(text, markedSpans, estimateHeight) { + this.text = text; + attachMarkedSpans(this, markedSpans); + this.height = estimateHeight ? estimateHeight(this) : 1; + }; + + Line.prototype.lineNo = function () { return lineNo(this) }; + eventMixin(Line); + + // Change the content (text, markers) of a line. Automatically + // invalidates cached information and tries to re-estimate the + // line's height. + function updateLine(line, text, markedSpans, estimateHeight) { + line.text = text; + if (line.stateAfter) { line.stateAfter = null; } + if (line.styles) { line.styles = null; } + if (line.order != null) { line.order = null; } + detachMarkedSpans(line); + attachMarkedSpans(line, markedSpans); + var estHeight = estimateHeight ? estimateHeight(line) : 1; + if (estHeight != line.height) { updateLineHeight(line, estHeight); } + } + + // Detach a line from the document tree and its markers. + function cleanUpLine(line) { + line.parent = null; + detachMarkedSpans(line); + } + + // Convert a style as returned by a mode (either null, or a string + // containing one or more styles) to a CSS style. This is cached, + // and also looks for line-wide styles. + var styleToClassCache = {}, styleToClassCacheWithMode = {}; + function interpretTokenStyle(style, options) { + if (!style || /^\s*$/.test(style)) { return null } + var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache; + return cache[style] || + (cache[style] = style.replace(/\S+/g, "cm-$&")) + } + + // Render the DOM representation of the text of a line. Also builds + // up a 'line map', which points at the DOM nodes that represent + // specific stretches of text, and is used by the measuring code. + // The returned object contains the DOM node, this map, and + // information about line-wide styles that were set by the mode. + function buildLineContent(cm, lineView) { + // The padding-right forces the element to have a 'border', which + // is needed on Webkit to be able to get line-level bounding + // rectangles for it (in measureChar). + var content = eltP("span", null, null, webkit ? "padding-right: .1px" : null); + var builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content, + col: 0, pos: 0, cm: cm, + trailingSpace: false, + splitSpaces: cm.getOption("lineWrapping")}; + lineView.measure = {}; + + // Iterate over the logical lines that make up this visual line. + for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) { + var line = i ? lineView.rest[i - 1] : lineView.line, order = (void 0); + builder.pos = 0; + builder.addToken = buildToken; + // Optionally wire in some hacks into the token-rendering + // algorithm, to deal with browser quirks. + if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction))) + { builder.addToken = buildTokenBadBidi(builder.addToken, order); } + builder.map = []; + var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line); + insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate)); + if (line.styleClasses) { + if (line.styleClasses.bgClass) + { builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); } + if (line.styleClasses.textClass) + { builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); } + } + + // Ensure at least a single node is present, for measuring. + if (builder.map.length == 0) + { builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); } + + // Store the map and a cache object for the current logical line + if (i == 0) { + lineView.measure.map = builder.map; + lineView.measure.cache = {}; + } else { + (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map) + ;(lineView.measure.caches || (lineView.measure.caches = [])).push({}); + } + } + + // See issue #2901 + if (webkit) { + var last = builder.content.lastChild; + if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab"))) + { builder.content.className = "cm-tab-wrap-hack"; } + } + + signal(cm, "renderLine", cm, lineView.line, builder.pre); + if (builder.pre.className) + { builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); } + + return builder + } + + function defaultSpecialCharPlaceholder(ch) { + var token = elt("span", "\u2022", "cm-invalidchar"); + token.title = "\\u" + ch.charCodeAt(0).toString(16); + token.setAttribute("aria-label", token.title); + return token + } + + // Build up the DOM representation for a single token, and add it to + // the line map. Takes care to render special characters separately. + function buildToken(builder, text, style, startStyle, endStyle, css, attributes) { + if (!text) { return } + var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text; + var special = builder.cm.state.specialChars, mustWrap = false; + var content; + if (!special.test(text)) { + builder.col += text.length; + content = document.createTextNode(displayText); + builder.map.push(builder.pos, builder.pos + text.length, content); + if (ie && ie_version < 9) { mustWrap = true; } + builder.pos += text.length; + } else { + content = document.createDocumentFragment(); + var pos = 0; + while (true) { + special.lastIndex = pos; + var m = special.exec(text); + var skipped = m ? m.index - pos : text.length - pos; + if (skipped) { + var txt = document.createTextNode(displayText.slice(pos, pos + skipped)); + if (ie && ie_version < 9) { content.appendChild(elt("span", [txt])); } + else { content.appendChild(txt); } + builder.map.push(builder.pos, builder.pos + skipped, txt); + builder.col += skipped; + builder.pos += skipped; + } + if (!m) { break } + pos += skipped + 1; + var txt$1 = (void 0); + if (m[0] == "\t") { + var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize; + txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")); + txt$1.setAttribute("role", "presentation"); + txt$1.setAttribute("cm-text", "\t"); + builder.col += tabWidth; + } else if (m[0] == "\r" || m[0] == "\n") { + txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar")); + txt$1.setAttribute("cm-text", m[0]); + builder.col += 1; + } else { + txt$1 = builder.cm.options.specialCharPlaceholder(m[0]); + txt$1.setAttribute("cm-text", m[0]); + if (ie && ie_version < 9) { content.appendChild(elt("span", [txt$1])); } + else { content.appendChild(txt$1); } + builder.col += 1; + } + builder.map.push(builder.pos, builder.pos + 1, txt$1); + builder.pos++; + } + } + builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32; + if (style || startStyle || endStyle || mustWrap || css || attributes) { + var fullStyle = style || ""; + if (startStyle) { fullStyle += startStyle; } + if (endStyle) { fullStyle += endStyle; } + var token = elt("span", [content], fullStyle, css); + if (attributes) { + for (var attr in attributes) { if (attributes.hasOwnProperty(attr) && attr != "style" && attr != "class") + { token.setAttribute(attr, attributes[attr]); } } + } + return builder.content.appendChild(token) + } + builder.content.appendChild(content); + } + + // Change some spaces to NBSP to prevent the browser from collapsing + // trailing spaces at the end of a line when rendering text (issue #1362). + function splitSpaces(text, trailingBefore) { + if (text.length > 1 && !/ /.test(text)) { return text } + var spaceBefore = trailingBefore, result = ""; + for (var i = 0; i < text.length; i++) { + var ch = text.charAt(i); + if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32)) + { ch = "\u00a0"; } + result += ch; + spaceBefore = ch == " "; + } + return result + } + + // Work around nonsense dimensions being reported for stretches of + // right-to-left text. + function buildTokenBadBidi(inner, order) { + return function (builder, text, style, startStyle, endStyle, css, attributes) { + style = style ? style + " cm-force-border" : "cm-force-border"; + var start = builder.pos, end = start + text.length; + for (;;) { + // Find the part that overlaps with the start of this text + var part = (void 0); + for (var i = 0; i < order.length; i++) { + part = order[i]; + if (part.to > start && part.from <= start) { break } + } + if (part.to >= end) { return inner(builder, text, style, startStyle, endStyle, css, attributes) } + inner(builder, text.slice(0, part.to - start), style, startStyle, null, css, attributes); + startStyle = null; + text = text.slice(part.to - start); + start = part.to; + } + } + } + + function buildCollapsedSpan(builder, size, marker, ignoreWidget) { + var widget = !ignoreWidget && marker.widgetNode; + if (widget) { builder.map.push(builder.pos, builder.pos + size, widget); } + if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) { + if (!widget) + { widget = builder.content.appendChild(document.createElement("span")); } + widget.setAttribute("cm-marker", marker.id); + } + if (widget) { + builder.cm.display.input.setUneditable(widget); + builder.content.appendChild(widget); + } + builder.pos += size; + builder.trailingSpace = false; + } + + // Outputs a number of spans to make up a line, taking highlighting + // and marked text into account. + function insertLineContent(line, builder, styles) { + var spans = line.markedSpans, allText = line.text, at = 0; + if (!spans) { + for (var i$1 = 1; i$1 < styles.length; i$1+=2) + { builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1+1], builder.cm.options)); } + return + } + + var len = allText.length, pos = 0, i = 1, text = "", style, css; + var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed, attributes; + for (;;) { + if (nextChange == pos) { // Update current marker set + spanStyle = spanEndStyle = spanStartStyle = css = ""; + attributes = null; + collapsed = null; nextChange = Infinity; + var foundBookmarks = [], endStyles = (void 0); + for (var j = 0; j < spans.length; ++j) { + var sp = spans[j], m = sp.marker; + if (m.type == "bookmark" && sp.from == pos && m.widgetNode) { + foundBookmarks.push(m); + } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) { + if (sp.to != null && sp.to != pos && nextChange > sp.to) { + nextChange = sp.to; + spanEndStyle = ""; + } + if (m.className) { spanStyle += " " + m.className; } + if (m.css) { css = (css ? css + ";" : "") + m.css; } + if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; } + if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); } + // support for the old title property + // https://github.com/codemirror/CodeMirror/pull/5673 + if (m.title) { (attributes || (attributes = {})).title = m.title; } + if (m.attributes) { + for (var attr in m.attributes) + { (attributes || (attributes = {}))[attr] = m.attributes[attr]; } + } + if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0)) + { collapsed = sp; } + } else if (sp.from > pos && nextChange > sp.from) { + nextChange = sp.from; + } + } + if (endStyles) { for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2) + { if (endStyles[j$1 + 1] == nextChange) { spanEndStyle += " " + endStyles[j$1]; } } } + + if (!collapsed || collapsed.from == pos) { for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2) + { buildCollapsedSpan(builder, 0, foundBookmarks[j$2]); } } + if (collapsed && (collapsed.from || 0) == pos) { + buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos, + collapsed.marker, collapsed.from == null); + if (collapsed.to == null) { return } + if (collapsed.to == pos) { collapsed = false; } + } + } + if (pos >= len) { break } + + var upto = Math.min(len, nextChange); + while (true) { + if (text) { + var end = pos + text.length; + if (!collapsed) { + var tokenText = end > upto ? text.slice(0, upto - pos) : text; + builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle, + spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", css, attributes); + } + if (end >= upto) {text = text.slice(upto - pos); pos = upto; break} + pos = end; + spanStartStyle = ""; + } + text = allText.slice(at, at = styles[i++]); + style = interpretTokenStyle(styles[i++], builder.cm.options); + } + } + } + + + // These objects are used to represent the visible (currently drawn) + // part of the document. A LineView may correspond to multiple + // logical lines, if those are connected by collapsed ranges. + function LineView(doc, line, lineN) { + // The starting line + this.line = line; + // Continuing lines, if any + this.rest = visualLineContinued(line); + // Number of logical lines in this visual line + this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1; + this.node = this.text = null; + this.hidden = lineIsHidden(doc, line); + } + + // Create a range of LineView objects for the given lines. + function buildViewArray(cm, from, to) { + var array = [], nextPos; + for (var pos = from; pos < to; pos = nextPos) { + var view = new LineView(cm.doc, getLine(cm.doc, pos), pos); + nextPos = pos + view.size; + array.push(view); + } + return array + } + + var operationGroup = null; + + function pushOperation(op) { + if (operationGroup) { + operationGroup.ops.push(op); + } else { + op.ownsGroup = operationGroup = { + ops: [op], + delayedCallbacks: [] + }; + } + } + + function fireCallbacksForOps(group) { + // Calls delayed callbacks and cursorActivity handlers until no + // new ones appear + var callbacks = group.delayedCallbacks, i = 0; + do { + for (; i < callbacks.length; i++) + { callbacks[i].call(null); } + for (var j = 0; j < group.ops.length; j++) { + var op = group.ops[j]; + if (op.cursorActivityHandlers) + { while (op.cursorActivityCalled < op.cursorActivityHandlers.length) + { op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); } } + } + } while (i < callbacks.length) + } + + function finishOperation(op, endCb) { + var group = op.ownsGroup; + if (!group) { return } + + try { fireCallbacksForOps(group); } + finally { + operationGroup = null; + endCb(group); + } + } + + var orphanDelayedCallbacks = null; + + // Often, we want to signal events at a point where we are in the + // middle of some work, but don't want the handler to start calling + // other methods on the editor, which might be in an inconsistent + // state or simply not expect any other events to happen. + // signalLater looks whether there are any handlers, and schedules + // them to be executed when the last operation ends, or, if no + // operation is active, when a timeout fires. + function signalLater(emitter, type /*, values...*/) { + var arr = getHandlers(emitter, type); + if (!arr.length) { return } + var args = Array.prototype.slice.call(arguments, 2), list; + if (operationGroup) { + list = operationGroup.delayedCallbacks; + } else if (orphanDelayedCallbacks) { + list = orphanDelayedCallbacks; + } else { + list = orphanDelayedCallbacks = []; + setTimeout(fireOrphanDelayed, 0); + } + var loop = function ( i ) { + list.push(function () { return arr[i].apply(null, args); }); + }; + + for (var i = 0; i < arr.length; ++i) + loop( i ); + } + + function fireOrphanDelayed() { + var delayed = orphanDelayedCallbacks; + orphanDelayedCallbacks = null; + for (var i = 0; i < delayed.length; ++i) { delayed[i](); } + } + + // When an aspect of a line changes, a string is added to + // lineView.changes. This updates the relevant part of the line's + // DOM structure. + function updateLineForChanges(cm, lineView, lineN, dims) { + for (var j = 0; j < lineView.changes.length; j++) { + var type = lineView.changes[j]; + if (type == "text") { updateLineText(cm, lineView); } + else if (type == "gutter") { updateLineGutter(cm, lineView, lineN, dims); } + else if (type == "class") { updateLineClasses(cm, lineView); } + else if (type == "widget") { updateLineWidgets(cm, lineView, dims); } + } + lineView.changes = null; + } + + // Lines with gutter elements, widgets or a background class need to + // be wrapped, and have the extra elements added to the wrapper div + function ensureLineWrapped(lineView) { + if (lineView.node == lineView.text) { + lineView.node = elt("div", null, null, "position: relative"); + if (lineView.text.parentNode) + { lineView.text.parentNode.replaceChild(lineView.node, lineView.text); } + lineView.node.appendChild(lineView.text); + if (ie && ie_version < 8) { lineView.node.style.zIndex = 2; } + } + return lineView.node + } + + function updateLineBackground(cm, lineView) { + var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass; + if (cls) { cls += " CodeMirror-linebackground"; } + if (lineView.background) { + if (cls) { lineView.background.className = cls; } + else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; } + } else if (cls) { + var wrap = ensureLineWrapped(lineView); + lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild); + cm.display.input.setUneditable(lineView.background); + } + } + + // Wrapper around buildLineContent which will reuse the structure + // in display.externalMeasured when possible. + function getLineContent(cm, lineView) { + var ext = cm.display.externalMeasured; + if (ext && ext.line == lineView.line) { + cm.display.externalMeasured = null; + lineView.measure = ext.measure; + return ext.built + } + return buildLineContent(cm, lineView) + } + + // Redraw the line's text. Interacts with the background and text + // classes because the mode may output tokens that influence these + // classes. + function updateLineText(cm, lineView) { + var cls = lineView.text.className; + var built = getLineContent(cm, lineView); + if (lineView.text == lineView.node) { lineView.node = built.pre; } + lineView.text.parentNode.replaceChild(built.pre, lineView.text); + lineView.text = built.pre; + if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) { + lineView.bgClass = built.bgClass; + lineView.textClass = built.textClass; + updateLineClasses(cm, lineView); + } else if (cls) { + lineView.text.className = cls; + } + } + + function updateLineClasses(cm, lineView) { + updateLineBackground(cm, lineView); + if (lineView.line.wrapClass) + { ensureLineWrapped(lineView).className = lineView.line.wrapClass; } + else if (lineView.node != lineView.text) + { lineView.node.className = ""; } + var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass; + lineView.text.className = textClass || ""; + } + + function updateLineGutter(cm, lineView, lineN, dims) { + if (lineView.gutter) { + lineView.node.removeChild(lineView.gutter); + lineView.gutter = null; + } + if (lineView.gutterBackground) { + lineView.node.removeChild(lineView.gutterBackground); + lineView.gutterBackground = null; + } + if (lineView.line.gutterClass) { + var wrap = ensureLineWrapped(lineView); + lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass, + ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + (dims.gutterTotalWidth) + "px")); + cm.display.input.setUneditable(lineView.gutterBackground); + wrap.insertBefore(lineView.gutterBackground, lineView.text); + } + var markers = lineView.line.gutterMarkers; + if (cm.options.lineNumbers || markers) { + var wrap$1 = ensureLineWrapped(lineView); + var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px")); + cm.display.input.setUneditable(gutterWrap); + wrap$1.insertBefore(gutterWrap, lineView.text); + if (lineView.line.gutterClass) + { gutterWrap.className += " " + lineView.line.gutterClass; } + if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"])) + { lineView.lineNumber = gutterWrap.appendChild( + elt("div", lineNumberFor(cm.options, lineN), + "CodeMirror-linenumber CodeMirror-gutter-elt", + ("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))); } + if (markers) { for (var k = 0; k < cm.display.gutterSpecs.length; ++k) { + var id = cm.display.gutterSpecs[k].className, found = markers.hasOwnProperty(id) && markers[id]; + if (found) + { gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", + ("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))); } + } } + } + } + + function updateLineWidgets(cm, lineView, dims) { + if (lineView.alignable) { lineView.alignable = null; } + var isWidget = classTest("CodeMirror-linewidget"); + for (var node = lineView.node.firstChild, next = (void 0); node; node = next) { + next = node.nextSibling; + if (isWidget.test(node.className)) { lineView.node.removeChild(node); } + } + insertLineWidgets(cm, lineView, dims); + } + + // Build a line's DOM representation from scratch + function buildLineElement(cm, lineView, lineN, dims) { + var built = getLineContent(cm, lineView); + lineView.text = lineView.node = built.pre; + if (built.bgClass) { lineView.bgClass = built.bgClass; } + if (built.textClass) { lineView.textClass = built.textClass; } + + updateLineClasses(cm, lineView); + updateLineGutter(cm, lineView, lineN, dims); + insertLineWidgets(cm, lineView, dims); + return lineView.node + } + + // A lineView may contain multiple logical lines (when merged by + // collapsed spans). The widgets for all of them need to be drawn. + function insertLineWidgets(cm, lineView, dims) { + insertLineWidgetsFor(cm, lineView.line, lineView, dims, true); + if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++) + { insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false); } } + } + + function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) { + if (!line.widgets) { return } + var wrap = ensureLineWrapped(lineView); + for (var i = 0, ws = line.widgets; i < ws.length; ++i) { + var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : "")); + if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true"); } + positionLineWidget(widget, node, lineView, dims); + cm.display.input.setUneditable(node); + if (allowAbove && widget.above) + { wrap.insertBefore(node, lineView.gutter || lineView.text); } + else + { wrap.appendChild(node); } + signalLater(widget, "redraw"); + } + } + + function positionLineWidget(widget, node, lineView, dims) { + if (widget.noHScroll) { + (lineView.alignable || (lineView.alignable = [])).push(node); + var width = dims.wrapperWidth; + node.style.left = dims.fixedPos + "px"; + if (!widget.coverGutter) { + width -= dims.gutterTotalWidth; + node.style.paddingLeft = dims.gutterTotalWidth + "px"; + } + node.style.width = width + "px"; + } + if (widget.coverGutter) { + node.style.zIndex = 5; + node.style.position = "relative"; + if (!widget.noHScroll) { node.style.marginLeft = -dims.gutterTotalWidth + "px"; } + } + } + + function widgetHeight(widget) { + if (widget.height != null) { return widget.height } + var cm = widget.doc.cm; + if (!cm) { return 0 } + if (!contains(document.body, widget.node)) { + var parentStyle = "position: relative;"; + if (widget.coverGutter) + { parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; } + if (widget.noHScroll) + { parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; } + removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle)); + } + return widget.height = widget.node.parentNode.offsetHeight + } + + // Return true when the given mouse event happened in a widget + function eventInWidget(display, e) { + for (var n = e_target(e); n != display.wrapper; n = n.parentNode) { + if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") || + (n.parentNode == display.sizer && n != display.mover)) + { return true } + } + } + + // POSITION MEASUREMENT + + function paddingTop(display) {return display.lineSpace.offsetTop} + function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight} + function paddingH(display) { + if (display.cachedPaddingH) { return display.cachedPaddingH } + var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like")); + var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle; + var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}; + if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; } + return data + } + + function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth } + function displayWidth(cm) { + return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth + } + function displayHeight(cm) { + return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight + } + + // Ensure the lineView.wrapping.heights array is populated. This is + // an array of bottom offsets for the lines that make up a drawn + // line. When lineWrapping is on, there might be more than one + // height. + function ensureLineHeights(cm, lineView, rect) { + var wrapping = cm.options.lineWrapping; + var curWidth = wrapping && displayWidth(cm); + if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) { + var heights = lineView.measure.heights = []; + if (wrapping) { + lineView.measure.width = curWidth; + var rects = lineView.text.firstChild.getClientRects(); + for (var i = 0; i < rects.length - 1; i++) { + var cur = rects[i], next = rects[i + 1]; + if (Math.abs(cur.bottom - next.bottom) > 2) + { heights.push((cur.bottom + next.top) / 2 - rect.top); } + } + } + heights.push(rect.bottom - rect.top); + } + } + + // Find a line map (mapping character offsets to text nodes) and a + // measurement cache for the given line number. (A line view might + // contain multiple lines when collapsed ranges are present.) + function mapFromLineView(lineView, line, lineN) { + if (lineView.line == line) + { return {map: lineView.measure.map, cache: lineView.measure.cache} } + for (var i = 0; i < lineView.rest.length; i++) + { if (lineView.rest[i] == line) + { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } } + for (var i$1 = 0; i$1 < lineView.rest.length; i$1++) + { if (lineNo(lineView.rest[i$1]) > lineN) + { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } } + } + + // Render a line into the hidden node display.externalMeasured. Used + // when measurement is needed for a line that's not in the viewport. + function updateExternalMeasurement(cm, line) { + line = visualLine(line); + var lineN = lineNo(line); + var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN); + view.lineN = lineN; + var built = view.built = buildLineContent(cm, view); + view.text = built.pre; + removeChildrenAndAdd(cm.display.lineMeasure, built.pre); + return view + } + + // Get a {top, bottom, left, right} box (in line-local coordinates) + // for a given character. + function measureChar(cm, line, ch, bias) { + return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias) + } + + // Find a line view that corresponds to the given line number. + function findViewForLine(cm, lineN) { + if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) + { return cm.display.view[findViewIndex(cm, lineN)] } + var ext = cm.display.externalMeasured; + if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size) + { return ext } + } + + // Measurement can be split in two steps, the set-up work that + // applies to the whole line, and the measurement of the actual + // character. Functions like coordsChar, that need to do a lot of + // measurements in a row, can thus ensure that the set-up work is + // only done once. + function prepareMeasureForLine(cm, line) { + var lineN = lineNo(line); + var view = findViewForLine(cm, lineN); + if (view && !view.text) { + view = null; + } else if (view && view.changes) { + updateLineForChanges(cm, view, lineN, getDimensions(cm)); + cm.curOp.forceUpdate = true; + } + if (!view) + { view = updateExternalMeasurement(cm, line); } + + var info = mapFromLineView(view, line, lineN); + return { + line: line, view: view, rect: null, + map: info.map, cache: info.cache, before: info.before, + hasHeights: false + } + } + + // Given a prepared measurement object, measures the position of an + // actual character (or fetches it from the cache). + function measureCharPrepared(cm, prepared, ch, bias, varHeight) { + if (prepared.before) { ch = -1; } + var key = ch + (bias || ""), found; + if (prepared.cache.hasOwnProperty(key)) { + found = prepared.cache[key]; + } else { + if (!prepared.rect) + { prepared.rect = prepared.view.text.getBoundingClientRect(); } + if (!prepared.hasHeights) { + ensureLineHeights(cm, prepared.view, prepared.rect); + prepared.hasHeights = true; + } + found = measureCharInner(cm, prepared, ch, bias); + if (!found.bogus) { prepared.cache[key] = found; } + } + return {left: found.left, right: found.right, + top: varHeight ? found.rtop : found.top, + bottom: varHeight ? found.rbottom : found.bottom} + } + + var nullRect = {left: 0, right: 0, top: 0, bottom: 0}; + + function nodeAndOffsetInLineMap(map, ch, bias) { + var node, start, end, collapse, mStart, mEnd; + // First, search the line map for the text node corresponding to, + // or closest to, the target character. + for (var i = 0; i < map.length; i += 3) { + mStart = map[i]; + mEnd = map[i + 1]; + if (ch < mStart) { + start = 0; end = 1; + collapse = "left"; + } else if (ch < mEnd) { + start = ch - mStart; + end = start + 1; + } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) { + end = mEnd - mStart; + start = end - 1; + if (ch >= mEnd) { collapse = "right"; } + } + if (start != null) { + node = map[i + 2]; + if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right")) + { collapse = bias; } + if (bias == "left" && start == 0) + { while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) { + node = map[(i -= 3) + 2]; + collapse = "left"; + } } + if (bias == "right" && start == mEnd - mStart) + { while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) { + node = map[(i += 3) + 2]; + collapse = "right"; + } } + break + } + } + return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd} + } + + function getUsefulRect(rects, bias) { + var rect = nullRect; + if (bias == "left") { for (var i = 0; i < rects.length; i++) { + if ((rect = rects[i]).left != rect.right) { break } + } } else { for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) { + if ((rect = rects[i$1]).left != rect.right) { break } + } } + return rect + } + + function measureCharInner(cm, prepared, ch, bias) { + var place = nodeAndOffsetInLineMap(prepared.map, ch, bias); + var node = place.node, start = place.start, end = place.end, collapse = place.collapse; + + var rect; + if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates. + for (var i$1 = 0; i$1 < 4; i$1++) { // Retry a maximum of 4 times when nonsense rectangles are returned + while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { --start; } + while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { ++end; } + if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) + { rect = node.parentNode.getBoundingClientRect(); } + else + { rect = getUsefulRect(range(node, start, end).getClientRects(), bias); } + if (rect.left || rect.right || start == 0) { break } + end = start; + start = start - 1; + collapse = "right"; + } + if (ie && ie_version < 11) { rect = maybeUpdateRectForZooming(cm.display.measure, rect); } + } else { // If it is a widget, simply get the box for the whole widget. + if (start > 0) { collapse = bias = "right"; } + var rects; + if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1) + { rect = rects[bias == "right" ? rects.length - 1 : 0]; } + else + { rect = node.getBoundingClientRect(); } + } + if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) { + var rSpan = node.parentNode.getClientRects()[0]; + if (rSpan) + { rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}; } + else + { rect = nullRect; } + } + + var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top; + var mid = (rtop + rbot) / 2; + var heights = prepared.view.measure.heights; + var i = 0; + for (; i < heights.length - 1; i++) + { if (mid < heights[i]) { break } } + var top = i ? heights[i - 1] : 0, bot = heights[i]; + var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, + right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left, + top: top, bottom: bot}; + if (!rect.left && !rect.right) { result.bogus = true; } + if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; } + + return result + } + + // Work around problem with bounding client rects on ranges being + // returned incorrectly when zoomed on IE10 and below. + function maybeUpdateRectForZooming(measure, rect) { + if (!window.screen || screen.logicalXDPI == null || + screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure)) + { return rect } + var scaleX = screen.logicalXDPI / screen.deviceXDPI; + var scaleY = screen.logicalYDPI / screen.deviceYDPI; + return {left: rect.left * scaleX, right: rect.right * scaleX, + top: rect.top * scaleY, bottom: rect.bottom * scaleY} + } + + function clearLineMeasurementCacheFor(lineView) { + if (lineView.measure) { + lineView.measure.cache = {}; + lineView.measure.heights = null; + if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++) + { lineView.measure.caches[i] = {}; } } + } + } + + function clearLineMeasurementCache(cm) { + cm.display.externalMeasure = null; + removeChildren(cm.display.lineMeasure); + for (var i = 0; i < cm.display.view.length; i++) + { clearLineMeasurementCacheFor(cm.display.view[i]); } + } + + function clearCaches(cm) { + clearLineMeasurementCache(cm); + cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null; + if (!cm.options.lineWrapping) { cm.display.maxLineChanged = true; } + cm.display.lineNumChars = null; + } + + function pageScrollX() { + // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206 + // which causes page_Offset and bounding client rects to use + // different reference viewports and invalidate our calculations. + if (chrome && android) { return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft)) } + return window.pageXOffset || (document.documentElement || document.body).scrollLeft + } + function pageScrollY() { + if (chrome && android) { return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop)) } + return window.pageYOffset || (document.documentElement || document.body).scrollTop + } + + function widgetTopHeight(lineObj) { + var height = 0; + if (lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above) + { height += widgetHeight(lineObj.widgets[i]); } } } + return height + } + + // Converts a {top, bottom, left, right} box from line-local + // coordinates into another coordinate system. Context may be one of + // "line", "div" (display.lineDiv), "local"./null (editor), "window", + // or "page". + function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) { + if (!includeWidgets) { + var height = widgetTopHeight(lineObj); + rect.top += height; rect.bottom += height; + } + if (context == "line") { return rect } + if (!context) { context = "local"; } + var yOff = heightAtLine(lineObj); + if (context == "local") { yOff += paddingTop(cm.display); } + else { yOff -= cm.display.viewOffset; } + if (context == "page" || context == "window") { + var lOff = cm.display.lineSpace.getBoundingClientRect(); + yOff += lOff.top + (context == "window" ? 0 : pageScrollY()); + var xOff = lOff.left + (context == "window" ? 0 : pageScrollX()); + rect.left += xOff; rect.right += xOff; + } + rect.top += yOff; rect.bottom += yOff; + return rect + } + + // Coverts a box from "div" coords to another coordinate system. + // Context may be "window", "page", "div", or "local"./null. + function fromCoordSystem(cm, coords, context) { + if (context == "div") { return coords } + var left = coords.left, top = coords.top; + // First move into "page" coordinate system + if (context == "page") { + left -= pageScrollX(); + top -= pageScrollY(); + } else if (context == "local" || !context) { + var localBox = cm.display.sizer.getBoundingClientRect(); + left += localBox.left; + top += localBox.top; + } + + var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect(); + return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top} + } + + function charCoords(cm, pos, context, lineObj, bias) { + if (!lineObj) { lineObj = getLine(cm.doc, pos.line); } + return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context) + } + + // Returns a box for a given cursor position, which may have an + // 'other' property containing the position of the secondary cursor + // on a bidi boundary. + // A cursor Pos(line, char, "before") is on the same visual line as `char - 1` + // and after `char - 1` in writing order of `char - 1` + // A cursor Pos(line, char, "after") is on the same visual line as `char` + // and before `char` in writing order of `char` + // Examples (upper-case letters are RTL, lower-case are LTR): + // Pos(0, 1, ...) + // before after + // ab a|b a|b + // aB a|B aB| + // Ab |Ab A|b + // AB B|A B|A + // Every position after the last character on a line is considered to stick + // to the last character on the line. + function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) { + lineObj = lineObj || getLine(cm.doc, pos.line); + if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); } + function get(ch, right) { + var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight); + if (right) { m.left = m.right; } else { m.right = m.left; } + return intoCoordSystem(cm, lineObj, m, context) + } + var order = getOrder(lineObj, cm.doc.direction), ch = pos.ch, sticky = pos.sticky; + if (ch >= lineObj.text.length) { + ch = lineObj.text.length; + sticky = "before"; + } else if (ch <= 0) { + ch = 0; + sticky = "after"; + } + if (!order) { return get(sticky == "before" ? ch - 1 : ch, sticky == "before") } + + function getBidi(ch, partPos, invert) { + var part = order[partPos], right = part.level == 1; + return get(invert ? ch - 1 : ch, right != invert) + } + var partPos = getBidiPartAt(order, ch, sticky); + var other = bidiOther; + var val = getBidi(ch, partPos, sticky == "before"); + if (other != null) { val.other = getBidi(ch, other, sticky != "before"); } + return val + } + + // Used to cheaply estimate the coordinates for a position. Used for + // intermediate scroll updates. + function estimateCoords(cm, pos) { + var left = 0; + pos = clipPos(cm.doc, pos); + if (!cm.options.lineWrapping) { left = charWidth(cm.display) * pos.ch; } + var lineObj = getLine(cm.doc, pos.line); + var top = heightAtLine(lineObj) + paddingTop(cm.display); + return {left: left, right: left, top: top, bottom: top + lineObj.height} + } + + // Positions returned by coordsChar contain some extra information. + // xRel is the relative x position of the input coordinates compared + // to the found position (so xRel > 0 means the coordinates are to + // the right of the character position, for example). When outside + // is true, that means the coordinates lie outside the line's + // vertical range. + function PosWithInfo(line, ch, sticky, outside, xRel) { + var pos = Pos(line, ch, sticky); + pos.xRel = xRel; + if (outside) { pos.outside = outside; } + return pos + } + + // Compute the character position closest to the given coordinates. + // Input must be lineSpace-local ("div" coordinate system). + function coordsChar(cm, x, y) { + var doc = cm.doc; + y += cm.display.viewOffset; + if (y < 0) { return PosWithInfo(doc.first, 0, null, -1, -1) } + var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1; + if (lineN > last) + { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1) } + if (x < 0) { x = 0; } + + var lineObj = getLine(doc, lineN); + for (;;) { + var found = coordsCharInner(cm, lineObj, lineN, x, y); + var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0)); + if (!collapsed) { return found } + var rangeEnd = collapsed.find(1); + if (rangeEnd.line == lineN) { return rangeEnd } + lineObj = getLine(doc, lineN = rangeEnd.line); + } + } + + function wrappedLineExtent(cm, lineObj, preparedMeasure, y) { + y -= widgetTopHeight(lineObj); + var end = lineObj.text.length; + var begin = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y; }, end, 0); + end = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch).top > y; }, begin, end); + return {begin: begin, end: end} + } + + function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) { + if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); } + var targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top; + return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop) + } + + // Returns true if the given side of a box is after the given + // coordinates, in top-to-bottom, left-to-right order. + function boxIsAfter(box, x, y, left) { + return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x + } + + function coordsCharInner(cm, lineObj, lineNo, x, y) { + // Move y into line-local coordinate space + y -= heightAtLine(lineObj); + var preparedMeasure = prepareMeasureForLine(cm, lineObj); + // When directly calling `measureCharPrepared`, we have to adjust + // for the widgets at this line. + var widgetHeight = widgetTopHeight(lineObj); + var begin = 0, end = lineObj.text.length, ltr = true; + + var order = getOrder(lineObj, cm.doc.direction); + // If the line isn't plain left-to-right text, first figure out + // which bidi section the coordinates fall into. + if (order) { + var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart) + (cm, lineObj, lineNo, preparedMeasure, order, x, y); + ltr = part.level != 1; + // The awkward -1 offsets are needed because findFirst (called + // on these below) will treat its first bound as inclusive, + // second as exclusive, but we want to actually address the + // characters in the part's range + begin = ltr ? part.from : part.to - 1; + end = ltr ? part.to : part.from - 1; + } + + // A binary search to find the first character whose bounding box + // starts after the coordinates. If we run across any whose box wrap + // the coordinates, store that. + var chAround = null, boxAround = null; + var ch = findFirst(function (ch) { + var box = measureCharPrepared(cm, preparedMeasure, ch); + box.top += widgetHeight; box.bottom += widgetHeight; + if (!boxIsAfter(box, x, y, false)) { return false } + if (box.top <= y && box.left <= x) { + chAround = ch; + boxAround = box; + } + return true + }, begin, end); + + var baseX, sticky, outside = false; + // If a box around the coordinates was found, use that + if (boxAround) { + // Distinguish coordinates nearer to the left or right side of the box + var atLeft = x - boxAround.left < boxAround.right - x, atStart = atLeft == ltr; + ch = chAround + (atStart ? 0 : 1); + sticky = atStart ? "after" : "before"; + baseX = atLeft ? boxAround.left : boxAround.right; + } else { + // (Adjust for extended bound, if necessary.) + if (!ltr && (ch == end || ch == begin)) { ch++; } + // To determine which side to associate with, get the box to the + // left of the character and compare it's vertical position to the + // coordinates + sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" : + (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight <= y) == ltr ? + "after" : "before"; + // Now get accurate coordinates for this place, in order to get a + // base X position + var coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure); + baseX = coords.left; + outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0; + } + + ch = skipExtendingChars(lineObj.text, ch, 1); + return PosWithInfo(lineNo, ch, sticky, outside, x - baseX) + } + + function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) { + // Bidi parts are sorted left-to-right, and in a non-line-wrapping + // situation, we can take this ordering to correspond to the visual + // ordering. This finds the first part whose end is after the given + // coordinates. + var index = findFirst(function (i) { + var part = order[i], ltr = part.level != 1; + return boxIsAfter(cursorCoords(cm, Pos(lineNo, ltr ? part.to : part.from, ltr ? "before" : "after"), + "line", lineObj, preparedMeasure), x, y, true) + }, 0, order.length - 1); + var part = order[index]; + // If this isn't the first part, the part's start is also after + // the coordinates, and the coordinates aren't on the same line as + // that start, move one part back. + if (index > 0) { + var ltr = part.level != 1; + var start = cursorCoords(cm, Pos(lineNo, ltr ? part.from : part.to, ltr ? "after" : "before"), + "line", lineObj, preparedMeasure); + if (boxIsAfter(start, x, y, true) && start.top > y) + { part = order[index - 1]; } + } + return part + } + + function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) { + // In a wrapped line, rtl text on wrapping boundaries can do things + // that don't correspond to the ordering in our `order` array at + // all, so a binary search doesn't work, and we want to return a + // part that only spans one line so that the binary search in + // coordsCharInner is safe. As such, we first find the extent of the + // wrapped line, and then do a flat search in which we discard any + // spans that aren't on the line. + var ref = wrappedLineExtent(cm, lineObj, preparedMeasure, y); + var begin = ref.begin; + var end = ref.end; + if (/\s/.test(lineObj.text.charAt(end - 1))) { end--; } + var part = null, closestDist = null; + for (var i = 0; i < order.length; i++) { + var p = order[i]; + if (p.from >= end || p.to <= begin) { continue } + var ltr = p.level != 1; + var endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right; + // Weigh against spans ending before this, so that they are only + // picked if nothing ends after + var dist = endX < x ? x - endX + 1e9 : endX - x; + if (!part || closestDist > dist) { + part = p; + closestDist = dist; + } + } + if (!part) { part = order[order.length - 1]; } + // Clip the part to the wrapped line. + if (part.from < begin) { part = {from: begin, to: part.to, level: part.level}; } + if (part.to > end) { part = {from: part.from, to: end, level: part.level}; } + return part + } + + var measureText; + // Compute the default text height. + function textHeight(display) { + if (display.cachedTextHeight != null) { return display.cachedTextHeight } + if (measureText == null) { + measureText = elt("pre", null, "CodeMirror-line-like"); + // Measure a bunch of lines, for browsers that compute + // fractional heights. + for (var i = 0; i < 49; ++i) { + measureText.appendChild(document.createTextNode("x")); + measureText.appendChild(elt("br")); + } + measureText.appendChild(document.createTextNode("x")); + } + removeChildrenAndAdd(display.measure, measureText); + var height = measureText.offsetHeight / 50; + if (height > 3) { display.cachedTextHeight = height; } + removeChildren(display.measure); + return height || 1 + } + + // Compute the default character width. + function charWidth(display) { + if (display.cachedCharWidth != null) { return display.cachedCharWidth } + var anchor = elt("span", "xxxxxxxxxx"); + var pre = elt("pre", [anchor], "CodeMirror-line-like"); + removeChildrenAndAdd(display.measure, pre); + var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10; + if (width > 2) { display.cachedCharWidth = width; } + return width || 10 + } + + // Do a bulk-read of the DOM positions and sizes needed to draw the + // view, so that we don't interleave reading and writing to the DOM. + function getDimensions(cm) { + var d = cm.display, left = {}, width = {}; + var gutterLeft = d.gutters.clientLeft; + for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) { + var id = cm.display.gutterSpecs[i].className; + left[id] = n.offsetLeft + n.clientLeft + gutterLeft; + width[id] = n.clientWidth; + } + return {fixedPos: compensateForHScroll(d), + gutterTotalWidth: d.gutters.offsetWidth, + gutterLeft: left, + gutterWidth: width, + wrapperWidth: d.wrapper.clientWidth} + } + + // Computes display.scroller.scrollLeft + display.gutters.offsetWidth, + // but using getBoundingClientRect to get a sub-pixel-accurate + // result. + function compensateForHScroll(display) { + return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left + } + + // Returns a function that estimates the height of a line, to use as + // first approximation until the line becomes visible (and is thus + // properly measurable). + function estimateHeight(cm) { + var th = textHeight(cm.display), wrapping = cm.options.lineWrapping; + var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3); + return function (line) { + if (lineIsHidden(cm.doc, line)) { return 0 } + + var widgetsHeight = 0; + if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) { + if (line.widgets[i].height) { widgetsHeight += line.widgets[i].height; } + } } + + if (wrapping) + { return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th } + else + { return widgetsHeight + th } + } + } + + function estimateLineHeights(cm) { + var doc = cm.doc, est = estimateHeight(cm); + doc.iter(function (line) { + var estHeight = est(line); + if (estHeight != line.height) { updateLineHeight(line, estHeight); } + }); + } + + // Given a mouse event, find the corresponding position. If liberal + // is false, it checks whether a gutter or scrollbar was clicked, + // and returns null if it was. forRect is used by rectangular + // selections, and tries to estimate a character position even for + // coordinates beyond the right of the text. + function posFromMouse(cm, e, liberal, forRect) { + var display = cm.display; + if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { return null } + + var x, y, space = display.lineSpace.getBoundingClientRect(); + // Fails unpredictably on IE[67] when mouse is dragged around quickly. + try { x = e.clientX - space.left; y = e.clientY - space.top; } + catch (e$1) { return null } + var coords = coordsChar(cm, x, y), line; + if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) { + var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length; + coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff)); + } + return coords + } + + // Find the view element corresponding to a given line. Return null + // when the line isn't visible. + function findViewIndex(cm, n) { + if (n >= cm.display.viewTo) { return null } + n -= cm.display.viewFrom; + if (n < 0) { return null } + var view = cm.display.view; + for (var i = 0; i < view.length; i++) { + n -= view[i].size; + if (n < 0) { return i } + } + } + + // Updates the display.view data structure for a given change to the + // document. From and to are in pre-change coordinates. Lendiff is + // the amount of lines added or subtracted by the change. This is + // used for changes that span multiple lines, or change the way + // lines are divided into visual lines. regLineChange (below) + // registers single-line changes. + function regChange(cm, from, to, lendiff) { + if (from == null) { from = cm.doc.first; } + if (to == null) { to = cm.doc.first + cm.doc.size; } + if (!lendiff) { lendiff = 0; } + + var display = cm.display; + if (lendiff && to < display.viewTo && + (display.updateLineNumbers == null || display.updateLineNumbers > from)) + { display.updateLineNumbers = from; } + + cm.curOp.viewChanged = true; + + if (from >= display.viewTo) { // Change after + if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo) + { resetView(cm); } + } else if (to <= display.viewFrom) { // Change before + if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) { + resetView(cm); + } else { + display.viewFrom += lendiff; + display.viewTo += lendiff; + } + } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap + resetView(cm); + } else if (from <= display.viewFrom) { // Top overlap + var cut = viewCuttingPoint(cm, to, to + lendiff, 1); + if (cut) { + display.view = display.view.slice(cut.index); + display.viewFrom = cut.lineN; + display.viewTo += lendiff; + } else { + resetView(cm); + } + } else if (to >= display.viewTo) { // Bottom overlap + var cut$1 = viewCuttingPoint(cm, from, from, -1); + if (cut$1) { + display.view = display.view.slice(0, cut$1.index); + display.viewTo = cut$1.lineN; + } else { + resetView(cm); + } + } else { // Gap in the middle + var cutTop = viewCuttingPoint(cm, from, from, -1); + var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1); + if (cutTop && cutBot) { + display.view = display.view.slice(0, cutTop.index) + .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN)) + .concat(display.view.slice(cutBot.index)); + display.viewTo += lendiff; + } else { + resetView(cm); + } + } + + var ext = display.externalMeasured; + if (ext) { + if (to < ext.lineN) + { ext.lineN += lendiff; } + else if (from < ext.lineN + ext.size) + { display.externalMeasured = null; } + } + } + + // Register a change to a single line. Type must be one of "text", + // "gutter", "class", "widget" + function regLineChange(cm, line, type) { + cm.curOp.viewChanged = true; + var display = cm.display, ext = cm.display.externalMeasured; + if (ext && line >= ext.lineN && line < ext.lineN + ext.size) + { display.externalMeasured = null; } + + if (line < display.viewFrom || line >= display.viewTo) { return } + var lineView = display.view[findViewIndex(cm, line)]; + if (lineView.node == null) { return } + var arr = lineView.changes || (lineView.changes = []); + if (indexOf(arr, type) == -1) { arr.push(type); } + } + + // Clear the view. + function resetView(cm) { + cm.display.viewFrom = cm.display.viewTo = cm.doc.first; + cm.display.view = []; + cm.display.viewOffset = 0; + } + + function viewCuttingPoint(cm, oldN, newN, dir) { + var index = findViewIndex(cm, oldN), diff, view = cm.display.view; + if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size) + { return {index: index, lineN: newN} } + var n = cm.display.viewFrom; + for (var i = 0; i < index; i++) + { n += view[i].size; } + if (n != oldN) { + if (dir > 0) { + if (index == view.length - 1) { return null } + diff = (n + view[index].size) - oldN; + index++; + } else { + diff = n - oldN; + } + oldN += diff; newN += diff; + } + while (visualLineNo(cm.doc, newN) != newN) { + if (index == (dir < 0 ? 0 : view.length - 1)) { return null } + newN += dir * view[index - (dir < 0 ? 1 : 0)].size; + index += dir; + } + return {index: index, lineN: newN} + } + + // Force the view to cover a given range, adding empty view element + // or clipping off existing ones as needed. + function adjustView(cm, from, to) { + var display = cm.display, view = display.view; + if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) { + display.view = buildViewArray(cm, from, to); + display.viewFrom = from; + } else { + if (display.viewFrom > from) + { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); } + else if (display.viewFrom < from) + { display.view = display.view.slice(findViewIndex(cm, from)); } + display.viewFrom = from; + if (display.viewTo < to) + { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); } + else if (display.viewTo > to) + { display.view = display.view.slice(0, findViewIndex(cm, to)); } + } + display.viewTo = to; + } + + // Count the number of lines in the view whose DOM representation is + // out of date (or nonexistent). + function countDirtyView(cm) { + var view = cm.display.view, dirty = 0; + for (var i = 0; i < view.length; i++) { + var lineView = view[i]; + if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty; } + } + return dirty + } + + function updateSelection(cm) { + cm.display.input.showSelection(cm.display.input.prepareSelection()); + } + + function prepareSelection(cm, primary) { + if ( primary === void 0 ) primary = true; + + var doc = cm.doc, result = {}; + var curFragment = result.cursors = document.createDocumentFragment(); + var selFragment = result.selection = document.createDocumentFragment(); + + for (var i = 0; i < doc.sel.ranges.length; i++) { + if (!primary && i == doc.sel.primIndex) { continue } + var range = doc.sel.ranges[i]; + if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) { continue } + var collapsed = range.empty(); + if (collapsed || cm.options.showCursorWhenSelecting) + { drawSelectionCursor(cm, range.head, curFragment); } + if (!collapsed) + { drawSelectionRange(cm, range, selFragment); } + } + return result + } + + // Draws a cursor for the given range + function drawSelectionCursor(cm, head, output) { + var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine); + + var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor")); + cursor.style.left = pos.left + "px"; + cursor.style.top = pos.top + "px"; + cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"; + + if (pos.other) { + // Secondary cursor, shown when on a 'jump' in bi-directional text + var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor")); + otherCursor.style.display = ""; + otherCursor.style.left = pos.other.left + "px"; + otherCursor.style.top = pos.other.top + "px"; + otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"; + } + } + + function cmpCoords(a, b) { return a.top - b.top || a.left - b.left } + + // Draws the given range as a highlighted selection + function drawSelectionRange(cm, range, output) { + var display = cm.display, doc = cm.doc; + var fragment = document.createDocumentFragment(); + var padding = paddingH(cm.display), leftSide = padding.left; + var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right; + var docLTR = doc.direction == "ltr"; + + function add(left, top, width, bottom) { + if (top < 0) { top = 0; } + top = Math.round(top); + bottom = Math.round(bottom); + fragment.appendChild(elt("div", null, "CodeMirror-selected", ("position: absolute; left: " + left + "px;\n top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n height: " + (bottom - top) + "px"))); + } + + function drawForLine(line, fromArg, toArg) { + var lineObj = getLine(doc, line); + var lineLen = lineObj.text.length; + var start, end; + function coords(ch, bias) { + return charCoords(cm, Pos(line, ch), "div", lineObj, bias) + } + + function wrapX(pos, dir, side) { + var extent = wrappedLineExtentChar(cm, lineObj, null, pos); + var prop = (dir == "ltr") == (side == "after") ? "left" : "right"; + var ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1); + return coords(ch, prop)[prop] + } + + var order = getOrder(lineObj, doc.direction); + iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir, i) { + var ltr = dir == "ltr"; + var fromPos = coords(from, ltr ? "left" : "right"); + var toPos = coords(to - 1, ltr ? "right" : "left"); + + var openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen; + var first = i == 0, last = !order || i == order.length - 1; + if (toPos.top - fromPos.top <= 3) { // Single line + var openLeft = (docLTR ? openStart : openEnd) && first; + var openRight = (docLTR ? openEnd : openStart) && last; + var left = openLeft ? leftSide : (ltr ? fromPos : toPos).left; + var right = openRight ? rightSide : (ltr ? toPos : fromPos).right; + add(left, fromPos.top, right - left, fromPos.bottom); + } else { // Multiple lines + var topLeft, topRight, botLeft, botRight; + if (ltr) { + topLeft = docLTR && openStart && first ? leftSide : fromPos.left; + topRight = docLTR ? rightSide : wrapX(from, dir, "before"); + botLeft = docLTR ? leftSide : wrapX(to, dir, "after"); + botRight = docLTR && openEnd && last ? rightSide : toPos.right; + } else { + topLeft = !docLTR ? leftSide : wrapX(from, dir, "before"); + topRight = !docLTR && openStart && first ? rightSide : fromPos.right; + botLeft = !docLTR && openEnd && last ? leftSide : toPos.left; + botRight = !docLTR ? rightSide : wrapX(to, dir, "after"); + } + add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom); + if (fromPos.bottom < toPos.top) { add(leftSide, fromPos.bottom, null, toPos.top); } + add(botLeft, toPos.top, botRight - botLeft, toPos.bottom); + } + + if (!start || cmpCoords(fromPos, start) < 0) { start = fromPos; } + if (cmpCoords(toPos, start) < 0) { start = toPos; } + if (!end || cmpCoords(fromPos, end) < 0) { end = fromPos; } + if (cmpCoords(toPos, end) < 0) { end = toPos; } + }); + return {start: start, end: end} + } + + var sFrom = range.from(), sTo = range.to(); + if (sFrom.line == sTo.line) { + drawForLine(sFrom.line, sFrom.ch, sTo.ch); + } else { + var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line); + var singleVLine = visualLine(fromLine) == visualLine(toLine); + var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end; + var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start; + if (singleVLine) { + if (leftEnd.top < rightStart.top - 2) { + add(leftEnd.right, leftEnd.top, null, leftEnd.bottom); + add(leftSide, rightStart.top, rightStart.left, rightStart.bottom); + } else { + add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom); + } + } + if (leftEnd.bottom < rightStart.top) + { add(leftSide, leftEnd.bottom, null, rightStart.top); } + } + + output.appendChild(fragment); + } + + // Cursor-blinking + function restartBlink(cm) { + if (!cm.state.focused) { return } + var display = cm.display; + clearInterval(display.blinker); + var on = true; + display.cursorDiv.style.visibility = ""; + if (cm.options.cursorBlinkRate > 0) + { display.blinker = setInterval(function () { + if (!cm.hasFocus()) { onBlur(cm); } + display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; + }, cm.options.cursorBlinkRate); } + else if (cm.options.cursorBlinkRate < 0) + { display.cursorDiv.style.visibility = "hidden"; } + } + + function ensureFocus(cm) { + if (!cm.hasFocus()) { + cm.display.input.focus(); + if (!cm.state.focused) { onFocus(cm); } + } + } + + function delayBlurEvent(cm) { + cm.state.delayingBlurEvent = true; + setTimeout(function () { if (cm.state.delayingBlurEvent) { + cm.state.delayingBlurEvent = false; + if (cm.state.focused) { onBlur(cm); } + } }, 100); + } + + function onFocus(cm, e) { + if (cm.state.delayingBlurEvent && !cm.state.draggingText) { cm.state.delayingBlurEvent = false; } + + if (cm.options.readOnly == "nocursor") { return } + if (!cm.state.focused) { + signal(cm, "focus", cm, e); + cm.state.focused = true; + addClass(cm.display.wrapper, "CodeMirror-focused"); + // This test prevents this from firing when a context + // menu is closed (since the input reset would kill the + // select-all detection hack) + if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) { + cm.display.input.reset(); + if (webkit) { setTimeout(function () { return cm.display.input.reset(true); }, 20); } // Issue #1730 + } + cm.display.input.receivedFocus(); + } + restartBlink(cm); + } + function onBlur(cm, e) { + if (cm.state.delayingBlurEvent) { return } + + if (cm.state.focused) { + signal(cm, "blur", cm, e); + cm.state.focused = false; + rmClass(cm.display.wrapper, "CodeMirror-focused"); + } + clearInterval(cm.display.blinker); + setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false; } }, 150); + } + + // Read the actual heights of the rendered lines, and update their + // stored heights to match. + function updateHeightsInViewport(cm) { + var display = cm.display; + var prevBottom = display.lineDiv.offsetTop; + for (var i = 0; i < display.view.length; i++) { + var cur = display.view[i], wrapping = cm.options.lineWrapping; + var height = (void 0), width = 0; + if (cur.hidden) { continue } + if (ie && ie_version < 8) { + var bot = cur.node.offsetTop + cur.node.offsetHeight; + height = bot - prevBottom; + prevBottom = bot; + } else { + var box = cur.node.getBoundingClientRect(); + height = box.bottom - box.top; + // Check that lines don't extend past the right of the current + // editor width + if (!wrapping && cur.text.firstChild) + { width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1; } + } + var diff = cur.line.height - height; + if (diff > .005 || diff < -.005) { + updateLineHeight(cur.line, height); + updateWidgetHeight(cur.line); + if (cur.rest) { for (var j = 0; j < cur.rest.length; j++) + { updateWidgetHeight(cur.rest[j]); } } + } + if (width > cm.display.sizerWidth) { + var chWidth = Math.ceil(width / charWidth(cm.display)); + if (chWidth > cm.display.maxLineLength) { + cm.display.maxLineLength = chWidth; + cm.display.maxLine = cur.line; + cm.display.maxLineChanged = true; + } + } + } + } + + // Read and store the height of line widgets associated with the + // given line. + function updateWidgetHeight(line) { + if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i) { + var w = line.widgets[i], parent = w.node.parentNode; + if (parent) { w.height = parent.offsetHeight; } + } } + } + + // Compute the lines that are visible in a given viewport (defaults + // the the current scroll position). viewport may contain top, + // height, and ensure (see op.scrollToPos) properties. + function visibleLines(display, doc, viewport) { + var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop; + top = Math.floor(top - paddingTop(display)); + var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight; + + var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom); + // Ensure is a {from: {line, ch}, to: {line, ch}} object, and + // forces those lines into the viewport (if possible). + if (viewport && viewport.ensure) { + var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line; + if (ensureFrom < from) { + from = ensureFrom; + to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight); + } else if (Math.min(ensureTo, doc.lastLine()) >= to) { + from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight); + to = ensureTo; + } + } + return {from: from, to: Math.max(to, from + 1)} + } + + // SCROLLING THINGS INTO VIEW + + // If an editor sits on the top or bottom of the window, partially + // scrolled out of view, this ensures that the cursor is visible. + function maybeScrollWindow(cm, rect) { + if (signalDOMEvent(cm, "scrollCursorIntoView")) { return } + + var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null; + if (rect.top + box.top < 0) { doScroll = true; } + else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false; } + if (doScroll != null && !phantom) { + var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;")); + cm.display.lineSpace.appendChild(scrollNode); + scrollNode.scrollIntoView(doScroll); + cm.display.lineSpace.removeChild(scrollNode); + } + } + + // Scroll a given position into view (immediately), verifying that + // it actually became visible (as line heights are accurately + // measured, the position of something may 'drift' during drawing). + function scrollPosIntoView(cm, pos, end, margin) { + if (margin == null) { margin = 0; } + var rect; + if (!cm.options.lineWrapping && pos == end) { + // Set pos and end to the cursor positions around the character pos sticks to + // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch + // If pos == Pos(_, 0, "before"), pos and end are unchanged + pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos; + end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos; + } + for (var limit = 0; limit < 5; limit++) { + var changed = false; + var coords = cursorCoords(cm, pos); + var endCoords = !end || end == pos ? coords : cursorCoords(cm, end); + rect = {left: Math.min(coords.left, endCoords.left), + top: Math.min(coords.top, endCoords.top) - margin, + right: Math.max(coords.left, endCoords.left), + bottom: Math.max(coords.bottom, endCoords.bottom) + margin}; + var scrollPos = calculateScrollPos(cm, rect); + var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft; + if (scrollPos.scrollTop != null) { + updateScrollTop(cm, scrollPos.scrollTop); + if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true; } + } + if (scrollPos.scrollLeft != null) { + setScrollLeft(cm, scrollPos.scrollLeft); + if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true; } + } + if (!changed) { break } + } + return rect + } + + // Scroll a given set of coordinates into view (immediately). + function scrollIntoView(cm, rect) { + var scrollPos = calculateScrollPos(cm, rect); + if (scrollPos.scrollTop != null) { updateScrollTop(cm, scrollPos.scrollTop); } + if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft); } + } + + // Calculate a new scroll position needed to scroll the given + // rectangle into view. Returns an object with scrollTop and + // scrollLeft properties. When these are undefined, the + // vertical/horizontal position does not need to be adjusted. + function calculateScrollPos(cm, rect) { + var display = cm.display, snapMargin = textHeight(cm.display); + if (rect.top < 0) { rect.top = 0; } + var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop; + var screen = displayHeight(cm), result = {}; + if (rect.bottom - rect.top > screen) { rect.bottom = rect.top + screen; } + var docBottom = cm.doc.height + paddingVert(display); + var atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin; + if (rect.top < screentop) { + result.scrollTop = atTop ? 0 : rect.top; + } else if (rect.bottom > screentop + screen) { + var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen); + if (newTop != screentop) { result.scrollTop = newTop; } + } + + var gutterSpace = cm.options.fixedGutter ? 0 : display.gutters.offsetWidth; + var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - gutterSpace; + var screenw = displayWidth(cm) - display.gutters.offsetWidth; + var tooWide = rect.right - rect.left > screenw; + if (tooWide) { rect.right = rect.left + screenw; } + if (rect.left < 10) + { result.scrollLeft = 0; } + else if (rect.left < screenleft) + { result.scrollLeft = Math.max(0, rect.left + gutterSpace - (tooWide ? 0 : 10)); } + else if (rect.right > screenw + screenleft - 3) + { result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; } + return result + } + + // Store a relative adjustment to the scroll position in the current + // operation (to be applied when the operation finishes). + function addToScrollTop(cm, top) { + if (top == null) { return } + resolveScrollToPos(cm); + cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top; + } + + // Make sure that at the end of the operation the current cursor is + // shown. + function ensureCursorVisible(cm) { + resolveScrollToPos(cm); + var cur = cm.getCursor(); + cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin}; + } + + function scrollToCoords(cm, x, y) { + if (x != null || y != null) { resolveScrollToPos(cm); } + if (x != null) { cm.curOp.scrollLeft = x; } + if (y != null) { cm.curOp.scrollTop = y; } + } + + function scrollToRange(cm, range) { + resolveScrollToPos(cm); + cm.curOp.scrollToPos = range; + } + + // When an operation has its scrollToPos property set, and another + // scroll action is applied before the end of the operation, this + // 'simulates' scrolling that position into view in a cheap way, so + // that the effect of intermediate scroll commands is not ignored. + function resolveScrollToPos(cm) { + var range = cm.curOp.scrollToPos; + if (range) { + cm.curOp.scrollToPos = null; + var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to); + scrollToCoordsRange(cm, from, to, range.margin); + } + } + + function scrollToCoordsRange(cm, from, to, margin) { + var sPos = calculateScrollPos(cm, { + left: Math.min(from.left, to.left), + top: Math.min(from.top, to.top) - margin, + right: Math.max(from.right, to.right), + bottom: Math.max(from.bottom, to.bottom) + margin + }); + scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop); + } + + // Sync the scrollable area and scrollbars, ensure the viewport + // covers the visible area. + function updateScrollTop(cm, val) { + if (Math.abs(cm.doc.scrollTop - val) < 2) { return } + if (!gecko) { updateDisplaySimple(cm, {top: val}); } + setScrollTop(cm, val, true); + if (gecko) { updateDisplaySimple(cm); } + startWorker(cm, 100); + } + + function setScrollTop(cm, val, forceScroll) { + val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)); + if (cm.display.scroller.scrollTop == val && !forceScroll) { return } + cm.doc.scrollTop = val; + cm.display.scrollbars.setScrollTop(val); + if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val; } + } + + // Sync scroller and scrollbar, ensure the gutter elements are + // aligned. + function setScrollLeft(cm, val, isScroller, forceScroll) { + val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)); + if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return } + cm.doc.scrollLeft = val; + alignHorizontally(cm); + if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val; } + cm.display.scrollbars.setScrollLeft(val); + } + + // SCROLLBARS + + // Prepare DOM reads needed to update the scrollbars. Done in one + // shot to minimize update/measure roundtrips. + function measureForScrollbars(cm) { + var d = cm.display, gutterW = d.gutters.offsetWidth; + var docH = Math.round(cm.doc.height + paddingVert(cm.display)); + return { + clientHeight: d.scroller.clientHeight, + viewHeight: d.wrapper.clientHeight, + scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth, + viewWidth: d.wrapper.clientWidth, + barLeft: cm.options.fixedGutter ? gutterW : 0, + docHeight: docH, + scrollHeight: docH + scrollGap(cm) + d.barHeight, + nativeBarWidth: d.nativeBarWidth, + gutterWidth: gutterW + } + } + + var NativeScrollbars = function(place, scroll, cm) { + this.cm = cm; + var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar"); + var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar"); + vert.tabIndex = horiz.tabIndex = -1; + place(vert); place(horiz); + + on(vert, "scroll", function () { + if (vert.clientHeight) { scroll(vert.scrollTop, "vertical"); } + }); + on(horiz, "scroll", function () { + if (horiz.clientWidth) { scroll(horiz.scrollLeft, "horizontal"); } + }); + + this.checkedZeroWidth = false; + // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8). + if (ie && ie_version < 8) { this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; } + }; + + NativeScrollbars.prototype.update = function (measure) { + var needsH = measure.scrollWidth > measure.clientWidth + 1; + var needsV = measure.scrollHeight > measure.clientHeight + 1; + var sWidth = measure.nativeBarWidth; + + if (needsV) { + this.vert.style.display = "block"; + this.vert.style.bottom = needsH ? sWidth + "px" : "0"; + var totalHeight = measure.viewHeight - (needsH ? sWidth : 0); + // A bug in IE8 can cause this value to be negative, so guard it. + this.vert.firstChild.style.height = + Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"; + } else { + this.vert.style.display = ""; + this.vert.firstChild.style.height = "0"; + } + + if (needsH) { + this.horiz.style.display = "block"; + this.horiz.style.right = needsV ? sWidth + "px" : "0"; + this.horiz.style.left = measure.barLeft + "px"; + var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0); + this.horiz.firstChild.style.width = + Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px"; + } else { + this.horiz.style.display = ""; + this.horiz.firstChild.style.width = "0"; + } + + if (!this.checkedZeroWidth && measure.clientHeight > 0) { + if (sWidth == 0) { this.zeroWidthHack(); } + this.checkedZeroWidth = true; + } + + return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0} + }; + + NativeScrollbars.prototype.setScrollLeft = function (pos) { + if (this.horiz.scrollLeft != pos) { this.horiz.scrollLeft = pos; } + if (this.disableHoriz) { this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz"); } + }; + + NativeScrollbars.prototype.setScrollTop = function (pos) { + if (this.vert.scrollTop != pos) { this.vert.scrollTop = pos; } + if (this.disableVert) { this.enableZeroWidthBar(this.vert, this.disableVert, "vert"); } + }; + + NativeScrollbars.prototype.zeroWidthHack = function () { + var w = mac && !mac_geMountainLion ? "12px" : "18px"; + this.horiz.style.height = this.vert.style.width = w; + this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"; + this.disableHoriz = new Delayed; + this.disableVert = new Delayed; + }; + + NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) { + bar.style.pointerEvents = "auto"; + function maybeDisable() { + // To find out whether the scrollbar is still visible, we + // check whether the element under the pixel in the bottom + // right corner of the scrollbar box is the scrollbar box + // itself (when the bar is still visible) or its filler child + // (when the bar is hidden). If it is still visible, we keep + // it enabled, if it's hidden, we disable pointer events. + var box = bar.getBoundingClientRect(); + var elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2) + : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1); + if (elt != bar) { bar.style.pointerEvents = "none"; } + else { delay.set(1000, maybeDisable); } + } + delay.set(1000, maybeDisable); + }; + + NativeScrollbars.prototype.clear = function () { + var parent = this.horiz.parentNode; + parent.removeChild(this.horiz); + parent.removeChild(this.vert); + }; + + var NullScrollbars = function () {}; + + NullScrollbars.prototype.update = function () { return {bottom: 0, right: 0} }; + NullScrollbars.prototype.setScrollLeft = function () {}; + NullScrollbars.prototype.setScrollTop = function () {}; + NullScrollbars.prototype.clear = function () {}; + + function updateScrollbars(cm, measure) { + if (!measure) { measure = measureForScrollbars(cm); } + var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight; + updateScrollbarsInner(cm, measure); + for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) { + if (startWidth != cm.display.barWidth && cm.options.lineWrapping) + { updateHeightsInViewport(cm); } + updateScrollbarsInner(cm, measureForScrollbars(cm)); + startWidth = cm.display.barWidth; startHeight = cm.display.barHeight; + } + } + + // Re-synchronize the fake scrollbars with the actual size of the + // content. + function updateScrollbarsInner(cm, measure) { + var d = cm.display; + var sizes = d.scrollbars.update(measure); + + d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"; + d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"; + d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"; + + if (sizes.right && sizes.bottom) { + d.scrollbarFiller.style.display = "block"; + d.scrollbarFiller.style.height = sizes.bottom + "px"; + d.scrollbarFiller.style.width = sizes.right + "px"; + } else { d.scrollbarFiller.style.display = ""; } + if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) { + d.gutterFiller.style.display = "block"; + d.gutterFiller.style.height = sizes.bottom + "px"; + d.gutterFiller.style.width = measure.gutterWidth + "px"; + } else { d.gutterFiller.style.display = ""; } + } + + var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}; + + function initScrollbars(cm) { + if (cm.display.scrollbars) { + cm.display.scrollbars.clear(); + if (cm.display.scrollbars.addClass) + { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); } + } + + cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) { + cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller); + // Prevent clicks in the scrollbars from killing focus + on(node, "mousedown", function () { + if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0); } + }); + node.setAttribute("cm-not-content", "true"); + }, function (pos, axis) { + if (axis == "horizontal") { setScrollLeft(cm, pos); } + else { updateScrollTop(cm, pos); } + }, cm); + if (cm.display.scrollbars.addClass) + { addClass(cm.display.wrapper, cm.display.scrollbars.addClass); } + } + + // Operations are used to wrap a series of changes to the editor + // state in such a way that each change won't have to update the + // cursor and display (which would be awkward, slow, and + // error-prone). Instead, display updates are batched and then all + // combined and executed at once. + + var nextOpId = 0; + // Start a new operation. + function startOperation(cm) { + cm.curOp = { + cm: cm, + viewChanged: false, // Flag that indicates that lines might need to be redrawn + startHeight: cm.doc.height, // Used to detect need to update scrollbar + forceUpdate: false, // Used to force a redraw + updateInput: 0, // Whether to reset the input textarea + typing: false, // Whether this reset should be careful to leave existing text (for compositing) + changeObjs: null, // Accumulated changes, for firing change events + cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on + cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already + selectionChanged: false, // Whether the selection needs to be redrawn + updateMaxLine: false, // Set when the widest line needs to be determined anew + scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet + scrollToPos: null, // Used to scroll to a specific position + focus: false, + id: ++nextOpId // Unique ID + }; + pushOperation(cm.curOp); + } + + // Finish an operation, updating the display and signalling delayed events + function endOperation(cm) { + var op = cm.curOp; + if (op) { finishOperation(op, function (group) { + for (var i = 0; i < group.ops.length; i++) + { group.ops[i].cm.curOp = null; } + endOperations(group); + }); } + } + + // The DOM updates done when an operation finishes are batched so + // that the minimum number of relayouts are required. + function endOperations(group) { + var ops = group.ops; + for (var i = 0; i < ops.length; i++) // Read DOM + { endOperation_R1(ops[i]); } + for (var i$1 = 0; i$1 < ops.length; i$1++) // Write DOM (maybe) + { endOperation_W1(ops[i$1]); } + for (var i$2 = 0; i$2 < ops.length; i$2++) // Read DOM + { endOperation_R2(ops[i$2]); } + for (var i$3 = 0; i$3 < ops.length; i$3++) // Write DOM (maybe) + { endOperation_W2(ops[i$3]); } + for (var i$4 = 0; i$4 < ops.length; i$4++) // Read DOM + { endOperation_finish(ops[i$4]); } + } + + function endOperation_R1(op) { + var cm = op.cm, display = cm.display; + maybeClipScrollbars(cm); + if (op.updateMaxLine) { findMaxLine(cm); } + + op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null || + op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom || + op.scrollToPos.to.line >= display.viewTo) || + display.maxLineChanged && cm.options.lineWrapping; + op.update = op.mustUpdate && + new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate); + } + + function endOperation_W1(op) { + op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update); + } + + function endOperation_R2(op) { + var cm = op.cm, display = cm.display; + if (op.updatedDisplay) { updateHeightsInViewport(cm); } + + op.barMeasure = measureForScrollbars(cm); + + // If the max line changed since it was last measured, measure it, + // and ensure the document's width matches it. + // updateDisplay_W2 will use these properties to do the actual resizing + if (display.maxLineChanged && !cm.options.lineWrapping) { + op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3; + cm.display.sizerWidth = op.adjustWidthTo; + op.barMeasure.scrollWidth = + Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth); + op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm)); + } + + if (op.updatedDisplay || op.selectionChanged) + { op.preparedSelection = display.input.prepareSelection(); } + } + + function endOperation_W2(op) { + var cm = op.cm; + + if (op.adjustWidthTo != null) { + cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"; + if (op.maxScrollLeft < cm.doc.scrollLeft) + { setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); } + cm.display.maxLineChanged = false; + } + + var takeFocus = op.focus && op.focus == activeElt(); + if (op.preparedSelection) + { cm.display.input.showSelection(op.preparedSelection, takeFocus); } + if (op.updatedDisplay || op.startHeight != cm.doc.height) + { updateScrollbars(cm, op.barMeasure); } + if (op.updatedDisplay) + { setDocumentHeight(cm, op.barMeasure); } + + if (op.selectionChanged) { restartBlink(cm); } + + if (cm.state.focused && op.updateInput) + { cm.display.input.reset(op.typing); } + if (takeFocus) { ensureFocus(op.cm); } + } + + function endOperation_finish(op) { + var cm = op.cm, display = cm.display, doc = cm.doc; + + if (op.updatedDisplay) { postUpdateDisplay(cm, op.update); } + + // Abort mouse wheel delta measurement, when scrolling explicitly + if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos)) + { display.wheelStartX = display.wheelStartY = null; } + + // Propagate the scroll position to the actual DOM scroller + if (op.scrollTop != null) { setScrollTop(cm, op.scrollTop, op.forceScroll); } + + if (op.scrollLeft != null) { setScrollLeft(cm, op.scrollLeft, true, true); } + // If we need to scroll a specific position into view, do so. + if (op.scrollToPos) { + var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), + clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin); + maybeScrollWindow(cm, rect); + } + + // Fire events for markers that are hidden/unidden by editing or + // undoing + var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers; + if (hidden) { for (var i = 0; i < hidden.length; ++i) + { if (!hidden[i].lines.length) { signal(hidden[i], "hide"); } } } + if (unhidden) { for (var i$1 = 0; i$1 < unhidden.length; ++i$1) + { if (unhidden[i$1].lines.length) { signal(unhidden[i$1], "unhide"); } } } + + if (display.wrapper.offsetHeight) + { doc.scrollTop = cm.display.scroller.scrollTop; } + + // Fire change events, and delayed event handlers + if (op.changeObjs) + { signal(cm, "changes", cm, op.changeObjs); } + if (op.update) + { op.update.finish(); } + } + + // Run the given function in an operation + function runInOp(cm, f) { + if (cm.curOp) { return f() } + startOperation(cm); + try { return f() } + finally { endOperation(cm); } + } + // Wraps a function in an operation. Returns the wrapped function. + function operation(cm, f) { + return function() { + if (cm.curOp) { return f.apply(cm, arguments) } + startOperation(cm); + try { return f.apply(cm, arguments) } + finally { endOperation(cm); } + } + } + // Used to add methods to editor and doc instances, wrapping them in + // operations. + function methodOp(f) { + return function() { + if (this.curOp) { return f.apply(this, arguments) } + startOperation(this); + try { return f.apply(this, arguments) } + finally { endOperation(this); } + } + } + function docMethodOp(f) { + return function() { + var cm = this.cm; + if (!cm || cm.curOp) { return f.apply(this, arguments) } + startOperation(cm); + try { return f.apply(this, arguments) } + finally { endOperation(cm); } + } + } + + // HIGHLIGHT WORKER + + function startWorker(cm, time) { + if (cm.doc.highlightFrontier < cm.display.viewTo) + { cm.state.highlight.set(time, bind(highlightWorker, cm)); } + } + + function highlightWorker(cm) { + var doc = cm.doc; + if (doc.highlightFrontier >= cm.display.viewTo) { return } + var end = +new Date + cm.options.workTime; + var context = getContextBefore(cm, doc.highlightFrontier); + var changedLines = []; + + doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) { + if (context.line >= cm.display.viewFrom) { // Visible + var oldStyles = line.styles; + var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null; + var highlighted = highlightLine(cm, line, context, true); + if (resetState) { context.state = resetState; } + line.styles = highlighted.styles; + var oldCls = line.styleClasses, newCls = highlighted.classes; + if (newCls) { line.styleClasses = newCls; } + else if (oldCls) { line.styleClasses = null; } + var ischange = !oldStyles || oldStyles.length != line.styles.length || + oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass); + for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i]; } + if (ischange) { changedLines.push(context.line); } + line.stateAfter = context.save(); + context.nextLine(); + } else { + if (line.text.length <= cm.options.maxHighlightLength) + { processLine(cm, line.text, context); } + line.stateAfter = context.line % 5 == 0 ? context.save() : null; + context.nextLine(); + } + if (+new Date > end) { + startWorker(cm, cm.options.workDelay); + return true + } + }); + doc.highlightFrontier = context.line; + doc.modeFrontier = Math.max(doc.modeFrontier, context.line); + if (changedLines.length) { runInOp(cm, function () { + for (var i = 0; i < changedLines.length; i++) + { regLineChange(cm, changedLines[i], "text"); } + }); } + } + + // DISPLAY DRAWING + + var DisplayUpdate = function(cm, viewport, force) { + var display = cm.display; + + this.viewport = viewport; + // Store some values that we'll need later (but don't want to force a relayout for) + this.visible = visibleLines(display, cm.doc, viewport); + this.editorIsHidden = !display.wrapper.offsetWidth; + this.wrapperHeight = display.wrapper.clientHeight; + this.wrapperWidth = display.wrapper.clientWidth; + this.oldDisplayWidth = displayWidth(cm); + this.force = force; + this.dims = getDimensions(cm); + this.events = []; + }; + + DisplayUpdate.prototype.signal = function (emitter, type) { + if (hasHandler(emitter, type)) + { this.events.push(arguments); } + }; + DisplayUpdate.prototype.finish = function () { + for (var i = 0; i < this.events.length; i++) + { signal.apply(null, this.events[i]); } + }; + + function maybeClipScrollbars(cm) { + var display = cm.display; + if (!display.scrollbarsClipped && display.scroller.offsetWidth) { + display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth; + display.heightForcer.style.height = scrollGap(cm) + "px"; + display.sizer.style.marginBottom = -display.nativeBarWidth + "px"; + display.sizer.style.borderRightWidth = scrollGap(cm) + "px"; + display.scrollbarsClipped = true; + } + } + + function selectionSnapshot(cm) { + if (cm.hasFocus()) { return null } + var active = activeElt(); + if (!active || !contains(cm.display.lineDiv, active)) { return null } + var result = {activeElt: active}; + if (window.getSelection) { + var sel = window.getSelection(); + if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) { + result.anchorNode = sel.anchorNode; + result.anchorOffset = sel.anchorOffset; + result.focusNode = sel.focusNode; + result.focusOffset = sel.focusOffset; + } + } + return result + } + + function restoreSelection(snapshot) { + if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return } + snapshot.activeElt.focus(); + if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) && + snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) { + var sel = window.getSelection(), range = document.createRange(); + range.setEnd(snapshot.anchorNode, snapshot.anchorOffset); + range.collapse(false); + sel.removeAllRanges(); + sel.addRange(range); + sel.extend(snapshot.focusNode, snapshot.focusOffset); + } + } + + // Does the actual updating of the line display. Bails out + // (returning false) when there is nothing to be done and forced is + // false. + function updateDisplayIfNeeded(cm, update) { + var display = cm.display, doc = cm.doc; + + if (update.editorIsHidden) { + resetView(cm); + return false + } + + // Bail out if the visible area is already rendered and nothing changed. + if (!update.force && + update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo && + (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) && + display.renderedView == display.view && countDirtyView(cm) == 0) + { return false } + + if (maybeUpdateLineNumberWidth(cm)) { + resetView(cm); + update.dims = getDimensions(cm); + } + + // Compute a suitable new viewport (from & to) + var end = doc.first + doc.size; + var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first); + var to = Math.min(end, update.visible.to + cm.options.viewportMargin); + if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom); } + if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo); } + if (sawCollapsedSpans) { + from = visualLineNo(cm.doc, from); + to = visualLineEndNo(cm.doc, to); + } + + var different = from != display.viewFrom || to != display.viewTo || + display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth; + adjustView(cm, from, to); + + display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom)); + // Position the mover div to align with the current scroll position + cm.display.mover.style.top = display.viewOffset + "px"; + + var toUpdate = countDirtyView(cm); + if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view && + (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo)) + { return false } + + // For big changes, we hide the enclosing element during the + // update, since that speeds up the operations on most browsers. + var selSnapshot = selectionSnapshot(cm); + if (toUpdate > 4) { display.lineDiv.style.display = "none"; } + patchDisplay(cm, display.updateLineNumbers, update.dims); + if (toUpdate > 4) { display.lineDiv.style.display = ""; } + display.renderedView = display.view; + // There might have been a widget with a focused element that got + // hidden or updated, if so re-focus it. + restoreSelection(selSnapshot); + + // Prevent selection and cursors from interfering with the scroll + // width and height. + removeChildren(display.cursorDiv); + removeChildren(display.selectionDiv); + display.gutters.style.height = display.sizer.style.minHeight = 0; + + if (different) { + display.lastWrapHeight = update.wrapperHeight; + display.lastWrapWidth = update.wrapperWidth; + startWorker(cm, 400); + } + + display.updateLineNumbers = null; + + return true + } + + function postUpdateDisplay(cm, update) { + var viewport = update.viewport; + + for (var first = true;; first = false) { + if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) { + // Clip forced viewport to actual scrollable area. + if (viewport && viewport.top != null) + { viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)}; } + // Updated line heights might result in the drawn area not + // actually covering the viewport. Keep looping until it does. + update.visible = visibleLines(cm.display, cm.doc, viewport); + if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo) + { break } + } else if (first) { + update.visible = visibleLines(cm.display, cm.doc, viewport); + } + if (!updateDisplayIfNeeded(cm, update)) { break } + updateHeightsInViewport(cm); + var barMeasure = measureForScrollbars(cm); + updateSelection(cm); + updateScrollbars(cm, barMeasure); + setDocumentHeight(cm, barMeasure); + update.force = false; + } + + update.signal(cm, "update", cm); + if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) { + update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo); + cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo; + } + } + + function updateDisplaySimple(cm, viewport) { + var update = new DisplayUpdate(cm, viewport); + if (updateDisplayIfNeeded(cm, update)) { + updateHeightsInViewport(cm); + postUpdateDisplay(cm, update); + var barMeasure = measureForScrollbars(cm); + updateSelection(cm); + updateScrollbars(cm, barMeasure); + setDocumentHeight(cm, barMeasure); + update.finish(); + } + } + + // Sync the actual display DOM structure with display.view, removing + // nodes for lines that are no longer in view, and creating the ones + // that are not there yet, and updating the ones that are out of + // date. + function patchDisplay(cm, updateNumbersFrom, dims) { + var display = cm.display, lineNumbers = cm.options.lineNumbers; + var container = display.lineDiv, cur = container.firstChild; + + function rm(node) { + var next = node.nextSibling; + // Works around a throw-scroll bug in OS X Webkit + if (webkit && mac && cm.display.currentWheelTarget == node) + { node.style.display = "none"; } + else + { node.parentNode.removeChild(node); } + return next + } + + var view = display.view, lineN = display.viewFrom; + // Loop over the elements in the view, syncing cur (the DOM nodes + // in display.lineDiv) with the view as we go. + for (var i = 0; i < view.length; i++) { + var lineView = view[i]; + if (lineView.hidden) ; else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet + var node = buildLineElement(cm, lineView, lineN, dims); + container.insertBefore(node, cur); + } else { // Already drawn + while (cur != lineView.node) { cur = rm(cur); } + var updateNumber = lineNumbers && updateNumbersFrom != null && + updateNumbersFrom <= lineN && lineView.lineNumber; + if (lineView.changes) { + if (indexOf(lineView.changes, "gutter") > -1) { updateNumber = false; } + updateLineForChanges(cm, lineView, lineN, dims); + } + if (updateNumber) { + removeChildren(lineView.lineNumber); + lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN))); + } + cur = lineView.node.nextSibling; + } + lineN += lineView.size; + } + while (cur) { cur = rm(cur); } + } + + function updateGutterSpace(display) { + var width = display.gutters.offsetWidth; + display.sizer.style.marginLeft = width + "px"; + } + + function setDocumentHeight(cm, measure) { + cm.display.sizer.style.minHeight = measure.docHeight + "px"; + cm.display.heightForcer.style.top = measure.docHeight + "px"; + cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px"; + } + + // Re-align line numbers and gutter marks to compensate for + // horizontal scrolling. + function alignHorizontally(cm) { + var display = cm.display, view = display.view; + if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return } + var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft; + var gutterW = display.gutters.offsetWidth, left = comp + "px"; + for (var i = 0; i < view.length; i++) { if (!view[i].hidden) { + if (cm.options.fixedGutter) { + if (view[i].gutter) + { view[i].gutter.style.left = left; } + if (view[i].gutterBackground) + { view[i].gutterBackground.style.left = left; } + } + var align = view[i].alignable; + if (align) { for (var j = 0; j < align.length; j++) + { align[j].style.left = left; } } + } } + if (cm.options.fixedGutter) + { display.gutters.style.left = (comp + gutterW) + "px"; } + } + + // Used to ensure that the line number gutter is still the right + // size for the current document size. Returns true when an update + // is needed. + function maybeUpdateLineNumberWidth(cm) { + if (!cm.options.lineNumbers) { return false } + var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display; + if (last.length != display.lineNumChars) { + var test = display.measure.appendChild(elt("div", [elt("div", last)], + "CodeMirror-linenumber CodeMirror-gutter-elt")); + var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW; + display.lineGutter.style.width = ""; + display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1; + display.lineNumWidth = display.lineNumInnerWidth + padding; + display.lineNumChars = display.lineNumInnerWidth ? last.length : -1; + display.lineGutter.style.width = display.lineNumWidth + "px"; + updateGutterSpace(cm.display); + return true + } + return false + } + + function getGutters(gutters, lineNumbers) { + var result = [], sawLineNumbers = false; + for (var i = 0; i < gutters.length; i++) { + var name = gutters[i], style = null; + if (typeof name != "string") { style = name.style; name = name.className; } + if (name == "CodeMirror-linenumbers") { + if (!lineNumbers) { continue } + else { sawLineNumbers = true; } + } + result.push({className: name, style: style}); + } + if (lineNumbers && !sawLineNumbers) { result.push({className: "CodeMirror-linenumbers", style: null}); } + return result + } + + // Rebuild the gutter elements, ensure the margin to the left of the + // code matches their width. + function renderGutters(display) { + var gutters = display.gutters, specs = display.gutterSpecs; + removeChildren(gutters); + display.lineGutter = null; + for (var i = 0; i < specs.length; ++i) { + var ref = specs[i]; + var className = ref.className; + var style = ref.style; + var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className)); + if (style) { gElt.style.cssText = style; } + if (className == "CodeMirror-linenumbers") { + display.lineGutter = gElt; + gElt.style.width = (display.lineNumWidth || 1) + "px"; + } + } + gutters.style.display = specs.length ? "" : "none"; + updateGutterSpace(display); + } + + function updateGutters(cm) { + renderGutters(cm.display); + regChange(cm); + alignHorizontally(cm); + } + + // The display handles the DOM integration, both for input reading + // and content drawing. It holds references to DOM nodes and + // display-related state. + + function Display(place, doc, input, options) { + var d = this; + this.input = input; + + // Covers bottom-right square when both scrollbars are present. + d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler"); + d.scrollbarFiller.setAttribute("cm-not-content", "true"); + // Covers bottom of gutter when coverGutterNextToScrollbar is on + // and h scrollbar is present. + d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler"); + d.gutterFiller.setAttribute("cm-not-content", "true"); + // Will contain the actual code, positioned to cover the viewport. + d.lineDiv = eltP("div", null, "CodeMirror-code"); + // Elements are added to these to represent selection and cursors. + d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1"); + d.cursorDiv = elt("div", null, "CodeMirror-cursors"); + // A visibility: hidden element used to find the size of things. + d.measure = elt("div", null, "CodeMirror-measure"); + // When lines outside of the viewport are measured, they are drawn in this. + d.lineMeasure = elt("div", null, "CodeMirror-measure"); + // Wraps everything that needs to exist inside the vertically-padded coordinate system + d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv], + null, "position: relative; outline: none"); + var lines = eltP("div", [d.lineSpace], "CodeMirror-lines"); + // Moved around its parent to cover visible view. + d.mover = elt("div", [lines], null, "position: relative"); + // Set to the height of the document, allowing scrolling. + d.sizer = elt("div", [d.mover], "CodeMirror-sizer"); + d.sizerWidth = null; + // Behavior of elts with overflow: auto and padding is + // inconsistent across browsers. This is used to ensure the + // scrollable area is big enough. + d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;"); + // Will contain the gutters, if any. + d.gutters = elt("div", null, "CodeMirror-gutters"); + d.lineGutter = null; + // Actual scrollable element. + d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll"); + d.scroller.setAttribute("tabIndex", "-1"); + // The element in which the editor lives. + d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror"); + + // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported) + if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; } + if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true; } + + if (place) { + if (place.appendChild) { place.appendChild(d.wrapper); } + else { place(d.wrapper); } + } + + // Current rendered range (may be bigger than the view window). + d.viewFrom = d.viewTo = doc.first; + d.reportedViewFrom = d.reportedViewTo = doc.first; + // Information about the rendered lines. + d.view = []; + d.renderedView = null; + // Holds info about a single rendered line when it was rendered + // for measurement, while not in view. + d.externalMeasured = null; + // Empty space (in pixels) above the view + d.viewOffset = 0; + d.lastWrapHeight = d.lastWrapWidth = 0; + d.updateLineNumbers = null; + + d.nativeBarWidth = d.barHeight = d.barWidth = 0; + d.scrollbarsClipped = false; + + // Used to only resize the line number gutter when necessary (when + // the amount of lines crosses a boundary that makes its width change) + d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null; + // Set to true when a non-horizontal-scrolling line widget is + // added. As an optimization, line widget aligning is skipped when + // this is false. + d.alignWidgets = false; + + d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; + + // Tracks the maximum line length so that the horizontal scrollbar + // can be kept static when scrolling. + d.maxLine = null; + d.maxLineLength = 0; + d.maxLineChanged = false; + + // Used for measuring wheel scrolling granularity + d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null; + + // True when shift is held down. + d.shift = false; + + // Used to track whether anything happened since the context menu + // was opened. + d.selForContextMenu = null; + + d.activeTouch = null; + + d.gutterSpecs = getGutters(options.gutters, options.lineNumbers); + renderGutters(d); + + input.init(d); + } + + // Since the delta values reported on mouse wheel events are + // unstandardized between browsers and even browser versions, and + // generally horribly unpredictable, this code starts by measuring + // the scroll effect that the first few mouse wheel events have, + // and, from that, detects the way it can convert deltas to pixel + // offsets afterwards. + // + // The reason we want to know the amount a wheel event will scroll + // is that it gives us a chance to update the display before the + // actual scrolling happens, reducing flickering. + + var wheelSamples = 0, wheelPixelsPerUnit = null; + // Fill in a browser-detected starting value on browsers where we + // know one. These don't have to be accurate -- the result of them + // being wrong would just be a slight flicker on the first wheel + // scroll (if it is large enough). + if (ie) { wheelPixelsPerUnit = -.53; } + else if (gecko) { wheelPixelsPerUnit = 15; } + else if (chrome) { wheelPixelsPerUnit = -.7; } + else if (safari) { wheelPixelsPerUnit = -1/3; } + + function wheelEventDelta(e) { + var dx = e.wheelDeltaX, dy = e.wheelDeltaY; + if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail; } + if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail; } + else if (dy == null) { dy = e.wheelDelta; } + return {x: dx, y: dy} + } + function wheelEventPixels(e) { + var delta = wheelEventDelta(e); + delta.x *= wheelPixelsPerUnit; + delta.y *= wheelPixelsPerUnit; + return delta + } + + function onScrollWheel(cm, e) { + var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y; + + var display = cm.display, scroll = display.scroller; + // Quit if there's nothing to scroll here + var canScrollX = scroll.scrollWidth > scroll.clientWidth; + var canScrollY = scroll.scrollHeight > scroll.clientHeight; + if (!(dx && canScrollX || dy && canScrollY)) { return } + + // Webkit browsers on OS X abort momentum scrolls when the target + // of the scroll event is removed from the scrollable element. + // This hack (see related code in patchDisplay) makes sure the + // element is kept around. + if (dy && mac && webkit) { + outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { + for (var i = 0; i < view.length; i++) { + if (view[i].node == cur) { + cm.display.currentWheelTarget = cur; + break outer + } + } + } + } + + // On some browsers, horizontal scrolling will cause redraws to + // happen before the gutter has been realigned, causing it to + // wriggle around in a most unseemly way. When we have an + // estimated pixels/delta value, we just handle horizontal + // scrolling entirely here. It'll be slightly off from native, but + // better than glitching out. + if (dx && !gecko && !presto && wheelPixelsPerUnit != null) { + if (dy && canScrollY) + { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit)); } + setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit)); + // Only prevent default scrolling if vertical scrolling is + // actually possible. Otherwise, it causes vertical scroll + // jitter on OSX trackpads when deltaX is small and deltaY + // is large (issue #3579) + if (!dy || (dy && canScrollY)) + { e_preventDefault(e); } + display.wheelStartX = null; // Abort measurement, if in progress + return + } + + // 'Project' the visible viewport to cover the area that is being + // scrolled into view (if we know enough to estimate it). + if (dy && wheelPixelsPerUnit != null) { + var pixels = dy * wheelPixelsPerUnit; + var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight; + if (pixels < 0) { top = Math.max(0, top + pixels - 50); } + else { bot = Math.min(cm.doc.height, bot + pixels + 50); } + updateDisplaySimple(cm, {top: top, bottom: bot}); + } + + if (wheelSamples < 20) { + if (display.wheelStartX == null) { + display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop; + display.wheelDX = dx; display.wheelDY = dy; + setTimeout(function () { + if (display.wheelStartX == null) { return } + var movedX = scroll.scrollLeft - display.wheelStartX; + var movedY = scroll.scrollTop - display.wheelStartY; + var sample = (movedY && display.wheelDY && movedY / display.wheelDY) || + (movedX && display.wheelDX && movedX / display.wheelDX); + display.wheelStartX = display.wheelStartY = null; + if (!sample) { return } + wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1); + ++wheelSamples; + }, 200); + } else { + display.wheelDX += dx; display.wheelDY += dy; + } + } + } + + // Selection objects are immutable. A new one is created every time + // the selection changes. A selection is one or more non-overlapping + // (and non-touching) ranges, sorted, and an integer that indicates + // which one is the primary selection (the one that's scrolled into + // view, that getCursor returns, etc). + var Selection = function(ranges, primIndex) { + this.ranges = ranges; + this.primIndex = primIndex; + }; + + Selection.prototype.primary = function () { return this.ranges[this.primIndex] }; + + Selection.prototype.equals = function (other) { + if (other == this) { return true } + if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false } + for (var i = 0; i < this.ranges.length; i++) { + var here = this.ranges[i], there = other.ranges[i]; + if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { return false } + } + return true + }; + + Selection.prototype.deepCopy = function () { + var out = []; + for (var i = 0; i < this.ranges.length; i++) + { out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)); } + return new Selection(out, this.primIndex) + }; + + Selection.prototype.somethingSelected = function () { + for (var i = 0; i < this.ranges.length; i++) + { if (!this.ranges[i].empty()) { return true } } + return false + }; + + Selection.prototype.contains = function (pos, end) { + if (!end) { end = pos; } + for (var i = 0; i < this.ranges.length; i++) { + var range = this.ranges[i]; + if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0) + { return i } + } + return -1 + }; + + var Range = function(anchor, head) { + this.anchor = anchor; this.head = head; + }; + + Range.prototype.from = function () { return minPos(this.anchor, this.head) }; + Range.prototype.to = function () { return maxPos(this.anchor, this.head) }; + Range.prototype.empty = function () { return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch }; + + // Take an unsorted, potentially overlapping set of ranges, and + // build a selection out of it. 'Consumes' ranges array (modifying + // it). + function normalizeSelection(cm, ranges, primIndex) { + var mayTouch = cm && cm.options.selectionsMayTouch; + var prim = ranges[primIndex]; + ranges.sort(function (a, b) { return cmp(a.from(), b.from()); }); + primIndex = indexOf(ranges, prim); + for (var i = 1; i < ranges.length; i++) { + var cur = ranges[i], prev = ranges[i - 1]; + var diff = cmp(prev.to(), cur.from()); + if (mayTouch && !cur.empty() ? diff > 0 : diff >= 0) { + var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to()); + var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head; + if (i <= primIndex) { --primIndex; } + ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to)); + } + } + return new Selection(ranges, primIndex) + } + + function simpleSelection(anchor, head) { + return new Selection([new Range(anchor, head || anchor)], 0) + } + + // Compute the position of the end of a change (its 'to' property + // refers to the pre-change end). + function changeEnd(change) { + if (!change.text) { return change.to } + return Pos(change.from.line + change.text.length - 1, + lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0)) + } + + // Adjust a position to refer to the post-change position of the + // same text, or the end of the change if the change covers it. + function adjustForChange(pos, change) { + if (cmp(pos, change.from) < 0) { return pos } + if (cmp(pos, change.to) <= 0) { return changeEnd(change) } + + var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch; + if (pos.line == change.to.line) { ch += changeEnd(change).ch - change.to.ch; } + return Pos(line, ch) + } + + function computeSelAfterChange(doc, change) { + var out = []; + for (var i = 0; i < doc.sel.ranges.length; i++) { + var range = doc.sel.ranges[i]; + out.push(new Range(adjustForChange(range.anchor, change), + adjustForChange(range.head, change))); + } + return normalizeSelection(doc.cm, out, doc.sel.primIndex) + } + + function offsetPos(pos, old, nw) { + if (pos.line == old.line) + { return Pos(nw.line, pos.ch - old.ch + nw.ch) } + else + { return Pos(nw.line + (pos.line - old.line), pos.ch) } + } + + // Used by replaceSelections to allow moving the selection to the + // start or around the replaced test. Hint may be "start" or "around". + function computeReplacedSel(doc, changes, hint) { + var out = []; + var oldPrev = Pos(doc.first, 0), newPrev = oldPrev; + for (var i = 0; i < changes.length; i++) { + var change = changes[i]; + var from = offsetPos(change.from, oldPrev, newPrev); + var to = offsetPos(changeEnd(change), oldPrev, newPrev); + oldPrev = change.to; + newPrev = to; + if (hint == "around") { + var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0; + out[i] = new Range(inv ? to : from, inv ? from : to); + } else { + out[i] = new Range(from, from); + } + } + return new Selection(out, doc.sel.primIndex) + } + + // Used to get the editor into a consistent state again when options change. + + function loadMode(cm) { + cm.doc.mode = getMode(cm.options, cm.doc.modeOption); + resetModeState(cm); + } + + function resetModeState(cm) { + cm.doc.iter(function (line) { + if (line.stateAfter) { line.stateAfter = null; } + if (line.styles) { line.styles = null; } + }); + cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first; + startWorker(cm, 100); + cm.state.modeGen++; + if (cm.curOp) { regChange(cm); } + } + + // DOCUMENT DATA STRUCTURE + + // By default, updates that start and end at the beginning of a line + // are treated specially, in order to make the association of line + // widgets and marker elements with the text behave more intuitive. + function isWholeLineUpdate(doc, change) { + return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" && + (!doc.cm || doc.cm.options.wholeLineUpdateBefore) + } + + // Perform a change on the document data structure. + function updateDoc(doc, change, markedSpans, estimateHeight) { + function spansFor(n) {return markedSpans ? markedSpans[n] : null} + function update(line, text, spans) { + updateLine(line, text, spans, estimateHeight); + signalLater(line, "change", line, change); + } + function linesFor(start, end) { + var result = []; + for (var i = start; i < end; ++i) + { result.push(new Line(text[i], spansFor(i), estimateHeight)); } + return result + } + + var from = change.from, to = change.to, text = change.text; + var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line); + var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line; + + // Adjust the line structure + if (change.full) { + doc.insert(0, linesFor(0, text.length)); + doc.remove(text.length, doc.size - text.length); + } else if (isWholeLineUpdate(doc, change)) { + // This is a whole-line replace. Treated specially to make + // sure line objects move the way they are supposed to. + var added = linesFor(0, text.length - 1); + update(lastLine, lastLine.text, lastSpans); + if (nlines) { doc.remove(from.line, nlines); } + if (added.length) { doc.insert(from.line, added); } + } else if (firstLine == lastLine) { + if (text.length == 1) { + update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans); + } else { + var added$1 = linesFor(1, text.length - 1); + added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight)); + update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); + doc.insert(from.line + 1, added$1); + } + } else if (text.length == 1) { + update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0)); + doc.remove(from.line + 1, nlines); + } else { + update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); + update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans); + var added$2 = linesFor(1, text.length - 1); + if (nlines > 1) { doc.remove(from.line + 1, nlines - 1); } + doc.insert(from.line + 1, added$2); + } + + signalLater(doc, "change", doc, change); + } + + // Call f for all linked documents. + function linkedDocs(doc, f, sharedHistOnly) { + function propagate(doc, skip, sharedHist) { + if (doc.linked) { for (var i = 0; i < doc.linked.length; ++i) { + var rel = doc.linked[i]; + if (rel.doc == skip) { continue } + var shared = sharedHist && rel.sharedHist; + if (sharedHistOnly && !shared) { continue } + f(rel.doc, shared); + propagate(rel.doc, doc, shared); + } } + } + propagate(doc, null, true); + } + + // Attach a document to an editor. + function attachDoc(cm, doc) { + if (doc.cm) { throw new Error("This document is already in use.") } + cm.doc = doc; + doc.cm = cm; + estimateLineHeights(cm); + loadMode(cm); + setDirectionClass(cm); + if (!cm.options.lineWrapping) { findMaxLine(cm); } + cm.options.mode = doc.modeOption; + regChange(cm); + } + + function setDirectionClass(cm) { + (cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl"); + } + + function directionChanged(cm) { + runInOp(cm, function () { + setDirectionClass(cm); + regChange(cm); + }); + } + + function History(prev) { + // Arrays of change events and selections. Doing something adds an + // event to done and clears undo. Undoing moves events from done + // to undone, redoing moves them in the other direction. + this.done = []; this.undone = []; + this.undoDepth = prev ? prev.undoDepth : Infinity; + // Used to track when changes can be merged into a single undo + // event + this.lastModTime = this.lastSelTime = 0; + this.lastOp = this.lastSelOp = null; + this.lastOrigin = this.lastSelOrigin = null; + // Used by the isClean() method + this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1; + } + + // Create a history change event from an updateDoc-style change + // object. + function historyChangeFromChange(doc, change) { + var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}; + attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); + linkedDocs(doc, function (doc) { return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); }, true); + return histChange + } + + // Pop all selection events off the end of a history array. Stop at + // a change event. + function clearSelectionEvents(array) { + while (array.length) { + var last = lst(array); + if (last.ranges) { array.pop(); } + else { break } + } + } + + // Find the top change event in the history. Pop off selection + // events that are in the way. + function lastChangeEvent(hist, force) { + if (force) { + clearSelectionEvents(hist.done); + return lst(hist.done) + } else if (hist.done.length && !lst(hist.done).ranges) { + return lst(hist.done) + } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) { + hist.done.pop(); + return lst(hist.done) + } + } + + // Register a change in the history. Merges changes that are within + // a single operation, or are close together with an origin that + // allows merging (starting with "+") into a single event. + function addChangeToHistory(doc, change, selAfter, opId) { + var hist = doc.history; + hist.undone.length = 0; + var time = +new Date, cur; + var last; + + if ((hist.lastOp == opId || + hist.lastOrigin == change.origin && change.origin && + ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) || + change.origin.charAt(0) == "*")) && + (cur = lastChangeEvent(hist, hist.lastOp == opId))) { + // Merge this change into the last event + last = lst(cur.changes); + if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) { + // Optimized case for simple insertion -- don't want to add + // new changesets for every character typed + last.to = changeEnd(change); + } else { + // Add new sub-event + cur.changes.push(historyChangeFromChange(doc, change)); + } + } else { + // Can not be merged, start a new event. + var before = lst(hist.done); + if (!before || !before.ranges) + { pushSelectionToHistory(doc.sel, hist.done); } + cur = {changes: [historyChangeFromChange(doc, change)], + generation: hist.generation}; + hist.done.push(cur); + while (hist.done.length > hist.undoDepth) { + hist.done.shift(); + if (!hist.done[0].ranges) { hist.done.shift(); } + } + } + hist.done.push(selAfter); + hist.generation = ++hist.maxGeneration; + hist.lastModTime = hist.lastSelTime = time; + hist.lastOp = hist.lastSelOp = opId; + hist.lastOrigin = hist.lastSelOrigin = change.origin; + + if (!last) { signal(doc, "historyAdded"); } + } + + function selectionEventCanBeMerged(doc, origin, prev, sel) { + var ch = origin.charAt(0); + return ch == "*" || + ch == "+" && + prev.ranges.length == sel.ranges.length && + prev.somethingSelected() == sel.somethingSelected() && + new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500) + } + + // Called whenever the selection changes, sets the new selection as + // the pending selection in the history, and pushes the old pending + // selection into the 'done' array when it was significantly + // different (in number of selected ranges, emptiness, or time). + function addSelectionToHistory(doc, sel, opId, options) { + var hist = doc.history, origin = options && options.origin; + + // A new event is started when the previous origin does not match + // the current, or the origins don't allow matching. Origins + // starting with * are always merged, those starting with + are + // merged when similar and close together in time. + if (opId == hist.lastSelOp || + (origin && hist.lastSelOrigin == origin && + (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin || + selectionEventCanBeMerged(doc, origin, lst(hist.done), sel)))) + { hist.done[hist.done.length - 1] = sel; } + else + { pushSelectionToHistory(sel, hist.done); } + + hist.lastSelTime = +new Date; + hist.lastSelOrigin = origin; + hist.lastSelOp = opId; + if (options && options.clearRedo !== false) + { clearSelectionEvents(hist.undone); } + } + + function pushSelectionToHistory(sel, dest) { + var top = lst(dest); + if (!(top && top.ranges && top.equals(sel))) + { dest.push(sel); } + } + + // Used to store marked span information in the history. + function attachLocalSpans(doc, change, from, to) { + var existing = change["spans_" + doc.id], n = 0; + doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) { + if (line.markedSpans) + { (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; } + ++n; + }); + } + + // When un/re-doing restores text containing marked spans, those + // that have been explicitly cleared should not be restored. + function removeClearedSpans(spans) { + if (!spans) { return null } + var out; + for (var i = 0; i < spans.length; ++i) { + if (spans[i].marker.explicitlyCleared) { if (!out) { out = spans.slice(0, i); } } + else if (out) { out.push(spans[i]); } + } + return !out ? spans : out.length ? out : null + } + + // Retrieve and filter the old marked spans stored in a change event. + function getOldSpans(doc, change) { + var found = change["spans_" + doc.id]; + if (!found) { return null } + var nw = []; + for (var i = 0; i < change.text.length; ++i) + { nw.push(removeClearedSpans(found[i])); } + return nw + } + + // Used for un/re-doing changes from the history. Combines the + // result of computing the existing spans with the set of spans that + // existed in the history (so that deleting around a span and then + // undoing brings back the span). + function mergeOldSpans(doc, change) { + var old = getOldSpans(doc, change); + var stretched = stretchSpansOverChange(doc, change); + if (!old) { return stretched } + if (!stretched) { return old } + + for (var i = 0; i < old.length; ++i) { + var oldCur = old[i], stretchCur = stretched[i]; + if (oldCur && stretchCur) { + spans: for (var j = 0; j < stretchCur.length; ++j) { + var span = stretchCur[j]; + for (var k = 0; k < oldCur.length; ++k) + { if (oldCur[k].marker == span.marker) { continue spans } } + oldCur.push(span); + } + } else if (stretchCur) { + old[i] = stretchCur; + } + } + return old + } + + // Used both to provide a JSON-safe object in .getHistory, and, when + // detaching a document, to split the history in two + function copyHistoryArray(events, newGroup, instantiateSel) { + var copy = []; + for (var i = 0; i < events.length; ++i) { + var event = events[i]; + if (event.ranges) { + copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event); + continue + } + var changes = event.changes, newChanges = []; + copy.push({changes: newChanges}); + for (var j = 0; j < changes.length; ++j) { + var change = changes[j], m = (void 0); + newChanges.push({from: change.from, to: change.to, text: change.text}); + if (newGroup) { for (var prop in change) { if (m = prop.match(/^spans_(\d+)$/)) { + if (indexOf(newGroup, Number(m[1])) > -1) { + lst(newChanges)[prop] = change[prop]; + delete change[prop]; + } + } } } + } + } + return copy + } + + // The 'scroll' parameter given to many of these indicated whether + // the new cursor position should be scrolled into view after + // modifying the selection. + + // If shift is held or the extend flag is set, extends a range to + // include a given position (and optionally a second position). + // Otherwise, simply returns the range between the given positions. + // Used for cursor motion and such. + function extendRange(range, head, other, extend) { + if (extend) { + var anchor = range.anchor; + if (other) { + var posBefore = cmp(head, anchor) < 0; + if (posBefore != (cmp(other, anchor) < 0)) { + anchor = head; + head = other; + } else if (posBefore != (cmp(head, other) < 0)) { + head = other; + } + } + return new Range(anchor, head) + } else { + return new Range(other || head, head) + } + } + + // Extend the primary selection range, discard the rest. + function extendSelection(doc, head, other, options, extend) { + if (extend == null) { extend = doc.cm && (doc.cm.display.shift || doc.extend); } + setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options); + } + + // Extend all selections (pos is an array of selections with length + // equal the number of selections) + function extendSelections(doc, heads, options) { + var out = []; + var extend = doc.cm && (doc.cm.display.shift || doc.extend); + for (var i = 0; i < doc.sel.ranges.length; i++) + { out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend); } + var newSel = normalizeSelection(doc.cm, out, doc.sel.primIndex); + setSelection(doc, newSel, options); + } + + // Updates a single range in the selection. + function replaceOneSelection(doc, i, range, options) { + var ranges = doc.sel.ranges.slice(0); + ranges[i] = range; + setSelection(doc, normalizeSelection(doc.cm, ranges, doc.sel.primIndex), options); + } + + // Reset the selection to a single range. + function setSimpleSelection(doc, anchor, head, options) { + setSelection(doc, simpleSelection(anchor, head), options); + } + + // Give beforeSelectionChange handlers a change to influence a + // selection update. + function filterSelectionChange(doc, sel, options) { + var obj = { + ranges: sel.ranges, + update: function(ranges) { + this.ranges = []; + for (var i = 0; i < ranges.length; i++) + { this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor), + clipPos(doc, ranges[i].head)); } + }, + origin: options && options.origin + }; + signal(doc, "beforeSelectionChange", doc, obj); + if (doc.cm) { signal(doc.cm, "beforeSelectionChange", doc.cm, obj); } + if (obj.ranges != sel.ranges) { return normalizeSelection(doc.cm, obj.ranges, obj.ranges.length - 1) } + else { return sel } + } + + function setSelectionReplaceHistory(doc, sel, options) { + var done = doc.history.done, last = lst(done); + if (last && last.ranges) { + done[done.length - 1] = sel; + setSelectionNoUndo(doc, sel, options); + } else { + setSelection(doc, sel, options); + } + } + + // Set a new selection. + function setSelection(doc, sel, options) { + setSelectionNoUndo(doc, sel, options); + addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options); + } + + function setSelectionNoUndo(doc, sel, options) { + if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) + { sel = filterSelectionChange(doc, sel, options); } + + var bias = options && options.bias || + (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1); + setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true)); + + if (!(options && options.scroll === false) && doc.cm && doc.cm.getOption("readOnly") != "nocursor") + { ensureCursorVisible(doc.cm); } + } + + function setSelectionInner(doc, sel) { + if (sel.equals(doc.sel)) { return } + + doc.sel = sel; + + if (doc.cm) { + doc.cm.curOp.updateInput = 1; + doc.cm.curOp.selectionChanged = true; + signalCursorActivity(doc.cm); + } + signalLater(doc, "cursorActivity", doc); + } + + // Verify that the selection does not partially select any atomic + // marked ranges. + function reCheckSelection(doc) { + setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false)); + } + + // Return a selection that does not partially select any atomic + // ranges. + function skipAtomicInSelection(doc, sel, bias, mayClear) { + var out; + for (var i = 0; i < sel.ranges.length; i++) { + var range = sel.ranges[i]; + var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]; + var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear); + var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear); + if (out || newAnchor != range.anchor || newHead != range.head) { + if (!out) { out = sel.ranges.slice(0, i); } + out[i] = new Range(newAnchor, newHead); + } + } + return out ? normalizeSelection(doc.cm, out, sel.primIndex) : sel + } + + function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { + var line = getLine(doc, pos.line); + if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) { + var sp = line.markedSpans[i], m = sp.marker; + + // Determine if we should prevent the cursor being placed to the left/right of an atomic marker + // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it + // is with selectLeft/Right + var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft; + var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight; + + if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) && + (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) { + if (mayClear) { + signal(m, "beforeCursorEnter"); + if (m.explicitlyCleared) { + if (!line.markedSpans) { break } + else {--i; continue} + } + } + if (!m.atomic) { continue } + + if (oldPos) { + var near = m.find(dir < 0 ? 1 : -1), diff = (void 0); + if (dir < 0 ? preventCursorRight : preventCursorLeft) + { near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); } + if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0)) + { return skipAtomicInner(doc, near, pos, dir, mayClear) } + } + + var far = m.find(dir < 0 ? -1 : 1); + if (dir < 0 ? preventCursorLeft : preventCursorRight) + { far = movePos(doc, far, dir, far.line == pos.line ? line : null); } + return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null + } + } } + return pos + } + + // Ensure a given position is not inside an atomic range. + function skipAtomic(doc, pos, oldPos, bias, mayClear) { + var dir = bias || 1; + var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) || + (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) || + skipAtomicInner(doc, pos, oldPos, -dir, mayClear) || + (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true)); + if (!found) { + doc.cantEdit = true; + return Pos(doc.first, 0) + } + return found + } + + function movePos(doc, pos, dir, line) { + if (dir < 0 && pos.ch == 0) { + if (pos.line > doc.first) { return clipPos(doc, Pos(pos.line - 1)) } + else { return null } + } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) { + if (pos.line < doc.first + doc.size - 1) { return Pos(pos.line + 1, 0) } + else { return null } + } else { + return new Pos(pos.line, pos.ch + dir) + } + } + + function selectAll(cm) { + cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll); + } + + // UPDATING + + // Allow "beforeChange" event handlers to influence a change + function filterChange(doc, change, update) { + var obj = { + canceled: false, + from: change.from, + to: change.to, + text: change.text, + origin: change.origin, + cancel: function () { return obj.canceled = true; } + }; + if (update) { obj.update = function (from, to, text, origin) { + if (from) { obj.from = clipPos(doc, from); } + if (to) { obj.to = clipPos(doc, to); } + if (text) { obj.text = text; } + if (origin !== undefined) { obj.origin = origin; } + }; } + signal(doc, "beforeChange", doc, obj); + if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj); } + + if (obj.canceled) { + if (doc.cm) { doc.cm.curOp.updateInput = 2; } + return null + } + return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin} + } + + // Apply a change to a document, and add it to the document's + // history, and propagating it to all linked documents. + function makeChange(doc, change, ignoreReadOnly) { + if (doc.cm) { + if (!doc.cm.curOp) { return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly) } + if (doc.cm.state.suppressEdits) { return } + } + + if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) { + change = filterChange(doc, change, true); + if (!change) { return } + } + + // Possibly split or suppress the update based on the presence + // of read-only spans in its range. + var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to); + if (split) { + for (var i = split.length - 1; i >= 0; --i) + { makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text, origin: change.origin}); } + } else { + makeChangeInner(doc, change); + } + } + + function makeChangeInner(doc, change) { + if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { return } + var selAfter = computeSelAfterChange(doc, change); + addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN); + + makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change)); + var rebased = []; + + linkedDocs(doc, function (doc, sharedHist) { + if (!sharedHist && indexOf(rebased, doc.history) == -1) { + rebaseHist(doc.history, change); + rebased.push(doc.history); + } + makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change)); + }); + } + + // Revert a change stored in a document's history. + function makeChangeFromHistory(doc, type, allowSelectionOnly) { + var suppress = doc.cm && doc.cm.state.suppressEdits; + if (suppress && !allowSelectionOnly) { return } + + var hist = doc.history, event, selAfter = doc.sel; + var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done; + + // Verify that there is a useable event (so that ctrl-z won't + // needlessly clear selection events) + var i = 0; + for (; i < source.length; i++) { + event = source[i]; + if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges) + { break } + } + if (i == source.length) { return } + hist.lastOrigin = hist.lastSelOrigin = null; + + for (;;) { + event = source.pop(); + if (event.ranges) { + pushSelectionToHistory(event, dest); + if (allowSelectionOnly && !event.equals(doc.sel)) { + setSelection(doc, event, {clearRedo: false}); + return + } + selAfter = event; + } else if (suppress) { + source.push(event); + return + } else { break } + } + + // Build up a reverse change object to add to the opposite history + // stack (redo when undoing, and vice versa). + var antiChanges = []; + pushSelectionToHistory(selAfter, dest); + dest.push({changes: antiChanges, generation: hist.generation}); + hist.generation = event.generation || ++hist.maxGeneration; + + var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange"); + + var loop = function ( i ) { + var change = event.changes[i]; + change.origin = type; + if (filter && !filterChange(doc, change, false)) { + source.length = 0; + return {} + } + + antiChanges.push(historyChangeFromChange(doc, change)); + + var after = i ? computeSelAfterChange(doc, change) : lst(source); + makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change)); + if (!i && doc.cm) { doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}); } + var rebased = []; + + // Propagate to the linked documents + linkedDocs(doc, function (doc, sharedHist) { + if (!sharedHist && indexOf(rebased, doc.history) == -1) { + rebaseHist(doc.history, change); + rebased.push(doc.history); + } + makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change)); + }); + }; + + for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) { + var returned = loop( i$1 ); + + if ( returned ) return returned.v; + } + } + + // Sub-views need their line numbers shifted when text is added + // above or below them in the parent document. + function shiftDoc(doc, distance) { + if (distance == 0) { return } + doc.first += distance; + doc.sel = new Selection(map(doc.sel.ranges, function (range) { return new Range( + Pos(range.anchor.line + distance, range.anchor.ch), + Pos(range.head.line + distance, range.head.ch) + ); }), doc.sel.primIndex); + if (doc.cm) { + regChange(doc.cm, doc.first, doc.first - distance, distance); + for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) + { regLineChange(doc.cm, l, "gutter"); } + } + } + + // More lower-level change function, handling only a single document + // (not linked ones). + function makeChangeSingleDoc(doc, change, selAfter, spans) { + if (doc.cm && !doc.cm.curOp) + { return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans) } + + if (change.to.line < doc.first) { + shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line)); + return + } + if (change.from.line > doc.lastLine()) { return } + + // Clip the change to the size of this doc + if (change.from.line < doc.first) { + var shift = change.text.length - 1 - (doc.first - change.from.line); + shiftDoc(doc, shift); + change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch), + text: [lst(change.text)], origin: change.origin}; + } + var last = doc.lastLine(); + if (change.to.line > last) { + change = {from: change.from, to: Pos(last, getLine(doc, last).text.length), + text: [change.text[0]], origin: change.origin}; + } + + change.removed = getBetween(doc, change.from, change.to); + + if (!selAfter) { selAfter = computeSelAfterChange(doc, change); } + if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); } + else { updateDoc(doc, change, spans); } + setSelectionNoUndo(doc, selAfter, sel_dontScroll); + + if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0))) + { doc.cantEdit = false; } + } + + // Handle the interaction of a change to a document with the editor + // that this document is part of. + function makeChangeSingleDocInEditor(cm, change, spans) { + var doc = cm.doc, display = cm.display, from = change.from, to = change.to; + + var recomputeMaxLength = false, checkWidthStart = from.line; + if (!cm.options.lineWrapping) { + checkWidthStart = lineNo(visualLine(getLine(doc, from.line))); + doc.iter(checkWidthStart, to.line + 1, function (line) { + if (line == display.maxLine) { + recomputeMaxLength = true; + return true + } + }); + } + + if (doc.sel.contains(change.from, change.to) > -1) + { signalCursorActivity(cm); } + + updateDoc(doc, change, spans, estimateHeight(cm)); + + if (!cm.options.lineWrapping) { + doc.iter(checkWidthStart, from.line + change.text.length, function (line) { + var len = lineLength(line); + if (len > display.maxLineLength) { + display.maxLine = line; + display.maxLineLength = len; + display.maxLineChanged = true; + recomputeMaxLength = false; + } + }); + if (recomputeMaxLength) { cm.curOp.updateMaxLine = true; } + } + + retreatFrontier(doc, from.line); + startWorker(cm, 400); + + var lendiff = change.text.length - (to.line - from.line) - 1; + // Remember that these lines changed, for updating the display + if (change.full) + { regChange(cm); } + else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change)) + { regLineChange(cm, from.line, "text"); } + else + { regChange(cm, from.line, to.line + 1, lendiff); } + + var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change"); + if (changeHandler || changesHandler) { + var obj = { + from: from, to: to, + text: change.text, + removed: change.removed, + origin: change.origin + }; + if (changeHandler) { signalLater(cm, "change", cm, obj); } + if (changesHandler) { (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); } + } + cm.display.selForContextMenu = null; + } + + function replaceRange(doc, code, from, to, origin) { + var assign; + + if (!to) { to = from; } + if (cmp(to, from) < 0) { (assign = [to, from], from = assign[0], to = assign[1]); } + if (typeof code == "string") { code = doc.splitLines(code); } + makeChange(doc, {from: from, to: to, text: code, origin: origin}); + } + + // Rebasing/resetting history to deal with externally-sourced changes + + function rebaseHistSelSingle(pos, from, to, diff) { + if (to < pos.line) { + pos.line += diff; + } else if (from < pos.line) { + pos.line = from; + pos.ch = 0; + } + } + + // Tries to rebase an array of history events given a change in the + // document. If the change touches the same lines as the event, the + // event, and everything 'behind' it, is discarded. If the change is + // before the event, the event's positions are updated. Uses a + // copy-on-write scheme for the positions, to avoid having to + // reallocate them all on every rebase, but also avoid problems with + // shared position objects being unsafely updated. + function rebaseHistArray(array, from, to, diff) { + for (var i = 0; i < array.length; ++i) { + var sub = array[i], ok = true; + if (sub.ranges) { + if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; } + for (var j = 0; j < sub.ranges.length; j++) { + rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff); + rebaseHistSelSingle(sub.ranges[j].head, from, to, diff); + } + continue + } + for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) { + var cur = sub.changes[j$1]; + if (to < cur.from.line) { + cur.from = Pos(cur.from.line + diff, cur.from.ch); + cur.to = Pos(cur.to.line + diff, cur.to.ch); + } else if (from <= cur.to.line) { + ok = false; + break + } + } + if (!ok) { + array.splice(0, i + 1); + i = 0; + } + } + } + + function rebaseHist(hist, change) { + var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1; + rebaseHistArray(hist.done, from, to, diff); + rebaseHistArray(hist.undone, from, to, diff); + } + + // Utility for applying a change to a line by handle or number, + // returning the number and optionally registering the line as + // changed. + function changeLine(doc, handle, changeType, op) { + var no = handle, line = handle; + if (typeof handle == "number") { line = getLine(doc, clipLine(doc, handle)); } + else { no = lineNo(handle); } + if (no == null) { return null } + if (op(line, no) && doc.cm) { regLineChange(doc.cm, no, changeType); } + return line + } + + // The document is represented as a BTree consisting of leaves, with + // chunk of lines in them, and branches, with up to ten leaves or + // other branch nodes below them. The top node is always a branch + // node, and is the document object itself (meaning it has + // additional methods and properties). + // + // All nodes have parent links. The tree is used both to go from + // line numbers to line objects, and to go from objects to numbers. + // It also indexes by height, and is used to convert between height + // and line object, and to find the total height of the document. + // + // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html + + function LeafChunk(lines) { + this.lines = lines; + this.parent = null; + var height = 0; + for (var i = 0; i < lines.length; ++i) { + lines[i].parent = this; + height += lines[i].height; + } + this.height = height; + } + + LeafChunk.prototype = { + chunkSize: function() { return this.lines.length }, + + // Remove the n lines at offset 'at'. + removeInner: function(at, n) { + for (var i = at, e = at + n; i < e; ++i) { + var line = this.lines[i]; + this.height -= line.height; + cleanUpLine(line); + signalLater(line, "delete"); + } + this.lines.splice(at, n); + }, + + // Helper used to collapse a small branch into a single leaf. + collapse: function(lines) { + lines.push.apply(lines, this.lines); + }, + + // Insert the given array of lines at offset 'at', count them as + // having the given height. + insertInner: function(at, lines, height) { + this.height += height; + this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at)); + for (var i = 0; i < lines.length; ++i) { lines[i].parent = this; } + }, + + // Used to iterate over a part of the tree. + iterN: function(at, n, op) { + for (var e = at + n; at < e; ++at) + { if (op(this.lines[at])) { return true } } + } + }; + + function BranchChunk(children) { + this.children = children; + var size = 0, height = 0; + for (var i = 0; i < children.length; ++i) { + var ch = children[i]; + size += ch.chunkSize(); height += ch.height; + ch.parent = this; + } + this.size = size; + this.height = height; + this.parent = null; + } + + BranchChunk.prototype = { + chunkSize: function() { return this.size }, + + removeInner: function(at, n) { + this.size -= n; + for (var i = 0; i < this.children.length; ++i) { + var child = this.children[i], sz = child.chunkSize(); + if (at < sz) { + var rm = Math.min(n, sz - at), oldHeight = child.height; + child.removeInner(at, rm); + this.height -= oldHeight - child.height; + if (sz == rm) { this.children.splice(i--, 1); child.parent = null; } + if ((n -= rm) == 0) { break } + at = 0; + } else { at -= sz; } + } + // If the result is smaller than 25 lines, ensure that it is a + // single leaf node. + if (this.size - n < 25 && + (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) { + var lines = []; + this.collapse(lines); + this.children = [new LeafChunk(lines)]; + this.children[0].parent = this; + } + }, + + collapse: function(lines) { + for (var i = 0; i < this.children.length; ++i) { this.children[i].collapse(lines); } + }, + + insertInner: function(at, lines, height) { + this.size += lines.length; + this.height += height; + for (var i = 0; i < this.children.length; ++i) { + var child = this.children[i], sz = child.chunkSize(); + if (at <= sz) { + child.insertInner(at, lines, height); + if (child.lines && child.lines.length > 50) { + // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced. + // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest. + var remaining = child.lines.length % 25 + 25; + for (var pos = remaining; pos < child.lines.length;) { + var leaf = new LeafChunk(child.lines.slice(pos, pos += 25)); + child.height -= leaf.height; + this.children.splice(++i, 0, leaf); + leaf.parent = this; + } + child.lines = child.lines.slice(0, remaining); + this.maybeSpill(); + } + break + } + at -= sz; + } + }, + + // When a node has grown, check whether it should be split. + maybeSpill: function() { + if (this.children.length <= 10) { return } + var me = this; + do { + var spilled = me.children.splice(me.children.length - 5, 5); + var sibling = new BranchChunk(spilled); + if (!me.parent) { // Become the parent node + var copy = new BranchChunk(me.children); + copy.parent = me; + me.children = [copy, sibling]; + me = copy; + } else { + me.size -= sibling.size; + me.height -= sibling.height; + var myIndex = indexOf(me.parent.children, me); + me.parent.children.splice(myIndex + 1, 0, sibling); + } + sibling.parent = me.parent; + } while (me.children.length > 10) + me.parent.maybeSpill(); + }, + + iterN: function(at, n, op) { + for (var i = 0; i < this.children.length; ++i) { + var child = this.children[i], sz = child.chunkSize(); + if (at < sz) { + var used = Math.min(n, sz - at); + if (child.iterN(at, used, op)) { return true } + if ((n -= used) == 0) { break } + at = 0; + } else { at -= sz; } + } + } + }; + + // Line widgets are block elements displayed above or below a line. + + var LineWidget = function(doc, node, options) { + if (options) { for (var opt in options) { if (options.hasOwnProperty(opt)) + { this[opt] = options[opt]; } } } + this.doc = doc; + this.node = node; + }; + + LineWidget.prototype.clear = function () { + var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line); + if (no == null || !ws) { return } + for (var i = 0; i < ws.length; ++i) { if (ws[i] == this) { ws.splice(i--, 1); } } + if (!ws.length) { line.widgets = null; } + var height = widgetHeight(this); + updateLineHeight(line, Math.max(0, line.height - height)); + if (cm) { + runInOp(cm, function () { + adjustScrollWhenAboveVisible(cm, line, -height); + regLineChange(cm, no, "widget"); + }); + signalLater(cm, "lineWidgetCleared", cm, this, no); + } + }; + + LineWidget.prototype.changed = function () { + var this$1 = this; + + var oldH = this.height, cm = this.doc.cm, line = this.line; + this.height = null; + var diff = widgetHeight(this) - oldH; + if (!diff) { return } + if (!lineIsHidden(this.doc, line)) { updateLineHeight(line, line.height + diff); } + if (cm) { + runInOp(cm, function () { + cm.curOp.forceUpdate = true; + adjustScrollWhenAboveVisible(cm, line, diff); + signalLater(cm, "lineWidgetChanged", cm, this$1, lineNo(line)); + }); + } + }; + eventMixin(LineWidget); + + function adjustScrollWhenAboveVisible(cm, line, diff) { + if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop)) + { addToScrollTop(cm, diff); } + } + + function addLineWidget(doc, handle, node, options) { + var widget = new LineWidget(doc, node, options); + var cm = doc.cm; + if (cm && widget.noHScroll) { cm.display.alignWidgets = true; } + changeLine(doc, handle, "widget", function (line) { + var widgets = line.widgets || (line.widgets = []); + if (widget.insertAt == null) { widgets.push(widget); } + else { widgets.splice(Math.min(widgets.length, Math.max(0, widget.insertAt)), 0, widget); } + widget.line = line; + if (cm && !lineIsHidden(doc, line)) { + var aboveVisible = heightAtLine(line) < doc.scrollTop; + updateLineHeight(line, line.height + widgetHeight(widget)); + if (aboveVisible) { addToScrollTop(cm, widget.height); } + cm.curOp.forceUpdate = true; + } + return true + }); + if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); } + return widget + } + + // TEXTMARKERS + + // Created with markText and setBookmark methods. A TextMarker is a + // handle that can be used to clear or find a marked position in the + // document. Line objects hold arrays (markedSpans) containing + // {from, to, marker} object pointing to such marker objects, and + // indicating that such a marker is present on that line. Multiple + // lines may point to the same marker when it spans across lines. + // The spans will have null for their from/to properties when the + // marker continues beyond the start/end of the line. Markers have + // links back to the lines they currently touch. + + // Collapsed markers have unique ids, in order to be able to order + // them, which is needed for uniquely determining an outer marker + // when they overlap (they may nest, but not partially overlap). + var nextMarkerId = 0; + + var TextMarker = function(doc, type) { + this.lines = []; + this.type = type; + this.doc = doc; + this.id = ++nextMarkerId; + }; + + // Clear the marker. + TextMarker.prototype.clear = function () { + if (this.explicitlyCleared) { return } + var cm = this.doc.cm, withOp = cm && !cm.curOp; + if (withOp) { startOperation(cm); } + if (hasHandler(this, "clear")) { + var found = this.find(); + if (found) { signalLater(this, "clear", found.from, found.to); } + } + var min = null, max = null; + for (var i = 0; i < this.lines.length; ++i) { + var line = this.lines[i]; + var span = getMarkedSpanFor(line.markedSpans, this); + if (cm && !this.collapsed) { regLineChange(cm, lineNo(line), "text"); } + else if (cm) { + if (span.to != null) { max = lineNo(line); } + if (span.from != null) { min = lineNo(line); } + } + line.markedSpans = removeMarkedSpan(line.markedSpans, span); + if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm) + { updateLineHeight(line, textHeight(cm.display)); } + } + if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) { + var visual = visualLine(this.lines[i$1]), len = lineLength(visual); + if (len > cm.display.maxLineLength) { + cm.display.maxLine = visual; + cm.display.maxLineLength = len; + cm.display.maxLineChanged = true; + } + } } + + if (min != null && cm && this.collapsed) { regChange(cm, min, max + 1); } + this.lines.length = 0; + this.explicitlyCleared = true; + if (this.atomic && this.doc.cantEdit) { + this.doc.cantEdit = false; + if (cm) { reCheckSelection(cm.doc); } + } + if (cm) { signalLater(cm, "markerCleared", cm, this, min, max); } + if (withOp) { endOperation(cm); } + if (this.parent) { this.parent.clear(); } + }; + + // Find the position of the marker in the document. Returns a {from, + // to} object by default. Side can be passed to get a specific side + // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the + // Pos objects returned contain a line object, rather than a line + // number (used to prevent looking up the same line twice). + TextMarker.prototype.find = function (side, lineObj) { + if (side == null && this.type == "bookmark") { side = 1; } + var from, to; + for (var i = 0; i < this.lines.length; ++i) { + var line = this.lines[i]; + var span = getMarkedSpanFor(line.markedSpans, this); + if (span.from != null) { + from = Pos(lineObj ? line : lineNo(line), span.from); + if (side == -1) { return from } + } + if (span.to != null) { + to = Pos(lineObj ? line : lineNo(line), span.to); + if (side == 1) { return to } + } + } + return from && {from: from, to: to} + }; + + // Signals that the marker's widget changed, and surrounding layout + // should be recomputed. + TextMarker.prototype.changed = function () { + var this$1 = this; + + var pos = this.find(-1, true), widget = this, cm = this.doc.cm; + if (!pos || !cm) { return } + runInOp(cm, function () { + var line = pos.line, lineN = lineNo(pos.line); + var view = findViewForLine(cm, lineN); + if (view) { + clearLineMeasurementCacheFor(view); + cm.curOp.selectionChanged = cm.curOp.forceUpdate = true; + } + cm.curOp.updateMaxLine = true; + if (!lineIsHidden(widget.doc, line) && widget.height != null) { + var oldHeight = widget.height; + widget.height = null; + var dHeight = widgetHeight(widget) - oldHeight; + if (dHeight) + { updateLineHeight(line, line.height + dHeight); } + } + signalLater(cm, "markerChanged", cm, this$1); + }); + }; + + TextMarker.prototype.attachLine = function (line) { + if (!this.lines.length && this.doc.cm) { + var op = this.doc.cm.curOp; + if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1) + { (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); } + } + this.lines.push(line); + }; + + TextMarker.prototype.detachLine = function (line) { + this.lines.splice(indexOf(this.lines, line), 1); + if (!this.lines.length && this.doc.cm) { + var op = this.doc.cm.curOp + ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this); + } + }; + eventMixin(TextMarker); + + // Create a marker, wire it up to the right lines, and + function markText(doc, from, to, options, type) { + // Shared markers (across linked documents) are handled separately + // (markTextShared will call out to this again, once per + // document). + if (options && options.shared) { return markTextShared(doc, from, to, options, type) } + // Ensure we are in an operation. + if (doc.cm && !doc.cm.curOp) { return operation(doc.cm, markText)(doc, from, to, options, type) } + + var marker = new TextMarker(doc, type), diff = cmp(from, to); + if (options) { copyObj(options, marker, false); } + // Don't connect empty markers unless clearWhenEmpty is false + if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false) + { return marker } + if (marker.replacedWith) { + // Showing up as a widget implies collapsed (widget replaces text) + marker.collapsed = true; + marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget"); + if (!options.handleMouseEvents) { marker.widgetNode.setAttribute("cm-ignore-events", "true"); } + if (options.insertLeft) { marker.widgetNode.insertLeft = true; } + } + if (marker.collapsed) { + if (conflictingCollapsedRange(doc, from.line, from, to, marker) || + from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) + { throw new Error("Inserting collapsed marker partially overlapping an existing one") } + seeCollapsedSpans(); + } + + if (marker.addToHistory) + { addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN); } + + var curLine = from.line, cm = doc.cm, updateMaxLine; + doc.iter(curLine, to.line + 1, function (line) { + if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine) + { updateMaxLine = true; } + if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0); } + addMarkedSpan(line, new MarkedSpan(marker, + curLine == from.line ? from.ch : null, + curLine == to.line ? to.ch : null)); + ++curLine; + }); + // lineIsHidden depends on the presence of the spans, so needs a second pass + if (marker.collapsed) { doc.iter(from.line, to.line + 1, function (line) { + if (lineIsHidden(doc, line)) { updateLineHeight(line, 0); } + }); } + + if (marker.clearOnEnter) { on(marker, "beforeCursorEnter", function () { return marker.clear(); }); } + + if (marker.readOnly) { + seeReadOnlySpans(); + if (doc.history.done.length || doc.history.undone.length) + { doc.clearHistory(); } + } + if (marker.collapsed) { + marker.id = ++nextMarkerId; + marker.atomic = true; + } + if (cm) { + // Sync editor state + if (updateMaxLine) { cm.curOp.updateMaxLine = true; } + if (marker.collapsed) + { regChange(cm, from.line, to.line + 1); } + else if (marker.className || marker.startStyle || marker.endStyle || marker.css || + marker.attributes || marker.title) + { for (var i = from.line; i <= to.line; i++) { regLineChange(cm, i, "text"); } } + if (marker.atomic) { reCheckSelection(cm.doc); } + signalLater(cm, "markerAdded", cm, marker); + } + return marker + } + + // SHARED TEXTMARKERS + + // A shared marker spans multiple linked documents. It is + // implemented as a meta-marker-object controlling multiple normal + // markers. + var SharedTextMarker = function(markers, primary) { + this.markers = markers; + this.primary = primary; + for (var i = 0; i < markers.length; ++i) + { markers[i].parent = this; } + }; + + SharedTextMarker.prototype.clear = function () { + if (this.explicitlyCleared) { return } + this.explicitlyCleared = true; + for (var i = 0; i < this.markers.length; ++i) + { this.markers[i].clear(); } + signalLater(this, "clear"); + }; + + SharedTextMarker.prototype.find = function (side, lineObj) { + return this.primary.find(side, lineObj) + }; + eventMixin(SharedTextMarker); + + function markTextShared(doc, from, to, options, type) { + options = copyObj(options); + options.shared = false; + var markers = [markText(doc, from, to, options, type)], primary = markers[0]; + var widget = options.widgetNode; + linkedDocs(doc, function (doc) { + if (widget) { options.widgetNode = widget.cloneNode(true); } + markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type)); + for (var i = 0; i < doc.linked.length; ++i) + { if (doc.linked[i].isParent) { return } } + primary = lst(markers); + }); + return new SharedTextMarker(markers, primary) + } + + function findSharedMarkers(doc) { + return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { return m.parent; }) + } + + function copySharedMarkers(doc, markers) { + for (var i = 0; i < markers.length; i++) { + var marker = markers[i], pos = marker.find(); + var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to); + if (cmp(mFrom, mTo)) { + var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type); + marker.markers.push(subMark); + subMark.parent = marker; + } + } + } + + function detachSharedMarkers(markers) { + var loop = function ( i ) { + var marker = markers[i], linked = [marker.primary.doc]; + linkedDocs(marker.primary.doc, function (d) { return linked.push(d); }); + for (var j = 0; j < marker.markers.length; j++) { + var subMarker = marker.markers[j]; + if (indexOf(linked, subMarker.doc) == -1) { + subMarker.parent = null; + marker.markers.splice(j--, 1); + } + } + }; + + for (var i = 0; i < markers.length; i++) loop( i ); + } + + var nextDocId = 0; + var Doc = function(text, mode, firstLine, lineSep, direction) { + if (!(this instanceof Doc)) { return new Doc(text, mode, firstLine, lineSep, direction) } + if (firstLine == null) { firstLine = 0; } + + BranchChunk.call(this, [new LeafChunk([new Line("", null)])]); + this.first = firstLine; + this.scrollTop = this.scrollLeft = 0; + this.cantEdit = false; + this.cleanGeneration = 1; + this.modeFrontier = this.highlightFrontier = firstLine; + var start = Pos(firstLine, 0); + this.sel = simpleSelection(start); + this.history = new History(null); + this.id = ++nextDocId; + this.modeOption = mode; + this.lineSep = lineSep; + this.direction = (direction == "rtl") ? "rtl" : "ltr"; + this.extend = false; + + if (typeof text == "string") { text = this.splitLines(text); } + updateDoc(this, {from: start, to: start, text: text}); + setSelection(this, simpleSelection(start), sel_dontScroll); + }; + + Doc.prototype = createObj(BranchChunk.prototype, { + constructor: Doc, + // Iterate over the document. Supports two forms -- with only one + // argument, it calls that for each line in the document. With + // three, it iterates over the range given by the first two (with + // the second being non-inclusive). + iter: function(from, to, op) { + if (op) { this.iterN(from - this.first, to - from, op); } + else { this.iterN(this.first, this.first + this.size, from); } + }, + + // Non-public interface for adding and removing lines. + insert: function(at, lines) { + var height = 0; + for (var i = 0; i < lines.length; ++i) { height += lines[i].height; } + this.insertInner(at - this.first, lines, height); + }, + remove: function(at, n) { this.removeInner(at - this.first, n); }, + + // From here, the methods are part of the public interface. Most + // are also available from CodeMirror (editor) instances. + + getValue: function(lineSep) { + var lines = getLines(this, this.first, this.first + this.size); + if (lineSep === false) { return lines } + return lines.join(lineSep || this.lineSeparator()) + }, + setValue: docMethodOp(function(code) { + var top = Pos(this.first, 0), last = this.first + this.size - 1; + makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length), + text: this.splitLines(code), origin: "setValue", full: true}, true); + if (this.cm) { scrollToCoords(this.cm, 0, 0); } + setSelection(this, simpleSelection(top), sel_dontScroll); + }), + replaceRange: function(code, from, to, origin) { + from = clipPos(this, from); + to = to ? clipPos(this, to) : from; + replaceRange(this, code, from, to, origin); + }, + getRange: function(from, to, lineSep) { + var lines = getBetween(this, clipPos(this, from), clipPos(this, to)); + if (lineSep === false) { return lines } + return lines.join(lineSep || this.lineSeparator()) + }, + + getLine: function(line) {var l = this.getLineHandle(line); return l && l.text}, + + getLineHandle: function(line) {if (isLine(this, line)) { return getLine(this, line) }}, + getLineNumber: function(line) {return lineNo(line)}, + + getLineHandleVisualStart: function(line) { + if (typeof line == "number") { line = getLine(this, line); } + return visualLine(line) + }, + + lineCount: function() {return this.size}, + firstLine: function() {return this.first}, + lastLine: function() {return this.first + this.size - 1}, + + clipPos: function(pos) {return clipPos(this, pos)}, + + getCursor: function(start) { + var range = this.sel.primary(), pos; + if (start == null || start == "head") { pos = range.head; } + else if (start == "anchor") { pos = range.anchor; } + else if (start == "end" || start == "to" || start === false) { pos = range.to(); } + else { pos = range.from(); } + return pos + }, + listSelections: function() { return this.sel.ranges }, + somethingSelected: function() {return this.sel.somethingSelected()}, + + setCursor: docMethodOp(function(line, ch, options) { + setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options); + }), + setSelection: docMethodOp(function(anchor, head, options) { + setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options); + }), + extendSelection: docMethodOp(function(head, other, options) { + extendSelection(this, clipPos(this, head), other && clipPos(this, other), options); + }), + extendSelections: docMethodOp(function(heads, options) { + extendSelections(this, clipPosArray(this, heads), options); + }), + extendSelectionsBy: docMethodOp(function(f, options) { + var heads = map(this.sel.ranges, f); + extendSelections(this, clipPosArray(this, heads), options); + }), + setSelections: docMethodOp(function(ranges, primary, options) { + if (!ranges.length) { return } + var out = []; + for (var i = 0; i < ranges.length; i++) + { out[i] = new Range(clipPos(this, ranges[i].anchor), + clipPos(this, ranges[i].head)); } + if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex); } + setSelection(this, normalizeSelection(this.cm, out, primary), options); + }), + addSelection: docMethodOp(function(anchor, head, options) { + var ranges = this.sel.ranges.slice(0); + ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor))); + setSelection(this, normalizeSelection(this.cm, ranges, ranges.length - 1), options); + }), + + getSelection: function(lineSep) { + var ranges = this.sel.ranges, lines; + for (var i = 0; i < ranges.length; i++) { + var sel = getBetween(this, ranges[i].from(), ranges[i].to()); + lines = lines ? lines.concat(sel) : sel; + } + if (lineSep === false) { return lines } + else { return lines.join(lineSep || this.lineSeparator()) } + }, + getSelections: function(lineSep) { + var parts = [], ranges = this.sel.ranges; + for (var i = 0; i < ranges.length; i++) { + var sel = getBetween(this, ranges[i].from(), ranges[i].to()); + if (lineSep !== false) { sel = sel.join(lineSep || this.lineSeparator()); } + parts[i] = sel; + } + return parts + }, + replaceSelection: function(code, collapse, origin) { + var dup = []; + for (var i = 0; i < this.sel.ranges.length; i++) + { dup[i] = code; } + this.replaceSelections(dup, collapse, origin || "+input"); + }, + replaceSelections: docMethodOp(function(code, collapse, origin) { + var changes = [], sel = this.sel; + for (var i = 0; i < sel.ranges.length; i++) { + var range = sel.ranges[i]; + changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin}; + } + var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse); + for (var i$1 = changes.length - 1; i$1 >= 0; i$1--) + { makeChange(this, changes[i$1]); } + if (newSel) { setSelectionReplaceHistory(this, newSel); } + else if (this.cm) { ensureCursorVisible(this.cm); } + }), + undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}), + redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}), + undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}), + redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}), + + setExtending: function(val) {this.extend = val;}, + getExtending: function() {return this.extend}, + + historySize: function() { + var hist = this.history, done = 0, undone = 0; + for (var i = 0; i < hist.done.length; i++) { if (!hist.done[i].ranges) { ++done; } } + for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone; } } + return {undo: done, redo: undone} + }, + clearHistory: function() { + var this$1 = this; + + this.history = new History(this.history); + linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true); + }, + + markClean: function() { + this.cleanGeneration = this.changeGeneration(true); + }, + changeGeneration: function(forceSplit) { + if (forceSplit) + { this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; } + return this.history.generation + }, + isClean: function (gen) { + return this.history.generation == (gen || this.cleanGeneration) + }, + + getHistory: function() { + return {done: copyHistoryArray(this.history.done), + undone: copyHistoryArray(this.history.undone)} + }, + setHistory: function(histData) { + var hist = this.history = new History(this.history); + hist.done = copyHistoryArray(histData.done.slice(0), null, true); + hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); + }, + + setGutterMarker: docMethodOp(function(line, gutterID, value) { + return changeLine(this, line, "gutter", function (line) { + var markers = line.gutterMarkers || (line.gutterMarkers = {}); + markers[gutterID] = value; + if (!value && isEmpty(markers)) { line.gutterMarkers = null; } + return true + }) + }), + + clearGutter: docMethodOp(function(gutterID) { + var this$1 = this; + + this.iter(function (line) { + if (line.gutterMarkers && line.gutterMarkers[gutterID]) { + changeLine(this$1, line, "gutter", function () { + line.gutterMarkers[gutterID] = null; + if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null; } + return true + }); + } + }); + }), + + lineInfo: function(line) { + var n; + if (typeof line == "number") { + if (!isLine(this, line)) { return null } + n = line; + line = getLine(this, line); + if (!line) { return null } + } else { + n = lineNo(line); + if (n == null) { return null } + } + return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers, + textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass, + widgets: line.widgets} + }, + + addLineClass: docMethodOp(function(handle, where, cls) { + return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) { + var prop = where == "text" ? "textClass" + : where == "background" ? "bgClass" + : where == "gutter" ? "gutterClass" : "wrapClass"; + if (!line[prop]) { line[prop] = cls; } + else if (classTest(cls).test(line[prop])) { return false } + else { line[prop] += " " + cls; } + return true + }) + }), + removeLineClass: docMethodOp(function(handle, where, cls) { + return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) { + var prop = where == "text" ? "textClass" + : where == "background" ? "bgClass" + : where == "gutter" ? "gutterClass" : "wrapClass"; + var cur = line[prop]; + if (!cur) { return false } + else if (cls == null) { line[prop] = null; } + else { + var found = cur.match(classTest(cls)); + if (!found) { return false } + var end = found.index + found[0].length; + line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null; + } + return true + }) + }), + + addLineWidget: docMethodOp(function(handle, node, options) { + return addLineWidget(this, handle, node, options) + }), + removeLineWidget: function(widget) { widget.clear(); }, + + markText: function(from, to, options) { + return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range") + }, + setBookmark: function(pos, options) { + var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options), + insertLeft: options && options.insertLeft, + clearWhenEmpty: false, shared: options && options.shared, + handleMouseEvents: options && options.handleMouseEvents}; + pos = clipPos(this, pos); + return markText(this, pos, pos, realOpts, "bookmark") + }, + findMarksAt: function(pos) { + pos = clipPos(this, pos); + var markers = [], spans = getLine(this, pos.line).markedSpans; + if (spans) { for (var i = 0; i < spans.length; ++i) { + var span = spans[i]; + if ((span.from == null || span.from <= pos.ch) && + (span.to == null || span.to >= pos.ch)) + { markers.push(span.marker.parent || span.marker); } + } } + return markers + }, + findMarks: function(from, to, filter) { + from = clipPos(this, from); to = clipPos(this, to); + var found = [], lineNo = from.line; + this.iter(from.line, to.line + 1, function (line) { + var spans = line.markedSpans; + if (spans) { for (var i = 0; i < spans.length; i++) { + var span = spans[i]; + if (!(span.to != null && lineNo == from.line && from.ch >= span.to || + span.from == null && lineNo != from.line || + span.from != null && lineNo == to.line && span.from >= to.ch) && + (!filter || filter(span.marker))) + { found.push(span.marker.parent || span.marker); } + } } + ++lineNo; + }); + return found + }, + getAllMarks: function() { + var markers = []; + this.iter(function (line) { + var sps = line.markedSpans; + if (sps) { for (var i = 0; i < sps.length; ++i) + { if (sps[i].from != null) { markers.push(sps[i].marker); } } } + }); + return markers + }, + + posFromIndex: function(off) { + var ch, lineNo = this.first, sepSize = this.lineSeparator().length; + this.iter(function (line) { + var sz = line.text.length + sepSize; + if (sz > off) { ch = off; return true } + off -= sz; + ++lineNo; + }); + return clipPos(this, Pos(lineNo, ch)) + }, + indexFromPos: function (coords) { + coords = clipPos(this, coords); + var index = coords.ch; + if (coords.line < this.first || coords.ch < 0) { return 0 } + var sepSize = this.lineSeparator().length; + this.iter(this.first, coords.line, function (line) { // iter aborts when callback returns a truthy value + index += line.text.length + sepSize; + }); + return index + }, + + copy: function(copyHistory) { + var doc = new Doc(getLines(this, this.first, this.first + this.size), + this.modeOption, this.first, this.lineSep, this.direction); + doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft; + doc.sel = this.sel; + doc.extend = false; + if (copyHistory) { + doc.history.undoDepth = this.history.undoDepth; + doc.setHistory(this.getHistory()); + } + return doc + }, + + linkedDoc: function(options) { + if (!options) { options = {}; } + var from = this.first, to = this.first + this.size; + if (options.from != null && options.from > from) { from = options.from; } + if (options.to != null && options.to < to) { to = options.to; } + var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction); + if (options.sharedHist) { copy.history = this.history + ; }(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist}); + copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]; + copySharedMarkers(copy, findSharedMarkers(this)); + return copy + }, + unlinkDoc: function(other) { + if (other instanceof CodeMirror) { other = other.doc; } + if (this.linked) { for (var i = 0; i < this.linked.length; ++i) { + var link = this.linked[i]; + if (link.doc != other) { continue } + this.linked.splice(i, 1); + other.unlinkDoc(this); + detachSharedMarkers(findSharedMarkers(this)); + break + } } + // If the histories were shared, split them again + if (other.history == this.history) { + var splitIds = [other.id]; + linkedDocs(other, function (doc) { return splitIds.push(doc.id); }, true); + other.history = new History(null); + other.history.done = copyHistoryArray(this.history.done, splitIds); + other.history.undone = copyHistoryArray(this.history.undone, splitIds); + } + }, + iterLinkedDocs: function(f) {linkedDocs(this, f);}, + + getMode: function() {return this.mode}, + getEditor: function() {return this.cm}, + + splitLines: function(str) { + if (this.lineSep) { return str.split(this.lineSep) } + return splitLinesAuto(str) + }, + lineSeparator: function() { return this.lineSep || "\n" }, + + setDirection: docMethodOp(function (dir) { + if (dir != "rtl") { dir = "ltr"; } + if (dir == this.direction) { return } + this.direction = dir; + this.iter(function (line) { return line.order = null; }); + if (this.cm) { directionChanged(this.cm); } + }) + }); + + // Public alias. + Doc.prototype.eachLine = Doc.prototype.iter; + + // Kludge to work around strange IE behavior where it'll sometimes + // re-fire a series of drag-related events right after the drop (#1551) + var lastDrop = 0; + + function onDrop(e) { + var cm = this; + clearDragCursor(cm); + if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) + { return } + e_preventDefault(e); + if (ie) { lastDrop = +new Date; } + var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files; + if (!pos || cm.isReadOnly()) { return } + // Might be a file drop, in which case we simply extract the text + // and insert it. + if (files && files.length && window.FileReader && window.File) { + var n = files.length, text = Array(n), read = 0; + var markAsReadAndPasteIfAllFilesAreRead = function () { + if (++read == n) { + operation(cm, function () { + pos = clipPos(cm.doc, pos); + var change = {from: pos, to: pos, + text: cm.doc.splitLines( + text.filter(function (t) { return t != null; }).join(cm.doc.lineSeparator())), + origin: "paste"}; + makeChange(cm.doc, change); + setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change)))); + })(); + } + }; + var readTextFromFile = function (file, i) { + if (cm.options.allowDropFileTypes && + indexOf(cm.options.allowDropFileTypes, file.type) == -1) { + markAsReadAndPasteIfAllFilesAreRead(); + return + } + var reader = new FileReader; + reader.onerror = function () { return markAsReadAndPasteIfAllFilesAreRead(); }; + reader.onload = function () { + var content = reader.result; + if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { + markAsReadAndPasteIfAllFilesAreRead(); + return + } + text[i] = content; + markAsReadAndPasteIfAllFilesAreRead(); + }; + reader.readAsText(file); + }; + for (var i = 0; i < files.length; i++) { readTextFromFile(files[i], i); } + } else { // Normal drop + // Don't do a replace if the drop happened inside of the selected text. + if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) { + cm.state.draggingText(e); + // Ensure the editor is re-focused + setTimeout(function () { return cm.display.input.focus(); }, 20); + return + } + try { + var text$1 = e.dataTransfer.getData("Text"); + if (text$1) { + var selected; + if (cm.state.draggingText && !cm.state.draggingText.copy) + { selected = cm.listSelections(); } + setSelectionNoUndo(cm.doc, simpleSelection(pos, pos)); + if (selected) { for (var i$1 = 0; i$1 < selected.length; ++i$1) + { replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag"); } } + cm.replaceSelection(text$1, "around", "paste"); + cm.display.input.focus(); + } + } + catch(e$1){} + } + } + + function onDragStart(cm, e) { + if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return } + if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { return } + + e.dataTransfer.setData("Text", cm.getSelection()); + e.dataTransfer.effectAllowed = "copyMove"; + + // Use dummy image instead of default browsers image. + // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there. + if (e.dataTransfer.setDragImage && !safari) { + var img = elt("img", null, null, "position: fixed; left: 0; top: 0;"); + img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="; + if (presto) { + img.width = img.height = 1; + cm.display.wrapper.appendChild(img); + // Force a relayout, or Opera won't use our image for some obscure reason + img._top = img.offsetTop; + } + e.dataTransfer.setDragImage(img, 0, 0); + if (presto) { img.parentNode.removeChild(img); } + } + } + + function onDragOver(cm, e) { + var pos = posFromMouse(cm, e); + if (!pos) { return } + var frag = document.createDocumentFragment(); + drawSelectionCursor(cm, pos, frag); + if (!cm.display.dragCursor) { + cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors"); + cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv); + } + removeChildrenAndAdd(cm.display.dragCursor, frag); + } + + function clearDragCursor(cm) { + if (cm.display.dragCursor) { + cm.display.lineSpace.removeChild(cm.display.dragCursor); + cm.display.dragCursor = null; + } + } + + // These must be handled carefully, because naively registering a + // handler for each editor will cause the editors to never be + // garbage collected. + + function forEachCodeMirror(f) { + if (!document.getElementsByClassName) { return } + var byClass = document.getElementsByClassName("CodeMirror"), editors = []; + for (var i = 0; i < byClass.length; i++) { + var cm = byClass[i].CodeMirror; + if (cm) { editors.push(cm); } + } + if (editors.length) { editors[0].operation(function () { + for (var i = 0; i < editors.length; i++) { f(editors[i]); } + }); } + } + + var globalsRegistered = false; + function ensureGlobalHandlers() { + if (globalsRegistered) { return } + registerGlobalHandlers(); + globalsRegistered = true; + } + function registerGlobalHandlers() { + // When the window resizes, we need to refresh active editors. + var resizeTimer; + on(window, "resize", function () { + if (resizeTimer == null) { resizeTimer = setTimeout(function () { + resizeTimer = null; + forEachCodeMirror(onResize); + }, 100); } + }); + // When the window loses focus, we want to show the editor as blurred + on(window, "blur", function () { return forEachCodeMirror(onBlur); }); + } + // Called when the window resizes + function onResize(cm) { + var d = cm.display; + // Might be a text scaling operation, clear size caches. + d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; + d.scrollbarsClipped = false; + cm.setSize(); + } + + var keyNames = { + 3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt", + 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", + 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert", + 46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", + 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 145: "ScrollLock", + 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", + 221: "]", 222: "'", 224: "Mod", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete", + 63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert" + }; + + // Number keys + for (var i = 0; i < 10; i++) { keyNames[i + 48] = keyNames[i + 96] = String(i); } + // Alphabetic keys + for (var i$1 = 65; i$1 <= 90; i$1++) { keyNames[i$1] = String.fromCharCode(i$1); } + // Function keys + for (var i$2 = 1; i$2 <= 12; i$2++) { keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2; } + + var keyMap = {}; + + keyMap.basic = { + "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown", + "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown", + "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore", + "Tab": "defaultTab", "Shift-Tab": "indentAuto", + "Enter": "newlineAndIndent", "Insert": "toggleOverwrite", + "Esc": "singleSelection" + }; + // Note that the save and find-related commands aren't defined by + // default. User code or addons can define them. Unknown commands + // are simply ignored. + keyMap.pcDefault = { + "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo", + "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown", + "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd", + "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find", + "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll", + "Ctrl-[": "indentLess", "Ctrl-]": "indentMore", + "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection", + "fallthrough": "basic" + }; + // Very basic readline/emacs-style bindings, which are standard on Mac. + keyMap.emacsy = { + "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown", + "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", + "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore", + "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars", + "Ctrl-O": "openLine" + }; + keyMap.macDefault = { + "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo", + "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft", + "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore", + "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find", + "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll", + "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight", + "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd", + "fallthrough": ["basic", "emacsy"] + }; + keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault; + + // KEYMAP DISPATCH + + function normalizeKeyName(name) { + var parts = name.split(/-(?!$)/); + name = parts[parts.length - 1]; + var alt, ctrl, shift, cmd; + for (var i = 0; i < parts.length - 1; i++) { + var mod = parts[i]; + if (/^(cmd|meta|m)$/i.test(mod)) { cmd = true; } + else if (/^a(lt)?$/i.test(mod)) { alt = true; } + else if (/^(c|ctrl|control)$/i.test(mod)) { ctrl = true; } + else if (/^s(hift)?$/i.test(mod)) { shift = true; } + else { throw new Error("Unrecognized modifier name: " + mod) } + } + if (alt) { name = "Alt-" + name; } + if (ctrl) { name = "Ctrl-" + name; } + if (cmd) { name = "Cmd-" + name; } + if (shift) { name = "Shift-" + name; } + return name + } + + // This is a kludge to keep keymaps mostly working as raw objects + // (backwards compatibility) while at the same time support features + // like normalization and multi-stroke key bindings. It compiles a + // new normalized keymap, and then updates the old object to reflect + // this. + function normalizeKeyMap(keymap) { + var copy = {}; + for (var keyname in keymap) { if (keymap.hasOwnProperty(keyname)) { + var value = keymap[keyname]; + if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { continue } + if (value == "...") { delete keymap[keyname]; continue } + + var keys = map(keyname.split(" "), normalizeKeyName); + for (var i = 0; i < keys.length; i++) { + var val = (void 0), name = (void 0); + if (i == keys.length - 1) { + name = keys.join(" "); + val = value; + } else { + name = keys.slice(0, i + 1).join(" "); + val = "..."; + } + var prev = copy[name]; + if (!prev) { copy[name] = val; } + else if (prev != val) { throw new Error("Inconsistent bindings for " + name) } + } + delete keymap[keyname]; + } } + for (var prop in copy) { keymap[prop] = copy[prop]; } + return keymap + } + + function lookupKey(key, map, handle, context) { + map = getKeyMap(map); + var found = map.call ? map.call(key, context) : map[key]; + if (found === false) { return "nothing" } + if (found === "...") { return "multi" } + if (found != null && handle(found)) { return "handled" } + + if (map.fallthrough) { + if (Object.prototype.toString.call(map.fallthrough) != "[object Array]") + { return lookupKey(key, map.fallthrough, handle, context) } + for (var i = 0; i < map.fallthrough.length; i++) { + var result = lookupKey(key, map.fallthrough[i], handle, context); + if (result) { return result } + } + } + } + + // Modifier key presses don't count as 'real' key presses for the + // purpose of keymap fallthrough. + function isModifierKey(value) { + var name = typeof value == "string" ? value : keyNames[value.keyCode]; + return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod" + } + + function addModifierNames(name, event, noShift) { + var base = name; + if (event.altKey && base != "Alt") { name = "Alt-" + name; } + if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name; } + if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Mod") { name = "Cmd-" + name; } + if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name; } + return name + } + + // Look up the name of a key as indicated by an event object. + function keyName(event, noShift) { + if (presto && event.keyCode == 34 && event["char"]) { return false } + var name = keyNames[event.keyCode]; + if (name == null || event.altGraphKey) { return false } + // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause, + // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+) + if (event.keyCode == 3 && event.code) { name = event.code; } + return addModifierNames(name, event, noShift) + } + + function getKeyMap(val) { + return typeof val == "string" ? keyMap[val] : val + } + + // Helper for deleting text near the selection(s), used to implement + // backspace, delete, and similar functionality. + function deleteNearSelection(cm, compute) { + var ranges = cm.doc.sel.ranges, kill = []; + // Build up a set of ranges to kill first, merging overlapping + // ranges. + for (var i = 0; i < ranges.length; i++) { + var toKill = compute(ranges[i]); + while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) { + var replaced = kill.pop(); + if (cmp(replaced.from, toKill.from) < 0) { + toKill.from = replaced.from; + break + } + } + kill.push(toKill); + } + // Next, remove those actual ranges. + runInOp(cm, function () { + for (var i = kill.length - 1; i >= 0; i--) + { replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); } + ensureCursorVisible(cm); + }); + } + + function moveCharLogically(line, ch, dir) { + var target = skipExtendingChars(line.text, ch + dir, dir); + return target < 0 || target > line.text.length ? null : target + } + + function moveLogically(line, start, dir) { + var ch = moveCharLogically(line, start.ch, dir); + return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before") + } + + function endOfLine(visually, cm, lineObj, lineNo, dir) { + if (visually) { + if (cm.doc.direction == "rtl") { dir = -dir; } + var order = getOrder(lineObj, cm.doc.direction); + if (order) { + var part = dir < 0 ? lst(order) : order[0]; + var moveInStorageOrder = (dir < 0) == (part.level == 1); + var sticky = moveInStorageOrder ? "after" : "before"; + var ch; + // With a wrapped rtl chunk (possibly spanning multiple bidi parts), + // it could be that the last bidi part is not on the last visual line, + // since visual lines contain content order-consecutive chunks. + // Thus, in rtl, we are looking for the first (content-order) character + // in the rtl chunk that is on the last line (that is, the same line + // as the last (content-order) character). + if (part.level > 0 || cm.doc.direction == "rtl") { + var prep = prepareMeasureForLine(cm, lineObj); + ch = dir < 0 ? lineObj.text.length - 1 : 0; + var targetTop = measureCharPrepared(cm, prep, ch).top; + ch = findFirst(function (ch) { return measureCharPrepared(cm, prep, ch).top == targetTop; }, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch); + if (sticky == "before") { ch = moveCharLogically(lineObj, ch, 1); } + } else { ch = dir < 0 ? part.to : part.from; } + return new Pos(lineNo, ch, sticky) + } + } + return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after") + } + + function moveVisually(cm, line, start, dir) { + var bidi = getOrder(line, cm.doc.direction); + if (!bidi) { return moveLogically(line, start, dir) } + if (start.ch >= line.text.length) { + start.ch = line.text.length; + start.sticky = "before"; + } else if (start.ch <= 0) { + start.ch = 0; + start.sticky = "after"; + } + var partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos]; + if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) { + // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines, + // nothing interesting happens. + return moveLogically(line, start, dir) + } + + var mv = function (pos, dir) { return moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir); }; + var prep; + var getWrappedLineExtent = function (ch) { + if (!cm.options.lineWrapping) { return {begin: 0, end: line.text.length} } + prep = prep || prepareMeasureForLine(cm, line); + return wrappedLineExtentChar(cm, line, prep, ch) + }; + var wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch); + + if (cm.doc.direction == "rtl" || part.level == 1) { + var moveInStorageOrder = (part.level == 1) == (dir < 0); + var ch = mv(start, moveInStorageOrder ? 1 : -1); + if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) { + // Case 2: We move within an rtl part or in an rtl editor on the same visual line + var sticky = moveInStorageOrder ? "before" : "after"; + return new Pos(start.line, ch, sticky) + } + } + + // Case 3: Could not move within this bidi part in this visual line, so leave + // the current bidi part + + var searchInVisualLine = function (partPos, dir, wrappedLineExtent) { + var getRes = function (ch, moveInStorageOrder) { return moveInStorageOrder + ? new Pos(start.line, mv(ch, 1), "before") + : new Pos(start.line, ch, "after"); }; + + for (; partPos >= 0 && partPos < bidi.length; partPos += dir) { + var part = bidi[partPos]; + var moveInStorageOrder = (dir > 0) == (part.level != 1); + var ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1); + if (part.from <= ch && ch < part.to) { return getRes(ch, moveInStorageOrder) } + ch = moveInStorageOrder ? part.from : mv(part.to, -1); + if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) { return getRes(ch, moveInStorageOrder) } + } + }; + + // Case 3a: Look for other bidi parts on the same visual line + var res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent); + if (res) { return res } + + // Case 3b: Look for other bidi parts on the next visual line + var nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1); + if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) { + res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh)); + if (res) { return res } + } + + // Case 4: Nowhere to move + return null + } + + // Commands are parameter-less actions that can be performed on an + // editor, mostly used for keybindings. + var commands = { + selectAll: selectAll, + singleSelection: function (cm) { return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); }, + killLine: function (cm) { return deleteNearSelection(cm, function (range) { + if (range.empty()) { + var len = getLine(cm.doc, range.head.line).text.length; + if (range.head.ch == len && range.head.line < cm.lastLine()) + { return {from: range.head, to: Pos(range.head.line + 1, 0)} } + else + { return {from: range.head, to: Pos(range.head.line, len)} } + } else { + return {from: range.from(), to: range.to()} + } + }); }, + deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({ + from: Pos(range.from().line, 0), + to: clipPos(cm.doc, Pos(range.to().line + 1, 0)) + }); }); }, + delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({ + from: Pos(range.from().line, 0), to: range.from() + }); }); }, + delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { + var top = cm.charCoords(range.head, "div").top + 5; + var leftPos = cm.coordsChar({left: 0, top: top}, "div"); + return {from: leftPos, to: range.from()} + }); }, + delWrappedLineRight: function (cm) { return deleteNearSelection(cm, function (range) { + var top = cm.charCoords(range.head, "div").top + 5; + var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"); + return {from: range.from(), to: rightPos } + }); }, + undo: function (cm) { return cm.undo(); }, + redo: function (cm) { return cm.redo(); }, + undoSelection: function (cm) { return cm.undoSelection(); }, + redoSelection: function (cm) { return cm.redoSelection(); }, + goDocStart: function (cm) { return cm.extendSelection(Pos(cm.firstLine(), 0)); }, + goDocEnd: function (cm) { return cm.extendSelection(Pos(cm.lastLine())); }, + goLineStart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStart(cm, range.head.line); }, + {origin: "+move", bias: 1} + ); }, + goLineStartSmart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStartSmart(cm, range.head); }, + {origin: "+move", bias: 1} + ); }, + goLineEnd: function (cm) { return cm.extendSelectionsBy(function (range) { return lineEnd(cm, range.head.line); }, + {origin: "+move", bias: -1} + ); }, + goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) { + var top = cm.cursorCoords(range.head, "div").top + 5; + return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div") + }, sel_move); }, + goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) { + var top = cm.cursorCoords(range.head, "div").top + 5; + return cm.coordsChar({left: 0, top: top}, "div") + }, sel_move); }, + goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) { + var top = cm.cursorCoords(range.head, "div").top + 5; + var pos = cm.coordsChar({left: 0, top: top}, "div"); + if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) } + return pos + }, sel_move); }, + goLineUp: function (cm) { return cm.moveV(-1, "line"); }, + goLineDown: function (cm) { return cm.moveV(1, "line"); }, + goPageUp: function (cm) { return cm.moveV(-1, "page"); }, + goPageDown: function (cm) { return cm.moveV(1, "page"); }, + goCharLeft: function (cm) { return cm.moveH(-1, "char"); }, + goCharRight: function (cm) { return cm.moveH(1, "char"); }, + goColumnLeft: function (cm) { return cm.moveH(-1, "column"); }, + goColumnRight: function (cm) { return cm.moveH(1, "column"); }, + goWordLeft: function (cm) { return cm.moveH(-1, "word"); }, + goGroupRight: function (cm) { return cm.moveH(1, "group"); }, + goGroupLeft: function (cm) { return cm.moveH(-1, "group"); }, + goWordRight: function (cm) { return cm.moveH(1, "word"); }, + delCharBefore: function (cm) { return cm.deleteH(-1, "codepoint"); }, + delCharAfter: function (cm) { return cm.deleteH(1, "char"); }, + delWordBefore: function (cm) { return cm.deleteH(-1, "word"); }, + delWordAfter: function (cm) { return cm.deleteH(1, "word"); }, + delGroupBefore: function (cm) { return cm.deleteH(-1, "group"); }, + delGroupAfter: function (cm) { return cm.deleteH(1, "group"); }, + indentAuto: function (cm) { return cm.indentSelection("smart"); }, + indentMore: function (cm) { return cm.indentSelection("add"); }, + indentLess: function (cm) { return cm.indentSelection("subtract"); }, + insertTab: function (cm) { return cm.replaceSelection("\t"); }, + insertSoftTab: function (cm) { + var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize; + for (var i = 0; i < ranges.length; i++) { + var pos = ranges[i].from(); + var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize); + spaces.push(spaceStr(tabSize - col % tabSize)); + } + cm.replaceSelections(spaces); + }, + defaultTab: function (cm) { + if (cm.somethingSelected()) { cm.indentSelection("add"); } + else { cm.execCommand("insertTab"); } + }, + // Swap the two chars left and right of each selection's head. + // Move cursor behind the two swapped characters afterwards. + // + // Doesn't consider line feeds a character. + // Doesn't scan more than one line above to find a character. + // Doesn't do anything on an empty line. + // Doesn't do anything with non-empty selections. + transposeChars: function (cm) { return runInOp(cm, function () { + var ranges = cm.listSelections(), newSel = []; + for (var i = 0; i < ranges.length; i++) { + if (!ranges[i].empty()) { continue } + var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text; + if (line) { + if (cur.ch == line.length) { cur = new Pos(cur.line, cur.ch - 1); } + if (cur.ch > 0) { + cur = new Pos(cur.line, cur.ch + 1); + cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2), + Pos(cur.line, cur.ch - 2), cur, "+transpose"); + } else if (cur.line > cm.doc.first) { + var prev = getLine(cm.doc, cur.line - 1).text; + if (prev) { + cur = new Pos(cur.line, 1); + cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() + + prev.charAt(prev.length - 1), + Pos(cur.line - 1, prev.length - 1), cur, "+transpose"); + } + } + } + newSel.push(new Range(cur, cur)); + } + cm.setSelections(newSel); + }); }, + newlineAndIndent: function (cm) { return runInOp(cm, function () { + var sels = cm.listSelections(); + for (var i = sels.length - 1; i >= 0; i--) + { cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input"); } + sels = cm.listSelections(); + for (var i$1 = 0; i$1 < sels.length; i$1++) + { cm.indentLine(sels[i$1].from().line, null, true); } + ensureCursorVisible(cm); + }); }, + openLine: function (cm) { return cm.replaceSelection("\n", "start"); }, + toggleOverwrite: function (cm) { return cm.toggleOverwrite(); } + }; + + + function lineStart(cm, lineN) { + var line = getLine(cm.doc, lineN); + var visual = visualLine(line); + if (visual != line) { lineN = lineNo(visual); } + return endOfLine(true, cm, visual, lineN, 1) + } + function lineEnd(cm, lineN) { + var line = getLine(cm.doc, lineN); + var visual = visualLineEnd(line); + if (visual != line) { lineN = lineNo(visual); } + return endOfLine(true, cm, line, lineN, -1) + } + function lineStartSmart(cm, pos) { + var start = lineStart(cm, pos.line); + var line = getLine(cm.doc, start.line); + var order = getOrder(line, cm.doc.direction); + if (!order || order[0].level == 0) { + var firstNonWS = Math.max(start.ch, line.text.search(/\S/)); + var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch; + return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky) + } + return start + } + + // Run a handler that was bound to a key. + function doHandleBinding(cm, bound, dropShift) { + if (typeof bound == "string") { + bound = commands[bound]; + if (!bound) { return false } + } + // Ensure previous input has been read, so that the handler sees a + // consistent view of the document + cm.display.input.ensurePolled(); + var prevShift = cm.display.shift, done = false; + try { + if (cm.isReadOnly()) { cm.state.suppressEdits = true; } + if (dropShift) { cm.display.shift = false; } + done = bound(cm) != Pass; + } finally { + cm.display.shift = prevShift; + cm.state.suppressEdits = false; + } + return done + } + + function lookupKeyForEditor(cm, name, handle) { + for (var i = 0; i < cm.state.keyMaps.length; i++) { + var result = lookupKey(name, cm.state.keyMaps[i], handle, cm); + if (result) { return result } + } + return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm)) + || lookupKey(name, cm.options.keyMap, handle, cm) + } + + // Note that, despite the name, this function is also used to check + // for bound mouse clicks. + + var stopSeq = new Delayed; + + function dispatchKey(cm, name, e, handle) { + var seq = cm.state.keySeq; + if (seq) { + if (isModifierKey(name)) { return "handled" } + if (/\'$/.test(name)) + { cm.state.keySeq = null; } + else + { stopSeq.set(50, function () { + if (cm.state.keySeq == seq) { + cm.state.keySeq = null; + cm.display.input.reset(); + } + }); } + if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { return true } + } + return dispatchKeyInner(cm, name, e, handle) + } + + function dispatchKeyInner(cm, name, e, handle) { + var result = lookupKeyForEditor(cm, name, handle); + + if (result == "multi") + { cm.state.keySeq = name; } + if (result == "handled") + { signalLater(cm, "keyHandled", cm, name, e); } + + if (result == "handled" || result == "multi") { + e_preventDefault(e); + restartBlink(cm); + } + + return !!result + } + + // Handle a key from the keydown event. + function handleKeyBinding(cm, e) { + var name = keyName(e, true); + if (!name) { return false } + + if (e.shiftKey && !cm.state.keySeq) { + // First try to resolve full name (including 'Shift-'). Failing + // that, see if there is a cursor-motion command (starting with + // 'go') bound to the keyname without 'Shift-'. + return dispatchKey(cm, "Shift-" + name, e, function (b) { return doHandleBinding(cm, b, true); }) + || dispatchKey(cm, name, e, function (b) { + if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion) + { return doHandleBinding(cm, b) } + }) + } else { + return dispatchKey(cm, name, e, function (b) { return doHandleBinding(cm, b); }) + } + } + + // Handle a key from the keypress event + function handleCharBinding(cm, e, ch) { + return dispatchKey(cm, "'" + ch + "'", e, function (b) { return doHandleBinding(cm, b, true); }) + } + + var lastStoppedKey = null; + function onKeyDown(e) { + var cm = this; + if (e.target && e.target != cm.display.input.getField()) { return } + cm.curOp.focus = activeElt(); + if (signalDOMEvent(cm, e)) { return } + // IE does strange things with escape. + if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false; } + var code = e.keyCode; + cm.display.shift = code == 16 || e.shiftKey; + var handled = handleKeyBinding(cm, e); + if (presto) { + lastStoppedKey = handled ? code : null; + // Opera has no cut event... we try to at least catch the key combo + if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey)) + { cm.replaceSelection("", null, "cut"); } + } + if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand) + { document.execCommand("cut"); } + + // Turn mouse into crosshair when Alt is held on Mac. + if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className)) + { showCrossHair(cm); } + } + + function showCrossHair(cm) { + var lineDiv = cm.display.lineDiv; + addClass(lineDiv, "CodeMirror-crosshair"); + + function up(e) { + if (e.keyCode == 18 || !e.altKey) { + rmClass(lineDiv, "CodeMirror-crosshair"); + off(document, "keyup", up); + off(document, "mouseover", up); + } + } + on(document, "keyup", up); + on(document, "mouseover", up); + } + + function onKeyUp(e) { + if (e.keyCode == 16) { this.doc.sel.shift = false; } + signalDOMEvent(this, e); + } + + function onKeyPress(e) { + var cm = this; + if (e.target && e.target != cm.display.input.getField()) { return } + if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return } + var keyCode = e.keyCode, charCode = e.charCode; + if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return} + if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) { return } + var ch = String.fromCharCode(charCode == null ? keyCode : charCode); + // Some browsers fire keypress events for backspace + if (ch == "\x08") { return } + if (handleCharBinding(cm, e, ch)) { return } + cm.display.input.onKeyPress(e); + } + + var DOUBLECLICK_DELAY = 400; + + var PastClick = function(time, pos, button) { + this.time = time; + this.pos = pos; + this.button = button; + }; + + PastClick.prototype.compare = function (time, pos, button) { + return this.time + DOUBLECLICK_DELAY > time && + cmp(pos, this.pos) == 0 && button == this.button + }; + + var lastClick, lastDoubleClick; + function clickRepeat(pos, button) { + var now = +new Date; + if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) { + lastClick = lastDoubleClick = null; + return "triple" + } else if (lastClick && lastClick.compare(now, pos, button)) { + lastDoubleClick = new PastClick(now, pos, button); + lastClick = null; + return "double" + } else { + lastClick = new PastClick(now, pos, button); + lastDoubleClick = null; + return "single" + } + } + + // A mouse down can be a single click, double click, triple click, + // start of selection drag, start of text drag, new cursor + // (ctrl-click), rectangle drag (alt-drag), or xwin + // middle-click-paste. Or it might be a click on something we should + // not interfere with, such as a scrollbar or widget. + function onMouseDown(e) { + var cm = this, display = cm.display; + if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { return } + display.input.ensurePolled(); + display.shift = e.shiftKey; + + if (eventInWidget(display, e)) { + if (!webkit) { + // Briefly turn off draggability, to allow widgets to do + // normal dragging things. + display.scroller.draggable = false; + setTimeout(function () { return display.scroller.draggable = true; }, 100); + } + return + } + if (clickInGutter(cm, e)) { return } + var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"; + window.focus(); + + // #3261: make sure, that we're not starting a second selection + if (button == 1 && cm.state.selectingText) + { cm.state.selectingText(e); } + + if (pos && handleMappedButton(cm, button, pos, repeat, e)) { return } + + if (button == 1) { + if (pos) { leftButtonDown(cm, pos, repeat, e); } + else if (e_target(e) == display.scroller) { e_preventDefault(e); } + } else if (button == 2) { + if (pos) { extendSelection(cm.doc, pos); } + setTimeout(function () { return display.input.focus(); }, 20); + } else if (button == 3) { + if (captureRightClick) { cm.display.input.onContextMenu(e); } + else { delayBlurEvent(cm); } + } + } + + function handleMappedButton(cm, button, pos, repeat, event) { + var name = "Click"; + if (repeat == "double") { name = "Double" + name; } + else if (repeat == "triple") { name = "Triple" + name; } + name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name; + + return dispatchKey(cm, addModifierNames(name, event), event, function (bound) { + if (typeof bound == "string") { bound = commands[bound]; } + if (!bound) { return false } + var done = false; + try { + if (cm.isReadOnly()) { cm.state.suppressEdits = true; } + done = bound(cm, pos) != Pass; + } finally { + cm.state.suppressEdits = false; + } + return done + }) + } + + function configureMouse(cm, repeat, event) { + var option = cm.getOption("configureMouse"); + var value = option ? option(cm, repeat, event) : {}; + if (value.unit == null) { + var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey; + value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line"; + } + if (value.extend == null || cm.doc.extend) { value.extend = cm.doc.extend || event.shiftKey; } + if (value.addNew == null) { value.addNew = mac ? event.metaKey : event.ctrlKey; } + if (value.moveOnDrag == null) { value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); } + return value + } + + function leftButtonDown(cm, pos, repeat, event) { + if (ie) { setTimeout(bind(ensureFocus, cm), 0); } + else { cm.curOp.focus = activeElt(); } + + var behavior = configureMouse(cm, repeat, event); + + var sel = cm.doc.sel, contained; + if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() && + repeat == "single" && (contained = sel.contains(pos)) > -1 && + (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) && + (cmp(contained.to(), pos) > 0 || pos.xRel < 0)) + { leftButtonStartDrag(cm, event, pos, behavior); } + else + { leftButtonSelect(cm, event, pos, behavior); } + } + + // Start a text drag. When it ends, see if any dragging actually + // happen, and treat as a click if it didn't. + function leftButtonStartDrag(cm, event, pos, behavior) { + var display = cm.display, moved = false; + var dragEnd = operation(cm, function (e) { + if (webkit) { display.scroller.draggable = false; } + cm.state.draggingText = false; + if (cm.state.delayingBlurEvent) { + if (cm.hasFocus()) { cm.state.delayingBlurEvent = false; } + else { delayBlurEvent(cm); } + } + off(display.wrapper.ownerDocument, "mouseup", dragEnd); + off(display.wrapper.ownerDocument, "mousemove", mouseMove); + off(display.scroller, "dragstart", dragStart); + off(display.scroller, "drop", dragEnd); + if (!moved) { + e_preventDefault(e); + if (!behavior.addNew) + { extendSelection(cm.doc, pos, null, null, behavior.extend); } + // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081) + if ((webkit && !safari) || ie && ie_version == 9) + { setTimeout(function () {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus();}, 20); } + else + { display.input.focus(); } + } + }); + var mouseMove = function(e2) { + moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10; + }; + var dragStart = function () { return moved = true; }; + // Let the drag handler handle this. + if (webkit) { display.scroller.draggable = true; } + cm.state.draggingText = dragEnd; + dragEnd.copy = !behavior.moveOnDrag; + on(display.wrapper.ownerDocument, "mouseup", dragEnd); + on(display.wrapper.ownerDocument, "mousemove", mouseMove); + on(display.scroller, "dragstart", dragStart); + on(display.scroller, "drop", dragEnd); + + cm.state.delayingBlurEvent = true; + setTimeout(function () { return display.input.focus(); }, 20); + // IE's approach to draggable + if (display.scroller.dragDrop) { display.scroller.dragDrop(); } + } + + function rangeForUnit(cm, pos, unit) { + if (unit == "char") { return new Range(pos, pos) } + if (unit == "word") { return cm.findWordAt(pos) } + if (unit == "line") { return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) } + var result = unit(cm, pos); + return new Range(result.from, result.to) + } + + // Normal selection, as opposed to text dragging. + function leftButtonSelect(cm, event, start, behavior) { + if (ie) { delayBlurEvent(cm); } + var display = cm.display, doc = cm.doc; + e_preventDefault(event); + + var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges; + if (behavior.addNew && !behavior.extend) { + ourIndex = doc.sel.contains(start); + if (ourIndex > -1) + { ourRange = ranges[ourIndex]; } + else + { ourRange = new Range(start, start); } + } else { + ourRange = doc.sel.primary(); + ourIndex = doc.sel.primIndex; + } + + if (behavior.unit == "rectangle") { + if (!behavior.addNew) { ourRange = new Range(start, start); } + start = posFromMouse(cm, event, true, true); + ourIndex = -1; + } else { + var range = rangeForUnit(cm, start, behavior.unit); + if (behavior.extend) + { ourRange = extendRange(ourRange, range.anchor, range.head, behavior.extend); } + else + { ourRange = range; } + } + + if (!behavior.addNew) { + ourIndex = 0; + setSelection(doc, new Selection([ourRange], 0), sel_mouse); + startSel = doc.sel; + } else if (ourIndex == -1) { + ourIndex = ranges.length; + setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex), + {scroll: false, origin: "*mouse"}); + } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) { + setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0), + {scroll: false, origin: "*mouse"}); + startSel = doc.sel; + } else { + replaceOneSelection(doc, ourIndex, ourRange, sel_mouse); + } + + var lastPos = start; + function extendTo(pos) { + if (cmp(lastPos, pos) == 0) { return } + lastPos = pos; + + if (behavior.unit == "rectangle") { + var ranges = [], tabSize = cm.options.tabSize; + var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize); + var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize); + var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol); + for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); + line <= end; line++) { + var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize); + if (left == right) + { ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); } + else if (text.length > leftPos) + { ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); } + } + if (!ranges.length) { ranges.push(new Range(start, start)); } + setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), + {origin: "*mouse", scroll: false}); + cm.scrollIntoView(pos); + } else { + var oldRange = ourRange; + var range = rangeForUnit(cm, pos, behavior.unit); + var anchor = oldRange.anchor, head; + if (cmp(range.anchor, anchor) > 0) { + head = range.head; + anchor = minPos(oldRange.from(), range.anchor); + } else { + head = range.anchor; + anchor = maxPos(oldRange.to(), range.head); + } + var ranges$1 = startSel.ranges.slice(0); + ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head)); + setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse); + } + } + + var editorSize = display.wrapper.getBoundingClientRect(); + // Used to ensure timeout re-tries don't fire when another extend + // happened in the meantime (clearTimeout isn't reliable -- at + // least on Chrome, the timeouts still happen even when cleared, + // if the clear happens after their scheduled firing time). + var counter = 0; + + function extend(e) { + var curCount = ++counter; + var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle"); + if (!cur) { return } + if (cmp(cur, lastPos) != 0) { + cm.curOp.focus = activeElt(); + extendTo(cur); + var visible = visibleLines(display, doc); + if (cur.line >= visible.to || cur.line < visible.from) + { setTimeout(operation(cm, function () {if (counter == curCount) { extend(e); }}), 150); } + } else { + var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0; + if (outside) { setTimeout(operation(cm, function () { + if (counter != curCount) { return } + display.scroller.scrollTop += outside; + extend(e); + }), 50); } + } + } + + function done(e) { + cm.state.selectingText = false; + counter = Infinity; + // If e is null or undefined we interpret this as someone trying + // to explicitly cancel the selection rather than the user + // letting go of the mouse button. + if (e) { + e_preventDefault(e); + display.input.focus(); + } + off(display.wrapper.ownerDocument, "mousemove", move); + off(display.wrapper.ownerDocument, "mouseup", up); + doc.history.lastSelOrigin = null; + } + + var move = operation(cm, function (e) { + if (e.buttons === 0 || !e_button(e)) { done(e); } + else { extend(e); } + }); + var up = operation(cm, done); + cm.state.selectingText = up; + on(display.wrapper.ownerDocument, "mousemove", move); + on(display.wrapper.ownerDocument, "mouseup", up); + } + + // Used when mouse-selecting to adjust the anchor to the proper side + // of a bidi jump depending on the visual position of the head. + function bidiSimplify(cm, range) { + var anchor = range.anchor; + var head = range.head; + var anchorLine = getLine(cm.doc, anchor.line); + if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { return range } + var order = getOrder(anchorLine); + if (!order) { return range } + var index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index]; + if (part.from != anchor.ch && part.to != anchor.ch) { return range } + var boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1); + if (boundary == 0 || boundary == order.length) { return range } + + // Compute the relative visual position of the head compared to the + // anchor (<0 is to the left, >0 to the right) + var leftSide; + if (head.line != anchor.line) { + leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0; + } else { + var headIndex = getBidiPartAt(order, head.ch, head.sticky); + var dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1); + if (headIndex == boundary - 1 || headIndex == boundary) + { leftSide = dir < 0; } + else + { leftSide = dir > 0; } + } + + var usePart = order[boundary + (leftSide ? -1 : 0)]; + var from = leftSide == (usePart.level == 1); + var ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before"; + return anchor.ch == ch && anchor.sticky == sticky ? range : new Range(new Pos(anchor.line, ch, sticky), head) + } + + + // Determines whether an event happened in the gutter, and fires the + // handlers for the corresponding event. + function gutterEvent(cm, e, type, prevent) { + var mX, mY; + if (e.touches) { + mX = e.touches[0].clientX; + mY = e.touches[0].clientY; + } else { + try { mX = e.clientX; mY = e.clientY; } + catch(e$1) { return false } + } + if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false } + if (prevent) { e_preventDefault(e); } + + var display = cm.display; + var lineBox = display.lineDiv.getBoundingClientRect(); + + if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) } + mY -= lineBox.top - display.viewOffset; + + for (var i = 0; i < cm.display.gutterSpecs.length; ++i) { + var g = display.gutters.childNodes[i]; + if (g && g.getBoundingClientRect().right >= mX) { + var line = lineAtHeight(cm.doc, mY); + var gutter = cm.display.gutterSpecs[i]; + signal(cm, type, cm, line, gutter.className, e); + return e_defaultPrevented(e) + } + } + } + + function clickInGutter(cm, e) { + return gutterEvent(cm, e, "gutterClick", true) + } + + // CONTEXT MENU HANDLING + + // To make the context menu work, we need to briefly unhide the + // textarea (making it as unobtrusive as possible) to let the + // right-click take effect on it. + function onContextMenu(cm, e) { + if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { return } + if (signalDOMEvent(cm, e, "contextmenu")) { return } + if (!captureRightClick) { cm.display.input.onContextMenu(e); } + } + + function contextMenuInGutter(cm, e) { + if (!hasHandler(cm, "gutterContextMenu")) { return false } + return gutterEvent(cm, e, "gutterContextMenu", false) + } + + function themeChanged(cm) { + cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") + + cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-"); + clearCaches(cm); + } + + var Init = {toString: function(){return "CodeMirror.Init"}}; + + var defaults = {}; + var optionHandlers = {}; + + function defineOptions(CodeMirror) { + var optionHandlers = CodeMirror.optionHandlers; + + function option(name, deflt, handle, notOnInit) { + CodeMirror.defaults[name] = deflt; + if (handle) { optionHandlers[name] = + notOnInit ? function (cm, val, old) {if (old != Init) { handle(cm, val, old); }} : handle; } + } + + CodeMirror.defineOption = option; + + // Passed to option handlers when there is no old value. + CodeMirror.Init = Init; + + // These two are, on init, called from the constructor because they + // have to be initialized before the editor can start at all. + option("value", "", function (cm, val) { return cm.setValue(val); }, true); + option("mode", null, function (cm, val) { + cm.doc.modeOption = val; + loadMode(cm); + }, true); + + option("indentUnit", 2, loadMode, true); + option("indentWithTabs", false); + option("smartIndent", true); + option("tabSize", 4, function (cm) { + resetModeState(cm); + clearCaches(cm); + regChange(cm); + }, true); + + option("lineSeparator", null, function (cm, val) { + cm.doc.lineSep = val; + if (!val) { return } + var newBreaks = [], lineNo = cm.doc.first; + cm.doc.iter(function (line) { + for (var pos = 0;;) { + var found = line.text.indexOf(val, pos); + if (found == -1) { break } + pos = found + val.length; + newBreaks.push(Pos(lineNo, found)); + } + lineNo++; + }); + for (var i = newBreaks.length - 1; i >= 0; i--) + { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); } + }); + option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { + cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); + if (old != Init) { cm.refresh(); } + }); + option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { return cm.refresh(); }, true); + option("electricChars", true); + option("inputStyle", mobile ? "contenteditable" : "textarea", function () { + throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME + }, true); + option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true); + option("autocorrect", false, function (cm, val) { return cm.getInputField().autocorrect = val; }, true); + option("autocapitalize", false, function (cm, val) { return cm.getInputField().autocapitalize = val; }, true); + option("rtlMoveVisually", !windows); + option("wholeLineUpdateBefore", true); + + option("theme", "default", function (cm) { + themeChanged(cm); + updateGutters(cm); + }, true); + option("keyMap", "default", function (cm, val, old) { + var next = getKeyMap(val); + var prev = old != Init && getKeyMap(old); + if (prev && prev.detach) { prev.detach(cm, next); } + if (next.attach) { next.attach(cm, prev || null); } + }); + option("extraKeys", null); + option("configureMouse", null); + + option("lineWrapping", false, wrappingChanged, true); + option("gutters", [], function (cm, val) { + cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers); + updateGutters(cm); + }, true); + option("fixedGutter", true, function (cm, val) { + cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"; + cm.refresh(); + }, true); + option("coverGutterNextToScrollbar", false, function (cm) { return updateScrollbars(cm); }, true); + option("scrollbarStyle", "native", function (cm) { + initScrollbars(cm); + updateScrollbars(cm); + cm.display.scrollbars.setScrollTop(cm.doc.scrollTop); + cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft); + }, true); + option("lineNumbers", false, function (cm, val) { + cm.display.gutterSpecs = getGutters(cm.options.gutters, val); + updateGutters(cm); + }, true); + option("firstLineNumber", 1, updateGutters, true); + option("lineNumberFormatter", function (integer) { return integer; }, updateGutters, true); + option("showCursorWhenSelecting", false, updateSelection, true); + + option("resetSelectionOnContextMenu", true); + option("lineWiseCopyCut", true); + option("pasteLinesPerSelection", true); + option("selectionsMayTouch", false); + + option("readOnly", false, function (cm, val) { + if (val == "nocursor") { + onBlur(cm); + cm.display.input.blur(); + } + cm.display.input.readOnlyChanged(val); + }); + + option("screenReaderLabel", null, function (cm, val) { + val = (val === '') ? null : val; + cm.display.input.screenReaderLabelChanged(val); + }); + + option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset(); }}, true); + option("dragDrop", true, dragDropChanged); + option("allowDropFileTypes", null); + + option("cursorBlinkRate", 530); + option("cursorScrollMargin", 0); + option("cursorHeight", 1, updateSelection, true); + option("singleCursorHeightPerLine", true, updateSelection, true); + option("workTime", 100); + option("workDelay", 100); + option("flattenSpans", true, resetModeState, true); + option("addModeClass", false, resetModeState, true); + option("pollInterval", 100); + option("undoDepth", 200, function (cm, val) { return cm.doc.history.undoDepth = val; }); + option("historyEventDelay", 1250); + option("viewportMargin", 10, function (cm) { return cm.refresh(); }, true); + option("maxHighlightLength", 10000, resetModeState, true); + option("moveInputWithCursor", true, function (cm, val) { + if (!val) { cm.display.input.resetPosition(); } + }); + + option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; }); + option("autofocus", null); + option("direction", "ltr", function (cm, val) { return cm.doc.setDirection(val); }, true); + option("phrases", null); + } + + function dragDropChanged(cm, value, old) { + var wasOn = old && old != Init; + if (!value != !wasOn) { + var funcs = cm.display.dragFunctions; + var toggle = value ? on : off; + toggle(cm.display.scroller, "dragstart", funcs.start); + toggle(cm.display.scroller, "dragenter", funcs.enter); + toggle(cm.display.scroller, "dragover", funcs.over); + toggle(cm.display.scroller, "dragleave", funcs.leave); + toggle(cm.display.scroller, "drop", funcs.drop); + } + } + + function wrappingChanged(cm) { + if (cm.options.lineWrapping) { + addClass(cm.display.wrapper, "CodeMirror-wrap"); + cm.display.sizer.style.minWidth = ""; + cm.display.sizerWidth = null; + } else { + rmClass(cm.display.wrapper, "CodeMirror-wrap"); + findMaxLine(cm); + } + estimateLineHeights(cm); + regChange(cm); + clearCaches(cm); + setTimeout(function () { return updateScrollbars(cm); }, 100); + } + + // A CodeMirror instance represents an editor. This is the object + // that user code is usually dealing with. + + function CodeMirror(place, options) { + var this$1 = this; + + if (!(this instanceof CodeMirror)) { return new CodeMirror(place, options) } + + this.options = options = options ? copyObj(options) : {}; + // Determine effective options based on given values and defaults. + copyObj(defaults, options, false); + + var doc = options.value; + if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); } + else if (options.mode) { doc.modeOption = options.mode; } + this.doc = doc; + + var input = new CodeMirror.inputStyles[options.inputStyle](this); + var display = this.display = new Display(place, doc, input, options); + display.wrapper.CodeMirror = this; + themeChanged(this); + if (options.lineWrapping) + { this.display.wrapper.className += " CodeMirror-wrap"; } + initScrollbars(this); + + this.state = { + keyMaps: [], // stores maps added by addKeyMap + overlays: [], // highlighting overlays, as added by addOverlay + modeGen: 0, // bumped when mode/overlay changes, used to invalidate highlighting info + overwrite: false, + delayingBlurEvent: false, + focused: false, + suppressEdits: false, // used to disable editing during key handlers when in readOnly mode + pasteIncoming: -1, cutIncoming: -1, // help recognize paste/cut edits in input.poll + selectingText: false, + draggingText: false, + highlight: new Delayed(), // stores highlight worker timeout + keySeq: null, // Unfinished key sequence + specialChars: null + }; + + if (options.autofocus && !mobile) { display.input.focus(); } + + // Override magic textarea content restore that IE sometimes does + // on our hidden textarea on reload + if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20); } + + registerEventHandlers(this); + ensureGlobalHandlers(); + + startOperation(this); + this.curOp.forceUpdate = true; + attachDoc(this, doc); + + if ((options.autofocus && !mobile) || this.hasFocus()) + { setTimeout(function () { + if (this$1.hasFocus() && !this$1.state.focused) { onFocus(this$1); } + }, 20); } + else + { onBlur(this); } + + for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt)) + { optionHandlers[opt](this, options[opt], Init); } } + maybeUpdateLineNumberWidth(this); + if (options.finishInit) { options.finishInit(this); } + for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this); } + endOperation(this); + // Suppress optimizelegibility in Webkit, since it breaks text + // measuring on line wrapping boundaries. + if (webkit && options.lineWrapping && + getComputedStyle(display.lineDiv).textRendering == "optimizelegibility") + { display.lineDiv.style.textRendering = "auto"; } + } + + // The default configuration options. + CodeMirror.defaults = defaults; + // Functions to run when options are changed. + CodeMirror.optionHandlers = optionHandlers; + + // Attach the necessary event handlers when initializing the editor + function registerEventHandlers(cm) { + var d = cm.display; + on(d.scroller, "mousedown", operation(cm, onMouseDown)); + // Older IE's will not fire a second mousedown for a double click + if (ie && ie_version < 11) + { on(d.scroller, "dblclick", operation(cm, function (e) { + if (signalDOMEvent(cm, e)) { return } + var pos = posFromMouse(cm, e); + if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { return } + e_preventDefault(e); + var word = cm.findWordAt(pos); + extendSelection(cm.doc, word.anchor, word.head); + })); } + else + { on(d.scroller, "dblclick", function (e) { return signalDOMEvent(cm, e) || e_preventDefault(e); }); } + // Some browsers fire contextmenu *after* opening the menu, at + // which point we can't mess with it anymore. Context menu is + // handled in onMouseDown for these browsers. + on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); }); + on(d.input.getField(), "contextmenu", function (e) { + if (!d.scroller.contains(e.target)) { onContextMenu(cm, e); } + }); + + // Used to suppress mouse event handling when a touch happens + var touchFinished, prevTouch = {end: 0}; + function finishTouch() { + if (d.activeTouch) { + touchFinished = setTimeout(function () { return d.activeTouch = null; }, 1000); + prevTouch = d.activeTouch; + prevTouch.end = +new Date; + } + } + function isMouseLikeTouchEvent(e) { + if (e.touches.length != 1) { return false } + var touch = e.touches[0]; + return touch.radiusX <= 1 && touch.radiusY <= 1 + } + function farAway(touch, other) { + if (other.left == null) { return true } + var dx = other.left - touch.left, dy = other.top - touch.top; + return dx * dx + dy * dy > 20 * 20 + } + on(d.scroller, "touchstart", function (e) { + if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) { + d.input.ensurePolled(); + clearTimeout(touchFinished); + var now = +new Date; + d.activeTouch = {start: now, moved: false, + prev: now - prevTouch.end <= 300 ? prevTouch : null}; + if (e.touches.length == 1) { + d.activeTouch.left = e.touches[0].pageX; + d.activeTouch.top = e.touches[0].pageY; + } + } + }); + on(d.scroller, "touchmove", function () { + if (d.activeTouch) { d.activeTouch.moved = true; } + }); + on(d.scroller, "touchend", function (e) { + var touch = d.activeTouch; + if (touch && !eventInWidget(d, e) && touch.left != null && + !touch.moved && new Date - touch.start < 300) { + var pos = cm.coordsChar(d.activeTouch, "page"), range; + if (!touch.prev || farAway(touch, touch.prev)) // Single tap + { range = new Range(pos, pos); } + else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap + { range = cm.findWordAt(pos); } + else // Triple tap + { range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); } + cm.setSelection(range.anchor, range.head); + cm.focus(); + e_preventDefault(e); + } + finishTouch(); + }); + on(d.scroller, "touchcancel", finishTouch); + + // Sync scrolling between fake scrollbars and real scrollable + // area, ensure viewport is updated when scrolling. + on(d.scroller, "scroll", function () { + if (d.scroller.clientHeight) { + updateScrollTop(cm, d.scroller.scrollTop); + setScrollLeft(cm, d.scroller.scrollLeft, true); + signal(cm, "scroll", cm); + } + }); + + // Listen to wheel events in order to try and update the viewport on time. + on(d.scroller, "mousewheel", function (e) { return onScrollWheel(cm, e); }); + on(d.scroller, "DOMMouseScroll", function (e) { return onScrollWheel(cm, e); }); + + // Prevent wrapper from ever scrolling + on(d.wrapper, "scroll", function () { return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; }); + + d.dragFunctions = { + enter: function (e) {if (!signalDOMEvent(cm, e)) { e_stop(e); }}, + over: function (e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }}, + start: function (e) { return onDragStart(cm, e); }, + drop: operation(cm, onDrop), + leave: function (e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }} + }; + + var inp = d.input.getField(); + on(inp, "keyup", function (e) { return onKeyUp.call(cm, e); }); + on(inp, "keydown", operation(cm, onKeyDown)); + on(inp, "keypress", operation(cm, onKeyPress)); + on(inp, "focus", function (e) { return onFocus(cm, e); }); + on(inp, "blur", function (e) { return onBlur(cm, e); }); + } + + var initHooks = []; + CodeMirror.defineInitHook = function (f) { return initHooks.push(f); }; + + // Indent the given line. The how parameter can be "smart", + // "add"/null, "subtract", or "prev". When aggressive is false + // (typically set to true for forced single-line indents), empty + // lines are not indented, and places where the mode returns Pass + // are left alone. + function indentLine(cm, n, how, aggressive) { + var doc = cm.doc, state; + if (how == null) { how = "add"; } + if (how == "smart") { + // Fall back to "prev" when the mode doesn't have an indentation + // method. + if (!doc.mode.indent) { how = "prev"; } + else { state = getContextBefore(cm, n).state; } + } + + var tabSize = cm.options.tabSize; + var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize); + if (line.stateAfter) { line.stateAfter = null; } + var curSpaceString = line.text.match(/^\s*/)[0], indentation; + if (!aggressive && !/\S/.test(line.text)) { + indentation = 0; + how = "not"; + } else if (how == "smart") { + indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text); + if (indentation == Pass || indentation > 150) { + if (!aggressive) { return } + how = "prev"; + } + } + if (how == "prev") { + if (n > doc.first) { indentation = countColumn(getLine(doc, n-1).text, null, tabSize); } + else { indentation = 0; } + } else if (how == "add") { + indentation = curSpace + cm.options.indentUnit; + } else if (how == "subtract") { + indentation = curSpace - cm.options.indentUnit; + } else if (typeof how == "number") { + indentation = curSpace + how; + } + indentation = Math.max(0, indentation); + + var indentString = "", pos = 0; + if (cm.options.indentWithTabs) + { for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} } + if (pos < indentation) { indentString += spaceStr(indentation - pos); } + + if (indentString != curSpaceString) { + replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input"); + line.stateAfter = null; + return true + } else { + // Ensure that, if the cursor was in the whitespace at the start + // of the line, it is moved to the end of that space. + for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) { + var range = doc.sel.ranges[i$1]; + if (range.head.line == n && range.head.ch < curSpaceString.length) { + var pos$1 = Pos(n, curSpaceString.length); + replaceOneSelection(doc, i$1, new Range(pos$1, pos$1)); + break + } + } + } + } + + // This will be set to a {lineWise: bool, text: [string]} object, so + // that, when pasting, we know what kind of selections the copied + // text was made out of. + var lastCopied = null; + + function setLastCopied(newLastCopied) { + lastCopied = newLastCopied; + } + + function applyTextInput(cm, inserted, deleted, sel, origin) { + var doc = cm.doc; + cm.display.shift = false; + if (!sel) { sel = doc.sel; } + + var recent = +new Date - 200; + var paste = origin == "paste" || cm.state.pasteIncoming > recent; + var textLines = splitLinesAuto(inserted), multiPaste = null; + // When pasting N lines into N selections, insert one line per selection + if (paste && sel.ranges.length > 1) { + if (lastCopied && lastCopied.text.join("\n") == inserted) { + if (sel.ranges.length % lastCopied.text.length == 0) { + multiPaste = []; + for (var i = 0; i < lastCopied.text.length; i++) + { multiPaste.push(doc.splitLines(lastCopied.text[i])); } + } + } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) { + multiPaste = map(textLines, function (l) { return [l]; }); + } + } + + var updateInput = cm.curOp.updateInput; + // Normal behavior is to insert the new text into every selection + for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) { + var range = sel.ranges[i$1]; + var from = range.from(), to = range.to(); + if (range.empty()) { + if (deleted && deleted > 0) // Handle deletion + { from = Pos(from.line, from.ch - deleted); } + else if (cm.state.overwrite && !paste) // Handle overwrite + { to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); } + else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == textLines.join("\n")) + { from = to = Pos(from.line, 0); } + } + var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines, + origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input")}; + makeChange(cm.doc, changeEvent); + signalLater(cm, "inputRead", cm, changeEvent); + } + if (inserted && !paste) + { triggerElectric(cm, inserted); } + + ensureCursorVisible(cm); + if (cm.curOp.updateInput < 2) { cm.curOp.updateInput = updateInput; } + cm.curOp.typing = true; + cm.state.pasteIncoming = cm.state.cutIncoming = -1; + } + + function handlePaste(e, cm) { + var pasted = e.clipboardData && e.clipboardData.getData("Text"); + if (pasted) { + e.preventDefault(); + if (!cm.isReadOnly() && !cm.options.disableInput) + { runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }); } + return true + } + } + + function triggerElectric(cm, inserted) { + // When an 'electric' character is inserted, immediately trigger a reindent + if (!cm.options.electricChars || !cm.options.smartIndent) { return } + var sel = cm.doc.sel; + + for (var i = sel.ranges.length - 1; i >= 0; i--) { + var range = sel.ranges[i]; + if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) { continue } + var mode = cm.getModeAt(range.head); + var indented = false; + if (mode.electricChars) { + for (var j = 0; j < mode.electricChars.length; j++) + { if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) { + indented = indentLine(cm, range.head.line, "smart"); + break + } } + } else if (mode.electricInput) { + if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch))) + { indented = indentLine(cm, range.head.line, "smart"); } + } + if (indented) { signalLater(cm, "electricInput", cm, range.head.line); } + } + } + + function copyableRanges(cm) { + var text = [], ranges = []; + for (var i = 0; i < cm.doc.sel.ranges.length; i++) { + var line = cm.doc.sel.ranges[i].head.line; + var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}; + ranges.push(lineRange); + text.push(cm.getRange(lineRange.anchor, lineRange.head)); + } + return {text: text, ranges: ranges} + } + + function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) { + field.setAttribute("autocorrect", autocorrect ? "" : "off"); + field.setAttribute("autocapitalize", autocapitalize ? "" : "off"); + field.setAttribute("spellcheck", !!spellcheck); + } + + function hiddenTextarea() { + var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"); + var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;"); + // The textarea is kept positioned near the cursor to prevent the + // fact that it'll be scrolled into view on input from scrolling + // our fake cursor out of view. On webkit, when wrap=off, paste is + // very slow. So make the area wide instead. + if (webkit) { te.style.width = "1000px"; } + else { te.setAttribute("wrap", "off"); } + // If border: 0; -- iOS fails to open keyboard (issue #1287) + if (ios) { te.style.border = "1px solid black"; } + disableBrowserMagic(te); + return div + } + + // The publicly visible API. Note that methodOp(f) means + // 'wrap f in an operation, performed on its `this` parameter'. + + // This is not the complete set of editor methods. Most of the + // methods defined on the Doc type are also injected into + // CodeMirror.prototype, for backwards compatibility and + // convenience. + + function addEditorMethods(CodeMirror) { + var optionHandlers = CodeMirror.optionHandlers; + + var helpers = CodeMirror.helpers = {}; + + CodeMirror.prototype = { + constructor: CodeMirror, + focus: function(){window.focus(); this.display.input.focus();}, + + setOption: function(option, value) { + var options = this.options, old = options[option]; + if (options[option] == value && option != "mode") { return } + options[option] = value; + if (optionHandlers.hasOwnProperty(option)) + { operation(this, optionHandlers[option])(this, value, old); } + signal(this, "optionChange", this, option); + }, + + getOption: function(option) {return this.options[option]}, + getDoc: function() {return this.doc}, + + addKeyMap: function(map, bottom) { + this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map)); + }, + removeKeyMap: function(map) { + var maps = this.state.keyMaps; + for (var i = 0; i < maps.length; ++i) + { if (maps[i] == map || maps[i].name == map) { + maps.splice(i, 1); + return true + } } + }, + + addOverlay: methodOp(function(spec, options) { + var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec); + if (mode.startState) { throw new Error("Overlays may not be stateful.") } + insertSorted(this.state.overlays, + {mode: mode, modeSpec: spec, opaque: options && options.opaque, + priority: (options && options.priority) || 0}, + function (overlay) { return overlay.priority; }); + this.state.modeGen++; + regChange(this); + }), + removeOverlay: methodOp(function(spec) { + var overlays = this.state.overlays; + for (var i = 0; i < overlays.length; ++i) { + var cur = overlays[i].modeSpec; + if (cur == spec || typeof spec == "string" && cur.name == spec) { + overlays.splice(i, 1); + this.state.modeGen++; + regChange(this); + return + } + } + }), + + indentLine: methodOp(function(n, dir, aggressive) { + if (typeof dir != "string" && typeof dir != "number") { + if (dir == null) { dir = this.options.smartIndent ? "smart" : "prev"; } + else { dir = dir ? "add" : "subtract"; } + } + if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive); } + }), + indentSelection: methodOp(function(how) { + var ranges = this.doc.sel.ranges, end = -1; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i]; + if (!range.empty()) { + var from = range.from(), to = range.to(); + var start = Math.max(end, from.line); + end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1; + for (var j = start; j < end; ++j) + { indentLine(this, j, how); } + var newRanges = this.doc.sel.ranges; + if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0) + { replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); } + } else if (range.head.line > end) { + indentLine(this, range.head.line, how, true); + end = range.head.line; + if (i == this.doc.sel.primIndex) { ensureCursorVisible(this); } + } + } + }), + + // Fetch the parser token for a given character. Useful for hacks + // that want to inspect the mode state (say, for completion). + getTokenAt: function(pos, precise) { + return takeToken(this, pos, precise) + }, + + getLineTokens: function(line, precise) { + return takeToken(this, Pos(line), precise, true) + }, + + getTokenTypeAt: function(pos) { + pos = clipPos(this.doc, pos); + var styles = getLineStyles(this, getLine(this.doc, pos.line)); + var before = 0, after = (styles.length - 1) / 2, ch = pos.ch; + var type; + if (ch == 0) { type = styles[2]; } + else { for (;;) { + var mid = (before + after) >> 1; + if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { after = mid; } + else if (styles[mid * 2 + 1] < ch) { before = mid + 1; } + else { type = styles[mid * 2 + 2]; break } + } } + var cut = type ? type.indexOf("overlay ") : -1; + return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1) + }, + + getModeAt: function(pos) { + var mode = this.doc.mode; + if (!mode.innerMode) { return mode } + return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode + }, + + getHelper: function(pos, type) { + return this.getHelpers(pos, type)[0] + }, + + getHelpers: function(pos, type) { + var found = []; + if (!helpers.hasOwnProperty(type)) { return found } + var help = helpers[type], mode = this.getModeAt(pos); + if (typeof mode[type] == "string") { + if (help[mode[type]]) { found.push(help[mode[type]]); } + } else if (mode[type]) { + for (var i = 0; i < mode[type].length; i++) { + var val = help[mode[type][i]]; + if (val) { found.push(val); } + } + } else if (mode.helperType && help[mode.helperType]) { + found.push(help[mode.helperType]); + } else if (help[mode.name]) { + found.push(help[mode.name]); + } + for (var i$1 = 0; i$1 < help._global.length; i$1++) { + var cur = help._global[i$1]; + if (cur.pred(mode, this) && indexOf(found, cur.val) == -1) + { found.push(cur.val); } + } + return found + }, + + getStateAfter: function(line, precise) { + var doc = this.doc; + line = clipLine(doc, line == null ? doc.first + doc.size - 1: line); + return getContextBefore(this, line + 1, precise).state + }, + + cursorCoords: function(start, mode) { + var pos, range = this.doc.sel.primary(); + if (start == null) { pos = range.head; } + else if (typeof start == "object") { pos = clipPos(this.doc, start); } + else { pos = start ? range.from() : range.to(); } + return cursorCoords(this, pos, mode || "page") + }, + + charCoords: function(pos, mode) { + return charCoords(this, clipPos(this.doc, pos), mode || "page") + }, + + coordsChar: function(coords, mode) { + coords = fromCoordSystem(this, coords, mode || "page"); + return coordsChar(this, coords.left, coords.top) + }, + + lineAtHeight: function(height, mode) { + height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top; + return lineAtHeight(this.doc, height + this.display.viewOffset) + }, + heightAtLine: function(line, mode, includeWidgets) { + var end = false, lineObj; + if (typeof line == "number") { + var last = this.doc.first + this.doc.size - 1; + if (line < this.doc.first) { line = this.doc.first; } + else if (line > last) { line = last; end = true; } + lineObj = getLine(this.doc, line); + } else { + lineObj = line; + } + return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets || end).top + + (end ? this.doc.height - heightAtLine(lineObj) : 0) + }, + + defaultTextHeight: function() { return textHeight(this.display) }, + defaultCharWidth: function() { return charWidth(this.display) }, + + getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}}, + + addWidget: function(pos, node, scroll, vert, horiz) { + var display = this.display; + pos = cursorCoords(this, clipPos(this.doc, pos)); + var top = pos.bottom, left = pos.left; + node.style.position = "absolute"; + node.setAttribute("cm-ignore-events", "true"); + this.display.input.setUneditable(node); + display.sizer.appendChild(node); + if (vert == "over") { + top = pos.top; + } else if (vert == "above" || vert == "near") { + var vspace = Math.max(display.wrapper.clientHeight, this.doc.height), + hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth); + // Default to positioning above (if specified and possible); otherwise default to positioning below + if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight) + { top = pos.top - node.offsetHeight; } + else if (pos.bottom + node.offsetHeight <= vspace) + { top = pos.bottom; } + if (left + node.offsetWidth > hspace) + { left = hspace - node.offsetWidth; } + } + node.style.top = top + "px"; + node.style.left = node.style.right = ""; + if (horiz == "right") { + left = display.sizer.clientWidth - node.offsetWidth; + node.style.right = "0px"; + } else { + if (horiz == "left") { left = 0; } + else if (horiz == "middle") { left = (display.sizer.clientWidth - node.offsetWidth) / 2; } + node.style.left = left + "px"; + } + if (scroll) + { scrollIntoView(this, {left: left, top: top, right: left + node.offsetWidth, bottom: top + node.offsetHeight}); } + }, + + triggerOnKeyDown: methodOp(onKeyDown), + triggerOnKeyPress: methodOp(onKeyPress), + triggerOnKeyUp: onKeyUp, + triggerOnMouseDown: methodOp(onMouseDown), + + execCommand: function(cmd) { + if (commands.hasOwnProperty(cmd)) + { return commands[cmd].call(null, this) } + }, + + triggerElectric: methodOp(function(text) { triggerElectric(this, text); }), + + findPosH: function(from, amount, unit, visually) { + var dir = 1; + if (amount < 0) { dir = -1; amount = -amount; } + var cur = clipPos(this.doc, from); + for (var i = 0; i < amount; ++i) { + cur = findPosH(this.doc, cur, dir, unit, visually); + if (cur.hitSide) { break } + } + return cur + }, + + moveH: methodOp(function(dir, unit) { + var this$1 = this; + + this.extendSelectionsBy(function (range) { + if (this$1.display.shift || this$1.doc.extend || range.empty()) + { return findPosH(this$1.doc, range.head, dir, unit, this$1.options.rtlMoveVisually) } + else + { return dir < 0 ? range.from() : range.to() } + }, sel_move); + }), + + deleteH: methodOp(function(dir, unit) { + var sel = this.doc.sel, doc = this.doc; + if (sel.somethingSelected()) + { doc.replaceSelection("", null, "+delete"); } + else + { deleteNearSelection(this, function (range) { + var other = findPosH(doc, range.head, dir, unit, false); + return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other} + }); } + }), + + findPosV: function(from, amount, unit, goalColumn) { + var dir = 1, x = goalColumn; + if (amount < 0) { dir = -1; amount = -amount; } + var cur = clipPos(this.doc, from); + for (var i = 0; i < amount; ++i) { + var coords = cursorCoords(this, cur, "div"); + if (x == null) { x = coords.left; } + else { coords.left = x; } + cur = findPosV(this, coords, dir, unit); + if (cur.hitSide) { break } + } + return cur + }, + + moveV: methodOp(function(dir, unit) { + var this$1 = this; + + var doc = this.doc, goals = []; + var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected(); + doc.extendSelectionsBy(function (range) { + if (collapse) + { return dir < 0 ? range.from() : range.to() } + var headPos = cursorCoords(this$1, range.head, "div"); + if (range.goalColumn != null) { headPos.left = range.goalColumn; } + goals.push(headPos.left); + var pos = findPosV(this$1, headPos, dir, unit); + if (unit == "page" && range == doc.sel.primary()) + { addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); } + return pos + }, sel_move); + if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++) + { doc.sel.ranges[i].goalColumn = goals[i]; } } + }), + + // Find the word at the given position (as returned by coordsChar). + findWordAt: function(pos) { + var doc = this.doc, line = getLine(doc, pos.line).text; + var start = pos.ch, end = pos.ch; + if (line) { + var helper = this.getHelper(pos, "wordChars"); + if ((pos.sticky == "before" || end == line.length) && start) { --start; } else { ++end; } + var startChar = line.charAt(start); + var check = isWordChar(startChar, helper) + ? function (ch) { return isWordChar(ch, helper); } + : /\s/.test(startChar) ? function (ch) { return /\s/.test(ch); } + : function (ch) { return (!/\s/.test(ch) && !isWordChar(ch)); }; + while (start > 0 && check(line.charAt(start - 1))) { --start; } + while (end < line.length && check(line.charAt(end))) { ++end; } + } + return new Range(Pos(pos.line, start), Pos(pos.line, end)) + }, + + toggleOverwrite: function(value) { + if (value != null && value == this.state.overwrite) { return } + if (this.state.overwrite = !this.state.overwrite) + { addClass(this.display.cursorDiv, "CodeMirror-overwrite"); } + else + { rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); } + + signal(this, "overwriteToggle", this, this.state.overwrite); + }, + hasFocus: function() { return this.display.input.getField() == activeElt() }, + isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) }, + + scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }), + getScrollInfo: function() { + var scroller = this.display.scroller; + return {left: scroller.scrollLeft, top: scroller.scrollTop, + height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight, + width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth, + clientHeight: displayHeight(this), clientWidth: displayWidth(this)} + }, + + scrollIntoView: methodOp(function(range, margin) { + if (range == null) { + range = {from: this.doc.sel.primary().head, to: null}; + if (margin == null) { margin = this.options.cursorScrollMargin; } + } else if (typeof range == "number") { + range = {from: Pos(range, 0), to: null}; + } else if (range.from == null) { + range = {from: range, to: null}; + } + if (!range.to) { range.to = range.from; } + range.margin = margin || 0; + + if (range.from.line != null) { + scrollToRange(this, range); + } else { + scrollToCoordsRange(this, range.from, range.to, range.margin); + } + }), + + setSize: methodOp(function(width, height) { + var this$1 = this; + + var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; }; + if (width != null) { this.display.wrapper.style.width = interpret(width); } + if (height != null) { this.display.wrapper.style.height = interpret(height); } + if (this.options.lineWrapping) { clearLineMeasurementCache(this); } + var lineNo = this.display.viewFrom; + this.doc.iter(lineNo, this.display.viewTo, function (line) { + if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) + { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo, "widget"); break } } } + ++lineNo; + }); + this.curOp.forceUpdate = true; + signal(this, "refresh", this); + }), + + operation: function(f){return runInOp(this, f)}, + startOperation: function(){return startOperation(this)}, + endOperation: function(){return endOperation(this)}, + + refresh: methodOp(function() { + var oldHeight = this.display.cachedTextHeight; + regChange(this); + this.curOp.forceUpdate = true; + clearCaches(this); + scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop); + updateGutterSpace(this.display); + if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping) + { estimateLineHeights(this); } + signal(this, "refresh", this); + }), + + swapDoc: methodOp(function(doc) { + var old = this.doc; + old.cm = null; + // Cancel the current text selection if any (#5821) + if (this.state.selectingText) { this.state.selectingText(); } + attachDoc(this, doc); + clearCaches(this); + this.display.input.reset(); + scrollToCoords(this, doc.scrollLeft, doc.scrollTop); + this.curOp.forceScroll = true; + signalLater(this, "swapDoc", this, old); + return old + }), + + phrase: function(phraseText) { + var phrases = this.options.phrases; + return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText + }, + + getInputField: function(){return this.display.input.getField()}, + getWrapperElement: function(){return this.display.wrapper}, + getScrollerElement: function(){return this.display.scroller}, + getGutterElement: function(){return this.display.gutters} + }; + eventMixin(CodeMirror); + + CodeMirror.registerHelper = function(type, name, value) { + if (!helpers.hasOwnProperty(type)) { helpers[type] = CodeMirror[type] = {_global: []}; } + helpers[type][name] = value; + }; + CodeMirror.registerGlobalHelper = function(type, name, predicate, value) { + CodeMirror.registerHelper(type, name, value); + helpers[type]._global.push({pred: predicate, val: value}); + }; + } + + // Used for horizontal relative motion. Dir is -1 or 1 (left or + // right), unit can be "codepoint", "char", "column" (like char, but + // doesn't cross line boundaries), "word" (across next word), or + // "group" (to the start of next group of word or + // non-word-non-whitespace chars). The visually param controls + // whether, in right-to-left text, direction 1 means to move towards + // the next index in the string, or towards the character to the right + // of the current position. The resulting position will have a + // hitSide=true property if it reached the end of the document. + function findPosH(doc, pos, dir, unit, visually) { + var oldPos = pos; + var origDir = dir; + var lineObj = getLine(doc, pos.line); + var lineDir = visually && doc.direction == "rtl" ? -dir : dir; + function findNextLine() { + var l = pos.line + lineDir; + if (l < doc.first || l >= doc.first + doc.size) { return false } + pos = new Pos(l, pos.ch, pos.sticky); + return lineObj = getLine(doc, l) + } + function moveOnce(boundToLine) { + var next; + if (unit == "codepoint") { + var ch = lineObj.text.charCodeAt(pos.ch + (dir > 0 ? 0 : -1)); + if (isNaN(ch)) { + next = null; + } else { + var astral = dir > 0 ? ch >= 0xD800 && ch < 0xDC00 : ch >= 0xDC00 && ch < 0xDFFF; + next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (astral ? 2 : 1))), -dir); + } + } else if (visually) { + next = moveVisually(doc.cm, lineObj, pos, dir); + } else { + next = moveLogically(lineObj, pos, dir); + } + if (next == null) { + if (!boundToLine && findNextLine()) + { pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir); } + else + { return false } + } else { + pos = next; + } + return true + } + + if (unit == "char" || unit == "codepoint") { + moveOnce(); + } else if (unit == "column") { + moveOnce(true); + } else if (unit == "word" || unit == "group") { + var sawType = null, group = unit == "group"; + var helper = doc.cm && doc.cm.getHelper(pos, "wordChars"); + for (var first = true;; first = false) { + if (dir < 0 && !moveOnce(!first)) { break } + var cur = lineObj.text.charAt(pos.ch) || "\n"; + var type = isWordChar(cur, helper) ? "w" + : group && cur == "\n" ? "n" + : !group || /\s/.test(cur) ? null + : "p"; + if (group && !first && !type) { type = "s"; } + if (sawType && sawType != type) { + if (dir < 0) {dir = 1; moveOnce(); pos.sticky = "after";} + break + } + + if (type) { sawType = type; } + if (dir > 0 && !moveOnce(!first)) { break } + } + } + var result = skipAtomic(doc, pos, oldPos, origDir, true); + if (equalCursorPos(oldPos, result)) { result.hitSide = true; } + return result + } + + // For relative vertical movement. Dir may be -1 or 1. Unit can be + // "page" or "line". The resulting position will have a hitSide=true + // property if it reached the end of the document. + function findPosV(cm, pos, dir, unit) { + var doc = cm.doc, x = pos.left, y; + if (unit == "page") { + var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight); + var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3); + y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount; + + } else if (unit == "line") { + y = dir > 0 ? pos.bottom + 3 : pos.top - 3; + } + var target; + for (;;) { + target = coordsChar(cm, x, y); + if (!target.outside) { break } + if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break } + y += dir * 5; + } + return target + } + + // CONTENTEDITABLE INPUT STYLE + + var ContentEditableInput = function(cm) { + this.cm = cm; + this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null; + this.polling = new Delayed(); + this.composing = null; + this.gracePeriod = false; + this.readDOMTimeout = null; + }; + + ContentEditableInput.prototype.init = function (display) { + var this$1 = this; + + var input = this, cm = input.cm; + var div = input.div = display.lineDiv; + disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize); + + function belongsToInput(e) { + for (var t = e.target; t; t = t.parentNode) { + if (t == div) { return true } + if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) { break } + } + return false + } + + on(div, "paste", function (e) { + if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) { return } + // IE doesn't fire input events, so we schedule a read for the pasted content in this way + if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); } + }); + + on(div, "compositionstart", function (e) { + this$1.composing = {data: e.data, done: false}; + }); + on(div, "compositionupdate", function (e) { + if (!this$1.composing) { this$1.composing = {data: e.data, done: false}; } + }); + on(div, "compositionend", function (e) { + if (this$1.composing) { + if (e.data != this$1.composing.data) { this$1.readFromDOMSoon(); } + this$1.composing.done = true; + } + }); + + on(div, "touchstart", function () { return input.forceCompositionEnd(); }); + + on(div, "input", function () { + if (!this$1.composing) { this$1.readFromDOMSoon(); } + }); + + function onCopyCut(e) { + if (!belongsToInput(e) || signalDOMEvent(cm, e)) { return } + if (cm.somethingSelected()) { + setLastCopied({lineWise: false, text: cm.getSelections()}); + if (e.type == "cut") { cm.replaceSelection("", null, "cut"); } + } else if (!cm.options.lineWiseCopyCut) { + return + } else { + var ranges = copyableRanges(cm); + setLastCopied({lineWise: true, text: ranges.text}); + if (e.type == "cut") { + cm.operation(function () { + cm.setSelections(ranges.ranges, 0, sel_dontScroll); + cm.replaceSelection("", null, "cut"); + }); + } + } + if (e.clipboardData) { + e.clipboardData.clearData(); + var content = lastCopied.text.join("\n"); + // iOS exposes the clipboard API, but seems to discard content inserted into it + e.clipboardData.setData("Text", content); + if (e.clipboardData.getData("Text") == content) { + e.preventDefault(); + return + } + } + // Old-fashioned briefly-focus-a-textarea hack + var kludge = hiddenTextarea(), te = kludge.firstChild; + cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild); + te.value = lastCopied.text.join("\n"); + var hadFocus = document.activeElement; + selectInput(te); + setTimeout(function () { + cm.display.lineSpace.removeChild(kludge); + hadFocus.focus(); + if (hadFocus == div) { input.showPrimarySelection(); } + }, 50); + } + on(div, "copy", onCopyCut); + on(div, "cut", onCopyCut); + }; + + ContentEditableInput.prototype.screenReaderLabelChanged = function (label) { + // Label for screenreaders, accessibility + if(label) { + this.div.setAttribute('aria-label', label); + } else { + this.div.removeAttribute('aria-label'); + } + }; + + ContentEditableInput.prototype.prepareSelection = function () { + var result = prepareSelection(this.cm, false); + result.focus = document.activeElement == this.div; + return result + }; + + ContentEditableInput.prototype.showSelection = function (info, takeFocus) { + if (!info || !this.cm.display.view.length) { return } + if (info.focus || takeFocus) { this.showPrimarySelection(); } + this.showMultipleSelections(info); + }; + + ContentEditableInput.prototype.getSelection = function () { + return this.cm.display.wrapper.ownerDocument.getSelection() + }; + + ContentEditableInput.prototype.showPrimarySelection = function () { + var sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary(); + var from = prim.from(), to = prim.to(); + + if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) { + sel.removeAllRanges(); + return + } + + var curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); + var curFocus = domToPos(cm, sel.focusNode, sel.focusOffset); + if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad && + cmp(minPos(curAnchor, curFocus), from) == 0 && + cmp(maxPos(curAnchor, curFocus), to) == 0) + { return } + + var view = cm.display.view; + var start = (from.line >= cm.display.viewFrom && posToDOM(cm, from)) || + {node: view[0].measure.map[2], offset: 0}; + var end = to.line < cm.display.viewTo && posToDOM(cm, to); + if (!end) { + var measure = view[view.length - 1].measure; + var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map; + end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}; + } + + if (!start || !end) { + sel.removeAllRanges(); + return + } + + var old = sel.rangeCount && sel.getRangeAt(0), rng; + try { rng = range(start.node, start.offset, end.offset, end.node); } + catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible + if (rng) { + if (!gecko && cm.state.focused) { + sel.collapse(start.node, start.offset); + if (!rng.collapsed) { + sel.removeAllRanges(); + sel.addRange(rng); + } + } else { + sel.removeAllRanges(); + sel.addRange(rng); + } + if (old && sel.anchorNode == null) { sel.addRange(old); } + else if (gecko) { this.startGracePeriod(); } + } + this.rememberSelection(); + }; + + ContentEditableInput.prototype.startGracePeriod = function () { + var this$1 = this; + + clearTimeout(this.gracePeriod); + this.gracePeriod = setTimeout(function () { + this$1.gracePeriod = false; + if (this$1.selectionChanged()) + { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }); } + }, 20); + }; + + ContentEditableInput.prototype.showMultipleSelections = function (info) { + removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors); + removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection); + }; + + ContentEditableInput.prototype.rememberSelection = function () { + var sel = this.getSelection(); + this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset; + this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset; + }; + + ContentEditableInput.prototype.selectionInEditor = function () { + var sel = this.getSelection(); + if (!sel.rangeCount) { return false } + var node = sel.getRangeAt(0).commonAncestorContainer; + return contains(this.div, node) + }; + + ContentEditableInput.prototype.focus = function () { + if (this.cm.options.readOnly != "nocursor") { + if (!this.selectionInEditor() || document.activeElement != this.div) + { this.showSelection(this.prepareSelection(), true); } + this.div.focus(); + } + }; + ContentEditableInput.prototype.blur = function () { this.div.blur(); }; + ContentEditableInput.prototype.getField = function () { return this.div }; + + ContentEditableInput.prototype.supportsTouch = function () { return true }; + + ContentEditableInput.prototype.receivedFocus = function () { + var input = this; + if (this.selectionInEditor()) + { this.pollSelection(); } + else + { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }); } + + function poll() { + if (input.cm.state.focused) { + input.pollSelection(); + input.polling.set(input.cm.options.pollInterval, poll); + } + } + this.polling.set(this.cm.options.pollInterval, poll); + }; + + ContentEditableInput.prototype.selectionChanged = function () { + var sel = this.getSelection(); + return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset || + sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset + }; + + ContentEditableInput.prototype.pollSelection = function () { + if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { return } + var sel = this.getSelection(), cm = this.cm; + // On Android Chrome (version 56, at least), backspacing into an + // uneditable block element will put the cursor in that element, + // and then, because it's not editable, hide the virtual keyboard. + // Because Android doesn't allow us to actually detect backspace + // presses in a sane way, this code checks for when that happens + // and simulates a backspace press in this case. + if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) { + this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs}); + this.blur(); + this.focus(); + return + } + if (this.composing) { return } + this.rememberSelection(); + var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); + var head = domToPos(cm, sel.focusNode, sel.focusOffset); + if (anchor && head) { runInOp(cm, function () { + setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll); + if (anchor.bad || head.bad) { cm.curOp.selectionChanged = true; } + }); } + }; + + ContentEditableInput.prototype.pollContent = function () { + if (this.readDOMTimeout != null) { + clearTimeout(this.readDOMTimeout); + this.readDOMTimeout = null; + } + + var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary(); + var from = sel.from(), to = sel.to(); + if (from.ch == 0 && from.line > cm.firstLine()) + { from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length); } + if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine()) + { to = Pos(to.line + 1, 0); } + if (from.line < display.viewFrom || to.line > display.viewTo - 1) { return false } + + var fromIndex, fromLine, fromNode; + if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) { + fromLine = lineNo(display.view[0].line); + fromNode = display.view[0].node; + } else { + fromLine = lineNo(display.view[fromIndex].line); + fromNode = display.view[fromIndex - 1].node.nextSibling; + } + var toIndex = findViewIndex(cm, to.line); + var toLine, toNode; + if (toIndex == display.view.length - 1) { + toLine = display.viewTo - 1; + toNode = display.lineDiv.lastChild; + } else { + toLine = lineNo(display.view[toIndex + 1].line) - 1; + toNode = display.view[toIndex + 1].node.previousSibling; + } + + if (!fromNode) { return false } + var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine)); + var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length)); + while (newText.length > 1 && oldText.length > 1) { + if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; } + else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; } + else { break } + } + + var cutFront = 0, cutEnd = 0; + var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length); + while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront)) + { ++cutFront; } + var newBot = lst(newText), oldBot = lst(oldText); + var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0), + oldBot.length - (oldText.length == 1 ? cutFront : 0)); + while (cutEnd < maxCutEnd && + newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) + { ++cutEnd; } + // Try to move start of change to start of selection if ambiguous + if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) { + while (cutFront && cutFront > from.ch && + newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) { + cutFront--; + cutEnd++; + } + } + + newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, ""); + newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, ""); + + var chFrom = Pos(fromLine, cutFront); + var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0); + if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) { + replaceRange(cm.doc, newText, chFrom, chTo, "+input"); + return true + } + }; + + ContentEditableInput.prototype.ensurePolled = function () { + this.forceCompositionEnd(); + }; + ContentEditableInput.prototype.reset = function () { + this.forceCompositionEnd(); + }; + ContentEditableInput.prototype.forceCompositionEnd = function () { + if (!this.composing) { return } + clearTimeout(this.readDOMTimeout); + this.composing = null; + this.updateFromDOM(); + this.div.blur(); + this.div.focus(); + }; + ContentEditableInput.prototype.readFromDOMSoon = function () { + var this$1 = this; + + if (this.readDOMTimeout != null) { return } + this.readDOMTimeout = setTimeout(function () { + this$1.readDOMTimeout = null; + if (this$1.composing) { + if (this$1.composing.done) { this$1.composing = null; } + else { return } + } + this$1.updateFromDOM(); + }, 80); + }; + + ContentEditableInput.prototype.updateFromDOM = function () { + var this$1 = this; + + if (this.cm.isReadOnly() || !this.pollContent()) + { runInOp(this.cm, function () { return regChange(this$1.cm); }); } + }; + + ContentEditableInput.prototype.setUneditable = function (node) { + node.contentEditable = "false"; + }; + + ContentEditableInput.prototype.onKeyPress = function (e) { + if (e.charCode == 0 || this.composing) { return } + e.preventDefault(); + if (!this.cm.isReadOnly()) + { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); } + }; + + ContentEditableInput.prototype.readOnlyChanged = function (val) { + this.div.contentEditable = String(val != "nocursor"); + }; + + ContentEditableInput.prototype.onContextMenu = function () {}; + ContentEditableInput.prototype.resetPosition = function () {}; + + ContentEditableInput.prototype.needsContentAttribute = true; + + function posToDOM(cm, pos) { + var view = findViewForLine(cm, pos.line); + if (!view || view.hidden) { return null } + var line = getLine(cm.doc, pos.line); + var info = mapFromLineView(view, line, pos.line); + + var order = getOrder(line, cm.doc.direction), side = "left"; + if (order) { + var partPos = getBidiPartAt(order, pos.ch); + side = partPos % 2 ? "right" : "left"; + } + var result = nodeAndOffsetInLineMap(info.map, pos.ch, side); + result.offset = result.collapse == "right" ? result.end : result.start; + return result + } + + function isInGutter(node) { + for (var scan = node; scan; scan = scan.parentNode) + { if (/CodeMirror-gutter-wrapper/.test(scan.className)) { return true } } + return false + } + + function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos } + + function domTextBetween(cm, from, to, fromLine, toLine) { + var text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false; + function recognizeMarker(id) { return function (marker) { return marker.id == id; } } + function close() { + if (closing) { + text += lineSep; + if (extraLinebreak) { text += lineSep; } + closing = extraLinebreak = false; + } + } + function addText(str) { + if (str) { + close(); + text += str; + } + } + function walk(node) { + if (node.nodeType == 1) { + var cmText = node.getAttribute("cm-text"); + if (cmText) { + addText(cmText); + return + } + var markerID = node.getAttribute("cm-marker"), range; + if (markerID) { + var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID)); + if (found.length && (range = found[0].find(0))) + { addText(getBetween(cm.doc, range.from, range.to).join(lineSep)); } + return + } + if (node.getAttribute("contenteditable") == "false") { return } + var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName); + if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { return } + + if (isBlock) { close(); } + for (var i = 0; i < node.childNodes.length; i++) + { walk(node.childNodes[i]); } + + if (/^(pre|p)$/i.test(node.nodeName)) { extraLinebreak = true; } + if (isBlock) { closing = true; } + } else if (node.nodeType == 3) { + addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " ")); + } + } + for (;;) { + walk(from); + if (from == to) { break } + from = from.nextSibling; + extraLinebreak = false; + } + return text + } + + function domToPos(cm, node, offset) { + var lineNode; + if (node == cm.display.lineDiv) { + lineNode = cm.display.lineDiv.childNodes[offset]; + if (!lineNode) { return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) } + node = null; offset = 0; + } else { + for (lineNode = node;; lineNode = lineNode.parentNode) { + if (!lineNode || lineNode == cm.display.lineDiv) { return null } + if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { break } + } + } + for (var i = 0; i < cm.display.view.length; i++) { + var lineView = cm.display.view[i]; + if (lineView.node == lineNode) + { return locateNodeInLineView(lineView, node, offset) } + } + } + + function locateNodeInLineView(lineView, node, offset) { + var wrapper = lineView.text.firstChild, bad = false; + if (!node || !contains(wrapper, node)) { return badPos(Pos(lineNo(lineView.line), 0), true) } + if (node == wrapper) { + bad = true; + node = wrapper.childNodes[offset]; + offset = 0; + if (!node) { + var line = lineView.rest ? lst(lineView.rest) : lineView.line; + return badPos(Pos(lineNo(line), line.text.length), bad) + } + } + + var textNode = node.nodeType == 3 ? node : null, topNode = node; + if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) { + textNode = node.firstChild; + if (offset) { offset = textNode.nodeValue.length; } + } + while (topNode.parentNode != wrapper) { topNode = topNode.parentNode; } + var measure = lineView.measure, maps = measure.maps; + + function find(textNode, topNode, offset) { + for (var i = -1; i < (maps ? maps.length : 0); i++) { + var map = i < 0 ? measure.map : maps[i]; + for (var j = 0; j < map.length; j += 3) { + var curNode = map[j + 2]; + if (curNode == textNode || curNode == topNode) { + var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]); + var ch = map[j] + offset; + if (offset < 0 || curNode != textNode) { ch = map[j + (offset ? 1 : 0)]; } + return Pos(line, ch) + } + } + } + } + var found = find(textNode, topNode, offset); + if (found) { return badPos(found, bad) } + + // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems + for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) { + found = find(after, after.firstChild, 0); + if (found) + { return badPos(Pos(found.line, found.ch - dist), bad) } + else + { dist += after.textContent.length; } + } + for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) { + found = find(before, before.firstChild, -1); + if (found) + { return badPos(Pos(found.line, found.ch + dist$1), bad) } + else + { dist$1 += before.textContent.length; } + } + } + + // TEXTAREA INPUT STYLE + + var TextareaInput = function(cm) { + this.cm = cm; + // See input.poll and input.reset + this.prevInput = ""; + + // Flag that indicates whether we expect input to appear real soon + // now (after some event like 'keypress' or 'input') and are + // polling intensively. + this.pollingFast = false; + // Self-resetting timeout for the poller + this.polling = new Delayed(); + // Used to work around IE issue with selection being forgotten when focus moves away from textarea + this.hasSelection = false; + this.composing = null; + }; + + TextareaInput.prototype.init = function (display) { + var this$1 = this; + + var input = this, cm = this.cm; + this.createField(display); + var te = this.textarea; + + display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild); + + // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore) + if (ios) { te.style.width = "0px"; } + + on(te, "input", function () { + if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null; } + input.poll(); + }); + + on(te, "paste", function (e) { + if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return } + + cm.state.pasteIncoming = +new Date; + input.fastPoll(); + }); + + function prepareCopyCut(e) { + if (signalDOMEvent(cm, e)) { return } + if (cm.somethingSelected()) { + setLastCopied({lineWise: false, text: cm.getSelections()}); + } else if (!cm.options.lineWiseCopyCut) { + return + } else { + var ranges = copyableRanges(cm); + setLastCopied({lineWise: true, text: ranges.text}); + if (e.type == "cut") { + cm.setSelections(ranges.ranges, null, sel_dontScroll); + } else { + input.prevInput = ""; + te.value = ranges.text.join("\n"); + selectInput(te); + } + } + if (e.type == "cut") { cm.state.cutIncoming = +new Date; } + } + on(te, "cut", prepareCopyCut); + on(te, "copy", prepareCopyCut); + + on(display.scroller, "paste", function (e) { + if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return } + if (!te.dispatchEvent) { + cm.state.pasteIncoming = +new Date; + input.focus(); + return + } + + // Pass the `paste` event to the textarea so it's handled by its event listener. + var event = new Event("paste"); + event.clipboardData = e.clipboardData; + te.dispatchEvent(event); + }); + + // Prevent normal selection in the editor (we handle our own) + on(display.lineSpace, "selectstart", function (e) { + if (!eventInWidget(display, e)) { e_preventDefault(e); } + }); + + on(te, "compositionstart", function () { + var start = cm.getCursor("from"); + if (input.composing) { input.composing.range.clear(); } + input.composing = { + start: start, + range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"}) + }; + }); + on(te, "compositionend", function () { + if (input.composing) { + input.poll(); + input.composing.range.clear(); + input.composing = null; + } + }); + }; + + TextareaInput.prototype.createField = function (_display) { + // Wraps and hides input textarea + this.wrapper = hiddenTextarea(); + // The semihidden textarea that is focused when the editor is + // focused, and receives input. + this.textarea = this.wrapper.firstChild; + }; + + TextareaInput.prototype.screenReaderLabelChanged = function (label) { + // Label for screenreaders, accessibility + if(label) { + this.textarea.setAttribute('aria-label', label); + } else { + this.textarea.removeAttribute('aria-label'); + } + }; + + TextareaInput.prototype.prepareSelection = function () { + // Redraw the selection and/or cursor + var cm = this.cm, display = cm.display, doc = cm.doc; + var result = prepareSelection(cm); + + // Move the hidden textarea near the cursor to prevent scrolling artifacts + if (cm.options.moveInputWithCursor) { + var headPos = cursorCoords(cm, doc.sel.primary().head, "div"); + var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect(); + result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10, + headPos.top + lineOff.top - wrapOff.top)); + result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10, + headPos.left + lineOff.left - wrapOff.left)); + } + + return result + }; + + TextareaInput.prototype.showSelection = function (drawn) { + var cm = this.cm, display = cm.display; + removeChildrenAndAdd(display.cursorDiv, drawn.cursors); + removeChildrenAndAdd(display.selectionDiv, drawn.selection); + if (drawn.teTop != null) { + this.wrapper.style.top = drawn.teTop + "px"; + this.wrapper.style.left = drawn.teLeft + "px"; + } + }; + + // Reset the input to correspond to the selection (or to be empty, + // when not typing and nothing is selected) + TextareaInput.prototype.reset = function (typing) { + if (this.contextMenuPending || this.composing) { return } + var cm = this.cm; + if (cm.somethingSelected()) { + this.prevInput = ""; + var content = cm.getSelection(); + this.textarea.value = content; + if (cm.state.focused) { selectInput(this.textarea); } + if (ie && ie_version >= 9) { this.hasSelection = content; } + } else if (!typing) { + this.prevInput = this.textarea.value = ""; + if (ie && ie_version >= 9) { this.hasSelection = null; } + } + }; + + TextareaInput.prototype.getField = function () { return this.textarea }; + + TextareaInput.prototype.supportsTouch = function () { return false }; + + TextareaInput.prototype.focus = function () { + if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) { + try { this.textarea.focus(); } + catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM + } + }; + + TextareaInput.prototype.blur = function () { this.textarea.blur(); }; + + TextareaInput.prototype.resetPosition = function () { + this.wrapper.style.top = this.wrapper.style.left = 0; + }; + + TextareaInput.prototype.receivedFocus = function () { this.slowPoll(); }; + + // Poll for input changes, using the normal rate of polling. This + // runs as long as the editor is focused. + TextareaInput.prototype.slowPoll = function () { + var this$1 = this; + + if (this.pollingFast) { return } + this.polling.set(this.cm.options.pollInterval, function () { + this$1.poll(); + if (this$1.cm.state.focused) { this$1.slowPoll(); } + }); + }; + + // When an event has just come in that is likely to add or change + // something in the input textarea, we poll faster, to ensure that + // the change appears on the screen quickly. + TextareaInput.prototype.fastPoll = function () { + var missed = false, input = this; + input.pollingFast = true; + function p() { + var changed = input.poll(); + if (!changed && !missed) {missed = true; input.polling.set(60, p);} + else {input.pollingFast = false; input.slowPoll();} + } + input.polling.set(20, p); + }; + + // Read input from the textarea, and update the document to match. + // When something is selected, it is present in the textarea, and + // selected (unless it is huge, in which case a placeholder is + // used). When nothing is selected, the cursor sits after previously + // seen text (can be empty), which is stored in prevInput (we must + // not reset the textarea when typing, because that breaks IME). + TextareaInput.prototype.poll = function () { + var this$1 = this; + + var cm = this.cm, input = this.textarea, prevInput = this.prevInput; + // Since this is called a *lot*, try to bail out as cheaply as + // possible when it is clear that nothing happened. hasSelection + // will be the case when there is a lot of text in the textarea, + // in which case reading its value would be expensive. + if (this.contextMenuPending || !cm.state.focused || + (hasSelection(input) && !prevInput && !this.composing) || + cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq) + { return false } + + var text = input.value; + // If nothing changed, bail. + if (text == prevInput && !cm.somethingSelected()) { return false } + // Work around nonsensical selection resetting in IE9/10, and + // inexplicable appearance of private area unicode characters on + // some key combos in Mac (#2689). + if (ie && ie_version >= 9 && this.hasSelection === text || + mac && /[\uf700-\uf7ff]/.test(text)) { + cm.display.input.reset(); + return false + } + + if (cm.doc.sel == cm.display.selForContextMenu) { + var first = text.charCodeAt(0); + if (first == 0x200b && !prevInput) { prevInput = "\u200b"; } + if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") } + } + // Find the part of the input that is actually new + var same = 0, l = Math.min(prevInput.length, text.length); + while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { ++same; } + + runInOp(cm, function () { + applyTextInput(cm, text.slice(same), prevInput.length - same, + null, this$1.composing ? "*compose" : null); + + // Don't leave long text in the textarea, since it makes further polling slow + if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = ""; } + else { this$1.prevInput = text; } + + if (this$1.composing) { + this$1.composing.range.clear(); + this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"), + {className: "CodeMirror-composing"}); + } + }); + return true + }; + + TextareaInput.prototype.ensurePolled = function () { + if (this.pollingFast && this.poll()) { this.pollingFast = false; } + }; + + TextareaInput.prototype.onKeyPress = function () { + if (ie && ie_version >= 9) { this.hasSelection = null; } + this.fastPoll(); + }; + + TextareaInput.prototype.onContextMenu = function (e) { + var input = this, cm = input.cm, display = cm.display, te = input.textarea; + if (input.contextMenuPending) { input.contextMenuPending(); } + var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop; + if (!pos || presto) { return } // Opera is difficult. + + // Reset the current text selection only if the click is done outside of the selection + // and 'resetSelectionOnContextMenu' option is true. + var reset = cm.options.resetSelectionOnContextMenu; + if (reset && cm.doc.sel.contains(pos) == -1) + { operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); } + + var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText; + var wrapperBox = input.wrapper.offsetParent.getBoundingClientRect(); + input.wrapper.style.cssText = "position: static"; + te.style.cssText = "position: absolute; width: 30px; height: 30px;\n top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"; + var oldScrollY; + if (webkit) { oldScrollY = window.scrollY; } // Work around Chrome issue (#2712) + display.input.focus(); + if (webkit) { window.scrollTo(null, oldScrollY); } + display.input.reset(); + // Adds "Select all" to context menu in FF + if (!cm.somethingSelected()) { te.value = input.prevInput = " "; } + input.contextMenuPending = rehide; + display.selForContextMenu = cm.doc.sel; + clearTimeout(display.detectingSelectAll); + + // Select-all will be greyed out if there's nothing to select, so + // this adds a zero-width space so that we can later check whether + // it got selected. + function prepareSelectAllHack() { + if (te.selectionStart != null) { + var selected = cm.somethingSelected(); + var extval = "\u200b" + (selected ? te.value : ""); + te.value = "\u21da"; // Used to catch context-menu undo + te.value = extval; + input.prevInput = selected ? "" : "\u200b"; + te.selectionStart = 1; te.selectionEnd = extval.length; + // Re-set this, in case some other handler touched the + // selection in the meantime. + display.selForContextMenu = cm.doc.sel; + } + } + function rehide() { + if (input.contextMenuPending != rehide) { return } + input.contextMenuPending = false; + input.wrapper.style.cssText = oldWrapperCSS; + te.style.cssText = oldCSS; + if (ie && ie_version < 9) { display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); } + + // Try to detect the user choosing select-all + if (te.selectionStart != null) { + if (!ie || (ie && ie_version < 9)) { prepareSelectAllHack(); } + var i = 0, poll = function () { + if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && + te.selectionEnd > 0 && input.prevInput == "\u200b") { + operation(cm, selectAll)(cm); + } else if (i++ < 10) { + display.detectingSelectAll = setTimeout(poll, 500); + } else { + display.selForContextMenu = null; + display.input.reset(); + } + }; + display.detectingSelectAll = setTimeout(poll, 200); + } + } + + if (ie && ie_version >= 9) { prepareSelectAllHack(); } + if (captureRightClick) { + e_stop(e); + var mouseup = function () { + off(window, "mouseup", mouseup); + setTimeout(rehide, 20); + }; + on(window, "mouseup", mouseup); + } else { + setTimeout(rehide, 50); + } + }; + + TextareaInput.prototype.readOnlyChanged = function (val) { + if (!val) { this.reset(); } + this.textarea.disabled = val == "nocursor"; + this.textarea.readOnly = !!val; + }; + + TextareaInput.prototype.setUneditable = function () {}; + + TextareaInput.prototype.needsContentAttribute = false; + + function fromTextArea(textarea, options) { + options = options ? copyObj(options) : {}; + options.value = textarea.value; + if (!options.tabindex && textarea.tabIndex) + { options.tabindex = textarea.tabIndex; } + if (!options.placeholder && textarea.placeholder) + { options.placeholder = textarea.placeholder; } + // Set autofocus to true if this textarea is focused, or if it has + // autofocus and no other element is focused. + if (options.autofocus == null) { + var hasFocus = activeElt(); + options.autofocus = hasFocus == textarea || + textarea.getAttribute("autofocus") != null && hasFocus == document.body; + } + + function save() {textarea.value = cm.getValue();} + + var realSubmit; + if (textarea.form) { + on(textarea.form, "submit", save); + // Deplorable hack to make the submit method do the right thing. + if (!options.leaveSubmitMethodAlone) { + var form = textarea.form; + realSubmit = form.submit; + try { + var wrappedSubmit = form.submit = function () { + save(); + form.submit = realSubmit; + form.submit(); + form.submit = wrappedSubmit; + }; + } catch(e) {} + } + } + + options.finishInit = function (cm) { + cm.save = save; + cm.getTextArea = function () { return textarea; }; + cm.toTextArea = function () { + cm.toTextArea = isNaN; // Prevent this from being ran twice + save(); + textarea.parentNode.removeChild(cm.getWrapperElement()); + textarea.style.display = ""; + if (textarea.form) { + off(textarea.form, "submit", save); + if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function") + { textarea.form.submit = realSubmit; } + } + }; + }; + + textarea.style.display = "none"; + var cm = CodeMirror(function (node) { return textarea.parentNode.insertBefore(node, textarea.nextSibling); }, + options); + return cm + } + + function addLegacyProps(CodeMirror) { + CodeMirror.off = off; + CodeMirror.on = on; + CodeMirror.wheelEventPixels = wheelEventPixels; + CodeMirror.Doc = Doc; + CodeMirror.splitLines = splitLinesAuto; + CodeMirror.countColumn = countColumn; + CodeMirror.findColumn = findColumn; + CodeMirror.isWordChar = isWordCharBasic; + CodeMirror.Pass = Pass; + CodeMirror.signal = signal; + CodeMirror.Line = Line; + CodeMirror.changeEnd = changeEnd; + CodeMirror.scrollbarModel = scrollbarModel; + CodeMirror.Pos = Pos; + CodeMirror.cmpPos = cmp; + CodeMirror.modes = modes; + CodeMirror.mimeModes = mimeModes; + CodeMirror.resolveMode = resolveMode; + CodeMirror.getMode = getMode; + CodeMirror.modeExtensions = modeExtensions; + CodeMirror.extendMode = extendMode; + CodeMirror.copyState = copyState; + CodeMirror.startState = startState; + CodeMirror.innerMode = innerMode; + CodeMirror.commands = commands; + CodeMirror.keyMap = keyMap; + CodeMirror.keyName = keyName; + CodeMirror.isModifierKey = isModifierKey; + CodeMirror.lookupKey = lookupKey; + CodeMirror.normalizeKeyMap = normalizeKeyMap; + CodeMirror.StringStream = StringStream; + CodeMirror.SharedTextMarker = SharedTextMarker; + CodeMirror.TextMarker = TextMarker; + CodeMirror.LineWidget = LineWidget; + CodeMirror.e_preventDefault = e_preventDefault; + CodeMirror.e_stopPropagation = e_stopPropagation; + CodeMirror.e_stop = e_stop; + CodeMirror.addClass = addClass; + CodeMirror.contains = contains; + CodeMirror.rmClass = rmClass; + CodeMirror.keyNames = keyNames; + } + + // EDITOR CONSTRUCTOR + + defineOptions(CodeMirror); + + addEditorMethods(CodeMirror); + + // Set up methods on CodeMirror's prototype to redirect to the editor's document. + var dontDelegate = "iter insert remove copy getEditor constructor".split(" "); + for (var prop in Doc.prototype) { if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) + { CodeMirror.prototype[prop] = (function(method) { + return function() {return method.apply(this.doc, arguments)} + })(Doc.prototype[prop]); } } + + eventMixin(Doc); + CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}; + + // Extra arguments are stored as the mode's dependencies, which is + // used by (legacy) mechanisms like loadmode.js to automatically + // load a mode. (Preferred mechanism is the require/define calls.) + CodeMirror.defineMode = function(name/*, mode, …*/) { + if (!CodeMirror.defaults.mode && name != "null") { CodeMirror.defaults.mode = name; } + defineMode.apply(this, arguments); + }; + + CodeMirror.defineMIME = defineMIME; + + // Minimal default mode. + CodeMirror.defineMode("null", function () { return ({token: function (stream) { return stream.skipToEnd(); }}); }); + CodeMirror.defineMIME("text/plain", "null"); + + // EXTENSIONS + + CodeMirror.defineExtension = function (name, func) { + CodeMirror.prototype[name] = func; + }; + CodeMirror.defineDocExtension = function (name, func) { + Doc.prototype[name] = func; + }; + + CodeMirror.fromTextArea = fromTextArea; + + addLegacyProps(CodeMirror); + + CodeMirror.version = "5.59.3"; + + return CodeMirror; + +}))); diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile index 6cc5d7036f..00a0e89c38 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile @@ -1,20 +1,22 @@ -# Copyright (C) 2016 Openwrt.org # -# This is a free software, use it under GNU General Public License v3.0. +# Copyright (C) 2021 ImmortalWrt +# (https://immortalwrt.org) +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. # -# Created By ImmortalWrt -# https://github.com/project-openwrt include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for UnblockNeteaseMusic LUCI_DEPENDS:=+bash +busybox +coreutils +coreutils-nohup +curl +dnsmasq-full +ipset +libopenssl +node LUCI_PKGARCH:=all + PKG_NAME:=luci-app-unblockneteasemusic PKG_VERSION:=2.8 -PKG_RELEASE:=8 +PKG_RELEASE:=10 -PKG_MAINTAINER:=ImmortalWrt +PKG_MAINTAINER:=CN_SZTL include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua index c2978f00ad..3846300d24 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua @@ -11,9 +11,9 @@ function index() entry({"admin", "services", "unblockneteasemusic"},firstchild(), _("解除网易云音乐播放限制"), 50).dependent = false - entry({"admin", "services", "unblockneteasemusic", "general"},cbi("unblockneteasemusic"), _("基本设定"), 1) - entry({"admin", "services", "unblockneteasemusic", "upgrade"},form("unblockneteasemusic_upgrade"), _("更新组件"), 2).leaf = true - entry({"admin", "services", "unblockneteasemusic", "log"},form("unblockneteasemusiclog"), _("日志"), 3) + entry({"admin", "services", "unblockneteasemusic", "general"},cbi("unblockneteasemusic/unblockneteasemusic"), _("基本设定"), 1) + entry({"admin", "services", "unblockneteasemusic", "upgrade"},form("unblockneteasemusic/unblockneteasemusic_upgrade"), _("更新组件"), 2).leaf = true + entry({"admin", "services", "unblockneteasemusic", "log"},form("unblockneteasemusic/unblockneteasemusiclog"), _("日志"), 3) entry({"admin", "services", "unblockneteasemusic", "status"},call("act_status")).leaf=true entry({"admin", "services", "unblockneteasemusic", "update_luci"},call("act_update_luci")) @@ -57,7 +57,7 @@ end function update_core() core_cloud_ver=luci.sys.exec("curl -s 'https://github.com/1715173329/UnblockNeteaseMusic/commits/enhanced' |tr -d '\n' |grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g'") - core_cloud_ver_mini=luci.sys.exec("curl -s 'https://github.com/1715173329/UnblockNeteaseMusic/commits/enhanced' |tr -d '\n' |grep -Eo 'BtnGroup-item.> [0-9a-z]+' |sed -n 1p |sed 's#BtnGroup-item.> ##g'") + core_cloud_ver_mini=string.sub(core_cloud_ver, 1, 7) if not core_cloud_ver or not core_cloud_ver_mini then return "1" else diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusic.lua similarity index 97% rename from package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua rename to package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusic.lua index 68f56c0297..b496ecc098 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusic.lua @@ -23,6 +23,7 @@ music_source:value("xiami", translate("虾米音乐")) music_source:value("baidu", translate("百度音乐")) music_source:value("joox", translate("JOOX音乐")) music_source:value("youtube", translate("Youtube音乐")) +music_source:value("bilibili", translate("Bilibili音乐")) music_source.description = translate("自定义模式下，多个音源请用空格隔开") music_source.default = "default" music_source.rmempty = false @@ -63,11 +64,6 @@ youtube_key.description = translate("API Key申请地址：https://developers.go youtube_key.datatype = "string" youtube_key:depends("use_custom_cookie", 1) -use_remote_qq_server = s:option(Flag, "use_remote_qq_server", translate("使用云端QQ音源解析")) -use_remote_qq_server.description = translate("通过云端服务器以获取QQ音源信息，无需开通QQ绿钻") -use_remote_qq_server.default = 0 -use_remote_qq_server.rmempty = false - auto_update = s:option(Flag, "auto_update", translate("启用自动更新")) auto_update.description = translate("启用后，每天将定时自动检查最新版本并更新") auto_update.default = 0 diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic_upgrade.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusic_upgrade.lua similarity index 100% rename from package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic_upgrade.lua rename to package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusic_upgrade.lua diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusiclog.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusiclog.lua similarity index 100% rename from package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusiclog.lua rename to package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic/unblockneteasemusiclog.lua diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/config/unblockneteasemusic b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/config/unblockneteasemusic index d1559b91ec..f62f9a207c 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/config/unblockneteasemusic +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/config/unblockneteasemusic @@ -5,7 +5,6 @@ config unblockneteasemusic option enable_flac '0' option replace_music_source 'dont_replace' option use_custom_cookie '0' - option use_remote_qq_server '0' option auto_update '1' option update_time '3' option daemon_enable '1' diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index dd32daf673..fc67f9f9ab 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -192,9 +192,6 @@ start() [ ! -e "/usr/share/$NAME/core/app.js" ] && { rm -f "/usr/share/$NAME/local_ver"; bash "/usr/share/$NAME/update.sh" "update_core_non_restart"; } [ ! -e "/usr/share/$NAME/core/app.js" ] && { echo "Core Not Found, please download it before starting." >> "/tmp/$NAME.log"; exit 1; } - [ "${use_remote_qq_server}" -ne "1" ] && qq_server_mode="local" || qq_server_mode="remote" - bash "/usr/share/$NAME/gen_qq_provider.sh" "${qq_server_mode}" "${enable_flac}" > "/usr/share/$NAME/core/src/provider/qq.js" - [ -n "${neteasemusic_cookie}" ] && { ub_cookie_line="$(sed -n -e "/netease.path.includes('song\/enhance')/=" "/usr/share/$NAME/core/src/hook.js")"; [ -n "${ub_cookie_line}" ] && { let ub_cookie_endline="ub_cookie_line+6"; sed -i "${ub_cookie_line},${ub_cookie_endline}d" "/usr/share/$NAME/core/src/hook.js"; } @@ -253,10 +250,10 @@ stop() { [ -f "${self_issue_cert_crt}" ] && [ -f "${self_issue_cert_key}" ]; } && { { [ "${self_issue_cert_crt}" != "/usr/share/$NAME/core/server.crt" ] && [ "${self_issue_cert_key}" != "/usr/share/$NAME/core/server.key" ]; } && { - sed -i "/${self_issue_cert_crt//\//\\/}/d" + sed -i "/${self_issue_cert_crt//\//\\/}/d" "${UPGRADE_CONF}" echo "${self_issue_cert_crt}" >> "${UPGRADE_CONF}" - sed -i "/${self_issue_cert_key//\//\\/}/d" + sed -i "/${self_issue_cert_key//\//\\/}/d" "${UPGRADE_CONF}" echo "${self_issue_cert_key}" >> "${UPGRADE_CONF}" } } diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh deleted file mode 100755 index 0bdaa2496c..0000000000 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/bash -# Created By ImmortalWrt -# https://github.com/project-openwrt - -header="const cache = require('../cache') -const insure = require('./insure') -const select = require('./select') -const request = require('../request') - -const headers = { - 'origin': 'http://y.qq.com/', - 'referer': 'http://y.qq.com/'," - -body="const playable = song => { - const switchFlag = song['switch'].toString(2).split('') - switchFlag.pop() - switchFlag.reverse() - const playFlag = switchFlag[0] - const tryFlag = switchFlag[13] - return ((playFlag == 1) || ((playFlag == 1) && (tryFlag == 1))) -} - -const format = song => ({ - id: {song: song.mid, file: song.file.media_mid}, - name: song.name, - duration: song.interval * 1000, - album: {id: song.album.mid, name: song.album.name}, - artists: song.singer.map(({mid, name}) => ({id: mid, name})) -}) - -const search = info => { - const url = - 'https://c.y.qq.com/soso/fcgi-bin/client_search_cp?' + - 'ct=24&qqmusic_ver=1298&new_json=1&remoteplace=txt.yqq.center&' + - 't=0&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=1&n=20&w=' + - encodeURIComponent(info.keyword) + '&' + - 'g_tk=5381&jsonpCallback=MusicJsonCallback10005317669353331&loginUin=0&hostUin=0&' + - 'format=jsonp&inCharset=utf8&outCharset=utf-8¬ice=0&platform=yqq&needNewCode=0' - - return request('GET', url) - .then(response => response.jsonp()) - .then(jsonBody => { - const list = jsonBody.data.song.list.map(format) - const matched = select(list, info) - return matched ? matched.id : Promise.reject() - }) -}" - -if [ "$1" == "local" ] -then echo -e "// local_mode -${header} - 'cookie': process.env.QQ_COOKIE || null // 'uin=; qm_keyst=', -} - -${body} - -const single = (id, format) => { - const uin = ((headers.cookie || '').match(/uin=(\d+)/) || [])[1] || '0' - - const concatenate = vkey => { - if (!vkey) return Promise.reject() - const host = ['streamoc.music.tc.qq.com', 'mobileoc.music.tc.qq.com', 'isure.stream.qqmusic.qq.com', 'dl.stream.qqmusic.qq.com', 'aqqmusic.tc.qq.com/amobile.music.tc.qq.com'][3] - return \`http://\${host}/\${format.join(id.file)}?vkey=\${vkey}&uin=0&fromtag=8&guid=7332953645\` - } - - const url = - 'https://u.y.qq.com/cgi-bin/musicu.fcg?data=' + - encodeURIComponent(JSON.stringify({ - req_0: { - module: 'vkey.GetVkeyServer', - method: 'CgiGetVkey', - param: { - guid: '7332953645', - loginflag: 1, - filename: [format.join(id.file)], - songmid: [id.song], - songtype: [0], - uin, - platform: '20' - } - } - })) - - return request('GET', url, headers) - .then(response => response.json()) - .then(jsonBody => { - const { sip, midurlinfo } = jsonBody.req_0.data - return midurlinfo[0].purl ? sip[0] + midurlinfo[0].purl : Promise.reject() - }) -} - -const track = id => { - id.key = id.file - return Promise.all( - [['F000', '.flac'], ['M800', '.mp3'], ['M500', '.mp3']].slice((headers.cookie || typeof(window) !== 'undefined') ? (select.ENABLE_FLAC ? 0 : 1) : 2) - .map(format => single(id, format).catch(() => null)) - ) - .then(result => result.find(url => url) || Promise.reject()) - .catch(() => insure().qq.track(id)) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, track}" -elif [ "$1" == "remote" ] -then [ "$2" == "1" ] && { flac_quality="'flac', "; loop_times="4"; } || loop_times="3" -echo -e "// remote_mode -${header} - 'cookie': null -} - -${body} - -const track = id => { - const typeObj = [${flac_quality}'320', '128', 'm4a'] - - let i = 0 - while (i < ${loop_times}) { - type = typeObj[i] - let url = - 'https://api.qq.jsososo.com/song/url?id=' + - id.song + '&mediaId=' + id.file + '&type=' + \`\${type}\` - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - let res = jsonBody.result - if (res === 100) { - let songUrl = jsonBody.data - return songUrl - } else if (i === $[${loop_times}-1]) { - return Promise.reject() - } else { - return - } - }) - .catch(() => insure().qq.track(id)) - i++ - } -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, track}" -else echo -e "Usage: $0 [local|remote] (1)" -fi diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh index ab25f24487..772b7b51bb 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh @@ -1,6 +1,6 @@ #!/bin/bash # Created By ImmortalWrt -# https://github.com/project-openwrt +# https://github.com/immortalwrt NAME="unblockneteasemusic" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh index 2355a48441..8b3bd22c80 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh @@ -1,6 +1,6 @@ #!/bin/bash # Created By ImmortalWrt -# https://github.com/project-openwrt +# https://github.com/immortalwrt NAME="unblockneteasemusic" @@ -19,7 +19,7 @@ function clean_log(){ } function check_luci_latest_version(){ - luci_latest_ver="$(curl -s 'https://github.com/project-openwrt/luci-app-unblockneteasemusic/releases/latest'| grep -Eo '[0-9\.]+\-[0-9]+')" + luci_latest_ver="$(curl -s 'https://github.com/immortalwrt/luci-app-unblockneteasemusic/releases/latest'| grep -Eo '[0-9\.]+\-[0-9]+')" [ -z "${luci_latest_ver}" ] && { echo -e "\nFailed to check latest LuCI version, please try again later." >> "/tmp/$NAME.log"; exit 1; } if [ "$(opkg info "luci-app-unblockneteasemusic" |sed -n "2p" |tr -d "Version: ")" != "${luci_latest_ver}" ]; then clean_log @@ -37,7 +37,7 @@ function update_luci(){ mkdir -p "/tmp" > "/dev/null" 2>&1 - curl -sL "https://github.com/project-openwrt/luci-app-unblockneteasemusic/releases/download/v${luci_latest_ver}/luci-app-unblockneteasemusic_${luci_latest_ver}_all.ipk" -o "/tmp/luci-app-unblockneteasemusic_${luci_latest_ver}_all.ipk" > "/dev/null" 2>&1 + curl -sL "https://github.com/immortalwrt/luci-app-unblockneteasemusic/releases/download/v${luci_latest_ver}/luci-app-unblockneteasemusic_${luci_latest_ver}_all.ipk" -o "/tmp/luci-app-unblockneteasemusic_${luci_latest_ver}_all.ipk" > "/dev/null" 2>&1 opkg install "/tmp/luci-app-unblockneteasemusic_${luci_latest_ver}_all.ipk" rm -f "/tmp/luci-app-unblockneteasemusic_${luci_latest_ver}_all.ipk" rm -rf "/tmp/luci-indexcache" "/tmp/luci-modulecache" diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index a0b9f3fd9d..ab96294d45 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -2,14 +2,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vssr PKG_VERSION:=1.22 -PKG_RELEASE:=20210119 +PKG_RELEASE:=20210227 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \ + CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin LUCI_TITLE:=A New SS/SSR/Xray/Trojan LuCI interface LUCI_PKGARCH:=all @@ -21,8 +21,8 @@ LUCI_DEPENDS:= \ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-ssr-server \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \ - +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core + +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin:xray-plugin define Package/$(PKG_NAME)/config @@ -38,13 +38,13 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan bool "Include Trojan" default y if i386||x86_64||arm||aarch64 -config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin - bool "Include Shadowsocks V2ray Plugin" - default y if i386||x86_64||arm||aarch64 - config PACKAGE_$(PKG_NAME)_INCLUDE_Xray bool "Include Xray" default y if i386||x86_64||arm||aarch64 + +config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin + bool "Include Shadowsocks Xray Plugin" + default y if i386||x86_64||arm||aarch64 endef define Package/$(PKG_NAME)/conffiles diff --git a/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr b/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr index e49549364e..4938e3197c 100755 --- a/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr +++ b/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr @@ -644,7 +644,7 @@ stop() { if [ $(uci_get_by_type global monitor_enable) = 1 ]; then kill -9 $(busybox ps -w | grep vssr-monitor | grep -v grep | awk '{print $1}') >/dev/null 2>&1 fi - killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server v2ray-plugin xray trojan microsocks ipt2socks dns2socks pdnsd + killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server xray-plugin xray trojan microsocks ipt2socks dns2socks pdnsd if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then rm -rf /tmp/dnsmasq.d/dnsmasq-ssr.conf /tmp/dnsmasq.ssr /tmp/dnsmasq.oversea diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua b/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua index 03f3788bf7..064eea7420 100644 --- a/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua +++ b/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua @@ -89,8 +89,9 @@ function _M.get_flag(remark, host) local iso_code = nil if (remark ~= nil) then + remark = string.gsub(remark, "NETWORKS", "") for i, v in pairs(emoji_table) do - if (string.find(string.lower(remark), string.lower(v))) then + if (string.find(string.lower(remark), string.lower(v)) ~= nil) then iso_code = string.lower(iso_table[i]) break end diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua index beed53de26..08f1dc0b6e 100755 --- a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua +++ b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua @@ -1,7 +1,6 @@ local ucursor = require 'luci.model.uci'.cursor() local name = 'vssr' local json = require 'luci.jsonc' -local proto = 'socks' local socks_switch = ucursor:get_first(name, 'socks5_proxy', 'enable_server') local auth_type = ucursor:get_first(name, 'socks5_proxy', 'enable_auth') local local_port = ucursor:get_first(name, 'socks5_proxy', 'local_port') @@ -15,7 +14,7 @@ local http_user = ucursor:get_first(name, 'http_proxy', 'http_user') local http_pass = ucursor:get_first(name, 'http_proxy', 'http_pass') function gen_inbound(sw, auth_type, local_port, user, pass, proto) - local bound = {} + local bound if sw == 0 then bound = nil else diff --git a/package/ctcgfw/luci-theme-infinityfreedom/htdocs/luci-static/infinityfreedom/css/style.css b/package/ctcgfw/luci-theme-infinityfreedom/htdocs/luci-static/infinityfreedom/css/style.css index 468e491c74..48379c6b2d 100644 --- a/package/ctcgfw/luci-theme-infinityfreedom/htdocs/luci-static/infinityfreedom/css/style.css +++ b/package/ctcgfw/luci-theme-infinityfreedom/htdocs/luci-static/infinityfreedom/css/style.css @@ -2162,6 +2162,13 @@ div#cbi-passwall.cbi-map div#set_node_div background : rgba(7,34,62,.9); } +/* For luci-app-softethervpn */ +div#cbi-softethervpn.cbi-map .cbi-value div.cbi-value-field font.softethervpn_status +{ + display: block; + padding-top:6px; +} + @media screen and (max-width: 1600px) { .main-left { /*width: calc(0% + 15rem);*/ diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile index 6bb9067bdb..6231796f33 100644 --- a/package/ctcgfw/mentohust/Makefile +++ b/package/ctcgfw/mentohust/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2014-2015 KyleRicardo # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/microsocks11/Makefile b/package/ctcgfw/microsocks11/Makefile index e81c268215..8b4843659b 100644 --- a/package/ctcgfw/microsocks11/Makefile +++ b/package/ctcgfw/microsocks11/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# (https://project-openwrt.eu.org) +# (https://immortalwrt.org) # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=7b2f7c1fca9ba6cb135c9ec3f2f7304b6ccd790bc15318619f515b3b2e5e148e PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=cxxopts PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile index d6a35d947d..991e142889 100644 --- a/package/ctcgfw/msgpack-c/Makefile +++ b/package/ctcgfw/msgpack-c/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -19,7 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-cpp-$(PKG_VERSION) PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 diff --git a/package/ctcgfw/mwol/Makefile b/package/ctcgfw/mwol/Makefile index 922384bd41..f3fe846f9b 100644 --- a/package/ctcgfw/mwol/Makefile +++ b/package/ctcgfw/mwol/Makefile @@ -3,7 +3,7 @@ # 微信公众号【WiFi物联网】 # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile index 6a91c43604..65b53c5316 100644 --- a/package/ctcgfw/naiveproxy/Makefile +++ b/package/ctcgfw/naiveproxy/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=ncurses/host ninja/host python3/host PKG_USE_MIPS16:=0 diff --git a/package/ctcgfw/nps/Makefile b/package/ctcgfw/nps/Makefile index 6e774ccd56..b86001ef28 100644 --- a/package/ctcgfw/nps/Makefile +++ b/package/ctcgfw/nps/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # @@ -17,7 +17,7 @@ PKG_HASH:=7df414180ed4f0049dc08f0e3c625a6de4ebed34da591515f9514b3763dd578d PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINTER:=CN_SZTL +PKG_MAINTAINTER:=CN_SZTL PKG_CONFIG_DEPENDS := \ CONFIG_NPC_COMPRESS_UPX \ diff --git a/package/ctcgfw/parted/Makefile b/package/ctcgfw/parted/Makefile index 7adb76f946..c94dda99e7 100644 --- a/package/ctcgfw/parted/Makefile +++ b/package/ctcgfw/parted/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/phicomm-k3screenctrl/Makefile b/package/ctcgfw/phicomm-k3screenctrl/Makefile index c730fa16de..14c6979cf7 100644 --- a/package/ctcgfw/phicomm-k3screenctrl/Makefile +++ b/package/ctcgfw/phicomm-k3screenctrl/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/quickjs/Makefile b/package/ctcgfw/quickjs/Makefile index 6855bb46e9..177812a20b 100644 --- a/package/ctcgfw/quickjs/Makefile +++ b/package/ctcgfw/quickjs/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile index 628cf0a645..64d0ec5f6d 100644 --- a/package/ctcgfw/rapidjson/Makefile +++ b/package/ctcgfw/rapidjson/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# (https://project-openwrt.eu.org) +# (https://immortalwrt.org) # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -19,7 +19,7 @@ PKG_MIRROR_HASH:=ef7d015b91f58355b02ce8356214ec7d6bdc3807d01b220834faa00afbcd7a7 PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 85fceb498a..ddb9a0269c 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -3,7 +3,7 @@ # # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index 1c716a7bef..052efad813 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -19,7 +19,7 @@ PKG_MIRROR_HASH:=77958d3bff8b0145504a10959765be0e3743b9c4880a5173d156238c2c569a5 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINTER:=CN_SZTL +PKG_MAINTAINTER:=CN_SZTL PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index e641d04ee6..63ce0c6817 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -19,7 +19,7 @@ PKG_MIRROR_HASH:=2991028fb7bd7e31d041b1e99d0e0d86781fff95fc70e4560ca9fcbe038f063 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINTER:=ElonH +PKG_MAINTAINTER:=ElonH PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/simple-obfs/Makefile b/package/ctcgfw/simple-obfs/Makefile index 032e4981f3..a3482cb69a 100644 --- a/package/ctcgfw/simple-obfs/Makefile +++ b/package/ctcgfw/simple-obfs/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2017-2019 Jian Chang # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/simple-torrent/Makefile b/package/ctcgfw/simple-torrent/Makefile index f9f4cfc021..a8a58b0d27 100644 --- a/package/ctcgfw/simple-torrent/Makefile +++ b/package/ctcgfw/simple-torrent/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=82cfa9cd9e9dca839ad542a24ecf67073fbcb703f9d890381148be99e8689716 PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_CONFIG_DEPENDS:= \ CONFIG_SIMPLE_TORRENT_COMPRESS_GOPROXY \ diff --git a/package/ctcgfw/ssocks/Makefile b/package/ctcgfw/ssocks/Makefile index 87a69ff0e9..29683b7953 100644 --- a/package/ctcgfw/ssocks/Makefile +++ b/package/ctcgfw/ssocks/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2017-2018 Jian Chang # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -22,7 +22,7 @@ PKG_MIRROR_HASH:=3654e9f1fb54646e1e89c19e7aa3e105b84b2e20b5b634662c21c66691d1d22 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/sub-web/Makefile b/package/ctcgfw/sub-web/Makefile index eebbddd4dd..424484f6bd 100644 --- a/package/ctcgfw/sub-web/Makefile +++ b/package/ctcgfw/sub-web/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# (https://project-openwrt.eu.org) +# (https://immortalwrt.org) # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -19,7 +19,7 @@ PKG_MIRROR_HASH:=a83f49aeecfa086ad8da3503b1ff95f8505845588839ed569d22fb0ced417b9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=node/host node-yarn/host diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile index 10ef886b97..5fab9266d7 100644 --- a/package/ctcgfw/subconverter/Makefile +++ b/package/ctcgfw/subconverter/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -19,7 +19,7 @@ PKG_MIRROR_HASH:=07815478cbfa1644ad016ea4b68a2edc9316f9aa23edf699d82c4c9026e1746 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=duktape jpcre2 rapidjson PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/tmate/Makefile b/package/ctcgfw/tmate/Makefile index 8bb674d83b..4ae02798d1 100644 --- a/package/ctcgfw/tmate/Makefile +++ b/package/ctcgfw/tmate/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -20,7 +20,7 @@ PKG_MIRROR_HASH:=8622869c8acfa147275d4658fbc2c9afdc9dde45d5d07fc4a4cb51ec740a8ac PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=CN_SZTL PKG_BUILD_DEPENDS:=ncurses PKG_FIXUP:=autoreconf diff --git a/package/ctcgfw/v2ray-plugin/Makefile b/package/ctcgfw/v2ray-plugin/Makefile index bb5d48ce52..611a2bcf99 100644 --- a/package/ctcgfw/v2ray-plugin/Makefile +++ b/package/ctcgfw/v2ray-plugin/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020 SharerMax # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/verysync/Makefile b/package/ctcgfw/verysync/Makefile index 186749439b..283a5d82bb 100644 --- a/package/ctcgfw/verysync/Makefile +++ b/package/ctcgfw/verysync/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/webdav-go/Makefile b/package/ctcgfw/webdav-go/Makefile index ca6e39aeed..09f02b72dd 100644 --- a/package/ctcgfw/webdav-go/Makefile +++ b/package/ctcgfw/webdav-go/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/xray-plugin/Makefile b/package/ctcgfw/xray-plugin/Makefile index 07e870eef2..1ff7dd7306 100644 --- a/package/ctcgfw/xray-plugin/Makefile +++ b/package/ctcgfw/xray-plugin/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -18,7 +18,7 @@ PKG_HASH:=a74adb1ea36819b634fb2b09fc2ac14ec2c57488285c82e6e26f1347de1d6324 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Tianling Shen +PKG_MAINTAINER:=Tianling Shen PKG_CONFIG_DEPENDS:= \ CONFIG_XRAY_PLUGIN_PROVIDE_V2RAY_PLUGIN \ diff --git a/package/firmware/amd64-microcode/Makefile b/package/firmware/amd64-microcode/Makefile index cf21aba569..e0051ab8c0 100644 --- a/package/firmware/amd64-microcode/Makefile +++ b/package/firmware/amd64-microcode/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=20191218 PKG_RELEASE:=1 PKG_SOURCE:=amd64-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/a/amd64-microcode/ +PKG_SOURCE_URL:=@DEBIAN/pool/non-free/a/amd64-microcode/ PKG_HASH:=f469b79348097c5f04641b67a39d0ee5a2a1916c9556281626c04f2275d4132d PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index b3c3674f87..e8ae7bff58 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=20200616 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/ +PKG_SOURCE_URL:=@DEBIAN/pool/non-free/i/intel-microcode/ PKG_HASH:=bcc3b81c452fe4649a948c022475d76c1cdfbb730f36749a082f412f1406a3b9 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE) diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index 210b843f85..5ef24a2e0a 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index da5bb98013..2294fdb228 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/amule/Makefile b/package/lean/amule/Makefile index 4cd2d38e2d..6824a4fdd6 100644 --- a/package/lean/amule/Makefile +++ b/package/lean/amule/Makefile @@ -1,5 +1,5 @@ # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/antileech/Makefile b/package/lean/antileech/Makefile index 6948c267d2..11a6fbcee0 100644 --- a/package/lean/antileech/Makefile +++ b/package/lean/antileech/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 4ab0568c11..63459f2b11 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020 Lean # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/baidupcs-web/Makefile b/package/lean/baidupcs-web/Makefile index 5effe1cbc6..0e47da766f 100644 --- a/package/lean/baidupcs-web/Makefile +++ b/package/lean/baidupcs-web/Makefile @@ -43,6 +43,15 @@ define Package/$(PKG_NAME)/description BaiduPCS-Web is a web controller for BaiduPCS-Go endef +define Build/Compile +( \ + GOOS=$$$$(go env GOOS) GOARCH=$$$$(go env GOARCH) go get -v github.com/GeertJohan/go.rice/rice/... ; \ + cd $(PKG_BUILD_DIR)/internal/pcsweb ; \ + "$$$$(go env GOPATH)/bin/rice" embed-go ; \ + $(call GoPackage/Build/Compile) ; \ +) +endef + define Package/$(PKG_NAME)/install $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(INSTALL_DIR) $(1)/usr/bin diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 5b860174ae..38b122405d 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2021 Lean # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/dnsforwarder/Makefile b/package/lean/dnsforwarder/Makefile index 9cf3b16a0f..05e7370a0c 100644 --- a/package/lean/dnsforwarder/Makefile +++ b/package/lean/dnsforwarder/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/gmediarender/Makefile b/package/lean/gmediarender/Makefile index 85362ce15b..2ef2b3db3c 100644 --- a/package/lean/gmediarender/Makefile +++ b/package/lean/gmediarender/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020 Lean # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/libcryptopp/Makefile b/package/lean/libcryptopp/Makefile index 6dc1371bb3..6dc2e88e85 100644 --- a/package/lean/libcryptopp/Makefile +++ b/package/lean/libcryptopp/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/luci-app-docker/Makefile b/package/lean/luci-app-docker/Makefile index a3e699db1f..1498c150b9 100644 --- a/package/lean/luci-app-docker/Makefile +++ b/package/lean/luci-app-docker/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Luci for Docker-CE -LUCI_DEPENDS:=+docker +e2fsprogs +fdisk +LUCI_DEPENDS:=+docker +dockerd +e2fsprogs +fdisk LUCI_PKGARCH:=all PKG_VERSION:=1 PKG_RELEASE:=9 diff --git a/package/lean/microsocks/Makefile b/package/lean/microsocks/Makefile index 5a9829c26a..4a6bce7646 100644 --- a/package/lean/microsocks/Makefile +++ b/package/lean/microsocks/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/n2n_v2/Makefile b/package/lean/n2n_v2/Makefile index 0cefb43adf..b04ecccdf2 100644 --- a/package/lean/n2n_v2/Makefile +++ b/package/lean/n2n_v2/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020 - ntop.org and contributors # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/pandownload-fake-server/Makefile b/package/lean/pandownload-fake-server/Makefile index fa1fd5f247..542e9cc716 100644 --- a/package/lean/pandownload-fake-server/Makefile +++ b/package/lean/pandownload-fake-server/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/pdnsd-alt/Makefile b/package/lean/pdnsd-alt/Makefile index 474e17232a..df49f66a2e 100644 --- a/package/lean/pdnsd-alt/Makefile +++ b/package/lean/pdnsd-alt/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/ps3netsrv/Makefile b/package/lean/ps3netsrv/Makefile index 63dfdea806..e7d6958d2e 100644 --- a/package/lean/ps3netsrv/Makefile +++ b/package/lean/ps3netsrv/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/shadowsocksr-libev/Makefile b/package/lean/shadowsocksr-libev/Makefile index 013fb38710..7f140d6d49 100644 --- a/package/lean/shadowsocksr-libev/Makefile +++ b/package/lean/shadowsocksr-libev/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/tcpping/Makefile b/package/lean/tcpping/Makefile index cc3ecbb72d..ede035b2ff 100644 --- a/package/lean/tcpping/Makefile +++ b/package/lean/tcpping/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lean/vlmcsd/Makefile b/package/lean/vlmcsd/Makefile index 4f670b8c36..eeefbb2d85 100644 --- a/package/lean/vlmcsd/Makefile +++ b/package/lean/vlmcsd/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile index 35ceb18c29..6168d4c459 100644 --- a/package/libs/libpcap/Makefile +++ b/package/libs/libpcap/Makefile @@ -8,22 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpcap -PKG_VERSION:=1.9.1 -PKG_RELEASE:=3 +PKG_VERSION:=1.10.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \ http://www.tcpdump.org/release/ -PKG_HASH:=635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 +PKG_HASH:=8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e PKG_MAINTAINER:=Felix Fietkau +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE PKG_ASLR_PIE_REGULAR:=1 PKG_BUILD_PARALLEL:=1 -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -48,11 +47,16 @@ endef CMAKE_OPTIONS += \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_WITH_LIBNL=OFF \ + -DINET6=O$(if $(CONFIG_IPV6),N,FF) \ + -DPCAP_SUPPORT_NETFILTER=O$(if $(CONFIG_PCAP_HAS_NETFILTER),N,FF) # grep 'option(DISABLE_' CMakeLists.txt | cut -f2 -d'(' | cut -f1 -d' ' | sort --unique CMAKE_OPTIONS += \ + -DDISABLE_BLUETOOTH=O$(if $(CONFIG_PCAP_HAS_BT),FF,N) \ -DDISABLE_DAG=ON \ -DDISABLE_DBUS=ON \ + -DDISABLE_DPDK=ON \ + -DDISABLE_LINUX_USBMON=O$(if $(CONFIG_PCAP_HAS_USB),FF,N) \ -DDISABLE_NETMAP=ON \ -DDISABLE_RDMA=ON \ -DDISABLE_SEPTEL=ON \ @@ -64,12 +68,6 @@ CMAKE_OPTIONS += \ -DBDEBUG=OFF \ -DYYDEBUG=OFF \ -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_USB) ,,-DDISABLE_USB=ON) -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_BT) ,,-DDISABLE_BLUETOOTH=ON) -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_NETFILTER) ,,-DPCAP_SUPPORT_NETFILTER=OFF) - -CMAKE_OPTIONS += $(if $(CONFIG_IPV6),-DINET6=ON,-DINET6=OFF) - define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) $(SED) \ diff --git a/package/libs/libpcap/patches/100-no-openssl.patch b/package/libs/libpcap/patches/100-no-openssl.patch new file mode 100644 index 0000000000..6424cf8c6f --- /dev/null +++ b/package/libs/libpcap/patches/100-no-openssl.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1006,7 +1006,6 @@ endif() + # + # OpenSSL/libressl. + # +-find_package(OpenSSL) + if(OPENSSL_FOUND) + # + # We have OpenSSL. diff --git a/package/libs/libpcap/patches/102-skip-manpages.patch b/package/libs/libpcap/patches/102-skip-manpages.patch index 28f572c913..57b780c1fe 100644 --- a/package/libs/libpcap/patches/102-skip-manpages.patch +++ b/package/libs/libpcap/patches/102-skip-manpages.patch @@ -7,69 +7,63 @@ Subject: [PATCH] skip manpages CMakeLists.txt | 55 -------------------------------------------------- 1 file changed, 55 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55b93f14..acf1a904 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2397,61 +2397,6 @@ if(NOT MSVC) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) +@@ -2701,57 +2701,6 @@ if(NOT MSVC) + if(MINGW) + find_program(LINK_EXECUTABLE ln) + endif(MINGW) +- if(UNIX OR (MINGW AND LINK_EXECUTABLE)) +- set(MAN1 "") +- foreach(MANPAGE ${MAN1_NOEXPAND}) +- set(MAN1 ${MAN1} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) +- endforeach(MANPAGE) +- install(FILES ${MAN1} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - -- # -- # Man pages. -- # -- # For each section of the manual for which we have man pages -- # that require macro expansion, do the expansion. -- # -- set(MAN1 "") -- foreach(MANPAGE ${MAN1_NOEXPAND}) -- set(MAN1 ${MAN1} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) -- endforeach(MANPAGE) -- install(FILES ${MAN1} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +- set(MAN3PCAP "") +- foreach(MANPAGE ${MAN3PCAP_NOEXPAND}) +- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) +- endforeach(MANPAGE) +- foreach(TEMPLATE_MANPAGE ${MAN3PCAP_EXPAND}) +- string(REPLACE ".in" "" MANPAGE ${TEMPLATE_MANPAGE}) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) +- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) +- endforeach(TEMPLATE_MANPAGE) +- install(FILES ${MAN3PCAP} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description_or_dlt.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_dump_open.3pcap pcap_dump_fopen.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_findalldevs.3pcap pcap_freealldevs.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_geterr.3pcap pcap_perror.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_inject.3pcap pcap_sendpacket.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_loop.3pcap pcap_dispatch.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_major_version.3pcap pcap_minor_version.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_next_ex.3pcap pcap_next.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_dead.3pcap pcap_open_dead_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_setnonblock.3pcap pcap_getnonblock.3pcap ${CMAKE_INSTALL_MANDIR}/man3) - -- set(MAN3PCAP "") -- foreach(MANPAGE ${MAN3PCAP_NOEXPAND}) -- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) -- endforeach(MANPAGE) -- foreach(TEMPLATE_MANPAGE ${MAN3PCAP_EXPAND}) -- string(REPLACE ".in" "" MANPAGE ${TEMPLATE_MANPAGE}) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) -- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) -- endforeach(TEMPLATE_MANPAGE) -- install(FILES ${MAN3PCAP} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_dump_open.3pcap pcap_dump_fopen.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_findalldevs.3pcap pcap_freealldevs.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_geterr.3pcap pcap_perror.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_inject.3pcap pcap_sendpacket.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_loop.3pcap pcap_dispatch.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_major_version.3pcap pcap_minor_version.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_next_ex.3pcap pcap_next.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_dead.3pcap pcap_open_dead_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_setnonblock.3pcap pcap_getnonblock.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- set(MANFILE "") +- foreach(TEMPLATE_MANPAGE ${MANFILE_EXPAND}) +- string(REPLACE ".manfile.in" ".${MAN_FILE_FORMATS}" MANPAGE ${TEMPLATE_MANPAGE}) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) +- set(MANFILE ${MANFILE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) +- endforeach(TEMPLATE_MANPAGE) +- install(FILES ${MANFILE} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_FILE_FORMATS}) - -- set(MANFILE "") -- foreach(TEMPLATE_MANPAGE ${MANFILE_EXPAND}) -- string(REPLACE ".manfile.in" ".${MAN_FILE_FORMATS}" MANPAGE ${TEMPLATE_MANPAGE}) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) -- set(MANFILE ${MANFILE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) -- endforeach(TEMPLATE_MANPAGE) -- install(FILES ${MANFILE} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_FILE_FORMATS}) -- -- set(MANMISC "") -- foreach(TEMPLATE_MANPAGE ${MANMISC_EXPAND}) -- string(REPLACE ".manmisc.in" ".${MAN_MISC_INFO}" MANPAGE ${TEMPLATE_MANPAGE}) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) -- set(MANMISC ${MANMISC} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) -- endforeach(TEMPLATE_MANPAGE) -- install(FILES ${MANMISC} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_MISC_INFO}) +- set(MANMISC "") +- foreach(TEMPLATE_MANPAGE ${MANMISC_EXPAND}) +- string(REPLACE ".manmisc.in" ".${MAN_MISC_INFO}" MANPAGE ${TEMPLATE_MANPAGE}) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) +- set(MANMISC ${MANMISC} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) +- endforeach(TEMPLATE_MANPAGE) +- install(FILES ${MANMISC} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_MISC_INFO}) +- endif(UNIX OR (MINGW AND LINK_EXECUTABLE)) endif(NOT MSVC) # uninstall target diff --git a/package/libs/libpcap/patches/103-makefile_flex_workaround.patch b/package/libs/libpcap/patches/103-makefile_flex_workaround.patch deleted file mode 100644 index 93e07c69c2..0000000000 --- a/package/libs/libpcap/patches/103-makefile_flex_workaround.patch +++ /dev/null @@ -1,14 +0,0 @@ - - Copyright (C) 2006 Markus Wigge - ---- a/Makefile.in -+++ b/Makefile.in -@@ -59,7 +59,7 @@ MKDEP = @MKDEP@ - CCOPT = @V_CCOPT@ - SHLIB_CCOPT = @V_SHLIB_CCOPT@ - INCLS = -I. @V_INCLS@ --DEFS = -DBUILDING_PCAP -Dpcap_EXPORTS @DEFS@ @V_DEFS@ -+DEFS = -DBUILDING_PCAP -D_BSD_SOURCE -Dpcap_EXPORTS @DEFS@ @V_DEFS@ - ADDLOBJS = @ADDLOBJS@ - ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@ - LIBS = @LIBS@ diff --git a/package/libs/libpcap/patches/201-space_optimization.patch b/package/libs/libpcap/patches/201-space_optimization.patch index 80e3824d82..bf9374dd54 100644 --- a/package/libs/libpcap/patches/201-space_optimization.patch +++ b/package/libs/libpcap/patches/201-space_optimization.patch @@ -1,6 +1,6 @@ --- a/pcap-common.c +++ b/pcap-common.c -@@ -1570,14 +1570,23 @@ swap_pseudo_headers(int linktype, struct +@@ -1662,14 +1662,23 @@ swap_pseudo_headers(int linktype, struct break; case DLT_USB_LINUX: diff --git a/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch b/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch deleted file mode 100644 index 53dd50137b..0000000000 --- a/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pcap-linux.c -+++ b/pcap-linux.c -@@ -263,6 +263,8 @@ - typedef int socklen_t; - #endif - -+#undef IW_MODE_MONITOR -+ - #ifndef MSG_TRUNC - /* - * This is being compiled on a system that lacks MSG_TRUNC; define it diff --git a/package/libs/libpcap/patches/204-usb-bus-path.patch b/package/libs/libpcap/patches/204-usb-bus-path.patch deleted file mode 100644 index 0c967a00ba..0000000000 --- a/package/libs/libpcap/patches/204-usb-bus-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix USB bus path; /proc/bus/usb is deprecated. - ---- a/pcap-usb-linux.c -+++ b/pcap-usb-linux.c -@@ -73,7 +73,7 @@ - #define USB_TEXT_DIR_OLD "/sys/kernel/debug/usbmon" - #define USB_TEXT_DIR "/sys/kernel/debug/usb/usbmon" - #define SYS_USB_BUS_DIR "/sys/bus/usb/devices" --#define PROC_USB_BUS_DIR "/proc/bus/usb" -+#define PROC_USB_BUS_DIR "/dev/bus/usb" - #define USB_LINE_LEN 4096 - - #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/package/libs/libunwind/Makefile b/package/libs/libunwind/Makefile index 89e6f84ff5..7f79996d25 100644 --- a/package/libs/libunwind/Makefile +++ b/package/libs/libunwind/Makefile @@ -32,7 +32,7 @@ define Package/libunwind CATEGORY:=Libraries TITLE:=The libunwind project URL:=http://www.nongnu.org/libunwind/ - DEPENDS:=@((mips||mipsel||x86_64||arm||aarch64)||(USE_GLIBC&&(powerpc||i386))) +zlib + DEPENDS:=@((mips||mipsel||mips64||x86_64||arm||aarch64)||(USE_GLIBC&&(powerpc||i386))) +zlib ABI_VERSION:=8 endef diff --git a/package/lienol/dns-forwarder/Makefile b/package/lienol/dns-forwarder/Makefile index 3f1371fe57..95e744f3f8 100644 --- a/package/lienol/dns-forwarder/Makefile +++ b/package/lienol/dns-forwarder/Makefile @@ -3,7 +3,7 @@ # Copyright (C) 2015 Jian Chang # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lienol/dns2socks/Makefile b/package/lienol/dns2socks/Makefile index 383c544edf..29f1258a22 100644 --- a/package/lienol/dns2socks/Makefile +++ b/package/lienol/dns2socks/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lienol/ipt2socks/Makefile b/package/lienol/ipt2socks/Makefile index 90c0d1f0b6..a7625d5031 100644 --- a/package/lienol/ipt2socks/Makefile +++ b/package/lienol/ipt2socks/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index ec7eb8fd24..da448193f5 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -37,10 +37,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Xray bool "Include Xray" default y if i386||x86_64||arm||aarch64 -config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray - bool "Include V2ray" - default n - config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus bool "Include Trojan_Plus" default y @@ -71,7 +67,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG config PACKAGE_$(PKG_NAME)_INCLUDE_dns2socks bool "Include dns2socks" - default n + default y config PACKAGE_$(PKG_NAME)_INCLUDE_v2ray-plugin bool "Include v2ray-plugin (Shadowsocks plugin)" diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 23e3754980..112835e94e 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -257,9 +257,7 @@ o:depends({dns_mode = "pdnsd"}) o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET"), translate("Try this feature if the rule modification does not take effect.")) o.inputstyle = "remove" function o.write(e, e) - luci.sys.call("/etc/init.d/" .. appname .. " stop") - luci.sys.call("/usr/share/" .. appname .. "/iptables.sh flush_ipset") - luci.sys.call("/etc/init.d/" .. appname .. " restart") + luci.sys.call("/usr/share/" .. appname .. "/iptables.sh flush_ipset > /dev/null 2>&1 &") end s:tab("Proxy", translate("Mode")) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua index 2a4fd8d008..ac13806eb6 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua @@ -1,6 +1,7 @@ local fs = require "nixio.fs" local api = require "luci.model.cbi.passwall.api.api" local appname = api.appname +local path = string.format("/usr/share/%s/rules/", appname) m = Map(appname) m.apply_on_parse=true @@ -13,9 +14,10 @@ s.anonymous = true s:tab("direct_list", translate("Direct List")) s:tab("proxy_list", translate("Proxy List")) +s:tab("block_list", translate("Block List")) ---- Direct Hosts -local direct_host = string.format("/usr/share/%s/rules/direct_host", appname) +local direct_host = path .. "direct_host" o = s:taboption("direct_list", TextValue, "direct_host", "", "" .. translate("Join the direct hosts list of domain names will not proxy.") .. "") o.rows = 15 o.wrap = "off" @@ -34,7 +36,7 @@ o.validate = function(self, value) end ---- Direct IP -local direct_ip = string.format("/usr/share/%s/rules/direct_ip", appname) +local direct_ip = path .. "direct_ip" o = s:taboption("direct_list", TextValue, "direct_ip", "", "" .. translate("These had been joined ip addresses will not proxy. Please input the ip address or ip address segment,every line can input only one ip address. For example: 192.168.0.0/24 or 223.5.5.5.") .. "") o.rows = 15 o.wrap = "off" @@ -53,8 +55,8 @@ o.validate = function(self, value) end ---- Proxy Hosts -local proxy_host = string.format("/usr/share/%s/rules/proxy_host", appname) -o = s:taboption("proxy_list", TextValue, "proxy_host", "", "" .. translate("These had been joined websites will use proxy. Please input the domain names of websites,every line can input only one website domain. For example: google.com.") .. "") +local proxy_host = path .. "proxy_host" +o = s:taboption("proxy_list", TextValue, "proxy_host", "", "" .. translate("These had been joined websites will use proxy. Please input the domain names of websites, every line can input only one website domain. For example: google.com.") .. "") o.rows = 15 o.wrap = "off" o.cfgvalue = function(self, section) return fs.readfile(proxy_host) or "" end @@ -72,8 +74,8 @@ o.validate = function(self, value) end ---- Proxy IP -local proxy_ip = string.format("/usr/share/%s/rules/proxy_ip", appname) -o = s:taboption("proxy_list", TextValue, "blacklist_ip", "", "" .. translate("These had been joined ip addresses will use proxy.Please input the ip address or ip address segment,every line can input only one ip address.For example: 35.24.0.0/24 or 8.8.4.4.") .. "") +local proxy_ip = path .. "proxy_ip" +o = s:taboption("proxy_list", TextValue, "proxy_ip", "", "" .. translate("These had been joined ip addresses will use proxy. Please input the ip address or ip address segment, every line can input only one ip address. For example: 35.24.0.0/24 or 8.8.4.4.") .. "") o.rows = 15 o.wrap = "off" o.cfgvalue = function(self, section) return fs.readfile(proxy_ip) or "" end @@ -90,4 +92,42 @@ o.validate = function(self, value) return value end +---- Block Hosts +local block_host = path .. "block_host" +o = s:taboption("block_list", TextValue, "block_host", "", "" .. translate("These had been joined websites will be block. Please input the domain names of websites, every line can input only one website domain. For example: twitter.com.") .. "") +o.rows = 15 +o.wrap = "off" +o.cfgvalue = function(self, section) return fs.readfile(block_host) or "" end +o.write = function(self, section, value) fs.writefile(block_host, value:gsub("\r\n", "\n")) end +o.remove = function(self, section, value) fs.writefile(block_host, "") end +o.validate = function(self, value) + local hosts= {} + string.gsub(value, '[^' .. "\r\n" .. ']+', function(w) table.insert(hosts, w) end) + for index, host in ipairs(hosts) do + if not datatypes.hostname(host) then + return nil, host .. " " .. translate("Not valid domain name, please re-enter!") + end + end + return value +end + +---- Block IP +local block_ip = path .. "block_ip" +o = s:taboption("block_list", TextValue, "block_ip", "", "" .. translate("These had been joined ip addresses will be block. Please input the ip address or ip address segment, every line can input only one ip address.") .. "") +o.rows = 15 +o.wrap = "off" +o.cfgvalue = function(self, section) return fs.readfile(block_ip) or "" end +o.write = function(self, section, value) fs.writefile(block_ip, value:gsub("\r\n", "\n")) end +o.remove = function(self, section, value) fs.writefile(block_ip, "") end +o.validate = function(self, value) + local ipmasks= {} + string.gsub(value, '[^' .. "\r\n" .. ']+', function(w) table.insert(ipmasks, w) end) + for index, ipmask in ipairs(ipmasks) do + if not ( datatypes.ipmask4(ipmask) or datatypes.ipmask6(ipmask) ) then + return nil, ipmask .. " " .. translate("Not valid IP format, please re-enter!") + end + end + return value +end + return m diff --git a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po index 9c4cc3c418..9cd5d44c67 100644 --- a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po +++ b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po @@ -868,18 +868,27 @@ msgstr "直连列表" msgid "Proxy List" msgstr "代理列表" +msgid "Block List" +msgstr "屏蔽列表" + msgid "Join the direct hosts list of domain names will not proxy." msgstr "加入的域名不走代理，对所有模式有效。且优先级最高。" msgid "These had been joined ip addresses will not proxy. Please input the ip address or ip address segment,every line can input only one ip address. For example: 192.168.0.0/24 or 223.5.5.5." msgstr "加入的IP段不走代理，对所有模式有效。且优先级最高。可输入IP地址或地址段，如：192.168.0.0/24或223.5.5.5，每个地址段一行。" -msgid "These had been joined websites will use proxy. Please input the domain names of websites,every line can input only one website domain. For example: google.com." +msgid "These had been joined websites will use proxy. Please input the domain names of websites, every line can input only one website domain. For example: google.com." msgstr "加入的域名将走代理。输入网站域名，如：google.com，每个地址段一行。" -msgid "These had been joined ip addresses will use proxy.Please input the ip address or ip address segment,every line can input only one ip address.For example: 35.24.0.0/24 or 8.8.4.4." +msgid "These had been joined ip addresses will use proxy. Please input the ip address or ip address segment, every line can input only one ip address. For example: 35.24.0.0/24 or 8.8.4.4." msgstr "加入的IP段将走代理。可输入IP地址或地址段，如：35.24.0.0/24或8.8.4.4，每个地址段一行。" +msgid "These had been joined websites will be block. Please input the domain names of websites, every line can input only one website domain. For example: twitter.com." +msgstr "加入的域名将屏蔽。输入网站域名，如：twitter.com，每个地址段一行。" + +msgid "These had been joined ip addresses will be block. Please input the ip address or ip address segment, every line can input only one ip address." +msgstr "加入的IP段将屏蔽。可输入IP地址或地址段，每个地址段一行。" + msgid "Not valid domain name, please re-enter!" msgstr "不是有效域名，请重新输入！" diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall b/package/lienol/luci-app-passwall/root/etc/config/passwall index beaf1b3602..6c00b2aad8 100644 --- a/package/lienol/luci-app-passwall/root/etc/config/passwall +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall @@ -9,9 +9,9 @@ config global option dns_forward '8.8.8.8' option tcp_proxy_mode 'chnroute' option udp_proxy_mode 'chnroute' - option localhost_tcp_proxy_mode 'chnroute' - option localhost_udp_proxy_mode 'chnroute' - option socks_server '127.0.0.1:9050' + option localhost_tcp_proxy_mode 'default' + option localhost_udp_proxy_mode 'default' + option socks_server '127.0.0.1:1080' option close_log_tcp '0' option close_log_udp '0' option loglevel 'warning' diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh index 57935bfae1..66799bfe1c 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh @@ -212,7 +212,7 @@ gen_dnsmasq_items() { } gen_dnsmasq_fake_items() { - local fwd_dns="1.2.3.4" + local fwd_dns=${1}; shift 1 local outf=${1}; shift 1 awk -v fwd_dns="${fwd_dns}" -v outf="${outf}" ' @@ -786,11 +786,11 @@ start_dns() { china_ng_gfw="127.0.0.1#${dns_listen_port}" [ -n "${returnhome}" ] && china_ng_chn="${china_ng_gfw}" && china_ng_gfw="${LOCAL_DNS}" - echolog "过滤服务配置：准备接管域名解析[$?]..." + echolog "过滤服务配置：准备接管域名解析..." case "$DNS_MODE" in nonuse) - echolog " - 被禁用，设置为非 '默认DNS' 并开启广告过滤可以按本插件内置的广告域名表进行过滤..." + echolog " - 不过滤DNS..." TUN_DNS="" ;; dns2socks) @@ -849,7 +849,7 @@ start_dns() { echolog " - 域名解析：直接使用UDP节点请求DNS（$TUN_DNS）" ;; fake_ip) - TUN_DNS="1.2.3.4" + TUN_DNS="11.1.1.1" echolog " - 域名解析：使用FakeIP方案..." ;; custom) @@ -917,26 +917,29 @@ add_dnsmasq() { if [ "${DNS_MODE}" = "nonuse" ]; then echolog " - 不对域名进行分流解析" else + #屏蔽列表 + sort -u "${RULES_PATH}/block_host" | gen_dnsmasq_fake_items "0.0.0.0" "${TMP_DNSMASQ_PATH}/00-block_host.conf" + #始终用国内DNS解析节点域名 fwd_dns="${LOCAL_DNS}" servers=$(uci show "${CONFIG}" | grep ".address=" | cut -d "'" -f 2) - hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist,vpsiplist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/00-vpsiplist_host.conf" + hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist,vpsiplist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/10-vpsiplist_host.conf" echolog " - [$?]节点列表中的域名(vpsiplist)：${fwd_dns:-默认}" #始终用国内DNS解析直连（白名单）列表 fwd_dns="${LOCAL_DNS}" [ -n "$CHINADNS_NG" ] && unset fwd_dns - sort -u "${RULES_PATH}/direct_host" | gen_dnsmasq_items "whitelist,whitelist_6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/01-direct_host.conf" + sort -u "${RULES_PATH}/direct_host" | gen_dnsmasq_items "whitelist,whitelist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/11-direct_host.conf" echolog " - [$?]域名白名单(whitelist)：${fwd_dns:-默认}" #始终使用远程DNS解析代理（黑名单）列表 if [ "${DNS_MODE}" = "fake_ip" ]; then - sort -u "${RULES_PATH}/proxy_host" | gen_dnsmasq_fake_items "${TMP_DNSMASQ_PATH}/99-proxy_host.conf" + sort -u "${RULES_PATH}/proxy_host" | gen_dnsmasq_fake_items "11.1.1.1" "${TMP_DNSMASQ_PATH}/90-proxy_host.conf" else fwd_dns="${TUN_DNS}" [ -n "$CHINADNS_NG" ] && fwd_dns="${china_ng_gfw}" [ -n "$CHINADNS_NG" ] && unset fwd_dns - sort -u "${RULES_PATH}/proxy_host" | gen_dnsmasq_items "blacklist,blacklist_6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/99-proxy_host.conf" + sort -u "${RULES_PATH}/proxy_host" | gen_dnsmasq_items "blacklist,blacklist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/90-proxy_host.conf" echolog " - [$?]代理域名表(blacklist)：${fwd_dns:-默认}" fi @@ -946,9 +949,9 @@ add_dnsmasq() { [ -n "$CHINADNS_NG" ] && fwd_dns="${china_ng_gfw}" for item in $(get_enabled_anonymous_secs "@subscribe_list"); do if [ "${DNS_MODE}" = "fake_ip" ]; then - host_from_url "$(config_n_get ${item} url)" | gen_dnsmasq_fake_items "${TMP_DNSMASQ_PATH}/99-subscribe.conf" + host_from_url "$(config_n_get ${item} url)" | gen_dnsmasq_fake_items "11.1.1.1" "${TMP_DNSMASQ_PATH}/91-subscribe.conf" else - host_from_url "$(config_n_get ${item} url)" | gen_dnsmasq_items "blacklist,blacklist_6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/99-subscribe.conf" + host_from_url "$(config_n_get ${item} url)" | gen_dnsmasq_items "blacklist,blacklist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/91-subscribe.conf" fi done [ "${DNS_MODE}" != "fake_ip" ] && echolog " - [$?]节点订阅域名(blacklist)：${fwd_dns:-默认}" @@ -967,9 +970,9 @@ add_dnsmasq() { local shunt_node=$(config_n_get $shunt_node_id address nil) [ "$shunt_node" = "nil" ] && continue if [ "${DNS_MODE}" = "fake_ip" ]; then - config_n_get $shunt_id domain_list | grep -v 'regexp:\|geosite:\|ext:' | sed 's/domain:\|full:\|//g' | tr -s "\r\n" "\n" | sort -u | gen_dnsmasq_fake_items "${TMP_DNSMASQ_PATH}/998-shunt_host.conf" + config_n_get $shunt_id domain_list | grep -v 'regexp:\|geosite:\|ext:' | sed 's/domain:\|full:\|//g' | tr -s "\r\n" "\n" | sort -u | gen_dnsmasq_fake_items "11.1.1.1" "${TMP_DNSMASQ_PATH}/98-shunt_host.conf" else - config_n_get $shunt_id domain_list | grep -v 'regexp:\|geosite:\|ext:' | sed 's/domain:\|full:\|//g' | tr -s "\r\n" "\n" | sort -u | gen_dnsmasq_items "shuntlist,shuntlist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/998-shunt_host.conf" + config_n_get $shunt_id domain_list | grep -v 'regexp:\|geosite:\|ext:' | sed 's/domain:\|full:\|//g' | tr -s "\r\n" "\n" | sort -u | gen_dnsmasq_items "shuntlist,shuntlist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/98-shunt_host.conf" fi done [ "${DNS_MODE}" != "fake_ip" ] && echolog " - [$?]Xray分流规则(shuntlist)：${fwd_dns:-默认}" @@ -979,21 +982,21 @@ add_dnsmasq() { if [ -z "${returnhome}" ]; then [ ! -f "${TMP_PATH}/gfwlist.txt" ] && sed -n 's/^ipset=\/\.\?\([^/]*\).*$/\1/p' "${RULES_PATH}/gfwlist.conf" | sort -u > "${TMP_PATH}/gfwlist.txt" if [ "${DNS_MODE}" = "fake_ip" ]; then - sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_fake_items "${TMP_DNSMASQ_PATH}/999-gfwlist.conf" + sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_fake_items "11.1.1.1" "${TMP_DNSMASQ_PATH}/99-gfwlist.conf" else fwd_dns="${TUN_DNS}" [ -n "$CHINADNS_NG" ] && fwd_dns="${china_ng_gfw}" [ -n "$CHINADNS_NG" ] && unset fwd_dns - sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_items "gfwlist,gfwlist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/999-gfwlist.conf" + sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_items "gfwlist,gfwlist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/99-gfwlist.conf" echolog " - [$?]防火墙域名表(gfwlist)：${fwd_dns:-默认}" fi else #回国模式 if [ "${DNS_MODE}" = "fake_ip" ]; then - sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_fake_items "${TMP_DNSMASQ_PATH}/02-chinalist_host.conf" + sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_fake_items "11.1.1.1" "${TMP_DNSMASQ_PATH}/10-chinalist_host.conf" else fwd_dns="${TUN_DNS}" - sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_items "chnroute,chnroute6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/02-chinalist_host.conf" + sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_items "chnroute,chnroute6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/10-chinalist_host.conf" echolog " - [$?]中国域名表(chnroute)：${fwd_dns:-默认}" fi fi diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh index ea939ac8d5..2145e4dc89 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -6,19 +6,17 @@ IPSET_SHUNTLIST="shuntlist" IPSET_GFW="gfwlist" IPSET_CHN="chnroute" IPSET_BLACKLIST="blacklist" -IPSET_BLACKLIST2="blacklist2" -IPSET_BLACKLIST3="blacklist3" IPSET_WHITELIST="whitelist" +IPSET_BLOCKLIST="blocklist" -IPSET_LANIPLIST_6="laniplist6" -IPSET_VPSIPLIST_6="vpsiplist6" -IPSET_SHUNTLIST_6="shuntlist6" +IPSET_LANIPLIST6="laniplist6" +IPSET_VPSIPLIST6="vpsiplist6" +IPSET_SHUNTLIST6="shuntlist6" IPSET_GFW6="gfwlist6" IPSET_CHN6="chnroute6" -IPSET_BLACKLIST_6="blacklist_6" -IPSET_BLACKLIST2_6="blacklist2_6" -IPSET_BLACKLIST3_6="blacklist3_6" -IPSET_WHITELIST_6="whitelist_6" +IPSET_BLACKLIST6="blacklist6" +IPSET_WHITELIST6="whitelist6" +IPSET_BLOCKLIST6="blocklist6" PROXY_IPV6=0 @@ -49,6 +47,11 @@ comment() { echo "-m comment --comment '$name'" } +destroy_ipset() { + #ipset -q -F $1 + ipset -q -X $1 +} + RULE_LAST_INDEX() { [ $# -ge 3 ] || { echolog "索引列举方式不正确（iptables），终止执行！" @@ -208,14 +211,14 @@ load_acl() { msg2="${msg2}[$?]除${tcp_no_redir_ports}外的" } msg2="${msg2}所有端口" - $ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -d 1.2.3.4 $(REDIRECT $tcp_port $is_tproxy) + $ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -d 11.1.1.1 $(REDIRECT $tcp_port $is_tproxy) $ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $tcp_port $is_tproxy) $ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $tcp_port $is_tproxy) $ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(get_redirect_ipt $tcp_proxy_mode $tcp_port $is_tproxy) if [ "$PROXY_IPV6" == "1" ]; then - $ip6t_m -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST_6) $(REDIRECT $tcp_port TPROXY) - $ip6t_m -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST_6) $(REDIRECT $tcp_port TPROXY) + $ip6t_m -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $tcp_port TPROXY) + $ip6t_m -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $tcp_port TPROXY) $ip6t_m -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(get_redirect_ip6t $tcp_proxy_mode $tcp_port TPROXY) fi } @@ -235,14 +238,14 @@ load_acl() { msg2="${msg2}[$?]除${udp_no_redir_ports}外的" } msg2="${msg2}所有端口" - $ipt_m -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -d 1.2.3.4 $(REDIRECT $udp_port TPROXY) + $ipt_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -d 11.1.1.1 $(REDIRECT $udp_port TPROXY) $ipt_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $udp_port TPROXY) $ipt_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $udp_port TPROXY) $ipt_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(get_redirect_ipt $udp_proxy_mode $udp_port TPROXY) if [ "$PROXY_IPV6" == "1" ]; then - $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST_6) $(REDIRECT $udp_port TPROXY) - $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST_6) $(REDIRECT $udp_port TPROXY) + $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $udp_port TPROXY) + $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $udp_port TPROXY) $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(get_redirect_ip6t $udp_proxy_mode $udp_port TPROXY) fi } @@ -277,14 +280,14 @@ load_acl() { fi [ "$TCP_NO_REDIR_PORTS" != "disable" ] && msg="${msg}除${TCP_NO_REDIR_PORTS}外的" msg="${msg}所有端口" - $ipt_tmp -A PSW $(comment "默认") -p tcp -d 1.2.3.4 $(REDIRECT $TCP_REDIR_PORT $is_tproxy) + $ipt_tmp -A PSW $(comment "默认") -p tcp -d 11.1.1.1 $(REDIRECT $TCP_REDIR_PORT $is_tproxy) $ipt_tmp -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $TCP_REDIR_PORT $is_tproxy) $ipt_tmp -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $TCP_REDIR_PORT $is_tproxy) $ipt_tmp -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ipt $TCP_PROXY_MODE $TCP_REDIR_PORT $is_tproxy) if [ "$PROXY_IPV6" == "1" ]; then - $ip6t_m -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST_6) $(REDIRECT $TCP_REDIR_PORT TPROXY) - $ip6t_m -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST_6) $(REDIRECT $TCP_REDIR_PORT TPROXY) + $ip6t_m -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $TCP_REDIR_PORT TPROXY) + $ip6t_m -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $TCP_REDIR_PORT TPROXY) $ip6t_m -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $TCP_PROXY_MODE $TCP_REDIR_PORT TPROXY) fi @@ -306,14 +309,14 @@ load_acl() { msg="UDP默认代理：使用UDP节点 [$(get_action_chain_name $UDP_PROXY_MODE)](TPROXY:${UDP_REDIR_PORT})代理" [ "$UDP_NO_REDIR_PORTS" != "disable" ] && msg="${msg}除${UDP_NO_REDIR_PORTS}外的" msg="${msg}所有端口" - $ipt_m -A PSW $(comment "默认") -p udp -d 1.2.3.4 $(REDIRECT $UDP_REDIR_PORT TPROXY) + $ipt_m -A PSW $(comment "默认") -p udp -d 11.1.1.1 $(REDIRECT $UDP_REDIR_PORT TPROXY) $ipt_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $UDP_REDIR_PORT TPROXY) $ipt_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $UDP_REDIR_PORT TPROXY) $ipt_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ipt $UDP_PROXY_MODE $UDP_REDIR_PORT TPROXY) if [ "$PROXY_IPV6" == "1" ]; then - $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST_6) $(REDIRECT $UDP_REDIR_PORT TPROXY) - $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST_6) $(REDIRECT $UDP_REDIR_PORT TPROXY) + $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $UDP_REDIR_PORT TPROXY) + $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $UDP_REDIR_PORT TPROXY) $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $UDP_PROXY_MODE $UDP_REDIR_PORT TPROXY) fi @@ -335,7 +338,7 @@ filter_haproxy() { filter_vpsip() { uci show $CONFIG | grep ".address=" | cut -d "'" -f 2 | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_VPSIPLIST &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - uci show $CONFIG | grep ".address=" | cut -d "'" -f 2 | grep -E "([[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7}])" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_VPSIPLIST_6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R + uci show $CONFIG | grep ".address=" | cut -d "'" -f 2 | grep -E "([[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7}])" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_VPSIPLIST6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R echolog "加入所有节点到ipset[$IPSET_VPSIPLIST]直连完成" } @@ -459,19 +462,17 @@ add_firewall_rule() { ipset -! create $IPSET_GFW nethash ipset -! create $IPSET_CHN nethash ipset -! create $IPSET_BLACKLIST nethash - ipset -! create $IPSET_BLACKLIST2 nethash - ipset -! create $IPSET_BLACKLIST3 nethash ipset -! create $IPSET_WHITELIST nethash + ipset -! create $IPSET_BLOCKLIST nethash - ipset -! create $IPSET_LANIPLIST_6 nethash family inet6 - ipset -! create $IPSET_VPSIPLIST_6 nethash family inet6 - ipset -! create $IPSET_SHUNTLIST_6 nethash family inet6 + ipset -! create $IPSET_LANIPLIST6 nethash family inet6 + ipset -! create $IPSET_VPSIPLIST6 nethash family inet6 + ipset -! create $IPSET_SHUNTLIST6 nethash family inet6 ipset -! create $IPSET_GFW6 nethash family inet6 ipset -! create $IPSET_CHN6 nethash family inet6 - ipset -! create $IPSET_BLACKLIST_6 nethash family inet6 - ipset -! create $IPSET_BLACKLIST2_6 nethash family inet6 - ipset -! create $IPSET_BLACKLIST3_6 nethash family inet6 - ipset -! create $IPSET_WHITELIST_6 nethash family inet6 + ipset -! create $IPSET_BLACKLIST6 nethash family inet6 + ipset -! create $IPSET_WHITELIST6 nethash family inet6 + ipset -! create $IPSET_BLOCKLIST6 nethash family inet6 local shunt_ids=$(uci show $CONFIG | grep "=shunt_rules" | awk -F '.' '{print $2}' | awk -F '=' '{print $1}') @@ -480,20 +481,18 @@ add_firewall_rule() { done for shunt_id in $shunt_ids; do - config_n_get $shunt_id ip_list | tr -s "\r\n" "\n" | sed -e "/^$/d" | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "s/^/add $IPSET_SHUNTLIST_6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R + config_n_get $shunt_id ip_list | tr -s "\r\n" "\n" | sed -e "/^$/d" | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "s/^/add $IPSET_SHUNTLIST6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R done cat $RULES_PATH/chnroute | sed -e "/^$/d" | sed -e "s/^/add $IPSET_CHN &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R cat $RULES_PATH/proxy_ip | sed -e "/^$/d" | grep -E "(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}" | sed -e "s/^/add $IPSET_BLACKLIST &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - [ -f "$RULES_PATH/proxy_ip2" ] && cat $RULES_PATH/proxy_ip2 | grep -E "(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLACKLIST2 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - [ -f "$RULES_PATH/proxy_ip3" ] && cat $RULES_PATH/proxy_ip3 | grep -E "(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLACKLIST3 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R cat $RULES_PATH/direct_ip | sed -e "/^$/d" | grep -E "(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}" | sed -e "s/^/add $IPSET_WHITELIST &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R + cat $RULES_PATH/block_ip | sed -e "/^$/d" | grep -E "(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}" | sed -e "s/^/add $IPSET_BLOCKLIST &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R cat $RULES_PATH/chnroute6 | sed -e "/^$/d" | sed -e "s/^/add $IPSET_CHN6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - cat $RULES_PATH/proxy_ip | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLACKLIST_6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - [ -f "$RULES_PATH/proxy_ip2" ] && cat $RULES_PATH/proxy_ip2 | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLACKLIST2_6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - [ -f "$RULES_PATH/proxy_ip3" ] && cat $RULES_PATH/proxy_ip3 | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLACKLIST3_6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R - cat $RULES_PATH/direct_ip | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_WHITELIST_6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R + cat $RULES_PATH/proxy_ip | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLACKLIST6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R + cat $RULES_PATH/direct_ip | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_WHITELIST6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R + cat $RULES_PATH/block_ip | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | sed -e "/^$/d" | sed -e "s/^/add $IPSET_BLOCKLIST6 &/g" | awk '{print $0} END{print "COMMIT"}' | ipset -! -R ipset -! -R <<-EOF $(gen_laniplist | sed -e "s/^/add $IPSET_LANIPLIST /") @@ -504,7 +503,7 @@ add_firewall_rule() { } ipset -! -R <<-EOF - $(gen_laniplist_6 | sed -e "s/^/add $IPSET_LANIPLIST_6 /") + $(gen_laniplist_6 | sed -e "s/^/add $IPSET_LANIPLIST6 /") EOF # [ $? -eq 0 ] || { # echolog "系统不兼容IPv6，终止执行！" @@ -525,7 +524,7 @@ add_firewall_rule() { EOF [ -n "$lan_ip6" ] && ipset -! -R <<-EOF - $(echo $lan_ip6 | sed -e "s/ /\n/g" | sed -e "s/^/add $IPSET_LANIPLIST_6 /") + $(echo $lan_ip6 | sed -e "s/ /\n/g" | sed -e "s/^/add $IPSET_LANIPLIST6 /") EOF } @@ -542,7 +541,7 @@ add_firewall_rule() { [ -n "$ISP_DNS" ] && { #echolog "处理 ISP IPv6 DNS 例外..." for ispip6 in $ISP_DNS; do - ipset -! add $IPSET_WHITELIST_6 $ispip6 >/dev/null 2>&1 & + ipset -! add $IPSET_WHITELIST6 $ispip6 >/dev/null 2>&1 & #echolog " - 追加到白名单：${ispip6}" done } @@ -568,12 +567,14 @@ add_firewall_rule() { $ipt_m -A PSW $(dst $IPSET_VPSIPLIST) -j RETURN $ipt_m -A PSW $(dst $IPSET_WHITELIST) -j RETURN $ipt_m -A PSW -m mark --mark 0xff -j RETURN + $ipt_m -A PSW $(dst $IPSET_BLOCKLIST) -j DROP $ipt_m -N PSW_OUTPUT $ipt_m -A PSW_OUTPUT $(dst $IPSET_LANIPLIST) -j RETURN $ipt_m -A PSW_OUTPUT $(dst $IPSET_VPSIPLIST) -j RETURN $ipt_m -A PSW_OUTPUT $(dst $IPSET_WHITELIST) -j RETURN $ipt_m -A PSW_OUTPUT -m mark --mark 0xff -j RETURN + $ipt_m -A PSW_OUTPUT $(dst $IPSET_BLOCKLIST) -j DROP ip rule add fwmark 1 lookup 100 ip route add local 0.0.0.0/0 dev lo table 100 @@ -595,17 +596,19 @@ add_firewall_rule() { #$ip6t_n -A OUTPUT -p tcp -j PSW_OUTPUT $ip6t_m -N PSW - $ip6t_m -A PSW $(dst $IPSET_LANIPLIST_6) -j RETURN - $ip6t_m -A PSW $(dst $IPSET_VPSIPLIST_6) -j RETURN - $ip6t_m -A PSW $(dst $IPSET_WHITELIST_6) -j RETURN + $ip6t_m -A PSW $(dst $IPSET_LANIPLIST6) -j RETURN + $ip6t_m -A PSW $(dst $IPSET_VPSIPLIST6) -j RETURN + $ip6t_m -A PSW $(dst $IPSET_WHITELIST6) -j RETURN $ip6t_m -A PSW -m mark --mark 0xff -j RETURN + $ip6t_m -A PSW $(dst $IPSET_BLOCKLIST6) -j DROP $ip6t_m -A PREROUTING -j PSW $ip6t_m -N PSW_OUTPUT - $ip6t_m -A PSW_OUTPUT $(dst $IPSET_LANIPLIST_6) -j RETURN - $ip6t_m -A PSW_OUTPUT $(dst $IPSET_VPSIPLIST_6) -j RETURN - $ip6t_m -A PSW_OUTPUT $(dst $IPSET_WHITELIST_6) -j RETURN + $ip6t_m -A PSW_OUTPUT $(dst $IPSET_LANIPLIST6) -j RETURN + $ip6t_m -A PSW_OUTPUT $(dst $IPSET_VPSIPLIST6) -j RETURN + $ip6t_m -A PSW_OUTPUT $(dst $IPSET_WHITELIST6) -j RETURN $ip6t_m -A PSW_OUTPUT -m mark --mark 0xff -j RETURN + $ip6t_m -A PSW_OUTPUT $(dst $IPSET_BLOCKLIST6) -j DROP $ip6t_m -A OUTPUT -j PSW_OUTPUT ip -6 rule add fwmark 1 table 100 @@ -644,17 +647,19 @@ add_firewall_rule() { $ipt_tmp -A OUTPUT -p tcp -j PSW_OUTPUT [ "$TCP_NO_REDIR_PORTS" != "disable" ] && { $ipt_tmp -A PSW_OUTPUT -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN + $ipt_tmp -A PSW_OUTPUT -p tcp -m multiport --sport $TCP_NO_REDIR_PORTS -j RETURN $ip6t_m -A PSW_OUTPUT -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN + $ip6t_m -A PSW_OUTPUT -p tcp -m multiport --sport $TCP_NO_REDIR_PORTS -j RETURN echolog " - [$?]不代理TCP 端口：$TCP_NO_REDIR_PORTS" } - $ipt_tmp -A PSW_OUTPUT -p tcp -d 1.2.3.4 $blist_r + $ipt_tmp -A PSW_OUTPUT -p tcp -d 11.1.1.1 $blist_r $ipt_tmp -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $blist_r $ipt_tmp -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $blist_r $ipt_tmp -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $p_r if [ "$PROXY_IPV6" == "1" ]; then - $ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST_6) $(REDIRECT 1 MARK) - $ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST_6) $(REDIRECT 1 MARK) + $ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT 1 MARK) + $ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT 1 MARK) $ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_TCP_PROXY_MODE 1 MARK) fi fi @@ -737,17 +742,19 @@ add_firewall_rule() { $ipt_m -A OUTPUT -p udp -j PSW_OUTPUT [ "$UDP_NO_REDIR_PORTS" != "disable" ] && { $ipt_m -A PSW_OUTPUT -p udp -m multiport --dport $UDP_NO_REDIR_PORTS -j RETURN + $ipt_m -A PSW_OUTPUT -p udp -m multiport --sport $UDP_NO_REDIR_PORTS -j RETURN $ip6t_m -A PSW_OUTPUT -p udp -m multiport --dport $UDP_NO_REDIR_PORTS -j RETURN + $ip6t_m -A PSW_OUTPUT -p udp -m multiport --sport $UDP_NO_REDIR_PORTS -j RETURN echolog " - [$?]不代理 UDP 端口：$UDP_NO_REDIR_PORTS" } - $ipt_m -A PSW_OUTPUT -p udp -d 1.2.3.4 $(REDIRECT 1 MARK) + $ipt_m -A PSW_OUTPUT -p udp -d 11.1.1.1 $(REDIRECT 1 MARK) $ipt_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT 1 MARK) $ipt_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT 1 MARK) $ipt_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ipt $LOCALHOST_UDP_PROXY_MODE 1 MARK) if [ "$PROXY_IPV6" == "1" ]; then - $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST_6) $(REDIRECT 1 MARK) - $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST_6) $(REDIRECT 1 MARK) + $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT 1 MARK) + $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT 1 MARK) $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_UDP_PROXY_MODE 1 MARK) fi fi @@ -774,12 +781,11 @@ del_firewall_rule() { $ipt_m -D OUTPUT -p tcp -j PSW_OUTPUT 2>/dev/null $ipt_m -D OUTPUT -p udp -j PSW_OUTPUT 2>/dev/null - $ip6t_n -D PREROUTING -j PSW 2>/dev/null - $ip6t_n -D OUTPUT -p tcp -j PSW_OUTPUT 2>/dev/null + #$ip6t_n -D PREROUTING -j PSW 2>/dev/null + #$ip6t_n -D OUTPUT -p tcp -j PSW_OUTPUT 2>/dev/null $ip6t_m -D PREROUTING -j PSW 2>/dev/null - $ip6t_m -D OUTPUT -p tcp -j PSW_OUTPUT 2>/dev/null - $ip6t_m -D OUTPUT -p udp -j PSW_OUTPUT 2>/dev/null + $ip6t_m -D OUTPUT -j PSW_OUTPUT 2>/dev/null ib_nat_exist=$(expr $ib_nat_exist - 1) done @@ -789,8 +795,8 @@ del_firewall_rule() { $ipt_n -F PSW_OUTPUT 2>/dev/null && $ipt_n -X PSW_OUTPUT 2>/dev/null $ipt_m -F PSW 2>/dev/null && $ipt_m -X PSW 2>/dev/null $ipt_m -F PSW_OUTPUT 2>/dev/null && $ipt_m -X PSW_OUTPUT 2>/dev/null - $ip6t_n -F PSW 2>/dev/null && $ip6t_n -X PSW 2>/dev/null - $ip6t_n -F PSW_OUTPUT 2>/dev/null && $ip6t_n -X PSW_OUTPUT 2>/dev/null + #$ip6t_n -F PSW 2>/dev/null && $ip6t_n -X PSW 2>/dev/null + #$ip6t_n -F PSW_OUTPUT 2>/dev/null && $ip6t_n -X PSW_OUTPUT 2>/dev/null $ip6t_m -F PSW 2>/dev/null && $ip6t_m -X PSW 2>/dev/null $ip6t_m -F PSW_OUTPUT 2>/dev/null && $ip6t_m -X PSW_OUTPUT 2>/dev/null @@ -799,50 +805,47 @@ del_firewall_rule() { ip -6 rule del fwmark 1 table 100 2>/dev/null ip -6 route del local ::/0 dev lo table 100 2>/dev/null - - ipset -F $IPSET_LANIPLIST >/dev/null 2>&1 && ipset -X $IPSET_LANIPLIST >/dev/null 2>&1 & - ipset -F $IPSET_VPSIPLIST >/dev/null 2>&1 && ipset -X $IPSET_VPSIPLIST >/dev/null 2>&1 & - #ipset -F $IPSET_SHUNTLIST >/dev/null 2>&1 && ipset -X $IPSET_SHUNTLIST >/dev/null 2>&1 & - #ipset -F $IPSET_GFW >/dev/null 2>&1 && ipset -X $IPSET_GFW >/dev/null 2>&1 & - #ipset -F $IPSET_CHN >/dev/null 2>&1 && ipset -X $IPSET_CHN >/dev/null 2>&1 & - #ipset -F $IPSET_BLACKLIST >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST >/dev/null 2>&1 & - #ipset -F $IPSET_BLACKLIST2 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST2 >/dev/null 2>&1 & - #ipset -F $IPSET_BLACKLIST3 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST3 >/dev/null 2>&1 & - ipset -F $IPSET_WHITELIST >/dev/null 2>&1 && ipset -X $IPSET_WHITELIST >/dev/null 2>&1 & - - ipset -F $IPSET_LANIPLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_LANIPLIST_6 >/dev/null 2>&1 & - ipset -F $IPSET_VPSIPLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_VPSIPLIST_6 >/dev/null 2>&1 & - #ipset -F $IPSET_SHUNTLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_SHUNTLIST_6 >/dev/null 2>&1 & - #ipset -F $IPSET_GFW6 >/dev/null 2>&1 && ipset -X $IPSET_GFW6 >/dev/null 2>&1 & - #ipset -F $IPSET_CHN6 >/dev/null 2>&1 && ipset -X $IPSET_CHN6 >/dev/null 2>&1 & - #ipset -F $IPSET_BLACKLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST_6 >/dev/null 2>&1 & - #ipset -F $IPSET_BLACKLIST2_6 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST2_6 >/dev/null 2>&1 & - #ipset -F $IPSET_BLACKLIST3_6 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST3_6 >/dev/null 2>&1 & - ipset -F $IPSET_WHITELIST_6 >/dev/null 2>&1 && ipset -X $IPSET_WHITELIST_6 >/dev/null 2>&1 & - + + destroy_ipset $IPSET_LANIPLIST + destroy_ipset $IPSET_VPSIPLIST + #destroy_ipset $IPSET_SHUNTLIST + #destroy_ipset $IPSET_GFW + #destroy_ipset $IPSET_CHN + #destroy_ipset $IPSET_BLACKLIST + destroy_ipset $IPSET_BLOCKLIST + destroy_ipset $IPSET_WHITELIST + + destroy_ipset $IPSET_LANIPLIST6 + destroy_ipset $IPSET_VPSIPLIST6 + #destroy_ipset $IPSET_SHUNTLIST6 + #destroy_ipset $IPSET_GFW6 + #destroy_ipset $IPSET_CHN6 + #destroy_ipset $IPSET_BLACKLIST6 + destroy_ipset $IPSET_BLOCKLIST6 + destroy_ipset $IPSET_WHITELIST6 + echolog "删除相关防火墙规则完成。" } flush_ipset() { - ipset -F $IPSET_LANIPLIST >/dev/null 2>&1 && ipset -X $IPSET_LANIPLIST >/dev/null 2>&1 & - ipset -F $IPSET_VPSIPLIST >/dev/null 2>&1 && ipset -X $IPSET_VPSIPLIST >/dev/null 2>&1 & - ipset -F $IPSET_SHUNTLIST >/dev/null 2>&1 && ipset -X $IPSET_SHUNTLIST >/dev/null 2>&1 & - ipset -F $IPSET_GFW >/dev/null 2>&1 && ipset -X $IPSET_GFW >/dev/null 2>&1 & - ipset -F $IPSET_CHN >/dev/null 2>&1 && ipset -X $IPSET_CHN >/dev/null 2>&1 & - ipset -F $IPSET_BLACKLIST >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST >/dev/null 2>&1 & - ipset -F $IPSET_BLACKLIST2 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST2 >/dev/null 2>&1 & - ipset -F $IPSET_BLACKLIST3 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST3 >/dev/null 2>&1 & - ipset -F $IPSET_WHITELIST >/dev/null 2>&1 && ipset -X $IPSET_WHITELIST >/dev/null 2>&1 & - - ipset -F $IPSET_LANIPLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_LANIPLIST_6 >/dev/null 2>&1 & - ipset -F $IPSET_VPSIPLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_VPSIPLIST_6 >/dev/null 2>&1 & - ipset -F $IPSET_SHUNTLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_SHUNTLIST_6 >/dev/null 2>&1 & - ipset -F $IPSET_GFW6 >/dev/null 2>&1 && ipset -X $IPSET_GFW6 >/dev/null 2>&1 & - ipset -F $IPSET_CHN6 >/dev/null 2>&1 && ipset -X $IPSET_CHN6 >/dev/null 2>&1 & - ipset -F $IPSET_BLACKLIST_6 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST_6 >/dev/null 2>&1 & - ipset -F $IPSET_BLACKLIST2_6 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST2_6 >/dev/null 2>&1 & - ipset -F $IPSET_BLACKLIST3_6 >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST3_6 >/dev/null 2>&1 & - ipset -F $IPSET_WHITELIST_6 >/dev/null 2>&1 && ipset -X $IPSET_WHITELIST_6 >/dev/null 2>&1 & + destroy_ipset $IPSET_LANIPLIST + destroy_ipset $IPSET_VPSIPLIST + destroy_ipset $IPSET_SHUNTLIST + destroy_ipset $IPSET_GFW + destroy_ipset $IPSET_CHN + destroy_ipset $IPSET_BLACKLIST + destroy_ipset $IPSET_BLOCKLIST + destroy_ipset $IPSET_WHITELIST + + destroy_ipset $IPSET_LANIPLIST6 + destroy_ipset $IPSET_VPSIPLIST6 + destroy_ipset $IPSET_SHUNTLIST6 + destroy_ipset $IPSET_GFW6 + destroy_ipset $IPSET_CHN6 + destroy_ipset $IPSET_BLACKLIST6 + destroy_ipset $IPSET_BLOCKLIST6 + destroy_ipset $IPSET_WHITELIST6 + /etc/init.d/passwall reload } flush_include() { diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh index d5499a9d95..db0b07afb3 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh @@ -65,7 +65,7 @@ do #dns dns_mode=$(config_t_get global dns_mode) - if [ "$dns_mode" != "nonuse" ] && [ "$dns_mode" != "custom" ] && [ "$dns_mode" != "fake_ip" ]; then + if [ "$dns_mode" == "pdnsd" ] || [ "$dns_mode" == "dns2socks" ] || [ "$dns_mode" == "xray_doh" ]; then icount=$(netstat -apn | grep 7913 | wc -l) if [ $icount = 0 ]; then /etc/init.d/$CONFIG restart diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.lua b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.lua index 977fd0b65d..0220614405 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.lua +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.lua @@ -451,6 +451,6 @@ luci.sys.call("uci commit " .. name) if reboot == 1 then log("重启服务，应用新的规则。") - luci.sys.call("/usr/share/" .. name .. "/iptables.sh flush_ipset && /etc/init.d/" .. name .. " restart") + luci.sys.call("/usr/share/" .. name .. "/iptables.sh flush_ipset > /dev/null 2>&1 &") end log("规则更新完毕...") diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/block_host b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/block_host new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/block_ip b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/block_ip new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist index 78084f69a6..57f3ff0466 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist @@ -22,7 +22,6 @@ 001tech.com 001town.com 001xin.com -0024aaaa.com 0028i.com 002lzj.com 0033.com @@ -87,20 +86,19 @@ 01-123.com 01-cf.com 010123456.com +010155.net 0101shop.com 01095113.com 010bianhu.com 010bjzs.com 010byyy.com 010cns.com -010dh.com 010dsmzyy.com 010hetongls.com 010jianzhan.com 010jing-pc.com 010lf.com 0110m.com -012333.com 0123401234.com 0123456789.biz 0123456789.com @@ -115,6 +113,7 @@ 0149.com 016272.com 0168.cc +016sf.com 0196.site 01bz.wang 01caijing.com @@ -239,7 +238,6 @@ 024fuwu.com 024fytx.com 024fzy.com -024geliweixiu.com 024grc.com 024heyi.com 024hh.com @@ -360,7 +358,6 @@ 03414.com 034666.com 0349.info -034show.com 035110000.com 0351data.com 0351fdc.com @@ -811,7 +808,6 @@ 0gsc.com 0ju.cc 0kee.com -0omcp.wang 0quan8.com 0rg.pw 0s8s.com @@ -922,7 +918,6 @@ 100jiapu.com 100kk.com 100ksw.com -100lcrc.com 100lnrc.com 100loujia.com 100lw.com @@ -1397,7 +1392,6 @@ 12gang.com 12h5.com 12jn.com -12kanshu.com 12ky.com 12pk.com 12sporting.com @@ -1471,7 +1465,6 @@ 138top.com 138txt.com 138vps.com -139.cm 139.com 139018.com 1391.com @@ -1500,6 +1493,7 @@ 13ejob.com 13fuwu.com 13gm.com +13hangpifa.com 13ie.com 13mobi.com 13ww.net @@ -1549,6 +1543,7 @@ 153g.net 1545ts.com 155.com +155175.com 15595.com 155idc.com 1560008.com @@ -1847,7 +1842,6 @@ 17ai.me 17avr.com 17b.net -17baba.com 17bang.ren 17bdc.com 17bianji.com @@ -1909,7 +1903,6 @@ 17liuxue.com 17ll.com 17luyouqi.com -17lyhq.com 17m3.com 17maimaimai.com 17meiwen.com @@ -2005,7 +1998,6 @@ 18008888338.com 180102.com 18095.com -180zh.com 181230.com 18183.com 181839.com @@ -2087,6 +2079,7 @@ 18lipin.com 18ph.com 18qiang.com +18shuwu.com 18touch.com 18vps.com 18wk.com @@ -2178,6 +2171,7 @@ 1diary.me 1domedia.com 1drj.com +1drv.ws 1dufish.com 1duhy.com 1dume.com @@ -2264,6 +2258,7 @@ 1px.wang 1pxs.com 1q2q.com +1qfa.com 1qianbao.com 1qq.me 1qwe3r.com @@ -2425,6 +2420,7 @@ 2144gy.com 2146677.com 214yx.com +2155.com 217.net 217play.com 217wo.com @@ -2571,7 +2567,6 @@ 22lianmeng.com 22lrc.com 22m6.com -22mm.cc 22mt.in 22net.com 22plc.com @@ -2803,6 +2798,7 @@ 2800.so 280xs.com 281010.com +28123.com 2828dy.com 28493.com 285868.com @@ -2908,7 +2904,6 @@ 2liang.net 2lieqi.com 2m2j.com -2manhua.com 2mdn.net 2mjob.com 2mould.com @@ -2942,9 +2937,9 @@ 2vc00.com 2w.cm 2weima.com -2xbinh.com 2xiazai.com 2y9y.com +2ysfw5hz4.pw 2yuanma.com 2yun.com 2yup.com @@ -2980,7 +2975,6 @@ 3023.com 3033c.com 30556.com -306t.com 307760.com 308308.com 309edu.com @@ -2993,6 +2987,7 @@ 30nl.net 30play.com 30px.com +30tqyb.com 30w.net 30wish.com 30xz.com @@ -3134,6 +3129,7 @@ 333-555.com 33324333.com 333333.com +333666999.club 3339.cc 3339auto.com 333ck.com @@ -3230,7 +3226,6 @@ 3566t.com 357.com 357global.com -357my.com 35941.com 3595.com 35ba.com @@ -3462,7 +3457,6 @@ 365kzj.com 365master.com 365mini.com -365ng.com 365pcbuy.com 365pk.com 365pp.com @@ -3481,7 +3475,6 @@ 365weifu.com 365wenku.com 365world.com -365wos.com 365xiaoyanzi.com 365xiazai.com 365xuet.com @@ -3637,7 +3630,10 @@ 39655.com 3970yy.com 3975.com +3975ad.com 3975ad.xyz +3975app.com +3975cdn.com 398990.com 39ask.net 39box.com @@ -3852,7 +3848,6 @@ 3yoqu.com 3yx.com 3z.cc -3zhm.com 3zmuseum.com 3zxsw.com 4-xiang.com @@ -4041,6 +4036,7 @@ 45r.com 45win.com 45xie.com +45zw.cc 462546.com 46412.com 4647.org @@ -4067,7 +4063,6 @@ 477sblive.com 47819.com 47gs.com -47hddy.com 47jh.com 47ks.com 47yun.com @@ -4136,7 +4131,6 @@ 4inlook.com 4jplus.com 4k123.com -4kdy.net 4khi.com 4kong.com 4kyy.com @@ -4225,7 +4219,6 @@ 50zw.la 50zw.net 50zww.com -51-arm.com 51-cf.com 51-jia.com 51-n.com @@ -4508,6 +4501,7 @@ 51haojob.com 51hcb.com 51hch.com +51hcie.com 51hcw.com 51hei.com 51hejia.com @@ -4957,6 +4951,7 @@ 52115211.com 5211game.com 521360.com +52177.com 521che.com 521g.com 521g.org @@ -5086,6 +5081,7 @@ 52js8.com 52jscn.com 52jt.net +52jubensha.com 52jxt.com 52jying.com 52kfly.com @@ -5183,7 +5179,6 @@ 52wlw.com 52wmb.com 52wubi.com -52wy.com 52xiaomian.com 52xiaoshuowang.com 52xiaoyuan.net @@ -5675,6 +5670,7 @@ 5djbb.com 5djiaren.com 5djpg.com +5dm.cc 5dmail.net 5down.net 5dplay.net @@ -5729,6 +5725,7 @@ 5iflying.com 5ifund.com 5ifxw.com +5igen.com 5igupiao.com 5ihse.com 5ijuyi.com @@ -5874,7 +5871,6 @@ 5z5zw.com 5zai.com 5zg.com -5zhufu.com 5zzu.com 6-china.com 6.gy @@ -5910,6 +5906,7 @@ 60tui.com 61.com 61.life +610213.net 612.com 6120aa.com 6122.net @@ -5951,7 +5948,6 @@ 61kezhan.com 61mami.com 61mc.com -61mon.com 61sheji.com 61sou.com 61tg.com @@ -5982,7 +5978,6 @@ 63346.com 637000.cc 6383.com -638977.com 639311.com 6399868.com 63diy.com @@ -6091,7 +6086,6 @@ 6688.com 66880.com 66889.net -668891.com 668895.com 6688pay.com 668app.com @@ -6328,6 +6322,7 @@ 6yoo.com 6yu6.com 6yuexi.com +6yxk.com 6yyy7.com 6zrc.com 6zu.com @@ -6336,7 +6331,6 @@ 7-vk.com 7-wx.com 700bike.com -700mh.com 700ok.net 700so.com 700static.com @@ -6706,6 +6700,7 @@ 7flowers.com 7forz.com 7fresh.com +7fun.org 7gz.com 7hcn.com 7help.net @@ -6731,7 +6726,6 @@ 7kww.net 7kxs.com 7kzw.com -7le8.com 7liwu.com 7lizhi.com 7lk.com @@ -6777,6 +6771,7 @@ 7wa.cc 7wan.com 7wenta.com +7wenyi.com 7wkw.com 7wnews.com 7wsh.com @@ -6840,6 +6835,7 @@ 800youhuo.com 800zy99.com 801358.com +802203.com 8038.pw 8044445.com 806699a.com @@ -7019,7 +7015,6 @@ 860527.com 860598.com 860816.com -86118114.net 861522.com 86175.com 861817.com @@ -7367,10 +7362,10 @@ 903772.com 90432.net 90576.com +9080ysw.com 90880.com 908872.com 90907.com -9090jiebei.com 90a.cc 90ckm.com 90e.com @@ -7491,7 +7486,6 @@ 91feizhuliu.com 91fifa.com 91flac.com -91fuzhu.com 91game.com 91gaoding.com 91gaoqing.com @@ -7541,7 +7535,6 @@ 91maths.com 91mcpz.com 91mitang.com -91mjw.com 91money.com 91muzhi.com 91nzh.com @@ -7731,7 +7724,7 @@ 93sdk.com 93soso.com 93tyy.com -93w.net +93wgames.com 93zp.com 93zw.com 941.so @@ -7762,7 +7755,6 @@ 94i5.com 94ip.com 94ixs.com -94kssc8.icu 94lm.com 94mxd.com 94nw.com @@ -7986,6 +7978,7 @@ 988640.com 988svip.com 9898c.com +98a.ink 98ep.com 98fp.com 98jx.com @@ -8201,6 +8194,7 @@ 9inx.com 9iphp.com 9ishe.com +9ixiangsheng.com 9iyoo.com 9j9y.com 9ji.com @@ -8298,7 +8292,6 @@ a0b88.com a0bi.com a0c00.com a0c77.com -a0o5x.work a1.mzstatic.com a1166.com a135.net @@ -8440,7 +8433,6 @@ abslw.com abthink.com abtionb.com abto.cc -abu.im abuquant.com abusi.net abuyun.com @@ -8582,13 +8574,11 @@ adanxing.com adarrive.com adas-china.org adashuo.com -adaxi.net adbats.com adbxb.com adccd.com adcdownload.apple.com adcdownload.apple.com.akadns.net -adchitu.net adcmove.com adconfer.com addaad.com @@ -8689,7 +8679,6 @@ adtchrome.com adtime.com adtiming.com adtmm.com -adulisnet.icu adunicorn.com adunioncode.com adunite.com @@ -8764,7 +8753,6 @@ afie.xin afilmb.com afjk.com afjob88.com -afoo.me afriendx.com afshanghai.org aft1v1.com @@ -8777,9 +8765,9 @@ afvdrf.vip afxbbs.com afzhan.com ag17.wang -ag260.net ag365.com agalwood.net +agamepower.com agcloudcs.com agctc.com age06.com @@ -9049,7 +9037,6 @@ aiizen.net aijc.net aiji66.com aijianji.com -aijianshui.com aijiaoqi.com aijigeci.com aijikong.com @@ -9171,6 +9158,7 @@ airwh.com ais56.com aisaw.com aisbeijing.com +aisearch.cc aisee.tv aiseminar.com aishangcan.com @@ -9407,6 +9395,7 @@ alibuybuy.com alicall.com alicdm.com alicdn.com +alicdngslb.com alicelj.com alicloudapi.com alicloudlayer.com @@ -9429,7 +9418,6 @@ aliguanlian.com alihd.net alihuahua.com aliimg.com -alijianfei.com alijijinhui.org alijk.com alikunlun.com @@ -9490,6 +9478,7 @@ aliyuncdn.com aliyunceng.com aliyuncs.com aliyundaiwei.com +aliyunddos0018.com aliyunddos0020.com aliyunddos0026.com aliyunddos0030.com @@ -9563,6 +9552,7 @@ alllget.com alllook.tv allmaga.net allmei.com +allnow.com allok.wang alloyteam.com allpayx.com @@ -9659,6 +9649,7 @@ amijiaoyu.com aminer.org aminglinux.com aminoacid-jirong.com +amn57.com amo9.com amobbs.com amon.org @@ -10074,7 +10065,6 @@ apeiwan.com apelearn.com apesk.com apetdog.com -apex100.com apexmic.com apexyun.com apgblogs.com @@ -10466,7 +10456,6 @@ askwx.com askxt.org aslzw.com asm64.com -asmr8.com asnlab.com asnlab.org aso.ink @@ -10607,7 +10596,6 @@ ausdn.com aushy.com ausny.com auspiciousvp.com -auspr.com aussino.net austargroup.com austarskill.com @@ -10633,7 +10621,6 @@ autobaidu.com autobizreview.com autocamel.com autochina360.com -autocsdn.xyz autodg.com autodmp.com autodry.net @@ -10734,7 +10721,6 @@ awx1.com awzp.net ax1x.com ax2nc4.ren -ax2nssc.icu ax630.com axatp.com axbsec.com @@ -11045,6 +11031,7 @@ baikemy.net baikezh.com bailiaijia.com bailiangroup.com +bailiguangmang.com bailitech.com bailitop.com bailuqixiu.com @@ -11171,6 +11158,7 @@ bala.cc baldc.com baletu.com balijieji.com +ballgametime.com ballpure.com bama1688.com bama555.com @@ -11222,6 +11210,7 @@ bangqiu.biz bangqu.com bangquan.net bangrong.com +bangrongjinfu.com bangshouwang.com bangthink.com bangwo8.com @@ -11420,7 +11409,6 @@ barretlee.com barstowcollege.net bartender.cc bartholomewart.com -bartmoney.com base64.us base9174.com basemu.com @@ -11596,6 +11584,7 @@ bd-film.co bd-film.com bd-gl.com bd001.net +bd2020.com bd689.com bdall.com bdaop.com @@ -11621,7 +11610,6 @@ bditong.com bdkssc.com bdkyr.com bdpan.com -bdqlz.com bdqn027.com bdqn666.com bdqnwh.com @@ -11642,6 +11630,7 @@ bdwm.net bdwork.com bdxhj.com bdxiaodai.com +bdxiguaimg.com bdxiguavod.com bdxx.net bdydns.com @@ -11656,6 +11645,7 @@ beacons.gvt2.com beacons3.gvt2.com beadwallet.com bear20.com +bearad.com bearead.com beargoo.com bearjoy.com @@ -11747,6 +11737,7 @@ beijing-marathon.com beijing-time.org beijingbang.com beijingbaomu.com +beijingcenterforthearts.com beijingfenxiangkeji.com beijinghenghua.com beijingidc.com @@ -11821,7 +11812,6 @@ benbun.com bendibao.com bendiw.cc bengbeng.com -bengbuzhangyue.xyz bengden.com bengfa.biz benghuai.com @@ -12207,14 +12197,15 @@ billchn.com billionconnect.com billionseo.com billowlink.com -billts.site billwang.net biluzww.com bim-times.com bim99.org bimcn.org bimo.cc +binance.cc binance.org +binancezh.cc binbinyl.com bincailiuxue.com binfen.tv @@ -12273,7 +12264,6 @@ biosren.com biosrepair.com biostatistic.net biotgene.com -biotroncanada.icu bipush.com bipvcn.com biqiga.com @@ -12305,6 +12295,7 @@ biquge11.com biquge5200.cc biquge5200.com biquge8.com +biquge99.cc biqugeapp.com biqugebook.com biqugecom.com @@ -12527,7 +12518,6 @@ bjdbrc.com bjdcfy.com bjdfart.com bjdfxj.com -bjdhbl.com bjdiaoyu.com bjdingyi.com bjdjc.com @@ -12558,7 +12548,6 @@ bjgooo.com bjgtzl.com bjgujibaohu.com bjhaiguang.com -bjhchh.com bjhdnet.com bjhdsc.com bjheadline.com @@ -13142,6 +13131,7 @@ booz88.com bopian.com boqii.com boqiicdn.com +boquxinxi.com boraid.org borlonclan.com borninsummer.com @@ -13149,6 +13139,7 @@ bornlead.com borpor.com borscon.com boruiqin.com +boruishijie.com boruisx.com boruisz.com boryou.com @@ -13197,6 +13188,7 @@ boy-toy.net boy1818.com boy1904.com boyaa.com +boyaceo.com boyais.com boyasoftware.com boyaxun.com @@ -13384,7 +13376,6 @@ btorange.com btpan.com btpig.com btplay.net -btr-static.com btrcsc.com btrenren.com bts.hk @@ -13438,9 +13429,7 @@ budou.com budueba.com bufan.com buffst.com -bug200.com bughd.com -bugjia.net bugku.com bugnull.com bugscan.net @@ -13524,6 +13513,7 @@ buylabel.com buysun.net buysweet.com buytips.site +buytoyguns.com buyu46.com buzhi5.com buzhibushi.com @@ -13671,6 +13661,7 @@ bytrip.com byts.com bytter.com bytx888.com +bywave.io byxy.com byyapp.com byzhihuo.com @@ -13734,7 +13725,6 @@ c0ks.com c1042.com c114.net c1ass.com -c1i07cp.icu c1mzbm.shop c1s.com c21wuhan.com @@ -13937,9 +13927,11 @@ caiqiuba.com cairongquan.com cairot.com caisan.io +caishen66.com caishencai.com caisheng.net caishenpo.com +caishenwang.online caishimv.com caishuixxi.com caispace.com @@ -14469,10 +14461,10 @@ ccxinshijicy.com ccxinshijimc.com ccxinyikeji.com ccxinyuedu.com -ccxinyutong.com ccxiyuecare.com ccxjcg.com ccxjd.com +ccyjjd.com ccymf.com ccyts.com ccyyls.com @@ -14494,7 +14486,6 @@ cdadsj.com cdaidu.com cdairport.com cdajcx.com -cdalxx.com cdaten.com cdbcw.com cdbdsec.com @@ -14653,6 +14644,7 @@ cdnunion.org cdnvp.com cdnvpn.net cdnvue.com +cdnyzdjj.com cdnzhuji.com cdooc.com cdqcnt.com @@ -15045,7 +15037,6 @@ chainsql.net chainwhy.com chainwon.cc chainwon.com -chaiqiu.wang chairyfish.com chaishiguan.com chaitin.com @@ -15571,7 +15562,6 @@ china-flash.com china-flower.com china-g.com china-galaxy-inv.com -china-gc.com china-genius.com china-goldcard.com china-highway.com @@ -16388,6 +16378,7 @@ chrent.com chrice.net chris-tina.com christianlouboutin-shop.com +christianris.com chrisyue.com chrmn.com chrom-china.com @@ -16431,6 +16422,7 @@ chuangkem.com chuangkeup.com chuangkit.com chuanglian.net +chuanglinggame.com chuangluo.com chuangread.com chuangshifurui.com @@ -16554,6 +16546,7 @@ chutianlaser.com chutianzhinu.com chuwi.com chuxiangyi.com +chuxindata.com chuxingyouhui.com chuxinhudong.com chuxinm.com @@ -16757,6 +16750,7 @@ cjcjw.com cjcp.org cjdby.net cjdcw.com +cjdropshipping.com cjeduw.com cjftb.com cjhb168.com @@ -16817,7 +16811,6 @@ ckuai.com ckurk.org ckxsw.com ckxx.net -ckxxbao.com ckzhijiaedu.com cl-acg.com cl-hs.com @@ -16870,7 +16863,6 @@ click-v.com click369.com clickclaro.xyz clickserve.dartsearch.net -clickstyle.net clicksun.net clickwifi.net client51.com @@ -16913,7 +16905,6 @@ cloudacc-inc.com cloudajs.org cloudangelfunds.com cloudbility.com -cloudcachestels.com cloudcc.com cloudcdn.net cloudcdns.com @@ -17150,7 +17141,6 @@ cnaaa7.com cnaaa9.com cnacg.cc cnad.com -cnadtop.com cnaf.com cnagcoin.com cnaho.com @@ -17200,7 +17190,6 @@ cnbzol.com cnbzs.com cnc-gd.net cnca.net -cncaijin.com cncait.net cncard.com cncc.bingj.com @@ -17271,7 +17260,6 @@ cndw.com cndy.org cndzq.com cndzys.com -cneca.net cnecc.com cnedoc.com cnedres.org @@ -17488,6 +17476,7 @@ cnlogo8.com cnluqiao.com cnmanhua.com cnmattson.com +cnmcom.com cnmdy.com cnmediae.com cnmeifa.com @@ -17577,6 +17566,7 @@ cnqiang.com cnqiaoxiang.com cnqjc.com cnqjw.com +cnqlk.com cnqr.org cnquanjing.com cnradio.com @@ -17620,7 +17610,6 @@ cnsesan.com cnsfk.com cnshipnet.com cnshipping.com -cnshiyanji.com cnsifa.net cnsikao.com cnsimin.com @@ -17647,6 +17636,7 @@ cnsunp.com cnsuomei.com cnsupu.com cnsuv.com +cnsyhz.com cnsynews.com cnsyyx.com cnszkl.com @@ -17740,7 +17730,6 @@ cnzhanzhang.com cnzhengmu.com cnzhibo.com cnzhiyuanhui.com -cnzhizhe.com cnzjol.com cnzknet.com cnzlapp.com @@ -17767,6 +17756,7 @@ coatingol.com cobbersz.com cobenet.com cobkl.com +cocas.cc cocblo.com cocccc.vip coccccc.cc @@ -17982,7 +17972,6 @@ comiai.com comic123.net comic520.com comicdd.com -comice.net comicer.com comicfans.net comiclub.com @@ -18103,7 +18092,6 @@ coopb2b.com coophone.com coorain.net coorfeon.com -coosem.com cootek.com cootekservice.com coovbbs.com @@ -18149,6 +18137,7 @@ cosyjoy.com coubei.com counect.com couns.com +couplefish.com coupon996.com couponmaster.store coursegraph.com @@ -18157,7 +18146,6 @@ coventrynv.com coverweb.cc covinda.com covtv.com -cow.black cowarobot.com cowgrrl.com cowlevel.net @@ -18216,7 +18204,6 @@ cpppc.org cpppf.org cppprog.com cppwh.com -cprs31b.icu cps1688.com cps800.com cpsbeijing.org @@ -18501,7 +18488,6 @@ csapa.org csaspx.com csau.com csbabao.com -csbdfyy.net csbdkj.com csbidding.com csbly.net @@ -18527,6 +18513,8 @@ csdn.com csdn.net csdn123.net csdndoc.com +csdndx.com +csdndx.net csdnxiazai.xyz csdqp.com csdxcw.com @@ -18640,6 +18628,7 @@ csvsc.com csvw.com csw18.com csweigou.com +cswsadlab.com csxcdj.com csxdf.com csxiemin.com @@ -18761,6 +18750,7 @@ ctzrnet.com cu-air.com cu321.com cuaa.net +cuan.la cuantianhou.net cuav.net cubead.com @@ -18808,7 +18798,6 @@ cunan.com cuncun8.com cuncunle.com cuncx.com -cunfo.wang cunman.com cunnar.com cunyoulu.com @@ -18879,7 +18868,6 @@ cxcyds.com cxdq.com cxfuwu.com cxgame.net -cxh.me cxh99.com cxhl365.net cxhr.com @@ -18890,6 +18878,7 @@ cxmld.com cxmms.com cxmt.com cxmtc.net +cxqb.net cxsw3d.com cxsyjy.com cxta.com @@ -19009,7 +18998,6 @@ cyyizuo.com cyysjm.com cyyz.org cyyzws.com -cyzhao.xyz cyzl8.com cyzm.net cz-hffm.com @@ -19046,7 +19034,6 @@ czggsj.com czgjj.com czgjj.net czgongzuo.com -czhello.com czie.net czifi.org czitc.com @@ -19069,7 +19056,6 @@ czrxw.com czry888.com czshyhg.com czsljky.com -czslstechnology.com czsrc.com czssx.com cztour.com @@ -19224,7 +19210,6 @@ dafanqie.net dafanshu.com dafaqipaizx.com dafayu.com -dafayun9.com dafengning.com dafhr.com dafork.com @@ -19373,7 +19358,6 @@ dalunews.com daluo.com daluwang.net damailicai.com -damaroyworkshop.com damatu1.com damddos.com dameisheng.com @@ -19480,7 +19464,6 @@ daodian100.com daodianfu.com daododo.com daoduoduo.com -daoen888.com daofengdj.com daofenggame.com daofengyx.com @@ -19540,7 +19523,6 @@ darentang.org dariyu.com darkhat.xyz darkmi.com -darkz.co darmao.com darongcheng.com darryring.com @@ -19947,7 +19929,6 @@ deerchao.net deerma.com defcoding.com defectink.com -defu189.com deheheng.com deheng.com dehsm.com @@ -20102,6 +20083,7 @@ dfbgv.com dfcfw.com dfcx-bj.com dfdaily.com +dfdfoy.bar dfdjy.net dfedu.com dfgzqc.com @@ -20111,6 +20093,7 @@ dfhon.com dfhtjn.com dfkcgs.com dfkhgj.com +dfmc.com dfmcastrol.com dfmingya.com dfpk.com @@ -20192,6 +20175,7 @@ dgym519.com dgyuanyi.com dgzhihongjx.com dgzhisen.com +dgzhuorui.com dgzj.com dgzsgjg.com dgzz1.com @@ -20254,7 +20238,6 @@ dianclan.com diandainfo.com diandanbao.com diandao.org -diandawenku.com diandian.com diandianchu.com diandianshu.com @@ -20417,6 +20400,7 @@ dididadidi.com dididapiao.com dididawo.com didiling.com +didipay.com didiqiche.com didispace.com didistatic.com @@ -20506,7 +20490,6 @@ dingdone.com dingdongcloud.com dingdongqb.com dingfang123.com -dingguajiao.com dinghaiec.com dinghuaren.com dinghuihuojia.com @@ -20833,7 +20816,6 @@ dnbbn.com dnbbs.com dnbcw.com dnbcw.info -dnbcw.net dnbiz.com dnbwg.com dncheng.com @@ -21054,6 +21036,7 @@ dongbeiol.com dongbeishifandaxue.com dongbucaijing.com dongcai.net +dongcaibaoxian.com dongchedi.com dongcheng120.com dongchenghotels.com @@ -21180,6 +21163,7 @@ dotgate.com dotinapp.com dou.bz dou.li +douban.co douban.com douban.fm douban666.com @@ -21650,7 +21634,6 @@ duolebo.com duolegame.com duolerong.com duolingptfe.com -duolm.com duolunmoma.org duoluodeyu.com duoluohua.com @@ -22154,7 +22137,6 @@ easybug.org easycolor.cc easydarwin.org easyder.com -easydingtalk.org easydoc.xyz easyfami.com easyfang.com @@ -22216,6 +22198,7 @@ ebdan.net ebdoor.com ebeta.org ebfcn.com +ebibi.com ebigear.com ebingqilin.com ebiobuy.com @@ -22228,7 +22211,6 @@ ebnew.com ebook.name ebook23.com ebookbao.net -ebookcn.com ebookdown.net ebookmen.com ebooks.run @@ -23029,7 +23011,6 @@ ergengtech.com ergengtv.com ergouzi.fun erhaojie.com -erhnv.com eri.cx ericfu.me erichfund.com @@ -23079,7 +23060,6 @@ esde.cc esduu.com esensoft.com esfimg.com -eshangke.com eshangxian.com eshanyao.com eshenlin.com @@ -23098,7 +23078,6 @@ esk365.com eskgn.com esky8.com eskysky.com -esljt.com eslosity.com esmartwave.com esnai.com @@ -23175,6 +23154,7 @@ etongdai.com etongguan.com etonkidd.com etoote.com +etoplive.com etosun.com etoubao.com etowz.com @@ -23357,7 +23337,6 @@ expai.com expba.com expcloud.net expdns.net -expfile.com expiredns.net expirenotification.com expirepausedns.com @@ -23536,7 +23515,6 @@ faceu.mobi faceu.net faceui.com faceunity.com -faceye.net facri.com factj.com factube.com @@ -23648,7 +23626,6 @@ fanghuihui.com fanging.com fangjia.com fangjiadp.com -fangjian.me fangjs.com fangkebao.cc fangkeduo.net @@ -23953,7 +23930,6 @@ fdjzu.com fdkjgz.com fdkm88.com fdlly.com -fdlsi.com fdlt.net fdmgj.com fdpx.com @@ -23968,7 +23944,6 @@ fe2x.cc fe520.com fearlazy.com feaye.com -febird.net febug.com fecable-gz.com fecmall.com @@ -24066,7 +24041,6 @@ feipin.com feiq18.com feiren.com feisan.net -feishuzhibo.com feisu.com feiteng.la feitian001.com @@ -24101,6 +24075,7 @@ felix021.com femba.net femrice.com fen-xiang.com +fenbaner.net fenbeijinfu.com fenbi.com fenbi8.com @@ -24573,7 +24548,6 @@ fltacn.com fltau.com fltrp.com fluke-ig.com -fluttercc.com flutterchina.club flvcd.com flvsp.com @@ -24794,7 +24768,6 @@ fox688.com fox800.xyz foxbeen.com foxconn.com -foxease.com foxera.com foxmail.com foxphp.com @@ -25037,7 +25010,6 @@ fukun.org fulantv.com fulevmy.com fuli.la -fuli.zone fuli1024.com fuli404.net fuliansheng.com @@ -25126,6 +25098,7 @@ fuwuqinet.com fuwuqu.com fuxiaohei.me fuxinbank.com +fuxing56.com fuxingtech.com fuxingwang.com fuyangseo.com @@ -25191,7 +25164,6 @@ fxcsxb.com fxdiv.com fxdm.net fxdp.com -fxdzlcl.com fxeye.com fxhqw.net fxian.org @@ -25230,7 +25202,6 @@ fy027.com fy169.net fy558.com fy98.com -fybanks.com fybiji.com fybooks.com fybxw.com @@ -25261,6 +25232,7 @@ fyjsz.net fyktaqm.com fynas.com fynews.net +fyq99.com fyrcbk.com fyrexian.com fyrwzz.com @@ -25343,7 +25315,6 @@ g72.com g7430.com g77775555.com g77776666.com -g806.com g88885555.com g88886666.com g8f8.com @@ -25573,6 +25544,7 @@ gaomon.net gaonengfun.com gaopaiwood.com gaopeng.com +gaoqing.la gaoqing500.com gaoqingpai.com gaoqiwenda.com @@ -25742,6 +25714,7 @@ gdjdxy.com gdjinge.com gdjn.org gdjyw.com +gdkaman.com gdkepler.com gdkjb.com gdkszx.com @@ -25948,7 +25921,6 @@ geospatialsmart.com geotmt.com gepresearch.com gepush.com -geqiming.com gequ77.com gequdaquan.net geren-jianli.com @@ -26474,7 +26446,6 @@ gohomesafe.org gohong.com gohugo.org going-link.com -goingamer.com gojiaju.com goke.com gokols.com @@ -26660,7 +26631,6 @@ gopiaowu.com goplaycn.com goplayervideo.com gopojie.net -gopuu.com gorichox.com gorouter.info gorse.com @@ -26929,7 +26899,7 @@ gst-china.net gstarcad.com gstdt.com gston.cc -gsuo.com +gstonegames.com gsxcdn.com gsxiongjian.com gsxservice.com @@ -26967,6 +26937,7 @@ gtlrxt.com gtm-a1b2.com gtm-a1b4.com gtm-a2b3.com +gtm-a2b6.com gtm-a3b1.com gtm-a4b8.com gtm-a4b9.com @@ -27031,7 +27002,6 @@ guangdauser.com guangdiu.com guangdongchuangke.com guangfeng.com -guangfengjx.com guanggao.com guanggoo.com guanggu100.com @@ -27157,6 +27127,7 @@ guilinlife.com guilintravel.com guimengning.com guimi.com +guimilu.com guimimianbao.cc guimipay.net guipp.com @@ -27286,7 +27257,6 @@ gupei.com gupen.com gupiao111.com gupiao135.com -gupiao266.vip gupiao3.com gupiao8.com gupiaowajue.com @@ -27321,6 +27291,7 @@ guxunw.com guyidai.com guyiyangsd.com guyuenglish.com +guyungame.com guzaosf.com guzhangting.com guzhifengds.com @@ -27332,7 +27303,6 @@ gvlocalization.com gw-ec.com gw2field.com gw2sc.com -gw630.com gw6c.com gw8888.com gwamcc.com @@ -27475,6 +27445,7 @@ gyzfbz.net gyzy.com gyzyfw.com gz-cmc.com +gz-cube.com gz-data.com gz-forever.com gz-gz.com @@ -27547,7 +27518,6 @@ gzhshoulu.wang gzhtg.com gzhtinfo.com gzhuake.cc -gzhui.net gzhxpw.com gzhzcj.com gzhzgwyw.com @@ -27572,7 +27542,6 @@ gzlingli.com gzliy.com gzlug.org gzlujiao.com -gzly-talent.com gzlz307.com gzlzfm.com gzmama.com @@ -27964,6 +27933,7 @@ haizhoumo.com haizihe.com haizitong.com hajjjc.com +haku77.com halade.com halaha.com halffashion.com @@ -28649,7 +28619,6 @@ hbtxbaidu.com hbtybio.com hbtycp.com hbvhbv.com -hbwcl.com hbwh.net hbwhgs.com hbwhjj.com @@ -28775,7 +28744,6 @@ hdj.me hdjay.com hdjr.org hdjwww.com -hdkjc.wang hdlchina.com hdletv.com hdlogo.com @@ -28792,7 +28760,6 @@ hds111.com hdsbyby.com hdscg.com hdsdyyy.com -hdsky.net hdslb.com hdslb.net hdthjy.com @@ -28830,7 +28797,6 @@ heartide.com heartinsti.com hebangdianzi.com hebaodai.com -hebaow.net hebauto.com hebbank.com hebbr.com @@ -28861,7 +28827,6 @@ hebsg.net hebshanggu.com hebtv.com hebxtjx.com -hebzy.com hec-al.com hec-changjiang.com hecai360.com @@ -28899,6 +28864,7 @@ heibai.org heibaimanhua.com heicha.com heicheng51.com +heidiankeji.com heidiseo.com heigaga.com heiguang.com @@ -29024,7 +28990,6 @@ hemaos.com hemayun.com hemayx.com heminjie.com -hemnq.com hempelgroup.com hen360.com henan100.com @@ -29186,7 +29151,7 @@ hfgjj.com hfgrandtheatre.com hfhouse.com hfhyw.com -hfiwjo.icu +hfi-health.com hfjy.com hfkeheng.com hfkj0754.com @@ -29265,7 +29230,6 @@ hh010.com hh04.com hh1488.com hhailuo.com -hhalloy.com hhbg123.com hhcmjt.com hhcn.com @@ -29421,6 +29385,7 @@ hinew8.com hinpy.com hiogadw.bar hiopensource.com +hioug.com hioyun.com hipandashop.com hiparking.com @@ -29466,7 +29431,6 @@ hit180.com hitachi-helc.com hitalk.com hitalkers.com -hitao.com hitevision-solution.com hitfmfans.com hitgk.com @@ -29502,7 +29466,6 @@ hiyd.com hiyongche.com hiyouib.com hiyouqu.com -hiyuezhi.com hizg.org hizhu.com hizhuanli.com @@ -29615,7 +29578,6 @@ hlgnet.net hlhmf.com hlideal.com hlj-aptech.com -hljdxb114.com hljjjb.com hljjnjp.org hljjxrc.com @@ -29696,7 +29658,6 @@ hnangel.com hnapay.com hnayg.com hnbaiyun.com -hnbka.com hnbljy.com hnboxu.com hnbwsd.com @@ -29709,8 +29670,8 @@ hncreate.com hncsmjzs.com hncsmtr.com hncsvod.com +hndbs.com hndca.com -hndlgt.com hndnews.com hndpx.com hndxsg.org @@ -29893,7 +29854,6 @@ homekingcdn.com homekoo.com homekoocdn.com homeremedies247.net -homescn.com hometeda.com hometex114.com hometexjoin.com @@ -29973,7 +29933,6 @@ hongxiang666.com hongxiaolong.com hongxin18.com hongxinbao.com -hongxinghai.com hongxingzn.com hongxinhuaxue.com hongxiu.cc @@ -30034,7 +29993,6 @@ horizonrcg.com horn-yacht.com horsa.org horsehr.com -horsepointtv.com horti-expo2019.com horti-expo2019.org hortor.net @@ -30182,7 +30140,6 @@ hqwhw.com hqwx.com hqwy.com hqyj.com -hqylgc.com hqys.net hqytgyh.com hqyun.com @@ -30198,7 +30155,6 @@ hr44.com hr510.com hr5156.com hr668.com -hr7c.com hr9000.com hr987.com hran.me @@ -30348,6 +30304,7 @@ htbaba.com htback.com htbenet.net htc-media.com +htc.com htcbbs.net htcis.net htciy.com @@ -30404,6 +30361,7 @@ httprunner.org httpsbaidu.com hturl.cc htuwenming.com +htv009.com htwed.com htxxpx.com htxyin.com @@ -30520,7 +30478,6 @@ huanbao.com huanbaoscx.com huanbeiloan.com huancaicp.com -huanchenggjhy.com huandie.com huang-jerryc.com huang-ou.com @@ -30762,7 +30719,6 @@ huduntech.com huelead.com hueseman.com hufangyun.com -hugage.com hugaoba.com hugd.com hugeland.com @@ -30858,7 +30814,6 @@ huing.net huion.com huioo.net huiqiangkeji.com -huiqituan.com huirendai.com huiris.com huirong168.com @@ -30934,6 +30889,7 @@ hujiuzhou.com hujuntao.com hukai.me huke88.com +hukou021.com hukoushanghai.com huladai.com hulai.com @@ -31049,6 +31005,7 @@ huoqiucaijing.com huoshan.cc huoshan.club huoshan.com +huoshanvod.com huoshanzhibo.com huoshen.com huoshen.net @@ -31073,7 +31030,6 @@ hupo.tv hupu.com hupu.tv hupucdn.com -huqimei.com huquan.net hurongclub.com hurun.net @@ -31174,7 +31130,6 @@ hwjyw.com hwk603.com hwlantian.com hwlpz.com -hwq66.com hwrecruit.com hwsem.com hwtrip.com @@ -31192,7 +31147,6 @@ hx110.com hx2car.com hx2cars.com hx36.net -hx8666.com hx8886.com hx95.com hx99.net @@ -31259,7 +31213,6 @@ hxyxsj.com hxzdhn.com hxzxg.com hy-cgp.com -hy-cn.com hy-zr.com hy01888.com hy05190134.com @@ -31324,9 +31277,9 @@ hytic.net hyundai-hmtc.com hyundaibeijing.com hyuuhit.com -hyuwen.com hywly.com hyxdj.com +hyxrzs.com hyyazhaji.com hyyf.net hyyic.com @@ -31916,6 +31869,7 @@ idcpv.com idcquan.com idcsec.com idcser.com +idcsh.com idcsh.net idcsped.com idcspy.com @@ -31937,7 +31891,6 @@ ideacms.net ideagou.com idealshanghai.com ideanote.cc -ideapersist.com ideappt.com ideasandroid.com ideazhao.com @@ -31978,7 +31931,6 @@ idotools.com idouba.net idoupiao.com idourl.com -idouu.com idouyinstatic.com idouzi.com idown.hk @@ -32657,6 +32609,7 @@ imwexpo.com imwork.net imxh.com imxingzhe.com +imycdn.com imydl.com imydl.tech imydns.net @@ -32738,7 +32691,6 @@ infobidding.com infobigdata.com infocomm-journal.com infoier.com -infoip.org infoipwest.com infong.net infoobs.com @@ -32793,6 +32745,7 @@ inkcn.com inke.com inke.tv inkeygo.com +inkonote.com inktok.com inkuai.com inlaylink.com @@ -33417,6 +33370,7 @@ itouchchina.com itougu.com itoumi.com itoutiao.co +itoutiaoimg.com itoutiaostatic.com itouxian.com itouzi.com @@ -33490,6 +33444,7 @@ itziy.com itzjj.com itzk.com itzm.com +itzmx.com itzmx.net itzpark.com iu18.com @@ -33542,7 +33497,6 @@ iwan4399.com iwanbei.com iwanboy.com iwangding.com -iwangke.me iwangnan.com iwanoutdoor.com iwanvr.com @@ -33625,6 +33579,7 @@ ixinwei.com ixiqi.com ixiqin.com ixiumei.com +ixiupet.com ixixili.com ixizang.com ixmu.net @@ -33803,7 +33758,6 @@ javaear.com javaeye.com javafreer.com javafxchina.net -javalebogame9.com javaresearch.org javascriptcn.com javashuo.com @@ -34077,7 +34031,6 @@ jfdwy.com jfedu.net jfenz.com jfewle.com -jfgfsj.icu jfh.com jfinal.com jfinfo.com @@ -34088,7 +34041,6 @@ jfshare.com jfsky.com jfstage.com jfstatic.com -jftrf.com jfuwu.com jfxc.com jfxqczl.com @@ -34264,7 +34216,6 @@ jianghao.wang jianghehuagong.com jianghui.xyz jiangjiaolong.com -jiangjiukc.com jiangkk.com jiangmin.com jiangpaipinpai.com @@ -34363,6 +34314,7 @@ jianzhila.net jianzhimao.com jianzhiwang.com jianzhiwangzhan.com +jianzhiyixin.com jianzhu2008.com jiao4.com jiaobu365.com @@ -34406,6 +34358,7 @@ jiashuangkuaizi.com jiashule.com jiaston.com jiasuba.com +jiasuhui.com jiasule.com jiasule.net jiasule.org @@ -34499,7 +34452,6 @@ jiemo.net jiemo8.com jiemodui.com jiepaids.com -jiepaishow.com jiepang.com jiepei.com jiepeng023.com @@ -34514,6 +34466,8 @@ jieti5.com jietu365.com jietuosh.com jietusoft.com +jiexi.la +jiexi.link jiexi8.com jiexiyouxuan.com jieyou.com @@ -34736,7 +34690,6 @@ jinhuatv.com jinhuazhe.com jinhuicorp.com jinhuizhibo.com -jinhuo5.com jinhusns.com jinianbi.com jiniance8.com @@ -35061,7 +35014,6 @@ jjblove.com jjbnews.xyz jjccb.com jjcdn.com -jjcfsb.com jjcoffetel.cc jjcoffetels.com jjcpchina.com @@ -35121,7 +35073,6 @@ jjtxtx.com jjunj.com jjvod.tv jjw.com -jjw5.com jjword.com jjwxc.com jjwxc.net @@ -35220,6 +35171,7 @@ jlzsoft.com jlzsw.com jlzyz.com jm1ph.com +jm2046.com jm3q.com jm678.com jmabroad.com @@ -35238,7 +35190,6 @@ jmhapp.com jmhd8.com jmicd.com jmjc.tech -jmjinrong.com jmjiuchang.com jmjxc.com jmkjmob2.xyz @@ -35424,7 +35375,6 @@ joying.com joyj.com joyk.com joylife.hk -joyme.com joymeng.com joynb.net joyncleon.com @@ -35463,7 +35413,6 @@ jpjc315.com jpjww.com jpkcnet.com jpkix.com -jpmm8.com jpmsg.com jpnsp.com jpqp888.com @@ -35604,6 +35553,7 @@ jsfof.com jsform.com jsform3.com jsfw8.com +jsfycdn3.com jsgbds.com jsgblog.com jsgc168.com @@ -35774,7 +35724,6 @@ jtqh.net jtstudy.com jttv.net jtv123.com -jtv5n.buzz jtyjy.com jtyy.com ju33.com @@ -35881,7 +35830,6 @@ julyclyde.org julydate.com julyedu.com julysong.com -julysxy.xyz jumaicms.com jumaizhijia.com jumanhua.com @@ -35919,7 +35867,6 @@ juneyaoairlines.com jungebb.com junhey.com junhuisoft.com -juning.com juniu.tv junjiahao.com junjichu.net @@ -36226,7 +36173,6 @@ jyncw.com jynews.net jyous.com jypc.org -jyqhs.com jyqkx.com jyqxz2015.com jyrd.com @@ -36541,7 +36487,6 @@ kankannews.com kankantv.cc kankanzhijian.com kanketv.com -kankia.com kankun-smartplug.com kanlxy.com kanman.com @@ -36874,7 +36819,6 @@ kexue.fm kexuelife.com kexuexia.com kexuezixunzzs.com -key-4ever.com key007.com keyan.life keyboardancer.com @@ -37226,6 +37170,7 @@ knewone.com knewsmart.com knifecms.com kniu.cc +knotesapp.com knowgive.com knowncoin.com knownpcb.com @@ -37302,6 +37247,7 @@ konkamobile.com konkek2.com konlan.org konotaku.com +konshan.com kooaoo.com koocdn.com koofang.com @@ -37391,6 +37337,7 @@ kqgeo.com kqidong.com kqiqi.com kqiwen.com +kqiwen.net kqj123.com kqqy.com kqzjw.com @@ -37400,6 +37347,7 @@ kr.com kr126.com kr3360.com krahag.com +krbamboo.com krdem.com krdlw.com krdrama.com @@ -37439,7 +37387,6 @@ ksgnr.com kshitachi.com kshot.com ksjgs.com -ksjlsw.wang ksjsa.com ksjygc.com kskino.com @@ -37518,7 +37465,6 @@ kuai8.com kuaibbs.com kuaibiancheng.com kuaibiao2000.com -kuaibo.com kuaibowang.net kuaibuw.com kuaicad.com @@ -37572,7 +37518,6 @@ kuailiyu.com kuailiyu.net kuailugroup.com kuaimi.com -kuaipan.com kuaipandata.com kuaipao8.com kuaipeilian.com @@ -37600,7 +37545,6 @@ kuaiyan.com kuaiyankanshu.net kuaiyilicai.com kuaiyingxiao88.com -kuaiyong.com kuaiyoujia.com kuaiyouxi.com kuaiyu.com @@ -37642,6 +37586,7 @@ kubicode.me kubikeji.com kubiops.com kubo-360-tudou.com +kubozy-cdn-baidu.com kubozy-youku-163-aiqi.com kubozy-youku-163.com kuche.com @@ -37710,7 +37655,6 @@ kuniaozs.com kunjyu.com kunkkawu.com kunleen.com -kunluen.com kunlun-cdn.com kunlunaq.com kunlunar.com @@ -37750,6 +37694,7 @@ kuotu.com kuozhan.net kupao.com kuparts.com +kupoo.com kuqin.com kurogame.com kurokingdom.com @@ -37863,6 +37808,7 @@ kyleslight.net kylienet.com kyligence.io kylin-os.com +kylinlot.com kylinmobi.com kylinos.com kylinpet.com @@ -37921,7 +37867,6 @@ ladouban.com ladpex.com lady177.com lady361.com -lady83.com lady8844.com lady98.com ladybirdedu.com @@ -37936,6 +37881,7 @@ lagou.com lagouevents.com lagoujobs.com lagowang.com +lahuashanbx.com lai-ai.com laibxw.com laichou.com @@ -38071,6 +38017,7 @@ langlangchinese.com langlangjiajiao.com langlib.com langlive.com +langlvseo.com langmanzg.com langmanzw.com langongju.com @@ -38133,11 +38080,9 @@ lanrenzhijia.com lanrenzhoumo.com lansedongli.com lanseyujie.com -lansezw.com lansha.tv lanshanweb.com lanshi.hk -lanshiliu.com lanshizi.com lanshou.net lantaoyu.com @@ -38208,7 +38153,6 @@ laohuangli.net laohucaijing.com laohuyou.xyz laohuyun.com -laohuzx.com laojianwang.com laojilu.com laojiuxitong.com @@ -38240,7 +38184,6 @@ laotiaomao.com laowangappxy.xyz laowangshengge.com laowuxx.com -laoxier365.com laoxiezi.com laoxuehost.com laoxuehost.net @@ -38288,7 +38231,6 @@ lativ.com latoooo.com lattebank.com lattecake.com -latvcnc.com lavago.com lavandehotels.com lavapm.com @@ -38311,7 +38253,6 @@ lawyee.org lawyer027.com lawyerbridge.com lawyermr.com -lawyerqx.com lawyershanghai.net lawyersuperman.com layabox.com @@ -38326,7 +38267,6 @@ lazada.com.ph lazada.sg lazada.vn lazonga.com -lazpit.com lazybios.com lazylorna.com lb-floor.com @@ -38447,7 +38387,6 @@ leapmie.com leapmotor.com learn-quantum.com learndiary.com -learnengs.com learnfans.com learnfuture.com learning-archive.org @@ -38476,6 +38415,7 @@ leda13.com ledaiyu.com ledanji.com ledao.so +ledboke.com ledcax.com ledchina-sh.com ledctl.com @@ -38483,7 +38423,6 @@ lede.com ledi.us ledianduo.com lediaocha.com -ledlightingfactory.com ledo.com ledongzone.com ledpfw.net @@ -38748,7 +38687,6 @@ lexue8.com lexueying.com lexun.com lexun365.com -lexyhome.com leyan8.com leyaoyao.com leybc.com @@ -38770,6 +38708,7 @@ leyue100.com leyun001.com leyunapp.com leyungame.com +leyunge.com leyuntimes.com leyuz.com leyvo.com @@ -38835,15 +38774,14 @@ lgzikao.com lh-lx.com lh168.net lh310.com -lh499.com lh75.com lhao88.com lhave.com lhcmc.com lhdyfc.com -lhezedu.com lhflh.com lhggjd.org +lhh.la lhidc.net lhlqw.com lhm8.com @@ -38924,7 +38862,6 @@ lianqianluchangjia.com lianshangbing.com lianshijie.com liansuo.com -liansuo580.com liantianhong.com liantu.com liantuobank.com @@ -39340,6 +39277,7 @@ linux178.com linux265.com linux5.net linux6.com +linuxacme.icu linuxba.com linuxbaike.com linuxbaodian.com @@ -39388,7 +39326,6 @@ linyi.com linyi.net linyilongyuan.com linyimama.com -linyingfans.com linyiren.com linzhuotech.com linzhuxin.com @@ -39664,6 +39601,7 @@ ljimg.com ljjgdj.org ljjhfc.com ljlcd.com +ljmeng.site ljqkk.com ljsdk.com ljsw.io @@ -39698,7 +39636,6 @@ llever.com llewan.com llgkm.com llgo.work -lli5.cc llidc.com lljgame.com lljgxx.com @@ -39717,7 +39654,6 @@ lltoken.com lltxy.com llwin.com llwt.ink -llxhw.com llycloud.com llzg.com llzw888.com @@ -39789,7 +39725,6 @@ lnzikao.com lnzsks.com lo97.com load-page.com -lobsfh.icu locatran.com locez.com lockfans.com @@ -39926,7 +39861,6 @@ longjcun.com longjiazuo.com longjushangcheng.com longk.com -longkouhaijingfang.com longlongweb.com longmaosoft.com longmeng.com @@ -40004,7 +39938,6 @@ looking-car.com lookr.cc lookrv.com looktm.com -looktm.net looktmt.com lookvin.com loome.net @@ -40127,6 +40060,7 @@ loyo.cc loyogame.com lpcheng.com lpllol.com +lplrbi.bar lply.net lppz.com lprcx.com @@ -40216,14 +40150,12 @@ lskejisoft.com lskyf.com lsljgc.com lsnetlib.com -lsoo.org lsoos.com lspjy.com lsq6.com lsqifu.com lssdjt.com lssen.com -lsservers.net lstazl.com lstest.com lsttapp.com @@ -40241,6 +40173,7 @@ lszj.com lszjyj.com lszp.cc lt-tree.com +lt-uv.com lt3c.com ltaaa.com ltaaa.net @@ -40300,7 +40233,6 @@ luckycoding.com luckycoffee.com luckyjia.com luckykun.com -luckyshopgo.com luckyxp.net lucode.net lucoder.com @@ -40404,7 +40336,6 @@ luokuang.com luolai.com luolai.tech luolei.org -luolicloud.com luomapan.com luomi.com luoo.net @@ -40616,7 +40547,6 @@ lxy.me lxy520.net lxybaike.com lxyes.com -lxzzs.com ly-sky.com ly-wz.com ly.com @@ -40747,7 +40677,6 @@ lzxdly.com lzxgo.com lzydjy.com lzyun.vip -lzzsjt.com lzzyad.com lzzzf.com m-finder.com @@ -40778,11 +40707,11 @@ m4yy.com m598.com m5bn.com m5stack.com +m6.ai m6go.com m818.com m8cool.com m90cc.com -m924w.buzz m937.com m9o.net ma-china.com @@ -40835,7 +40764,6 @@ macsky.net macsofter.com macw.com macwk.com -macxin.com macz.com maczapp.com maczd.com @@ -41034,6 +40962,7 @@ maldiveszh.com maldun.com males120.com maliapi.com +maliquankai.com mall-builder.com mallchina.net mallcoo.net @@ -41057,6 +40986,7 @@ mamicode.com mamilist.com mamioo.com mamipush.com +mamsh.org man189.com mana-harp.com manage.c3edge.com @@ -41265,7 +41195,6 @@ massage7.com massclouds.com masscrunch.com masterlab.vip -masterlifewh.com mastersay.com mastersim123.com mastertimes.net @@ -41291,6 +41220,7 @@ matools.com matouwang.com matt33.com mattge.com +matthewsery.com mattressmachinery.net matwav.com mauu.me @@ -41308,6 +41238,7 @@ maxhub.com maxhub.vip maxiang.info maxiang.io +maximiliansery.com maxitas.com maxjia.com maxket.com @@ -41322,6 +41253,7 @@ maxthonimg.com maxuscloud.com maxvinch.com maxwealthfund.com +maxwellsery.com maxwi.com maxxipoint.com maya09.com @@ -41337,7 +41269,6 @@ mayicms.com mayidui.net mayihot.com mayihr.com -mayihy.com mayijieqian.com mayima.net mayinews.com @@ -41479,6 +41410,7 @@ me4399.com me97.com meadin.com meaninggame.com +meaquatietie.com meazhi.com meb.com meban.cc @@ -41686,6 +41618,7 @@ meishiwangluo.com meishow.com meishubao.com meishui.com +meishuquan.net meisubq.com meisupic.com meitaixianlan.com @@ -41748,7 +41681,6 @@ meke-shanghai.com meke8.com mekya.com meldingcloud.com -melissabaileycreations.com melodyhome.com melote.com melove.net @@ -41790,7 +41722,6 @@ mengma.com mengniang.tv mengniu99.com mengqiuju.com -mengshanzhongxue.com mengshihm.com mengso.com mengtian.com @@ -42004,7 +41935,6 @@ miaoshou.net miaoshoucdn.com miaoshuwu.com miaoshuzhai.com -miaosolu.com miaostreet.com miaotu2018.com miaov.com @@ -42135,7 +42065,6 @@ mijiannet.com mijiayoupin.com mijishe.com mijisou.com -mijuge.com mijwed.com mika123.com mika18.com @@ -42214,7 +42143,6 @@ mindopu.com mindpin.com mindray.com mindstore.io -mindy.tk minecraftxz.com mineplugin.org miner.tools @@ -42340,7 +42268,6 @@ mir4399.com miraclevision.net mirari.cc mirgaga.net -miro891.com mirxat.com misall.com miscd.com @@ -42675,6 +42602,7 @@ moejam.com moejj.com moejn.com moejp.com +moeli-desu.com moemiao.net moeover.com moeplay.com @@ -42788,6 +42716,7 @@ moneydata.hk moneygz.com moneyslow.com mongochina.com +monidai.com monizl.com monph.com monseng.com @@ -42868,6 +42797,7 @@ morning.work morningcore.com morninghan.com morningwhistle.com +morstar.net mos86.com mosea.net moseacg.com @@ -43156,7 +43086,6 @@ mugeda.com mugisama.com muguaddy.com muhai.net -muhehuanbao.com muhoujiemi.com muimg.com mujj.us @@ -43172,8 +43101,8 @@ mumu01.com mumumoo.com munfan.com muniao.com +murdermysterypa.com murl.tv -muruoxi.pw muryi.net muse-ui.org muse100.com @@ -43207,6 +43136,7 @@ muxufang.com muyangkuaibao.com muyangrennongjiayuan.com muyee.com +muyewx.com muyii.com muying.com muyingjie.com @@ -43350,7 +43280,6 @@ mychinaevent.com mychunyan.net mycleanmymac.com myclub2.com -mycms.xyz mycnc.org mycodes.net mycollect.net @@ -43565,7 +43494,6 @@ mywayboo.net myweimai.com mywll.com mywood.cc -myxiongtao.com myxns.org myxzy.com myyishu.com @@ -43732,6 +43660,7 @@ nanshanski.com nanshifaxing.com nantaihu.com nantongbike.com +nantonghua.net nanxueqx.com nanxunjob.com nanyangcable.com @@ -43755,6 +43684,7 @@ nas2x.com nasgetinfo.com nashangban.com nashwork.com +nasimobi.com nasiosoft.com naslike.com nasyun.com @@ -43851,7 +43781,6 @@ ncfgroup.com ncfstatic.com ncfwx.com ncfz.com -ncgxs.com nchjz.com nchq.cc nciku.com @@ -43905,7 +43834,6 @@ nebulogy.com necboa.com nedaex.com nedigitals.com -needdowncoat.com needexam.com needma.com needyouknow.com @@ -44002,6 +43930,7 @@ netskao.com netsmell.com netsoz.com netspreading.com +netstatic.net netsun.com nettsz.com nettvl.com @@ -44066,7 +43995,6 @@ newhtml.net newhua.com newifi.com newistock.com -newjianzhi.com newjson.com newlandaidc.com newlifex.com @@ -44083,7 +44011,6 @@ nework360.com neworld.org neworldedu.org neworldjp.com -newpctorrent.com newperiod.net news18a.com news606.com @@ -44121,6 +44048,7 @@ newtouch-elec.com newtrekwang.me newtrip.com newume.com +newvfx.com newxing.com newxitong.com newxue.com @@ -44449,7 +44377,6 @@ njyongji.com njywsd.com njzc025.com njzglxs.com -njzhonglv.com njzhzx.net njzrxx.xyz njzztyl.com @@ -44550,6 +44477,7 @@ noclyt.com nocode-tech.com nocode.com noddl.me +node.cyou nodeasy.com nodebb-cn.org nodeclass.com @@ -44654,6 +44582,7 @@ nowyingshi.com noxgroup.com noxue.com noxxxx.com +noyes88.com npbdp.com npcgo.com npcka.com @@ -44741,6 +44670,7 @@ ntqcct.com ntrcb.com ntrdjsjl.com ntrqq.com +ntryjd.net nttui.com ntuiw.cc ntuiw.com @@ -44889,6 +44819,7 @@ nzjsw.com nzsiteres.com nzw-china.com nzwgs.com +o--o.win o-netcom.com o-sky.com o136.com @@ -44941,7 +44872,6 @@ oborad.com oborr.com obowin.com obsapp.net -obugs.net obyee.com ocar.tv ocd120.com @@ -45093,6 +45023,7 @@ okchexian.com okdai.com okdd.net okemu.com +okex.vip okeycar.com okfri.com okgj.com @@ -45224,6 +45155,7 @@ onedi.net onedict.com onedns.net onedropchangeseverything.net +onefoot365.com onegreen.net onehang.com onehome.me @@ -45276,6 +45208,7 @@ onlinenic.net onlinesjtu.com onlinexijiang.com onlinknews.com +only4.work onlyay.net onlycatch.com onlyedu.com @@ -45736,7 +45669,6 @@ pagecookery.com pagurian.com pahaoche.com pahou.com -pahuanlegou.com pahys.com pai-hang-bang.com paibanxia.com @@ -45805,7 +45737,6 @@ pandaminer.com pandara.xyz pandateacher.com pandatv.com -pandll.com pandoe.com pandolia.net pandoramanager.com @@ -45815,7 +45746,6 @@ pandoxie.com panduoduo.me panduoduo.net panduoduo.online -panexpremium.com panfn.com pang0lin.com pangbu.com @@ -45858,7 +45788,6 @@ panshizz.com panshy.com pansino-solutions.com pansoso.com -pansoso.org pansou.com pantianxia.com pantosafety.com @@ -45935,6 +45864,7 @@ parnassusdata.com parryqiu.com parsein.com partinchina.com +parwix.com pass7.cc passby.me passdesign.net @@ -46056,7 +45986,6 @@ pctutu.net pctvx.com pcviva.com pcw365.com -pcwenda.com pcwenti.com pcwl.com pcyangguangban.com @@ -46064,7 +45993,6 @@ pcyule.com pd-sts.com pd120.com pd521.com -pdawiki.com pdazw.com pdbeta.com pddcdn.com @@ -46159,7 +46087,6 @@ pengdashuju.com pengfu.com penging.com pengjuan.com -pengjunjie.com pengke.com penglaiu.com penglei.name @@ -46401,6 +46328,7 @@ piaoquantv.com piaoshen.com piaotian.org piaotian.us +piaotian5.com piaotongyun.com piaowu99.com piaowusong.com @@ -46646,7 +46574,6 @@ pkan.com pkbeta.com pkbigdata.com pkbkok.com -pkdanji.com pkdyplayer.com pkfj.xyz pkgklk.com @@ -46676,6 +46603,7 @@ pkusp.com pkvs.com pkzx.com plaidc.com +planckled.com planetmeican.com planoi.com plantextra.com @@ -46930,7 +46858,6 @@ pp8d.com pp9570.com pp9l.com ppa18.com -ppaaol.com ppaikd.com ppbizon.com ppcall.com @@ -47178,6 +47105,7 @@ pucms.com pudaquan.com pudn.com pudongwater.com +puduoduo123.com puduzhai.com puem.org puercha.cc @@ -47231,7 +47159,6 @@ putao.so putaoa.com putaocdn.com putaogame.com -putaozhuangyuan.com putclub.com putdb.com putian508.com @@ -47323,7 +47250,6 @@ pyydhg.com pyynsm.com pyyx.com pz0033.com -pz1789.com pz18155.com pz2777.com pz2999.com @@ -47393,6 +47319,7 @@ qbdcc.com qbdgame.com qbeenslee.com qbitai.com +qbj8.com qbjrxs.com qbox.me qbsznkj.com @@ -47449,7 +47376,6 @@ qcrlapp.com qcsdn.com qcsj.com qcstudy.com -qcsyt.com qctsw.com qcwan.com qcwdpt.com @@ -47520,7 +47446,6 @@ qdskill.com qdsntsg.com qdswphb.com qdsysj.com -qdtech.ai qdtgood.com qdthgs.com qdtongxinedu.net @@ -47530,7 +47455,6 @@ qdwenxue.com qdwght.com qdwsb.com qdxfgy.com -qdxiaojiaoya.com qdxtcw.com qdyijiamei.com qdymjy.com @@ -47567,7 +47491,6 @@ qfsyj.com qftouch.com qfun.com qfwwj.com -qfwy8.com qg.net qg108.com qgbzyzl.com @@ -47582,7 +47505,6 @@ qgsydw.com qgtql.com qguiyang.com qgvps.com -qgw123.com qgwsp.com qgxl.org qgysj.org @@ -47691,6 +47613,7 @@ qiangchuan.com qianggen.com qianggongzhang.com qianggou5.com +qiangidc.vip qiangka.com qianglihuifu.com qiangmi.com @@ -47816,7 +47739,6 @@ qichehot.com qichepindao.net qichetong.com qichexin.com -qicheyonping.com qichezhan.net qichuang.com qicn.net @@ -48008,13 +47930,13 @@ qingliuge.com qingliulan.com qinglm.com qinglue.net -qinglvai.com qinglvcha.com qingmang.me qingmang.mobi qingmayun.com qingmei.me qingmo.com +qingmo.net qingmob.com qingnianlvxing.com qingnianwang.com @@ -48235,6 +48157,7 @@ qiyue.com qiyuesuo.com qiyujiasu.com qiyukf.com +qiyukf.net qiyukid.com qiyunbook.com qiyuntong.com @@ -48360,7 +48283,6 @@ qnssl.com qntz.cc qnvod.net qnvod.vip -qnxsk.com qnydns.com qnydns.net qo26.com @@ -48516,6 +48438,7 @@ qqsurvey.net qqt6.com qqteacher.com qqtest.com +qqtf.com qqtn.com qqtouxiangzq.com qqtss.net @@ -48723,6 +48646,7 @@ quantuantuan.com quantum-info.com quanweili.com quanxi.cc +quanxiangyun.com quanxiaoshuo.com quanyin.xyz quanyouhui.cc @@ -48963,7 +48887,6 @@ qxs.la qxslyfjq.com qxswk.com qxsxw.com -qxtxt.com qxw.cc qxwl21.com qxwz.com @@ -48990,7 +48913,6 @@ qycn.net qycn.org qydaili.com qydimg.com -qydm.net qydns1.com qyec.com qyer.com @@ -49101,7 +49023,6 @@ radeonfury.com radicalmail.net radida.com radio1964.com -radio366.com radiokm.com radiotj.com radiowar.org @@ -49176,7 +49097,6 @@ rationmcu.com ratodo.com ratoo.net ratuo.com -rawidn.com ray-joy.com ray4u.com ray8.cc @@ -49222,10 +49142,12 @@ rcgus.com rclbbs.com rcpx.cc rcss88.com +rcuts.com rcw0375.com rcwl.net rcxhhexing.com rcyd.net +rczfang.com rczp.org rd-game.com rd351.com @@ -49243,13 +49165,13 @@ rdtuijian.com rdwork.com rdxmt.com rdxw8.com +rdy.link rdyhly.net rdzhijia.com rdzjw.com rdzs.com rdzx.net re1d.com -reacf.com reachace.com react-china.org react.mobi @@ -49401,6 +49323,7 @@ rendefpc.com renderbbs.com renderbus.com renderincloud.com +rendiyu.com renfas.com renhence.com renji.com @@ -49526,6 +49449,7 @@ rfsister.com rfthunder.com rg950.com rgb128.com +rgdhgdf.com rgfc.net rgoo.com rgrcb.com @@ -49604,6 +49528,7 @@ ritaipaper.com ritarpower.com ritayzy.com ritering.com +rivennero.com rivergame.net riwee.com riyuba.com @@ -49682,7 +49607,6 @@ robot-china.com robotedu.org robotpark.cc robotplaces.com -robotsbase.com rock-chips.com rock-lizard.org rockbrain.net @@ -49770,7 +49694,6 @@ roosur.com root1111.com rootcloud.com rootguide.org -rootjl.com rootk.com rootop.org rootopen.com @@ -49783,6 +49706,7 @@ rosaryshelties.com rosecmsc.com rosedata.com roseduan.com +rosefinchfund.com roshanca.com rosinson.com rossoarts.net @@ -49813,10 +49737,10 @@ royole.com royotech.com rp-pet.com rpg99.com +rpgmoba.com rpo5156.com rpsh.net rpwtcn.com -rqchwl.com rqcotton.com rqi17.com rqjrb.com @@ -50000,6 +49924,7 @@ runhuayou.biz runidc.com runjf.com runker.net +runker.online runmang.com runnar.com runnerbar.com @@ -50016,6 +49941,7 @@ runtianhotel.com runtime.pw runtimeedu.com runtimewh.com +runtonggroup.com runtronic.com runwith.cc runzhize.com @@ -50043,6 +49969,7 @@ ruubypay.com ruuxee.com ruvar.com ruvisas.com +ruwen5.com ruxianke.com ruyahui.com ruyi.ai @@ -50104,7 +50031,6 @@ rzok.net rzwzg.com rzx.me rzxdjy.com -rzydq.com rzyjyl.com s-dom.net s-mob.com @@ -50148,6 +50074,7 @@ saasruanjian.com saasv.com saaswaf.com saayaa.com +sablog.net sac-china.com sacdr.net sact-digital.com @@ -50203,6 +50130,7 @@ saintic.com saipujianshen.com saipujiaoyu.com sairaicc.com +sairui020.com saite-xdc.com saitjr.com saiyouedu.net @@ -50218,7 +50146,6 @@ salonwith.com saltyfish.cloud samankamyab.com samanlehua.com -samcui.com samebar.com samhotele.com saming.com @@ -50292,6 +50219,7 @@ sankgo.com sankougift.com sankuai.com sanmaofafa.com +sanmudc.com sannongejia.com sannxx.com sanpowergroup.com @@ -50320,6 +50248,7 @@ sanwen8.com sanwer.com sanxiamarathon.com sanxiapharm.com +sanxige.com sanxinbook.com sanxiw.com sanxu88.com @@ -50574,6 +50503,7 @@ scymob.com scyongqin.com scyslb.com scytyy.net +scyusuan.com sczg.com sczj.org sczlb.com @@ -50581,7 +50511,6 @@ sczlcts.com sczprc.com sczshz.net sczsie.com -sczsnj.com sczsxx.com sczw.com sczycp.com @@ -50619,6 +50548,7 @@ sddagongrubber.com sddcp.com sddeznsm.com sddh.online +sddlys.com sddxjtss.com sde6.com sdebank.com @@ -50672,8 +50602,6 @@ sdkclick.com sdkclickurl.com sdklh.com sdksrv.com -sdlc6.com -sdlfjt.com sdlldj.com sdlocw.com sdlongli.com @@ -50705,7 +50633,6 @@ sdshulifang.com sdshyl.com sdsjht.com sdsmefina.com -sdsml.com sdssytgc.com sdsszt.com sdsteel.cc @@ -51025,6 +50952,7 @@ sflep.com sflqw.com sforest.in sfpgmk.com +sfplay.net sfwxf.com sfyb.com sfygroup.com @@ -51149,6 +51077,7 @@ shandongsannong.com shandongyunpin.com shandw.com shang-tai.com +shang0898.com shang168.com shang360.com shang5.net @@ -51204,7 +51133,6 @@ shanghaiyueshang.com shanghaizaojia.com shanghaizhenji.com shangji998.com -shangjiefs.com shangjilian.com shanglei.net shangliancn.com @@ -51415,6 +51343,7 @@ shenanhui.com shenbao.org shenbiedu.com shenbinghang.com +shenchai.com shenchuang.com shencut.com shendamachine.com @@ -51534,6 +51463,8 @@ shenzhentong.com shenzhentour.com shenzhenware.com sheqjx.com +shequfu.com +shequfu.net shequnguanjia.com sher.vip sherc.net @@ -51668,6 +51599,7 @@ shimo.im shimo.run shimodev.com shimolife.com +shimonote.net shineenergy.com shinelon.com shinemediaworld.com @@ -51824,6 +51756,7 @@ shootmedia.net shop.samsung.com shop123.com shop2255.com +shop2cn.com shop987.net shopbackdrop.com shopbop.ink @@ -52195,6 +52128,7 @@ shushangyun.com shushao.com shushi100.com shushihome.com +shushubuyue.net shusw.com shuti.com shuttle.co @@ -52232,7 +52166,6 @@ shxibeiquanshe.com shxinlang.com shxt.com shxwcb.com -shxy888.com shy99.com shyacz.com shyanke.com @@ -52314,6 +52247,7 @@ siglff.com sigmachip.com sigmamed.net sigmoblive.com +sigu.cc sigu.me siguady.com sigujx.com @@ -52675,6 +52609,7 @@ sjzyz.net sjzz.cc sjzzimu.com sk1999.com +sk2game.com skatehere.com skcto.com skdlabs.com @@ -52735,7 +52670,6 @@ skylook.org skymobiapp.net skymoons.com skymoons.net -skymz.cc skynj.com skype-china.net skyqzone.com @@ -52919,6 +52853,7 @@ smthome.net smtiger.com smtsvs.com smtsvspay.com +smtu.cc smtvip.com smucdn.com smudc.com @@ -53101,6 +53036,7 @@ soharp.com soho-yiming.com soho3q.com sohochina.com +sohocute.com sohonow.com sohotask.com sohovark.com @@ -53135,6 +53071,7 @@ solidot.org soliloquize.org solo-launcher.com solochex.com +solodonna.world solosea.com solotoon.com solution9.net @@ -53153,7 +53090,6 @@ somic.cc somo.so somode.com somsds.com -somuchrice.com sonald.me sonceo.com songanjun.com @@ -53302,6 +53238,7 @@ soukecheng.net soukf.com soukuren.com soulady.net +soulapp.me souldee.com soulgame.mobi souluo.net @@ -53398,6 +53335,7 @@ sparlala.com spasvo.com spawatervip.net spawor.com +spay365.com spazio.plus spbo.com spbo1.com @@ -53595,6 +53533,7 @@ sspsky.com ssqgx.com ssqzj.com ssreader.com +ssrrxx.com ssrtys.com sssie.com ssso.com @@ -53677,7 +53616,6 @@ staticec.com staticf.com staticfile.org statickksmg.com -staticq.com staticssl.image-gmkt.com staycu.com stbieshu.com @@ -53912,7 +53850,6 @@ suibiji.com suicloud.com suilengea.com suileyoo.com -suimengxiaoshuo.com suinian.com suinikan.com suiniyi.com @@ -54125,7 +54062,6 @@ suremotoo.site surface-ser.com surmon.me surplusvalue.club -surroundtm.com sursen.com sursenelec.com sursung.com @@ -54229,7 +54165,6 @@ swjack.com swjinsheng.com swjl.net swjoy.com -swjrzk.com swkong.com swlhome.com swlidc.com @@ -54361,6 +54296,7 @@ sxzydj.com sy-home.com sy25.com sy2k.com +sy3.com sy76.com sy916.net sy9d.com @@ -54703,7 +54639,6 @@ sztaijier.com sztalent.org sztanko.com sztara.com -sztblog.com szteacher.net szthks.com sztkc.com @@ -54823,7 +54758,6 @@ tadewo.com tadiao168.com tadseeker.com tadu.com -taduo.net taeapp.com tag.gg taglyst.com @@ -54905,7 +54839,6 @@ tajubao.com tajyw.net takeinblue.com takeitem.com -takoyamanpuku.com takungpao.com tal-rasha.com taladapp.com @@ -55000,6 +54933,7 @@ tannet-information.com tanpoqiuer.com tanqi888.com tanrd.com +tanshudata.com tansoole.com tansuo233.com tansuotv.com @@ -55077,6 +55011,7 @@ taoduyx.com taofang.com taofen8.com taofont.com +taoguaji.com taogula.com taohaobang.com taohua.com @@ -55153,7 +55088,6 @@ taoxiaoxing.com taoxiaozhong.com taoxie.com taoxv.com -taoyard.com taoyeyou.com taoyi-support.com taoyinqing.com @@ -55306,6 +55240,7 @@ tcxfpc-pcb.com tcxw.cc tcxx.info tcy365.com +tcyl.pro tcyl77.com tcylgslb.com tcz.name @@ -55332,7 +55267,6 @@ tdsx114.com tdtsd.com tduou.com tdzyw.com -te-rm.com te5.com te6.com tea26.com @@ -55402,6 +55336,7 @@ teemm.com teemmm.com teencn.com teeqee.com +teeterstoop.store tefl-china.net tegjlxs.com tegongji.com @@ -55412,7 +55347,6 @@ tehuituan.com tejiabei.com tejiaquan.com tejiawang.com -tektalk.org tektea.com tel7777777.com telaideyouxue.com @@ -55422,13 +55356,11 @@ telefen.com telehr.com teleinfoo.com teleland.net -telidh.com teliute.org tell520.com telllove520.com telnet404.com telojob.com -telstraclear.net telunsu.net tem.pw tem365.com @@ -55594,7 +55526,6 @@ tgnet.com tgovcloud.com tgshenghe.com tgshiguan.com -tgskins.com tgsoso.com tgyoo.com tgyun.cc @@ -55816,11 +55747,11 @@ tianshangrenjian123.com tianshannet.com tianshengdiyi.com tianshi.info +tianshi2.net tianshiaomei.com tianshiyiyuan.com tianshouzhi.com tianshuge.com -tianshuosujiao.com tiansin.com tiantailaw.com tiantang520.com @@ -55907,6 +55838,7 @@ tibetcyts.com tibetinfor.com ticket800.com ticketdashi.com +ticketmars.com ticstore.com tictalk.com tictalk.vip @@ -55977,6 +55909,7 @@ timeoutbeijing.com timeoutcn.com timepill.net timeread.com +timeread.net times-asia.com timesawards.com timeso.cc @@ -56062,7 +55995,6 @@ tiyii.com tiyu008.com tiyu68.com tiyuansu.com -tiyuba.net tiyudaka.com tiyufeng.com tiyule.com @@ -56164,7 +56096,6 @@ tl-vogue.com tl88.net tl95.com tlbaby.com -tlbbq.com tlby120.com tlbyx.com tlcharity.com @@ -56245,6 +56176,7 @@ to8to.com to9.org to999.com tobaccobid.com +tobaccochina.com toberp.com tobnews.com tobosu.com @@ -56273,7 +56205,6 @@ toec.com toecsec.com toecsoft.com toecxy.com -tofuelcell.com togj.com togln.com togo666.com @@ -56365,7 +56296,6 @@ tongtongxue.com tongtool.com tongwang.net tongxiang.net -tongxiehui.net tongxin.com tongxin.org tongxinclub.com @@ -56426,6 +56356,7 @@ top2fun.com top301.com top3456.com topacg.com +topber.com topbester.com topbiz360.com topbm.com @@ -56531,6 +56462,7 @@ touid.com toujidao.com touker.com toumiao.com +toupb.com toupiaoapp.com touqikan.com tour110.com @@ -56838,6 +56770,7 @@ tszyzx.com tt-beian.com tt-bike.com tt-ly.com +tt-tz.com tt116114.com tt1386.com tt1h.com @@ -56993,6 +56926,7 @@ tuchong.com tuchong.net tuchuang.org tuchuang001.com +tuchuang188.com tucia.net tucoo.com tudai.cc @@ -57473,7 +57407,6 @@ u2j2ha.com u3dc.com u3dol.com u3v3.com -u4ad.com u51.com u520.net u5h5.com @@ -57695,7 +57628,6 @@ uicool123.com uid75.com uidec.com uidev.tech -uiej.com uigreat.com uihacker.com uiiiuiii.com @@ -57807,6 +57739,8 @@ uncbd.com unccr.com uncle-ad.com uncledesk.com +unclenoway.com +unclenowayapi.com unclicks.com undefined.ltd underfill.cc @@ -57870,7 +57804,6 @@ unitymanual.com universeandart.com uniview.com uniworldart.com -unix-cd.com unix5.com unixfbi.com unixhot.com @@ -58061,7 +57994,7 @@ ustcers.com ustclug.org ustui.com usu8.com -usuhr.com +usuredata.com uszcn.com ut7.com ut8d.com @@ -58081,7 +58014,6 @@ utoper.com utourworld.com utovr.com utransm.com -utv4dtalk.com uu.cc uu.me uu08.net @@ -58233,7 +58165,6 @@ v1pin.com v1tuan.com v1tx.com v2ambition.com -v2box.net v2ex.cc v2geek.com v2kt.com @@ -58318,6 +58249,7 @@ vanrui.com vanterc.com vants.org vapee.com +vapejoin.com vapps.me vaptcha.com vaptcha.net @@ -58671,6 +58603,7 @@ vitian.vip vivantecorp.com vivcms.com vividict.com +vivienrgs.com vivifz.vip vivijk.com viviv.com @@ -58760,7 +58693,6 @@ voldev.net voldp.com volit.com volmoe.com -volt.ink voltmemo.com voltsky.com volumes.cc @@ -58822,6 +58754,7 @@ vqs.com vqudo.com vqudochina.com vqudoshop.com +vqxfj.bar vr-cat.com vr1000.com vr186.com @@ -58848,7 +58781,6 @@ vrsat.com vrshendeng.com vrwuhan.com vrzb.com -vs912.com vsaker.com vsane.com vsbclub.com @@ -58912,7 +58844,6 @@ vutoo.com vuvps.com vux.li vv181.com -vv235.com vv8.com vv881.com vv8yx.com @@ -59114,7 +59045,6 @@ wan95.com wana98.com wanbang365.com wanbaoju.com -wanbenxiaoshuo.net wanbizu.com wancai.com wancaibb.com @@ -59165,7 +59095,6 @@ wangbixi.com wangcaigu.com wangcaio2o.com wangcaiwang.com -wangchao.de wangchuan.wang wangchujiang.com wangchunsheng.com @@ -59196,7 +59125,6 @@ wangfujing.com wangfushipin.com wanggou.com wanggou236.com -wanggouchao.com wanggouyizu.com wangguai.com wanghaida.com @@ -59493,6 +59421,7 @@ wbldjy.com wbljjy.com wbo529.com wbolt.com +wbpluto.com wbpvc.com wbsp.net wbsrf.com @@ -59589,6 +59518,7 @@ weaponx.site weapp.com weapp.me weappdev.com +wearefriendlyfires.com weareqy.com weartrends.com weasing.com @@ -60068,7 +59998,9 @@ wenjuan.cc wenjuan.com wenjuan.in wenjuan.link +wenjuan.ltd wenjuan.net +wenjuan.pub wenjuanba.com wenjuanshow.com wenjunjiang.win @@ -60138,6 +60070,7 @@ wenzhaihui.com wenzhangba.com wenzhanghui.com wenzhen8.com +wenzhengwenhua.com wenzhousx.com wenzidi.com wepiao.com @@ -60264,7 +60197,6 @@ wh-haipu.com wh-motorshow.com wh-mx.com wh10000.com -wh10001.com wh100idc.com wh111.com wh119.com @@ -60518,7 +60450,6 @@ whssni.com whssxpx.com whsunmap.com whsw.net -whsxsd.com whsxt.com whsy.org whsyy.net @@ -60722,7 +60653,6 @@ winapp111.mobi winasdaq.com winbaicai.com winbaoxian.com -winbei.com winbic.com winbjb.com winbond-ic.com @@ -60838,6 +60768,7 @@ wisiyilink.com wismom.com wisrc.com wistone.com +wit-parking.com wit0.com wit5.com witchspring.com @@ -60985,7 +60916,6 @@ wmgm.org wmiao.com wmiyx.com wmjk.net -wmjqcl.com wmjrc.com wmjygg.net wmjyqd.net @@ -61115,7 +61045,6 @@ wokugame.com wolai.com wolaidai.com wolegou.net -woleya.com wolezhibo.com wolf.cc wolfcstech.com @@ -61234,6 +61163,7 @@ worldmsports.com worldofai.com worldpathclinic.com worldpia.net +worldpowerliftingchina.com worldsocks.com worlduc.com worldui.com @@ -61621,6 +61551,7 @@ wulannews.com wuliaoo.com wuliaosi.com wuliapi.com +wulicdn.com wulinsoso.com wuliujia2018.com wulong365.com @@ -61721,6 +61652,7 @@ wuzhiwei.net wuzhouqianzheng.com wuziya.com wuzongping.com +wvbtech.com wvshare.com ww2bbs.net wwaaffxx.com @@ -61789,6 +61721,7 @@ www000377.com www045789.com www1.djicdn.com www2.djicdn.com +www2011india.com www3.djicdn.com www37430.com www4.djicdn.com @@ -61865,6 +61798,7 @@ wxiao.net wxjx123.com wxjxyb.com wxjyql.com +wxlagame.com wxlongre.com wxlss.com wxlvxin.com @@ -61917,7 +61851,6 @@ wycntv.com wydbw.com wydljx.com wydns.com -wygdu.com wying360.com wyins.net wykefu.com @@ -61942,6 +61875,7 @@ wysww.vip wytfsp.com wytx.net wytype.com +wyuetec.com wywy6.com wywyx.com wyx365.com @@ -62016,7 +61950,6 @@ x-jishu.com x-medex.com x-mol.com x-plans.com -x-ssp.com x0431.com x0769.com x118.net @@ -62259,7 +62192,6 @@ xctmr.com xctsw.com xcvgame.cc xcvmbyte.com -xcx1024.com xcxs222.com xcxs520.com xcxs9.com @@ -62286,6 +62218,7 @@ xdcdn.net xddex.com xddhy.com xddpay.com +xddxs.cc xddxx102.com xde.com xde6.net @@ -62373,7 +62306,6 @@ xf24ms.com xf3z.com xf4hs.com xf5z.com -xf9168.com xfabs.com xfannix.com xfb315.com @@ -62394,7 +62326,6 @@ xfjunpin.com xfjw.net xfkou.com xfliusheng.com -xfmoney.com xfnano.com xfocus.net xfocus.org @@ -62650,7 +62581,6 @@ xianshuabao.com xianshufang.com xiantao.com xianwangs.cc -xianwangx.com xianxia.pro xianxiadao.com xianxiadao.net @@ -62681,7 +62611,6 @@ xiaoacha.com xiaobai.com xiaobaibk.com xiaobaidj.com -xiaobaifile.com xiaobaijidi.net xiaobaipan.com xiaobaishiji.com @@ -62742,7 +62671,6 @@ xiaofeng.org xiaogan.com xiaogouh5.com xiaogr.com -xiaoguandao.wang xiaoguikuaipao.com xiaoguowenhua.com xiaogushi.com @@ -62920,6 +62848,7 @@ xiaoshuotxt.com xiaoshuotxt.org xiaoshuoyd.com xiaoshuozu.com +xiaoshuwu.vip xiaoshuxiong.com xiaositv.com xiaoso.net @@ -62968,7 +62897,6 @@ xiaoxue123.com xiaoxuehelp.com xiaoyantong.com xiaoyaobi.com -xiaoyaojing.tv xiaoyaoyou.com xiaoyaoyou365.com xiaoyatong.com @@ -62982,6 +62910,7 @@ xiaoying.co xiaoying.com xiaoying.tv xiaoyiwo.net +xiaoyoucaip2p.com xiaoyouxi100.com xiaoyouxiqun.com xiaoyu.com @@ -63058,7 +62987,6 @@ xiazaisoft.com xiazaiziti.com xibaiwang.com xibao100.com -xibei70.com xibeicanyin.com xibeidev.com xibsteel.com @@ -63183,6 +63111,7 @@ xima.tv ximalaya.com ximalayaos.com ximgs.net +ximiplay.com ximiued.com ximiyouxi.com ximizi.com @@ -63500,7 +63429,6 @@ xinyegang.com xinyelianmeng.com xinyicms.com xinyifu.net -xinyiqi.net xinyisemi.com xinyitt.com xinyo100.com @@ -63531,6 +63459,7 @@ xiongdayq.com xiongdong.com xiongmao666.com xiongmaojinku.com +xiongmaopan.com xiongmaoxingyan.com xiongyin.com xiongying.com @@ -63598,7 +63527,6 @@ xiudodo.com xiufaxing.com xiugei.com xiugu.com -xiuhaoli.com xiuhome.com xiuimg.com xiujiadian.com @@ -63665,7 +63593,6 @@ xiyouchat.com xiyoucts.net xiyouence.com xiyouji.com -xiyoulinux.org xiyouo.com xiyouquan.com xiyousdk.com @@ -63736,7 +63663,6 @@ xjiuai.com xjjjb.com xjjnjp.org xjjxc.com -xjkrq.com xjkwm.com xjltp.com xjlxw.com @@ -63766,7 +63692,6 @@ xjxy.com xjy415.net xjyaxin.com xjyqly.com -xjysq.com xjytjt.com xjzdjx.com xjzkzx.com @@ -63909,7 +63834,6 @@ xmsmjk.com xmsoft.com xmspace.net xmsunyoung.com -xmt516.com xmtbang.com xmtekic.com xmtiaozhuan.com @@ -63941,6 +63865,7 @@ xn--2qux23c9ziyrq.plus xn--2qux23c9ziyrq.video xn--2qux23confgml.club xn--2qux23confgml.online +xn--3bs795g.link xn--3bs795g.zone xn--48s290ajcu2tzl891isd3anfh.com xn--4gqqc629gbju.com @@ -63951,6 +63876,8 @@ xn--7hv285el2dtof.com xn--8tw.com xn--9kq745jwng.ink xn--ddua45lfy1c.ink +xn--dkr447bejn.com +xn--dkr447bejn.net xn--e9qp53aepg.xn--ses554g xn--ebr05n.com xn--eqrt2g.xn--vuq861b @@ -63959,7 +63886,6 @@ xn--fiqz7g67bsydx1ed00d.com xn--fjqz50cv5q3so.ltd xn--fjqz50cv5q3so.online xn--glr604k.com -xn--gtv651d.com xn--hgvp6a86z.xn--6qq986b3xl xn--i7qt52bvsr0u0a.com xn--it-1r3f.com @@ -64014,6 +63940,7 @@ xnszsjgyey.com xntt.com xntv.tv xnw.com +xnwan.com xnwx2014.net xnxin.com xny365.com @@ -64126,7 +64053,6 @@ xsb120.com xsbashi.net xsbiquge.com xsbiqugew.com -xsbjw.com xscbs.com xschu.com xsdwk.com @@ -64268,6 +64194,7 @@ xuanwonainiu.com xuanwu88.com xuanwuhuijeushiwu.com xuanwumobile.com +xuanxiu.cc xuanxuan.com xuanxuangame.com xuanxuantemai.com @@ -64571,7 +64498,6 @@ xxkt.org xxlcn.com xxlinux.com xxliudsp.com -xxlpage.com xxlwin.com xxmac.com xxmanhua.info @@ -64654,6 +64580,7 @@ xyfw.org xygjg.com xygjx.com xygmed.com +xygyhd.org xyhc.com xyhis.com xyhlcd.com @@ -64938,7 +64865,6 @@ yangyi02.com yangyi08.com yangyingming.com yangyongquan.com -yangyoulin.com yangyq.net yangzhe1991.org yangzhi.net @@ -65116,7 +65042,6 @@ ybvv.com ybword.com ybwzx.com ybxww.com -ybytlsq.com ybzhao.com ybzkb.com yc.cc @@ -65229,7 +65154,6 @@ ye.com ye1992.com ye3.com ye40.com -ye85diy.com yea.im yead.net yeah.net @@ -65344,6 +65268,7 @@ yexinggroup.com yeyaji9.com yeyday.com yeyetech.net +yeyezw.com yeyo.cc yeyou.com yeyoucdn.com @@ -65439,6 +65364,7 @@ yhj2000.com yhj9.com yhjbox.com yhjdcom.com +yhkgas.com yhkingdee.com yhlbbs.com yhm11.com @@ -65511,7 +65437,6 @@ yiche.com yichemall.com yichengzhicheng.com yichesafe.com -yichijing.com yichuyifan.com yiclear.com yicongfound.org @@ -65922,6 +65847,7 @@ yiruantong.com yiruanwang.com yiruide.com yiruikecorp.com +yiruituo.com yisa.com yisafe.co yisanban.com @@ -66094,6 +66020,7 @@ yjpal.com yjq.cc yjqiqi.com yjrcyw.com +yjren3gc.tw yjro.com yjrzj.com yjs-cdn.com @@ -66132,17 +66059,14 @@ ykt.io yktworld.com yktz.net ykyao.com -ykycy.com ykzr.com yl1001.com yl114.cc yl177.com yladm.com ylallinone.com -ylangroup.com ylbgw1.com yld360.com -yldcc.com yldh.cc ylfx.com ylg877.com @@ -66313,7 +66237,6 @@ yochoi.com yocyxc.com yodak.net yodakgroup.com -yodamob.com yodao.com yodbank.com yodo1.com @@ -66372,6 +66295,7 @@ yongheng0852.com yonghongtech.com yonghuigj.com yonghuivip.com +yongjiu8.com yongkao.com yonglang.co yonglongdai.com @@ -66380,6 +66304,7 @@ yongqiaonews.com yongqischool.net yongshei.com yongsheng-sl.com +yongshikj.com yongsy.com yongtu.net yongxinby.com @@ -66420,6 +66345,7 @@ yoozai.com yoozhe.com yopai.com yoperp.com +yopoint.cc yopoint.com yoptech.com yopwefun.com @@ -66528,7 +66454,6 @@ youkua.net youkudou.com youkudown.com youkutv.cc -youlai88.com youlanw.com youle55.com youleliwu.com @@ -66553,7 +66478,6 @@ youme.im youmeek.com youmeng.me youmengchuangxiang.com -youmengkm.com youmenr.com youmew.com youmi.net @@ -66943,7 +66867,6 @@ ytdcgg.com ytdiy8.net ytdongsheng.com ytdsdz.com -yteden.com ytesting.com ytet.org ytfuzhen.com @@ -66960,10 +66883,8 @@ ytmxny.com ytnetgame.com ytoexpress.com ytoglobal.com -ytoscm.com ytoxl.com ytpp.com -ytpzyc.com ytrenyu.com ytsanchuan.com ytsjw.net @@ -67318,6 +67239,7 @@ yunhaicangshu.com yunhaike.com yunhaiqiao.com yunhedata.com +yunheit.com yunheka.com yunhesanwan.com yunhetong.com @@ -67360,7 +67282,6 @@ yunliaoim.com yunlie.net yunlietou.com yunliketech.com -yunlu6.com yunmai.com yunmayi.com yunmeipai.com @@ -67464,7 +67385,6 @@ yunzhixiyou.com yunzhizao.net yunzmall.com yunzz.net -yupian.net yupiao.info yupoo.com yupsky.com @@ -67612,6 +67532,7 @@ yxdaily.com yxdd.com yxdgc.com yxdh.com +yxdm.tv yxdown.com yxdr.com yxdsgs.com @@ -67756,7 +67677,6 @@ yyste.com yysweb.com yysycn.com yytcdn.com -yytd66.com yytek.com yytgjjk.com yytingli.com @@ -67986,7 +67906,6 @@ zbgsw.com zbhouse.com zbii.com zbintel.com -zbiptv.xyz zbird.com zbj.com zbjdev.com @@ -68007,7 +67926,6 @@ zbopr.net zbqlm.com zbqzy.com zbrushcn.com -zbtytd.wang zbuhe.com zbusa.com zbwbbs.com @@ -68049,7 +67967,6 @@ zcit.net zcitidc.com zcitwf.com zciv.com -zcjiaorouji.com zcjxedu.com zcm99.com zcmlc.com @@ -68079,7 +67996,6 @@ zcwz.com zcxn.com zcyitang.com zcyiyao.com -zcyttech.com zczj.com zczy001.com zd-power.com @@ -68145,7 +68061,6 @@ zealer.com zeali.net zealquest.com zealsafe.net -zealyst.com zebred.com zechoriah.com zechunbengye.com @@ -68153,7 +68068,6 @@ zeelis.com zego.im zeguoren.com zeidei.com -zeigao.net zeisp.com zeixihuan.com zejiri.net @@ -68402,7 +68316,6 @@ zgwxbbs.com zgwygl.org zgxcfx.com zgxga.com -zgxht.com zgxk.org zgxqwqh.com zgxrjy.com @@ -68478,6 +68391,7 @@ zhangdongshengtech.com zhangdongxuan.com zhangdu5.net zhangdu520.com +zhange8.com zhangfen.com zhangfensir.com zhanggang.net @@ -68726,7 +68640,6 @@ zhenhaojituan.com zhenhaotao.com zhenhaotv.com zhenhong56.com -zhenhua.xyz zhenhuajn.xin zhenhuan888.com zhenimg.com @@ -69012,6 +68925,7 @@ zhizhucms.com zhizhuwu.com zhizhuyx.com zhizihuan.com +zhizihuan.net zhiziyun.com zhizunbo.com zhizuncn.com @@ -69029,7 +68943,6 @@ zhjs.cc zhjtong.com zhjypco.com zhk.me -zhkaka.com zhku.com zhl.com zhld.com @@ -69085,7 +68998,6 @@ zhongguoseo.net zhongguosou.com zhongguotiyucaipiao.com zhongguowangshi.com -zhongguoweishang.org zhongguoxianhua.com zhongguoyimin.net zhongguoym.com @@ -69135,6 +69047,7 @@ zhongqixin360.com zhongrenbang.cc zhongrongjz.com zhongruigang.com +zhongruihuacheng.com zhongruitech.com zhongshang114.com zhongshanpark.com @@ -69522,7 +69435,6 @@ zihua01.com ziiai.com ziipoo.com ziisp.com -ziiyan.com ziji.cc zijiayouly.com zijie.com @@ -69534,6 +69446,7 @@ zijinji.com zijinjubao.net zijinsuo.com zijiren.net +zijishanghui.com zijizhang.com zikao-zikao.com zikao.gd @@ -69718,7 +69631,6 @@ zjgmsw.com zjgqt.org zjgrrb.com zjgslb.com -zjgsq.com zjgt.com zjguji.com zjgwy.org @@ -69769,7 +69681,6 @@ zjkings.com zjknews.com zjkonline.com zjks.com -zjlanbi.com zjldrcb.com zjlottery.com zjlvjie.com @@ -69794,7 +69705,6 @@ zjpubservice.com zjqimeng.com zjqk110.com zjqyjy.com -zjqyltlg.com zjrc.com zjrc.net zjrjks.org @@ -69877,6 +69787,7 @@ zkuyun.com zkx.cc zkxblog.com zkxlkj.net +zkxsw.com zkxww.com zkyouxi.com zkyxls.com @@ -70258,7 +70169,6 @@ ztestin.com ztfans.com ztfssc.com ztgame.com -ztganme.com ztgy.org zthxcf.com ztinfoga.com @@ -70482,7 +70392,6 @@ zwjscl.com zwkf.net zwkj7.com zwoptical.com -zwshe.com zwtianshangm.com zwtkl8.com zwtxipr.com @@ -70510,7 +70419,6 @@ zx8.cc zx98.com zxamq.com zxbaopeng.com -zxbcl.wang zxblinux.com zxbzr.com zxclqw.com @@ -70572,7 +70480,6 @@ zxwyouxi.com zxxk.com zxxww.com zxxxkj.com -zxycj.wang zxzhijia.com zxzj.me zxzjs.com @@ -70621,6 +70528,7 @@ zyhot.com zyiis.com zyiis.net zyip.com +zyjoygame.com zyjyyun.com zykjgame.com zyku.net @@ -70692,7 +70600,6 @@ zzbtv.com zzcangzhou.com zzccom.com zzccyq1.com -zzclfp.wang zzcm1.com zzcm2.com zzcm5.com @@ -70784,7 +70691,6 @@ zzyjsmba.com zzyzan.com zzyzphoto.com zzz4.com -zzzccwyy.com zzzdm.com zzzhisou.com zzzj.com diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute index 3dd6c3aee6..1cf31d92de 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute @@ -3951,7 +3951,6 @@ 103.144.66.0/23 103.144.70.0/23 103.144.72.0/23 -103.144.88.0/24 103.144.108.0/23 103.144.136.0/23 103.144.148.0/23 @@ -3986,7 +3985,6 @@ 103.147.124.0/23 103.147.198.0/23 103.147.206.0/23 -103.147.211.0/24 103.148.174.0/23 103.149.6.0/23 103.149.17.0/24 @@ -4129,6 +4127,10 @@ 103.162.32.0/23 103.162.38.0/23 103.162.116.0/23 +103.163.28.0/23 +103.163.32.0/23 +103.163.46.0/23 +103.163.74.0/23 103.192.0.0/22 103.192.4.0/22 103.192.8.0/22 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute6 b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute6 index 334b602d9b..b7e10a967b 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute6 +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute6 @@ -27,7 +27,6 @@ 2001:df0:4500::/48 2001:df0:5d00::/48 2001:df0:5d01::/48 -2001:df0:5d80::/48 2001:df0:9a00::/48 2001:df0:b180::/48 2001:df0:bf80::/48 @@ -41,7 +40,6 @@ 2001:df1:6b80::/48 2001:df1:8b00::/48 2001:df1:a100::/48 -2001:df1:b980::/48 2001:df1:bd80::/48 2001:df1:c900::/48 2001:df1:d100::/48 @@ -1775,6 +1773,8 @@ 2407:1e80::/32 2407:2280::/32 2407:2380::/32 +2407:23c0::/32 +2407:2440::/32 2407:2780::/32 2407:3700::/32 2407:3900::/32 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf index ef7f32c0bf..ac0f8539c6 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf @@ -32,8 +32,8 @@ server=/.sapikachu.net/127.0.0.1#7913 ipset=/.sapikachu.net/gfwlist server=/.de-sci.org/127.0.0.1#7913 ipset=/.de-sci.org/gfwlist -server=/.discordapp.net/127.0.0.1#7913 -ipset=/.discordapp.net/gfwlist +server=/.shadowsocks9.com/127.0.0.1#7913 +ipset=/.shadowsocks9.com/gfwlist server=/.seezone.net/127.0.0.1#7913 ipset=/.seezone.net/gfwlist server=/.igotmail.com.tw/127.0.0.1#7913 @@ -118,8 +118,8 @@ server=/.truebuddha-md.org/127.0.0.1#7913 ipset=/.truebuddha-md.org/gfwlist server=/.vanpeople.com/127.0.0.1#7913 ipset=/.vanpeople.com/gfwlist -server=/.wsgzao.github.io/127.0.0.1#7913 -ipset=/.wsgzao.github.io/gfwlist +server=/.falunart.org/127.0.0.1#7913 +ipset=/.falunart.org/gfwlist server=/.amnesty.org/127.0.0.1#7913 ipset=/.amnesty.org/gfwlist server=/.domains.google/127.0.0.1#7913 @@ -128,8 +128,8 @@ server=/.d3c33hcgiwev3.cloudfront.net/127.0.0.1#7913 ipset=/.d3c33hcgiwev3.cloudfront.net/gfwlist server=/.hechaji.com/127.0.0.1#7913 ipset=/.hechaji.com/gfwlist -server=/.ippotv.com/127.0.0.1#7913 -ipset=/.ippotv.com/gfwlist +server=/.mog.com/127.0.0.1#7913 +ipset=/.mog.com/gfwlist server=/.wheelockslatin.com/127.0.0.1#7913 ipset=/.wheelockslatin.com/gfwlist server=/.dotplane.com/127.0.0.1#7913 @@ -192,8 +192,8 @@ server=/.nordstrom.com/127.0.0.1#7913 ipset=/.nordstrom.com/gfwlist server=/.taiwannation.50webs.com/127.0.0.1#7913 ipset=/.taiwannation.50webs.com/gfwlist -server=/.dailidaili.com/127.0.0.1#7913 -ipset=/.dailidaili.com/gfwlist +server=/.my.pcloud.com/127.0.0.1#7913 +ipset=/.my.pcloud.com/gfwlist server=/.laoyang.info/127.0.0.1#7913 ipset=/.laoyang.info/gfwlist server=/.coinbene.com/127.0.0.1#7913 @@ -216,8 +216,8 @@ server=/.177pic.info/127.0.0.1#7913 ipset=/.177pic.info/gfwlist server=/.video.pbs.org/127.0.0.1#7913 ipset=/.video.pbs.org/gfwlist -server=/.cbsnews.com/127.0.0.1#7913 -ipset=/.cbsnews.com/gfwlist +server=/.bestvpnanalysis.com/127.0.0.1#7913 +ipset=/.bestvpnanalysis.com/gfwlist server=/.hotpornshow.com/127.0.0.1#7913 ipset=/.hotpornshow.com/gfwlist server=/.devio.us/127.0.0.1#7913 @@ -324,8 +324,8 @@ server=/.mirrorbooks.com/127.0.0.1#7913 ipset=/.mirrorbooks.com/gfwlist server=/.nytimes.map.fastly.net/127.0.0.1#7913 ipset=/.nytimes.map.fastly.net/gfwlist -server=/.kkbox.com/127.0.0.1#7913 -ipset=/.kkbox.com/gfwlist +server=/.bcex.ca/127.0.0.1#7913 +ipset=/.bcex.ca/gfwlist server=/.thomasbernhard.org/127.0.0.1#7913 ipset=/.thomasbernhard.org/gfwlist server=/.msha.gov/127.0.0.1#7913 @@ -350,8 +350,8 @@ server=/.finler.net/127.0.0.1#7913 ipset=/.finler.net/gfwlist server=/.innermongolia.org/127.0.0.1#7913 ipset=/.innermongolia.org/gfwlist -server=/.al-qimmah.net/127.0.0.1#7913 -ipset=/.al-qimmah.net/gfwlist +server=/.hizbuttahrir.org/127.0.0.1#7913 +ipset=/.hizbuttahrir.org/gfwlist server=/.ddns.us/127.0.0.1#7913 ipset=/.ddns.us/gfwlist server=/.spike.com/127.0.0.1#7913 @@ -420,8 +420,8 @@ server=/.yobit.net/127.0.0.1#7913 ipset=/.yobit.net/gfwlist server=/.fuyin.net/127.0.0.1#7913 ipset=/.fuyin.net/gfwlist -server=/.freemorenews.com/127.0.0.1#7913 -ipset=/.freemorenews.com/gfwlist +server=/.www.kindleren.com/127.0.0.1#7913 +ipset=/.www.kindleren.com/gfwlist server=/.freakshare.com/127.0.0.1#7913 ipset=/.freakshare.com/gfwlist server=/.livingonline.us/127.0.0.1#7913 @@ -516,8 +516,8 @@ server=/.friendfeed-media.com/127.0.0.1#7913 ipset=/.friendfeed-media.com/gfwlist server=/.overplay.net/127.0.0.1#7913 ipset=/.overplay.net/gfwlist -server=/.encyclopedia.com/127.0.0.1#7913 -ipset=/.encyclopedia.com/gfwlist +server=/.www.cmoinc.org/127.0.0.1#7913 +ipset=/.www.cmoinc.org/gfwlist server=/.lemonde.fr/127.0.0.1#7913 ipset=/.lemonde.fr/gfwlist server=/.fpmt-osel.org/127.0.0.1#7913 @@ -530,12 +530,12 @@ server=/.strongvpn.com/127.0.0.1#7913 ipset=/.strongvpn.com/gfwlist server=/.wo.tc/127.0.0.1#7913 ipset=/.wo.tc/gfwlist -server=/.ddns.net/127.0.0.1#7913 -ipset=/.ddns.net/gfwlist +server=/.alliance.org.hk/127.0.0.1#7913 +ipset=/.alliance.org.hk/gfwlist server=/.serveuser.com/127.0.0.1#7913 ipset=/.serveuser.com/gfwlist -server=/.lizhizhuangbi.com/127.0.0.1#7913 -ipset=/.lizhizhuangbi.com/gfwlist +server=/.jav.com/127.0.0.1#7913 +ipset=/.jav.com/gfwlist server=/.goo.gl/127.0.0.1#7913 ipset=/.goo.gl/gfwlist server=/.twerkingbutt.com/127.0.0.1#7913 @@ -562,8 +562,8 @@ server=/.easyca.ca/127.0.0.1#7913 ipset=/.easyca.ca/gfwlist server=/.google.it/127.0.0.1#7913 ipset=/.google.it/gfwlist -server=/.emulefans.com/127.0.0.1#7913 -ipset=/.emulefans.com/gfwlist +server=/.static.shemalez.com/127.0.0.1#7913 +ipset=/.static.shemalez.com/gfwlist server=/.dns2.us/127.0.0.1#7913 ipset=/.dns2.us/gfwlist server=/.chapm25.com/127.0.0.1#7913 @@ -638,8 +638,8 @@ server=/.uwants.com/127.0.0.1#7913 ipset=/.uwants.com/gfwlist server=/.itweet.net/127.0.0.1#7913 ipset=/.itweet.net/gfwlist -server=/.cahr.org.tw/127.0.0.1#7913 -ipset=/.cahr.org.tw/gfwlist +server=/.hkcmi.edu/127.0.0.1#7913 +ipset=/.hkcmi.edu/gfwlist server=/.amazon.com/127.0.0.1#7913 ipset=/.amazon.com/gfwlist server=/.dalailamacenter.org/127.0.0.1#7913 @@ -674,8 +674,8 @@ server=/.twiends.com/127.0.0.1#7913 ipset=/.twiends.com/gfwlist server=/.padmanet.com/127.0.0.1#7913 ipset=/.padmanet.com/gfwlist -server=/.blog.daum.net/127.0.0.1#7913 -ipset=/.blog.daum.net/gfwlist +server=/.bibox.com/127.0.0.1#7913 +ipset=/.bibox.com/gfwlist server=/.helplinfen.com/127.0.0.1#7913 ipset=/.helplinfen.com/gfwlist server=/.brandonhutchinson.com/127.0.0.1#7913 @@ -692,8 +692,8 @@ server=/.bbs.mychat.to/127.0.0.1#7913 ipset=/.bbs.mychat.to/gfwlist server=/.proxy.org/127.0.0.1#7913 ipset=/.proxy.org/gfwlist -server=/.cusu.hk/127.0.0.1#7913 -ipset=/.cusu.hk/gfwlist +server=/.googlemail.com/127.0.0.1#7913 +ipset=/.googlemail.com/gfwlist server=/.mohu.club/127.0.0.1#7913 ipset=/.mohu.club/gfwlist server=/.standupfortibet.org/127.0.0.1#7913 @@ -714,8 +714,8 @@ server=/.getfoxyproxy.org/127.0.0.1#7913 ipset=/.getfoxyproxy.org/gfwlist server=/.twtrland.com/127.0.0.1#7913 ipset=/.twtrland.com/gfwlist -server=/.playpcesor.com/127.0.0.1#7913 -ipset=/.playpcesor.com/gfwlist +server=/.pornmm.net/127.0.0.1#7913 +ipset=/.pornmm.net/gfwlist server=/.vod-abematv.akamaized.net/127.0.0.1#7913 ipset=/.vod-abematv.akamaized.net/gfwlist server=/.data.flurry.com/127.0.0.1#7913 @@ -748,22 +748,22 @@ server=/.tibetanfeministcollective.org/127.0.0.1#7913 ipset=/.tibetanfeministcollective.org/gfwlist server=/.news.omy.sg/127.0.0.1#7913 ipset=/.news.omy.sg/gfwlist -server=/.macrovpn.com/127.0.0.1#7913 -ipset=/.macrovpn.com/gfwlist +server=/.mingjinglishi.com/127.0.0.1#7913 +ipset=/.mingjinglishi.com/gfwlist server=/.roboforex.com/127.0.0.1#7913 ipset=/.roboforex.com/gfwlist server=/.cnineu.com/127.0.0.1#7913 ipset=/.cnineu.com/gfwlist -server=/.hideman.net/127.0.0.1#7913 -ipset=/.hideman.net/gfwlist +server=/.cao.im/127.0.0.1#7913 +ipset=/.cao.im/gfwlist server=/.fc2blog.net/127.0.0.1#7913 ipset=/.fc2blog.net/gfwlist server=/.eroprofile.com/127.0.0.1#7913 ipset=/.eroprofile.com/gfwlist server=/.lionsroar.com/127.0.0.1#7913 ipset=/.lionsroar.com/gfwlist -server=/.rg3.github.io/127.0.0.1#7913 -ipset=/.rg3.github.io/gfwlist +server=/.eyevio.jp/127.0.0.1#7913 +ipset=/.eyevio.jp/gfwlist server=/.waymo.com/127.0.0.1#7913 ipset=/.waymo.com/gfwlist server=/.video.aol.com/127.0.0.1#7913 @@ -792,8 +792,8 @@ server=/.angela-merkel.de/127.0.0.1#7913 ipset=/.angela-merkel.de/gfwlist server=/.chinasucks.net/127.0.0.1#7913 ipset=/.chinasucks.net/gfwlist -server=/.ndr.de/127.0.0.1#7913 -ipset=/.ndr.de/gfwlist +server=/.hakkatv.org.tw/127.0.0.1#7913 +ipset=/.hakkatv.org.tw/gfwlist server=/.mx981.com/127.0.0.1#7913 ipset=/.mx981.com/gfwlist server=/.cecc.gov/127.0.0.1#7913 @@ -884,8 +884,8 @@ server=/.urbansurvival.com/127.0.0.1#7913 ipset=/.urbansurvival.com/gfwlist server=/.abc.xyz/127.0.0.1#7913 ipset=/.abc.xyz/gfwlist -server=/.bastillepost.com/127.0.0.1#7913 -ipset=/.bastillepost.com/gfwlist +server=/.airvpn.org/127.0.0.1#7913 +ipset=/.airvpn.org/gfwlist server=/.serveusers.com/127.0.0.1#7913 ipset=/.serveusers.com/gfwlist server=/.metrolife.ca/127.0.0.1#7913 @@ -930,10 +930,10 @@ server=/.googlehosted.com/127.0.0.1#7913 ipset=/.googlehosted.com/gfwlist server=/.foxgay.com/127.0.0.1#7913 ipset=/.foxgay.com/gfwlist -server=/.jukujo-club.com/127.0.0.1#7913 -ipset=/.jukujo-club.com/gfwlist -server=/.5278.cc/127.0.0.1#7913 -ipset=/.5278.cc/gfwlist +server=/.band.us/127.0.0.1#7913 +ipset=/.band.us/gfwlist +server=/.tfhub.dev/127.0.0.1#7913 +ipset=/.tfhub.dev/gfwlist server=/.yorkbbs.ca/127.0.0.1#7913 ipset=/.yorkbbs.ca/gfwlist server=/.sourcewadio.com/127.0.0.1#7913 @@ -1022,8 +1022,8 @@ server=/.citypopulation.de/127.0.0.1#7913 ipset=/.citypopulation.de/gfwlist server=/.bolehvpn.net/127.0.0.1#7913 ipset=/.bolehvpn.net/gfwlist -server=/.khmusic.com.tw/127.0.0.1#7913 -ipset=/.khmusic.com.tw/gfwlist +server=/.friendfeed.com/127.0.0.1#7913 +ipset=/.friendfeed.com/gfwlist server=/.sendspace.com/127.0.0.1#7913 ipset=/.sendspace.com/gfwlist server=/.ismprofessional.net/127.0.0.1#7913 @@ -1044,8 +1044,8 @@ server=/.sadistic-v.com/127.0.0.1#7913 ipset=/.sadistic-v.com/gfwlist server=/.weijingsheng.org/127.0.0.1#7913 ipset=/.weijingsheng.org/gfwlist -server=/.chinadialogue.net/127.0.0.1#7913 -ipset=/.chinadialogue.net/gfwlist +server=/.if.ttt/127.0.0.1#7913 +ipset=/.if.ttt/gfwlist server=/.insidevoa.com/127.0.0.1#7913 ipset=/.insidevoa.com/gfwlist server=/.iphone4hongkong.com/127.0.0.1#7913 @@ -1070,8 +1070,8 @@ server=/.geocities.co.jp/127.0.0.1#7913 ipset=/.geocities.co.jp/gfwlist server=/.ugo.com/127.0.0.1#7913 ipset=/.ugo.com/gfwlist -server=/.old-cat.net/127.0.0.1#7913 -ipset=/.old-cat.net/gfwlist +server=/.biliworld.com/127.0.0.1#7913 +ipset=/.biliworld.com/gfwlist server=/.furbo.org/127.0.0.1#7913 ipset=/.furbo.org/gfwlist server=/.ukliferadio.co.uk/127.0.0.1#7913 @@ -1088,8 +1088,8 @@ server=/.gs-discuss.com/127.0.0.1#7913 ipset=/.gs-discuss.com/gfwlist server=/.fring.com/127.0.0.1#7913 ipset=/.fring.com/gfwlist -server=/.jingpin.org/127.0.0.1#7913 -ipset=/.jingpin.org/gfwlist +server=/.api-verify.recaptcha.net/127.0.0.1#7913 +ipset=/.api-verify.recaptcha.net/gfwlist server=/.sethwklein.net/127.0.0.1#7913 ipset=/.sethwklein.net/gfwlist server=/.freechina.net/127.0.0.1#7913 @@ -1130,8 +1130,8 @@ server=/.tibetonline.com/127.0.0.1#7913 ipset=/.tibetonline.com/gfwlist server=/.penchinese.net/127.0.0.1#7913 ipset=/.penchinese.net/gfwlist -server=/.icu-project.org/127.0.0.1#7913 -ipset=/.icu-project.org/gfwlist +server=/.myav.com.tw/127.0.0.1#7913 +ipset=/.myav.com.tw/gfwlist server=/.pornsharing.com/127.0.0.1#7913 ipset=/.pornsharing.com/gfwlist server=/.openid.net/127.0.0.1#7913 @@ -1152,8 +1152,8 @@ server=/.h-china.org/127.0.0.1#7913 ipset=/.h-china.org/gfwlist server=/.islamtoday.net/127.0.0.1#7913 ipset=/.islamtoday.net/gfwlist -server=/.jbtalks.com/127.0.0.1#7913 -ipset=/.jbtalks.com/gfwlist +server=/.civilhrfront.org/127.0.0.1#7913 +ipset=/.civilhrfront.org/gfwlist server=/.go.nesnode.com/127.0.0.1#7913 ipset=/.go.nesnode.com/gfwlist server=/.tweetymail.com/127.0.0.1#7913 @@ -1188,22 +1188,22 @@ server=/.avdb.tv/127.0.0.1#7913 ipset=/.avdb.tv/gfwlist server=/.forum.my903.com/127.0.0.1#7913 ipset=/.forum.my903.com/gfwlist -server=/.fscked.org/127.0.0.1#7913 -ipset=/.fscked.org/gfwlist +server=/.dotvpn.com/127.0.0.1#7913 +ipset=/.dotvpn.com/gfwlist server=/.epochtimestr.com/127.0.0.1#7913 ipset=/.epochtimestr.com/gfwlist server=/.2017.hk/127.0.0.1#7913 ipset=/.2017.hk/gfwlist server=/.hotvpn.com/127.0.0.1#7913 ipset=/.hotvpn.com/gfwlist -server=/.icfcdn.com/127.0.0.1#7913 -ipset=/.icfcdn.com/gfwlist +server=/.cdpweb.org/127.0.0.1#7913 +ipset=/.cdpweb.org/gfwlist server=/.shopping.com/127.0.0.1#7913 ipset=/.shopping.com/gfwlist server=/.mullvad.net/127.0.0.1#7913 ipset=/.mullvad.net/gfwlist -server=/.meshrep.com/127.0.0.1#7913 -ipset=/.meshrep.com/gfwlist +server=/.chubold.com/127.0.0.1#7913 +ipset=/.chubold.com/gfwlist server=/.cgdepot.org/127.0.0.1#7913 ipset=/.cgdepot.org/gfwlist server=/.desipro.de/127.0.0.1#7913 @@ -1218,8 +1218,8 @@ server=/.penisbot.com/127.0.0.1#7913 ipset=/.penisbot.com/gfwlist server=/.freeilhamtohti.org/127.0.0.1#7913 ipset=/.freeilhamtohti.org/gfwlist -server=/.break.com/127.0.0.1#7913 -ipset=/.break.com/gfwlist +server=/.video.aol.ca/127.0.0.1#7913 +ipset=/.video.aol.ca/gfwlist server=/.twitlonger.com/127.0.0.1#7913 ipset=/.twitlonger.com/gfwlist server=/.bbkz.com/127.0.0.1#7913 @@ -1280,8 +1280,8 @@ server=/.socks-proxy.net/127.0.0.1#7913 ipset=/.socks-proxy.net/gfwlist server=/.tweetbackup.com/127.0.0.1#7913 ipset=/.tweetbackup.com/gfwlist -server=/.hideme.nl/127.0.0.1#7913 -ipset=/.hideme.nl/gfwlist +server=/.material.io/127.0.0.1#7913 +ipset=/.material.io/gfwlist server=/.tma.co.jp/127.0.0.1#7913 ipset=/.tma.co.jp/gfwlist server=/.to-porno.com/127.0.0.1#7913 @@ -1348,12 +1348,10 @@ server=/.chinacitynews.be/127.0.0.1#7913 ipset=/.chinacitynews.be/gfwlist server=/.xcafe.in/127.0.0.1#7913 ipset=/.xcafe.in/gfwlist -server=/.kyohk.net/127.0.0.1#7913 -ipset=/.kyohk.net/gfwlist +server=/.widevine.com/127.0.0.1#7913 +ipset=/.widevine.com/gfwlist server=/.watchinese.com/127.0.0.1#7913 ipset=/.watchinese.com/gfwlist -server=/.limbopro.github.io/127.0.0.1#7913 -ipset=/.limbopro.github.io/gfwlist server=/.pride.google/127.0.0.1#7913 ipset=/.pride.google/gfwlist server=/.archive.fo/127.0.0.1#7913 @@ -1378,8 +1376,8 @@ server=/.unirule.cloud/127.0.0.1#7913 ipset=/.unirule.cloud/gfwlist server=/.wezhiyong.org/127.0.0.1#7913 ipset=/.wezhiyong.org/gfwlist -server=/.androidtv.com/127.0.0.1#7913 -ipset=/.androidtv.com/gfwlist +server=/.change.org/127.0.0.1#7913 +ipset=/.change.org/gfwlist server=/.top10vpn.com/127.0.0.1#7913 ipset=/.top10vpn.com/gfwlist server=/.freegao.com/127.0.0.1#7913 @@ -1400,8 +1398,8 @@ server=/.antiwave.net/127.0.0.1#7913 ipset=/.antiwave.net/gfwlist server=/.tracfone.com/127.0.0.1#7913 ipset=/.tracfone.com/gfwlist -server=/.cenews.eu/127.0.0.1#7913 -ipset=/.cenews.eu/gfwlist +server=/.ipalter.com/127.0.0.1#7913 +ipset=/.ipalter.com/gfwlist server=/.sumrando.com/127.0.0.1#7913 ipset=/.sumrando.com/gfwlist server=/.chinayouth.org.hk/127.0.0.1#7913 @@ -1414,8 +1412,8 @@ server=/.acmedia365.com/127.0.0.1#7913 ipset=/.acmedia365.com/gfwlist server=/.mobatek.net/127.0.0.1#7913 ipset=/.mobatek.net/gfwlist -server=/.aofriend.com/127.0.0.1#7913 -ipset=/.aofriend.com/gfwlist +server=/.twimg.com/127.0.0.1#7913 +ipset=/.twimg.com/gfwlist server=/.google.ws/127.0.0.1#7913 ipset=/.google.ws/gfwlist server=/.lobsangwangyal.com/127.0.0.1#7913 @@ -1476,8 +1474,8 @@ server=/.kechara.com/127.0.0.1#7913 ipset=/.kechara.com/gfwlist server=/.dynssl.com/127.0.0.1#7913 ipset=/.dynssl.com/gfwlist -server=/.meteorshowersonline.com/127.0.0.1#7913 -ipset=/.meteorshowersonline.com/gfwlist +server=/.spotify.com/127.0.0.1#7913 +ipset=/.spotify.com/gfwlist server=/.pinterest.nl/127.0.0.1#7913 ipset=/.pinterest.nl/gfwlist server=/.shadow.ma/127.0.0.1#7913 @@ -1492,22 +1490,22 @@ server=/.luke54.com/127.0.0.1#7913 ipset=/.luke54.com/gfwlist server=/.stboy.net/127.0.0.1#7913 ipset=/.stboy.net/gfwlist -server=/.itasoftware.com/127.0.0.1#7913 -ipset=/.itasoftware.com/gfwlist +server=/.avcity.tv/127.0.0.1#7913 +ipset=/.avcity.tv/gfwlist server=/.chengmingmag.com/127.0.0.1#7913 ipset=/.chengmingmag.com/gfwlist server=/.bbtoystore.com/127.0.0.1#7913 ipset=/.bbtoystore.com/gfwlist -server=/.beeg.com/127.0.0.1#7913 -ipset=/.beeg.com/gfwlist +server=/.allowed.org/127.0.0.1#7913 +ipset=/.allowed.org/gfwlist server=/.galaxymacau.com/127.0.0.1#7913 ipset=/.galaxymacau.com/gfwlist server=/.cn.shafaqna.com/127.0.0.1#7913 ipset=/.cn.shafaqna.com/gfwlist server=/.blogs.yahoo.co.jp/127.0.0.1#7913 ipset=/.blogs.yahoo.co.jp/gfwlist -server=/.acmetoy.com/127.0.0.1#7913 -ipset=/.acmetoy.com/gfwlist +server=/.hugoroy.eu/127.0.0.1#7913 +ipset=/.hugoroy.eu/gfwlist server=/.privatepaste.com/127.0.0.1#7913 ipset=/.privatepaste.com/gfwlist server=/.cdcparty.com/127.0.0.1#7913 @@ -1542,8 +1540,8 @@ server=/.twstar.net/127.0.0.1#7913 ipset=/.twstar.net/gfwlist server=/.fzlm.com/127.0.0.1#7913 ipset=/.fzlm.com/gfwlist -server=/.steamcommunity.com/127.0.0.1#7913 -ipset=/.steamcommunity.com/gfwlist +server=/.userapi.nytlog.com/127.0.0.1#7913 +ipset=/.userapi.nytlog.com/gfwlist server=/.x24hr.com/127.0.0.1#7913 ipset=/.x24hr.com/gfwlist server=/.igmg.de/127.0.0.1#7913 @@ -1576,8 +1574,8 @@ server=/.kobobooks.com/127.0.0.1#7913 ipset=/.kobobooks.com/gfwlist server=/.monitorchina.org/127.0.0.1#7913 ipset=/.monitorchina.org/gfwlist -server=/.tubewolf.com/127.0.0.1#7913 -ipset=/.tubewolf.com/gfwlist +server=/.discord.com/127.0.0.1#7913 +ipset=/.discord.com/gfwlist server=/.whodns.xyz/127.0.0.1#7913 ipset=/.whodns.xyz/gfwlist server=/.casadeltibetbcn.org/127.0.0.1#7913 @@ -1646,8 +1644,8 @@ server=/.atchinese.com/127.0.0.1#7913 ipset=/.atchinese.com/gfwlist server=/.kineox.free.fr/127.0.0.1#7913 ipset=/.kineox.free.fr/gfwlist -server=/.hgseav.com/127.0.0.1#7913 -ipset=/.hgseav.com/gfwlist +server=/.tibetlibre.free.fr/127.0.0.1#7913 +ipset=/.tibetlibre.free.fr/gfwlist server=/.tianlawoffice.com/127.0.0.1#7913 ipset=/.tianlawoffice.com/gfwlist server=/.dalailamavisit.org.nz/127.0.0.1#7913 @@ -1664,8 +1662,8 @@ server=/.scramble.io/127.0.0.1#7913 ipset=/.scramble.io/gfwlist server=/.hutong9.net/127.0.0.1#7913 ipset=/.hutong9.net/gfwlist -server=/.dw-world.com/127.0.0.1#7913 -ipset=/.dw-world.com/gfwlist +server=/.w.idaiwan.com/127.0.0.1#7913 +ipset=/.w.idaiwan.com/gfwlist server=/.mattwilcox.net/127.0.0.1#7913 ipset=/.mattwilcox.net/gfwlist server=/.joinmastodon.org/127.0.0.1#7913 @@ -1684,8 +1682,8 @@ server=/.got-game.org/127.0.0.1#7913 ipset=/.got-game.org/gfwlist server=/.popyard.org/127.0.0.1#7913 ipset=/.popyard.org/gfwlist -server=/.falungong.club/127.0.0.1#7913 -ipset=/.falungong.club/gfwlist +server=/.tw.bid.yahoo.com/127.0.0.1#7913 +ipset=/.tw.bid.yahoo.com/gfwlist server=/.web2project.net/127.0.0.1#7913 ipset=/.web2project.net/gfwlist server=/.cdn1.lp.saboom.com/127.0.0.1#7913 @@ -1700,8 +1698,8 @@ server=/.islamicpluralism.org/127.0.0.1#7913 ipset=/.islamicpluralism.org/gfwlist server=/.hkej.com/127.0.0.1#7913 ipset=/.hkej.com/gfwlist -server=/.dlyoutube.com/127.0.0.1#7913 -ipset=/.dlyoutube.com/gfwlist +server=/.blog.excite.co.jp/127.0.0.1#7913 +ipset=/.blog.excite.co.jp/gfwlist server=/.rsf.org/127.0.0.1#7913 ipset=/.rsf.org/gfwlist server=/.yakbutterblues.com/127.0.0.1#7913 @@ -1722,8 +1720,8 @@ server=/.xlfmtalk.com/127.0.0.1#7913 ipset=/.xlfmtalk.com/gfwlist server=/.tw.myblog.yahoo.com/127.0.0.1#7913 ipset=/.tw.myblog.yahoo.com/gfwlist -server=/.nzchinese.com/127.0.0.1#7913 -ipset=/.nzchinese.com/gfwlist +server=/.recordhistory.org/127.0.0.1#7913 +ipset=/.recordhistory.org/gfwlist server=/.ozchinese.com/127.0.0.1#7913 ipset=/.ozchinese.com/gfwlist server=/.centauro.com.br/127.0.0.1#7913 @@ -1742,8 +1740,8 @@ server=/.tokyo-hot.com/127.0.0.1#7913 ipset=/.tokyo-hot.com/gfwlist server=/.wufi.org.tw/127.0.0.1#7913 ipset=/.wufi.org.tw/gfwlist -server=/.bithumb.com/127.0.0.1#7913 -ipset=/.bithumb.com/gfwlist +server=/.cbc.ca/127.0.0.1#7913 +ipset=/.cbc.ca/gfwlist server=/.archives.gov/127.0.0.1#7913 ipset=/.archives.gov/gfwlist server=/.guo.media/127.0.0.1#7913 @@ -1752,8 +1750,8 @@ server=/.sexhuang.com/127.0.0.1#7913 ipset=/.sexhuang.com/gfwlist server=/.euronews.com/127.0.0.1#7913 ipset=/.euronews.com/gfwlist -server=/.voa-11.akacast.akamaistream.net/127.0.0.1#7913 -ipset=/.voa-11.akacast.akamaistream.net/gfwlist +server=/.fling.com/127.0.0.1#7913 +ipset=/.fling.com/gfwlist server=/.warbler.iconfactory.net/127.0.0.1#7913 ipset=/.warbler.iconfactory.net/gfwlist server=/.epochtimes.se/127.0.0.1#7913 @@ -1766,8 +1764,8 @@ server=/.renyurenquan.org/127.0.0.1#7913 ipset=/.renyurenquan.org/gfwlist server=/.asdfg.jp/127.0.0.1#7913 ipset=/.asdfg.jp/gfwlist -server=/.lightnovel.cn/127.0.0.1#7913 -ipset=/.lightnovel.cn/gfwlist +server=/.imgchili.net/127.0.0.1#7913 +ipset=/.imgchili.net/gfwlist server=/.broadpressinc.com/127.0.0.1#7913 ipset=/.broadpressinc.com/gfwlist server=/.anti1984.com/127.0.0.1#7913 @@ -1798,8 +1796,8 @@ server=/.mail-archive.com/127.0.0.1#7913 ipset=/.mail-archive.com/gfwlist server=/.hotpot.hk/127.0.0.1#7913 ipset=/.hotpot.hk/gfwlist -server=/.jizzthis.com/127.0.0.1#7913 -ipset=/.jizzthis.com/gfwlist +server=/.bigmoney.biz/127.0.0.1#7913 +ipset=/.bigmoney.biz/gfwlist server=/.cloakpoint.com/127.0.0.1#7913 ipset=/.cloakpoint.com/gfwlist server=/.incapdns.net/127.0.0.1#7913 @@ -1832,12 +1830,12 @@ server=/.ncn.org/127.0.0.1#7913 ipset=/.ncn.org/gfwlist server=/.voy.com/127.0.0.1#7913 ipset=/.voy.com/gfwlist -server=/.boyfriendtv.com/127.0.0.1#7913 -ipset=/.boyfriendtv.com/gfwlist +server=/.fileserve.com/127.0.0.1#7913 +ipset=/.fileserve.com/gfwlist server=/.echofon.com/127.0.0.1#7913 ipset=/.echofon.com/gfwlist -server=/.mediachinese.com/127.0.0.1#7913 -ipset=/.mediachinese.com/gfwlist +server=/.dalailamaquotes.org/127.0.0.1#7913 +ipset=/.dalailamaquotes.org/gfwlist server=/.vraiesagesse.net/127.0.0.1#7913 ipset=/.vraiesagesse.net/gfwlist server=/.googlebot.com/127.0.0.1#7913 @@ -1862,8 +1860,8 @@ server=/.xcritic.com/127.0.0.1#7913 ipset=/.xcritic.com/gfwlist server=/.twitpic.com/127.0.0.1#7913 ipset=/.twitpic.com/gfwlist -server=/.google.vu/127.0.0.1#7913 -ipset=/.google.vu/gfwlist +server=/.tw.yahoo.com/127.0.0.1#7913 +ipset=/.tw.yahoo.com/gfwlist server=/.chromercise.com/127.0.0.1#7913 ipset=/.chromercise.com/gfwlist server=/.tcewf.org/127.0.0.1#7913 @@ -1890,14 +1888,14 @@ server=/.play-asia.com/127.0.0.1#7913 ipset=/.play-asia.com/gfwlist server=/.impp.mn/127.0.0.1#7913 ipset=/.impp.mn/gfwlist -server=/.unseen.is/127.0.0.1#7913 -ipset=/.unseen.is/gfwlist +server=/.www.gmiddle.com/127.0.0.1#7913 +ipset=/.www.gmiddle.com/gfwlist server=/.ssl443.org/127.0.0.1#7913 ipset=/.ssl443.org/gfwlist -server=/.terminus2049.github.io/127.0.0.1#7913 -ipset=/.terminus2049.github.io/gfwlist -server=/.gcc.org.hk/127.0.0.1#7913 -ipset=/.gcc.org.hk/gfwlist +server=/.piring.com/127.0.0.1#7913 +ipset=/.piring.com/gfwlist +server=/.dns-stuff.com/127.0.0.1#7913 +ipset=/.dns-stuff.com/gfwlist server=/.free.fr/127.0.0.1#7913 ipset=/.free.fr/gfwlist server=/.stupidvideos.com/127.0.0.1#7913 @@ -1920,8 +1918,8 @@ server=/.hk.search.yahoo.com/127.0.0.1#7913 ipset=/.hk.search.yahoo.com/gfwlist server=/.flickriver.com/127.0.0.1#7913 ipset=/.flickriver.com/gfwlist -server=/.chinafreepress.org/127.0.0.1#7913 -ipset=/.chinafreepress.org/gfwlist +server=/.hihistory.net/127.0.0.1#7913 +ipset=/.hihistory.net/gfwlist server=/.blockcn.com/127.0.0.1#7913 ipset=/.blockcn.com/gfwlist server=/.36rain.com/127.0.0.1#7913 @@ -1938,8 +1936,8 @@ server=/.easternlightning.org/127.0.0.1#7913 ipset=/.easternlightning.org/gfwlist server=/.gospelherald.com/127.0.0.1#7913 ipset=/.gospelherald.com/gfwlist -server=/.3proxy.ru/127.0.0.1#7913 -ipset=/.3proxy.ru/gfwlist +server=/.blogspot.com/127.0.0.1#7913 +ipset=/.blogspot.com/gfwlist server=/.hotfrog.com.tw/127.0.0.1#7913 ipset=/.hotfrog.com.tw/gfwlist server=/.pcanywhere.net/127.0.0.1#7913 @@ -1962,8 +1960,8 @@ server=/.fdc89.jp/127.0.0.1#7913 ipset=/.fdc89.jp/gfwlist server=/.sftuk.org/127.0.0.1#7913 ipset=/.sftuk.org/gfwlist -server=/.disconnect.me/127.0.0.1#7913 -ipset=/.disconnect.me/gfwlist +server=/.maiio.net/127.0.0.1#7913 +ipset=/.maiio.net/gfwlist server=/.simpleproductivityblog.com/127.0.0.1#7913 ipset=/.simpleproductivityblog.com/gfwlist server=/.flgg.us/127.0.0.1#7913 @@ -2042,8 +2040,8 @@ server=/.naitik.net/127.0.0.1#7913 ipset=/.naitik.net/gfwlist server=/.alldrawnsex.com/127.0.0.1#7913 ipset=/.alldrawnsex.com/gfwlist -server=/.breaking911.com/127.0.0.1#7913 -ipset=/.breaking911.com/gfwlist +server=/.navyfamily.navy.mil/127.0.0.1#7913 +ipset=/.navyfamily.navy.mil/gfwlist server=/.empfil.com/127.0.0.1#7913 ipset=/.empfil.com/gfwlist server=/.crocotube.com/127.0.0.1#7913 @@ -2070,8 +2068,8 @@ server=/.oex.com/127.0.0.1#7913 ipset=/.oex.com/gfwlist server=/.flipkart.com/127.0.0.1#7913 ipset=/.flipkart.com/gfwlist -server=/.jex.com/127.0.0.1#7913 -ipset=/.jex.com/gfwlist +server=/.d3rhr7kgmtrq1v.cloudfront.net/127.0.0.1#7913 +ipset=/.d3rhr7kgmtrq1v.cloudfront.net/gfwlist server=/.kex.com/127.0.0.1#7913 ipset=/.kex.com/gfwlist server=/.google.de/127.0.0.1#7913 @@ -2096,8 +2094,8 @@ server=/.guangming.com.my/127.0.0.1#7913 ipset=/.guangming.com.my/gfwlist server=/.ns01.us/127.0.0.1#7913 ipset=/.ns01.us/gfwlist -server=/.coolstuffinc.com/127.0.0.1#7913 -ipset=/.coolstuffinc.com/gfwlist +server=/.hecaitou.net/127.0.0.1#7913 +ipset=/.hecaitou.net/gfwlist server=/.eyny.com/127.0.0.1#7913 ipset=/.eyny.com/gfwlist server=/.eastturkistangovernmentinexile.us/127.0.0.1#7913 @@ -2180,8 +2178,8 @@ server=/.futurechinaforum.org/127.0.0.1#7913 ipset=/.futurechinaforum.org/gfwlist server=/.livevideo.com/127.0.0.1#7913 ipset=/.livevideo.com/gfwlist -server=/.googlegroups.com/127.0.0.1#7913 -ipset=/.googlegroups.com/gfwlist +server=/.freefuckvids.com/127.0.0.1#7913 +ipset=/.freefuckvids.com/gfwlist server=/.tibet.net/127.0.0.1#7913 ipset=/.tibet.net/gfwlist server=/.journalchretien.net/127.0.0.1#7913 @@ -2212,18 +2210,18 @@ server=/.yobt.tv/127.0.0.1#7913 ipset=/.yobt.tv/gfwlist server=/.facebookmail.com/127.0.0.1#7913 ipset=/.facebookmail.com/gfwlist -server=/.archive.ph/127.0.0.1#7913 -ipset=/.archive.ph/gfwlist -server=/.filthdump.com/127.0.0.1#7913 -ipset=/.filthdump.com/gfwlist +server=/.googleapps.com/127.0.0.1#7913 +ipset=/.googleapps.com/gfwlist +server=/.ctfriend.net/127.0.0.1#7913 +ipset=/.ctfriend.net/gfwlist server=/.beric.me/127.0.0.1#7913 ipset=/.beric.me/gfwlist server=/.video.fdbox.com/127.0.0.1#7913 ipset=/.video.fdbox.com/gfwlist server=/.am730.com.hk/127.0.0.1#7913 ipset=/.am730.com.hk/gfwlist -server=/.no-ip.org/127.0.0.1#7913 -ipset=/.no-ip.org/gfwlist +server=/.filmy.olabloga.pl/127.0.0.1#7913 +ipset=/.filmy.olabloga.pl/gfwlist server=/.mpinews.com/127.0.0.1#7913 ipset=/.mpinews.com/gfwlist server=/.www1.biz/127.0.0.1#7913 @@ -2292,8 +2290,8 @@ server=/.googlearth.com/127.0.0.1#7913 ipset=/.googlearth.com/gfwlist server=/.brkmd.com/127.0.0.1#7913 ipset=/.brkmd.com/gfwlist -server=/.iav19.com/127.0.0.1#7913 -ipset=/.iav19.com/gfwlist +server=/.tubepornclassic.com/127.0.0.1#7913 +ipset=/.tubepornclassic.com/gfwlist server=/.sohcradio.com/127.0.0.1#7913 ipset=/.sohcradio.com/gfwlist server=/.dharmakara.net/127.0.0.1#7913 @@ -2368,8 +2366,8 @@ server=/.definebabe.com/127.0.0.1#7913 ipset=/.definebabe.com/gfwlist server=/.tibet-envoy.eu/127.0.0.1#7913 ipset=/.tibet-envoy.eu/gfwlist -server=/.gohappy.com.tw/127.0.0.1#7913 -ipset=/.gohappy.com.tw/gfwlist +server=/.badjojo.com/127.0.0.1#7913 +ipset=/.badjojo.com/gfwlist server=/.effers.com/127.0.0.1#7913 ipset=/.effers.com/gfwlist server=/.crossthewall.net/127.0.0.1#7913 @@ -2402,8 +2400,8 @@ server=/.btbtav.com/127.0.0.1#7913 ipset=/.btbtav.com/gfwlist server=/.1pondo.tv/127.0.0.1#7913 ipset=/.1pondo.tv/gfwlist -server=/.hoxx.com/127.0.0.1#7913 -ipset=/.hoxx.com/gfwlist +server=/.onmypc.org/127.0.0.1#7913 +ipset=/.onmypc.org/gfwlist server=/.xiaohexie.com/127.0.0.1#7913 ipset=/.xiaohexie.com/gfwlist server=/.dragonex.io/127.0.0.1#7913 @@ -2426,14 +2424,14 @@ server=/.aniscartujo.com/127.0.0.1#7913 ipset=/.aniscartujo.com/gfwlist server=/.eeas.europa.eu/127.0.0.1#7913 ipset=/.eeas.europa.eu/gfwlist -server=/.hkcoc.com/127.0.0.1#7913 -ipset=/.hkcoc.com/gfwlist +server=/.18virginsex.com/127.0.0.1#7913 +ipset=/.18virginsex.com/gfwlist server=/.tibetanyouth.org/127.0.0.1#7913 ipset=/.tibetanyouth.org/gfwlist server=/.shenshou.org/127.0.0.1#7913 ipset=/.shenshou.org/gfwlist -server=/.hidden-advent.org/127.0.0.1#7913 -ipset=/.hidden-advent.org/gfwlist +server=/.getlantern.org/127.0.0.1#7913 +ipset=/.getlantern.org/gfwlist server=/.smchbooks.com/127.0.0.1#7913 ipset=/.smchbooks.com/gfwlist server=/.cfhks.org.hk/127.0.0.1#7913 @@ -2480,8 +2478,8 @@ server=/.google.sh/127.0.0.1#7913 ipset=/.google.sh/gfwlist server=/.calameo.com/127.0.0.1#7913 ipset=/.calameo.com/gfwlist -server=/.madewithcode.com/127.0.0.1#7913 -ipset=/.madewithcode.com/gfwlist +server=/.furinkan.com/127.0.0.1#7913 +ipset=/.furinkan.com/gfwlist server=/.videomo.com/127.0.0.1#7913 ipset=/.videomo.com/gfwlist server=/.1000giri.net/127.0.0.1#7913 @@ -2496,8 +2494,8 @@ server=/.quannengshen.org/127.0.0.1#7913 ipset=/.quannengshen.org/gfwlist server=/.hqsbonline.wordpress.com/127.0.0.1#7913 ipset=/.hqsbonline.wordpress.com/gfwlist -server=/.lflinkup.com/127.0.0.1#7913 -ipset=/.lflinkup.com/gfwlist +server=/.ezua.com/127.0.0.1#7913 +ipset=/.ezua.com/gfwlist server=/.gizlen.net/127.0.0.1#7913 ipset=/.gizlen.net/gfwlist server=/.listorious.com/127.0.0.1#7913 @@ -2548,12 +2546,12 @@ server=/.hkchurch.org/127.0.0.1#7913 ipset=/.hkchurch.org/gfwlist server=/.dalianmeng.org/127.0.0.1#7913 ipset=/.dalianmeng.org/gfwlist -server=/.xbtce.com/127.0.0.1#7913 -ipset=/.xbtce.com/gfwlist +server=/.18board.info/127.0.0.1#7913 +ipset=/.18board.info/gfwlist server=/.spicevpn.com/127.0.0.1#7913 ipset=/.spicevpn.com/gfwlist -server=/.zhao.jinhai.de/127.0.0.1#7913 -ipset=/.zhao.jinhai.de/gfwlist +server=/.jiehua.cz/127.0.0.1#7913 +ipset=/.jiehua.cz/gfwlist server=/.apiary.io/127.0.0.1#7913 ipset=/.apiary.io/gfwlist server=/.linear-abematv.akamaized.net/127.0.0.1#7913 @@ -2568,8 +2566,8 @@ server=/.hexieshe.xyz/127.0.0.1#7913 ipset=/.hexieshe.xyz/gfwlist server=/.eevpn.com/127.0.0.1#7913 ipset=/.eevpn.com/gfwlist -server=/.addictedtocoffee.de/127.0.0.1#7913 -ipset=/.addictedtocoffee.de/gfwlist +server=/.imgur.com/127.0.0.1#7913 +ipset=/.imgur.com/gfwlist server=/.rcinet.ca/127.0.0.1#7913 ipset=/.rcinet.ca/gfwlist server=/.kink.com/127.0.0.1#7913 @@ -2580,8 +2578,8 @@ server=/.fillthesquare.org/127.0.0.1#7913 ipset=/.fillthesquare.org/gfwlist server=/.fuckcnnic.net/127.0.0.1#7913 ipset=/.fuckcnnic.net/gfwlist -server=/.almasdarnews.com/127.0.0.1#7913 -ipset=/.almasdarnews.com/gfwlist +server=/.annatam.com/127.0.0.1#7913 +ipset=/.annatam.com/gfwlist server=/.tw.news.yahoo.com/127.0.0.1#7913 ipset=/.tw.news.yahoo.com/gfwlist server=/.a771.dscq.akamai.net/127.0.0.1#7913 @@ -2660,16 +2658,16 @@ server=/.from-pr.com/127.0.0.1#7913 ipset=/.from-pr.com/gfwlist server=/.readingtimes.com.tw/127.0.0.1#7913 ipset=/.readingtimes.com.tw/gfwlist -server=/.api.pureapk.com/127.0.0.1#7913 -ipset=/.api.pureapk.com/gfwlist +server=/.centralnation.com/127.0.0.1#7913 +ipset=/.centralnation.com/gfwlist server=/.videopediaworld.com/127.0.0.1#7913 ipset=/.videopediaworld.com/gfwlist server=/.putihome.org/127.0.0.1#7913 ipset=/.putihome.org/gfwlist server=/.www.citizenlab.org/127.0.0.1#7913 ipset=/.www.citizenlab.org/gfwlist -server=/.drepung.org/127.0.0.1#7913 -ipset=/.drepung.org/gfwlist +server=/.freeman2.com/127.0.0.1#7913 +ipset=/.freeman2.com/gfwlist server=/.eporner.com/127.0.0.1#7913 ipset=/.eporner.com/gfwlist server=/.allcoin.com/127.0.0.1#7913 @@ -2748,18 +2746,18 @@ server=/.xinmiao.com.hk/127.0.0.1#7913 ipset=/.xinmiao.com.hk/gfwlist server=/.isasecret.com/127.0.0.1#7913 ipset=/.isasecret.com/gfwlist -server=/.fanqiangyakexi.net/127.0.0.1#7913 -ipset=/.fanqiangyakexi.net/gfwlist -server=/.flyvpn.com/127.0.0.1#7913 -ipset=/.flyvpn.com/gfwlist +server=/.baijie.org/127.0.0.1#7913 +ipset=/.baijie.org/gfwlist +server=/.sl-reverse.com/127.0.0.1#7913 +ipset=/.sl-reverse.com/gfwlist server=/.chicagoncmtv.com/127.0.0.1#7913 ipset=/.chicagoncmtv.com/gfwlist server=/.getastrill.com/127.0.0.1#7913 ipset=/.getastrill.com/gfwlist server=/.linux.org.hk/127.0.0.1#7913 ipset=/.linux.org.hk/gfwlist -server=/.minghui-school.org/127.0.0.1#7913 -ipset=/.minghui-school.org/gfwlist +server=/.nurgo-software.com/127.0.0.1#7913 +ipset=/.nurgo-software.com/gfwlist server=/.online.recoveryversion.org/127.0.0.1#7913 ipset=/.online.recoveryversion.org/gfwlist server=/.docs.cfw.lbyczf.com/127.0.0.1#7913 @@ -2816,26 +2814,26 @@ server=/.chinesetalks.net/127.0.0.1#7913 ipset=/.chinesetalks.net/gfwlist server=/.466453.com/127.0.0.1#7913 ipset=/.466453.com/gfwlist -server=/.theguardian.com/127.0.0.1#7913 -ipset=/.theguardian.com/gfwlist +server=/.gartlive.com/127.0.0.1#7913 +ipset=/.gartlive.com/gfwlist server=/.youdontcare.com/127.0.0.1#7913 ipset=/.youdontcare.com/gfwlist server=/.retweeteffect.com/127.0.0.1#7913 ipset=/.retweeteffect.com/gfwlist server=/.t.co/127.0.0.1#7913 ipset=/.t.co/gfwlist -server=/.uku.im/127.0.0.1#7913 -ipset=/.uku.im/gfwlist +server=/.beijingzx.org/127.0.0.1#7913 +ipset=/.beijingzx.org/gfwlist server=/.shattered.io/127.0.0.1#7913 ipset=/.shattered.io/gfwlist server=/.mytizi.com/127.0.0.1#7913 ipset=/.mytizi.com/gfwlist server=/.metrohk.com.hk/127.0.0.1#7913 ipset=/.metrohk.com.hk/gfwlist -server=/.electionsmeter.com/127.0.0.1#7913 -ipset=/.electionsmeter.com/gfwlist -server=/.bcmorning.com/127.0.0.1#7913 -ipset=/.bcmorning.com/gfwlist +server=/.greatroc.org/127.0.0.1#7913 +ipset=/.greatroc.org/gfwlist +server=/.dalailama-archives.org/127.0.0.1#7913 +ipset=/.dalailama-archives.org/gfwlist server=/.blog.kangye.org/127.0.0.1#7913 ipset=/.blog.kangye.org/gfwlist server=/.g.co/127.0.0.1#7913 @@ -2888,16 +2886,16 @@ server=/.rlwlw.com/127.0.0.1#7913 ipset=/.rlwlw.com/gfwlist server=/.sakuralive.com/127.0.0.1#7913 ipset=/.sakuralive.com/gfwlist -server=/.cthlo.github.io/127.0.0.1#7913 -ipset=/.cthlo.github.io/gfwlist +server=/.prism-break.org/127.0.0.1#7913 +ipset=/.prism-break.org/gfwlist server=/.jandyx.com/127.0.0.1#7913 ipset=/.jandyx.com/gfwlist server=/.nexon.com/127.0.0.1#7913 ipset=/.nexon.com/gfwlist server=/.tibetalk.com/127.0.0.1#7913 ipset=/.tibetalk.com/gfwlist -server=/.vmpsoft.com/127.0.0.1#7913 -ipset=/.vmpsoft.com/gfwlist +server=/.clementine-player.org/127.0.0.1#7913 +ipset=/.clementine-player.org/gfwlist server=/.creaders.net/127.0.0.1#7913 ipset=/.creaders.net/gfwlist server=/.0rz.tw/127.0.0.1#7913 @@ -2918,8 +2916,8 @@ server=/.freewechat.com/127.0.0.1#7913 ipset=/.freewechat.com/gfwlist server=/.phosphation13.rssing.com/127.0.0.1#7913 ipset=/.phosphation13.rssing.com/gfwlist -server=/.expekt.com/127.0.0.1#7913 -ipset=/.expekt.com/gfwlist +server=/.boysmaster.com/127.0.0.1#7913 +ipset=/.boysmaster.com/gfwlist server=/.instanthq.com/127.0.0.1#7913 ipset=/.instanthq.com/gfwlist server=/.wforum.com/127.0.0.1#7913 @@ -3002,8 +3000,8 @@ server=/.waikeung.org/127.0.0.1#7913 ipset=/.waikeung.org/gfwlist server=/.mitbbsau.com/127.0.0.1#7913 ipset=/.mitbbsau.com/gfwlist -server=/.china-mmm.jp.net/127.0.0.1#7913 -ipset=/.china-mmm.jp.net/gfwlist +server=/.freeforums.org/127.0.0.1#7913 +ipset=/.freeforums.org/gfwlist server=/.nextmedia.com/127.0.0.1#7913 ipset=/.nextmedia.com/gfwlist server=/.postimg.org/127.0.0.1#7913 @@ -3016,8 +3014,8 @@ server=/.ulop.net/127.0.0.1#7913 ipset=/.ulop.net/gfwlist server=/.fc2cn.com/127.0.0.1#7913 ipset=/.fc2cn.com/gfwlist -server=/.fochk.org/127.0.0.1#7913 -ipset=/.fochk.org/gfwlist +server=/.dajiyuan.eu/127.0.0.1#7913 +ipset=/.dajiyuan.eu/gfwlist server=/.huluim.com/127.0.0.1#7913 ipset=/.huluim.com/gfwlist server=/.dpr.info/127.0.0.1#7913 @@ -3030,8 +3028,8 @@ server=/.msa-it.org/127.0.0.1#7913 ipset=/.msa-it.org/gfwlist server=/.voacantonese.com/127.0.0.1#7913 ipset=/.voacantonese.com/gfwlist -server=/.wizcrafts.net/127.0.0.1#7913 -ipset=/.wizcrafts.net/gfwlist +server=/.bot.nu/127.0.0.1#7913 +ipset=/.bot.nu/gfwlist server=/.10musume.com/127.0.0.1#7913 ipset=/.10musume.com/gfwlist server=/.adsense.com/127.0.0.1#7913 @@ -3100,8 +3098,8 @@ server=/.fangeqiang.com/127.0.0.1#7913 ipset=/.fangeqiang.com/gfwlist server=/.okayfreedom.com/127.0.0.1#7913 ipset=/.okayfreedom.com/gfwlist -server=/.binux.me/127.0.0.1#7913 -ipset=/.binux.me/gfwlist +server=/.avbody.tv/127.0.0.1#7913 +ipset=/.avbody.tv/gfwlist server=/.nradio.me/127.0.0.1#7913 ipset=/.nradio.me/gfwlist server=/.faydao.com/127.0.0.1#7913 @@ -3116,8 +3114,8 @@ server=/.civildisobediencemovement.org/127.0.0.1#7913 ipset=/.civildisobediencemovement.org/gfwlist server=/.bod.asia/127.0.0.1#7913 ipset=/.bod.asia/gfwlist -server=/.mymusic.net.tw/127.0.0.1#7913 -ipset=/.mymusic.net.tw/gfwlist +server=/.greenfieldbookstore.com.hk/127.0.0.1#7913 +ipset=/.greenfieldbookstore.com.hk/gfwlist server=/.city365.ca/127.0.0.1#7913 ipset=/.city365.ca/gfwlist server=/.233v2.com/127.0.0.1#7913 @@ -3168,8 +3166,8 @@ server=/.gardennetworks.com/127.0.0.1#7913 ipset=/.gardennetworks.com/gfwlist server=/.google.co.jp/127.0.0.1#7913 ipset=/.google.co.jp/gfwlist -server=/.onionhacker.github.io/127.0.0.1#7913 -ipset=/.onionhacker.github.io/gfwlist +server=/.wingy.site/127.0.0.1#7913 +ipset=/.wingy.site/gfwlist server=/.archiveofourown.org/127.0.0.1#7913 ipset=/.archiveofourown.org/gfwlist server=/.sinocism.com/127.0.0.1#7913 @@ -3214,8 +3212,8 @@ server=/.jkb.cc/127.0.0.1#7913 ipset=/.jkb.cc/gfwlist server=/.dafabet.com/127.0.0.1#7913 ipset=/.dafabet.com/gfwlist -server=/.superpages.com/127.0.0.1#7913 -ipset=/.superpages.com/gfwlist +server=/.falun-ny.net/127.0.0.1#7913 +ipset=/.falun-ny.net/gfwlist server=/.pengyulong.com/127.0.0.1#7913 ipset=/.pengyulong.com/gfwlist server=/.sgwritings.com/127.0.0.1#7913 @@ -3332,8 +3330,8 @@ server=/.eroticsaloon.net/127.0.0.1#7913 ipset=/.eroticsaloon.net/gfwlist server=/.friends-of-tibet.org/127.0.0.1#7913 ipset=/.friends-of-tibet.org/gfwlist -server=/.onmypc.net/127.0.0.1#7913 -ipset=/.onmypc.net/gfwlist +server=/.blogger.com/127.0.0.1#7913 +ipset=/.blogger.com/gfwlist server=/.fengzhenghu.com/127.0.0.1#7913 ipset=/.fengzhenghu.com/gfwlist server=/.makemymood.com/127.0.0.1#7913 @@ -3356,8 +3354,8 @@ server=/.dizhuzhishang.com/127.0.0.1#7913 ipset=/.dizhuzhishang.com/gfwlist server=/.cldr.unicode.org/127.0.0.1#7913 ipset=/.cldr.unicode.org/gfwlist -server=/.enewstree.com/127.0.0.1#7913 -ipset=/.enewstree.com/gfwlist +server=/.bakgeekhome.tk/127.0.0.1#7913 +ipset=/.bakgeekhome.tk/gfwlist server=/.newscn.org/127.0.0.1#7913 ipset=/.newscn.org/gfwlist server=/.michaelmarketl.com/127.0.0.1#7913 @@ -3420,14 +3418,14 @@ server=/.cdp1989.org/127.0.0.1#7913 ipset=/.cdp1989.org/gfwlist server=/.141tube.com/127.0.0.1#7913 ipset=/.141tube.com/gfwlist -server=/.pincong.rocks/127.0.0.1#7913 -ipset=/.pincong.rocks/gfwlist +server=/.64museum.org/127.0.0.1#7913 +ipset=/.64museum.org/gfwlist server=/.redditlist.com/127.0.0.1#7913 ipset=/.redditlist.com/gfwlist server=/.idiomconnection.com/127.0.0.1#7913 ipset=/.idiomconnection.com/gfwlist -server=/.facebook.com/127.0.0.1#7913 -ipset=/.facebook.com/gfwlist +server=/.emanna.com/127.0.0.1#7913 +ipset=/.emanna.com/gfwlist server=/.2waky.com/127.0.0.1#7913 ipset=/.2waky.com/gfwlist server=/.shireyishunjian.com/127.0.0.1#7913 @@ -3516,8 +3514,8 @@ server=/.google.be/127.0.0.1#7913 ipset=/.google.be/gfwlist server=/.ct.org.tw/127.0.0.1#7913 ipset=/.ct.org.tw/gfwlist -server=/.coolloud.org.tw/127.0.0.1#7913 -ipset=/.coolloud.org.tw/gfwlist +server=/.dynamicdns.me.uk/127.0.0.1#7913 +ipset=/.dynamicdns.me.uk/gfwlist server=/.cipfg.org/127.0.0.1#7913 ipset=/.cipfg.org/gfwlist server=/.google.gr/127.0.0.1#7913 @@ -3550,14 +3548,16 @@ server=/.goagent.codeplex.com/127.0.0.1#7913 ipset=/.goagent.codeplex.com/gfwlist server=/.flipboard.com/127.0.0.1#7913 ipset=/.flipboard.com/gfwlist -server=/.6park.com/127.0.0.1#7913 -ipset=/.6park.com/gfwlist +server=/.research.google/127.0.0.1#7913 +ipset=/.research.google/gfwlist server=/.javfor.me/127.0.0.1#7913 ipset=/.javfor.me/gfwlist server=/.casatibet.org.mx/127.0.0.1#7913 ipset=/.casatibet.org.mx/gfwlist server=/.dns-dns.com/127.0.0.1#7913 ipset=/.dns-dns.com/gfwlist +server=/.mega.co.nz/127.0.0.1#7913 +ipset=/.mega.co.nz/gfwlist server=/.betvictor.com/127.0.0.1#7913 ipset=/.betvictor.com/gfwlist server=/.pbwiki.com/127.0.0.1#7913 @@ -3598,8 +3598,8 @@ server=/.xijie.wordpress.com/127.0.0.1#7913 ipset=/.xijie.wordpress.com/gfwlist server=/.mayimayi.com/127.0.0.1#7913 ipset=/.mayimayi.com/gfwlist -server=/.bangbrosnetwork.com/127.0.0.1#7913 -ipset=/.bangbrosnetwork.com/gfwlist +server=/.dalailamafoundation.org/127.0.0.1#7913 +ipset=/.dalailamafoundation.org/gfwlist server=/.hornytrip.com/127.0.0.1#7913 ipset=/.hornytrip.com/gfwlist server=/.pinterest.co.uk/127.0.0.1#7913 @@ -3612,8 +3612,8 @@ server=/.eastturkistan-gov.org/127.0.0.1#7913 ipset=/.eastturkistan-gov.org/gfwlist server=/.flitto.com/127.0.0.1#7913 ipset=/.flitto.com/gfwlist -server=/.blip.tv/127.0.0.1#7913 -ipset=/.blip.tv/gfwlist +server=/.barnabu.co.uk/127.0.0.1#7913 +ipset=/.barnabu.co.uk/gfwlist server=/.cafepress.com/127.0.0.1#7913 ipset=/.cafepress.com/gfwlist server=/.duping.net/127.0.0.1#7913 @@ -3714,8 +3714,8 @@ server=/.spotflux.com/127.0.0.1#7913 ipset=/.spotflux.com/gfwlist server=/.elpais.com/127.0.0.1#7913 ipset=/.elpais.com/gfwlist -server=/.bx.tl/127.0.0.1#7913 -ipset=/.bx.tl/gfwlist +server=/.blog.calibre-ebook.com/127.0.0.1#7913 +ipset=/.blog.calibre-ebook.com/gfwlist server=/.nationsonline.org/127.0.0.1#7913 ipset=/.nationsonline.org/gfwlist server=/.dojin.com/127.0.0.1#7913 @@ -3814,14 +3814,16 @@ server=/.myftp.name/127.0.0.1#7913 ipset=/.myftp.name/gfwlist server=/.webrush.net/127.0.0.1#7913 ipset=/.webrush.net/gfwlist +server=/.tunsafe.com/127.0.0.1#7913 +ipset=/.tunsafe.com/gfwlist server=/.tgstat.com/127.0.0.1#7913 ipset=/.tgstat.com/gfwlist server=/.pandapow.co/127.0.0.1#7913 ipset=/.pandapow.co/gfwlist server=/.bdsmvideos.net/127.0.0.1#7913 ipset=/.bdsmvideos.net/gfwlist -server=/.googlechrome.github.io/127.0.0.1#7913 -ipset=/.googlechrome.github.io/gfwlist +server=/.141hongkong.com/127.0.0.1#7913 +ipset=/.141hongkong.com/gfwlist server=/.creativelab5.com/127.0.0.1#7913 ipset=/.creativelab5.com/gfwlist server=/.juliepost.com/127.0.0.1#7913 @@ -3942,8 +3944,8 @@ server=/.cn.thegay.com/127.0.0.1#7913 ipset=/.cn.thegay.com/gfwlist server=/.themoviedb.org/127.0.0.1#7913 ipset=/.themoviedb.org/gfwlist -server=/.glorystar.me/127.0.0.1#7913 -ipset=/.glorystar.me/gfwlist +server=/.ssr.tools/127.0.0.1#7913 +ipset=/.ssr.tools/gfwlist server=/.xmovies.com/127.0.0.1#7913 ipset=/.xmovies.com/gfwlist server=/.pandora.com/127.0.0.1#7913 @@ -4032,12 +4034,10 @@ server=/.usmgtcg.ning.com/127.0.0.1#7913 ipset=/.usmgtcg.ning.com/gfwlist server=/.ticket.com.tw/127.0.0.1#7913 ipset=/.ticket.com.tw/gfwlist -server=/.toutyrater.github.io/127.0.0.1#7913 -ipset=/.toutyrater.github.io/gfwlist server=/.azerbaycan.tv/127.0.0.1#7913 ipset=/.azerbaycan.tv/gfwlist -server=/.androidify.com/127.0.0.1#7913 -ipset=/.androidify.com/gfwlist +server=/.japanfirst.asianfreeforum.com/127.0.0.1#7913 +ipset=/.japanfirst.asianfreeforum.com/gfwlist server=/.tw.jiepang.com/127.0.0.1#7913 ipset=/.tw.jiepang.com/gfwlist server=/.meetup.com/127.0.0.1#7913 @@ -4054,8 +4054,6 @@ server=/.gutteruncensored.com/127.0.0.1#7913 ipset=/.gutteruncensored.com/gfwlist server=/.feeds.fileforum.com/127.0.0.1#7913 ipset=/.feeds.fileforum.com/gfwlist -server=/.hahaxixi.github.io/127.0.0.1#7913 -ipset=/.hahaxixi.github.io/gfwlist server=/.delicious.com/127.0.0.1#7913 ipset=/.delicious.com/gfwlist server=/.pandora.tv/127.0.0.1#7913 @@ -4072,14 +4070,14 @@ server=/.juhuaren.com/127.0.0.1#7913 ipset=/.juhuaren.com/gfwlist server=/.izlesem.org/127.0.0.1#7913 ipset=/.izlesem.org/gfwlist -server=/.igvita.com/127.0.0.1#7913 -ipset=/.igvita.com/gfwlist +server=/.oursteps.com.au/127.0.0.1#7913 +ipset=/.oursteps.com.au/gfwlist server=/.fofg.org/127.0.0.1#7913 ipset=/.fofg.org/gfwlist server=/.photofocus.com/127.0.0.1#7913 ipset=/.photofocus.com/gfwlist -server=/.maskedip.com/127.0.0.1#7913 -ipset=/.maskedip.com/gfwlist +server=/.proxfree.com/127.0.0.1#7913 +ipset=/.proxfree.com/gfwlist server=/.bbsfeed.com/127.0.0.1#7913 ipset=/.bbsfeed.com/gfwlist server=/.vermonttibet.org/127.0.0.1#7913 @@ -4236,8 +4234,8 @@ server=/.freeproxylists.net/127.0.0.1#7913 ipset=/.freeproxylists.net/gfwlist server=/.freeoz.org/127.0.0.1#7913 ipset=/.freeoz.org/gfwlist -server=/.crchina.org/127.0.0.1#7913 -ipset=/.crchina.org/gfwlist +server=/.hikinggfw.org/127.0.0.1#7913 +ipset=/.hikinggfw.org/gfwlist server=/.mobileways.de/127.0.0.1#7913 ipset=/.mobileways.de/gfwlist server=/.blog.de/127.0.0.1#7913 @@ -4310,8 +4308,8 @@ server=/.forum4hk.com/127.0.0.1#7913 ipset=/.forum4hk.com/gfwlist server=/.pds.nasa.gov/127.0.0.1#7913 ipset=/.pds.nasa.gov/gfwlist -server=/.googleanalytics.com/127.0.0.1#7913 -ipset=/.googleanalytics.com/gfwlist +server=/.withgoogle.com/127.0.0.1#7913 +ipset=/.withgoogle.com/gfwlist server=/.epochtimes.de/127.0.0.1#7913 ipset=/.epochtimes.de/gfwlist server=/.giga-web.jp/127.0.0.1#7913 @@ -4344,8 +4342,8 @@ server=/.oopsforum.com/127.0.0.1#7913 ipset=/.oopsforum.com/gfwlist server=/.po2b.com/127.0.0.1#7913 ipset=/.po2b.com/gfwlist -server=/.bnews.co/127.0.0.1#7913 -ipset=/.bnews.co/gfwlist +server=/.golang.org/127.0.0.1#7913 +ipset=/.golang.org/gfwlist server=/.toypark.in/127.0.0.1#7913 ipset=/.toypark.in/gfwlist server=/.mrbasic.com/127.0.0.1#7913 @@ -4472,8 +4470,8 @@ server=/.thetrotskymovie.com/127.0.0.1#7913 ipset=/.thetrotskymovie.com/gfwlist server=/.gamer2-cds.cdn.hinet.net/127.0.0.1#7913 ipset=/.gamer2-cds.cdn.hinet.net/gfwlist -server=/.freeviewmovies.com/127.0.0.1#7913 -ipset=/.freeviewmovies.com/gfwlist +server=/.greenreadings.com/127.0.0.1#7913 +ipset=/.greenreadings.com/gfwlist server=/.woopie.tv/127.0.0.1#7913 ipset=/.woopie.tv/gfwlist server=/.himalayan-foundation.org/127.0.0.1#7913 @@ -4526,8 +4524,8 @@ server=/.tistory.com/127.0.0.1#7913 ipset=/.tistory.com/gfwlist server=/.banana-vpn.com/127.0.0.1#7913 ipset=/.banana-vpn.com/gfwlist -server=/.isohunt.com/127.0.0.1#7913 -ipset=/.isohunt.com/gfwlist +server=/.army.mil/127.0.0.1#7913 +ipset=/.army.mil/gfwlist server=/.windscribe.com/127.0.0.1#7913 ipset=/.windscribe.com/gfwlist server=/.stoporganharvesting.org/127.0.0.1#7913 @@ -4546,8 +4544,8 @@ server=/.player.fm/127.0.0.1#7913 ipset=/.player.fm/gfwlist server=/.kurashsultan.com/127.0.0.1#7913 ipset=/.kurashsultan.com/gfwlist -server=/.softsmirror.cf/127.0.0.1#7913 -ipset=/.softsmirror.cf/gfwlist +server=/.akiba-online.com/127.0.0.1#7913 +ipset=/.akiba-online.com/gfwlist server=/.trickip.net/127.0.0.1#7913 ipset=/.trickip.net/gfwlist server=/.pullfolio.com/127.0.0.1#7913 @@ -4566,8 +4564,6 @@ server=/.tibetwrites.org/127.0.0.1#7913 ipset=/.tibetwrites.org/gfwlist server=/.dontmovetochina.com/127.0.0.1#7913 ipset=/.dontmovetochina.com/gfwlist -server=/.haoel.github.io/127.0.0.1#7913 -ipset=/.haoel.github.io/gfwlist server=/.unblocksit.es/127.0.0.1#7913 ipset=/.unblocksit.es/gfwlist server=/.techviz.net/127.0.0.1#7913 @@ -4576,8 +4572,8 @@ server=/.duckduckgo.com/127.0.0.1#7913 ipset=/.duckduckgo.com/gfwlist server=/.bwgyhw.com/127.0.0.1#7913 ipset=/.bwgyhw.com/gfwlist -server=/.gunsamerica.com/127.0.0.1#7913 -ipset=/.gunsamerica.com/gfwlist +server=/.about.google/127.0.0.1#7913 +ipset=/.about.google/gfwlist server=/.m.plixi.com/127.0.0.1#7913 ipset=/.m.plixi.com/gfwlist server=/.soundofhope.org/127.0.0.1#7913 @@ -4598,8 +4594,6 @@ server=/.xgmyd.com/127.0.0.1#7913 ipset=/.xgmyd.com/gfwlist server=/.oyghan.com/127.0.0.1#7913 ipset=/.oyghan.com/gfwlist -server=/.sodatea.github.io/127.0.0.1#7913 -ipset=/.sodatea.github.io/gfwlist server=/.djorz.com/127.0.0.1#7913 ipset=/.djorz.com/gfwlist server=/.geekheart.info/127.0.0.1#7913 @@ -4620,8 +4614,8 @@ server=/.ns2.name/127.0.0.1#7913 ipset=/.ns2.name/gfwlist server=/.kingstone.com.tw/127.0.0.1#7913 ipset=/.kingstone.com.tw/gfwlist -server=/.ifcss.org/127.0.0.1#7913 -ipset=/.ifcss.org/gfwlist +server=/.blog.fizzik.com/127.0.0.1#7913 +ipset=/.blog.fizzik.com/gfwlist server=/.btdigg.org/127.0.0.1#7913 ipset=/.btdigg.org/gfwlist server=/.apkmonk.com/127.0.0.1#7913 @@ -4650,8 +4644,8 @@ server=/.picturedip.com/127.0.0.1#7913 ipset=/.picturedip.com/gfwlist server=/.fuckgfw.org/127.0.0.1#7913 ipset=/.fuckgfw.org/gfwlist -server=/.boyangu.com/127.0.0.1#7913 -ipset=/.boyangu.com/gfwlist +server=/.faith100.org/127.0.0.1#7913 +ipset=/.faith100.org/gfwlist server=/.plm.org.hk/127.0.0.1#7913 ipset=/.plm.org.hk/gfwlist server=/.greatfirewall.biz/127.0.0.1#7913 @@ -4664,8 +4658,8 @@ server=/.a248.e.akamai.net/127.0.0.1#7913 ipset=/.a248.e.akamai.net/gfwlist server=/.demosisto.hk/127.0.0.1#7913 ipset=/.demosisto.hk/gfwlist -server=/.cmx.im/127.0.0.1#7913 -ipset=/.cmx.im/gfwlist +server=/.isgreat.org/127.0.0.1#7913 +ipset=/.isgreat.org/gfwlist server=/.xfm.pp.ru/127.0.0.1#7913 ipset=/.xfm.pp.ru/gfwlist server=/.news.yahoo.com/127.0.0.1#7913 @@ -4810,8 +4804,8 @@ server=/.vaticannews.va/127.0.0.1#7913 ipset=/.vaticannews.va/gfwlist server=/.networktunnel.net/127.0.0.1#7913 ipset=/.networktunnel.net/gfwlist -server=/.ddns.ms/127.0.0.1#7913 -ipset=/.ddns.ms/gfwlist +server=/.admob.com/127.0.0.1#7913 +ipset=/.admob.com/gfwlist server=/.dtic.mil/127.0.0.1#7913 ipset=/.dtic.mil/gfwlist server=/.gooday.xyz/127.0.0.1#7913 @@ -4850,10 +4844,10 @@ server=/.eksisozluk.com/127.0.0.1#7913 ipset=/.eksisozluk.com/gfwlist server=/.qiangwaikan.com/127.0.0.1#7913 ipset=/.qiangwaikan.com/gfwlist -server=/.chinaway.org/127.0.0.1#7913 -ipset=/.chinaway.org/gfwlist -server=/.85cc.us/127.0.0.1#7913 -ipset=/.85cc.us/gfwlist +server=/.anonymise.us/127.0.0.1#7913 +ipset=/.anonymise.us/gfwlist +server=/.xuehua.us/127.0.0.1#7913 +ipset=/.xuehua.us/gfwlist server=/.justpaste.it/127.0.0.1#7913 ipset=/.justpaste.it/gfwlist server=/.blogspot.hk/127.0.0.1#7913 @@ -4868,8 +4862,8 @@ server=/.rangzen.com/127.0.0.1#7913 ipset=/.rangzen.com/gfwlist server=/.toonel.net/127.0.0.1#7913 ipset=/.toonel.net/gfwlist -server=/.askstudent.com/127.0.0.1#7913 -ipset=/.askstudent.com/gfwlist +server=/.flgjustice.org/127.0.0.1#7913 +ipset=/.flgjustice.org/gfwlist server=/.hkjc.com/127.0.0.1#7913 ipset=/.hkjc.com/gfwlist server=/.twtr2src.ogaoga.org/127.0.0.1#7913 @@ -4896,8 +4890,8 @@ server=/.onmypc.biz/127.0.0.1#7913 ipset=/.onmypc.biz/gfwlist server=/.rixcloud.com/127.0.0.1#7913 ipset=/.rixcloud.com/gfwlist -server=/.hotav.tv/127.0.0.1#7913 -ipset=/.hotav.tv/gfwlist +server=/.ub0.cc/127.0.0.1#7913 +ipset=/.ub0.cc/gfwlist server=/.steemit.com/127.0.0.1#7913 ipset=/.steemit.com/gfwlist server=/.lsxszzg.com/127.0.0.1#7913 @@ -4906,36 +4900,32 @@ server=/.greenpeace.org/127.0.0.1#7913 ipset=/.greenpeace.org/gfwlist server=/.xkiwi.tk/127.0.0.1#7913 ipset=/.xkiwi.tk/gfwlist +server=/.workerdemo.org.hk/127.0.0.1#7913 +ipset=/.workerdemo.org.hk/gfwlist +server=/.google.dk/127.0.0.1#7913 +ipset=/.google.dk/gfwlist server=/.xn--90wwvt03e.com/127.0.0.1#7913 ipset=/.xn--90wwvt03e.com/gfwlist server=/.xn--oiq.cc/127.0.0.1#7913 ipset=/.xn--oiq.cc/gfwlist -server=/.workerdemo.org.hk/127.0.0.1#7913 -ipset=/.workerdemo.org.hk/gfwlist -server=/.cdnews.com.tw/127.0.0.1#7913 -ipset=/.cdnews.com.tw/gfwlist server=/.xn--i2ru8q2qg.com/127.0.0.1#7913 ipset=/.xn--i2ru8q2qg.com/gfwlist -server=/.xn--4gq171p.com/127.0.0.1#7913 -ipset=/.xn--4gq171p.com/gfwlist -server=/.cloudflare.com/127.0.0.1#7913 -ipset=/.cloudflare.com/gfwlist server=/.fulione.com/127.0.0.1#7913 ipset=/.fulione.com/gfwlist -server=/.s-onetag.com/127.0.0.1#7913 -ipset=/.s-onetag.com/gfwlist +server=/.xn--4gq171p.com/127.0.0.1#7913 +ipset=/.xn--4gq171p.com/gfwlist server=/.greasespot.net/127.0.0.1#7913 ipset=/.greasespot.net/gfwlist server=/.sockscap64.com/127.0.0.1#7913 ipset=/.sockscap64.com/gfwlist -server=/.c-span.org/127.0.0.1#7913 -ipset=/.c-span.org/gfwlist +server=/.thongdreams.com/127.0.0.1#7913 +ipset=/.thongdreams.com/gfwlist server=/.fast.wistia.com/127.0.0.1#7913 ipset=/.fast.wistia.com/gfwlist -server=/.hkbc.net/127.0.0.1#7913 -ipset=/.hkbc.net/gfwlist -server=/.bot.nu/127.0.0.1#7913 -ipset=/.bot.nu/gfwlist +server=/.vultryhw.com/127.0.0.1#7913 +ipset=/.vultryhw.com/gfwlist +server=/.redhat.com/127.0.0.1#7913 +ipset=/.redhat.com/gfwlist server=/.deja.com/127.0.0.1#7913 ipset=/.deja.com/gfwlist server=/.twt.tl/127.0.0.1#7913 @@ -4946,42 +4936,42 @@ server=/.cumlouder.com/127.0.0.1#7913 ipset=/.cumlouder.com/gfwlist server=/.ebookbrowse.com/127.0.0.1#7913 ipset=/.ebookbrowse.com/gfwlist -server=/.nflximg.com/127.0.0.1#7913 -ipset=/.nflximg.com/gfwlist -server=/.godsdirectcontact.org.tw/127.0.0.1#7913 -ipset=/.godsdirectcontact.org.tw/gfwlist +server=/.twbbs.tw/127.0.0.1#7913 +ipset=/.twbbs.tw/gfwlist +server=/.classicalguitarblog.net/127.0.0.1#7913 +ipset=/.classicalguitarblog.net/gfwlist server=/.rocketcdn.me/127.0.0.1#7913 ipset=/.rocketcdn.me/gfwlist -server=/.foxnewsplayer-a.akamaihd.net/127.0.0.1#7913 -ipset=/.foxnewsplayer-a.akamaihd.net/gfwlist -server=/.news.ycombinator.com/127.0.0.1#7913 -ipset=/.news.ycombinator.com/gfwlist -server=/.skimresources.com/127.0.0.1#7913 -ipset=/.skimresources.com/gfwlist +server=/.wireguard.com/127.0.0.1#7913 +ipset=/.wireguard.com/gfwlist +server=/.cloudflare.com/127.0.0.1#7913 +ipset=/.cloudflare.com/gfwlist +server=/.c-span.org/127.0.0.1#7913 +ipset=/.c-span.org/gfwlist server=/.download.ithome.com.tw/127.0.0.1#7913 ipset=/.download.ithome.com.tw/gfwlist -server=/.bitcoinworld.com/127.0.0.1#7913 -ipset=/.bitcoinworld.com/gfwlist -server=/.vpnintouch.com/127.0.0.1#7913 -ipset=/.vpnintouch.com/gfwlist -server=/.nbcnews.com/127.0.0.1#7913 -ipset=/.nbcnews.com/gfwlist +server=/.hopto.org/127.0.0.1#7913 +ipset=/.hopto.org/gfwlist +server=/.twskype.com/127.0.0.1#7913 +ipset=/.twskype.com/gfwlist +server=/.fsurf.com/127.0.0.1#7913 +ipset=/.fsurf.com/gfwlist server=/.7cow.com/127.0.0.1#7913 ipset=/.7cow.com/gfwlist server=/.taconet.com.tw/127.0.0.1#7913 ipset=/.taconet.com.tw/gfwlist server=/.velkaepocha.sk/127.0.0.1#7913 ipset=/.velkaepocha.sk/gfwlist -server=/.mosucloud.site/127.0.0.1#7913 -ipset=/.mosucloud.site/gfwlist +server=/.foxnewsplayer-a.akamaihd.net/127.0.0.1#7913 +ipset=/.foxnewsplayer-a.akamaihd.net/gfwlist server=/.soh.tw/127.0.0.1#7913 ipset=/.soh.tw/gfwlist -server=/.cdn.ampproject.org/127.0.0.1#7913 -ipset=/.cdn.ampproject.org/gfwlist +server=/.github.io/127.0.0.1#7913 +ipset=/.github.io/gfwlist server=/.newsancai.com/127.0.0.1#7913 ipset=/.newsancai.com/gfwlist -server=/.tweetree.com/127.0.0.1#7913 -ipset=/.tweetree.com/gfwlist +server=/.news.ycombinator.com/127.0.0.1#7913 +ipset=/.news.ycombinator.com/gfwlist server=/.iconpaper.org/127.0.0.1#7913 ipset=/.iconpaper.org/gfwlist server=/.xxxx.com.au/127.0.0.1#7913 @@ -4992,94 +4982,94 @@ server=/.hrtsea.com/127.0.0.1#7913 ipset=/.hrtsea.com/gfwlist server=/.xxxfuckmom.com/127.0.0.1#7913 ipset=/.xxxfuckmom.com/gfwlist -server=/.suprememastertv.com/127.0.0.1#7913 -ipset=/.suprememastertv.com/gfwlist -server=/.stweetly.com/127.0.0.1#7913 -ipset=/.stweetly.com/gfwlist -server=/.new-akiba.com/127.0.0.1#7913 -ipset=/.new-akiba.com/gfwlist +server=/.skimresources.com/127.0.0.1#7913 +ipset=/.skimresources.com/gfwlist +server=/.vpnpronet.com/127.0.0.1#7913 +ipset=/.vpnpronet.com/gfwlist +server=/.nbcnews.com/127.0.0.1#7913 +ipset=/.nbcnews.com/gfwlist server=/.macts.com.tw/127.0.0.1#7913 ipset=/.macts.com.tw/gfwlist -server=/.thepiratebay.ee/127.0.0.1#7913 -ipset=/.thepiratebay.ee/gfwlist +server=/.mosucloud.site/127.0.0.1#7913 +ipset=/.mosucloud.site/gfwlist server=/.crrev.com/127.0.0.1#7913 ipset=/.crrev.com/gfwlist -server=/.hitomi.la/127.0.0.1#7913 -ipset=/.hitomi.la/gfwlist -server=/.nypost.com/127.0.0.1#7913 -ipset=/.nypost.com/gfwlist -server=/.inoreader.com/127.0.0.1#7913 -ipset=/.inoreader.com/gfwlist -server=/.travelinkcard.com/127.0.0.1#7913 -ipset=/.travelinkcard.com/gfwlist +server=/.flickrhivemind.net/127.0.0.1#7913 +ipset=/.flickrhivemind.net/gfwlist +server=/.tw.money.yahoo.com/127.0.0.1#7913 +ipset=/.tw.money.yahoo.com/gfwlist +server=/.twibase.com/127.0.0.1#7913 +ipset=/.twibase.com/gfwlist +server=/.blog.syx86.cn/127.0.0.1#7913 +ipset=/.blog.syx86.cn/gfwlist server=/.heungkongdiscuss.com/127.0.0.1#7913 ipset=/.heungkongdiscuss.com/gfwlist -server=/.evchk.wikia.org/127.0.0.1#7913 -ipset=/.evchk.wikia.org/gfwlist +server=/.stweetly.com/127.0.0.1#7913 +ipset=/.stweetly.com/gfwlist server=/.atc.org.au/127.0.0.1#7913 ipset=/.atc.org.au/gfwlist server=/.asianews.it/127.0.0.1#7913 ipset=/.asianews.it/gfwlist -server=/.wp.com/127.0.0.1#7913 -ipset=/.wp.com/gfwlist -server=/.yegle.net/127.0.0.1#7913 -ipset=/.yegle.net/gfwlist -server=/.apidocs.linksalpha.com/127.0.0.1#7913 -ipset=/.apidocs.linksalpha.com/gfwlist +server=/.new-akiba.com/127.0.0.1#7913 +ipset=/.new-akiba.com/gfwlist +server=/.thepiratebay.ee/127.0.0.1#7913 +ipset=/.thepiratebay.ee/gfwlist +server=/.nypost.com/127.0.0.1#7913 +ipset=/.nypost.com/gfwlist server=/.ns02.biz/127.0.0.1#7913 ipset=/.ns02.biz/gfwlist -server=/.cam4.sg/127.0.0.1#7913 -ipset=/.cam4.sg/gfwlist +server=/.inoreader.com/127.0.0.1#7913 +ipset=/.inoreader.com/gfwlist server=/.china5000.us/127.0.0.1#7913 ipset=/.china5000.us/gfwlist -server=/.knowyourmeme.com/127.0.0.1#7913 -ipset=/.knowyourmeme.com/gfwlist -server=/.cointobe.com/127.0.0.1#7913 -ipset=/.cointobe.com/gfwlist -server=/.htl.li/127.0.0.1#7913 -ipset=/.htl.li/gfwlist +server=/.travelinkcard.com/127.0.0.1#7913 +ipset=/.travelinkcard.com/gfwlist +server=/.paperb.us/127.0.0.1#7913 +ipset=/.paperb.us/gfwlist +server=/.evchk.wikia.org/127.0.0.1#7913 +ipset=/.evchk.wikia.org/gfwlist server=/.e-hentai.org/127.0.0.1#7913 ipset=/.e-hentai.org/gfwlist -server=/.lala.im/127.0.0.1#7913 -ipset=/.lala.im/gfwlist -server=/.godns.work/127.0.0.1#7913 -ipset=/.godns.work/gfwlist -server=/.ctwant.com/127.0.0.1#7913 -ipset=/.ctwant.com/gfwlist +server=/.wp.com/127.0.0.1#7913 +ipset=/.wp.com/gfwlist +server=/.flagsonline.it/127.0.0.1#7913 +ipset=/.flagsonline.it/gfwlist +server=/.yhcw.net/127.0.0.1#7913 +ipset=/.yhcw.net/gfwlist server=/.ampproject.org/127.0.0.1#7913 ipset=/.ampproject.org/gfwlist -server=/.memes.tw/127.0.0.1#7913 -ipset=/.memes.tw/gfwlist +server=/.mysinablog.com/127.0.0.1#7913 +ipset=/.mysinablog.com/gfwlist server=/.wearehairy.com/127.0.0.1#7913 ipset=/.wearehairy.com/gfwlist server=/.mypop3.org/127.0.0.1#7913 ipset=/.mypop3.org/gfwlist server=/.flyzy2005.com/127.0.0.1#7913 ipset=/.flyzy2005.com/gfwlist -server=/.feedly.com/127.0.0.1#7913 -ipset=/.feedly.com/gfwlist -server=/.dafagood.com/127.0.0.1#7913 -ipset=/.dafagood.com/gfwlist +server=/.electionsmeter.com/127.0.0.1#7913 +ipset=/.electionsmeter.com/gfwlist +server=/.hexieshe.com/127.0.0.1#7913 +ipset=/.hexieshe.com/gfwlist server=/.equinenow.com/127.0.0.1#7913 ipset=/.equinenow.com/gfwlist server=/.alforattv.net/127.0.0.1#7913 ipset=/.alforattv.net/gfwlist -server=/.gnews.org/127.0.0.1#7913 -ipset=/.gnews.org/gfwlist +server=/.knowyourmeme.com/127.0.0.1#7913 +ipset=/.knowyourmeme.com/gfwlist server=/.app.box.com/127.0.0.1#7913 ipset=/.app.box.com/gfwlist -server=/.v2mm.tech/127.0.0.1#7913 -ipset=/.v2mm.tech/gfwlist +server=/.ow.ly/127.0.0.1#7913 +ipset=/.ow.ly/gfwlist server=/.totalvpn.com/127.0.0.1#7913 ipset=/.totalvpn.com/gfwlist -server=/.lighti.me/127.0.0.1#7913 -ipset=/.lighti.me/gfwlist -server=/.g.kfd.me/127.0.0.1#7913 -ipset=/.g.kfd.me/gfwlist -server=/.wiki.kfd.me/127.0.0.1#7913 -ipset=/.wiki.kfd.me/gfwlist -server=/.duyaoss.com/127.0.0.1#7913 -ipset=/.duyaoss.com/gfwlist +server=/.lala.im/127.0.0.1#7913 +ipset=/.lala.im/gfwlist +server=/.ctwant.com/127.0.0.1#7913 +ipset=/.ctwant.com/gfwlist +server=/.memes.tw/127.0.0.1#7913 +ipset=/.memes.tw/gfwlist +server=/.feedly.com/127.0.0.1#7913 +ipset=/.feedly.com/gfwlist server=/.newipnow.com/127.0.0.1#7913 ipset=/.newipnow.com/gfwlist server=/.vegasred.com/127.0.0.1#7913 @@ -5088,24 +5078,24 @@ server=/.figprayer.com/127.0.0.1#7913 ipset=/.figprayer.com/gfwlist server=/.imageab.com/127.0.0.1#7913 ipset=/.imageab.com/gfwlist -server=/.wiki.jqueryui.com/127.0.0.1#7913 -ipset=/.wiki.jqueryui.com/gfwlist -server=/.justmysocks.net/127.0.0.1#7913 -ipset=/.justmysocks.net/gfwlist -server=/.javdb.com/127.0.0.1#7913 -ipset=/.javdb.com/gfwlist -server=/.mydati.com/127.0.0.1#7913 -ipset=/.mydati.com/gfwlist -server=/.pems.dot.ca.gov/127.0.0.1#7913 -ipset=/.pems.dot.ca.gov/gfwlist -server=/.china-week.com/127.0.0.1#7913 -ipset=/.china-week.com/gfwlist -server=/.app.cloudcone.com/127.0.0.1#7913 -ipset=/.app.cloudcone.com/gfwlist +server=/.gnews.org/127.0.0.1#7913 +ipset=/.gnews.org/gfwlist +server=/.v2mm.tech/127.0.0.1#7913 +ipset=/.v2mm.tech/gfwlist +server=/.erodoujinlog.com/127.0.0.1#7913 +ipset=/.erodoujinlog.com/gfwlist +server=/.g.kfd.me/127.0.0.1#7913 +ipset=/.g.kfd.me/gfwlist +server=/.wiki.kfd.me/127.0.0.1#7913 +ipset=/.wiki.kfd.me/gfwlist +server=/.duyaoss.com/127.0.0.1#7913 +ipset=/.duyaoss.com/gfwlist +server=/.pbxes.org/127.0.0.1#7913 +ipset=/.pbxes.org/gfwlist server=/.webevader.org/127.0.0.1#7913 ipset=/.webevader.org/gfwlist -server=/.myiphider.com/127.0.0.1#7913 -ipset=/.myiphider.com/gfwlist +server=/.justmysocks.net/127.0.0.1#7913 +ipset=/.justmysocks.net/gfwlist server=/.cq99.us/127.0.0.1#7913 ipset=/.cq99.us/gfwlist server=/.opml.radiotime.com/127.0.0.1#7913 @@ -5116,60 +5106,60 @@ server=/.webfreer.com/127.0.0.1#7913 ipset=/.webfreer.com/gfwlist server=/.bannednews.org/127.0.0.1#7913 ipset=/.bannednews.org/gfwlist -server=/.punyu.com/127.0.0.1#7913 -ipset=/.punyu.com/gfwlist -server=/.jable.tv/127.0.0.1#7913 -ipset=/.jable.tv/gfwlist -server=/.puffin.com/127.0.0.1#7913 -ipset=/.puffin.com/gfwlist +server=/.javdb.com/127.0.0.1#7913 +ipset=/.javdb.com/gfwlist +server=/.mydati.com/127.0.0.1#7913 +ipset=/.mydati.com/gfwlist +server=/.pems.dot.ca.gov/127.0.0.1#7913 +ipset=/.pems.dot.ca.gov/gfwlist server=/.time.com/127.0.0.1#7913 ipset=/.time.com/gfwlist server=/.xtube.com/127.0.0.1#7913 ipset=/.xtube.com/gfwlist -server=/.zsdxzk.com/127.0.0.1#7913 -ipset=/.zsdxzk.com/gfwlist +server=/.china-week.com/127.0.0.1#7913 +ipset=/.china-week.com/gfwlist server=/.share.america.gov/127.0.0.1#7913 ipset=/.share.america.gov/gfwlist -server=/.nchrd.org/127.0.0.1#7913 -ipset=/.nchrd.org/gfwlist -server=/.biggo.com.tw/127.0.0.1#7913 -ipset=/.biggo.com.tw/gfwlist +server=/.app.cloudcone.com/127.0.0.1#7913 +ipset=/.app.cloudcone.com/gfwlist +server=/.myiphider.com/127.0.0.1#7913 +ipset=/.myiphider.com/gfwlist server=/.saveliuxiaobo.com/127.0.0.1#7913 ipset=/.saveliuxiaobo.com/gfwlist server=/.getfreedur.com/127.0.0.1#7913 ipset=/.getfreedur.com/gfwlist -server=/.parts.blog.livedoor.jp/127.0.0.1#7913 -ipset=/.parts.blog.livedoor.jp/gfwlist +server=/.glock.com/127.0.0.1#7913 +ipset=/.glock.com/gfwlist server=/.vpnhq.com/127.0.0.1#7913 ipset=/.vpnhq.com/gfwlist -server=/.clips4sale.com/127.0.0.1#7913 -ipset=/.clips4sale.com/gfwlist -server=/.bwh1.net/127.0.0.1#7913 -ipset=/.bwh1.net/gfwlist +server=/.jable.tv/127.0.0.1#7913 +ipset=/.jable.tv/gfwlist +server=/.ozxw.com/127.0.0.1#7913 +ipset=/.ozxw.com/gfwlist server=/.starfishfx.com/127.0.0.1#7913 ipset=/.starfishfx.com/gfwlist -server=/.ocsp.int-x3.letsencrypt.org/127.0.0.1#7913 -ipset=/.ocsp.int-x3.letsencrypt.org/gfwlist +server=/.puffin.com/127.0.0.1#7913 +ipset=/.puffin.com/gfwlist server=/.left21.hk/127.0.0.1#7913 ipset=/.left21.hk/gfwlist -server=/.tintuc101.com/127.0.0.1#7913 -ipset=/.tintuc101.com/gfwlist -server=/.see.xxx/127.0.0.1#7913 -ipset=/.see.xxx/gfwlist +server=/.zsdxzk.com/127.0.0.1#7913 +ipset=/.zsdxzk.com/gfwlist +server=/.nchrd.org/127.0.0.1#7913 +ipset=/.nchrd.org/gfwlist server=/.sfshibao.com/127.0.0.1#7913 ipset=/.sfshibao.com/gfwlist -server=/.goliathguitartutorials.com/127.0.0.1#7913 -ipset=/.goliathguitartutorials.com/gfwlist -server=/.xvideos-cdn.com/127.0.0.1#7913 -ipset=/.xvideos-cdn.com/gfwlist +server=/.biggo.com.tw/127.0.0.1#7913 +ipset=/.biggo.com.tw/gfwlist +server=/.parts.blog.livedoor.jp/127.0.0.1#7913 +ipset=/.parts.blog.livedoor.jp/gfwlist server=/.blog.istef.info/127.0.0.1#7913 ipset=/.blog.istef.info/gfwlist -server=/.chinasmile.net/127.0.0.1#7913 -ipset=/.chinasmile.net/gfwlist -server=/.pornbest.org/127.0.0.1#7913 -ipset=/.pornbest.org/gfwlist -server=/.zello.com/127.0.0.1#7913 -ipset=/.zello.com/gfwlist +server=/.chinaaid.us/127.0.0.1#7913 +ipset=/.chinaaid.us/gfwlist +server=/.clips4sale.com/127.0.0.1#7913 +ipset=/.clips4sale.com/gfwlist +server=/.ocsp.int-x3.letsencrypt.org/127.0.0.1#7913 +ipset=/.ocsp.int-x3.letsencrypt.org/gfwlist server=/.tbtemple.org.uk/127.0.0.1#7913 ipset=/.tbtemple.org.uk/gfwlist server=/.phprcdn.com/127.0.0.1#7913 @@ -5178,14 +5168,14 @@ server=/.porn5.com/127.0.0.1#7913 ipset=/.porn5.com/gfwlist server=/.mytalkbox.com/127.0.0.1#7913 ipset=/.mytalkbox.com/gfwlist -server=/.zyzc9.com/127.0.0.1#7913 -ipset=/.zyzc9.com/gfwlist +server=/.orgasm.com/127.0.0.1#7913 +ipset=/.orgasm.com/gfwlist server=/.suppig.net/127.0.0.1#7913 ipset=/.suppig.net/gfwlist -server=/.zynaima.com/127.0.0.1#7913 -ipset=/.zynaima.com/gfwlist -server=/.unification.net/127.0.0.1#7913 -ipset=/.unification.net/gfwlist +server=/.see.xxx/127.0.0.1#7913 +ipset=/.see.xxx/gfwlist +server=/.goliathguitartutorials.com/127.0.0.1#7913 +ipset=/.goliathguitartutorials.com/gfwlist server=/.sleazydream.com/127.0.0.1#7913 ipset=/.sleazydream.com/gfwlist server=/.fdc64.de/127.0.0.1#7913 @@ -5196,158 +5186,158 @@ server=/.dnset.com/127.0.0.1#7913 ipset=/.dnset.com/gfwlist server=/.tibetcorps.org/127.0.0.1#7913 ipset=/.tibetcorps.org/gfwlist -server=/.saiq.me/127.0.0.1#7913 -ipset=/.saiq.me/gfwlist +server=/.xvideos-cdn.com/127.0.0.1#7913 +ipset=/.xvideos-cdn.com/gfwlist server=/.antichristendom.com/127.0.0.1#7913 ipset=/.antichristendom.com/gfwlist server=/.holymountaincn.com/127.0.0.1#7913 ipset=/.holymountaincn.com/gfwlist -server=/.zuobiao.me/127.0.0.1#7913 -ipset=/.zuobiao.me/gfwlist +server=/.pornbest.org/127.0.0.1#7913 +ipset=/.pornbest.org/gfwlist server=/.philborges.com/127.0.0.1#7913 ipset=/.philborges.com/gfwlist server=/.wenyunchao.com/127.0.0.1#7913 ipset=/.wenyunchao.com/gfwlist -server=/.zsrhao.com/127.0.0.1#7913 -ipset=/.zsrhao.com/gfwlist -server=/.iipdigital.usembassy.gov/127.0.0.1#7913 -ipset=/.iipdigital.usembassy.gov/gfwlist +server=/.zhangtianliang.com/127.0.0.1#7913 +ipset=/.zhangtianliang.com/gfwlist +server=/.zyzc9.com/127.0.0.1#7913 +ipset=/.zyzc9.com/gfwlist server=/.leisurecafe.ca/127.0.0.1#7913 ipset=/.leisurecafe.ca/gfwlist -server=/.ice.audionow.com/127.0.0.1#7913 -ipset=/.ice.audionow.com/gfwlist -server=/.writer.zoho.com/127.0.0.1#7913 -ipset=/.writer.zoho.com/gfwlist -server=/.tor.cn.uptodown.com/127.0.0.1#7913 -ipset=/.tor.cn.uptodown.com/gfwlist -server=/.zootool.com/127.0.0.1#7913 -ipset=/.zootool.com/gfwlist +server=/.zynaima.com/127.0.0.1#7913 +ipset=/.zynaima.com/gfwlist +server=/.unpo.org/127.0.0.1#7913 +ipset=/.unpo.org/gfwlist +server=/.provpnaccounts.com/127.0.0.1#7913 +ipset=/.provpnaccounts.com/gfwlist +server=/.zuobiao.me/127.0.0.1#7913 +ipset=/.zuobiao.me/gfwlist server=/.privatetunnel.com/127.0.0.1#7913 ipset=/.privatetunnel.com/gfwlist -server=/.zoogvpn.com/127.0.0.1#7913 -ipset=/.zoogvpn.com/gfwlist +server=/.zsrhao.com/127.0.0.1#7913 +ipset=/.zsrhao.com/gfwlist server=/.tcsovi.org/127.0.0.1#7913 ipset=/.tcsovi.org/gfwlist -server=/.zonghexinwen.net/127.0.0.1#7913 -ipset=/.zonghexinwen.net/gfwlist -server=/.zomobo.net/127.0.0.1#7913 -ipset=/.zomobo.net/gfwlist -server=/.zmw.cn/127.0.0.1#7913 -ipset=/.zmw.cn/gfwlist +server=/.pscp.tv/127.0.0.1#7913 +ipset=/.pscp.tv/gfwlist +server=/.archive.ph/127.0.0.1#7913 +ipset=/.archive.ph/gfwlist +server=/.writer.zoho.com/127.0.0.1#7913 +ipset=/.writer.zoho.com/gfwlist server=/.dotgov.gov/127.0.0.1#7913 ipset=/.dotgov.gov/gfwlist server=/.nhk-ondemand.jp/127.0.0.1#7913 ipset=/.nhk-ondemand.jp/gfwlist server=/.uni.cc/127.0.0.1#7913 ipset=/.uni.cc/gfwlist -server=/.realforum.zkiz.com/127.0.0.1#7913 -ipset=/.realforum.zkiz.com/gfwlist +server=/.faststone.org/127.0.0.1#7913 +ipset=/.faststone.org/gfwlist server=/.busayari.com/127.0.0.1#7913 ipset=/.busayari.com/gfwlist server=/.localbitcoins.com/127.0.0.1#7913 ipset=/.localbitcoins.com/gfwlist -server=/.vpnunlimitedapp.com/127.0.0.1#7913 -ipset=/.vpnunlimitedapp.com/gfwlist -server=/.ziporn.com/127.0.0.1#7913 -ipset=/.ziporn.com/gfwlist +server=/.zootool.com/127.0.0.1#7913 +ipset=/.zootool.com/gfwlist +server=/.zoogvpn.com/127.0.0.1#7913 +ipset=/.zoogvpn.com/gfwlist server=/.helpeachpeople.com/127.0.0.1#7913 ipset=/.helpeachpeople.com/gfwlist -server=/.newstapa.org/127.0.0.1#7913 -ipset=/.newstapa.org/gfwlist +server=/.zonghexinwen.net/127.0.0.1#7913 +ipset=/.zonghexinwen.net/gfwlist server=/.skyxvpn.com/127.0.0.1#7913 ipset=/.skyxvpn.com/gfwlist +server=/.zomobo.net/127.0.0.1#7913 +ipset=/.zomobo.net/gfwlist +server=/.zmw.cn/127.0.0.1#7913 +ipset=/.zmw.cn/gfwlist +server=/.realforum.zkiz.com/127.0.0.1#7913 +ipset=/.realforum.zkiz.com/gfwlist +server=/.vtunnel.com/127.0.0.1#7913 +ipset=/.vtunnel.com/gfwlist +server=/.ziporn.com/127.0.0.1#7913 +ipset=/.ziporn.com/gfwlist +server=/.br.st/127.0.0.1#7913 +ipset=/.br.st/gfwlist +server=/.yourlust.com/127.0.0.1#7913 +ipset=/.yourlust.com/gfwlist server=/.ziddu.com/127.0.0.1#7913 ipset=/.ziddu.com/gfwlist server=/.book.zi5.me/127.0.0.1#7913 ipset=/.book.zi5.me/gfwlist -server=/.zhuatieba.com/127.0.0.1#7913 -ipset=/.zhuatieba.com/gfwlist -server=/.pbworks.com/127.0.0.1#7913 -ipset=/.pbworks.com/gfwlist -server=/.zhoushuguang.com/127.0.0.1#7913 -ipset=/.zhoushuguang.com/gfwlist -server=/.zhongguorenquan.org/127.0.0.1#7913 -ipset=/.zhongguorenquan.org/gfwlist -server=/.yourlust.com/127.0.0.1#7913 -ipset=/.yourlust.com/gfwlist -server=/.zhongguo.ca/127.0.0.1#7913 -ipset=/.zhongguo.ca/gfwlist -server=/.zhinengluyou.com/127.0.0.1#7913 -ipset=/.zhinengluyou.com/gfwlist server=/.is-a-hunter.com/127.0.0.1#7913 ipset=/.is-a-hunter.com/gfwlist server=/.mcreasite.com/127.0.0.1#7913 ipset=/.mcreasite.com/gfwlist -server=/.zhenxiang.biz/127.0.0.1#7913 -ipset=/.zhenxiang.biz/gfwlist +server=/.zhuatieba.com/127.0.0.1#7913 +ipset=/.zhuatieba.com/gfwlist server=/.kone.com/127.0.0.1#7913 ipset=/.kone.com/gfwlist -server=/.zhenlibu1984.com/127.0.0.1#7913 -ipset=/.zhenlibu1984.com/gfwlist +server=/.hitomi.la/127.0.0.1#7913 +ipset=/.hitomi.la/gfwlist server=/.whatsapp.net/127.0.0.1#7913 ipset=/.whatsapp.net/gfwlist server=/.h5galgame.me/127.0.0.1#7913 ipset=/.h5galgame.me/gfwlist server=/.chinamz.org/127.0.0.1#7913 ipset=/.chinamz.org/gfwlist +server=/.zhoushuguang.com/127.0.0.1#7913 +ipset=/.zhoushuguang.com/gfwlist +server=/.zhongguorenquan.org/127.0.0.1#7913 +ipset=/.zhongguorenquan.org/gfwlist +server=/.zhongguo.ca/127.0.0.1#7913 +ipset=/.zhongguo.ca/gfwlist +server=/.zhinengluyou.com/127.0.0.1#7913 +ipset=/.zhinengluyou.com/gfwlist +server=/.hstt.net/127.0.0.1#7913 +ipset=/.hstt.net/gfwlist +server=/.zhenxiang.biz/127.0.0.1#7913 +ipset=/.zhenxiang.biz/gfwlist +server=/.zhenlibu1984.com/127.0.0.1#7913 +ipset=/.zhenlibu1984.com/gfwlist server=/.zhenlibu.info/127.0.0.1#7913 ipset=/.zhenlibu.info/gfwlist -server=/.googleplus.com/127.0.0.1#7913 -ipset=/.googleplus.com/gfwlist +server=/.panoramio.com/127.0.0.1#7913 +ipset=/.panoramio.com/gfwlist server=/.zhengjian.org/127.0.0.1#7913 ipset=/.zhengjian.org/gfwlist server=/.zhenghui.org/127.0.0.1#7913 ipset=/.zhenghui.org/gfwlist -server=/.hstt.net/127.0.0.1#7913 -ipset=/.hstt.net/gfwlist -server=/.zhangtianliang.com/127.0.0.1#7913 -ipset=/.zhangtianliang.com/gfwlist +server=/.zzcartoon.com/127.0.0.1#7913 +ipset=/.zzcartoon.com/gfwlist server=/.zhangboli.net/127.0.0.1#7913 ipset=/.zhangboli.net/gfwlist +server=/.vizvaz.com/127.0.0.1#7913 +ipset=/.vizvaz.com/gfwlist server=/.zgsddh.com/127.0.0.1#7913 ipset=/.zgsddh.com/gfwlist server=/.zfreet.com/127.0.0.1#7913 ipset=/.zfreet.com/gfwlist +server=/.dns05.com/127.0.0.1#7913 +ipset=/.dns05.com/gfwlist server=/.zenmate.com.ru/127.0.0.1#7913 ipset=/.zenmate.com.ru/gfwlist server=/.zengjinyan.org/127.0.0.1#7913 ipset=/.zengjinyan.org/gfwlist -server=/.zzcartoon.com/127.0.0.1#7913 -ipset=/.zzcartoon.com/gfwlist +server=/.zello.com/127.0.0.1#7913 +ipset=/.zello.com/gfwlist server=/.zdnet.com.tw/127.0.0.1#7913 ipset=/.zdnet.com.tw/gfwlist -server=/.vizvaz.com/127.0.0.1#7913 -ipset=/.vizvaz.com/gfwlist server=/.zaobao.com.sg/127.0.0.1#7913 ipset=/.zaobao.com.sg/gfwlist -server=/.zalmos.com/127.0.0.1#7913 -ipset=/.zalmos.com/gfwlist -server=/.dns05.com/127.0.0.1#7913 -ipset=/.dns05.com/gfwlist -server=/.yzzk.com/127.0.0.1#7913 -ipset=/.yzzk.com/gfwlist -server=/.openvpn.org/127.0.0.1#7913 -ipset=/.openvpn.org/gfwlist -server=/.yx51.net/127.0.0.1#7913 -ipset=/.yx51.net/gfwlist -server=/.ywpw.com/127.0.0.1#7913 -ipset=/.ywpw.com/gfwlist -server=/.shwchurch.org/127.0.0.1#7913 -ipset=/.shwchurch.org/gfwlist server=/.chinesedemocracy.com/127.0.0.1#7913 ipset=/.chinesedemocracy.com/gfwlist server=/.m-team.cc/127.0.0.1#7913 ipset=/.m-team.cc/gfwlist -server=/.yuntipub.com/127.0.0.1#7913 -ipset=/.yuntipub.com/gfwlist -server=/.tibetanlanguage.org/127.0.0.1#7913 -ipset=/.tibetanlanguage.org/gfwlist -server=/.wearn.com/127.0.0.1#7913 -ipset=/.wearn.com/gfwlist -server=/.yuanming.net/127.0.0.1#7913 -ipset=/.yuanming.net/gfwlist -server=/.youshun12.com/127.0.0.1#7913 -ipset=/.youshun12.com/gfwlist +server=/.zalmos.com/127.0.0.1#7913 +ipset=/.zalmos.com/gfwlist +server=/.yzzk.com/127.0.0.1#7913 +ipset=/.yzzk.com/gfwlist +server=/.sharpdaily.tw/127.0.0.1#7913 +ipset=/.sharpdaily.tw/gfwlist +server=/.yx51.net/127.0.0.1#7913 +ipset=/.yx51.net/gfwlist +server=/.ywpw.com/127.0.0.1#7913 +ipset=/.ywpw.com/gfwlist server=/.minzhuhua.net/127.0.0.1#7913 ipset=/.minzhuhua.net/gfwlist server=/.karayou.com/127.0.0.1#7913 @@ -5356,80 +5346,80 @@ server=/.inote.tw/127.0.0.1#7913 ipset=/.inote.tw/gfwlist server=/.proyectoclubes.com/127.0.0.1#7913 ipset=/.proyectoclubes.com/gfwlist -server=/.topic.youthwant.com.tw/127.0.0.1#7913 -ipset=/.topic.youthwant.com.tw/gfwlist -server=/.share.youthwant.com.tw/127.0.0.1#7913 -ipset=/.share.youthwant.com.tw/gfwlist +server=/.adult.friendfinder.com/127.0.0.1#7913 +ipset=/.adult.friendfinder.com/gfwlist +server=/.yuntipub.com/127.0.0.1#7913 +ipset=/.yuntipub.com/gfwlist server=/.twifan.com/127.0.0.1#7913 ipset=/.twifan.com/gfwlist server=/.chinayuanmin.org/127.0.0.1#7913 ipset=/.chinayuanmin.org/gfwlist -server=/.boxun.com/127.0.0.1#7913 -ipset=/.boxun.com/gfwlist +server=/.igoogle.com/127.0.0.1#7913 +ipset=/.igoogle.com/gfwlist +server=/.websitepulse.com/127.0.0.1#7913 +ipset=/.websitepulse.com/gfwlist +server=/.yuanming.net/127.0.0.1#7913 +ipset=/.yuanming.net/gfwlist +server=/.youshun12.com/127.0.0.1#7913 +ipset=/.youshun12.com/gfwlist +server=/.topic.youthwant.com.tw/127.0.0.1#7913 +ipset=/.topic.youthwant.com.tw/gfwlist +server=/.lamnia.co.uk/127.0.0.1#7913 +ipset=/.lamnia.co.uk/gfwlist +server=/.twitbrowser.net/127.0.0.1#7913 +ipset=/.twitbrowser.net/gfwlist +server=/.share.youthwant.com.tw/127.0.0.1#7913 +ipset=/.share.youthwant.com.tw/gfwlist +server=/.bestforchina.org/127.0.0.1#7913 +ipset=/.bestforchina.org/gfwlist server=/.blog.youthwant.com.tw/127.0.0.1#7913 ipset=/.blog.youthwant.com.tw/gfwlist server=/.youthnetradio.org/127.0.0.1#7913 ipset=/.youthnetradio.org/gfwlist server=/.yousendit.com/127.0.0.1#7913 ipset=/.yousendit.com/gfwlist -server=/.yourprivatevpn.com/127.0.0.1#7913 -ipset=/.yourprivatevpn.com/gfwlist -server=/.lamnia.co.uk/127.0.0.1#7913 -ipset=/.lamnia.co.uk/gfwlist -server=/.twitbrowser.net/127.0.0.1#7913 -ipset=/.twitbrowser.net/gfwlist -server=/.yourepeat.com/127.0.0.1#7913 -ipset=/.yourepeat.com/gfwlist -server=/.your-freedom.net/127.0.0.1#7913 -ipset=/.your-freedom.net/gfwlist -server=/.blogs.tampabay.com/127.0.0.1#7913 -ipset=/.blogs.tampabay.com/gfwlist -server=/.youngspiration.hk/127.0.0.1#7913 -ipset=/.youngspiration.hk/gfwlist -server=/.youngpornvideos.com/127.0.0.1#7913 -ipset=/.youngpornvideos.com/gfwlist server=/.cam4.jp/127.0.0.1#7913 ipset=/.cam4.jp/gfwlist -server=/.expatshield.com/127.0.0.1#7913 -ipset=/.expatshield.com/gfwlist +server=/.yourprivatevpn.com/127.0.0.1#7913 +ipset=/.yourprivatevpn.com/gfwlist server=/.softwarebychuck.com/127.0.0.1#7913 ipset=/.softwarebychuck.com/gfwlist -server=/.youjizz.com/127.0.0.1#7913 -ipset=/.youjizz.com/gfwlist +server=/.yourepeat.com/127.0.0.1#7913 +ipset=/.yourepeat.com/gfwlist server=/.h-moe.com/127.0.0.1#7913 ipset=/.h-moe.com/gfwlist server=/.medium.com/127.0.0.1#7913 ipset=/.medium.com/gfwlist server=/.maxing.jp/127.0.0.1#7913 ipset=/.maxing.jp/gfwlist -server=/.youxu.info/127.0.0.1#7913 -ipset=/.youxu.info/gfwlist +server=/.your-freedom.net/127.0.0.1#7913 +ipset=/.your-freedom.net/gfwlist server=/.cdig.info/127.0.0.1#7913 ipset=/.cdig.info/gfwlist -server=/.yomiuri.co.jp/127.0.0.1#7913 -ipset=/.yomiuri.co.jp/gfwlist +server=/.uc-japan.org/127.0.0.1#7913 +ipset=/.uc-japan.org/gfwlist server=/.luxebc.com/127.0.0.1#7913 ipset=/.luxebc.com/gfwlist server=/.fleshbot.com/127.0.0.1#7913 ipset=/.fleshbot.com/gfwlist -server=/.yolasite.com/127.0.0.1#7913 -ipset=/.yolasite.com/gfwlist +server=/.youngspiration.hk/127.0.0.1#7913 +ipset=/.youngspiration.hk/gfwlist server=/.slideshare.net/127.0.0.1#7913 ipset=/.slideshare.net/gfwlist server=/.rapidvpn.com/127.0.0.1#7913 ipset=/.rapidvpn.com/gfwlist server=/.pandapow.net/127.0.0.1#7913 ipset=/.pandapow.net/gfwlist -server=/.weihuo.org/127.0.0.1#7913 -ipset=/.weihuo.org/gfwlist +server=/.youngpornvideos.com/127.0.0.1#7913 +ipset=/.youngpornvideos.com/gfwlist server=/.efcc.org.hk/127.0.0.1#7913 ipset=/.efcc.org.hk/gfwlist -server=/.apigee.com/127.0.0.1#7913 -ipset=/.apigee.com/gfwlist +server=/.blacklogic.com/127.0.0.1#7913 +ipset=/.blacklogic.com/gfwlist server=/.xskywalker.net/127.0.0.1#7913 ipset=/.xskywalker.net/gfwlist -server=/.yinlei.org/127.0.0.1#7913 -ipset=/.yinlei.org/gfwlist +server=/.youjizz.com/127.0.0.1#7913 +ipset=/.youjizz.com/gfwlist server=/.liquidvpn.com/127.0.0.1#7913 ipset=/.liquidvpn.com/gfwlist server=/.referer.us/127.0.0.1#7913 @@ -5438,162 +5428,162 @@ server=/.gongm.in/127.0.0.1#7913 ipset=/.gongm.in/gfwlist server=/.xianba.net/127.0.0.1#7913 ipset=/.xianba.net/gfwlist -server=/.yipub.com/127.0.0.1#7913 -ipset=/.yipub.com/gfwlist -server=/.yingsuoss.com/127.0.0.1#7913 -ipset=/.yingsuoss.com/gfwlist +server=/.youxu.info/127.0.0.1#7913 +ipset=/.youxu.info/gfwlist +server=/.yomiuri.co.jp/127.0.0.1#7913 +ipset=/.yomiuri.co.jp/gfwlist server=/.psiphontoday.com/127.0.0.1#7913 ipset=/.psiphontoday.com/gfwlist -server=/.xa.yimg.com/127.0.0.1#7913 -ipset=/.xa.yimg.com/gfwlist +server=/.yolasite.com/127.0.0.1#7913 +ipset=/.yolasite.com/gfwlist server=/.crbug.com/127.0.0.1#7913 ipset=/.crbug.com/gfwlist server=/.google.gg/127.0.0.1#7913 ipset=/.google.gg/gfwlist server=/.asiatoday.us/127.0.0.1#7913 ipset=/.asiatoday.us/gfwlist -server=/.yilubbs.com/127.0.0.1#7913 -ipset=/.yilubbs.com/gfwlist +server=/.wengewang.com/127.0.0.1#7913 +ipset=/.wengewang.com/gfwlist server=/.18p2p.com/127.0.0.1#7913 ipset=/.18p2p.com/gfwlist -server=/.yidio.com/127.0.0.1#7913 -ipset=/.yidio.com/gfwlist +server=/.speakerdeck.com/127.0.0.1#7913 +ipset=/.speakerdeck.com/gfwlist server=/.torrentproject.se/127.0.0.1#7913 ipset=/.torrentproject.se/gfwlist -server=/.yibaochina.com/127.0.0.1#7913 -ipset=/.yibaochina.com/gfwlist +server=/.yinlei.org/127.0.0.1#7913 +ipset=/.yinlei.org/gfwlist server=/.dalailamafellows.org/127.0.0.1#7913 ipset=/.dalailamafellows.org/gfwlist -server=/.yhcw.net/127.0.0.1#7913 -ipset=/.yhcw.net/gfwlist -server=/.yeyeclub.com/127.0.0.1#7913 -ipset=/.yeyeclub.com/gfwlist +server=/.yipub.com/127.0.0.1#7913 +ipset=/.yipub.com/gfwlist +server=/.yingsuoss.com/127.0.0.1#7913 +ipset=/.yingsuoss.com/gfwlist server=/.guancha.org/127.0.0.1#7913 ipset=/.guancha.org/gfwlist -server=/.yespornplease.com/127.0.0.1#7913 -ipset=/.yespornplease.com/gfwlist -server=/.wenhui.ch/127.0.0.1#7913 -ipset=/.wenhui.ch/gfwlist -server=/.yesasia.com/127.0.0.1#7913 -ipset=/.yesasia.com/gfwlist -server=/.yes123.com.tw/127.0.0.1#7913 -ipset=/.yes123.com.tw/gfwlist +server=/.xa.yimg.com/127.0.0.1#7913 +ipset=/.xa.yimg.com/gfwlist +server=/.yilubbs.com/127.0.0.1#7913 +ipset=/.yilubbs.com/gfwlist +server=/.yidio.com/127.0.0.1#7913 +ipset=/.yidio.com/gfwlist +server=/.yibaochina.com/127.0.0.1#7913 +ipset=/.yibaochina.com/gfwlist server=/.wordpress.com/127.0.0.1#7913 ipset=/.wordpress.com/gfwlist server=/.dw.de/127.0.0.1#7913 ipset=/.dw.de/gfwlist +server=/.yeyeclub.com/127.0.0.1#7913 +ipset=/.yeyeclub.com/gfwlist +server=/.yespornplease.com/127.0.0.1#7913 +ipset=/.yespornplease.com/gfwlist +server=/.wetpussygames.com/127.0.0.1#7913 +ipset=/.wetpussygames.com/gfwlist +server=/.yesasia.com/127.0.0.1#7913 +ipset=/.yesasia.com/gfwlist +server=/.yes123.com.tw/127.0.0.1#7913 +ipset=/.yes123.com.tw/gfwlist +server=/.yegle.net/127.0.0.1#7913 +ipset=/.yegle.net/gfwlist +server=/.slyip.com/127.0.0.1#7913 +ipset=/.slyip.com/gfwlist server=/.yeeyi.com/127.0.0.1#7913 ipset=/.yeeyi.com/gfwlist server=/.yecl.net/127.0.0.1#7913 ipset=/.yecl.net/gfwlist -server=/.av.nightlife141.com/127.0.0.1#7913 -ipset=/.av.nightlife141.com/gfwlist +server=/.nintendium.com/127.0.0.1#7913 +ipset=/.nintendium.com/gfwlist server=/.ydy.com/127.0.0.1#7913 ipset=/.ydy.com/gfwlist -server=/.avcity.tv/127.0.0.1#7913 -ipset=/.avcity.tv/gfwlist +server=/.minghui-b.org/127.0.0.1#7913 +ipset=/.minghui-b.org/gfwlist +server=/.beeg.com/127.0.0.1#7913 +ipset=/.beeg.com/gfwlist server=/.yanghengjun.com/127.0.0.1#7913 ipset=/.yanghengjun.com/gfwlist -server=/.slyip.com/127.0.0.1#7913 -ipset=/.slyip.com/gfwlist server=/.yam.org.tw/127.0.0.1#7913 ipset=/.yam.org.tw/gfwlist server=/.yam.com/127.0.0.1#7913 ipset=/.yam.com/gfwlist +server=/.roadshow.hk/127.0.0.1#7913 +ipset=/.roadshow.hk/gfwlist +server=/.dalailamaworld.com/127.0.0.1#7913 +ipset=/.dalailamaworld.com/gfwlist server=/.xyy69.info/127.0.0.1#7913 ipset=/.xyy69.info/gfwlist -server=/.stephaniered.com/127.0.0.1#7913 -ipset=/.stephaniered.com/gfwlist -server=/.minghui-b.org/127.0.0.1#7913 -ipset=/.minghui-b.org/gfwlist +server=/.skyking.com.tw/127.0.0.1#7913 +ipset=/.skyking.com.tw/gfwlist +server=/.hentaivideoworld.com/127.0.0.1#7913 +ipset=/.hentaivideoworld.com/gfwlist server=/.xxxymovies.com/127.0.0.1#7913 ipset=/.xxxymovies.com/gfwlist server=/.xxx.xxx/127.0.0.1#7913 ipset=/.xxx.xxx/gfwlist server=/.xxbbx.com/127.0.0.1#7913 ipset=/.xxbbx.com/gfwlist +server=/.ninjaproxy.ninja/127.0.0.1#7913 +ipset=/.ninjaproxy.ninja/gfwlist server=/.xvideos.es/127.0.0.1#7913 ipset=/.xvideos.es/gfwlist -server=/.roadshow.hk/127.0.0.1#7913 -ipset=/.roadshow.hk/gfwlist -server=/.dalailamaworld.com/127.0.0.1#7913 -ipset=/.dalailamaworld.com/gfwlist server=/.xvideos.com/127.0.0.1#7913 ipset=/.xvideos.com/gfwlist -server=/.skyking.com.tw/127.0.0.1#7913 -ipset=/.skyking.com.tw/gfwlist server=/.xvideo.cc/127.0.0.1#7913 ipset=/.xvideo.cc/gfwlist server=/.xuchao.net/127.0.0.1#7913 ipset=/.xuchao.net/gfwlist -server=/.appledaily.com/127.0.0.1#7913 -ipset=/.appledaily.com/gfwlist -server=/.xuzhiyong.net/127.0.0.1#7913 -ipset=/.xuzhiyong.net/gfwlist -server=/.fsurf.com/127.0.0.1#7913 -ipset=/.fsurf.com/gfwlist -server=/.cdn.printfriendly.com/127.0.0.1#7913 -ipset=/.cdn.printfriendly.com/gfwlist -server=/.xpud.org/127.0.0.1#7913 -ipset=/.xpud.org/gfwlist -server=/.xnxx.com/127.0.0.1#7913 -ipset=/.xnxx.com/gfwlist -server=/.xml-training-guide.com/127.0.0.1#7913 -ipset=/.xml-training-guide.com/gfwlist server=/.economist.com/127.0.0.1#7913 ipset=/.economist.com/gfwlist server=/.edupro.org/127.0.0.1#7913 ipset=/.edupro.org/gfwlist -server=/.xjtravelguide.com/127.0.0.1#7913 -ipset=/.xjtravelguide.com/gfwlist +server=/.faceless.me/127.0.0.1#7913 +ipset=/.faceless.me/gfwlist server=/.51luoben.com/127.0.0.1#7913 ipset=/.51luoben.com/gfwlist -server=/.xjp.cc/127.0.0.1#7913 -ipset=/.xjp.cc/gfwlist +server=/.xuzhiyong.net/127.0.0.1#7913 +ipset=/.xuzhiyong.net/gfwlist server=/.cdp2006.org/127.0.0.1#7913 ipset=/.cdp2006.org/gfwlist server=/.javmoo.xyz/127.0.0.1#7913 ipset=/.javmoo.xyz/gfwlist server=/.lpsg.com/127.0.0.1#7913 ipset=/.lpsg.com/gfwlist -server=/.xiuren.org/127.0.0.1#7913 -ipset=/.xiuren.org/gfwlist -server=/.xiongpian.com/127.0.0.1#7913 -ipset=/.xiongpian.com/gfwlist +server=/.gzone-anime.info/127.0.0.1#7913 +ipset=/.gzone-anime.info/gfwlist +server=/.xpud.org/127.0.0.1#7913 +ipset=/.xpud.org/gfwlist server=/.www.imdb.com/127.0.0.1#7913 ipset=/.www.imdb.com/gfwlist server=/.sinonet.ca/127.0.0.1#7913 ipset=/.sinonet.ca/gfwlist server=/.www.tablesgenerator.com/127.0.0.1#7913 ipset=/.www.tablesgenerator.com/gfwlist -server=/.twisterio.com/127.0.0.1#7913 -ipset=/.twisterio.com/gfwlist +server=/.xnxx.com/127.0.0.1#7913 +ipset=/.xnxx.com/gfwlist server=/.iuksky.com/127.0.0.1#7913 ipset=/.iuksky.com/gfwlist -server=/.xinhuanet.org/127.0.0.1#7913 -ipset=/.xinhuanet.org/gfwlist -server=/.hk32168.com/127.0.0.1#7913 -ipset=/.hk32168.com/gfwlist +server=/.xml-training-guide.com/127.0.0.1#7913 +ipset=/.xml-training-guide.com/gfwlist +server=/.isunaffairs.com/127.0.0.1#7913 +ipset=/.isunaffairs.com/gfwlist server=/.site2unblock.com/127.0.0.1#7913 ipset=/.site2unblock.com/gfwlist server=/.evschool.net/127.0.0.1#7913 ipset=/.evschool.net/gfwlist server=/.ccim.org/127.0.0.1#7913 ipset=/.ccim.org/gfwlist -server=/.rangzen.org/127.0.0.1#7913 -ipset=/.rangzen.org/gfwlist -server=/.xing.com/127.0.0.1#7913 -ipset=/.xing.com/gfwlist -server=/.forum.xinbao.de/127.0.0.1#7913 -ipset=/.forum.xinbao.de/gfwlist -server=/.xihua.es/127.0.0.1#7913 -ipset=/.xihua.es/gfwlist -server=/.xiaoma.org/127.0.0.1#7913 -ipset=/.xiaoma.org/gfwlist +server=/.xjtravelguide.com/127.0.0.1#7913 +ipset=/.xjtravelguide.com/gfwlist +server=/.xjp.cc/127.0.0.1#7913 +ipset=/.xjp.cc/gfwlist +server=/.xiuren.org/127.0.0.1#7913 +ipset=/.xiuren.org/gfwlist +server=/.xiongpian.com/127.0.0.1#7913 +ipset=/.xiongpian.com/gfwlist +server=/.twitiq.com/127.0.0.1#7913 +ipset=/.twitiq.com/gfwlist server=/.bbs.huasing.org/127.0.0.1#7913 ipset=/.bbs.huasing.org/gfwlist -server=/.hbg.com/127.0.0.1#7913 -ipset=/.hbg.com/gfwlist +server=/.xinhuanet.org/127.0.0.1#7913 +ipset=/.xinhuanet.org/gfwlist server=/.tibetswiss.ch/127.0.0.1#7913 ipset=/.tibetswiss.ch/gfwlist server=/.bangdream.space/127.0.0.1#7913 @@ -5612,12 +5602,12 @@ server=/.www.dwheeler.com/127.0.0.1#7913 ipset=/.www.dwheeler.com/gfwlist server=/.vjav.com/127.0.0.1#7913 ipset=/.vjav.com/gfwlist -server=/.xiaobaiwu.com/127.0.0.1#7913 -ipset=/.xiaobaiwu.com/gfwlist -server=/.facebook.hu/127.0.0.1#7913 -ipset=/.facebook.hu/gfwlist -server=/.xianqiao.net/127.0.0.1#7913 -ipset=/.xianqiao.net/gfwlist +server=/.xing.com/127.0.0.1#7913 +ipset=/.xing.com/gfwlist +server=/.rocksdb.org/127.0.0.1#7913 +ipset=/.rocksdb.org/gfwlist +server=/.forum.xinbao.de/127.0.0.1#7913 +ipset=/.forum.xinbao.de/gfwlist server=/.tweetboard.com/127.0.0.1#7913 ipset=/.tweetboard.com/gfwlist server=/.allmovie.com/127.0.0.1#7913 @@ -5626,8 +5616,8 @@ server=/.mediafreakcity.com/127.0.0.1#7913 ipset=/.mediafreakcity.com/gfwlist server=/.taiwantp.net/127.0.0.1#7913 ipset=/.taiwantp.net/gfwlist -server=/.xianjian.tw/127.0.0.1#7913 -ipset=/.xianjian.tw/gfwlist +server=/.xihua.es/127.0.0.1#7913 +ipset=/.xihua.es/gfwlist server=/.abc.net.au/127.0.0.1#7913 ipset=/.abc.net.au/gfwlist server=/.wheatseeds.org/127.0.0.1#7913 @@ -5642,54 +5632,54 @@ server=/.expressvpn.com/127.0.0.1#7913 ipset=/.expressvpn.com/gfwlist server=/.tcsofbc.org/127.0.0.1#7913 ipset=/.tcsofbc.org/gfwlist -server=/.xianchawang.net/127.0.0.1#7913 -ipset=/.xianchawang.net/gfwlist +server=/.xiaoma.org/127.0.0.1#7913 +ipset=/.xiaoma.org/gfwlist server=/.cdpwu.org/127.0.0.1#7913 ipset=/.cdpwu.org/gfwlist server=/.i-scmp.com/127.0.0.1#7913 ipset=/.i-scmp.com/gfwlist -server=/.xhamster.com/127.0.0.1#7913 -ipset=/.xhamster.com/gfwlist +server=/.pokerstars.net/127.0.0.1#7913 +ipset=/.pokerstars.net/gfwlist server=/.gongminliliang.com/127.0.0.1#7913 ipset=/.gongminliliang.com/gfwlist -server=/.destiny.xfiles.to/127.0.0.1#7913 -ipset=/.destiny.xfiles.to/gfwlist +server=/.usaip.eu/127.0.0.1#7913 +ipset=/.usaip.eu/gfwlist server=/.cn2.streetvoice.com/127.0.0.1#7913 ipset=/.cn2.streetvoice.com/gfwlist -server=/.xerotica.com/127.0.0.1#7913 -ipset=/.xerotica.com/gfwlist +server=/.xiaobaiwu.com/127.0.0.1#7913 +ipset=/.xiaobaiwu.com/gfwlist server=/.myeasytv.com/127.0.0.1#7913 ipset=/.myeasytv.com/gfwlist -server=/.xcity.jp/127.0.0.1#7913 -ipset=/.xcity.jp/gfwlist -server=/.chinaaid.us/127.0.0.1#7913 -ipset=/.chinaaid.us/gfwlist -server=/.debug.com/127.0.0.1#7913 -ipset=/.debug.com/gfwlist -server=/.xbabe.com/127.0.0.1#7913 -ipset=/.xbabe.com/gfwlist -server=/.xanga.com/127.0.0.1#7913 -ipset=/.xanga.com/gfwlist -server=/.x-art.com/127.0.0.1#7913 -ipset=/.x-art.com/gfwlist +server=/.xianqiao.net/127.0.0.1#7913 +ipset=/.xianqiao.net/gfwlist +server=/.xianjian.tw/127.0.0.1#7913 +ipset=/.xianjian.tw/gfwlist +server=/.3ren.ca/127.0.0.1#7913 +ipset=/.3ren.ca/gfwlist +server=/.xianchawang.net/127.0.0.1#7913 +ipset=/.xianchawang.net/gfwlist +server=/.xhamster.com/127.0.0.1#7913 +ipset=/.xhamster.com/gfwlist +server=/.destiny.xfiles.to/127.0.0.1#7913 +ipset=/.destiny.xfiles.to/gfwlist server=/.twitturly.com/127.0.0.1#7913 ipset=/.twitturly.com/gfwlist server=/.zynamics.com/127.0.0.1#7913 ipset=/.zynamics.com/gfwlist -server=/.flagsonline.it/127.0.0.1#7913 -ipset=/.flagsonline.it/gfwlist -server=/.mcaf.ee/127.0.0.1#7913 -ipset=/.mcaf.ee/gfwlist -server=/.wujieliulan.com/127.0.0.1#7913 -ipset=/.wujieliulan.com/gfwlist +server=/.xerotica.com/127.0.0.1#7913 +ipset=/.xerotica.com/gfwlist +server=/.xcity.jp/127.0.0.1#7913 +ipset=/.xcity.jp/gfwlist +server=/.dynawebinc.com/127.0.0.1#7913 +ipset=/.dynawebinc.com/gfwlist server=/.twyac.org/127.0.0.1#7913 ipset=/.twyac.org/gfwlist server=/.getiton.com/127.0.0.1#7913 ipset=/.getiton.com/gfwlist server=/.tunnelbear.com/127.0.0.1#7913 ipset=/.tunnelbear.com/gfwlist -server=/.sex8.cc/127.0.0.1#7913 -ipset=/.sex8.cc/gfwlist +server=/.xbabe.com/127.0.0.1#7913 +ipset=/.xbabe.com/gfwlist server=/.dafahao.com/127.0.0.1#7913 ipset=/.dafahao.com/gfwlist server=/.pipii.tv/127.0.0.1#7913 @@ -5698,22 +5688,22 @@ server=/.m.hkgalden.com/127.0.0.1#7913 ipset=/.m.hkgalden.com/gfwlist server=/.sunskyforum.com/127.0.0.1#7913 ipset=/.sunskyforum.com/gfwlist -server=/.epochtimes.co.il/127.0.0.1#7913 -ipset=/.epochtimes.co.il/gfwlist +server=/.xanga.com/127.0.0.1#7913 +ipset=/.xanga.com/gfwlist server=/.tascn.com.au/127.0.0.1#7913 ipset=/.tascn.com.au/gfwlist -server=/.wtbn.org/127.0.0.1#7913 -ipset=/.wtbn.org/gfwlist +server=/.x-art.com/127.0.0.1#7913 +ipset=/.x-art.com/gfwlist server=/.npa.go.jp/127.0.0.1#7913 ipset=/.npa.go.jp/gfwlist -server=/.wsjhk.com/127.0.0.1#7913 -ipset=/.wsjhk.com/gfwlist -server=/.wretch.cc/127.0.0.1#7913 -ipset=/.wretch.cc/gfwlist -server=/.wrchina.org/127.0.0.1#7913 -ipset=/.wrchina.org/gfwlist -server=/.woyaolian.org/127.0.0.1#7913 -ipset=/.woyaolian.org/gfwlist +server=/.1dumb.com/127.0.0.1#7913 +ipset=/.1dumb.com/gfwlist +server=/.startpage.com/127.0.0.1#7913 +ipset=/.startpage.com/gfwlist +server=/.wujieliulan.com/127.0.0.1#7913 +ipset=/.wujieliulan.com/gfwlist +server=/.iblogserv-f.net/127.0.0.1#7913 +ipset=/.iblogserv-f.net/gfwlist server=/.mesotw.com/127.0.0.1#7913 ipset=/.mesotw.com/gfwlist server=/.google-analytics.com/127.0.0.1#7913 @@ -5728,302 +5718,302 @@ server=/.whippedass.com/127.0.0.1#7913 ipset=/.whippedass.com/gfwlist server=/.onion.city/127.0.0.1#7913 ipset=/.onion.city/gfwlist -server=/.linglingfa.com/127.0.0.1#7913 -ipset=/.linglingfa.com/gfwlist +server=/.onmoon.net/127.0.0.1#7913 +ipset=/.onmoon.net/gfwlist server=/.orn.jp/127.0.0.1#7913 ipset=/.orn.jp/gfwlist -server=/.top81.ws/127.0.0.1#7913 -ipset=/.top81.ws/gfwlist +server=/.wtbn.org/127.0.0.1#7913 +ipset=/.wtbn.org/gfwlist +server=/.wsjhk.com/127.0.0.1#7913 +ipset=/.wsjhk.com/gfwlist +server=/.wretch.cc/127.0.0.1#7913 +ipset=/.wretch.cc/gfwlist +server=/.wrchina.org/127.0.0.1#7913 +ipset=/.wrchina.org/gfwlist +server=/.woyaolian.org/127.0.0.1#7913 +ipset=/.woyaolian.org/gfwlist +server=/.liudejun.com/127.0.0.1#7913 +ipset=/.liudejun.com/gfwlist +server=/.topshareware.com/127.0.0.1#7913 +ipset=/.topshareware.com/gfwlist server=/.wowgirls.com/127.0.0.1#7913 ipset=/.wowgirls.com/gfwlist -server=/.wowlegacy.ml/127.0.0.1#7913 -ipset=/.wowlegacy.ml/gfwlist -server=/.wow.com/127.0.0.1#7913 -ipset=/.wow.com/gfwlist -server=/.sujiatun.wordpress.com/127.0.0.1#7913 -ipset=/.sujiatun.wordpress.com/gfwlist -server=/.wo3ttt.wordpress.com/127.0.0.1#7913 -ipset=/.wo3ttt.wordpress.com/gfwlist -server=/.jobnewera.wordpress.com/127.0.0.1#7913 -ipset=/.jobnewera.wordpress.com/gfwlist -server=/.ranyunfei.com/127.0.0.1#7913 -ipset=/.ranyunfei.com/gfwlist server=/.91vps.club/127.0.0.1#7913 ipset=/.91vps.club/gfwlist server=/.srocket.us/127.0.0.1#7913 ipset=/.srocket.us/gfwlist server=/.bell.wiki/127.0.0.1#7913 ipset=/.bell.wiki/gfwlist -server=/.uforadio.com.tw/127.0.0.1#7913 -ipset=/.uforadio.com.tw/gfwlist -server=/.hkanews.wordpress.com/127.0.0.1#7913 -ipset=/.hkanews.wordpress.com/gfwlist +server=/.wowlegacy.ml/127.0.0.1#7913 +ipset=/.wowlegacy.ml/gfwlist +server=/.wow.com/127.0.0.1#7913 +ipset=/.wow.com/gfwlist server=/.clinica-tibet.ru/127.0.0.1#7913 ipset=/.clinica-tibet.ru/gfwlist -server=/.chinaview.wordpress.com/127.0.0.1#7913 -ipset=/.chinaview.wordpress.com/gfwlist +server=/.sujiatun.wordpress.com/127.0.0.1#7913 +ipset=/.sujiatun.wordpress.com/gfwlist server=/.ignitedetroit.net/127.0.0.1#7913 ipset=/.ignitedetroit.net/gfwlist -server=/.worldvpn.net/127.0.0.1#7913 -ipset=/.worldvpn.net/gfwlist +server=/.wo3ttt.wordpress.com/127.0.0.1#7913 +ipset=/.wo3ttt.wordpress.com/gfwlist server=/.blog.exblog.co.jp/127.0.0.1#7913 ipset=/.blog.exblog.co.jp/gfwlist server=/.aiweiweiblog.com/127.0.0.1#7913 ipset=/.aiweiweiblog.com/gfwlist server=/.forum.slime.com.tw/127.0.0.1#7913 ipset=/.forum.slime.com.tw/gfwlist +server=/.jobnewera.wordpress.com/127.0.0.1#7913 +ipset=/.jobnewera.wordpress.com/gfwlist +server=/.read100.com/127.0.0.1#7913 +ipset=/.read100.com/gfwlist +server=/.ghut.org/127.0.0.1#7913 +ipset=/.ghut.org/gfwlist +server=/.hkanews.wordpress.com/127.0.0.1#7913 +ipset=/.hkanews.wordpress.com/gfwlist +server=/.theync.com/127.0.0.1#7913 +ipset=/.theync.com/gfwlist +server=/.chinaview.wordpress.com/127.0.0.1#7913 +ipset=/.chinaview.wordpress.com/gfwlist +server=/.worldvpn.net/127.0.0.1#7913 +ipset=/.worldvpn.net/gfwlist +server=/.atlanta168.com/127.0.0.1#7913 +ipset=/.atlanta168.com/gfwlist server=/.worldjournal.com/127.0.0.1#7913 ipset=/.worldjournal.com/gfwlist server=/.worldcat.org/127.0.0.1#7913 ipset=/.worldcat.org/gfwlist +server=/.csuchen.de/127.0.0.1#7913 +ipset=/.csuchen.de/gfwlist server=/.workersthebig.net/127.0.0.1#7913 ipset=/.workersthebig.net/gfwlist server=/.workerempowerment.org/127.0.0.1#7913 ipset=/.workerempowerment.org/gfwlist -server=/.theync.com/127.0.0.1#7913 -ipset=/.theync.com/gfwlist server=/.workatruna.com/127.0.0.1#7913 ipset=/.workatruna.com/gfwlist -server=/.woopie.jp/127.0.0.1#7913 -ipset=/.woopie.jp/gfwlist -server=/.atlanta168.com/127.0.0.1#7913 -ipset=/.atlanta168.com/gfwlist -server=/.woolyss.com/127.0.0.1#7913 -ipset=/.woolyss.com/gfwlist -server=/.bonbonme.com/127.0.0.1#7913 -ipset=/.bonbonme.com/gfwlist -server=/.csuchen.de/127.0.0.1#7913 -ipset=/.csuchen.de/gfwlist -server=/.wnacg.org/127.0.0.1#7913 -ipset=/.wnacg.org/gfwlist -server=/.wnacg.com/127.0.0.1#7913 -ipset=/.wnacg.com/gfwlist -server=/.blog.tiney.com/127.0.0.1#7913 -ipset=/.blog.tiney.com/gfwlist server=/.iblist.com/127.0.0.1#7913 ipset=/.iblist.com/gfwlist server=/.milph.net/127.0.0.1#7913 ipset=/.milph.net/gfwlist -server=/.girlbanker.com/127.0.0.1#7913 -ipset=/.girlbanker.com/gfwlist -server=/.zhao.1984.city/127.0.0.1#7913 -ipset=/.zhao.1984.city/gfwlist +server=/.woopie.jp/127.0.0.1#7913 +ipset=/.woopie.jp/gfwlist +server=/.imagevenue.com/127.0.0.1#7913 +ipset=/.imagevenue.com/gfwlist +server=/.woolyss.com/127.0.0.1#7913 +ipset=/.woolyss.com/gfwlist +server=/.razyboard.com/127.0.0.1#7913 +ipset=/.razyboard.com/gfwlist +server=/.wnacg.org/127.0.0.1#7913 +ipset=/.wnacg.org/gfwlist +server=/.9bis.net/127.0.0.1#7913 +ipset=/.9bis.net/gfwlist +server=/.wnacg.com/127.0.0.1#7913 +ipset=/.wnacg.com/gfwlist +server=/.tmagazine.com/127.0.0.1#7913 +ipset=/.tmagazine.com/gfwlist +server=/.google.co.id/127.0.0.1#7913 +ipset=/.google.co.id/gfwlist +server=/.jintian.net/127.0.0.1#7913 +ipset=/.jintian.net/gfwlist +server=/.ninjacloak.com/127.0.0.1#7913 +ipset=/.ninjacloak.com/gfwlist server=/.witopia.net/127.0.0.1#7913 ipset=/.witopia.net/gfwlist server=/.witnessleeteaching.com/127.0.0.1#7913 ipset=/.witnessleeteaching.com/gfwlist server=/.wisdompubs.org/127.0.0.1#7913 ipset=/.wisdompubs.org/gfwlist -server=/.9bis.net/127.0.0.1#7913 -ipset=/.9bis.net/gfwlist server=/.wiredpen.com/127.0.0.1#7913 ipset=/.wiredpen.com/gfwlist server=/.winning11.com/127.0.0.1#7913 ipset=/.winning11.com/gfwlist -server=/.google.co.id/127.0.0.1#7913 -ipset=/.google.co.id/gfwlist -server=/.wingy.site/127.0.0.1#7913 -ipset=/.wingy.site/gfwlist -server=/.ninjacloak.com/127.0.0.1#7913 -ipset=/.ninjacloak.com/gfwlist -server=/.tvunetworks.com/127.0.0.1#7913 -ipset=/.tvunetworks.com/gfwlist +server=/.tibetansports.org/127.0.0.1#7913 +ipset=/.tibetansports.org/gfwlist +server=/.harunyahya.com/127.0.0.1#7913 +ipset=/.harunyahya.com/gfwlist server=/.willw.net/127.0.0.1#7913 ipset=/.willw.net/gfwlist -server=/.tweetwally.com/127.0.0.1#7913 -ipset=/.tweetwally.com/gfwlist -server=/.wikiwiki.jp/127.0.0.1#7913 -ipset=/.wikiwiki.jp/gfwlist -server=/.wikivoyage.org/127.0.0.1#7913 -ipset=/.wikivoyage.org/gfwlist -server=/.wikiquote.org/127.0.0.1#7913 -ipset=/.wikiquote.org/gfwlist -server=/.lotsawahouse.org/127.0.0.1#7913 -ipset=/.lotsawahouse.org/gfwlist -server=/.wiktionary.org/127.0.0.1#7913 -ipset=/.wiktionary.org/gfwlist -server=/.xskywalker.com/127.0.0.1#7913 -ipset=/.xskywalker.com/gfwlist +server=/.raizoji.or.jp/127.0.0.1#7913 +ipset=/.raizoji.or.jp/gfwlist server=/.falundafa-florida.org/127.0.0.1#7913 ipset=/.falundafa-florida.org/gfwlist server=/.casinoriva.com/127.0.0.1#7913 ipset=/.casinoriva.com/gfwlist -server=/.wikisource.org/127.0.0.1#7913 -ipset=/.wikisource.org/gfwlist +server=/.wikiwiki.jp/127.0.0.1#7913 +ipset=/.wikiwiki.jp/gfwlist server=/.city9x.com/127.0.0.1#7913 ipset=/.city9x.com/gfwlist -server=/.tibetoffice.com.au/127.0.0.1#7913 -ipset=/.tibetoffice.com.au/gfwlist +server=/.wikivoyage.org/127.0.0.1#7913 +ipset=/.wikivoyage.org/gfwlist server=/.nobodycanstop.us/127.0.0.1#7913 ipset=/.nobodycanstop.us/gfwlist -server=/.mediawiki.org/127.0.0.1#7913 -ipset=/.mediawiki.org/gfwlist +server=/.wikiquote.org/127.0.0.1#7913 +ipset=/.wikiquote.org/gfwlist server=/.bbs.hasi.wang/127.0.0.1#7913 ipset=/.bbs.hasi.wang/gfwlist server=/.islamawareness.net/127.0.0.1#7913 ipset=/.islamawareness.net/gfwlist -server=/.ae.org/127.0.0.1#7913 -ipset=/.ae.org/gfwlist -server=/.wikidata.org/127.0.0.1#7913 -ipset=/.wikidata.org/gfwlist +server=/.mywww.biz/127.0.0.1#7913 +ipset=/.mywww.biz/gfwlist +server=/.wiktionary.org/127.0.0.1#7913 +ipset=/.wiktionary.org/gfwlist server=/.scieron.com/127.0.0.1#7913 ipset=/.scieron.com/gfwlist -server=/.wikipedia.org/127.0.0.1#7913 -ipset=/.wikipedia.org/gfwlist +server=/.slutload.com/127.0.0.1#7913 +ipset=/.slutload.com/gfwlist server=/.google.ae/127.0.0.1#7913 ipset=/.google.ae/gfwlist -server=/.wikinews.org/127.0.0.1#7913 -ipset=/.wikinews.org/gfwlist -server=/.wikiwand.com/127.0.0.1#7913 -ipset=/.wikiwand.com/gfwlist -server=/.wikilivres.info/127.0.0.1#7913 -ipset=/.wikilivres.info/gfwlist +server=/.wikisource.org/127.0.0.1#7913 +ipset=/.wikisource.org/gfwlist +server=/.tibetsun.com/127.0.0.1#7913 +ipset=/.tibetsun.com/gfwlist +server=/.mediawiki.org/127.0.0.1#7913 +ipset=/.mediawiki.org/gfwlist server=/.comefromchina.com/127.0.0.1#7913 ipset=/.comefromchina.com/gfwlist -server=/.collateralmurder.com/127.0.0.1#7913 -ipset=/.collateralmurder.com/gfwlist -server=/.boomssr.com/127.0.0.1#7913 -ipset=/.boomssr.com/gfwlist -server=/.williamhill.com/127.0.0.1#7913 -ipset=/.williamhill.com/gfwlist +server=/.wikidata.org/127.0.0.1#7913 +ipset=/.wikidata.org/gfwlist +server=/.google.tm/127.0.0.1#7913 +ipset=/.google.tm/gfwlist +server=/.wikipedia.org/127.0.0.1#7913 +ipset=/.wikipedia.org/gfwlist server=/.falundafa.org/127.0.0.1#7913 ipset=/.falundafa.org/gfwlist -server=/.politicalchina.org/127.0.0.1#7913 -ipset=/.politicalchina.org/gfwlist +server=/.wikinews.org/127.0.0.1#7913 +ipset=/.wikinews.org/gfwlist server=/.iphonix.fr/127.0.0.1#7913 ipset=/.iphonix.fr/gfwlist server=/.gwtproject.org/127.0.0.1#7913 ipset=/.gwtproject.org/gfwlist -server=/.jingsim.org/127.0.0.1#7913 -ipset=/.jingsim.org/gfwlist -server=/.4irc.com/127.0.0.1#7913 -ipset=/.4irc.com/gfwlist -server=/.wikileaks.pl/127.0.0.1#7913 -ipset=/.wikileaks.pl/gfwlist -server=/.psiphon.civisec.org/127.0.0.1#7913 -ipset=/.psiphon.civisec.org/gfwlist +server=/.myaudiocast.com/127.0.0.1#7913 +ipset=/.myaudiocast.com/gfwlist +server=/.hkip.org.uk/127.0.0.1#7913 +ipset=/.hkip.org.uk/gfwlist +server=/.wikiwand.com/127.0.0.1#7913 +ipset=/.wikiwand.com/gfwlist +server=/.wikilivres.info/127.0.0.1#7913 +ipset=/.wikilivres.info/gfwlist server=/.etokki.com/127.0.0.1#7913 ipset=/.etokki.com/gfwlist server=/.freechina.news/127.0.0.1#7913 ipset=/.freechina.news/gfwlist -server=/.wikileaks.lu/127.0.0.1#7913 -ipset=/.wikileaks.lu/gfwlist -server=/.wikileaks.eu/127.0.0.1#7913 -ipset=/.wikileaks.eu/gfwlist +server=/.collateralmurder.com/127.0.0.1#7913 +ipset=/.collateralmurder.com/gfwlist +server=/.williamhill.com/127.0.0.1#7913 +ipset=/.williamhill.com/gfwlist server=/.abc.com/127.0.0.1#7913 ipset=/.abc.com/gfwlist server=/.bbc.com/127.0.0.1#7913 ipset=/.bbc.com/gfwlist server=/.taiwantt.org.tw/127.0.0.1#7913 ipset=/.taiwantt.org.tw/gfwlist -server=/.wikileaks.de/127.0.0.1#7913 -ipset=/.wikileaks.de/gfwlist +server=/.pornhubpremium.com/127.0.0.1#7913 +ipset=/.pornhubpremium.com/gfwlist server=/.longhair.hk/127.0.0.1#7913 ipset=/.longhair.hk/gfwlist -server=/.wikia.com/127.0.0.1#7913 -ipset=/.wikia.com/gfwlist -server=/.organiccrap.com/127.0.0.1#7913 -ipset=/.organiccrap.com/gfwlist -server=/.whyx.org/127.0.0.1#7913 -ipset=/.whyx.org/gfwlist +server=/.wikileaks.pl/127.0.0.1#7913 +ipset=/.wikileaks.pl/gfwlist +server=/.dvorak.org/127.0.0.1#7913 +ipset=/.dvorak.org/gfwlist +server=/.tw.tomonews.net/127.0.0.1#7913 +ipset=/.tw.tomonews.net/gfwlist server=/.vijayatemple.org/127.0.0.1#7913 ipset=/.vijayatemple.org/gfwlist +server=/.wikileaks.lu/127.0.0.1#7913 +ipset=/.wikileaks.lu/gfwlist +server=/.wikileaks.eu/127.0.0.1#7913 +ipset=/.wikileaks.eu/gfwlist +server=/.wikileaks.de/127.0.0.1#7913 +ipset=/.wikileaks.de/gfwlist +server=/.wikia.com/127.0.0.1#7913 +ipset=/.wikia.com/gfwlist +server=/.whyx.org/127.0.0.1#7913 +ipset=/.whyx.org/gfwlist server=/.whylover.com/127.0.0.1#7913 ipset=/.whylover.com/gfwlist +server=/.leeao.com.cn/127.0.0.1#7913 +ipset=/.leeao.com.cn/gfwlist server=/.whotalking.com/127.0.0.1#7913 ipset=/.whotalking.com/gfwlist server=/.whoer.net/127.0.0.1#7913 ipset=/.whoer.net/gfwlist -server=/.bullogger.com/127.0.0.1#7913 -ipset=/.bullogger.com/gfwlist -server=/.readmoo.com/127.0.0.1#7913 -ipset=/.readmoo.com/gfwlist -server=/.wetplace.com/127.0.0.1#7913 -ipset=/.wetplace.com/gfwlist -server=/.leeao.com.cn/127.0.0.1#7913 -ipset=/.leeao.com.cn/gfwlist -server=/.wetpussygames.com/127.0.0.1#7913 -ipset=/.wetpussygames.com/gfwlist -server=/.westernwolves.com/127.0.0.1#7913 -ipset=/.westernwolves.com/gfwlist -server=/.westca.com/127.0.0.1#7913 -ipset=/.westca.com/gfwlist -server=/.wenxuecity.com/127.0.0.1#7913 -ipset=/.wenxuecity.com/gfwlist +server=/.adult-sex-games.com/127.0.0.1#7913 +ipset=/.adult-sex-games.com/gfwlist +server=/.stephaniered.com/127.0.0.1#7913 +ipset=/.stephaniered.com/gfwlist server=/.softether-download.com/127.0.0.1#7913 ipset=/.softether-download.com/gfwlist server=/.news.sinchew.com.my/127.0.0.1#7913 ipset=/.news.sinchew.com.my/gfwlist server=/.bcchinese.net/127.0.0.1#7913 ipset=/.bcchinese.net/gfwlist -server=/.wenweipo.com/127.0.0.1#7913 -ipset=/.wenweipo.com/gfwlist +server=/.wetplace.com/127.0.0.1#7913 +ipset=/.wetplace.com/gfwlist server=/.yesasia.com.hk/127.0.0.1#7913 ipset=/.yesasia.com.hk/gfwlist -server=/.wengewang.org/127.0.0.1#7913 -ipset=/.wengewang.org/gfwlist -server=/.wengewang.com/127.0.0.1#7913 -ipset=/.wengewang.com/gfwlist -server=/.wemigrate.org/127.0.0.1#7913 -ipset=/.wemigrate.org/gfwlist -server=/.dalailama-archives.org/127.0.0.1#7913 -ipset=/.dalailama-archives.org/gfwlist -server=/.weisuo.ws/127.0.0.1#7913 -ipset=/.weisuo.ws/gfwlist +server=/.westernwolves.com/127.0.0.1#7913 +ipset=/.westernwolves.com/gfwlist +server=/.westca.com/127.0.0.1#7913 +ipset=/.westca.com/gfwlist +server=/.wenxuecity.com/127.0.0.1#7913 +ipset=/.wenxuecity.com/gfwlist +server=/.wenweipo.com/127.0.0.1#7913 +ipset=/.wenweipo.com/gfwlist +server=/.wenhui.ch/127.0.0.1#7913 +ipset=/.wenhui.ch/gfwlist server=/.wahas.com/127.0.0.1#7913 ipset=/.wahas.com/gfwlist server=/.simbolostwitter.com/127.0.0.1#7913 ipset=/.simbolostwitter.com/gfwlist -server=/.weiming.info/127.0.0.1#7913 -ipset=/.weiming.info/gfwlist +server=/.wengewang.org/127.0.0.1#7913 +ipset=/.wengewang.org/gfwlist server=/.yobt.com/127.0.0.1#7913 ipset=/.yobt.com/gfwlist server=/.iphonetaiwan.org/127.0.0.1#7913 ipset=/.iphonetaiwan.org/gfwlist -server=/.weiboleak.com/127.0.0.1#7913 -ipset=/.weiboleak.com/gfwlist +server=/.wemigrate.org/127.0.0.1#7913 +ipset=/.wemigrate.org/gfwlist server=/.hola.org/127.0.0.1#7913 ipset=/.hola.org/gfwlist server=/.chinese.soifind.com/127.0.0.1#7913 ipset=/.chinese.soifind.com/gfwlist server=/.pinterest.com/127.0.0.1#7913 ipset=/.pinterest.com/gfwlist -server=/.wefong.com/127.0.0.1#7913 -ipset=/.wefong.com/gfwlist -server=/.rmjdw.com/127.0.0.1#7913 -ipset=/.rmjdw.com/gfwlist -server=/.torrentprivacy.com/127.0.0.1#7913 -ipset=/.torrentprivacy.com/gfwlist -server=/.webworkerdaily.com/127.0.0.1#7913 -ipset=/.webworkerdaily.com/gfwlist +server=/.d1c37gjwa26taa.cloudfront.net/127.0.0.1#7913 +ipset=/.d1c37gjwa26taa.cloudfront.net/gfwlist +server=/.weisuo.ws/127.0.0.1#7913 +ipset=/.weisuo.ws/gfwlist +server=/.weiming.info/127.0.0.1#7913 +ipset=/.weiming.info/gfwlist +server=/.weihuo.org/127.0.0.1#7913 +ipset=/.weihuo.org/gfwlist server=/.cn.streetvoice.com/127.0.0.1#7913 ipset=/.cn.streetvoice.com/gfwlist -server=/.torrenty.org/127.0.0.1#7913 -ipset=/.torrenty.org/gfwlist -server=/.www.websnapr.com/127.0.0.1#7913 -ipset=/.www.websnapr.com/gfwlist -server=/.websitepulse.com/127.0.0.1#7913 -ipset=/.websitepulse.com/gfwlist +server=/.weiboleak.com/127.0.0.1#7913 +ipset=/.weiboleak.com/gfwlist +server=/.wefong.com/127.0.0.1#7913 +ipset=/.wefong.com/gfwlist +server=/.shwchurch.org/127.0.0.1#7913 +ipset=/.shwchurch.org/gfwlist server=/.api.ai/127.0.0.1#7913 ipset=/.api.ai/gfwlist -server=/.webs-tv.net/127.0.0.1#7913 -ipset=/.webs-tv.net/gfwlist +server=/.traffichaus.com/127.0.0.1#7913 +ipset=/.traffichaus.com/gfwlist server=/.nationwide.com/127.0.0.1#7913 ipset=/.nationwide.com/gfwlist server=/.api.recaptcha.net/127.0.0.1#7913 ipset=/.api.recaptcha.net/gfwlist -server=/.webjb.org/127.0.0.1#7913 -ipset=/.webjb.org/gfwlist -server=/.hudatoriq.web.id/127.0.0.1#7913 -ipset=/.hudatoriq.web.id/gfwlist +server=/.webworkerdaily.com/127.0.0.1#7913 +ipset=/.webworkerdaily.com/gfwlist +server=/.transparency.org/127.0.0.1#7913 +ipset=/.transparency.org/gfwlist server=/.googleearth.com/127.0.0.1#7913 ipset=/.googleearth.com/gfwlist server=/.trialofccp.org/127.0.0.1#7913 ipset=/.trialofccp.org/gfwlist -server=/.chinesepen.org/127.0.0.1#7913 -ipset=/.chinesepen.org/gfwlist -server=/.ezpeer.com/127.0.0.1#7913 -ipset=/.ezpeer.com/gfwlist +server=/.www.websnapr.com/127.0.0.1#7913 +ipset=/.www.websnapr.com/gfwlist +server=/.crwdcntrl.net/127.0.0.1#7913 +ipset=/.crwdcntrl.net/gfwlist server=/.highrockmedia.com/127.0.0.1#7913 ipset=/.highrockmedia.com/gfwlist server=/.tn2.shemalez.com/127.0.0.1#7913 @@ -6032,52 +6022,52 @@ server=/.yulghun.com/127.0.0.1#7913 ipset=/.yulghun.com/gfwlist server=/.bnn.co/127.0.0.1#7913 ipset=/.bnn.co/gfwlist -server=/.wdf5.com/127.0.0.1#7913 -ipset=/.wdf5.com/gfwlist +server=/.webs-tv.net/127.0.0.1#7913 +ipset=/.webs-tv.net/gfwlist server=/.advertfan.com/127.0.0.1#7913 ipset=/.advertfan.com/gfwlist -server=/.nemesis2.qx.net/127.0.0.1#7913 -ipset=/.nemesis2.qx.net/gfwlist +server=/.webjb.org/127.0.0.1#7913 +ipset=/.webjb.org/gfwlist server=/.www.skype.com/127.0.0.1#7913 ipset=/.www.skype.com/gfwlist server=/.netsneak.com/127.0.0.1#7913 ipset=/.netsneak.com/gfwlist server=/.episcopalchurch.org/127.0.0.1#7913 ipset=/.episcopalchurch.org/gfwlist -server=/.watch8x.com/127.0.0.1#7913 -ipset=/.watch8x.com/gfwlist +server=/.hudatoriq.web.id/127.0.0.1#7913 +ipset=/.hudatoriq.web.id/gfwlist server=/.stoptibetcrisis.net/127.0.0.1#7913 ipset=/.stoptibetcrisis.net/gfwlist -server=/.washeng.net/127.0.0.1#7913 -ipset=/.washeng.net/gfwlist +server=/.onmoon.com/127.0.0.1#7913 +ipset=/.onmoon.com/gfwlist server=/.pythonhackers.com/127.0.0.1#7913 ipset=/.pythonhackers.com/gfwlist server=/.mega.nz/127.0.0.1#7913 ipset=/.mega.nz/gfwlist -server=/.makzhou.warehouse333.com/127.0.0.1#7913 -ipset=/.makzhou.warehouse333.com/gfwlist +server=/.wearn.com/127.0.0.1#7913 +ipset=/.wearn.com/gfwlist server=/.kyzyhello.com/127.0.0.1#7913 ipset=/.kyzyhello.com/gfwlist -server=/.cdpweb.org/127.0.0.1#7913 -ipset=/.cdpweb.org/gfwlist -server=/.wapedia.mobi/127.0.0.1#7913 -ipset=/.wapedia.mobi/gfwlist +server=/.wdf5.com/127.0.0.1#7913 +ipset=/.wdf5.com/gfwlist +server=/.servehttp.com/127.0.0.1#7913 +ipset=/.servehttp.com/gfwlist server=/.4rbtv.com/127.0.0.1#7913 ipset=/.4rbtv.com/gfwlist server=/.flog.tw/127.0.0.1#7913 ipset=/.flog.tw/gfwlist server=/.goagentplus.com/127.0.0.1#7913 ipset=/.goagentplus.com/gfwlist -server=/.want-daily.com/127.0.0.1#7913 -ipset=/.want-daily.com/gfwlist -server=/.www.wangruowang.org/127.0.0.1#7913 -ipset=/.www.wangruowang.org/gfwlist -server=/.wangruoshui.net/127.0.0.1#7913 -ipset=/.wangruoshui.net/gfwlist +server=/.watch8x.com/127.0.0.1#7913 +ipset=/.watch8x.com/gfwlist +server=/.washeng.net/127.0.0.1#7913 +ipset=/.washeng.net/gfwlist +server=/.makzhou.warehouse333.com/127.0.0.1#7913 +ipset=/.makzhou.warehouse333.com/gfwlist server=/.freedomsherald.org/127.0.0.1#7913 ipset=/.freedomsherald.org/gfwlist -server=/.wanglixiong.com/127.0.0.1#7913 -ipset=/.wanglixiong.com/gfwlist +server=/.91porn.com/127.0.0.1#7913 +ipset=/.91porn.com/gfwlist server=/.tuo8.cc/127.0.0.1#7913 ipset=/.tuo8.cc/gfwlist server=/.kinghost.com/127.0.0.1#7913 @@ -6090,78 +6080,78 @@ server=/.thegioitinhoc.vn/127.0.0.1#7913 ipset=/.thegioitinhoc.vn/gfwlist server=/.domain.club.tw/127.0.0.1#7913 ipset=/.domain.club.tw/gfwlist -server=/.wangjinbo.org/127.0.0.1#7913 -ipset=/.wangjinbo.org/gfwlist +server=/.wapedia.mobi/127.0.0.1#7913 +ipset=/.wapedia.mobi/gfwlist server=/.psiphon.ca/127.0.0.1#7913 ipset=/.psiphon.ca/gfwlist -server=/.www.wan-press.org/127.0.0.1#7913 -ipset=/.www.wan-press.org/gfwlist -server=/.waltermartin.org/127.0.0.1#7913 -ipset=/.waltermartin.org/gfwlist +server=/.want-daily.com/127.0.0.1#7913 +ipset=/.want-daily.com/gfwlist +server=/.www.wangruowang.org/127.0.0.1#7913 +ipset=/.www.wangruowang.org/gfwlist server=/.scache.vzw.com/127.0.0.1#7913 ipset=/.scache.vzw.com/gfwlist server=/.comic-mega.me/127.0.0.1#7913 ipset=/.comic-mega.me/gfwlist -server=/.waltermartin.com/127.0.0.1#7913 -ipset=/.waltermartin.com/gfwlist +server=/.wangruoshui.net/127.0.0.1#7913 +ipset=/.wangruoshui.net/gfwlist server=/.huangyiyu.com/127.0.0.1#7913 ipset=/.huangyiyu.com/gfwlist -server=/.ultraxs.com/127.0.0.1#7913 -ipset=/.ultraxs.com/gfwlist -server=/.wallpapercasa.com/127.0.0.1#7913 -ipset=/.wallpapercasa.com/gfwlist +server=/.wanglixiong.com/127.0.0.1#7913 +ipset=/.wanglixiong.com/gfwlist +server=/.wangjinbo.org/127.0.0.1#7913 +ipset=/.wangjinbo.org/gfwlist server=/.upholdjustice.org/127.0.0.1#7913 ipset=/.upholdjustice.org/gfwlist server=/.englishforeveryone.org/127.0.0.1#7913 ipset=/.englishforeveryone.org/gfwlist server=/.christianfreedom.org/127.0.0.1#7913 ipset=/.christianfreedom.org/gfwlist +server=/.www.wan-press.org/127.0.0.1#7913 +ipset=/.www.wan-press.org/gfwlist +server=/.waltermartin.org/127.0.0.1#7913 +ipset=/.waltermartin.org/gfwlist +server=/.waltermartin.com/127.0.0.1#7913 +ipset=/.waltermartin.com/gfwlist +server=/.unification.net/127.0.0.1#7913 +ipset=/.unification.net/gfwlist +server=/.wallpapercasa.com/127.0.0.1#7913 +ipset=/.wallpapercasa.com/gfwlist server=/.wallmama.com/127.0.0.1#7913 ipset=/.wallmama.com/gfwlist -server=/.ccue.ca/127.0.0.1#7913 -ipset=/.ccue.ca/gfwlist +server=/.javakiba.org/127.0.0.1#7913 +ipset=/.javakiba.org/gfwlist +server=/.tosh.comedycentral.com/127.0.0.1#7913 +ipset=/.tosh.comedycentral.com/gfwlist server=/.wailaike.net/127.0.0.1#7913 ipset=/.wailaike.net/gfwlist server=/.waigaobu.com/127.0.0.1#7913 ipset=/.waigaobu.com/gfwlist -server=/.waffle1999.com/127.0.0.1#7913 -ipset=/.waffle1999.com/gfwlist -server=/.lists.w3.org/127.0.0.1#7913 -ipset=/.lists.w3.org/gfwlist -server=/.vuku.cc/127.0.0.1#7913 -ipset=/.vuku.cc/gfwlist -server=/.tosh.comedycentral.com/127.0.0.1#7913 -ipset=/.tosh.comedycentral.com/gfwlist -server=/.vtunnel.com/127.0.0.1#7913 -ipset=/.vtunnel.com/gfwlist -server=/.plusbb.com/127.0.0.1#7913 -ipset=/.plusbb.com/gfwlist server=/.localpresshk.com/127.0.0.1#7913 ipset=/.localpresshk.com/gfwlist server=/.avidemux.org/127.0.0.1#7913 ipset=/.avidemux.org/gfwlist -server=/.vporn.com/127.0.0.1#7913 -ipset=/.vporn.com/gfwlist +server=/.waffle1999.com/127.0.0.1#7913 +ipset=/.waffle1999.com/gfwlist server=/.daidostup.ru/127.0.0.1#7913 ipset=/.daidostup.ru/gfwlist -server=/.vpnworldwide.com/127.0.0.1#7913 -ipset=/.vpnworldwide.com/gfwlist -server=/.recoveryversion.com.tw/127.0.0.1#7913 -ipset=/.recoveryversion.com.tw/gfwlist +server=/.lists.w3.org/127.0.0.1#7913 +ipset=/.lists.w3.org/gfwlist +server=/.vuku.cc/127.0.0.1#7913 +ipset=/.vuku.cc/gfwlist server=/.fringenetwork.com/127.0.0.1#7913 ipset=/.fringenetwork.com/gfwlist server=/.zippyshare.com/127.0.0.1#7913 ipset=/.zippyshare.com/gfwlist -server=/.vpntunnel.com/127.0.0.1#7913 -ipset=/.vpntunnel.com/gfwlist -server=/.vivatube.com/127.0.0.1#7913 -ipset=/.vivatube.com/gfwlist -server=/.vpnshieldapp.com/127.0.0.1#7913 -ipset=/.vpnshieldapp.com/gfwlist -server=/.spencertipping.com/127.0.0.1#7913 -ipset=/.spencertipping.com/gfwlist -server=/.thepiratebay.org/127.0.0.1#7913 -ipset=/.thepiratebay.org/gfwlist +server=/.sanmin.com.tw/127.0.0.1#7913 +ipset=/.sanmin.com.tw/gfwlist +server=/.vporn.com/127.0.0.1#7913 +ipset=/.vporn.com/gfwlist +server=/.vpnworldwide.com/127.0.0.1#7913 +ipset=/.vpnworldwide.com/gfwlist +server=/.aamacau.com/127.0.0.1#7913 +ipset=/.aamacau.com/gfwlist +server=/.vpnunlimitedapp.com/127.0.0.1#7913 +ipset=/.vpnunlimitedapp.com/gfwlist server=/.archive.is/127.0.0.1#7913 ipset=/.archive.is/gfwlist server=/.naughtyamerica.com/127.0.0.1#7913 @@ -6172,34 +6162,34 @@ server=/.zapto.org/127.0.0.1#7913 ipset=/.zapto.org/gfwlist server=/.falunaz.net/127.0.0.1#7913 ipset=/.falunaz.net/gfwlist -server=/.vpnreviewz.com/127.0.0.1#7913 -ipset=/.vpnreviewz.com/gfwlist +server=/.vpntunnel.com/127.0.0.1#7913 +ipset=/.vpntunnel.com/gfwlist server=/.greenvpn.org/127.0.0.1#7913 ipset=/.greenvpn.org/gfwlist server=/.cftfc.com/127.0.0.1#7913 ipset=/.cftfc.com/gfwlist server=/.pchome.com.tw/127.0.0.1#7913 ipset=/.pchome.com.tw/gfwlist -server=/.vpnreactor.com/127.0.0.1#7913 -ipset=/.vpnreactor.com/gfwlist +server=/.vpnshieldapp.com/127.0.0.1#7913 +ipset=/.vpnshieldapp.com/gfwlist server=/.cccat.cc/127.0.0.1#7913 ipset=/.cccat.cc/gfwlist server=/.matome-plus.net/127.0.0.1#7913 ipset=/.matome-plus.net/gfwlist server=/.dsmtp.com/127.0.0.1#7913 ipset=/.dsmtp.com/gfwlist -server=/.vpnpronet.com/127.0.0.1#7913 -ipset=/.vpnpronet.com/gfwlist +server=/.ss-link.com/127.0.0.1#7913 +ipset=/.ss-link.com/gfwlist server=/.cyberghost.natado.com/127.0.0.1#7913 ipset=/.cyberghost.natado.com/gfwlist -server=/.vpnpick.com/127.0.0.1#7913 -ipset=/.vpnpick.com/gfwlist +server=/.thetibetconnection.org/127.0.0.1#7913 +ipset=/.thetibetconnection.org/gfwlist server=/.tw.voa.mobi/127.0.0.1#7913 ipset=/.tw.voa.mobi/gfwlist -server=/.vpnjack.com/127.0.0.1#7913 -ipset=/.vpnjack.com/gfwlist -server=/.vpnintouch.net/127.0.0.1#7913 -ipset=/.vpnintouch.net/gfwlist +server=/.vpnreviewz.com/127.0.0.1#7913 +ipset=/.vpnreviewz.com/gfwlist +server=/.vpnreactor.com/127.0.0.1#7913 +ipset=/.vpnreactor.com/gfwlist server=/.uygur.fc2web.com/127.0.0.1#7913 ipset=/.uygur.fc2web.com/gfwlist server=/.diaoyuislands.org/127.0.0.1#7913 @@ -6208,100 +6198,100 @@ server=/.s-nbcnews.com/127.0.0.1#7913 ipset=/.s-nbcnews.com/gfwlist server=/.mgstage.com/127.0.0.1#7913 ipset=/.mgstage.com/gfwlist -server=/.vpnmentor.com/127.0.0.1#7913 -ipset=/.vpnmentor.com/gfwlist +server=/.vpnpick.com/127.0.0.1#7913 +ipset=/.vpnpick.com/gfwlist server=/.mybbs.us/127.0.0.1#7913 ipset=/.mybbs.us/gfwlist server=/.betternet.co/127.0.0.1#7913 ipset=/.betternet.co/gfwlist server=/.gotw.ca/127.0.0.1#7913 ipset=/.gotw.ca/gfwlist -server=/.vpnmaster.com/127.0.0.1#7913 -ipset=/.vpnmaster.com/gfwlist +server=/.vpnjack.com/127.0.0.1#7913 +ipset=/.vpnjack.com/gfwlist server=/.jiangweiping.com/127.0.0.1#7913 ipset=/.jiangweiping.com/gfwlist +server=/.vpnintouch.net/127.0.0.1#7913 +ipset=/.vpnintouch.net/gfwlist +server=/.vpnintouch.com/127.0.0.1#7913 +ipset=/.vpnintouch.com/gfwlist +server=/.prayforchina.net/127.0.0.1#7913 +ipset=/.prayforchina.net/gfwlist +server=/.vpnmentor.com/127.0.0.1#7913 +ipset=/.vpnmentor.com/gfwlist +server=/.mychinanet.com/127.0.0.1#7913 +ipset=/.mychinanet.com/gfwlist +server=/.vpnmaster.com/127.0.0.1#7913 +ipset=/.vpnmaster.com/gfwlist server=/.vpngratis.net/127.0.0.1#7913 ipset=/.vpngratis.net/gfwlist server=/.vpngate.net/127.0.0.1#7913 ipset=/.vpngate.net/gfwlist -server=/.prayforchina.net/127.0.0.1#7913 -ipset=/.prayforchina.net/gfwlist server=/.vpngate.jp/127.0.0.1#7913 ipset=/.vpngate.jp/gfwlist -server=/.mychinanet.com/127.0.0.1#7913 -ipset=/.mychinanet.com/gfwlist server=/.vpnfires.biz/127.0.0.1#7913 ipset=/.vpnfires.biz/gfwlist -server=/.china101.com/127.0.0.1#7913 -ipset=/.china101.com/gfwlist -server=/.vpnfan.com/127.0.0.1#7913 -ipset=/.vpnfan.com/gfwlist -server=/.vpncoupons.com/127.0.0.1#7913 -ipset=/.vpncoupons.com/gfwlist -server=/.br.st/127.0.0.1#7913 -ipset=/.br.st/gfwlist server=/.protonvpn.com/127.0.0.1#7913 ipset=/.protonvpn.com/gfwlist -server=/.lalulalu.com/127.0.0.1#7913 -ipset=/.lalulalu.com/gfwlist -server=/.vpncomparison.org/127.0.0.1#7913 -ipset=/.vpncomparison.org/gfwlist +server=/.huashangnews.com/127.0.0.1#7913 +ipset=/.huashangnews.com/gfwlist +server=/.vpnfan.com/127.0.0.1#7913 +ipset=/.vpnfan.com/gfwlist server=/.web.dev/127.0.0.1#7913 ipset=/.web.dev/gfwlist server=/.www.eastturkistan.net/127.0.0.1#7913 ipset=/.www.eastturkistan.net/gfwlist server=/.slaytizle.com/127.0.0.1#7913 ipset=/.slaytizle.com/gfwlist -server=/.freefuckvids.com/127.0.0.1#7913 -ipset=/.freefuckvids.com/gfwlist +server=/.vpncoupons.com/127.0.0.1#7913 +ipset=/.vpncoupons.com/gfwlist server=/.ka-wai.com/127.0.0.1#7913 ipset=/.ka-wai.com/gfwlist server=/.quitccp.net/127.0.0.1#7913 ipset=/.quitccp.net/gfwlist +server=/.acmetoy.com/127.0.0.1#7913 +ipset=/.acmetoy.com/gfwlist +server=/.voa-11.akacast.akamaistream.net/127.0.0.1#7913 +ipset=/.voa-11.akacast.akamaistream.net/gfwlist +server=/.vpncomparison.org/127.0.0.1#7913 +ipset=/.vpncomparison.org/gfwlist +server=/.boyfriendtv.com/127.0.0.1#7913 +ipset=/.boyfriendtv.com/gfwlist +server=/.doubibackup.com/127.0.0.1#7913 +ipset=/.doubibackup.com/gfwlist server=/.vpnaccount.org/127.0.0.1#7913 ipset=/.vpnaccount.org/gfwlist server=/.vpn.ac/127.0.0.1#7913 ipset=/.vpn.ac/gfwlist -server=/.voxer.com/127.0.0.1#7913 -ipset=/.voxer.com/gfwlist -server=/.vot.org/127.0.0.1#7913 -ipset=/.vot.org/gfwlist -server=/.doubibackup.com/127.0.0.1#7913 -ipset=/.doubibackup.com/gfwlist -server=/.rael.org/127.0.0.1#7913 -ipset=/.rael.org/gfwlist -server=/.voatibetan.com/127.0.0.1#7913 -ipset=/.voatibetan.com/gfwlist server=/.html5rocks.com/127.0.0.1#7913 ipset=/.html5rocks.com/gfwlist server=/.thefrontier.hk/127.0.0.1#7913 ipset=/.thefrontier.hk/gfwlist -server=/.www.kindleren.com/127.0.0.1#7913 -ipset=/.www.kindleren.com/gfwlist +server=/.voxer.com/127.0.0.1#7913 +ipset=/.voxer.com/gfwlist server=/.ultravpn.fr/127.0.0.1#7913 ipset=/.ultravpn.fr/gfwlist -server=/.voachineseblog.com/127.0.0.1#7913 -ipset=/.voachineseblog.com/gfwlist +server=/.vot.org/127.0.0.1#7913 +ipset=/.vot.org/gfwlist server=/.discuss4u.com/127.0.0.1#7913 ipset=/.discuss4u.com/gfwlist server=/.vegas.williamhill.com/127.0.0.1#7913 ipset=/.vegas.williamhill.com/gfwlist -server=/.vnet.link/127.0.0.1#7913 -ipset=/.vnet.link/gfwlist -server=/.ifan.cz.cc/127.0.0.1#7913 -ipset=/.ifan.cz.cc/gfwlist -server=/.vllcs.org/127.0.0.1#7913 -ipset=/.vllcs.org/gfwlist +server=/.voatibetan.com/127.0.0.1#7913 +ipset=/.voatibetan.com/gfwlist +server=/.apidocs.linksalpha.com/127.0.0.1#7913 +ipset=/.apidocs.linksalpha.com/gfwlist +server=/.konachan.com/127.0.0.1#7913 +ipset=/.konachan.com/gfwlist server=/.fingerdaily.com/127.0.0.1#7913 ipset=/.fingerdaily.com/gfwlist -server=/.vivthomas.com/127.0.0.1#7913 -ipset=/.vivthomas.com/gfwlist +server=/.voachineseblog.com/127.0.0.1#7913 +ipset=/.voachineseblog.com/gfwlist server=/.vpnsp.com/127.0.0.1#7913 ipset=/.vpnsp.com/gfwlist -server=/.vivahentai4u.net/127.0.0.1#7913 -ipset=/.vivahentai4u.net/gfwlist -server=/.viu.com/127.0.0.1#7913 -ipset=/.viu.com/gfwlist +server=/.vnet.link/127.0.0.1#7913 +ipset=/.vnet.link/gfwlist +server=/.vllcs.org/127.0.0.1#7913 +ipset=/.vllcs.org/gfwlist server=/.iamtopone.com/127.0.0.1#7913 ipset=/.iamtopone.com/gfwlist server=/.upwill.org/127.0.0.1#7913 @@ -6312,28 +6302,28 @@ server=/.dbc.hk/127.0.0.1#7913 ipset=/.dbc.hk/gfwlist server=/.ygto.com/127.0.0.1#7913 ipset=/.ygto.com/gfwlist +server=/.vivthomas.com/127.0.0.1#7913 +ipset=/.vivthomas.com/gfwlist +server=/.vivatube.com/127.0.0.1#7913 +ipset=/.vivatube.com/gfwlist +server=/.vivahentai4u.net/127.0.0.1#7913 +ipset=/.vivahentai4u.net/gfwlist +server=/.viu.com/127.0.0.1#7913 +ipset=/.viu.com/gfwlist +server=/.i2p2.de/127.0.0.1#7913 +ipset=/.i2p2.de/gfwlist server=/.visibletweets.com/127.0.0.1#7913 ipset=/.visibletweets.com/gfwlist +server=/.teeniefuck.net/127.0.0.1#7913 +ipset=/.teeniefuck.net/gfwlist server=/.virtualrealporn.com/127.0.0.1#7913 ipset=/.virtualrealporn.com/gfwlist +server=/.https443.net/127.0.0.1#7913 +ipset=/.https443.net/gfwlist server=/.www.lib.virginia.edu/127.0.0.1#7913 ipset=/.www.lib.virginia.edu/gfwlist server=/.vinniev.com/127.0.0.1#7913 ipset=/.vinniev.com/gfwlist -server=/.bettervpn.com/127.0.0.1#7913 -ipset=/.bettervpn.com/gfwlist -server=/.vincnd.com/127.0.0.1#7913 -ipset=/.vincnd.com/gfwlist -server=/.teeniefuck.net/127.0.0.1#7913 -ipset=/.teeniefuck.net/gfwlist -server=/.vimperator.org/127.0.0.1#7913 -ipset=/.vimperator.org/gfwlist -server=/.https443.net/127.0.0.1#7913 -ipset=/.https443.net/gfwlist -server=/.vimeocdn.com/127.0.0.1#7913 -ipset=/.vimeocdn.com/gfwlist -server=/.jintian.net/127.0.0.1#7913 -ipset=/.jintian.net/gfwlist server=/.thestandnews.com/127.0.0.1#7913 ipset=/.thestandnews.com/gfwlist server=/.hkday.net/127.0.0.1#7913 @@ -6342,52 +6332,52 @@ server=/.extmatrix.com/127.0.0.1#7913 ipset=/.extmatrix.com/gfwlist server=/.tibetheritagefund.org/127.0.0.1#7913 ipset=/.tibetheritagefund.org/gfwlist -server=/.vidinfo.org/127.0.0.1#7913 -ipset=/.vidinfo.org/gfwlist +server=/.vincnd.com/127.0.0.1#7913 +ipset=/.vincnd.com/gfwlist server=/.freevpn.nl/127.0.0.1#7913 ipset=/.freevpn.nl/gfwlist server=/.ilove80.be/127.0.0.1#7913 ipset=/.ilove80.be/gfwlist -server=/.videopress.com/127.0.0.1#7913 -ipset=/.videopress.com/gfwlist +server=/.vimperator.org/127.0.0.1#7913 +ipset=/.vimperator.org/gfwlist server=/.pushchinawall.com/127.0.0.1#7913 ipset=/.pushchinawall.com/gfwlist server=/.huiyi.in/127.0.0.1#7913 ipset=/.huiyi.in/gfwlist -server=/.3boys2girls.com/127.0.0.1#7913 -ipset=/.3boys2girls.com/gfwlist +server=/.backchina.com/127.0.0.1#7913 +ipset=/.backchina.com/gfwlist server=/.media.org.hk/127.0.0.1#7913 ipset=/.media.org.hk/gfwlist server=/.hkdf.org/127.0.0.1#7913 ipset=/.hkdf.org/gfwlist -server=/.sl-reverse.com/127.0.0.1#7913 -ipset=/.sl-reverse.com/gfwlist -server=/.vid.me/127.0.0.1#7913 -ipset=/.vid.me/gfwlist -server=/.vica.info/127.0.0.1#7913 -ipset=/.vica.info/gfwlist +server=/.vimeocdn.com/127.0.0.1#7913 +ipset=/.vimeocdn.com/gfwlist +server=/.twibs.com/127.0.0.1#7913 +ipset=/.twibs.com/gfwlist +server=/.vidinfo.org/127.0.0.1#7913 +ipset=/.vidinfo.org/gfwlist server=/.dtdns.net/127.0.0.1#7913 ipset=/.dtdns.net/gfwlist -server=/.viber.com/127.0.0.1#7913 -ipset=/.viber.com/gfwlist +server=/.videopress.com/127.0.0.1#7913 +ipset=/.videopress.com/gfwlist server=/.jitouch.com/127.0.0.1#7913 ipset=/.jitouch.com/gfwlist -server=/.veoh.com/127.0.0.1#7913 -ipset=/.veoh.com/gfwlist -server=/.venchina.com/127.0.0.1#7913 -ipset=/.venchina.com/gfwlist +server=/.alljackpotscasino.com/127.0.0.1#7913 +ipset=/.alljackpotscasino.com/gfwlist +server=/.vid.me/127.0.0.1#7913 +ipset=/.vid.me/gfwlist server=/.peopo.org/127.0.0.1#7913 ipset=/.peopo.org/gfwlist server=/.hstern.net/127.0.0.1#7913 ipset=/.hstern.net/gfwlist -server=/.venbbs.com/127.0.0.1#7913 -ipset=/.venbbs.com/gfwlist -server=/.leirentv.ca/127.0.0.1#7913 -ipset=/.leirentv.ca/gfwlist -server=/.i2p2.de/127.0.0.1#7913 -ipset=/.i2p2.de/gfwlist -server=/.vansky.com/127.0.0.1#7913 -ipset=/.vansky.com/gfwlist +server=/.vica.info/127.0.0.1#7913 +ipset=/.vica.info/gfwlist +server=/.viber.com/127.0.0.1#7913 +ipset=/.viber.com/gfwlist +server=/.veoh.com/127.0.0.1#7913 +ipset=/.veoh.com/gfwlist +server=/.venchina.com/127.0.0.1#7913 +ipset=/.venchina.com/gfwlist server=/.falun.caltech.edu/127.0.0.1#7913 ipset=/.falun.caltech.edu/gfwlist server=/.chinese.engadget.com/127.0.0.1#7913 @@ -6396,106 +6386,106 @@ server=/.mychinamyhome.com/127.0.0.1#7913 ipset=/.mychinamyhome.com/gfwlist server=/.bbsland.com/127.0.0.1#7913 ipset=/.bbsland.com/gfwlist +server=/.venbbs.com/127.0.0.1#7913 +ipset=/.venbbs.com/gfwlist +server=/.leirentv.ca/127.0.0.1#7913 +ipset=/.leirentv.ca/gfwlist +server=/.codeskulptor.org/127.0.0.1#7913 +ipset=/.codeskulptor.org/gfwlist +server=/.vansky.com/127.0.0.1#7913 +ipset=/.vansky.com/gfwlist +server=/.paste.ee/127.0.0.1#7913 +ipset=/.paste.ee/gfwlist server=/.vanilla-jp.com/127.0.0.1#7913 ipset=/.vanilla-jp.com/gfwlist server=/.van698.com/127.0.0.1#7913 ipset=/.van698.com/gfwlist -server=/.great-roc.org/127.0.0.1#7913 -ipset=/.great-roc.org/gfwlist +server=/.binux.me/127.0.0.1#7913 +ipset=/.binux.me/gfwlist server=/.uptodown.com/127.0.0.1#7913 ipset=/.uptodown.com/gfwlist -server=/.paste.ee/127.0.0.1#7913 -ipset=/.paste.ee/gfwlist +server=/.fofldfradio.org/127.0.0.1#7913 +ipset=/.fofldfradio.org/gfwlist server=/.uymaarip.com/127.0.0.1#7913 ipset=/.uymaarip.com/gfwlist server=/.uyghurpress.com/127.0.0.1#7913 ipset=/.uyghurpress.com/gfwlist server=/.uyghurcongress.org/127.0.0.1#7913 ipset=/.uyghurcongress.org/gfwlist -server=/.slinkset.com/127.0.0.1#7913 -ipset=/.slinkset.com/gfwlist -server=/.fofldfradio.org/127.0.0.1#7913 -ipset=/.fofldfradio.org/gfwlist +server=/.smh.com.au/127.0.0.1#7913 +ipset=/.smh.com.au/gfwlist server=/.uyghurcanadiansociety.org/127.0.0.1#7913 ipset=/.uyghurcanadiansociety.org/gfwlist +server=/.greenpeace.com.tw/127.0.0.1#7913 +ipset=/.greenpeace.com.tw/gfwlist server=/.uyghuramerican.org/127.0.0.1#7913 ipset=/.uyghuramerican.org/gfwlist server=/.uyghur.co.uk/127.0.0.1#7913 ipset=/.uyghur.co.uk/gfwlist -server=/.uwants.net/127.0.0.1#7913 -ipset=/.uwants.net/gfwlist -server=/.uu-gg.com/127.0.0.1#7913 -ipset=/.uu-gg.com/gfwlist -server=/.greenpeace.com.tw/127.0.0.1#7913 -ipset=/.greenpeace.com.tw/gfwlist -server=/.utopianpal.com/127.0.0.1#7913 -ipset=/.utopianpal.com/gfwlist -server=/.usus.cc/127.0.0.1#7913 -ipset=/.usus.cc/gfwlist server=/.bestvpn.com/127.0.0.1#7913 ipset=/.bestvpn.com/gfwlist -server=/.nic.cz.cc/127.0.0.1#7913 -ipset=/.nic.cz.cc/gfwlist +server=/.uwants.net/127.0.0.1#7913 +ipset=/.uwants.net/gfwlist server=/.mediafire.com/127.0.0.1#7913 ipset=/.mediafire.com/gfwlist -server=/.tsdr.uspto.gov/127.0.0.1#7913 -ipset=/.tsdr.uspto.gov/gfwlist +server=/.uu-gg.com/127.0.0.1#7913 +ipset=/.uu-gg.com/gfwlist server=/.canyu.org/127.0.0.1#7913 ipset=/.canyu.org/gfwlist server=/.citizencn.com/127.0.0.1#7913 ipset=/.citizencn.com/gfwlist -server=/.usocctn.com/127.0.0.1#7913 -ipset=/.usocctn.com/gfwlist +server=/.utopianpal.com/127.0.0.1#7913 +ipset=/.utopianpal.com/gfwlist server=/.breakgfw.com/127.0.0.1#7913 ipset=/.breakgfw.com/gfwlist server=/.ipobar.com/127.0.0.1#7913 ipset=/.ipobar.com/gfwlist -server=/.quoracdn.net/127.0.0.1#7913 -ipset=/.quoracdn.net/gfwlist +server=/.usus.cc/127.0.0.1#7913 +ipset=/.usus.cc/gfwlist server=/.zspeeder.me/127.0.0.1#7913 ipset=/.zspeeder.me/gfwlist -server=/.usaip.eu/127.0.0.1#7913 -ipset=/.usaip.eu/gfwlist +server=/.tsdr.uspto.gov/127.0.0.1#7913 +ipset=/.tsdr.uspto.gov/gfwlist server=/.faluninfo.de/127.0.0.1#7913 ipset=/.faluninfo.de/gfwlist -server=/.us.to/127.0.0.1#7913 -ipset=/.us.to/gfwlist +server=/.usocctn.com/127.0.0.1#7913 +ipset=/.usocctn.com/gfwlist server=/.a-normal-day.com/127.0.0.1#7913 ipset=/.a-normal-day.com/gfwlist server=/.imb.org/127.0.0.1#7913 ipset=/.imb.org/gfwlist -server=/.urlborg.com/127.0.0.1#7913 -ipset=/.urlborg.com/gfwlist -server=/.dragonsprings.org/127.0.0.1#7913 -ipset=/.dragonsprings.org/gfwlist +server=/.sex8.cc/127.0.0.1#7913 +ipset=/.sex8.cc/gfwlist +server=/.iipdigital.usembassy.gov/127.0.0.1#7913 +ipset=/.iipdigital.usembassy.gov/gfwlist server=/.xiaod.in/127.0.0.1#7913 ipset=/.xiaod.in/gfwlist server=/.fgmtv.net/127.0.0.1#7913 ipset=/.fgmtv.net/gfwlist -server=/.uproxy.org/127.0.0.1#7913 -ipset=/.uproxy.org/gfwlist +server=/.us.to/127.0.0.1#7913 +ipset=/.us.to/gfwlist server=/.livestation.com/127.0.0.1#7913 ipset=/.livestation.com/gfwlist +server=/.urlborg.com/127.0.0.1#7913 +ipset=/.urlborg.com/gfwlist +server=/.dragonsprings.org/127.0.0.1#7913 +ipset=/.dragonsprings.org/gfwlist +server=/.hrw.org/127.0.0.1#7913 +ipset=/.hrw.org/gfwlist +server=/.tor.cn.uptodown.com/127.0.0.1#7913 +ipset=/.tor.cn.uptodown.com/gfwlist +server=/.maturejp.com/127.0.0.1#7913 +ipset=/.maturejp.com/gfwlist +server=/.uproxy.org/127.0.0.1#7913 +ipset=/.uproxy.org/gfwlist +server=/.erights.net/127.0.0.1#7913 +ipset=/.erights.net/gfwlist server=/.upornia.com/127.0.0.1#7913 ipset=/.upornia.com/gfwlist server=/.upmedia.mg/127.0.0.1#7913 ipset=/.upmedia.mg/gfwlist -server=/.hrw.org/127.0.0.1#7913 -ipset=/.hrw.org/gfwlist server=/.uploaded.to/127.0.0.1#7913 ipset=/.uploaded.to/gfwlist -server=/.maturejp.com/127.0.0.1#7913 -ipset=/.maturejp.com/gfwlist -server=/.tbskkinabalu.page.tl/127.0.0.1#7913 -ipset=/.tbskkinabalu.page.tl/gfwlist -server=/.erights.net/127.0.0.1#7913 -ipset=/.erights.net/gfwlist -server=/.smyxy.org/127.0.0.1#7913 -ipset=/.smyxy.org/gfwlist -server=/.lrip.org/127.0.0.1#7913 -ipset=/.lrip.org/gfwlist -server=/.untraceable.us/127.0.0.1#7913 -ipset=/.untraceable.us/gfwlist server=/.prozz.net/127.0.0.1#7913 ipset=/.prozz.net/gfwlist server=/.dphk.org/127.0.0.1#7913 @@ -6506,96 +6496,96 @@ server=/.greatfirewallofchina.org/127.0.0.1#7913 ipset=/.greatfirewallofchina.org/gfwlist server=/.hkcnews.com/127.0.0.1#7913 ipset=/.hkcnews.com/gfwlist -server=/.unpo.org/127.0.0.1#7913 -ipset=/.unpo.org/gfwlist -server=/.unodedos.com/127.0.0.1#7913 -ipset=/.unodedos.com/gfwlist -server=/.unknownspace.org/127.0.0.1#7913 -ipset=/.unknownspace.org/gfwlist +server=/.tcpspeed.co/127.0.0.1#7913 +ipset=/.tcpspeed.co/gfwlist +server=/.www.americorps.gov/127.0.0.1#7913 +ipset=/.www.americorps.gov/gfwlist +server=/.taiwanyes.ning.com/127.0.0.1#7913 +ipset=/.taiwanyes.ning.com/gfwlist server=/.chinasocialdemocraticparty.com/127.0.0.1#7913 ipset=/.chinasocialdemocraticparty.com/gfwlist -server=/.unix100.com/127.0.0.1#7913 -ipset=/.unix100.com/gfwlist +server=/.untraceable.us/127.0.0.1#7913 +ipset=/.untraceable.us/gfwlist server=/.penchinese.com/127.0.0.1#7913 ipset=/.penchinese.com/gfwlist server=/.zvereff.com/127.0.0.1#7913 ipset=/.zvereff.com/gfwlist -server=/.hautelookcdn.com/127.0.0.1#7913 -ipset=/.hautelookcdn.com/gfwlist +server=/.unodedos.com/127.0.0.1#7913 +ipset=/.unodedos.com/gfwlist server=/.pureconcepts.net/127.0.0.1#7913 ipset=/.pureconcepts.net/gfwlist server=/.googleusercontent.com/127.0.0.1#7913 ipset=/.googleusercontent.com/gfwlist server=/.gaybubble.com/127.0.0.1#7913 ipset=/.gaybubble.com/gfwlist -server=/.tsquare.tv/127.0.0.1#7913 -ipset=/.tsquare.tv/gfwlist -server=/.umich.edu/127.0.0.1#7913 -ipset=/.umich.edu/gfwlist +server=/.unknownspace.org/127.0.0.1#7913 +ipset=/.unknownspace.org/gfwlist +server=/.unix100.com/127.0.0.1#7913 +ipset=/.unix100.com/gfwlist server=/.wallproxy.com/127.0.0.1#7913 ipset=/.wallproxy.com/gfwlist -server=/.gifree.com/127.0.0.1#7913 -ipset=/.gifree.com/gfwlist +server=/.chinacomments.org/127.0.0.1#7913 +ipset=/.chinacomments.org/gfwlist server=/.mysecondarydns.com/127.0.0.1#7913 ipset=/.mysecondarydns.com/gfwlist +server=/.cmx.im/127.0.0.1#7913 +ipset=/.cmx.im/gfwlist +server=/.umich.edu/127.0.0.1#7913 +ipset=/.umich.edu/gfwlist +server=/.ultraxs.com/127.0.0.1#7913 +ipset=/.ultraxs.com/gfwlist +server=/.multiupload.com/127.0.0.1#7913 +ipset=/.multiupload.com/gfwlist +server=/.hqsbnet.wordpress.com/127.0.0.1#7913 +ipset=/.hqsbnet.wordpress.com/gfwlist server=/.ulike.net/127.0.0.1#7913 ipset=/.ulike.net/gfwlist server=/.uighurbiz.net/127.0.0.1#7913 ipset=/.uighurbiz.net/gfwlist server=/.uhrp.org/127.0.0.1#7913 ipset=/.uhrp.org/gfwlist -server=/.multiupload.com/127.0.0.1#7913 -ipset=/.multiupload.com/gfwlist -server=/.hqsbnet.wordpress.com/127.0.0.1#7913 -ipset=/.hqsbnet.wordpress.com/gfwlist -server=/.udnbkk.com/127.0.0.1#7913 -ipset=/.udnbkk.com/gfwlist -server=/.china.ucanews.com/127.0.0.1#7913 -ipset=/.china.ucanews.com/gfwlist -server=/.srcf.ucam.org/127.0.0.1#7913 -ipset=/.srcf.ucam.org/gfwlist server=/.sjum.cn/127.0.0.1#7913 ipset=/.sjum.cn/gfwlist -server=/.uc-japan.org/127.0.0.1#7913 -ipset=/.uc-japan.org/gfwlist +server=/.uforadio.com.tw/127.0.0.1#7913 +ipset=/.uforadio.com.tw/gfwlist server=/.raw.githubusercontent.com/127.0.0.1#7913 ipset=/.raw.githubusercontent.com/gfwlist -server=/.ubddns.org/127.0.0.1#7913 -ipset=/.ubddns.org/gfwlist +server=/.udnbkk.com/127.0.0.1#7913 +ipset=/.udnbkk.com/gfwlist server=/.ift.tt/127.0.0.1#7913 ipset=/.ift.tt/gfwlist -server=/.u9un.com/127.0.0.1#7913 -ipset=/.u9un.com/gfwlist +server=/.china.ucanews.com/127.0.0.1#7913 +ipset=/.china.ucanews.com/gfwlist server=/.mash.to/127.0.0.1#7913 ipset=/.mash.to/gfwlist -server=/.contests.twilio.com/127.0.0.1#7913 -ipset=/.contests.twilio.com/gfwlist +server=/.srcf.ucam.org/127.0.0.1#7913 +ipset=/.srcf.ucam.org/gfwlist server=/.youpai.org/127.0.0.1#7913 ipset=/.youpai.org/gfwlist server=/.taolun.info/127.0.0.1#7913 ipset=/.taolun.info/gfwlist -server=/.legaltech.law.com/127.0.0.1#7913 -ipset=/.legaltech.law.com/gfwlist -server=/.martsangkagyuofficial.org/127.0.0.1#7913 -ipset=/.martsangkagyuofficial.org/gfwlist -server=/.typepad.com/127.0.0.1#7913 -ipset=/.typepad.com/gfwlist -server=/.mixx.com/127.0.0.1#7913 -ipset=/.mixx.com/gfwlist +server=/.ubddns.org/127.0.0.1#7913 +ipset=/.ubddns.org/gfwlist +server=/.u9un.com/127.0.0.1#7913 +ipset=/.u9un.com/gfwlist +server=/.contests.twilio.com/127.0.0.1#7913 +ipset=/.contests.twilio.com/gfwlist +server=/.blogs.tampabay.com/127.0.0.1#7913 +ipset=/.blogs.tampabay.com/gfwlist server=/.ns02.info/127.0.0.1#7913 ipset=/.ns02.info/gfwlist -server=/.txxx.com/127.0.0.1#7913 -ipset=/.txxx.com/gfwlist +server=/.legaltech.law.com/127.0.0.1#7913 +ipset=/.legaltech.law.com/gfwlist server=/.politicalconsultation.org/127.0.0.1#7913 ipset=/.politicalconsultation.org/gfwlist -server=/.google.no/127.0.0.1#7913 -ipset=/.google.no/gfwlist -server=/.twskype.com/127.0.0.1#7913 -ipset=/.twskype.com/gfwlist -server=/.twnorth.org.tw/127.0.0.1#7913 -ipset=/.twnorth.org.tw/gfwlist -server=/.twiyia.com/127.0.0.1#7913 -ipset=/.twiyia.com/gfwlist +server=/.marxist.com/127.0.0.1#7913 +ipset=/.marxist.com/gfwlist +server=/.typepad.com/127.0.0.1#7913 +ipset=/.typepad.com/gfwlist +server=/.minzhuzhanxian.com/127.0.0.1#7913 +ipset=/.minzhuzhanxian.com/gfwlist +server=/.txxx.com/127.0.0.1#7913 +ipset=/.txxx.com/gfwlist server=/.fooooo.com/127.0.0.1#7913 ipset=/.fooooo.com/gfwlist server=/.zyxel.com/127.0.0.1#7913 @@ -6604,86 +6594,86 @@ server=/.parler.com/127.0.0.1#7913 ipset=/.parler.com/gfwlist server=/.chinadigitaltimes.net/127.0.0.1#7913 ipset=/.chinadigitaltimes.net/gfwlist -server=/.twittermail.com/127.0.0.1#7913 -ipset=/.twittermail.com/gfwlist +server=/.twnorth.org.tw/127.0.0.1#7913 +ipset=/.twnorth.org.tw/gfwlist server=/.boysfood.com/127.0.0.1#7913 ipset=/.boysfood.com/gfwlist -server=/.twittergadget.com/127.0.0.1#7913 -ipset=/.twittergadget.com/gfwlist +server=/.twiyia.com/127.0.0.1#7913 +ipset=/.twiyia.com/gfwlist server=/.tpi.org.tw/127.0.0.1#7913 ipset=/.tpi.org.tw/gfwlist -server=/.twitterfeed.com/127.0.0.1#7913 -ipset=/.twitterfeed.com/gfwlist -server=/.twittercounter.com/127.0.0.1#7913 -ipset=/.twittercounter.com/gfwlist -server=/.twitter4j.org/127.0.0.1#7913 -ipset=/.twitter4j.org/gfwlist +server=/.bitcoinworld.com/127.0.0.1#7913 +ipset=/.bitcoinworld.com/gfwlist +server=/.c-est-simple.com/127.0.0.1#7913 +ipset=/.c-est-simple.com/gfwlist +server=/.twittermail.com/127.0.0.1#7913 +ipset=/.twittermail.com/gfwlist server=/.megurineluka.com/127.0.0.1#7913 ipset=/.megurineluka.com/gfwlist -server=/.twttr.com/127.0.0.1#7913 -ipset=/.twttr.com/gfwlist +server=/.twittergadget.com/127.0.0.1#7913 +ipset=/.twittergadget.com/gfwlist server=/.ourtv.hk/127.0.0.1#7913 ipset=/.ourtv.hk/gfwlist server=/.powerphoto.org/127.0.0.1#7913 ipset=/.powerphoto.org/gfwlist server=/.shapeservices.com/127.0.0.1#7913 ipset=/.shapeservices.com/gfwlist -server=/.turbotwitter.com/127.0.0.1#7913 -ipset=/.turbotwitter.com/gfwlist +server=/.twitterfeed.com/127.0.0.1#7913 +ipset=/.twitterfeed.com/gfwlist server=/.chinatweeps.com/127.0.0.1#7913 ipset=/.chinatweeps.com/gfwlist -server=/.tweepguide.com/127.0.0.1#7913 -ipset=/.tweepguide.com/gfwlist +server=/.twittercounter.com/127.0.0.1#7913 +ipset=/.twittercounter.com/gfwlist server=/.jav101.com/127.0.0.1#7913 ipset=/.jav101.com/gfwlist -server=/.youtube-nocookie.com/127.0.0.1#7913 -ipset=/.youtube-nocookie.com/gfwlist -server=/.twitoaster.com/127.0.0.1#7913 -ipset=/.twitoaster.com/gfwlist +server=/.twitter4j.org/127.0.0.1#7913 +ipset=/.twitter4j.org/gfwlist +server=/.twttr.com/127.0.0.1#7913 +ipset=/.twttr.com/gfwlist server=/.ifjc.org/127.0.0.1#7913 ipset=/.ifjc.org/gfwlist server=/.cmi.org.tw/127.0.0.1#7913 ipset=/.cmi.org.tw/gfwlist -server=/.tsunagarumon.com/127.0.0.1#7913 -ipset=/.tsunagarumon.com/gfwlist -server=/.twitiq.com/127.0.0.1#7913 -ipset=/.twitiq.com/gfwlist +server=/.turbotwitter.com/127.0.0.1#7913 +ipset=/.turbotwitter.com/gfwlist +server=/.tweepguide.com/127.0.0.1#7913 +ipset=/.tweepguide.com/gfwlist +server=/.bastillepost.com/127.0.0.1#7913 +ipset=/.bastillepost.com/gfwlist +server=/.twitoaster.com/127.0.0.1#7913 +ipset=/.twitoaster.com/gfwlist +server=/.tube911.com/127.0.0.1#7913 +ipset=/.tube911.com/gfwlist +server=/.gamez.com.tw/127.0.0.1#7913 +ipset=/.gamez.com.tw/gfwlist +server=/.xinyubbs.net/127.0.0.1#7913 +ipset=/.xinyubbs.net/gfwlist server=/.twitgoo.com/127.0.0.1#7913 ipset=/.twitgoo.com/gfwlist server=/.twiggit.org/127.0.0.1#7913 ipset=/.twiggit.org/gfwlist server=/.twisternow.com/127.0.0.1#7913 ipset=/.twisternow.com/gfwlist -server=/.gamez.com.tw/127.0.0.1#7913 -ipset=/.gamez.com.tw/gfwlist -server=/.xinyubbs.net/127.0.0.1#7913 -ipset=/.xinyubbs.net/gfwlist -server=/.aboluowang.com/127.0.0.1#7913 -ipset=/.aboluowang.com/gfwlist -server=/.twishort.com/127.0.0.1#7913 -ipset=/.twishort.com/gfwlist -server=/.twip.me/127.0.0.1#7913 -ipset=/.twip.me/gfwlist server=/.putlocker.com/127.0.0.1#7913 ipset=/.putlocker.com/gfwlist -server=/.news.sina.com.hk/127.0.0.1#7913 -ipset=/.news.sina.com.hk/gfwlist +server=/.twisterio.com/127.0.0.1#7913 +ipset=/.twisterio.com/gfwlist server=/.paltalk.com/127.0.0.1#7913 ipset=/.paltalk.com/gfwlist server=/.revleft.com/127.0.0.1#7913 ipset=/.revleft.com/gfwlist -server=/.twicsy.com/127.0.0.1#7913 -ipset=/.twicsy.com/gfwlist -server=/.twibs.com/127.0.0.1#7913 -ipset=/.twibs.com/gfwlist +server=/.co.ng.mil/127.0.0.1#7913 +ipset=/.co.ng.mil/gfwlist +server=/.twishort.com/127.0.0.1#7913 +ipset=/.twishort.com/gfwlist server=/.63i.com/127.0.0.1#7913 ipset=/.63i.com/gfwlist -server=/.thetinhat.com/127.0.0.1#7913 -ipset=/.thetinhat.com/gfwlist -server=/.twibase.com/127.0.0.1#7913 -ipset=/.twibase.com/gfwlist -server=/.twgreatdaily.com/127.0.0.1#7913 -ipset=/.twgreatdaily.com/gfwlist +server=/.twip.me/127.0.0.1#7913 +ipset=/.twip.me/gfwlist +server=/.tibetcharity.in/127.0.0.1#7913 +ipset=/.tibetcharity.in/gfwlist +server=/.twicsy.com/127.0.0.1#7913 +ipset=/.twicsy.com/gfwlist server=/.vimeo.com/127.0.0.1#7913 ipset=/.vimeo.com/gfwlist server=/.cn.voa.mobi/127.0.0.1#7913 @@ -6694,58 +6684,58 @@ server=/.famunion.com/127.0.0.1#7913 ipset=/.famunion.com/gfwlist server=/.code.jquery.com/127.0.0.1#7913 ipset=/.code.jquery.com/gfwlist -server=/.actfortibet.org/127.0.0.1#7913 -ipset=/.actfortibet.org/gfwlist +server=/.twgreatdaily.com/127.0.0.1#7913 +ipset=/.twgreatdaily.com/gfwlist server=/.fakku.net/127.0.0.1#7913 ipset=/.fakku.net/gfwlist server=/.la-forum.org/127.0.0.1#7913 ipset=/.la-forum.org/gfwlist -server=/.tweetphoto.com/127.0.0.1#7913 -ipset=/.tweetphoto.com/gfwlist -server=/.tweetmylast.fm/127.0.0.1#7913 -ipset=/.tweetmylast.fm/gfwlist +server=/.nofile.io/127.0.0.1#7913 +ipset=/.nofile.io/gfwlist +server=/.tweetwally.com/127.0.0.1#7913 +ipset=/.tweetwally.com/gfwlist server=/.ladbrokes.com/127.0.0.1#7913 ipset=/.ladbrokes.com/gfwlist -server=/.mtw.tl/127.0.0.1#7913 -ipset=/.mtw.tl/gfwlist +server=/.tweetree.com/127.0.0.1#7913 +ipset=/.tweetree.com/gfwlist server=/.jetos.com/127.0.0.1#7913 ipset=/.jetos.com/gfwlist -server=/.deck.ly/127.0.0.1#7913 -ipset=/.deck.ly/gfwlist +server=/.daodu14.jigsy.com/127.0.0.1#7913 +ipset=/.daodu14.jigsy.com/gfwlist server=/.skyvegas.com/127.0.0.1#7913 ipset=/.skyvegas.com/gfwlist -server=/.newstarnet.com/127.0.0.1#7913 -ipset=/.newstarnet.com/gfwlist +server=/.tweetphoto.com/127.0.0.1#7913 +ipset=/.tweetphoto.com/gfwlist server=/.ntdtv.ru/127.0.0.1#7913 ipset=/.ntdtv.ru/gfwlist server=/.qanote.com/127.0.0.1#7913 ipset=/.qanote.com/gfwlist -server=/.tweetboner.biz/127.0.0.1#7913 -ipset=/.tweetboner.biz/gfwlist -server=/.tweepml.org/127.0.0.1#7913 -ipset=/.tweepml.org/gfwlist -server=/.bigmoney.biz/127.0.0.1#7913 -ipset=/.bigmoney.biz/gfwlist +server=/.tweetmylast.fm/127.0.0.1#7913 +ipset=/.tweetmylast.fm/gfwlist +server=/.mtw.tl/127.0.0.1#7913 +ipset=/.mtw.tl/gfwlist +server=/.deck.ly/127.0.0.1#7913 +ipset=/.deck.ly/gfwlist server=/.sherabgyaltsen.com/127.0.0.1#7913 ipset=/.sherabgyaltsen.com/gfwlist -server=/.twbbs.tw/127.0.0.1#7913 -ipset=/.twbbs.tw/gfwlist -server=/.tibetanculture.org/127.0.0.1#7913 -ipset=/.tibetanculture.org/gfwlist +server=/.newtalk.tw/127.0.0.1#7913 +ipset=/.newtalk.tw/gfwlist +server=/.tweetboner.biz/127.0.0.1#7913 +ipset=/.tweetboner.biz/gfwlist server=/.hopedialogue.org/127.0.0.1#7913 ipset=/.hopedialogue.org/gfwlist server=/.help.linksalpha.com/127.0.0.1#7913 ipset=/.help.linksalpha.com/gfwlist -server=/.twavi.com/127.0.0.1#7913 -ipset=/.twavi.com/gfwlist +server=/.tweepml.org/127.0.0.1#7913 +ipset=/.tweepml.org/gfwlist server=/.whereiswerner.com/127.0.0.1#7913 ipset=/.whereiswerner.com/gfwlist -server=/.twapperkeeper.com/127.0.0.1#7913 -ipset=/.twapperkeeper.com/gfwlist +server=/.mingpaony.com/127.0.0.1#7913 +ipset=/.mingpaony.com/gfwlist server=/.imlive.com/127.0.0.1#7913 ipset=/.imlive.com/gfwlist -server=/.tw-blog.com/127.0.0.1#7913 -ipset=/.tw-blog.com/gfwlist +server=/.joinclubhouse.com/127.0.0.1#7913 +ipset=/.joinclubhouse.com/gfwlist server=/.globaljihad.net/127.0.0.1#7913 ipset=/.globaljihad.net/gfwlist server=/.guishan.org/127.0.0.1#7913 @@ -6758,110 +6748,110 @@ server=/.community.windy.com/127.0.0.1#7913 ipset=/.community.windy.com/gfwlist server=/.alphaporno.com/127.0.0.1#7913 ipset=/.alphaporno.com/gfwlist -server=/.12bet.com/127.0.0.1#7913 -ipset=/.12bet.com/gfwlist -server=/.tvmost.com.hk/127.0.0.1#7913 -ipset=/.tvmost.com.hk/gfwlist -server=/.zzcloud.me/127.0.0.1#7913 -ipset=/.zzcloud.me/gfwlist -server=/.tvboxnow.com/127.0.0.1#7913 -ipset=/.tvboxnow.com/gfwlist -server=/.googlechinawebmaster.com/127.0.0.1#7913 -ipset=/.googlechinawebmaster.com/gfwlist +server=/.twavi.com/127.0.0.1#7913 +ipset=/.twavi.com/gfwlist +server=/.twapperkeeper.com/127.0.0.1#7913 +ipset=/.twapperkeeper.com/gfwlist +server=/.tw-blog.com/127.0.0.1#7913 +ipset=/.tw-blog.com/gfwlist +server=/.tvunetworks.com/127.0.0.1#7913 +ipset=/.tvunetworks.com/gfwlist +server=/.asiansexdiary.com/127.0.0.1#7913 +ipset=/.asiansexdiary.com/gfwlist server=/.chinatown.com.au/127.0.0.1#7913 ipset=/.chinatown.com.au/gfwlist -server=/.stumbleupon.com/127.0.0.1#7913 -ipset=/.stumbleupon.com/gfwlist -server=/.slutmoonbeam.com/127.0.0.1#7913 -ipset=/.slutmoonbeam.com/gfwlist -server=/.lecloud.net/127.0.0.1#7913 -ipset=/.lecloud.net/gfwlist -server=/.tumblr.com/127.0.0.1#7913 -ipset=/.tumblr.com/gfwlist +server=/.tvmost.com.hk/127.0.0.1#7913 +ipset=/.tvmost.com.hk/gfwlist +server=/.googleplus.com/127.0.0.1#7913 +ipset=/.googleplus.com/gfwlist +server=/.tvboxnow.com/127.0.0.1#7913 +ipset=/.tvboxnow.com/gfwlist +server=/.nakuz.com/127.0.0.1#7913 +ipset=/.nakuz.com/gfwlist server=/.onedrive.live.com/127.0.0.1#7913 ipset=/.onedrive.live.com/gfwlist server=/.6parker.com/127.0.0.1#7913 ipset=/.6parker.com/gfwlist server=/.cmp.hku.hk/127.0.0.1#7913 ipset=/.cmp.hku.hk/gfwlist -server=/.tuvpn.com/127.0.0.1#7913 -ipset=/.tuvpn.com/gfwlist +server=/.sunporno.com/127.0.0.1#7913 +ipset=/.sunporno.com/gfwlist server=/.fuq.com/127.0.0.1#7913 ipset=/.fuq.com/gfwlist -server=/.app.tutanota.com/127.0.0.1#7913 -ipset=/.app.tutanota.com/gfwlist -server=/.tushycash.com/127.0.0.1#7913 -ipset=/.tushycash.com/gfwlist +server=/.slutmoonbeam.com/127.0.0.1#7913 +ipset=/.slutmoonbeam.com/gfwlist +server=/.lecloud.net/127.0.0.1#7913 +ipset=/.lecloud.net/gfwlist server=/.gobet.cc/127.0.0.1#7913 ipset=/.gobet.cc/gfwlist -server=/.bbnradio.org/127.0.0.1#7913 -ipset=/.bbnradio.org/gfwlist -server=/.tuitwit.com/127.0.0.1#7913 -ipset=/.tuitwit.com/gfwlist -server=/.atnext.com/127.0.0.1#7913 -ipset=/.atnext.com/gfwlist +server=/.tumblr.com/127.0.0.1#7913 +ipset=/.tumblr.com/gfwlist +server=/.tuvpn.com/127.0.0.1#7913 +ipset=/.tuvpn.com/gfwlist +server=/.app.tutanota.com/127.0.0.1#7913 +ipset=/.app.tutanota.com/gfwlist server=/.dropbox.com/127.0.0.1#7913 ipset=/.dropbox.com/gfwlist server=/.have8.com/127.0.0.1#7913 ipset=/.have8.com/gfwlist -server=/.tuo8.pw/127.0.0.1#7913 -ipset=/.tuo8.pw/gfwlist -server=/.starp2p.com/127.0.0.1#7913 -ipset=/.starp2p.com/gfwlist +server=/.tushycash.com/127.0.0.1#7913 +ipset=/.tushycash.com/gfwlist +server=/.myfreshnet.com/127.0.0.1#7913 +ipset=/.myfreshnet.com/gfwlist server=/.ned.org/127.0.0.1#7913 ipset=/.ned.org/gfwlist -server=/.tuo8.in/127.0.0.1#7913 -ipset=/.tuo8.in/gfwlist -server=/.tuo8.hk/127.0.0.1#7913 -ipset=/.tuo8.hk/gfwlist +server=/.tuitwit.com/127.0.0.1#7913 +ipset=/.tuitwit.com/gfwlist +server=/.mp3ye.eu/127.0.0.1#7913 +ipset=/.mp3ye.eu/gfwlist server=/.summify.com/127.0.0.1#7913 ipset=/.summify.com/gfwlist server=/.gate-project.com/127.0.0.1#7913 ipset=/.gate-project.com/gfwlist +server=/.tuo8.pw/127.0.0.1#7913 +ipset=/.tuo8.pw/gfwlist +server=/.nflxso.net/127.0.0.1#7913 +ipset=/.nflxso.net/gfwlist +server=/.tuo8.in/127.0.0.1#7913 +ipset=/.tuo8.in/gfwlist +server=/.tuo8.hk/127.0.0.1#7913 +ipset=/.tuo8.hk/gfwlist +server=/.indiemerch.com/127.0.0.1#7913 +ipset=/.indiemerch.com/gfwlist server=/.tuo8.club/127.0.0.1#7913 ipset=/.tuo8.club/gfwlist server=/.tunnelr.com/127.0.0.1#7913 ipset=/.tunnelr.com/gfwlist -server=/.tunein.com/127.0.0.1#7913 -ipset=/.tunein.com/gfwlist -server=/.noypf.com/127.0.0.1#7913 -ipset=/.noypf.com/gfwlist -server=/.kyoyue.com/127.0.0.1#7913 -ipset=/.kyoyue.com/gfwlist -server=/.bbs.tuitui.info/127.0.0.1#7913 -ipset=/.bbs.tuitui.info/gfwlist -server=/.furinkan.com/127.0.0.1#7913 -ipset=/.furinkan.com/gfwlist server=/.qusi8.net/127.0.0.1#7913 ipset=/.qusi8.net/gfwlist -server=/.tuidang.org/127.0.0.1#7913 -ipset=/.tuidang.org/gfwlist +server=/.tunein.com/127.0.0.1#7913 +ipset=/.tunein.com/gfwlist server=/.tibet-munich.de/127.0.0.1#7913 ipset=/.tibet-munich.de/gfwlist server=/.kenengba.com/127.0.0.1#7913 ipset=/.kenengba.com/gfwlist server=/.hklts.org.hk/127.0.0.1#7913 ipset=/.hklts.org.hk/gfwlist -server=/.video.ap.org/127.0.0.1#7913 -ipset=/.video.ap.org/gfwlist +server=/.ogate.org/127.0.0.1#7913 +ipset=/.ogate.org/gfwlist server=/.seesmic.com/127.0.0.1#7913 ipset=/.seesmic.com/gfwlist -server=/.tubestack.com/127.0.0.1#7913 -ipset=/.tubestack.com/gfwlist +server=/.bbs.tuitui.info/127.0.0.1#7913 +ipset=/.bbs.tuitui.info/gfwlist server=/.bullog.org/127.0.0.1#7913 ipset=/.bullog.org/gfwlist -server=/.stranabg.com/127.0.0.1#7913 -ipset=/.stranabg.com/gfwlist -server=/.tube911.com/127.0.0.1#7913 -ipset=/.tube911.com/gfwlist -server=/.boxpn.com/127.0.0.1#7913 -ipset=/.boxpn.com/gfwlist -server=/.thereallove.kr/127.0.0.1#7913 -ipset=/.thereallove.kr/gfwlist -server=/.frootvpn.com/127.0.0.1#7913 -ipset=/.frootvpn.com/gfwlist -server=/.tt1069.com/127.0.0.1#7913 -ipset=/.tt1069.com/gfwlist +server=/.pinimg.com/127.0.0.1#7913 +ipset=/.pinimg.com/gfwlist +server=/.tuidang.org/127.0.0.1#7913 +ipset=/.tuidang.org/gfwlist +server=/.qienkuen.org/127.0.0.1#7913 +ipset=/.qienkuen.org/gfwlist +server=/.tubewolf.com/127.0.0.1#7913 +ipset=/.tubewolf.com/gfwlist +server=/.tubestack.com/127.0.0.1#7913 +ipset=/.tubestack.com/gfwlist +server=/.api.pureapk.com/127.0.0.1#7913 +ipset=/.api.pureapk.com/gfwlist server=/.le-vpn.com/127.0.0.1#7913 ipset=/.le-vpn.com/gfwlist server=/.twitmania.com/127.0.0.1#7913 @@ -6870,54 +6860,54 @@ server=/.chinainperspective.com/127.0.0.1#7913 ipset=/.chinainperspective.com/gfwlist server=/.unblock-us.com/127.0.0.1#7913 ipset=/.unblock-us.com/gfwlist -server=/.forum.omy.sg/127.0.0.1#7913 -ipset=/.forum.omy.sg/gfwlist -server=/.truveo.com/127.0.0.1#7913 -ipset=/.truveo.com/gfwlist -server=/.truth101.co.tv/127.0.0.1#7913 -ipset=/.truth101.co.tv/gfwlist +server=/.thevivekspot.com/127.0.0.1#7913 +ipset=/.thevivekspot.com/gfwlist +server=/.rti.org.tw/127.0.0.1#7913 +ipset=/.rti.org.tw/gfwlist +server=/.tt1069.com/127.0.0.1#7913 +ipset=/.tt1069.com/gfwlist server=/.piposay.com/127.0.0.1#7913 ipset=/.piposay.com/gfwlist -server=/.hotshame.com/127.0.0.1#7913 -ipset=/.hotshame.com/gfwlist -server=/.dvorak.org/127.0.0.1#7913 -ipset=/.dvorak.org/gfwlist +server=/.tsunagarumon.com/127.0.0.1#7913 +ipset=/.tsunagarumon.com/gfwlist +server=/.tsquare.tv/127.0.0.1#7913 +ipset=/.tsquare.tv/gfwlist server=/.google.as/127.0.0.1#7913 ipset=/.google.as/gfwlist server=/.appledaily.com.hk/127.0.0.1#7913 ipset=/.appledaily.com.hk/gfwlist server=/.lsmwebcast.com/127.0.0.1#7913 ipset=/.lsmwebcast.com/gfwlist -server=/.trouw.nl/127.0.0.1#7913 -ipset=/.trouw.nl/gfwlist -server=/.islam.org.hk/127.0.0.1#7913 -ipset=/.islam.org.hk/gfwlist +server=/.desc.se/127.0.0.1#7913 +ipset=/.desc.se/gfwlist +server=/.truveo.com/127.0.0.1#7913 +ipset=/.truveo.com/gfwlist server=/.liuxiaobo.net/127.0.0.1#7913 ipset=/.liuxiaobo.net/gfwlist -server=/.w.idaiwan.com/127.0.0.1#7913 -ipset=/.w.idaiwan.com/gfwlist -server=/.transparency.org/127.0.0.1#7913 -ipset=/.transparency.org/gfwlist -server=/.traffichaus.com/127.0.0.1#7913 -ipset=/.traffichaus.com/gfwlist -server=/.towngain.com/127.0.0.1#7913 -ipset=/.towngain.com/gfwlist +server=/.truth101.co.tv/127.0.0.1#7913 +ipset=/.truth101.co.tv/gfwlist +server=/.qidian.ca/127.0.0.1#7913 +ipset=/.qidian.ca/gfwlist +server=/.boyangu.com/127.0.0.1#7913 +ipset=/.boyangu.com/gfwlist +server=/.trouw.nl/127.0.0.1#7913 +ipset=/.trouw.nl/gfwlist server=/.abc.pp.ru/127.0.0.1#7913 ipset=/.abc.pp.ru/gfwlist -server=/.toutiaoabc.com/127.0.0.1#7913 -ipset=/.toutiaoabc.com/gfwlist +server=/.rael.org/127.0.0.1#7913 +ipset=/.rael.org/gfwlist server=/.cnnews.chosun.com/127.0.0.1#7913 ipset=/.cnnews.chosun.com/gfwlist -server=/.ntdtvla.com/127.0.0.1#7913 -ipset=/.ntdtvla.com/gfwlist +server=/.arethusa.su/127.0.0.1#7913 +ipset=/.arethusa.su/gfwlist server=/.webwarper.net/127.0.0.1#7913 ipset=/.webwarper.net/gfwlist server=/.weekmag.info/127.0.0.1#7913 ipset=/.weekmag.info/gfwlist server=/.blog.martinoei.com/127.0.0.1#7913 ipset=/.blog.martinoei.com/gfwlist -server=/.torproject.org/127.0.0.1#7913 -ipset=/.torproject.org/gfwlist +server=/.towngain.com/127.0.0.1#7913 +ipset=/.towngain.com/gfwlist server=/.straplessdildo.com/127.0.0.1#7913 ipset=/.straplessdildo.com/gfwlist server=/.facesoftibetanselfimmolators.info/127.0.0.1#7913 @@ -6926,66 +6916,66 @@ server=/.searchtruth.com/127.0.0.1#7913 ipset=/.searchtruth.com/gfwlist server=/.freessh.us/127.0.0.1#7913 ipset=/.freessh.us/gfwlist -server=/.torcn.com/127.0.0.1#7913 -ipset=/.torcn.com/gfwlist -server=/.tora.to/127.0.0.1#7913 -ipset=/.tora.to/gfwlist -server=/.toptip.ca/127.0.0.1#7913 -ipset=/.toptip.ca/gfwlist -server=/.topsy.com/127.0.0.1#7913 -ipset=/.topsy.com/gfwlist +server=/.toutiaoabc.com/127.0.0.1#7913 +ipset=/.toutiaoabc.com/gfwlist +server=/.nuvid.com/127.0.0.1#7913 +ipset=/.nuvid.com/gfwlist +server=/.torrenty.org/127.0.0.1#7913 +ipset=/.torrenty.org/gfwlist +server=/.torrentprivacy.com/127.0.0.1#7913 +ipset=/.torrentprivacy.com/gfwlist server=/.twitch.tv/127.0.0.1#7913 ipset=/.twitch.tv/gfwlist server=/.helloandroid.com/127.0.0.1#7913 ipset=/.helloandroid.com/gfwlist -server=/.topshareware.com/127.0.0.1#7913 -ipset=/.topshareware.com/gfwlist +server=/.torproject.org/127.0.0.1#7913 +ipset=/.torproject.org/gfwlist server=/.bbc.co.uk/127.0.0.1#7913 ipset=/.bbc.co.uk/gfwlist server=/.chromeenterprise.google/127.0.0.1#7913 ipset=/.chromeenterprise.google/gfwlist server=/.updates.tdesktop.com/127.0.0.1#7913 ipset=/.updates.tdesktop.com/gfwlist -server=/.top.tv/127.0.0.1#7913 -ipset=/.top.tv/gfwlist -server=/.iblogserv-f.net/127.0.0.1#7913 -ipset=/.iblogserv-f.net/gfwlist +server=/.torcn.com/127.0.0.1#7913 +ipset=/.torcn.com/gfwlist +server=/.moroneta.com/127.0.0.1#7913 +ipset=/.moroneta.com/gfwlist server=/.eu.org/127.0.0.1#7913 ipset=/.eu.org/gfwlist -server=/.torguard.net/127.0.0.1#7913 -ipset=/.torguard.net/gfwlist +server=/.tora.to/127.0.0.1#7913 +ipset=/.tora.to/gfwlist server=/.blueangellive.com/127.0.0.1#7913 ipset=/.blueangellive.com/gfwlist -server=/.toppornsites.com/127.0.0.1#7913 -ipset=/.toppornsites.com/gfwlist -server=/.topnews.in/127.0.0.1#7913 -ipset=/.topnews.in/gfwlist +server=/.toptip.ca/127.0.0.1#7913 +ipset=/.toptip.ca/gfwlist +server=/.topsy.com/127.0.0.1#7913 +ipset=/.topsy.com/gfwlist server=/.wowrk.com/127.0.0.1#7913 ipset=/.wowrk.com/gfwlist server=/.ra.gg/127.0.0.1#7913 ipset=/.ra.gg/gfwlist -server=/.18virginsex.com/127.0.0.1#7913 -ipset=/.18virginsex.com/gfwlist +server=/.top.tv/127.0.0.1#7913 +ipset=/.top.tv/gfwlist server=/.fpmt.tw/127.0.0.1#7913 ipset=/.fpmt.tw/gfwlist -server=/.orzistic.org/127.0.0.1#7913 -ipset=/.orzistic.org/gfwlist +server=/.murmur.tw/127.0.0.1#7913 +ipset=/.murmur.tw/gfwlist server=/.xm.com/127.0.0.1#7913 ipset=/.xm.com/gfwlist server=/.1eew.com/127.0.0.1#7913 ipset=/.1eew.com/gfwlist -server=/.bloglines.com/127.0.0.1#7913 -ipset=/.bloglines.com/gfwlist -server=/.slickvpn.com/127.0.0.1#7913 -ipset=/.slickvpn.com/gfwlist -server=/.tw.tomonews.net/127.0.0.1#7913 -ipset=/.tw.tomonews.net/gfwlist +server=/.torguard.net/127.0.0.1#7913 +ipset=/.torguard.net/gfwlist +server=/.toppornsites.com/127.0.0.1#7913 +ipset=/.toppornsites.com/gfwlist +server=/.topnews.in/127.0.0.1#7913 +ipset=/.topnews.in/gfwlist server=/.rferl.org/127.0.0.1#7913 ipset=/.rferl.org/gfwlist server=/.ipfire.org/127.0.0.1#7913 ipset=/.ipfire.org/gfwlist -server=/.tokyocn.com/127.0.0.1#7913 -ipset=/.tokyocn.com/gfwlist +server=/.top81.ws/127.0.0.1#7913 +ipset=/.top81.ws/gfwlist server=/.playboyplus.com/127.0.0.1#7913 ipset=/.playboyplus.com/gfwlist server=/.noodlevpn.com/127.0.0.1#7913 @@ -7000,20 +6990,20 @@ server=/.swissinfo.ch/127.0.0.1#7913 ipset=/.swissinfo.ch/gfwlist server=/.cn-proxy.com/127.0.0.1#7913 ipset=/.cn-proxy.com/gfwlist -server=/.tokyo-247.com/127.0.0.1#7913 -ipset=/.tokyo-247.com/gfwlist -server=/.togetter.com/127.0.0.1#7913 -ipset=/.togetter.com/gfwlist -server=/.tnaflix.com/127.0.0.1#7913 -ipset=/.tnaflix.com/gfwlist +server=/.get.dev/127.0.0.1#7913 +ipset=/.get.dev/gfwlist +server=/.drsunacademy.com/127.0.0.1#7913 +ipset=/.drsunacademy.com/gfwlist +server=/.smhric.org/127.0.0.1#7913 +ipset=/.smhric.org/gfwlist server=/.wikileaks.org/127.0.0.1#7913 ipset=/.wikileaks.org/gfwlist -server=/.tmagazine.com/127.0.0.1#7913 -ipset=/.tmagazine.com/gfwlist +server=/.tokyocn.com/127.0.0.1#7913 +ipset=/.tokyocn.com/gfwlist server=/.google.kz/127.0.0.1#7913 ipset=/.google.kz/gfwlist -server=/.tkcs-collins.com/127.0.0.1#7913 -ipset=/.tkcs-collins.com/gfwlist +server=/.tokyo-247.com/127.0.0.1#7913 +ipset=/.tokyo-247.com/gfwlist server=/.cctongbao.com/127.0.0.1#7913 ipset=/.cctongbao.com/gfwlist server=/.hidein.net/127.0.0.1#7913 @@ -7026,50 +7016,50 @@ server=/.hwadzan.tw/127.0.0.1#7913 ipset=/.hwadzan.tw/gfwlist server=/.mycanadanow.com/127.0.0.1#7913 ipset=/.mycanadanow.com/gfwlist -server=/.tinypaste.com/127.0.0.1#7913 -ipset=/.tinypaste.com/gfwlist +server=/.togetter.com/127.0.0.1#7913 +ipset=/.togetter.com/gfwlist server=/.ninecommentaries.com/127.0.0.1#7913 ipset=/.ninecommentaries.com/gfwlist -server=/.tinychat.com/127.0.0.1#7913 -ipset=/.tinychat.com/gfwlist +server=/.tnaflix.com/127.0.0.1#7913 +ipset=/.tnaflix.com/gfwlist server=/.googlefiber.net/127.0.0.1#7913 ipset=/.googlefiber.net/gfwlist server=/.wn.com/127.0.0.1#7913 ipset=/.wn.com/gfwlist server=/.guaguass.com/127.0.0.1#7913 ipset=/.guaguass.com/gfwlist -server=/.timdir.com/127.0.0.1#7913 -ipset=/.timdir.com/gfwlist +server=/.tkcs-collins.com/127.0.0.1#7913 +ipset=/.tkcs-collins.com/gfwlist server=/.skybet.com/127.0.0.1#7913 ipset=/.skybet.com/gfwlist -server=/.ourdearamy.com/127.0.0.1#7913 -ipset=/.ourdearamy.com/gfwlist -server=/.adultkeep.net/127.0.0.1#7913 -ipset=/.adultkeep.net/gfwlist +server=/.tinypaste.com/127.0.0.1#7913 +ipset=/.tinypaste.com/gfwlist +server=/.shiksha.com/127.0.0.1#7913 +ipset=/.shiksha.com/gfwlist server=/.sustainability.google/127.0.0.1#7913 ipset=/.sustainability.google/gfwlist server=/.lianyue.net/127.0.0.1#7913 ipset=/.lianyue.net/gfwlist -server=/.tibetsupportgroup.org/127.0.0.1#7913 -ipset=/.tibetsupportgroup.org/gfwlist -server=/.tibetsun.com/127.0.0.1#7913 -ipset=/.tibetsun.com/gfwlist +server=/.tinychat.com/127.0.0.1#7913 +ipset=/.tinychat.com/gfwlist +server=/.tintuc101.com/127.0.0.1#7913 +ipset=/.tintuc101.com/gfwlist server=/.faithfuleye.com/127.0.0.1#7913 ipset=/.faithfuleye.com/gfwlist server=/.gmail.com/127.0.0.1#7913 ipset=/.gmail.com/gfwlist server=/.bt2mag.com/127.0.0.1#7913 ipset=/.bt2mag.com/gfwlist -server=/.tibetsociety.com/127.0.0.1#7913 -ipset=/.tibetsociety.com/gfwlist -server=/.tibetpolicy.eu/127.0.0.1#7913 -ipset=/.tibetpolicy.eu/gfwlist -server=/.tibetoralhistory.org/127.0.0.1#7913 -ipset=/.tibetoralhistory.org/gfwlist +server=/.blog.tiney.com/127.0.0.1#7913 +ipset=/.blog.tiney.com/gfwlist +server=/.timdir.com/127.0.0.1#7913 +ipset=/.timdir.com/gfwlist +server=/.oursweb.net/127.0.0.1#7913 +ipset=/.oursweb.net/gfwlist server=/.cn.ibtimes.com/127.0.0.1#7913 ipset=/.cn.ibtimes.com/gfwlist -server=/.tibetonline.tv/127.0.0.1#7913 -ipset=/.tibetonline.tv/gfwlist +server=/.tibetsupportgroup.org/127.0.0.1#7913 +ipset=/.tibetsupportgroup.org/gfwlist server=/.ccue.com/127.0.0.1#7913 ipset=/.ccue.com/gfwlist server=/.wikiversity.org/127.0.0.1#7913 @@ -7078,42 +7068,42 @@ server=/.chingcheong.com/127.0.0.1#7913 ipset=/.chingcheong.com/gfwlist server=/.goofind.com/127.0.0.1#7913 ipset=/.goofind.com/gfwlist -server=/.tibetoffice.ch/127.0.0.1#7913 -ipset=/.tibetoffice.ch/gfwlist -server=/.tibetnetwork.org/127.0.0.1#7913 -ipset=/.tibetnetwork.org/gfwlist +server=/.tibetsociety.com/127.0.0.1#7913 +ipset=/.tibetsociety.com/gfwlist +server=/.tibetpolicy.eu/127.0.0.1#7913 +ipset=/.tibetpolicy.eu/gfwlist server=/.elgoog.im/127.0.0.1#7913 ipset=/.elgoog.im/gfwlist server=/.idv.tw/127.0.0.1#7913 ipset=/.idv.tw/gfwlist -server=/.sndcdn.com/127.0.0.1#7913 -ipset=/.sndcdn.com/gfwlist -server=/.google.am/127.0.0.1#7913 -ipset=/.google.am/gfwlist -server=/.alwaysdata.com/127.0.0.1#7913 -ipset=/.alwaysdata.com/gfwlist +server=/.tibetoralhistory.org/127.0.0.1#7913 +ipset=/.tibetoralhistory.org/gfwlist +server=/.htkou.net/127.0.0.1#7913 +ipset=/.htkou.net/gfwlist +server=/.tibetonline.tv/127.0.0.1#7913 +ipset=/.tibetonline.tv/gfwlist server=/.qxbbs.org/127.0.0.1#7913 ipset=/.qxbbs.org/gfwlist +server=/.tibetoffice.com.au/127.0.0.1#7913 +ipset=/.tibetoffice.com.au/gfwlist +server=/.tibetoffice.ch/127.0.0.1#7913 +ipset=/.tibetoffice.ch/gfwlist +server=/.tibetnetwork.org/127.0.0.1#7913 +ipset=/.tibetnetwork.org/gfwlist +server=/.sostibet.org/127.0.0.1#7913 +ipset=/.sostibet.org/gfwlist +server=/.angelfire.com/127.0.0.1#7913 +ipset=/.angelfire.com/gfwlist server=/.tibetinfonet.net/127.0.0.1#7913 ipset=/.tibetinfonet.net/gfwlist +server=/.gyatsostudio.com/127.0.0.1#7913 +ipset=/.gyatsostudio.com/gfwlist server=/.tibethouse.us/127.0.0.1#7913 ipset=/.tibethouse.us/gfwlist server=/.tibethouse.jp/127.0.0.1#7913 ipset=/.tibethouse.jp/gfwlist server=/.tibethaus.com/127.0.0.1#7913 ipset=/.tibethaus.com/gfwlist -server=/.tibetgermany.de/127.0.0.1#7913 -ipset=/.tibetgermany.de/gfwlist -server=/.tibetgermany.com/127.0.0.1#7913 -ipset=/.tibetgermany.com/gfwlist -server=/.gyatsostudio.com/127.0.0.1#7913 -ipset=/.gyatsostudio.com/gfwlist -server=/.tibetexpress.net/127.0.0.1#7913 -ipset=/.tibetexpress.net/gfwlist -server=/.tibetchild.org/127.0.0.1#7913 -ipset=/.tibetchild.org/gfwlist -server=/.tibetcharity.in/127.0.0.1#7913 -ipset=/.tibetcharity.in/gfwlist server=/.ns02.us/127.0.0.1#7913 ipset=/.ns02.us/gfwlist server=/.cdn.helixstudios.net/127.0.0.1#7913 @@ -7122,20 +7112,20 @@ server=/.googlepagecreator.com/127.0.0.1#7913 ipset=/.googlepagecreator.com/gfwlist server=/.efukt.com/127.0.0.1#7913 ipset=/.efukt.com/gfwlist -server=/.design.google/127.0.0.1#7913 -ipset=/.design.google/gfwlist +server=/.tibetgermany.de/127.0.0.1#7913 +ipset=/.tibetgermany.de/gfwlist server=/.inxian.com/127.0.0.1#7913 ipset=/.inxian.com/gfwlist server=/.gojet.krtco.com.tw/127.0.0.1#7913 ipset=/.gojet.krtco.com.tw/gfwlist -server=/.tibetanwomen.org/127.0.0.1#7913 -ipset=/.tibetanwomen.org/gfwlist +server=/.tibetgermany.com/127.0.0.1#7913 +ipset=/.tibetgermany.com/gfwlist server=/.androidplus.co/127.0.0.1#7913 ipset=/.androidplus.co/gfwlist -server=/.tibetansports.org/127.0.0.1#7913 -ipset=/.tibetansports.org/gfwlist -server=/.tibetanreview.net/127.0.0.1#7913 -ipset=/.tibetanreview.net/gfwlist +server=/.tibetexpress.net/127.0.0.1#7913 +ipset=/.tibetexpress.net/gfwlist +server=/.tibetchild.org/127.0.0.1#7913 +ipset=/.tibetchild.org/gfwlist server=/.bbs.skykiwi.com/127.0.0.1#7913 ipset=/.bbs.skykiwi.com/gfwlist server=/.juoaa.com/127.0.0.1#7913 @@ -7152,16 +7142,16 @@ server=/.swissvpn.net/127.0.0.1#7913 ipset=/.swissvpn.net/gfwlist server=/.fanqiang.network/127.0.0.1#7913 ipset=/.fanqiang.network/gfwlist -server=/.tibetanphotoproject.com/127.0.0.1#7913 -ipset=/.tibetanphotoproject.com/gfwlist +server=/.design.google/127.0.0.1#7913 +ipset=/.design.google/gfwlist server=/.tibetanbuddhistinstitute.org/127.0.0.1#7913 ipset=/.tibetanbuddhistinstitute.org/gfwlist server=/.daolan.net/127.0.0.1#7913 ipset=/.daolan.net/gfwlist server=/.ushuarencity.echainhost.com/127.0.0.1#7913 ipset=/.ushuarencity.echainhost.com/gfwlist -server=/.igoogle.com/127.0.0.1#7913 -ipset=/.igoogle.com/gfwlist +server=/.tibetanwomen.org/127.0.0.1#7913 +ipset=/.tibetanwomen.org/gfwlist server=/.shellfire.de/127.0.0.1#7913 ipset=/.shellfire.de/gfwlist server=/.twbbs.org/127.0.0.1#7913 @@ -7174,44 +7164,44 @@ server=/.sm-miracle.com/127.0.0.1#7913 ipset=/.sm-miracle.com/gfwlist server=/.red-lang.org/127.0.0.1#7913 ipset=/.red-lang.org/gfwlist -server=/.freelotto.com/127.0.0.1#7913 -ipset=/.freelotto.com/gfwlist +server=/.mjlsh.usc.cuhk.edu.hk/127.0.0.1#7913 +ipset=/.mjlsh.usc.cuhk.edu.hk/gfwlist server=/.duckdns.org/127.0.0.1#7913 ipset=/.duckdns.org/gfwlist -server=/.tibetancommunityuk.net/127.0.0.1#7913 -ipset=/.tibetancommunityuk.net/gfwlist +server=/.tibetanreview.net/127.0.0.1#7913 +ipset=/.tibetanreview.net/gfwlist server=/.com.google/127.0.0.1#7913 ipset=/.com.google/gfwlist server=/.gati.org.tw/127.0.0.1#7913 ipset=/.gati.org.tw/gfwlist -server=/.new-3lunch.net/127.0.0.1#7913 -ipset=/.new-3lunch.net/gfwlist +server=/.calgarychinese.ca/127.0.0.1#7913 +ipset=/.calgarychinese.ca/gfwlist server=/.blogspot.tw/127.0.0.1#7913 ipset=/.blogspot.tw/gfwlist -server=/.tibetcollection.com/127.0.0.1#7913 -ipset=/.tibetcollection.com/gfwlist +server=/.tibetanphotoproject.com/127.0.0.1#7913 +ipset=/.tibetanphotoproject.com/gfwlist server=/.yunchao.net/127.0.0.1#7913 ipset=/.yunchao.net/gfwlist -server=/.tibetanjournal.com/127.0.0.1#7913 -ipset=/.tibetanjournal.com/gfwlist -server=/.realcourage.org/127.0.0.1#7913 -ipset=/.realcourage.org/gfwlist -server=/.tibetan.fr/127.0.0.1#7913 -ipset=/.tibetan.fr/gfwlist -server=/.tibetaction.net/127.0.0.1#7913 -ipset=/.tibetaction.net/gfwlist +server=/.tibetanculture.org/127.0.0.1#7913 +ipset=/.tibetanculture.org/gfwlist +server=/.tibetancommunityuk.net/127.0.0.1#7913 +ipset=/.tibetancommunityuk.net/gfwlist +server=/.new-3lunch.net/127.0.0.1#7913 +ipset=/.new-3lunch.net/gfwlist +server=/.tibetcollection.com/127.0.0.1#7913 +ipset=/.tibetcollection.com/gfwlist server=/.store.steampowered.com/127.0.0.1#7913 ipset=/.store.steampowered.com/gfwlist server=/.squirly.info/127.0.0.1#7913 ipset=/.squirly.info/gfwlist -server=/.hxwq.org/127.0.0.1#7913 -ipset=/.hxwq.org/gfwlist +server=/.blog.cnyes.com/127.0.0.1#7913 +ipset=/.blog.cnyes.com/gfwlist server=/.supchina.com/127.0.0.1#7913 ipset=/.supchina.com/gfwlist -server=/.tibet.ca/127.0.0.1#7913 -ipset=/.tibet.ca/gfwlist -server=/.tibet-initiative.de/127.0.0.1#7913 -ipset=/.tibet-initiative.de/gfwlist +server=/.tibetanlanguage.org/127.0.0.1#7913 +ipset=/.tibetanlanguage.org/gfwlist +server=/.tibetanjournal.com/127.0.0.1#7913 +ipset=/.tibetanjournal.com/gfwlist server=/.anyporn.com/127.0.0.1#7913 ipset=/.anyporn.com/gfwlist server=/.free-ss.site/127.0.0.1#7913 @@ -7220,100 +7210,100 @@ server=/.earthvpn.com/127.0.0.1#7913 ipset=/.earthvpn.com/gfwlist server=/.upload4u.info/127.0.0.1#7913 ipset=/.upload4u.info/gfwlist -server=/.tibet-house-trust.co.uk/127.0.0.1#7913 -ipset=/.tibet-house-trust.co.uk/gfwlist -server=/.tibet-foundation.org/127.0.0.1#7913 -ipset=/.tibet-foundation.org/gfwlist +server=/.tibetan.fr/127.0.0.1#7913 +ipset=/.tibetan.fr/gfwlist +server=/.tibetaction.net/127.0.0.1#7913 +ipset=/.tibetaction.net/gfwlist server=/.myspace.com/127.0.0.1#7913 ipset=/.myspace.com/gfwlist server=/.tibet.to/127.0.0.1#7913 ipset=/.tibet.to/gfwlist -server=/.tibet.org.tw/127.0.0.1#7913 -ipset=/.tibet.org.tw/gfwlist -server=/.keezmovies.com/127.0.0.1#7913 -ipset=/.keezmovies.com/gfwlist -server=/.tibet.nu/127.0.0.1#7913 -ipset=/.tibet.nu/gfwlist -server=/.tibet.fr/127.0.0.1#7913 -ipset=/.tibet.fr/gfwlist +server=/.tibet-initiative.de/127.0.0.1#7913 +ipset=/.tibet-initiative.de/gfwlist +server=/.881903.com/127.0.0.1#7913 +ipset=/.881903.com/gfwlist +server=/.tibet-house-trust.co.uk/127.0.0.1#7913 +ipset=/.tibet-house-trust.co.uk/gfwlist +server=/.tibet-foundation.org/127.0.0.1#7913 +ipset=/.tibet-foundation.org/gfwlist server=/.tibet3rdpole.org/127.0.0.1#7913 ipset=/.tibet3rdpole.org/gfwlist server=/.youtube.com/127.0.0.1#7913 ipset=/.youtube.com/gfwlist server=/.sheikyermami.com/127.0.0.1#7913 ipset=/.sheikyermami.com/gfwlist +server=/.tibet.org.tw/127.0.0.1#7913 +ipset=/.tibet.org.tw/gfwlist +server=/.kichiku-doujinko.com/127.0.0.1#7913 +ipset=/.kichiku-doujinko.com/gfwlist +server=/.tibet.nu/127.0.0.1#7913 +ipset=/.tibet.nu/gfwlist +server=/.tibet.fr/127.0.0.1#7913 +ipset=/.tibet.fr/gfwlist +server=/.post852.com/127.0.0.1#7913 +ipset=/.post852.com/gfwlist +server=/.tibet.ca/127.0.0.1#7913 +ipset=/.tibet.ca/gfwlist server=/.tianzhu.org/127.0.0.1#7913 ipset=/.tianzhu.org/gfwlist server=/.tiantibooks.org/127.0.0.1#7913 ipset=/.tiantibooks.org/gfwlist server=/.tiananmenuniv.com/127.0.0.1#7913 ipset=/.tiananmenuniv.com/gfwlist +server=/.blinw.com/127.0.0.1#7913 +ipset=/.blinw.com/gfwlist server=/.tiananmenmother.org/127.0.0.1#7913 ipset=/.tiananmenmother.org/gfwlist -server=/.post852.com/127.0.0.1#7913 -ipset=/.post852.com/gfwlist server=/.thywords.com/127.0.0.1#7913 ipset=/.thywords.com/gfwlist server=/.thumbzilla.com/127.0.0.1#7913 ipset=/.thumbzilla.com/gfwlist -server=/.throughnightsfire.com/127.0.0.1#7913 -ipset=/.throughnightsfire.com/gfwlist -server=/.thongdreams.com/127.0.0.1#7913 -ipset=/.thongdreams.com/gfwlist -server=/.blinw.com/127.0.0.1#7913 -ipset=/.blinw.com/gfwlist -server=/.bitfinex.com/127.0.0.1#7913 -ipset=/.bitfinex.com/gfwlist -server=/.hexieshe.com/127.0.0.1#7913 -ipset=/.hexieshe.com/gfwlist -server=/.www.taiwanonline.cc/127.0.0.1#7913 -ipset=/.www.taiwanonline.cc/gfwlist server=/.hidemycomp.com/127.0.0.1#7913 ipset=/.hidemycomp.com/gfwlist server=/.muzi.net/127.0.0.1#7913 ipset=/.muzi.net/gfwlist -server=/.thevivekspot.com/127.0.0.1#7913 -ipset=/.thevivekspot.com/gfwlist +server=/.throughnightsfire.com/127.0.0.1#7913 +ipset=/.throughnightsfire.com/gfwlist server=/.twibble.de/127.0.0.1#7913 ipset=/.twibble.de/gfwlist server=/.bx.in.th/127.0.0.1#7913 ipset=/.bx.in.th/gfwlist -server=/.thetibetconnection.org/127.0.0.1#7913 -ipset=/.thetibetconnection.org/gfwlist -server=/.aculo.us/127.0.0.1#7913 -ipset=/.aculo.us/gfwlist -server=/.bookepub.com/127.0.0.1#7913 -ipset=/.bookepub.com/gfwlist -server=/.thespeeder.com/127.0.0.1#7913 -ipset=/.thespeeder.com/gfwlist +server=/.news.now.com/127.0.0.1#7913 +ipset=/.news.now.com/gfwlist +server=/.fourface.nodesnoop.com/127.0.0.1#7913 +ipset=/.fourface.nodesnoop.com/gfwlist +server=/.goldjizz.com/127.0.0.1#7913 +ipset=/.goldjizz.com/gfwlist +server=/.talkcc.com/127.0.0.1#7913 +ipset=/.talkcc.com/gfwlist server=/.relay.com.tw/127.0.0.1#7913 ipset=/.relay.com.tw/gfwlist server=/.bb.ttv.com.tw/127.0.0.1#7913 ipset=/.bb.ttv.com.tw/gfwlist server=/.chenpokong.com/127.0.0.1#7913 ipset=/.chenpokong.com/gfwlist -server=/.theportalwiki.com/127.0.0.1#7913 -ipset=/.theportalwiki.com/gfwlist +server=/.thetinhat.com/127.0.0.1#7913 +ipset=/.thetinhat.com/gfwlist server=/.mycould.com/127.0.0.1#7913 ipset=/.mycould.com/gfwlist server=/.vpnsecure.me/127.0.0.1#7913 ipset=/.vpnsecure.me/gfwlist -server=/.erodaizensyu.com/127.0.0.1#7913 -ipset=/.erodaizensyu.com/gfwlist +server=/.danke4china.net/127.0.0.1#7913 +ipset=/.danke4china.net/gfwlist server=/.vip-enterprise.com/127.0.0.1#7913 ipset=/.vip-enterprise.com/gfwlist server=/.blog.sogoo.org/127.0.0.1#7913 ipset=/.blog.sogoo.org/gfwlist -server=/.thenewslens.com/127.0.0.1#7913 -ipset=/.thenewslens.com/gfwlist -server=/.indiemerch.com/127.0.0.1#7913 -ipset=/.indiemerch.com/gfwlist +server=/.saiq.me/127.0.0.1#7913 +ipset=/.saiq.me/gfwlist +server=/.thespeeder.com/127.0.0.1#7913 +ipset=/.thespeeder.com/gfwlist server=/.co.ao/127.0.0.1#7913 ipset=/.co.ao/gfwlist server=/.dynu.net/127.0.0.1#7913 ipset=/.dynu.net/gfwlist -server=/.thehun.net/127.0.0.1#7913 -ipset=/.thehun.net/gfwlist +server=/.thereallove.kr/127.0.0.1#7913 +ipset=/.thereallove.kr/gfwlist server=/.chinaxchina.com/127.0.0.1#7913 ipset=/.chinaxchina.com/gfwlist server=/.sopcast.org/127.0.0.1#7913 @@ -7322,10 +7312,10 @@ server=/.freewww.info/127.0.0.1#7913 ipset=/.freewww.info/gfwlist server=/.reflectivecode.com/127.0.0.1#7913 ipset=/.reflectivecode.com/gfwlist -server=/.meansys.com/127.0.0.1#7913 -ipset=/.meansys.com/gfwlist -server=/.thegly.com/127.0.0.1#7913 -ipset=/.thegly.com/gfwlist +server=/.theportalwiki.com/127.0.0.1#7913 +ipset=/.theportalwiki.com/gfwlist +server=/.thepiratebay.org/127.0.0.1#7913 +ipset=/.thepiratebay.org/gfwlist server=/.cachinese.com/127.0.0.1#7913 ipset=/.cachinese.com/gfwlist server=/.nflxext.com/127.0.0.1#7913 @@ -7334,56 +7324,56 @@ server=/.freefq.com/127.0.0.1#7913 ipset=/.freefq.com/gfwlist server=/.huaren.us/127.0.0.1#7913 ipset=/.huaren.us/gfwlist -server=/.scmp.com/127.0.0.1#7913 -ipset=/.scmp.com/gfwlist +server=/.thenewslens.com/127.0.0.1#7913 +ipset=/.thenewslens.com/gfwlist server=/.gotgeeks.com/127.0.0.1#7913 ipset=/.gotgeeks.com/gfwlist -server=/.adult.friendfinder.com/127.0.0.1#7913 -ipset=/.adult.friendfinder.com/gfwlist -server=/.thebcomplex.com/127.0.0.1#7913 -ipset=/.thebcomplex.com/gfwlist -server=/.theblemish.com/127.0.0.1#7913 -ipset=/.theblemish.com/gfwlist +server=/.enanyang.my/127.0.0.1#7913 +ipset=/.enanyang.my/gfwlist +server=/.thehun.net/127.0.0.1#7913 +ipset=/.thehun.net/gfwlist +server=/.3proxy.ru/127.0.0.1#7913 +ipset=/.3proxy.ru/gfwlist server=/.t35.com/127.0.0.1#7913 ipset=/.t35.com/gfwlist +server=/.thegly.com/127.0.0.1#7913 +ipset=/.thegly.com/gfwlist +server=/.raidtalk.com.tw/127.0.0.1#7913 +ipset=/.raidtalk.com.tw/gfwlist +server=/.china-mmm.jp.net/127.0.0.1#7913 +ipset=/.china-mmm.jp.net/gfwlist +server=/.focustaiwan.tw/127.0.0.1#7913 +ipset=/.focustaiwan.tw/gfwlist +server=/.thebcomplex.com/127.0.0.1#7913 +ipset=/.thebcomplex.com/gfwlist +server=/.buddhanet.com.tw/127.0.0.1#7913 +ipset=/.buddhanet.com.tw/gfwlist +server=/.theblemish.com/127.0.0.1#7913 +ipset=/.theblemish.com/gfwlist server=/.theatrum-belli.com/127.0.0.1#7913 ipset=/.theatrum-belli.com/gfwlist server=/.tenzinpalmo.com/127.0.0.1#7913 ipset=/.tenzinpalmo.com/gfwlist server=/.tenacy.com/127.0.0.1#7913 ipset=/.tenacy.com/gfwlist -server=/.focustaiwan.tw/127.0.0.1#7913 -ipset=/.focustaiwan.tw/gfwlist -server=/.telegraph.co.uk/127.0.0.1#7913 -ipset=/.telegraph.co.uk/gfwlist -server=/.buddhanet.com.tw/127.0.0.1#7913 -ipset=/.buddhanet.com.tw/gfwlist -server=/.tdm.com.mo/127.0.0.1#7913 -ipset=/.tdm.com.mo/gfwlist -server=/.googleapps.com/127.0.0.1#7913 -ipset=/.googleapps.com/gfwlist -server=/.tcpspeed.co/127.0.0.1#7913 -ipset=/.tcpspeed.co/gfwlist -server=/.tccwonline.org/127.0.0.1#7913 -ipset=/.tccwonline.org/gfwlist server=/.freebrowser.org/127.0.0.1#7913 ipset=/.freebrowser.org/gfwlist server=/.bfnn.org/127.0.0.1#7913 ipset=/.bfnn.org/gfwlist -server=/.tbswd.org/127.0.0.1#7913 -ipset=/.tbswd.org/gfwlist +server=/.telegraph.co.uk/127.0.0.1#7913 +ipset=/.telegraph.co.uk/gfwlist server=/.cleansite.us/127.0.0.1#7913 ipset=/.cleansite.us/gfwlist -server=/.tbssqh.org/127.0.0.1#7913 -ipset=/.tbssqh.org/gfwlist +server=/.tdm.com.mo/127.0.0.1#7913 +ipset=/.tdm.com.mo/gfwlist server=/.mymediarom.com/127.0.0.1#7913 ipset=/.mymediarom.com/gfwlist server=/.dw.com/127.0.0.1#7913 ipset=/.dw.com/gfwlist server=/.zattoo.com/127.0.0.1#7913 ipset=/.zattoo.com/gfwlist -server=/.tbsmalaysia.org/127.0.0.1#7913 -ipset=/.tbsmalaysia.org/gfwlist +server=/.chenguangcheng.com/127.0.0.1#7913 +ipset=/.chenguangcheng.com/gfwlist server=/.uploaded.net/127.0.0.1#7913 ipset=/.uploaded.net/gfwlist server=/.disp.cc/127.0.0.1#7913 @@ -7392,86 +7382,86 @@ server=/.urchin.com/127.0.0.1#7913 ipset=/.urchin.com/gfwlist server=/.hmonghot.com/127.0.0.1#7913 ipset=/.hmonghot.com/gfwlist -server=/.tbs-rainbow.org/127.0.0.1#7913 -ipset=/.tbs-rainbow.org/gfwlist -server=/.wozy.in/127.0.0.1#7913 -ipset=/.wozy.in/gfwlist +server=/.tccwonline.org/127.0.0.1#7913 +ipset=/.tccwonline.org/gfwlist +server=/.tbswd.org/127.0.0.1#7913 +ipset=/.tbswd.org/gfwlist server=/.extremetube.com/127.0.0.1#7913 ipset=/.extremetube.com/gfwlist -server=/.tbjyt.org/127.0.0.1#7913 -ipset=/.tbjyt.org/gfwlist -server=/.tbicn.org/127.0.0.1#7913 -ipset=/.tbicn.org/gfwlist +server=/.tbssqh.org/127.0.0.1#7913 +ipset=/.tbssqh.org/gfwlist +server=/.tbsmalaysia.org/127.0.0.1#7913 +ipset=/.tbsmalaysia.org/gfwlist server=/.budaedu.org/127.0.0.1#7913 ipset=/.budaedu.org/gfwlist -server=/.tbi.org.hk/127.0.0.1#7913 -ipset=/.tbi.org.hk/gfwlist +server=/.tbskkinabalu.page.tl/127.0.0.1#7913 +ipset=/.tbskkinabalu.page.tl/gfwlist server=/.hd.stheadline.com/127.0.0.1#7913 ipset=/.hd.stheadline.com/gfwlist server=/.android.com/127.0.0.1#7913 ipset=/.android.com/gfwlist -server=/.taup.net/127.0.0.1#7913 -ipset=/.taup.net/gfwlist +server=/.tbs-rainbow.org/127.0.0.1#7913 +ipset=/.tbs-rainbow.org/gfwlist server=/.sopcast.com/127.0.0.1#7913 ipset=/.sopcast.com/gfwlist server=/.sulian.me/127.0.0.1#7913 ipset=/.sulian.me/gfwlist server=/.gloryhole.com/127.0.0.1#7913 ipset=/.gloryhole.com/gfwlist -server=/.blog.taragana.com/127.0.0.1#7913 -ipset=/.blog.taragana.com/gfwlist -server=/.www.cmoinc.org/127.0.0.1#7913 -ipset=/.www.cmoinc.org/gfwlist -server=/.tanc.org/127.0.0.1#7913 -ipset=/.tanc.org/gfwlist +server=/.btsynckeys.com/127.0.0.1#7913 +ipset=/.btsynckeys.com/gfwlist +server=/.tbjyt.org/127.0.0.1#7913 +ipset=/.tbjyt.org/gfwlist +server=/.tbicn.org/127.0.0.1#7913 +ipset=/.tbicn.org/gfwlist server=/.assets.bwbx.io/127.0.0.1#7913 ipset=/.assets.bwbx.io/gfwlist +server=/.tbi.org.hk/127.0.0.1#7913 +ipset=/.tbi.org.hk/gfwlist +server=/.taup.net/127.0.0.1#7913 +ipset=/.taup.net/gfwlist +server=/.blog.taragana.com/127.0.0.1#7913 +ipset=/.blog.taragana.com/gfwlist +server=/.revver.com/127.0.0.1#7913 +ipset=/.revver.com/gfwlist +server=/.tanc.org/127.0.0.1#7913 +ipset=/.tanc.org/gfwlist +server=/.openleaks.org/127.0.0.1#7913 +ipset=/.openleaks.org/gfwlist server=/.tamiaode.tk/127.0.0.1#7913 ipset=/.tamiaode.tk/gfwlist server=/.talkonly.net/127.0.0.1#7913 ipset=/.talkonly.net/gfwlist -server=/.talkcc.com/127.0.0.1#7913 -ipset=/.talkcc.com/gfwlist -server=/.freeforums.org/127.0.0.1#7913 -ipset=/.freeforums.org/gfwlist -server=/.video.aol.ca/127.0.0.1#7913 -ipset=/.video.aol.ca/gfwlist -server=/.openleaks.org/127.0.0.1#7913 -ipset=/.openleaks.org/gfwlist -server=/.calgarychinese.ca/127.0.0.1#7913 -ipset=/.calgarychinese.ca/gfwlist -server=/.tw.answers.yahoo.com/127.0.0.1#7913 -ipset=/.tw.answers.yahoo.com/gfwlist server=/.thewgo.org/127.0.0.1#7913 ipset=/.thewgo.org/gfwlist server=/.post76.com/127.0.0.1#7913 ipset=/.post76.com/gfwlist server=/.feedburner.com/127.0.0.1#7913 ipset=/.feedburner.com/gfwlist -server=/.taiwannews.com.tw/127.0.0.1#7913 -ipset=/.taiwannews.com.tw/gfwlist +server=/.adultkeep.net/127.0.0.1#7913 +ipset=/.adultkeep.net/gfwlist server=/.pornvisit.com/127.0.0.1#7913 ipset=/.pornvisit.com/gfwlist server=/.edns.biz/127.0.0.1#7913 ipset=/.edns.biz/gfwlist -server=/.taiwanncf.org.tw/127.0.0.1#7913 -ipset=/.taiwanncf.org.tw/gfwlist +server=/.lbank.info/127.0.0.1#7913 +ipset=/.lbank.info/gfwlist server=/.google.co.ma/127.0.0.1#7913 ipset=/.google.co.ma/gfwlist -server=/.taiwannation.com.tw/127.0.0.1#7913 -ipset=/.taiwannation.com.tw/gfwlist -server=/.taiwannation.com/127.0.0.1#7913 -ipset=/.taiwannation.com/gfwlist -server=/.nhentai.net/127.0.0.1#7913 -ipset=/.nhentai.net/gfwlist +server=/.washingtonpost.com/127.0.0.1#7913 +ipset=/.washingtonpost.com/gfwlist +server=/.boxun.com/127.0.0.1#7913 +ipset=/.boxun.com/gfwlist +server=/.www.taiwanonline.cc/127.0.0.1#7913 +ipset=/.www.taiwanonline.cc/gfwlist server=/.www2.rocketbbs.com/127.0.0.1#7913 ipset=/.www2.rocketbbs.com/gfwlist -server=/.taiwanjustice.com/127.0.0.1#7913 -ipset=/.taiwanjustice.com/gfwlist -server=/.taiwandc.org/127.0.0.1#7913 -ipset=/.taiwandc.org/gfwlist -server=/.taiwancon.com/127.0.0.1#7913 -ipset=/.taiwancon.com/gfwlist +server=/.taiwannews.com.tw/127.0.0.1#7913 +ipset=/.taiwannews.com.tw/gfwlist +server=/.taiwanncf.org.tw/127.0.0.1#7913 +ipset=/.taiwanncf.org.tw/gfwlist +server=/.taiwannation.com.tw/127.0.0.1#7913 +ipset=/.taiwannation.com.tw/gfwlist server=/.bcast.co.nz/127.0.0.1#7913 ipset=/.bcast.co.nz/gfwlist server=/.rotten.com/127.0.0.1#7913 @@ -7482,140 +7472,140 @@ server=/.globalvoicesonline.org/127.0.0.1#7913 ipset=/.globalvoicesonline.org/gfwlist server=/.assembla.com/127.0.0.1#7913 ipset=/.assembla.com/gfwlist +server=/.taiwannation.com/127.0.0.1#7913 +ipset=/.taiwannation.com/gfwlist +server=/.aceros-de-hispania.com/127.0.0.1#7913 +ipset=/.aceros-de-hispania.com/gfwlist +server=/.partycasino.com/127.0.0.1#7913 +ipset=/.partycasino.com/gfwlist +server=/.taiwanjustice.com/127.0.0.1#7913 +ipset=/.taiwanjustice.com/gfwlist +server=/.ggssl.com/127.0.0.1#7913 +ipset=/.ggssl.com/gfwlist +server=/.taiwandc.org/127.0.0.1#7913 +ipset=/.taiwandc.org/gfwlist +server=/.taiwancon.com/127.0.0.1#7913 +ipset=/.taiwancon.com/gfwlist server=/.taiwanbible.com/127.0.0.1#7913 ipset=/.taiwanbible.com/gfwlist server=/.tagwalk.com/127.0.0.1#7913 ipset=/.tagwalk.com/gfwlist -server=/.partycasino.com/127.0.0.1#7913 -ipset=/.partycasino.com/gfwlist -server=/.python.com/127.0.0.1#7913 -ipset=/.python.com/gfwlist -server=/.ggssl.com/127.0.0.1#7913 -ipset=/.ggssl.com/gfwlist +server=/.appledaily.com/127.0.0.1#7913 +ipset=/.appledaily.com/gfwlist +server=/.qiangyou.org/127.0.0.1#7913 +ipset=/.qiangyou.org/gfwlist server=/.taedp.org.tw/127.0.0.1#7913 ipset=/.taedp.org.tw/gfwlist -server=/.retweetrank.com/127.0.0.1#7913 -ipset=/.retweetrank.com/gfwlist +server=/.paldengyal.com/127.0.0.1#7913 +ipset=/.paldengyal.com/gfwlist server=/.taaze.tw/127.0.0.1#7913 ipset=/.taaze.tw/gfwlist server=/.taa-usa.org/127.0.0.1#7913 ipset=/.taa-usa.org/gfwlist -server=/.onmypc.info/127.0.0.1#7913 -ipset=/.onmypc.info/gfwlist server=/.t66y.com/127.0.0.1#7913 ipset=/.t66y.com/gfwlist -server=/.paperb.us/127.0.0.1#7913 -ipset=/.paperb.us/gfwlist +server=/.shambalapost.com/127.0.0.1#7913 +ipset=/.shambalapost.com/gfwlist server=/.szbbs.net/127.0.0.1#7913 ipset=/.szbbs.net/gfwlist -server=/.blog.syx86.cn/127.0.0.1#7913 -ipset=/.blog.syx86.cn/gfwlist +server=/.use.fontawesome.com/127.0.0.1#7913 +ipset=/.use.fontawesome.com/gfwlist server=/.syncback.com/127.0.0.1#7913 ipset=/.syncback.com/gfwlist server=/.sydneytoday.com/127.0.0.1#7913 ipset=/.sydneytoday.com/gfwlist -server=/.akamaihd.net/127.0.0.1#7913 -ipset=/.akamaihd.net/gfwlist +server=/.nvquan.org/127.0.0.1#7913 +ipset=/.nvquan.org/gfwlist server=/.surfeasy.com/127.0.0.1#7913 ipset=/.surfeasy.com/gfwlist -server=/.use.fontawesome.com/127.0.0.1#7913 -ipset=/.use.fontawesome.com/gfwlist -server=/.gcr.io/127.0.0.1#7913 -ipset=/.gcr.io/gfwlist +server=/.suprememastertv.com/127.0.0.1#7913 +ipset=/.suprememastertv.com/gfwlist +server=/.vmpsoft.com/127.0.0.1#7913 +ipset=/.vmpsoft.com/gfwlist server=/.sunvpn.net/127.0.0.1#7913 ipset=/.sunvpn.net/gfwlist server=/.sunmedia.ca/127.0.0.1#7913 ipset=/.sunmedia.ca/gfwlist -server=/.sunporno.com/127.0.0.1#7913 -ipset=/.sunporno.com/gfwlist -server=/.bjs.org/127.0.0.1#7913 -ipset=/.bjs.org/gfwlist -server=/.sugobbs.com/127.0.0.1#7913 -ipset=/.sugobbs.com/gfwlist -server=/.sugarsync.com/127.0.0.1#7913 -ipset=/.sugarsync.com/gfwlist -server=/.data-vocabulary.org/127.0.0.1#7913 -ipset=/.data-vocabulary.org/gfwlist server=/.tv.com/127.0.0.1#7913 ipset=/.tv.com/gfwlist -server=/.studentsforafreetibet.org/127.0.0.1#7913 -ipset=/.studentsforafreetibet.org/gfwlist -server=/.arethusa.su/127.0.0.1#7913 -ipset=/.arethusa.su/gfwlist +server=/.sakya.org/127.0.0.1#7913 +ipset=/.sakya.org/gfwlist +server=/.sugobbs.com/127.0.0.1#7913 +ipset=/.sugobbs.com/gfwlist server=/.chinaelections.org/127.0.0.1#7913 ipset=/.chinaelections.org/gfwlist -server=/.strongwindpress.com/127.0.0.1#7913 -ipset=/.strongwindpress.com/gfwlist +server=/.sugarsync.com/127.0.0.1#7913 +ipset=/.sugarsync.com/gfwlist server=/.hiitch.com/127.0.0.1#7913 ipset=/.hiitch.com/gfwlist -server=/.strikingly.com/127.0.0.1#7913 -ipset=/.strikingly.com/gfwlist +server=/.chinasmile.net/127.0.0.1#7913 +ipset=/.chinasmile.net/gfwlist server=/.iddddg.com/127.0.0.1#7913 ipset=/.iddddg.com/gfwlist -server=/.tw.streetvoice.com/127.0.0.1#7913 -ipset=/.tw.streetvoice.com/gfwlist -server=/.asianwomensfilm.de/127.0.0.1#7913 -ipset=/.asianwomensfilm.de/gfwlist +server=/.stumbleupon.com/127.0.0.1#7913 +ipset=/.stumbleupon.com/gfwlist +server=/.studentsforafreetibet.org/127.0.0.1#7913 +ipset=/.studentsforafreetibet.org/gfwlist server=/.tubecup.com/127.0.0.1#7913 ipset=/.tubecup.com/gfwlist server=/.10.tt/127.0.0.1#7913 ipset=/.10.tt/gfwlist -server=/.plurk.com/127.0.0.1#7913 -ipset=/.plurk.com/gfwlist +server=/.strongwindpress.com/127.0.0.1#7913 +ipset=/.strongwindpress.com/gfwlist server=/.martincartoons.com/127.0.0.1#7913 ipset=/.martincartoons.com/gfwlist -server=/.stormmediagroup.com/127.0.0.1#7913 -ipset=/.stormmediagroup.com/gfwlist -server=/.storify.com/127.0.0.1#7913 -ipset=/.storify.com/gfwlist -server=/.storagenewsletter.com/127.0.0.1#7913 -ipset=/.storagenewsletter.com/gfwlist +server=/.strikingly.com/127.0.0.1#7913 +ipset=/.strikingly.com/gfwlist +server=/.tw.streetvoice.com/127.0.0.1#7913 +ipset=/.tw.streetvoice.com/gfwlist +server=/.bbcchinese.com/127.0.0.1#7913 +ipset=/.bbcchinese.com/gfwlist server=/.msguancha.com/127.0.0.1#7913 ipset=/.msguancha.com/gfwlist +server=/.stranabg.com/127.0.0.1#7913 +ipset=/.stranabg.com/gfwlist +server=/.politicalchina.org/127.0.0.1#7913 +ipset=/.politicalchina.org/gfwlist +server=/.stormmediagroup.com/127.0.0.1#7913 +ipset=/.stormmediagroup.com/gfwlist +server=/.sharpdaily.com.hk/127.0.0.1#7913 +ipset=/.sharpdaily.com.hk/gfwlist +server=/.storify.com/127.0.0.1#7913 +ipset=/.storify.com/gfwlist +server=/.monster.com/127.0.0.1#7913 +ipset=/.monster.com/gfwlist +server=/.instagram.com/127.0.0.1#7913 +ipset=/.instagram.com/gfwlist +server=/.storagenewsletter.com/127.0.0.1#7913 +ipset=/.storagenewsletter.com/gfwlist +server=/.ebook.hyread.com.tw/127.0.0.1#7913 +ipset=/.ebook.hyread.com.tw/gfwlist +server=/.cdn.softlayer.net/127.0.0.1#7913 +ipset=/.cdn.softlayer.net/gfwlist server=/.sto.cc/127.0.0.1#7913 ipset=/.sto.cc/gfwlist server=/.stileproject.com/127.0.0.1#7913 ipset=/.stileproject.com/gfwlist server=/.stickeraction.com/127.0.0.1#7913 ipset=/.stickeraction.com/gfwlist -server=/.sharpdaily.com.hk/127.0.0.1#7913 -ipset=/.sharpdaily.com.hk/gfwlist -server=/.ctfriend.net/127.0.0.1#7913 -ipset=/.ctfriend.net/gfwlist -server=/.monster.com/127.0.0.1#7913 -ipset=/.monster.com/gfwlist -server=/.instagram.com/127.0.0.1#7913 -ipset=/.instagram.com/gfwlist -server=/.ny.stgloballink.com/127.0.0.1#7913 -ipset=/.ny.stgloballink.com/gfwlist -server=/.ebook.hyread.com.tw/127.0.0.1#7913 -ipset=/.ebook.hyread.com.tw/gfwlist -server=/.cdn.softlayer.net/127.0.0.1#7913 -ipset=/.cdn.softlayer.net/gfwlist -server=/.stepchina.com/127.0.0.1#7913 -ipset=/.stepchina.com/gfwlist -server=/.steel-storm.com/127.0.0.1#7913 -ipset=/.steel-storm.com/gfwlist -server=/.startpage.com/127.0.0.1#7913 -ipset=/.startpage.com/gfwlist server=/.tuo8.org/127.0.0.1#7913 ipset=/.tuo8.org/gfwlist -server=/.usinfo.state.gov/127.0.0.1#7913 -ipset=/.usinfo.state.gov/gfwlist +server=/.ny.stgloballink.com/127.0.0.1#7913 +ipset=/.ny.stgloballink.com/gfwlist server=/.dailymotion.com/127.0.0.1#7913 ipset=/.dailymotion.com/gfwlist server=/.hkptu.org/127.0.0.1#7913 ipset=/.hkptu.org/gfwlist server=/.bestvpnusa.com/127.0.0.1#7913 ipset=/.bestvpnusa.com/gfwlist -server=/.stanford.edu/127.0.0.1#7913 -ipset=/.stanford.edu/gfwlist +server=/.stepchina.com/127.0.0.1#7913 +ipset=/.stepchina.com/gfwlist server=/.av.com/127.0.0.1#7913 ipset=/.av.com/gfwlist server=/.chinagonet.com/127.0.0.1#7913 ipset=/.chinagonet.com/gfwlist -server=/.stage64.hk/127.0.0.1#7913 -ipset=/.stage64.hk/gfwlist +server=/.steel-storm.com/127.0.0.1#7913 +ipset=/.steel-storm.com/gfwlist server=/.mlzs.work/127.0.0.1#7913 ipset=/.mlzs.work/gfwlist server=/.freewww.biz/127.0.0.1#7913 @@ -7624,42 +7614,42 @@ server=/.falun-co.org/127.0.0.1#7913 ipset=/.falun-co.org/gfwlist server=/.wuw.red/127.0.0.1#7913 ipset=/.wuw.red/gfwlist -server=/.raizoji.or.jp/127.0.0.1#7913 -ipset=/.raizoji.or.jp/gfwlist +server=/.starp2p.com/127.0.0.1#7913 +ipset=/.starp2p.com/gfwlist +server=/.usinfo.state.gov/127.0.0.1#7913 +ipset=/.usinfo.state.gov/gfwlist +server=/.stanford.edu/127.0.0.1#7913 +ipset=/.stanford.edu/gfwlist +server=/.stage64.hk/127.0.0.1#7913 +ipset=/.stage64.hk/gfwlist +server=/.vpnvip.com/127.0.0.1#7913 +ipset=/.vpnvip.com/gfwlist +server=/.barenakedislam.com/127.0.0.1#7913 +ipset=/.barenakedislam.com/gfwlist server=/.ssrshare.com/127.0.0.1#7913 ipset=/.ssrshare.com/gfwlist server=/.ssh91.com/127.0.0.1#7913 ipset=/.ssh91.com/gfwlist server=/.ssglobal.me/127.0.0.1#7913 ipset=/.ssglobal.me/gfwlist -server=/.vpnvip.com/127.0.0.1#7913 -ipset=/.vpnvip.com/gfwlist -server=/.ss-link.com/127.0.0.1#7913 -ipset=/.ss-link.com/gfwlist -server=/.sproxy.info/127.0.0.1#7913 -ipset=/.sproxy.info/gfwlist -server=/.sproutcore.com/127.0.0.1#7913 -ipset=/.sproutcore.com/gfwlist -server=/.spring4u.info/127.0.0.1#7913 -ipset=/.spring4u.info/gfwlist -server=/.golang.org/127.0.0.1#7913 -ipset=/.golang.org/gfwlist +server=/.relaxbbs.com/127.0.0.1#7913 +ipset=/.relaxbbs.com/gfwlist server=/.vpnshazam.com/127.0.0.1#7913 ipset=/.vpnshazam.com/gfwlist server=/.ecfa.org.tw/127.0.0.1#7913 ipset=/.ecfa.org.tw/gfwlist -server=/.spem.at/127.0.0.1#7913 -ipset=/.spem.at/gfwlist +server=/.sproxy.info/127.0.0.1#7913 +ipset=/.sproxy.info/gfwlist server=/.nyt.com/127.0.0.1#7913 ipset=/.nyt.com/gfwlist -server=/.speedify.com/127.0.0.1#7913 -ipset=/.speedify.com/gfwlist +server=/.sproutcore.com/127.0.0.1#7913 +ipset=/.sproutcore.com/gfwlist server=/.5maodang.com/127.0.0.1#7913 ipset=/.5maodang.com/gfwlist -server=/.speakerdeck.com/127.0.0.1#7913 -ipset=/.speakerdeck.com/gfwlist -server=/.spb.com/127.0.0.1#7913 -ipset=/.spb.com/gfwlist +server=/.spring4u.info/127.0.0.1#7913 +ipset=/.spring4u.info/gfwlist +server=/.hide.me/127.0.0.1#7913 +ipset=/.hide.me/gfwlist server=/.btaia.com/127.0.0.1#7913 ipset=/.btaia.com/gfwlist server=/.wanz-factory.com/127.0.0.1#7913 @@ -7668,100 +7658,100 @@ server=/.anonymouse.org/127.0.0.1#7913 ipset=/.anonymouse.org/gfwlist server=/.googlesource.com/127.0.0.1#7913 ipset=/.googlesource.com/gfwlist +server=/.spencertipping.com/127.0.0.1#7913 +ipset=/.spencertipping.com/gfwlist +server=/.spem.at/127.0.0.1#7913 +ipset=/.spem.at/gfwlist +server=/.speedify.com/127.0.0.1#7913 +ipset=/.speedify.com/gfwlist +server=/.bbs-tw.com/127.0.0.1#7913 +ipset=/.bbs-tw.com/gfwlist +server=/.yizhihongxing.com/127.0.0.1#7913 +ipset=/.yizhihongxing.com/gfwlist +server=/.spb.com/127.0.0.1#7913 +ipset=/.spb.com/gfwlist +server=/.incredibox.fr/127.0.0.1#7913 +ipset=/.incredibox.fr/gfwlist server=/.spankwire.com/127.0.0.1#7913 ipset=/.spankwire.com/gfwlist +server=/.6parkbbs.com/127.0.0.1#7913 +ipset=/.6parkbbs.com/gfwlist server=/.spankingtube.com/127.0.0.1#7913 ipset=/.spankingtube.com/gfwlist server=/.wlx.sowiki.net/127.0.0.1#7913 ipset=/.wlx.sowiki.net/gfwlist -server=/.changeip.org/127.0.0.1#7913 -ipset=/.changeip.org/gfwlist -server=/.yizhihongxing.com/127.0.0.1#7913 -ipset=/.yizhihongxing.com/gfwlist +server=/.ismaelan.com/127.0.0.1#7913 +ipset=/.ismaelan.com/gfwlist +server=/.madthumbs.com/127.0.0.1#7913 +ipset=/.madthumbs.com/gfwlist server=/.southnews.com.tw/127.0.0.1#7913 ipset=/.southnews.com.tw/gfwlist -server=/.incredibox.fr/127.0.0.1#7913 -ipset=/.incredibox.fr/gfwlist +server=/.guaguass.org/127.0.0.1#7913 +ipset=/.guaguass.org/gfwlist server=/.sourceforge.net/127.0.0.1#7913 ipset=/.sourceforge.net/gfwlist -server=/.gaywatch.com/127.0.0.1#7913 -ipset=/.gaywatch.com/gfwlist server=/.soundcloud.com/127.0.0.1#7913 ipset=/.soundcloud.com/gfwlist server=/.soulcaliburhentai.net/127.0.0.1#7913 ipset=/.soulcaliburhentai.net/gfwlist -server=/.ismaelan.com/127.0.0.1#7913 -ipset=/.ismaelan.com/gfwlist server=/.soubory.com/127.0.0.1#7913 ipset=/.soubory.com/gfwlist -server=/.bbs.sou-tong.org/127.0.0.1#7913 -ipset=/.bbs.sou-tong.org/gfwlist -server=/.guaguass.org/127.0.0.1#7913 -ipset=/.guaguass.org/gfwlist -server=/.sos.org/127.0.0.1#7913 -ipset=/.sos.org/gfwlist -server=/.sorazone.net/127.0.0.1#7913 -ipset=/.sorazone.net/gfwlist -server=/.sonicbbs.cc/127.0.0.1#7913 -ipset=/.sonicbbs.cc/gfwlist -server=/.songjianjun.com/127.0.0.1#7913 -ipset=/.songjianjun.com/gfwlist server=/.4everproxy.com/127.0.0.1#7913 ipset=/.4everproxy.com/gfwlist server=/.page.bid.yahoo.com/127.0.0.1#7913 ipset=/.page.bid.yahoo.com/gfwlist server=/.safety.google/127.0.0.1#7913 ipset=/.safety.google/gfwlist +server=/.bbs.sou-tong.org/127.0.0.1#7913 +ipset=/.bbs.sou-tong.org/gfwlist +server=/.sos.org/127.0.0.1#7913 +ipset=/.sos.org/gfwlist +server=/.sorazone.net/127.0.0.1#7913 +ipset=/.sorazone.net/gfwlist +server=/.sonicbbs.cc/127.0.0.1#7913 +ipset=/.sonicbbs.cc/gfwlist +server=/.buddhistchannel.tv/127.0.0.1#7913 +ipset=/.buddhistchannel.tv/gfwlist +server=/.songjianjun.com/127.0.0.1#7913 +ipset=/.songjianjun.com/gfwlist server=/.sohfrance.org/127.0.0.1#7913 ipset=/.sohfrance.org/gfwlist server=/.sobees.com/127.0.0.1#7913 ipset=/.sobees.com/gfwlist -server=/.sostibet.org/127.0.0.1#7913 -ipset=/.sostibet.org/gfwlist -server=/.sokmil.com/127.0.0.1#7913 -ipset=/.sokmil.com/gfwlist -server=/.buddhistchannel.tv/127.0.0.1#7913 -ipset=/.buddhistchannel.tv/gfwlist -server=/.sogclub.com/127.0.0.1#7913 -ipset=/.sogclub.com/gfwlist -server=/.biliworld.com/127.0.0.1#7913 -ipset=/.biliworld.com/gfwlist -server=/.sod.co.jp/127.0.0.1#7913 -ipset=/.sod.co.jp/gfwlist server=/.epochtimes.cz/127.0.0.1#7913 ipset=/.epochtimes.cz/gfwlist server=/.islahhaber.net/127.0.0.1#7913 ipset=/.islahhaber.net/gfwlist server=/.tibetkomite.dk/127.0.0.1#7913 ipset=/.tibetkomite.dk/gfwlist -server=/.snaptu.com/127.0.0.1#7913 -ipset=/.snaptu.com/gfwlist -server=/.snapchat.com/127.0.0.1#7913 -ipset=/.snapchat.com/gfwlist +server=/.sokmil.com/127.0.0.1#7913 +ipset=/.sokmil.com/gfwlist +server=/.sogclub.com/127.0.0.1#7913 +ipset=/.sogclub.com/gfwlist server=/.tibet-info.net/127.0.0.1#7913 ipset=/.tibet-info.net/gfwlist server=/.cosplayjav.pl/127.0.0.1#7913 ipset=/.cosplayjav.pl/gfwlist server=/.globalvoices.org/127.0.0.1#7913 ipset=/.globalvoices.org/gfwlist -server=/.smhric.org/127.0.0.1#7913 -ipset=/.smhric.org/gfwlist -server=/.smh.com.au/127.0.0.1#7913 -ipset=/.smh.com.au/gfwlist +server=/.sod.co.jp/127.0.0.1#7913 +ipset=/.sod.co.jp/gfwlist +server=/.sndcdn.com/127.0.0.1#7913 +ipset=/.sndcdn.com/gfwlist server=/.google.ca/127.0.0.1#7913 ipset=/.google.ca/gfwlist -server=/.proxpn.com/127.0.0.1#7913 -ipset=/.proxpn.com/gfwlist -server=/.smartdnsproxy.com/127.0.0.1#7913 -ipset=/.smartdnsproxy.com/gfwlist +server=/.snaptu.com/127.0.0.1#7913 +ipset=/.snaptu.com/gfwlist +server=/.snapchat.com/127.0.0.1#7913 +ipset=/.snapchat.com/gfwlist server=/.ikwb.com/127.0.0.1#7913 ipset=/.ikwb.com/gfwlist server=/.google.ro/127.0.0.1#7913 ipset=/.google.ro/gfwlist server=/.sexidude.com/127.0.0.1#7913 ipset=/.sexidude.com/gfwlist -server=/.slutload.com/127.0.0.1#7913 -ipset=/.slutload.com/gfwlist +server=/.smyxy.org/127.0.0.1#7913 +ipset=/.smyxy.org/gfwlist server=/.china-review.com.ua/127.0.0.1#7913 ipset=/.china-review.com.ua/gfwlist server=/.badiucao.com/127.0.0.1#7913 @@ -7774,46 +7764,46 @@ server=/.uyghurensemble.co.uk/127.0.0.1#7913 ipset=/.uyghurensemble.co.uk/gfwlist server=/.david-kilgour.com/127.0.0.1#7913 ipset=/.david-kilgour.com/gfwlist -server=/.slheng.com/127.0.0.1#7913 -ipset=/.slheng.com/gfwlist +server=/.ptt.cc/127.0.0.1#7913 +ipset=/.ptt.cc/gfwlist server=/.abchinese.com/127.0.0.1#7913 ipset=/.abchinese.com/gfwlist -server=/.m.slandr.net/127.0.0.1#7913 -ipset=/.m.slandr.net/gfwlist +server=/.smartdnsproxy.com/127.0.0.1#7913 +ipset=/.smartdnsproxy.com/gfwlist server=/.wikibooks.org/127.0.0.1#7913 ipset=/.wikibooks.org/gfwlist server=/.free-hada-now.org/127.0.0.1#7913 ipset=/.free-hada-now.org/gfwlist -server=/.skimtube.com/127.0.0.1#7913 -ipset=/.skimtube.com/gfwlist -server=/.sjrt.org/127.0.0.1#7913 -ipset=/.sjrt.org/gfwlist +server=/.slickvpn.com/127.0.0.1#7913 +ipset=/.slickvpn.com/gfwlist +server=/.slinkset.com/127.0.0.1#7913 +ipset=/.slinkset.com/gfwlist server=/.www.gmll.org/127.0.0.1#7913 ipset=/.www.gmll.org/gfwlist server=/.myiphide.com/127.0.0.1#7913 ipset=/.myiphide.com/gfwlist -server=/.glock.com/127.0.0.1#7913 -ipset=/.glock.com/gfwlist +server=/.aenhancers.com/127.0.0.1#7913 +ipset=/.aenhancers.com/gfwlist server=/.arlingtoncemetery.mil/127.0.0.1#7913 ipset=/.arlingtoncemetery.mil/gfwlist -server=/.synergyse.com/127.0.0.1#7913 -ipset=/.synergyse.com/gfwlist -server=/.141hongkong.com/127.0.0.1#7913 -ipset=/.141hongkong.com/gfwlist +server=/.slheng.com/127.0.0.1#7913 +ipset=/.slheng.com/gfwlist +server=/.m.slandr.net/127.0.0.1#7913 +ipset=/.m.slandr.net/gfwlist server=/.duck.com/127.0.0.1#7913 ipset=/.duck.com/gfwlist server=/.gu-chu-sum.org/127.0.0.1#7913 ipset=/.gu-chu-sum.org/gfwlist -server=/.bnrmetal.com/127.0.0.1#7913 -ipset=/.bnrmetal.com/gfwlist +server=/.xskywalker.com/127.0.0.1#7913 +ipset=/.xskywalker.com/gfwlist server=/.uraban.me/127.0.0.1#7913 ipset=/.uraban.me/gfwlist server=/.aomiwang.com/127.0.0.1#7913 ipset=/.aomiwang.com/gfwlist -server=/.siteks.uk.to/127.0.0.1#7913 -ipset=/.siteks.uk.to/gfwlist -server=/.facebook.nl/127.0.0.1#7913 -ipset=/.facebook.nl/gfwlist +server=/.bnrmetal.com/127.0.0.1#7913 +ipset=/.bnrmetal.com/gfwlist +server=/.lockestek.com/127.0.0.1#7913 +ipset=/.lockestek.com/gfwlist server=/.scache1.vzw.com/127.0.0.1#7913 ipset=/.scache1.vzw.com/gfwlist server=/.rfamobile.org/127.0.0.1#7913 @@ -7824,10 +7814,10 @@ server=/.lenwhite.com/127.0.0.1#7913 ipset=/.lenwhite.com/gfwlist server=/.sidelinessportseatery.com/127.0.0.1#7913 ipset=/.sidelinessportseatery.com/gfwlist +server=/.facebook.nl/127.0.0.1#7913 +ipset=/.facebook.nl/gfwlist server=/.citytalk.tw/127.0.0.1#7913 ipset=/.citytalk.tw/gfwlist -server=/.sitebro.tw/127.0.0.1#7913 -ipset=/.sitebro.tw/gfwlist server=/.anchorfree.com/127.0.0.1#7913 ipset=/.anchorfree.com/gfwlist server=/.cotweet.com/127.0.0.1#7913 @@ -7840,60 +7830,60 @@ server=/.chinaaid.org/127.0.0.1#7913 ipset=/.chinaaid.org/gfwlist server=/.imdb.com/127.0.0.1#7913 ipset=/.imdb.com/gfwlist -server=/.libertytimes.com.tw/127.0.0.1#7913 -ipset=/.libertytimes.com.tw/gfwlist +server=/.askstudent.com/127.0.0.1#7913 +ipset=/.askstudent.com/gfwlist server=/.cams.org.sg/127.0.0.1#7913 ipset=/.cams.org.sg/gfwlist -server=/.shadowsocks9.com/127.0.0.1#7913 -ipset=/.shadowsocks9.com/gfwlist -server=/.mypopescu.com/127.0.0.1#7913 -ipset=/.mypopescu.com/gfwlist -server=/.goldenfrog.com/127.0.0.1#7913 -ipset=/.goldenfrog.com/gfwlist -server=/.sis001.com/127.0.0.1#7913 -ipset=/.sis001.com/gfwlist +server=/.libertytimes.com.tw/127.0.0.1#7913 +ipset=/.libertytimes.com.tw/gfwlist +server=/.discordapp.net/127.0.0.1#7913 +ipset=/.discordapp.net/gfwlist +server=/.skimtube.com/127.0.0.1#7913 +ipset=/.skimtube.com/gfwlist +server=/.qstatus.com/127.0.0.1#7913 +ipset=/.qstatus.com/gfwlist server=/.openervpn.in/127.0.0.1#7913 ipset=/.openervpn.in/gfwlist +server=/.goldenfrog.com/127.0.0.1#7913 +ipset=/.goldenfrog.com/gfwlist +server=/.freelotto.com/127.0.0.1#7913 +ipset=/.freelotto.com/gfwlist +server=/.sjrt.org/127.0.0.1#7913 +ipset=/.sjrt.org/gfwlist server=/.animeshippuuden.com/127.0.0.1#7913 ipset=/.animeshippuuden.com/gfwlist server=/.huobi.pro/127.0.0.1#7913 ipset=/.huobi.pro/gfwlist -server=/.bunbunhk.com/127.0.0.1#7913 -ipset=/.bunbunhk.com/gfwlist -server=/.sierrafriendsoftibet.org/127.0.0.1#7913 -ipset=/.sierrafriendsoftibet.org/gfwlist -server=/.alternativeto.net/127.0.0.1#7913 -ipset=/.alternativeto.net/gfwlist server=/.sbs.com.au/127.0.0.1#7913 ipset=/.sbs.com.au/gfwlist -server=/.sinoquebec.com/127.0.0.1#7913 -ipset=/.sinoquebec.com/gfwlist -server=/.sinopitt.info/127.0.0.1#7913 -ipset=/.sinopitt.info/gfwlist -server=/.nylonstockingsonline.com/127.0.0.1#7913 -ipset=/.nylonstockingsonline.com/gfwlist -server=/.singtaousa.com/127.0.0.1#7913 -ipset=/.singtaousa.com/gfwlist -server=/.singpao.com.hk/127.0.0.1#7913 -ipset=/.singpao.com.hk/gfwlist +server=/.bunbunhk.com/127.0.0.1#7913 +ipset=/.bunbunhk.com/gfwlist +server=/.open.com.hk/127.0.0.1#7913 +ipset=/.open.com.hk/gfwlist +server=/.siteks.uk.to/127.0.0.1#7913 +ipset=/.siteks.uk.to/gfwlist +server=/.sitebro.tw/127.0.0.1#7913 +ipset=/.sitebro.tw/gfwlist +server=/.sis001.com/127.0.0.1#7913 +ipset=/.sis001.com/gfwlist server=/.itshidden.com/127.0.0.1#7913 ipset=/.itshidden.com/gfwlist server=/.proxyanonimo.es/127.0.0.1#7913 ipset=/.proxyanonimo.es/gfwlist -server=/.singaporepools.com.sg/127.0.0.1#7913 -ipset=/.singaporepools.com.sg/gfwlist +server=/.sierrafriendsoftibet.org/127.0.0.1#7913 +ipset=/.sierrafriendsoftibet.org/gfwlist server=/.limiao.net/127.0.0.1#7913 ipset=/.limiao.net/gfwlist -server=/.avfantasy.com/127.0.0.1#7913 -ipset=/.avfantasy.com/gfwlist +server=/.i-cable.com/127.0.0.1#7913 +ipset=/.i-cable.com/gfwlist server=/.coinut.com/127.0.0.1#7913 ipset=/.coinut.com/gfwlist -server=/.sinchew.com.my/127.0.0.1#7913 -ipset=/.sinchew.com.my/gfwlist -server=/.newnews.ca/127.0.0.1#7913 -ipset=/.newnews.ca/gfwlist -server=/.washingtonpost.com/127.0.0.1#7913 -ipset=/.washingtonpost.com/gfwlist +server=/.sinoquebec.com/127.0.0.1#7913 +ipset=/.sinoquebec.com/gfwlist +server=/.sinopitt.info/127.0.0.1#7913 +ipset=/.sinopitt.info/gfwlist +server=/.oclp.hk/127.0.0.1#7913 +ipset=/.oclp.hk/gfwlist server=/.taiwanyes.com/127.0.0.1#7913 ipset=/.taiwanyes.com/gfwlist server=/.readydown.com/127.0.0.1#7913 @@ -7908,16 +7898,16 @@ server=/.kspcoin.com/127.0.0.1#7913 ipset=/.kspcoin.com/gfwlist server=/.tibetanpoliticalreview.org/127.0.0.1#7913 ipset=/.tibetanpoliticalreview.org/gfwlist -server=/.rawgit.com/127.0.0.1#7913 -ipset=/.rawgit.com/gfwlist -server=/.dailynews.sina.com/127.0.0.1#7913 -ipset=/.dailynews.sina.com/gfwlist -server=/.blog.sina.com.tw/127.0.0.1#7913 -ipset=/.blog.sina.com.tw/gfwlist -server=/.google.sc/127.0.0.1#7913 -ipset=/.google.sc/gfwlist -server=/.bbs.sina.com/127.0.0.1#7913 -ipset=/.bbs.sina.com/gfwlist +server=/.singtaousa.com/127.0.0.1#7913 +ipset=/.singtaousa.com/gfwlist +server=/.singpao.com.hk/127.0.0.1#7913 +ipset=/.singpao.com.hk/gfwlist +server=/.singaporepools.com.sg/127.0.0.1#7913 +ipset=/.singaporepools.com.sg/gfwlist +server=/.git.io/127.0.0.1#7913 +ipset=/.git.io/gfwlist +server=/.sinchew.com.my/127.0.0.1#7913 +ipset=/.sinchew.com.my/gfwlist server=/.google.dj/127.0.0.1#7913 ipset=/.google.dj/gfwlist server=/.mrtweet.com/127.0.0.1#7913 @@ -7928,134 +7918,134 @@ server=/.vcfbuilder.org/127.0.0.1#7913 ipset=/.vcfbuilder.org/gfwlist server=/.centurys.net/127.0.0.1#7913 ipset=/.centurys.net/gfwlist +server=/.news.sina.com.hk/127.0.0.1#7913 +ipset=/.news.sina.com.hk/gfwlist server=/.democrats.org/127.0.0.1#7913 ipset=/.democrats.org/gfwlist -server=/.silkbook.com/127.0.0.1#7913 -ipset=/.silkbook.com/gfwlist server=/.javhd.com/127.0.0.1#7913 ipset=/.javhd.com/gfwlist -server=/.sijihuisuo.com/127.0.0.1#7913 -ipset=/.sijihuisuo.com/gfwlist +server=/.realraptalk.com/127.0.0.1#7913 +ipset=/.realraptalk.com/gfwlist server=/.myshare.url.com.tw/127.0.0.1#7913 ipset=/.myshare.url.com.tw/gfwlist -server=/.codeskulptor.org/127.0.0.1#7913 -ipset=/.codeskulptor.org/gfwlist -server=/.siddharthasintent.org/127.0.0.1#7913 -ipset=/.siddharthasintent.org/gfwlist +server=/.dailynews.sina.com/127.0.0.1#7913 +ipset=/.dailynews.sina.com/gfwlist +server=/.blog.sina.com.tw/127.0.0.1#7913 +ipset=/.blog.sina.com.tw/gfwlist +server=/.bbs.sina.com/127.0.0.1#7913 +ipset=/.bbs.sina.com/gfwlist server=/.gfw.org.ua/127.0.0.1#7913 ipset=/.gfw.org.ua/gfwlist -server=/.shwchurch3.com/127.0.0.1#7913 -ipset=/.shwchurch3.com/gfwlist server=/.yvesgeleyn.com/127.0.0.1#7913 ipset=/.yvesgeleyn.com/gfwlist server=/.nytstyle.com/127.0.0.1#7913 ipset=/.nytstyle.com/gfwlist server=/.freevpn.me/127.0.0.1#7913 ipset=/.freevpn.me/gfwlist -server=/.hakkatv.org.tw/127.0.0.1#7913 -ipset=/.hakkatv.org.tw/gfwlist +server=/.silkbook.com/127.0.0.1#7913 +ipset=/.silkbook.com/gfwlist server=/.alarab.qa/127.0.0.1#7913 ipset=/.alarab.qa/gfwlist server=/.incloak.com/127.0.0.1#7913 ipset=/.incloak.com/gfwlist -server=/.bangyoulater.com/127.0.0.1#7913 -ipset=/.bangyoulater.com/gfwlist -server=/.showhaotu.com/127.0.0.1#7913 -ipset=/.showhaotu.com/gfwlist -server=/.ht.ly/127.0.0.1#7913 -ipset=/.ht.ly/gfwlist +server=/.sijihuisuo.com/127.0.0.1#7913 +ipset=/.sijihuisuo.com/gfwlist +server=/.data-vocabulary.org/127.0.0.1#7913 +ipset=/.data-vocabulary.org/gfwlist +server=/.cenews.eu/127.0.0.1#7913 +ipset=/.cenews.eu/gfwlist server=/.successfn.com/127.0.0.1#7913 ipset=/.successfn.com/gfwlist server=/.fuyindiantai.org/127.0.0.1#7913 ipset=/.fuyindiantai.org/gfwlist -server=/.fromchinatousa.net/127.0.0.1#7913 -ipset=/.fromchinatousa.net/gfwlist -server=/.shop2000.com.tw/127.0.0.1#7913 -ipset=/.shop2000.com.tw/gfwlist +server=/.discuss.com.hk/127.0.0.1#7913 +ipset=/.discuss.com.hk/gfwlist +server=/.shwchurch3.com/127.0.0.1#7913 +ipset=/.shwchurch3.com/gfwlist server=/.wefightcensorship.org/127.0.0.1#7913 ipset=/.wefightcensorship.org/gfwlist -server=/.shixiao.org/127.0.0.1#7913 -ipset=/.shixiao.org/gfwlist -server=/.i1.hk/127.0.0.1#7913 -ipset=/.i1.hk/gfwlist -server=/.potvpn.com/127.0.0.1#7913 -ipset=/.potvpn.com/gfwlist +server=/.eromangadouzin.com/127.0.0.1#7913 +ipset=/.eromangadouzin.com/gfwlist +server=/.goldstep.net/127.0.0.1#7913 +ipset=/.goldstep.net/gfwlist +server=/.18onlygirls.com/127.0.0.1#7913 +ipset=/.18onlygirls.com/gfwlist server=/.grotty-monday.com/127.0.0.1#7913 ipset=/.grotty-monday.com/gfwlist -server=/.falunart.org/127.0.0.1#7913 -ipset=/.falunart.org/gfwlist -server=/.shicheng.org/127.0.0.1#7913 -ipset=/.shicheng.org/gfwlist -server=/.backpackers.com.tw/127.0.0.1#7913 -ipset=/.backpackers.com.tw/gfwlist -server=/.drsunacademy.com/127.0.0.1#7913 -ipset=/.drsunacademy.com/gfwlist +server=/.showhaotu.com/127.0.0.1#7913 +ipset=/.showhaotu.com/gfwlist +server=/.bbs.ozchinese.com/127.0.0.1#7913 +ipset=/.bbs.ozchinese.com/gfwlist +server=/.bodog88.com/127.0.0.1#7913 +ipset=/.bodog88.com/gfwlist +server=/.shop2000.com.tw/127.0.0.1#7913 +ipset=/.shop2000.com.tw/gfwlist server=/.tonyyan.net/127.0.0.1#7913 ipset=/.tonyyan.net/gfwlist +server=/.bloglines.com/127.0.0.1#7913 +ipset=/.bloglines.com/gfwlist server=/.dl.box.net/127.0.0.1#7913 ipset=/.dl.box.net/gfwlist -server=/.megaproxy.com/127.0.0.1#7913 -ipset=/.megaproxy.com/gfwlist -server=/.shenyunperformingarts.org/127.0.0.1#7913 -ipset=/.shenyunperformingarts.org/gfwlist -server=/.hizbuttahrir.org/127.0.0.1#7913 -ipset=/.hizbuttahrir.org/gfwlist -server=/.japan-whores.com/127.0.0.1#7913 -ipset=/.japan-whores.com/gfwlist -server=/.bbcchinese.com/127.0.0.1#7913 -ipset=/.bbcchinese.com/gfwlist +server=/.china101.com/127.0.0.1#7913 +ipset=/.china101.com/gfwlist +server=/.googleanalytics.com/127.0.0.1#7913 +ipset=/.googleanalytics.com/gfwlist +server=/.shixiao.org/127.0.0.1#7913 +ipset=/.shixiao.org/gfwlist +server=/.scmp.com/127.0.0.1#7913 +ipset=/.scmp.com/gfwlist server=/.streema.com/127.0.0.1#7913 ipset=/.streema.com/gfwlist server=/.cctmweb.net/127.0.0.1#7913 ipset=/.cctmweb.net/gfwlist -server=/.sharpdaily.tw/127.0.0.1#7913 -ipset=/.sharpdaily.tw/gfwlist -server=/.kinmen.org.tw/127.0.0.1#7913 -ipset=/.kinmen.org.tw/gfwlist +server=/.asianwomensfilm.de/127.0.0.1#7913 +ipset=/.asianwomensfilm.de/gfwlist +server=/.shicheng.org/127.0.0.1#7913 +ipset=/.shicheng.org/gfwlist server=/.pixelqi.com/127.0.0.1#7913 ipset=/.pixelqi.com/gfwlist -server=/.sharebee.com/127.0.0.1#7913 -ipset=/.sharebee.com/gfwlist +server=/.memri.org/127.0.0.1#7913 +ipset=/.memri.org/gfwlist +server=/.hua-yue.net/127.0.0.1#7913 +ipset=/.hua-yue.net/gfwlist +server=/.shenyunperformingarts.org/127.0.0.1#7913 +ipset=/.shenyunperformingarts.org/gfwlist +server=/.jingpin.org/127.0.0.1#7913 +ipset=/.jingpin.org/gfwlist +server=/.iverycd.com/127.0.0.1#7913 +ipset=/.iverycd.com/gfwlist server=/.freeddns.com/127.0.0.1#7913 ipset=/.freeddns.com/gfwlist -server=/.jmscult.com/127.0.0.1#7913 -ipset=/.jmscult.com/gfwlist -server=/.shangfang.org/127.0.0.1#7913 -ipset=/.shangfang.org/gfwlist -server=/.shambalapost.com/127.0.0.1#7913 -ipset=/.shambalapost.com/gfwlist -server=/.hautelook.com/127.0.0.1#7913 -ipset=/.hautelook.com/gfwlist server=/.bowenpress.com/127.0.0.1#7913 ipset=/.bowenpress.com/gfwlist -server=/.shadowsocks-r.com/127.0.0.1#7913 -ipset=/.shadowsocks-r.com/gfwlist +server=/.jmscult.com/127.0.0.1#7913 +ipset=/.jmscult.com/gfwlist server=/.ntrfun.com/127.0.0.1#7913 ipset=/.ntrfun.com/gfwlist server=/.journalofdemocracy.org/127.0.0.1#7913 ipset=/.journalofdemocracy.org/gfwlist -server=/.crackle.com/127.0.0.1#7913 -ipset=/.crackle.com/gfwlist -server=/.pscp.tv/127.0.0.1#7913 -ipset=/.pscp.tv/gfwlist +server=/.lizhizhuangbi.com/127.0.0.1#7913 +ipset=/.lizhizhuangbi.com/gfwlist +server=/.hautelook.com/127.0.0.1#7913 +ipset=/.hautelook.com/gfwlist server=/.yyii.org/127.0.0.1#7913 ipset=/.yyii.org/gfwlist -server=/.clementine-player.org/127.0.0.1#7913 -ipset=/.clementine-player.org/gfwlist -server=/.shadowsocks.com/127.0.0.1#7913 -ipset=/.shadowsocks.com/gfwlist +server=/.fscked.org/127.0.0.1#7913 +ipset=/.fscked.org/gfwlist +server=/.crackle.com/127.0.0.1#7913 +ipset=/.crackle.com/gfwlist server=/.usunitednews.com/127.0.0.1#7913 ipset=/.usunitednews.com/gfwlist -server=/.oikos.com.tw/127.0.0.1#7913 -ipset=/.oikos.com.tw/gfwlist -server=/.shadowsky.xyz/127.0.0.1#7913 -ipset=/.shadowsky.xyz/gfwlist -server=/.adult-sex-games.com/127.0.0.1#7913 -ipset=/.adult-sex-games.com/gfwlist +server=/.openvpn.org/127.0.0.1#7913 +ipset=/.openvpn.org/gfwlist +server=/.sharebee.com/127.0.0.1#7913 +ipset=/.sharebee.com/gfwlist +server=/.nic.cz.cc/127.0.0.1#7913 +ipset=/.nic.cz.cc/gfwlist server=/.in99.org/127.0.0.1#7913 ipset=/.in99.org/gfwlist -server=/.shadeyouvpn.com/127.0.0.1#7913 -ipset=/.shadeyouvpn.com/gfwlist +server=/.shangfang.org/127.0.0.1#7913 +ipset=/.shangfang.org/gfwlist server=/.google.nu/127.0.0.1#7913 ipset=/.google.nu/gfwlist server=/.vcf-online.org/127.0.0.1#7913 @@ -8068,330 +8058,330 @@ server=/.szetowah.org.hk/127.0.0.1#7913 ipset=/.szetowah.org.hk/gfwlist server=/.cclife.org/127.0.0.1#7913 ipset=/.cclife.org/gfwlist -server=/.hanime.tv/127.0.0.1#7913 -ipset=/.hanime.tv/gfwlist +server=/.shadowsocks-r.com/127.0.0.1#7913 +ipset=/.shadowsocks-r.com/gfwlist server=/.falundafa-pa.net/127.0.0.1#7913 ipset=/.falundafa-pa.net/gfwlist -server=/.my.pcloud.com/127.0.0.1#7913 -ipset=/.my.pcloud.com/gfwlist -server=/.sfileydy.com/127.0.0.1#7913 -ipset=/.sfileydy.com/gfwlist +server=/.bullogger.com/127.0.0.1#7913 +ipset=/.bullogger.com/gfwlist +server=/.gunsamerica.com/127.0.0.1#7913 +ipset=/.gunsamerica.com/gfwlist server=/.old.honeynet.org/127.0.0.1#7913 ipset=/.old.honeynet.org/gfwlist -server=/.sf.net/127.0.0.1#7913 -ipset=/.sf.net/gfwlist -server=/.japanfirst.asianfreeforum.com/127.0.0.1#7913 -ipset=/.japanfirst.asianfreeforum.com/gfwlist -server=/.bestforchina.org/127.0.0.1#7913 -ipset=/.bestforchina.org/gfwlist +server=/.hanime.tv/127.0.0.1#7913 +ipset=/.hanime.tv/gfwlist +server=/.dailidaili.com/127.0.0.1#7913 +ipset=/.dailidaili.com/gfwlist +server=/.shadowsocks.com/127.0.0.1#7913 +ipset=/.shadowsocks.com/gfwlist server=/.helloqueer.com/127.0.0.1#7913 ipset=/.helloqueer.com/gfwlist -server=/.chinatopsex.com/127.0.0.1#7913 -ipset=/.chinatopsex.com/gfwlist +server=/.old-cat.net/127.0.0.1#7913 +ipset=/.old-cat.net/gfwlist server=/.me.youthwant.com.tw/127.0.0.1#7913 ipset=/.me.youthwant.com.tw/gfwlist -server=/.sextvx.com/127.0.0.1#7913 -ipset=/.sextvx.com/gfwlist +server=/.chinatopsex.com/127.0.0.1#7913 +ipset=/.chinatopsex.com/gfwlist server=/.taiwanus.net/127.0.0.1#7913 ipset=/.taiwanus.net/gfwlist -server=/.kawase.com/127.0.0.1#7913 -ipset=/.kawase.com/gfwlist +server=/.japan-whores.com/127.0.0.1#7913 +ipset=/.japan-whores.com/gfwlist +server=/.shadowsky.xyz/127.0.0.1#7913 +ipset=/.shadowsky.xyz/gfwlist +server=/.tw.answers.yahoo.com/127.0.0.1#7913 +ipset=/.tw.answers.yahoo.com/gfwlist server=/.chinaaid.net/127.0.0.1#7913 ipset=/.chinaaid.net/gfwlist -server=/.bestvpnanalysis.com/127.0.0.1#7913 -ipset=/.bestvpnanalysis.com/gfwlist -server=/.sexinsex.net/127.0.0.1#7913 -ipset=/.sexinsex.net/gfwlist -server=/.sexhu.com/127.0.0.1#7913 -ipset=/.sexhu.com/gfwlist -server=/.bangchen.net/127.0.0.1#7913 -ipset=/.bangchen.net/gfwlist -server=/.fapdu.com/127.0.0.1#7913 -ipset=/.fapdu.com/gfwlist -server=/.fc2.com/127.0.0.1#7913 -ipset=/.fc2.com/gfwlist +server=/.cbsnews.com/127.0.0.1#7913 +ipset=/.cbsnews.com/gfwlist +server=/.aisex.com/127.0.0.1#7913 +ipset=/.aisex.com/gfwlist +server=/.shadeyouvpn.com/127.0.0.1#7913 +ipset=/.shadeyouvpn.com/gfwlist +server=/.maskedip.com/127.0.0.1#7913 +ipset=/.maskedip.com/gfwlist server=/.wujie.net/127.0.0.1#7913 ipset=/.wujie.net/gfwlist server=/.hnntube.com/127.0.0.1#7913 ipset=/.hnntube.com/gfwlist -server=/.faith100.org/127.0.0.1#7913 -ipset=/.faith100.org/gfwlist -server=/.nko.navy.mil/127.0.0.1#7913 -ipset=/.nko.navy.mil/gfwlist -server=/.artofpeacefoundation.org/127.0.0.1#7913 -ipset=/.artofpeacefoundation.org/gfwlist +server=/.pastebin.com/127.0.0.1#7913 +ipset=/.pastebin.com/gfwlist +server=/.sfileydy.com/127.0.0.1#7913 +ipset=/.sfileydy.com/gfwlist +server=/.sf.net/127.0.0.1#7913 +ipset=/.sf.net/gfwlist server=/.kagyumonlam.org/127.0.0.1#7913 ipset=/.kagyumonlam.org/gfwlist server=/.bigsound.org/127.0.0.1#7913 ipset=/.bigsound.org/gfwlist -server=/.sevenload.com/127.0.0.1#7913 -ipset=/.sevenload.com/gfwlist -server=/.settv.com.tw/127.0.0.1#7913 -ipset=/.settv.com.tw/gfwlist -server=/.civiliangunner.com/127.0.0.1#7913 -ipset=/.civiliangunner.com/gfwlist +server=/.sextvx.com/127.0.0.1#7913 +ipset=/.sextvx.com/gfwlist +server=/.artofpeacefoundation.org/127.0.0.1#7913 +ipset=/.artofpeacefoundation.org/gfwlist +server=/.sexinsex.net/127.0.0.1#7913 +ipset=/.sexinsex.net/gfwlist server=/.21sextury.com/127.0.0.1#7913 ipset=/.21sextury.com/gfwlist -server=/.multiproxy.org/127.0.0.1#7913 -ipset=/.multiproxy.org/gfwlist +server=/.civiliangunner.com/127.0.0.1#7913 +ipset=/.civiliangunner.com/gfwlist server=/.amigobbs.net/127.0.0.1#7913 ipset=/.amigobbs.net/gfwlist server=/.gamer-cds.cdn.hinet.net/127.0.0.1#7913 ipset=/.gamer-cds.cdn.hinet.net/gfwlist -server=/.sesawe.org/127.0.0.1#7913 -ipset=/.sesawe.org/gfwlist -server=/.epochtimes.com/127.0.0.1#7913 -ipset=/.epochtimes.com/gfwlist +server=/.sexhu.com/127.0.0.1#7913 +ipset=/.sexhu.com/gfwlist +server=/.bcmorning.com/127.0.0.1#7913 +ipset=/.bcmorning.com/gfwlist server=/.usfk.mil/127.0.0.1#7913 ipset=/.usfk.mil/gfwlist -server=/.exrates.me/127.0.0.1#7913 -ipset=/.exrates.me/gfwlist +server=/.hacg.me/127.0.0.1#7913 +ipset=/.hacg.me/gfwlist server=/.ipicture.ru/127.0.0.1#7913 ipset=/.ipicture.ru/gfwlist +server=/.quoracdn.net/127.0.0.1#7913 +ipset=/.quoracdn.net/gfwlist server=/.1984bbs.org/127.0.0.1#7913 ipset=/.1984bbs.org/gfwlist +server=/.lotsawahouse.org/127.0.0.1#7913 +ipset=/.lotsawahouse.org/gfwlist server=/.dscn.info/127.0.0.1#7913 ipset=/.dscn.info/gfwlist server=/.club1069.com/127.0.0.1#7913 ipset=/.club1069.com/gfwlist -server=/.tfhub.dev/127.0.0.1#7913 -ipset=/.tfhub.dev/gfwlist -server=/.news.seehua.com/127.0.0.1#7913 -ipset=/.news.seehua.com/gfwlist -server=/.hikinggfw.org/127.0.0.1#7913 -ipset=/.hikinggfw.org/gfwlist +server=/.sevenload.com/127.0.0.1#7913 +ipset=/.sevenload.com/gfwlist server=/.greenparty.org.tw/127.0.0.1#7913 ipset=/.greenparty.org.tw/gfwlist -server=/.cdpa.url.tw/127.0.0.1#7913 -ipset=/.cdpa.url.tw/gfwlist +server=/.slyip.net/127.0.0.1#7913 +ipset=/.slyip.net/gfwlist server=/.mingpaocanada.com/127.0.0.1#7913 ipset=/.mingpaocanada.com/gfwlist server=/.googleartproject.com/127.0.0.1#7913 ipset=/.googleartproject.com/gfwlist -server=/.securitykiss.com/127.0.0.1#7913 -ipset=/.securitykiss.com/gfwlist +server=/.settv.com.tw/127.0.0.1#7913 +ipset=/.settv.com.tw/gfwlist server=/.game735.com/127.0.0.1#7913 ipset=/.game735.com/gfwlist -server=/.familyfed.org/127.0.0.1#7913 -ipset=/.familyfed.org/gfwlist -server=/.securetunnel.com/127.0.0.1#7913 -ipset=/.securetunnel.com/gfwlist -server=/.dotvpn.com/127.0.0.1#7913 -ipset=/.dotvpn.com/gfwlist -server=/.googleideas.com/127.0.0.1#7913 -ipset=/.googleideas.com/gfwlist +server=/.alabout.com/127.0.0.1#7913 +ipset=/.alabout.com/gfwlist +server=/.sesawe.org/127.0.0.1#7913 +ipset=/.sesawe.org/gfwlist +server=/.epochtimes.com/127.0.0.1#7913 +ipset=/.epochtimes.com/gfwlist +server=/.picacomiccn.com/127.0.0.1#7913 +ipset=/.picacomiccn.com/gfwlist server=/.dushi.ca/127.0.0.1#7913 ipset=/.dushi.ca/gfwlist -server=/.contactmagazine.net/127.0.0.1#7913 -ipset=/.contactmagazine.net/gfwlist +server=/.googleideas.com/127.0.0.1#7913 +ipset=/.googleideas.com/gfwlist server=/.dynamic-dns.net/127.0.0.1#7913 ipset=/.dynamic-dns.net/gfwlist -server=/.domainhelp.search.com/127.0.0.1#7913 -ipset=/.domainhelp.search.com/gfwlist +server=/.news.seehua.com/127.0.0.1#7913 +ipset=/.news.seehua.com/gfwlist server=/.ipredator.se/127.0.0.1#7913 ipset=/.ipredator.se/gfwlist -server=/.10conditionsoflove.com/127.0.0.1#7913 -ipset=/.10conditionsoflove.com/gfwlist +server=/.hkbc.net/127.0.0.1#7913 +ipset=/.hkbc.net/gfwlist server=/.javzoo.com/127.0.0.1#7913 ipset=/.javzoo.com/gfwlist server=/.bvpn.com/127.0.0.1#7913 ipset=/.bvpn.com/gfwlist -server=/.scriptspot.com/127.0.0.1#7913 -ipset=/.scriptspot.com/gfwlist +server=/.securitykiss.com/127.0.0.1#7913 +ipset=/.securitykiss.com/gfwlist server=/.bitsnoop.com/127.0.0.1#7913 ipset=/.bitsnoop.com/gfwlist -server=/.myaudiocast.com/127.0.0.1#7913 -ipset=/.myaudiocast.com/gfwlist +server=/.fangeming.com/127.0.0.1#7913 +ipset=/.fangeming.com/gfwlist server=/.puffstore.com/127.0.0.1#7913 ipset=/.puffstore.com/gfwlist +server=/.securetunnel.com/127.0.0.1#7913 +ipset=/.securetunnel.com/gfwlist server=/.cpj.org/127.0.0.1#7913 ipset=/.cpj.org/gfwlist -server=/.scmpchinese.com/127.0.0.1#7913 -ipset=/.scmpchinese.com/gfwlist server=/.bestvpnserver.com/127.0.0.1#7913 ipset=/.bestvpnserver.com/gfwlist server=/.hahlo.com/127.0.0.1#7913 ipset=/.hahlo.com/gfwlist server=/.thechinabeat.org/127.0.0.1#7913 ipset=/.thechinabeat.org/gfwlist -server=/.google.sn/127.0.0.1#7913 -ipset=/.google.sn/gfwlist +server=/.ezpeer.com/127.0.0.1#7913 +ipset=/.ezpeer.com/gfwlist server=/.geti2p.net/127.0.0.1#7913 ipset=/.geti2p.net/gfwlist server=/.googlecommerce.com/127.0.0.1#7913 ipset=/.googlecommerce.com/gfwlist +server=/.google.sn/127.0.0.1#7913 +ipset=/.google.sn/gfwlist server=/.bbs.cantonese.asia/127.0.0.1#7913 ipset=/.bbs.cantonese.asia/gfwlist -server=/.hihistory.net/127.0.0.1#7913 -ipset=/.hihistory.net/gfwlist server=/.fgmtv.org/127.0.0.1#7913 ipset=/.fgmtv.org/gfwlist server=/.fqrouter.com/127.0.0.1#7913 ipset=/.fqrouter.com/gfwlist server=/.4bluestones.biz/127.0.0.1#7913 ipset=/.4bluestones.biz/gfwlist -server=/.change.org/127.0.0.1#7913 -ipset=/.change.org/gfwlist +server=/.khmusic.com.tw/127.0.0.1#7913 +ipset=/.khmusic.com.tw/gfwlist server=/.dharamsalanet.com/127.0.0.1#7913 ipset=/.dharamsalanet.com/gfwlist server=/.businessweek.com/127.0.0.1#7913 ipset=/.businessweek.com/gfwlist server=/.fotile.me/127.0.0.1#7913 ipset=/.fotile.me/gfwlist -server=/.scasino.com/127.0.0.1#7913 -ipset=/.scasino.com/gfwlist -server=/.sbme.me/127.0.0.1#7913 -ipset=/.sbme.me/gfwlist -server=/.bcex.ca/127.0.0.1#7913 -ipset=/.bcex.ca/gfwlist +server=/.domainhelp.search.com/127.0.0.1#7913 +ipset=/.domainhelp.search.com/gfwlist +server=/.rushbee.com/127.0.0.1#7913 +ipset=/.rushbee.com/gfwlist +server=/.scriptspot.com/127.0.0.1#7913 +ipset=/.scriptspot.com/gfwlist server=/.hrea.org/127.0.0.1#7913 ipset=/.hrea.org/gfwlist -server=/.christusrex.org/127.0.0.1#7913 -ipset=/.christusrex.org/gfwlist +server=/.kkbox.com/127.0.0.1#7913 +ipset=/.kkbox.com/gfwlist server=/.falungong.org.uk/127.0.0.1#7913 ipset=/.falungong.org.uk/gfwlist server=/.zhreader.com/127.0.0.1#7913 ipset=/.zhreader.com/gfwlist -server=/.savevid.com/127.0.0.1#7913 -ipset=/.savevid.com/gfwlist +server=/.pbworks.com/127.0.0.1#7913 +ipset=/.pbworks.com/gfwlist server=/.xn--ngstr-lra8j.com/127.0.0.1#7913 ipset=/.xn--ngstr-lra8j.com/gfwlist server=/.hhthesakyatrizin.org/127.0.0.1#7913 ipset=/.hhthesakyatrizin.org/gfwlist +server=/.scmpchinese.com/127.0.0.1#7913 +ipset=/.scmpchinese.com/gfwlist server=/.buzzhand.com/127.0.0.1#7913 ipset=/.buzzhand.com/gfwlist -server=/.savetibet.org/127.0.0.1#7913 -ipset=/.savetibet.org/gfwlist -server=/.savethesounds.info/127.0.0.1#7913 -ipset=/.savethesounds.info/gfwlist -server=/.savetibet.fr/127.0.0.1#7913 -ipset=/.savetibet.fr/gfwlist -server=/.secure.raxcdn.com/127.0.0.1#7913 -ipset=/.secure.raxcdn.com/gfwlist +server=/.al-qimmah.net/127.0.0.1#7913 +ipset=/.al-qimmah.net/gfwlist +server=/.rtycminnesota.org/127.0.0.1#7913 +ipset=/.rtycminnesota.org/gfwlist +server=/.1688.com.au/127.0.0.1#7913 +ipset=/.1688.com.au/gfwlist server=/.apkmirror.com/127.0.0.1#7913 ipset=/.apkmirror.com/gfwlist server=/.gfw.press/127.0.0.1#7913 ipset=/.gfw.press/gfwlist +server=/.scasino.com/127.0.0.1#7913 +ipset=/.scasino.com/gfwlist +server=/.jbtalks.com/127.0.0.1#7913 +ipset=/.jbtalks.com/gfwlist +server=/.secure.raxcdn.com/127.0.0.1#7913 +ipset=/.secure.raxcdn.com/gfwlist +server=/.sbme.me/127.0.0.1#7913 +ipset=/.sbme.me/gfwlist server=/.avg.com/127.0.0.1#7913 ipset=/.avg.com/gfwlist -server=/.sanmin.com.tw/127.0.0.1#7913 -ipset=/.sanmin.com.tw/gfwlist -server=/.sambhota.org/127.0.0.1#7913 -ipset=/.sambhota.org/gfwlist -server=/.salvation.org.hk/127.0.0.1#7913 -ipset=/.salvation.org.hk/gfwlist -server=/.sakya.org/127.0.0.1#7913 -ipset=/.sakya.org/gfwlist server=/.acnw.com.au/127.0.0.1#7913 ipset=/.acnw.com.au/gfwlist -server=/.hacg.me/127.0.0.1#7913 -ipset=/.hacg.me/gfwlist +server=/.savevid.com/127.0.0.1#7913 +ipset=/.savevid.com/gfwlist server=/.zuola.com/127.0.0.1#7913 ipset=/.zuola.com/gfwlist server=/.bcrncdn.com/127.0.0.1#7913 ipset=/.bcrncdn.com/gfwlist -server=/.chinarightsia.org/127.0.0.1#7913 -ipset=/.chinarightsia.org/gfwlist +server=/.savetibet.org/127.0.0.1#7913 +ipset=/.savetibet.org/gfwlist server=/.madonna-av.com/127.0.0.1#7913 ipset=/.madonna-av.com/gfwlist -server=/.safervpn.com/127.0.0.1#7913 -ipset=/.safervpn.com/gfwlist -server=/.ninjaproxy.ninja/127.0.0.1#7913 -ipset=/.ninjaproxy.ninja/gfwlist +server=/.savetibet.fr/127.0.0.1#7913 +ipset=/.savetibet.fr/gfwlist +server=/.savethesounds.info/127.0.0.1#7913 +ipset=/.savethesounds.info/gfwlist server=/.sendsmtp.com/127.0.0.1#7913 ipset=/.sendsmtp.com/gfwlist server=/.sftindia.org/127.0.0.1#7913 ipset=/.sftindia.org/gfwlist -server=/.acgkj.com/127.0.0.1#7913 -ipset=/.acgkj.com/gfwlist -server=/.powercx.com/127.0.0.1#7913 -ipset=/.powercx.com/gfwlist +server=/.chinarightsia.org/127.0.0.1#7913 +ipset=/.chinarightsia.org/gfwlist +server=/.koolsolutions.com/127.0.0.1#7913 +ipset=/.koolsolutions.com/gfwlist server=/.galenwu.com/127.0.0.1#7913 ipset=/.galenwu.com/gfwlist server=/.deutsche-welle.de/127.0.0.1#7913 ipset=/.deutsche-welle.de/gfwlist -server=/.almostmy.com/127.0.0.1#7913 -ipset=/.almostmy.com/gfwlist -server=/.sacks.com/127.0.0.1#7913 -ipset=/.sacks.com/gfwlist +server=/.cclifefl.org/127.0.0.1#7913 +ipset=/.cclifefl.org/gfwlist +server=/.crchina.org/127.0.0.1#7913 +ipset=/.crchina.org/gfwlist server=/.vrmtr.com/127.0.0.1#7913 ipset=/.vrmtr.com/gfwlist -server=/.busytrade.com/127.0.0.1#7913 -ipset=/.busytrade.com/gfwlist -server=/.dropbooks.tv/127.0.0.1#7913 -ipset=/.dropbooks.tv/gfwlist -server=/.religioustolerance.org/127.0.0.1#7913 -ipset=/.religioustolerance.org/gfwlist +server=/.acgkj.com/127.0.0.1#7913 +ipset=/.acgkj.com/gfwlist +server=/.sambhota.org/127.0.0.1#7913 +ipset=/.sambhota.org/gfwlist +server=/.salvation.org.hk/127.0.0.1#7913 +ipset=/.salvation.org.hk/gfwlist server=/.hotels.cn/127.0.0.1#7913 ipset=/.hotels.cn/gfwlist server=/.webrtc.org/127.0.0.1#7913 ipset=/.webrtc.org/gfwlist -server=/.mp3ye.eu/127.0.0.1#7913 -ipset=/.mp3ye.eu/gfwlist +server=/.plusbb.com/127.0.0.1#7913 +ipset=/.plusbb.com/gfwlist server=/.ebony-beauty.com/127.0.0.1#7913 ipset=/.ebony-beauty.com/gfwlist server=/.lvv2.com/127.0.0.1#7913 ipset=/.lvv2.com/gfwlist server=/.suissl.com/127.0.0.1#7913 ipset=/.suissl.com/gfwlist -server=/.rutube.ru/127.0.0.1#7913 -ipset=/.rutube.ru/gfwlist +server=/.busytrade.com/127.0.0.1#7913 +ipset=/.busytrade.com/gfwlist server=/.thetibetcenter.org/127.0.0.1#7913 ipset=/.thetibetcenter.org/gfwlist server=/.mnewstv.com/127.0.0.1#7913 ipset=/.mnewstv.com/gfwlist -server=/.ezua.com/127.0.0.1#7913 -ipset=/.ezua.com/gfwlist -server=/.rushbee.com/127.0.0.1#7913 -ipset=/.rushbee.com/gfwlist +server=/.breaking911.com/127.0.0.1#7913 +ipset=/.breaking911.com/gfwlist +server=/.dropbooks.tv/127.0.0.1#7913 +ipset=/.dropbooks.tv/gfwlist +server=/.safervpn.com/127.0.0.1#7913 +ipset=/.safervpn.com/gfwlist +server=/.ddns.net/127.0.0.1#7913 +ipset=/.ddns.net/gfwlist +server=/.sacks.com/127.0.0.1#7913 +ipset=/.sacks.com/gfwlist +server=/.aculo.us/127.0.0.1#7913 +ipset=/.aculo.us/gfwlist server=/.blewpass.com/127.0.0.1#7913 ipset=/.blewpass.com/gfwlist -server=/.runbtx.com/127.0.0.1#7913 -ipset=/.runbtx.com/gfwlist -server=/.botanwang.com/127.0.0.1#7913 -ipset=/.botanwang.com/gfwlist -server=/.ruanyifeng.com/127.0.0.1#7913 -ipset=/.ruanyifeng.com/gfwlist -server=/.rtycminnesota.org/127.0.0.1#7913 -ipset=/.rtycminnesota.org/gfwlist server=/.ifanqiang.com/127.0.0.1#7913 ipset=/.ifanqiang.com/gfwlist server=/.cdp1998.org/127.0.0.1#7913 ipset=/.cdp1998.org/gfwlist -server=/.caobian.info/127.0.0.1#7913 -ipset=/.caobian.info/gfwlist -server=/.rti.org.tw/127.0.0.1#7913 -ipset=/.rti.org.tw/gfwlist +server=/.botanwang.com/127.0.0.1#7913 +ipset=/.botanwang.com/gfwlist +server=/.retweetrank.com/127.0.0.1#7913 +ipset=/.retweetrank.com/gfwlist server=/.files2me.com/127.0.0.1#7913 ipset=/.files2me.com/gfwlist -server=/.oculuscdn.com/127.0.0.1#7913 -ipset=/.oculuscdn.com/gfwlist -server=/.rthk.hk/127.0.0.1#7913 -ipset=/.rthk.hk/gfwlist +server=/.caobian.info/127.0.0.1#7913 +ipset=/.caobian.info/gfwlist +server=/.softsmirror.cf/127.0.0.1#7913 +ipset=/.softsmirror.cf/gfwlist server=/.briian.com/127.0.0.1#7913 ipset=/.briian.com/gfwlist +server=/.rutube.ru/127.0.0.1#7913 +ipset=/.rutube.ru/gfwlist server=/.askynz.net/127.0.0.1#7913 ipset=/.askynz.net/gfwlist -server=/.communitychoicecu.com/127.0.0.1#7913 -ipset=/.communitychoicecu.com/gfwlist server=/.getoutline.org/127.0.0.1#7913 ipset=/.getoutline.org/gfwlist -server=/.rssmeme.com/127.0.0.1#7913 -ipset=/.rssmeme.com/gfwlist -server=/.ub0.cc/127.0.0.1#7913 -ipset=/.ub0.cc/gfwlist +server=/.communitychoicecu.com/127.0.0.1#7913 +ipset=/.communitychoicecu.com/gfwlist +server=/.madewithcode.com/127.0.0.1#7913 +ipset=/.madewithcode.com/gfwlist server=/.seapuff.com/127.0.0.1#7913 ipset=/.seapuff.com/gfwlist -server=/.rsgamen.org/127.0.0.1#7913 -ipset=/.rsgamen.org/gfwlist -server=/.annatam.com/127.0.0.1#7913 -ipset=/.annatam.com/gfwlist +server=/.runbtx.com/127.0.0.1#7913 +ipset=/.runbtx.com/gfwlist +server=/.10conditionsoflove.com/127.0.0.1#7913 +ipset=/.10conditionsoflove.com/gfwlist server=/.ksdl.org/127.0.0.1#7913 ipset=/.ksdl.org/gfwlist server=/.mcadforums.com/127.0.0.1#7913 ipset=/.mcadforums.com/gfwlist -server=/.ellawine.org/127.0.0.1#7913 -ipset=/.ellawine.org/gfwlist +server=/.ruanyifeng.com/127.0.0.1#7913 +ipset=/.ruanyifeng.com/gfwlist server=/.citizenlab.org/127.0.0.1#7913 ipset=/.citizenlab.org/gfwlist server=/.onlytweets.com/127.0.0.1#7913 @@ -8400,52 +8390,52 @@ server=/.hizb-ut-tahrir.org/127.0.0.1#7913 ipset=/.hizb-ut-tahrir.org/gfwlist server=/.dilber.se/127.0.0.1#7913 ipset=/.dilber.se/gfwlist -server=/.koolsolutions.com/127.0.0.1#7913 -ipset=/.koolsolutions.com/gfwlist +server=/.ellawine.org/127.0.0.1#7913 +ipset=/.ellawine.org/gfwlist server=/.tttan.com/127.0.0.1#7913 ipset=/.tttan.com/gfwlist -server=/.rojo.com/127.0.0.1#7913 -ipset=/.rojo.com/gfwlist +server=/.nzchinese.com/127.0.0.1#7913 +ipset=/.nzchinese.com/gfwlist +server=/.rthk.hk/127.0.0.1#7913 +ipset=/.rthk.hk/gfwlist +server=/.rssmeme.com/127.0.0.1#7913 +ipset=/.rssmeme.com/gfwlist server=/.periscope.tv/127.0.0.1#7913 ipset=/.periscope.tv/gfwlist -server=/.rocket-inc.net/127.0.0.1#7913 -ipset=/.rocket-inc.net/gfwlist -server=/.robustnessiskey.com/127.0.0.1#7913 -ipset=/.robustnessiskey.com/gfwlist server=/.tibetjustice.org/127.0.0.1#7913 ipset=/.tibetjustice.org/gfwlist server=/.u15.info/127.0.0.1#7913 ipset=/.u15.info/gfwlist -server=/.chinese-leaders.org/127.0.0.1#7913 -ipset=/.chinese-leaders.org/gfwlist -server=/.withgoogle.com/127.0.0.1#7913 -ipset=/.withgoogle.com/gfwlist +server=/.rsgamen.org/127.0.0.1#7913 +ipset=/.rsgamen.org/gfwlist +server=/.alwaysdata.com/127.0.0.1#7913 +ipset=/.alwaysdata.com/gfwlist server=/.dalailamaprotesters.info/127.0.0.1#7913 ipset=/.dalailamaprotesters.info/gfwlist server=/.answering-islam.org/127.0.0.1#7913 ipset=/.answering-islam.org/gfwlist -server=/.aiph.net/127.0.0.1#7913 -ipset=/.aiph.net/gfwlist +server=/.ksnews.com.tw/127.0.0.1#7913 +ipset=/.ksnews.com.tw/gfwlist server=/.hec.su/127.0.0.1#7913 ipset=/.hec.su/gfwlist server=/.bemywife.cc/127.0.0.1#7913 ipset=/.bemywife.cc/gfwlist server=/.iicns.com/127.0.0.1#7913 ipset=/.iicns.com/gfwlist -server=/.lightyearvpn.com/127.0.0.1#7913 -ipset=/.lightyearvpn.com/gfwlist +server=/.chinese-leaders.org/127.0.0.1#7913 +ipset=/.chinese-leaders.org/gfwlist server=/.plus28.com/127.0.0.1#7913 ipset=/.plus28.com/gfwlist server=/.shizhao.org/127.0.0.1#7913 ipset=/.shizhao.org/gfwlist server=/.h5dm.com/127.0.0.1#7913 ipset=/.h5dm.com/gfwlist -server=/.google.at/127.0.0.1#7913 -ipset=/.google.at/gfwlist -server=/.hide.me/127.0.0.1#7913 -ipset=/.hide.me/gfwlist -server=/.gzone-anime.info/127.0.0.1#7913 -ipset=/.gzone-anime.info/gfwlist +server=/.aiph.net/127.0.0.1#7913 +ipset=/.aiph.net/gfwlist +server=/.lightyearvpn.com/127.0.0.1#7913 +ipset=/.lightyearvpn.com/gfwlist +server=/.fromchinatousa.net/127.0.0.1#7913 +ipset=/.fromchinatousa.net/gfwlist server=/.video.yahoo.com/127.0.0.1#7913 ipset=/.video.yahoo.com/gfwlist server=/.hkatvnews.com/127.0.0.1#7913 @@ -8454,30 +8444,30 @@ server=/.freeyoutubeproxy.net/127.0.0.1#7913 ipset=/.freeyoutubeproxy.net/gfwlist server=/.national-lottery.co.uk/127.0.0.1#7913 ipset=/.national-lottery.co.uk/gfwlist -server=/.blog.fizzik.com/127.0.0.1#7913 -ipset=/.blog.fizzik.com/gfwlist -server=/.dastrassi.org/127.0.0.1#7913 -ipset=/.dastrassi.org/gfwlist +server=/.google.at/127.0.0.1#7913 +ipset=/.google.at/gfwlist +server=/.rojo.com/127.0.0.1#7913 +ipset=/.rojo.com/gfwlist server=/.spendee.com/127.0.0.1#7913 ipset=/.spendee.com/gfwlist -server=/.fanqiangzhe.com/127.0.0.1#7913 -ipset=/.fanqiangzhe.com/gfwlist +server=/.rocket-inc.net/127.0.0.1#7913 +ipset=/.rocket-inc.net/gfwlist server=/.textnow.me/127.0.0.1#7913 ipset=/.textnow.me/gfwlist -server=/.izaobao.us/127.0.0.1#7913 -ipset=/.izaobao.us/gfwlist -server=/.paldengyal.com/127.0.0.1#7913 -ipset=/.paldengyal.com/gfwlist +server=/.robustnessiskey.com/127.0.0.1#7913 +ipset=/.robustnessiskey.com/gfwlist +server=/.dastrassi.org/127.0.0.1#7913 +ipset=/.dastrassi.org/gfwlist server=/.app.heywire.com/127.0.0.1#7913 ipset=/.app.heywire.com/gfwlist server=/.photodharma.net/127.0.0.1#7913 ipset=/.photodharma.net/gfwlist -server=/.rfachina.com/127.0.0.1#7913 -ipset=/.rfachina.com/gfwlist -server=/.fling.com/127.0.0.1#7913 -ipset=/.fling.com/gfwlist -server=/.revver.com/127.0.0.1#7913 -ipset=/.revver.com/gfwlist +server=/.rmjdw.com/127.0.0.1#7913 +ipset=/.rmjdw.com/gfwlist +server=/.izaobao.us/127.0.0.1#7913 +ipset=/.izaobao.us/gfwlist +server=/.uku.im/127.0.0.1#7913 +ipset=/.uku.im/gfwlist server=/.mcfog.com/127.0.0.1#7913 ipset=/.mcfog.com/gfwlist server=/.ibros.org/127.0.0.1#7913 @@ -8488,50 +8478,50 @@ server=/.eireinikotaerukai.com/127.0.0.1#7913 ipset=/.eireinikotaerukai.com/gfwlist server=/.gstatic.com/127.0.0.1#7913 ipset=/.gstatic.com/gfwlist -server=/.retweetist.com/127.0.0.1#7913 -ipset=/.retweetist.com/gfwlist -server=/.reutersmedia.net/127.0.0.1#7913 -ipset=/.reutersmedia.net/gfwlist -server=/.duihuahrjournal.org/127.0.0.1#7913 -ipset=/.duihuahrjournal.org/gfwlist -server=/.fileserve.com/127.0.0.1#7913 -ipset=/.fileserve.com/gfwlist +server=/.blog.jackjia.com/127.0.0.1#7913 +ipset=/.blog.jackjia.com/gfwlist +server=/.bnews.co/127.0.0.1#7913 +ipset=/.bnews.co/gfwlist +server=/.rfachina.com/127.0.0.1#7913 +ipset=/.rfachina.com/gfwlist +server=/.domaintoday.com.au/127.0.0.1#7913 +ipset=/.domaintoday.com.au/gfwlist server=/.clearwisdom.net/127.0.0.1#7913 ipset=/.clearwisdom.net/gfwlist server=/.pornstarclub.com/127.0.0.1#7913 ipset=/.pornstarclub.com/gfwlist -server=/.subacme.rerouted.org/127.0.0.1#7913 -ipset=/.subacme.rerouted.org/gfwlist -server=/.mrbonus.com/127.0.0.1#7913 -ipset=/.mrbonus.com/gfwlist -server=/.domaintoday.com.au/127.0.0.1#7913 -ipset=/.domaintoday.com.au/gfwlist -server=/.kagyuoffice.org.tw/127.0.0.1#7913 -ipset=/.kagyuoffice.org.tw/gfwlist server=/.btcbank.bank/127.0.0.1#7913 ipset=/.btcbank.bank/gfwlist +server=/.mrbonus.com/127.0.0.1#7913 +ipset=/.mrbonus.com/gfwlist +server=/.civicparty.hk/127.0.0.1#7913 +ipset=/.civicparty.hk/gfwlist +server=/.kagyuoffice.org.tw/127.0.0.1#7913 +ipset=/.kagyuoffice.org.tw/gfwlist server=/.free4u.com.ar/127.0.0.1#7913 ipset=/.free4u.com.ar/gfwlist +server=/.encyclopedia.com/127.0.0.1#7913 +ipset=/.encyclopedia.com/gfwlist server=/.taoism.net/127.0.0.1#7913 ipset=/.taoism.net/gfwlist -server=/.mingjingtimes.com/127.0.0.1#7913 -ipset=/.mingjingtimes.com/gfwlist -server=/.relaxbbs.com/127.0.0.1#7913 -ipset=/.relaxbbs.com/gfwlist +server=/.retweetist.com/127.0.0.1#7913 +ipset=/.retweetist.com/gfwlist +server=/.reutersmedia.net/127.0.0.1#7913 +ipset=/.reutersmedia.net/gfwlist server=/.falunhr.org/127.0.0.1#7913 ipset=/.falunhr.org/gfwlist server=/.occupytiananmen.com/127.0.0.1#7913 ipset=/.occupytiananmen.com/gfwlist -server=/.alliance.org.hk/127.0.0.1#7913 -ipset=/.alliance.org.hk/gfwlist +server=/.avfantasy.com/127.0.0.1#7913 +ipset=/.avfantasy.com/gfwlist server=/.dalailama80.org/127.0.0.1#7913 ipset=/.dalailama80.org/gfwlist -server=/.alljackpotscasino.com/127.0.0.1#7913 -ipset=/.alljackpotscasino.com/gfwlist +server=/.duihuahrjournal.org/127.0.0.1#7913 +ipset=/.duihuahrjournal.org/gfwlist server=/.specxinzl.jigsy.com/127.0.0.1#7913 ipset=/.specxinzl.jigsy.com/gfwlist -server=/.jav.com/127.0.0.1#7913 -ipset=/.jav.com/gfwlist +server=/.subacme.rerouted.org/127.0.0.1#7913 +ipset=/.subacme.rerouted.org/gfwlist server=/.tbrc.org/127.0.0.1#7913 ipset=/.tbrc.org/gfwlist server=/.coinex.com/127.0.0.1#7913 @@ -8542,38 +8532,38 @@ server=/.globalvpn.net/127.0.0.1#7913 ipset=/.globalvpn.net/gfwlist server=/.minghui.org/127.0.0.1#7913 ipset=/.minghui.org/gfwlist -server=/.btsynckeys.com/127.0.0.1#7913 -ipset=/.btsynckeys.com/gfwlist -server=/.redchinacn.net/127.0.0.1#7913 -ipset=/.redchinacn.net/gfwlist +server=/.religioustolerance.org/127.0.0.1#7913 +ipset=/.religioustolerance.org/gfwlist +server=/.ippotv.com/127.0.0.1#7913 +ipset=/.ippotv.com/gfwlist server=/.lflinkup.org/127.0.0.1#7913 ipset=/.lflinkup.org/gfwlist server=/.mohu.ml/127.0.0.1#7913 ipset=/.mohu.ml/gfwlist -server=/.goldbet.com/127.0.0.1#7913 -ipset=/.goldbet.com/gfwlist +server=/.lightnovel.cn/127.0.0.1#7913 +ipset=/.lightnovel.cn/gfwlist server=/.memrijttm.org/127.0.0.1#7913 ipset=/.memrijttm.org/gfwlist server=/.booktopia.com.au/127.0.0.1#7913 ipset=/.booktopia.com.au/gfwlist server=/.ssglobal.co/127.0.0.1#7913 ipset=/.ssglobal.co/gfwlist -server=/.hkip.org.uk/127.0.0.1#7913 -ipset=/.hkip.org.uk/gfwlist -server=/.backtotiananmen.com/127.0.0.1#7913 -ipset=/.backtotiananmen.com/gfwlist server=/.meme.yahoo.com/127.0.0.1#7913 ipset=/.meme.yahoo.com/gfwlist +server=/.backtotiananmen.com/127.0.0.1#7913 +ipset=/.backtotiananmen.com/gfwlist +server=/.chuang-yen.org/127.0.0.1#7913 +ipset=/.chuang-yen.org/gfwlist server=/.kissjav.com/127.0.0.1#7913 ipset=/.kissjav.com/gfwlist -server=/.recordhistory.org/127.0.0.1#7913 -ipset=/.recordhistory.org/gfwlist +server=/.entermap.com/127.0.0.1#7913 +ipset=/.entermap.com/gfwlist server=/.chinagreenparty.org/127.0.0.1#7913 ipset=/.chinagreenparty.org/gfwlist server=/.kusocity.com/127.0.0.1#7913 ipset=/.kusocity.com/gfwlist -server=/.aamacau.com/127.0.0.1#7913 -ipset=/.aamacau.com/gfwlist +server=/.redchinacn.net/127.0.0.1#7913 +ipset=/.redchinacn.net/gfwlist server=/.caribbeancom.com/127.0.0.1#7913 ipset=/.caribbeancom.com/gfwlist server=/.dynupdate.no-ip.com/127.0.0.1#7913 @@ -8582,36 +8572,36 @@ server=/.www.linksalpha.com/127.0.0.1#7913 ipset=/.www.linksalpha.com/gfwlist server=/.4sqi.net/127.0.0.1#7913 ipset=/.4sqi.net/gfwlist -server=/.realraptalk.com/127.0.0.1#7913 -ipset=/.realraptalk.com/gfwlist +server=/.m.me/127.0.0.1#7913 +ipset=/.m.me/gfwlist server=/.tibetan-alliance.org/127.0.0.1#7913 ipset=/.tibetan-alliance.org/gfwlist server=/.jungleheart.com/127.0.0.1#7913 ipset=/.jungleheart.com/gfwlist server=/.cos-moe.com/127.0.0.1#7913 ipset=/.cos-moe.com/gfwlist -server=/.m.me/127.0.0.1#7913 -ipset=/.m.me/gfwlist -server=/.static.shemalez.com/127.0.0.1#7913 -ipset=/.static.shemalez.com/gfwlist server=/.www.ajsands.com/127.0.0.1#7913 ipset=/.www.ajsands.com/gfwlist +server=/.recoveryversion.com.tw/127.0.0.1#7913 +ipset=/.recoveryversion.com.tw/gfwlist +server=/.hkusu.net/127.0.0.1#7913 +ipset=/.hkusu.net/gfwlist server=/.wezone.net/127.0.0.1#7913 ipset=/.wezone.net/gfwlist server=/.bloomberg.de/127.0.0.1#7913 ipset=/.bloomberg.de/gfwlist -server=/.read100.com/127.0.0.1#7913 -ipset=/.read100.com/gfwlist -server=/.razyboard.com/127.0.0.1#7913 -ipset=/.razyboard.com/gfwlist -server=/.sytes.net/127.0.0.1#7913 -ipset=/.sytes.net/gfwlist -server=/.hentaivideoworld.com/127.0.0.1#7913 -ipset=/.hentaivideoworld.com/gfwlist +server=/.boxpn.com/127.0.0.1#7913 +ipset=/.boxpn.com/gfwlist server=/.bet365.com/127.0.0.1#7913 ipset=/.bet365.com/gfwlist -server=/.faststone.org/127.0.0.1#7913 -ipset=/.faststone.org/gfwlist +server=/.sytes.net/127.0.0.1#7913 +ipset=/.sytes.net/gfwlist +server=/.realcourage.org/127.0.0.1#7913 +ipset=/.realcourage.org/gfwlist +server=/.readmoo.com/127.0.0.1#7913 +ipset=/.readmoo.com/gfwlist +server=/.hxwq.org/127.0.0.1#7913 +ipset=/.hxwq.org/gfwlist server=/.investigating.wordpress.com/127.0.0.1#7913 ipset=/.investigating.wordpress.com/gfwlist server=/.xinshijue.com/127.0.0.1#7913 @@ -8620,10 +8610,10 @@ server=/.woeser.com/127.0.0.1#7913 ipset=/.woeser.com/gfwlist server=/.gaymenring.com/127.0.0.1#7913 ipset=/.gaymenring.com/gfwlist -server=/.userapi.nytlog.com/127.0.0.1#7913 -ipset=/.userapi.nytlog.com/gfwlist -server=/.rangwang.biz/127.0.0.1#7913 -ipset=/.rangwang.biz/gfwlist +server=/.hidden-advent.org/127.0.0.1#7913 +ipset=/.hidden-advent.org/gfwlist +server=/.rawgit.com/127.0.0.1#7913 +ipset=/.rawgit.com/gfwlist server=/.dajiyuan.de/127.0.0.1#7913 ipset=/.dajiyuan.de/gfwlist server=/.sss.camp/127.0.0.1#7913 @@ -8632,30 +8622,30 @@ server=/.cts.com.tw/127.0.0.1#7913 ipset=/.cts.com.tw/gfwlist server=/.56cun04.jigsy.com/127.0.0.1#7913 ipset=/.56cun04.jigsy.com/gfwlist -server=/.njactb.org/127.0.0.1#7913 -ipset=/.njactb.org/gfwlist +server=/.organharvestinvestigation.net/127.0.0.1#7913 +ipset=/.organharvestinvestigation.net/gfwlist +server=/.bonbonme.com/127.0.0.1#7913 +ipset=/.bonbonme.com/gfwlist server=/.c-spanvideo.org/127.0.0.1#7913 ipset=/.c-spanvideo.org/gfwlist -server=/.six-degrees.io/127.0.0.1#7913 -ipset=/.six-degrees.io/gfwlist server=/.google.ms/127.0.0.1#7913 ipset=/.google.ms/gfwlist -server=/.raidtalk.com.tw/127.0.0.1#7913 -ipset=/.raidtalk.com.tw/gfwlist -server=/.raidcall.com.tw/127.0.0.1#7913 -ipset=/.raidcall.com.tw/gfwlist -server=/.boobstagram.com/127.0.0.1#7913 -ipset=/.boobstagram.com/gfwlist +server=/.fc2.com/127.0.0.1#7913 +ipset=/.fc2.com/gfwlist +server=/.six-degrees.io/127.0.0.1#7913 +ipset=/.six-degrees.io/gfwlist +server=/.ranyunfei.com/127.0.0.1#7913 +ipset=/.ranyunfei.com/gfwlist server=/.seed4.me/127.0.0.1#7913 ipset=/.seed4.me/gfwlist -server=/.ai-wen.net/127.0.0.1#7913 -ipset=/.ai-wen.net/gfwlist +server=/.rangzen.org/127.0.0.1#7913 +ipset=/.rangzen.org/gfwlist server=/.dvdpac.com/127.0.0.1#7913 ipset=/.dvdpac.com/gfwlist -server=/.radiohilight.net/127.0.0.1#7913 -ipset=/.radiohilight.net/gfwlist -server=/.panoramio.com/127.0.0.1#7913 -ipset=/.panoramio.com/gfwlist +server=/.ai-wen.net/127.0.0.1#7913 +ipset=/.ai-wen.net/gfwlist +server=/.rangwang.biz/127.0.0.1#7913 +ipset=/.rangwang.biz/gfwlist server=/.scribd.com/127.0.0.1#7913 ipset=/.scribd.com/gfwlist server=/.vocn.tv/127.0.0.1#7913 @@ -8668,10 +8658,10 @@ server=/.zhengwunet.org/127.0.0.1#7913 ipset=/.zhengwunet.org/gfwlist server=/.izles.net/127.0.0.1#7913 ipset=/.izles.net/gfwlist -server=/.onlinecha.com/127.0.0.1#7913 -ipset=/.onlinecha.com/gfwlist -server=/.chuizi.net/127.0.0.1#7913 -ipset=/.chuizi.net/gfwlist +server=/.raidcall.com.tw/127.0.0.1#7913 +ipset=/.raidcall.com.tw/gfwlist +server=/.alternate-tools.com/127.0.0.1#7913 +ipset=/.alternate-tools.com/gfwlist server=/.blogcatalog.com/127.0.0.1#7913 ipset=/.blogcatalog.com/gfwlist server=/.hihiforum.com/127.0.0.1#7913 @@ -8682,48 +8672,48 @@ server=/.buzzorange.com/127.0.0.1#7913 ipset=/.buzzorange.com/gfwlist server=/.tvider.com/127.0.0.1#7913 ipset=/.tvider.com/gfwlist +server=/.chuizi.net/127.0.0.1#7913 +ipset=/.chuizi.net/gfwlist +server=/.zzcloud.me/127.0.0.1#7913 +ipset=/.zzcloud.me/gfwlist server=/.china-mmm.sa.com/127.0.0.1#7913 ipset=/.china-mmm.sa.com/gfwlist -server=/.quranexplorer.com/127.0.0.1#7913 -ipset=/.quranexplorer.com/gfwlist -server=/.quran.com/127.0.0.1#7913 -ipset=/.quran.com/gfwlist -server=/.bibox.com/127.0.0.1#7913 -ipset=/.bibox.com/gfwlist +server=/.radiohilight.net/127.0.0.1#7913 +ipset=/.radiohilight.net/gfwlist server=/.zyns.com/127.0.0.1#7913 ipset=/.zyns.com/gfwlist server=/.trendsmap.com/127.0.0.1#7913 ipset=/.trendsmap.com/gfwlist -server=/.qstatus.com/127.0.0.1#7913 -ipset=/.qstatus.com/gfwlist -server=/.efksoft.com/127.0.0.1#7913 -ipset=/.efksoft.com/gfwlist +server=/.hautelookcdn.com/127.0.0.1#7913 +ipset=/.hautelookcdn.com/gfwlist +server=/.nemesis2.qx.net/127.0.0.1#7913 +ipset=/.nemesis2.qx.net/gfwlist server=/.sitemaps.org/127.0.0.1#7913 ipset=/.sitemaps.org/gfwlist -server=/.blog.qooza.hk/127.0.0.1#7913 -ipset=/.blog.qooza.hk/gfwlist -server=/.igfw.net/127.0.0.1#7913 -ipset=/.igfw.net/gfwlist +server=/.quranexplorer.com/127.0.0.1#7913 +ipset=/.quranexplorer.com/gfwlist +server=/.blog.daum.net/127.0.0.1#7913 +ipset=/.blog.daum.net/gfwlist +server=/.synergyse.com/127.0.0.1#7913 +ipset=/.synergyse.com/gfwlist +server=/.quran.com/127.0.0.1#7913 +ipset=/.quran.com/gfwlist +server=/.rawgithub.com/127.0.0.1#7913 +ipset=/.rawgithub.com/gfwlist +server=/.sellclassics.com/127.0.0.1#7913 +ipset=/.sellclassics.com/gfwlist +server=/.godsdirectcontact.org/127.0.0.1#7913 +ipset=/.godsdirectcontact.org/gfwlist server=/.citizensradio.org/127.0.0.1#7913 ipset=/.citizensradio.org/gfwlist server=/.google.jo/127.0.0.1#7913 ipset=/.google.jo/gfwlist -server=/.rawgithub.com/127.0.0.1#7913 -ipset=/.rawgithub.com/gfwlist -server=/.qiwen.lu/127.0.0.1#7913 -ipset=/.qiwen.lu/gfwlist -server=/.godsdirectcontact.org/127.0.0.1#7913 -ipset=/.godsdirectcontact.org/gfwlist +server=/.israbox.com/127.0.0.1#7913 +ipset=/.israbox.com/gfwlist server=/.centerforhumanreprod.com/127.0.0.1#7913 ipset=/.centerforhumanreprod.com/gfwlist -server=/.qienkuen.org/127.0.0.1#7913 -ipset=/.qienkuen.org/gfwlist -server=/.qidian.ca/127.0.0.1#7913 -ipset=/.qidian.ca/gfwlist -server=/.akiba-online.com/127.0.0.1#7913 -ipset=/.akiba-online.com/gfwlist -server=/.qiangyou.org/127.0.0.1#7913 -ipset=/.qiangyou.org/gfwlist +server=/.familyfed.org/127.0.0.1#7913 +ipset=/.familyfed.org/gfwlist server=/.download.cnet.com/127.0.0.1#7913 ipset=/.download.cnet.com/gfwlist server=/.wiki.cnitter.com/127.0.0.1#7913 @@ -8738,16 +8728,16 @@ server=/.boardreader.com/127.0.0.1#7913 ipset=/.boardreader.com/gfwlist server=/.heyzo.com/127.0.0.1#7913 ipset=/.heyzo.com/gfwlist -server=/.hua-yue.net/127.0.0.1#7913 -ipset=/.hua-yue.net/gfwlist -server=/.pornhubpremium.com/127.0.0.1#7913 -ipset=/.pornhubpremium.com/gfwlist +server=/.efksoft.com/127.0.0.1#7913 +ipset=/.efksoft.com/gfwlist +server=/.blog.qooza.hk/127.0.0.1#7913 +ipset=/.blog.qooza.hk/gfwlist server=/.dipity.com/127.0.0.1#7913 ipset=/.dipity.com/gfwlist -server=/.playno1.com/127.0.0.1#7913 -ipset=/.playno1.com/gfwlist -server=/.meltoday.com/127.0.0.1#7913 -ipset=/.meltoday.com/gfwlist +server=/.video.ap.org/127.0.0.1#7913 +ipset=/.video.ap.org/gfwlist +server=/.qiwen.lu/127.0.0.1#7913 +ipset=/.qiwen.lu/gfwlist server=/.tuibeitu.net/127.0.0.1#7913 ipset=/.tuibeitu.net/gfwlist server=/.trulyergonomic.com/127.0.0.1#7913 @@ -8764,16 +8754,16 @@ server=/.tagwa.org.au/127.0.0.1#7913 ipset=/.tagwa.org.au/gfwlist server=/.artsy.net/127.0.0.1#7913 ipset=/.artsy.net/gfwlist -server=/.hugoroy.eu/127.0.0.1#7913 -ipset=/.hugoroy.eu/gfwlist +server=/.playpcesor.com/127.0.0.1#7913 +ipset=/.playpcesor.com/gfwlist server=/.chinese-memorial.org/127.0.0.1#7913 ipset=/.chinese-memorial.org/gfwlist -server=/.uukanshu.com/127.0.0.1#7913 -ipset=/.uukanshu.com/gfwlist +server=/.hst.net.tw/127.0.0.1#7913 +ipset=/.hst.net.tw/gfwlist server=/.cmule.org/127.0.0.1#7913 ipset=/.cmule.org/gfwlist -server=/.pursuestar.com/127.0.0.1#7913 -ipset=/.pursuestar.com/gfwlist +server=/.erabaru.net/127.0.0.1#7913 +ipset=/.erabaru.net/gfwlist server=/.chrdnet.com/127.0.0.1#7913 ipset=/.chrdnet.com/gfwlist server=/.xiaolan.me/127.0.0.1#7913 @@ -8782,14 +8772,14 @@ server=/.telegram.org/127.0.0.1#7913 ipset=/.telegram.org/gfwlist server=/.bizhat.com/127.0.0.1#7913 ipset=/.bizhat.com/gfwlist -server=/.d1c37gjwa26taa.cloudfront.net/127.0.0.1#7913 -ipset=/.d1c37gjwa26taa.cloudfront.net/gfwlist +server=/.googleweblight.com/127.0.0.1#7913 +ipset=/.googleweblight.com/gfwlist server=/.packages.debian.org/127.0.0.1#7913 ipset=/.packages.debian.org/gfwlist server=/.code1984.com/127.0.0.1#7913 ipset=/.code1984.com/gfwlist -server=/.purevpn.com/127.0.0.1#7913 -ipset=/.purevpn.com/gfwlist +server=/.meripet.biz/127.0.0.1#7913 +ipset=/.meripet.biz/gfwlist server=/.poloniex.com/127.0.0.1#7913 ipset=/.poloniex.com/gfwlist server=/.free-gate.org/127.0.0.1#7913 @@ -8800,8 +8790,8 @@ server=/.channel8news.sg/127.0.0.1#7913 ipset=/.channel8news.sg/gfwlist server=/.ch.shvoong.com/127.0.0.1#7913 ipset=/.ch.shvoong.com/gfwlist -server=/.about.google/127.0.0.1#7913 -ipset=/.about.google/gfwlist +server=/.hbg.com/127.0.0.1#7913 +ipset=/.hbg.com/gfwlist server=/.eracom.com.tw/127.0.0.1#7913 ipset=/.eracom.com.tw/gfwlist server=/.gzm.tv/127.0.0.1#7913 @@ -8810,202 +8800,202 @@ server=/.zzux.com/127.0.0.1#7913 ipset=/.zzux.com/gfwlist server=/.google.ba/127.0.0.1#7913 ipset=/.google.ba/gfwlist -server=/.ptt.cc/127.0.0.1#7913 -ipset=/.ptt.cc/gfwlist +server=/.jinbushe.org/127.0.0.1#7913 +ipset=/.jinbushe.org/gfwlist server=/.chatnook.com/127.0.0.1#7913 ipset=/.chatnook.com/gfwlist server=/.tsemtulku.com/127.0.0.1#7913 ipset=/.tsemtulku.com/gfwlist -server=/.psiphon3.com/127.0.0.1#7913 -ipset=/.psiphon3.com/gfwlist -server=/.89.64.charter.constitutionalism.solutions/127.0.0.1#7913 -ipset=/.89.64.charter.constitutionalism.solutions/gfwlist -server=/.oclp.hk/127.0.0.1#7913 -ipset=/.oclp.hk/gfwlist +server=/.python.com/127.0.0.1#7913 +ipset=/.python.com/gfwlist +server=/.chinman.net/127.0.0.1#7913 +ipset=/.chinman.net/gfwlist +server=/.siddharthasintent.org/127.0.0.1#7913 +ipset=/.siddharthasintent.org/gfwlist server=/.api.dropboxapi.com/127.0.0.1#7913 ipset=/.api.dropboxapi.com/gfwlist -server=/.ccvoice.ca/127.0.0.1#7913 -ipset=/.ccvoice.ca/gfwlist -server=/.organharvestinvestigation.net/127.0.0.1#7913 -ipset=/.organharvestinvestigation.net/gfwlist +server=/.89.64.charter.constitutionalism.solutions/127.0.0.1#7913 +ipset=/.89.64.charter.constitutionalism.solutions/gfwlist +server=/.pursuestar.com/127.0.0.1#7913 +ipset=/.pursuestar.com/gfwlist server=/.softwaredownload.gitbooks.io/127.0.0.1#7913 ipset=/.softwaredownload.gitbooks.io/gfwlist server=/.free-ssh.com/127.0.0.1#7913 ipset=/.free-ssh.com/gfwlist -server=/.proxytunnel.net/127.0.0.1#7913 -ipset=/.proxytunnel.net/gfwlist +server=/.purevpn.com/127.0.0.1#7913 +ipset=/.purevpn.com/gfwlist server=/.merit-times.com.tw/127.0.0.1#7913 ipset=/.merit-times.com.tw/gfwlist -server=/.anthonycalzadilla.com/127.0.0.1#7913 -ipset=/.anthonycalzadilla.com/gfwlist +server=/.ccvoice.ca/127.0.0.1#7913 +ipset=/.ccvoice.ca/gfwlist server=/.chenpokong.net/127.0.0.1#7913 ipset=/.chenpokong.net/gfwlist -server=/.hornygamer.com/127.0.0.1#7913 -ipset=/.hornygamer.com/gfwlist +server=/.punyu.com/127.0.0.1#7913 +ipset=/.punyu.com/gfwlist server=/.thefacebook.com/127.0.0.1#7913 ipset=/.thefacebook.com/gfwlist -server=/.cao.im/127.0.0.1#7913 -ipset=/.cao.im/gfwlist -server=/.eyevio.jp/127.0.0.1#7913 -ipset=/.eyevio.jp/gfwlist +server=/.igvita.com/127.0.0.1#7913 +ipset=/.igvita.com/gfwlist +server=/.anthonycalzadilla.com/127.0.0.1#7913 +ipset=/.anthonycalzadilla.com/gfwlist server=/.smarthide.com/127.0.0.1#7913 ipset=/.smarthide.com/gfwlist server=/.redchinacn.org/127.0.0.1#7913 ipset=/.redchinacn.org/gfwlist -server=/.nofile.io/127.0.0.1#7913 -ipset=/.nofile.io/gfwlist -server=/.ping.fm/127.0.0.1#7913 -ipset=/.ping.fm/gfwlist -server=/.api.proxlet.com/127.0.0.1#7913 -ipset=/.api.proxlet.com/gfwlist -server=/.proxifier.com/127.0.0.1#7913 -ipset=/.proxifier.com/gfwlist +server=/.brutaltgp.com/127.0.0.1#7913 +ipset=/.brutaltgp.com/gfwlist +server=/.psiphon3.com/127.0.0.1#7913 +ipset=/.psiphon3.com/gfwlist +server=/.orzistic.org/127.0.0.1#7913 +ipset=/.orzistic.org/gfwlist +server=/.proxytunnel.net/127.0.0.1#7913 +ipset=/.proxytunnel.net/gfwlist server=/.guruonline.hk/127.0.0.1#7913 ipset=/.guruonline.hk/gfwlist -server=/.procopytips.com/127.0.0.1#7913 -ipset=/.procopytips.com/gfwlist +server=/.gohappy.com.tw/127.0.0.1#7913 +ipset=/.gohappy.com.tw/gfwlist server=/.itsaol.com/127.0.0.1#7913 ipset=/.itsaol.com/gfwlist -server=/.packetix.net/127.0.0.1#7913 -ipset=/.packetix.net/gfwlist -server=/.private.com/127.0.0.1#7913 -ipset=/.private.com/gfwlist +server=/.ifcss.org/127.0.0.1#7913 +ipset=/.ifcss.org/gfwlist +server=/.proxpn.com/127.0.0.1#7913 +ipset=/.proxpn.com/gfwlist server=/.shadowsocks.com.hk/127.0.0.1#7913 ipset=/.shadowsocks.com.hk/gfwlist -server=/.desc.se/127.0.0.1#7913 -ipset=/.desc.se/gfwlist +server=/.gov.tw/127.0.0.1#7913 +ipset=/.gov.tw/gfwlist server=/.fanqianghou.com/127.0.0.1#7913 ipset=/.fanqianghou.com/gfwlist server=/.dabr.me/127.0.0.1#7913 ipset=/.dabr.me/gfwlist -server=/.666kb.com/127.0.0.1#7913 -ipset=/.666kb.com/gfwlist +server=/.85cc.us/127.0.0.1#7913 +ipset=/.85cc.us/gfwlist server=/.lematin.ch/127.0.0.1#7913 ipset=/.lematin.ch/gfwlist -server=/.redd.it/127.0.0.1#7913 -ipset=/.redd.it/gfwlist +server=/.api.proxlet.com/127.0.0.1#7913 +ipset=/.api.proxlet.com/gfwlist server=/.rixcloud.us/127.0.0.1#7913 ipset=/.rixcloud.us/gfwlist server=/.csdparty.com/127.0.0.1#7913 ipset=/.csdparty.com/gfwlist -server=/.goagent.biz/127.0.0.1#7913 -ipset=/.goagent.biz/gfwlist -server=/.switch1.jp/127.0.0.1#7913 -ipset=/.switch1.jp/gfwlist +server=/.666kb.com/127.0.0.1#7913 +ipset=/.666kb.com/gfwlist +server=/.redd.it/127.0.0.1#7913 +ipset=/.redd.it/gfwlist server=/.softfamous.com/127.0.0.1#7913 ipset=/.softfamous.com/gfwlist server=/.recovery.org.tw/127.0.0.1#7913 ipset=/.recovery.org.tw/gfwlist -server=/.prisoneralert.com/127.0.0.1#7913 -ipset=/.prisoneralert.com/gfwlist +server=/.proxifier.com/127.0.0.1#7913 +ipset=/.proxifier.com/gfwlist +server=/.switch1.jp/127.0.0.1#7913 +ipset=/.switch1.jp/gfwlist server=/.earthcam.com/127.0.0.1#7913 ipset=/.earthcam.com/gfwlist -server=/.prestige-av.com/127.0.0.1#7913 -ipset=/.prestige-av.com/gfwlist -server=/.puffinbrowser.com/127.0.0.1#7913 -ipset=/.puffinbrowser.com/gfwlist +server=/.procopytips.com/127.0.0.1#7913 +ipset=/.procopytips.com/gfwlist server=/.gazotube.com/127.0.0.1#7913 ipset=/.gazotube.com/gfwlist server=/.pureinsight.org/127.0.0.1#7913 ipset=/.pureinsight.org/gfwlist -server=/.presentationzen.com/127.0.0.1#7913 -ipset=/.presentationzen.com/gfwlist +server=/.puffinbrowser.com/127.0.0.1#7913 +ipset=/.puffinbrowser.com/gfwlist server=/.chromeexperiments.com/127.0.0.1#7913 ipset=/.chromeexperiments.com/gfwlist server=/.omni7.jp/127.0.0.1#7913 ipset=/.omni7.jp/gfwlist server=/.trt.net.tr/127.0.0.1#7913 ipset=/.trt.net.tr/gfwlist -server=/.c-est-simple.com/127.0.0.1#7913 -ipset=/.c-est-simple.com/gfwlist -server=/.marc.info/127.0.0.1#7913 -ipset=/.marc.info/gfwlist +server=/.like.com/127.0.0.1#7913 +ipset=/.like.com/gfwlist +server=/.newstapa.org/127.0.0.1#7913 +ipset=/.newstapa.org/gfwlist server=/.furhhdl.org/127.0.0.1#7913 ipset=/.furhhdl.org/gfwlist server=/.pearlher.org/127.0.0.1#7913 ipset=/.pearlher.org/gfwlist server=/.fofg-europe.net/127.0.0.1#7913 ipset=/.fofg-europe.net/gfwlist +server=/.private.com/127.0.0.1#7913 +ipset=/.private.com/gfwlist server=/.mylftv.com/127.0.0.1#7913 ipset=/.mylftv.com/gfwlist -server=/.power.com/127.0.0.1#7913 -ipset=/.power.com/gfwlist server=/.tensorflow.org/127.0.0.1#7913 ipset=/.tensorflow.org/gfwlist server=/.mpettis.com/127.0.0.1#7913 ipset=/.mpettis.com/gfwlist -server=/.sellclassics.com/127.0.0.1#7913 -ipset=/.sellclassics.com/gfwlist +server=/.prisoneralert.com/127.0.0.1#7913 +ipset=/.prisoneralert.com/gfwlist server=/.99btgc01.com/127.0.0.1#7913 ipset=/.99btgc01.com/gfwlist server=/.tubaholic.com/127.0.0.1#7913 ipset=/.tubaholic.com/gfwlist -server=/.sogrady.me/127.0.0.1#7913 -ipset=/.sogrady.me/gfwlist -server=/.dtwang.org/127.0.0.1#7913 -ipset=/.dtwang.org/gfwlist +server=/.prestige-av.com/127.0.0.1#7913 +ipset=/.prestige-av.com/gfwlist +server=/.presentationzen.com/127.0.0.1#7913 +ipset=/.presentationzen.com/gfwlist server=/.news.msn.com.tw/127.0.0.1#7913 ipset=/.news.msn.com.tw/gfwlist -server=/.calebelston.com/127.0.0.1#7913 -ipset=/.calebelston.com/gfwlist -server=/.putty.org/127.0.0.1#7913 -ipset=/.putty.org/gfwlist -server=/.blacklogic.com/127.0.0.1#7913 -ipset=/.blacklogic.com/gfwlist +server=/.dtwang.org/127.0.0.1#7913 +ipset=/.dtwang.org/gfwlist +server=/.chinainterimgov.org/127.0.0.1#7913 +ipset=/.chinainterimgov.org/gfwlist +server=/.power.com/127.0.0.1#7913 +ipset=/.power.com/gfwlist server=/.chinalawtranslate.com/127.0.0.1#7913 ipset=/.chinalawtranslate.com/gfwlist server=/.youmaker.com/127.0.0.1#7913 ipset=/.youmaker.com/gfwlist server=/.googleapis.com/127.0.0.1#7913 ipset=/.googleapis.com/gfwlist -server=/.dok-forum.net/127.0.0.1#7913 -ipset=/.dok-forum.net/gfwlist +server=/.expatshield.com/127.0.0.1#7913 +ipset=/.expatshield.com/gfwlist server=/.koornk.com/127.0.0.1#7913 ipset=/.koornk.com/gfwlist -server=/.greatroc.org/127.0.0.1#7913 -ipset=/.greatroc.org/gfwlist +server=/.dok-forum.net/127.0.0.1#7913 +ipset=/.dok-forum.net/gfwlist server=/.mydad.info/127.0.0.1#7913 ipset=/.mydad.info/gfwlist +server=/.meltoday.com/127.0.0.1#7913 +ipset=/.meltoday.com/gfwlist server=/.tor.blingblingsquad.net/127.0.0.1#7913 ipset=/.tor.blingblingsquad.net/gfwlist -server=/.communistcrimes.org/127.0.0.1#7913 -ipset=/.communistcrimes.org/gfwlist server=/.netme.cc/127.0.0.1#7913 ipset=/.netme.cc/gfwlist +server=/.communistcrimes.org/127.0.0.1#7913 +ipset=/.communistcrimes.org/gfwlist +server=/.sogrady.me/127.0.0.1#7913 +ipset=/.sogrady.me/gfwlist server=/.milsurps.com/127.0.0.1#7913 ipset=/.milsurps.com/gfwlist -server=/.d3rhr7kgmtrq1v.cloudfront.net/127.0.0.1#7913 -ipset=/.d3rhr7kgmtrq1v.cloudfront.net/gfwlist -server=/.blog.jackjia.com/127.0.0.1#7913 -ipset=/.blog.jackjia.com/gfwlist -server=/.proxfree.com/127.0.0.1#7913 -ipset=/.proxfree.com/gfwlist +server=/.calebelston.com/127.0.0.1#7913 +ipset=/.calebelston.com/gfwlist server=/.ktzhk.com/127.0.0.1#7913 ipset=/.ktzhk.com/gfwlist -server=/.provpnaccounts.com/127.0.0.1#7913 -ipset=/.provpnaccounts.com/gfwlist +server=/.putty.org/127.0.0.1#7913 +ipset=/.putty.org/gfwlist server=/.lotuslight.org.hk/127.0.0.1#7913 ipset=/.lotuslight.org.hk/gfwlist server=/.hkepc.com/127.0.0.1#7913 ipset=/.hkepc.com/gfwlist -server=/.isunaffairs.com/127.0.0.1#7913 -ipset=/.isunaffairs.com/gfwlist +server=/.mswe1.org/127.0.0.1#7913 +ipset=/.mswe1.org/gfwlist server=/.xrentdvd.com/127.0.0.1#7913 ipset=/.xrentdvd.com/gfwlist -server=/.www.powerpointninja.com/127.0.0.1#7913 -ipset=/.www.powerpointninja.com/gfwlist -server=/.gluckman.com/127.0.0.1#7913 -ipset=/.gluckman.com/gfwlist server=/.hkgalden.com/127.0.0.1#7913 ipset=/.hkgalden.com/gfwlist +server=/.gluckman.com/127.0.0.1#7913 +ipset=/.gluckman.com/gfwlist +server=/.javbus.co/127.0.0.1#7913 +ipset=/.javbus.co/gfwlist server=/.emule-ed2k.com/127.0.0.1#7913 ipset=/.emule-ed2k.com/gfwlist server=/.savetibet.ru/127.0.0.1#7913 ipset=/.savetibet.ru/gfwlist server=/.jinx.com/127.0.0.1#7913 ipset=/.jinx.com/gfwlist -server=/.dish.com/127.0.0.1#7913 -ipset=/.dish.com/gfwlist +server=/.youtube-nocookie.com/127.0.0.1#7913 +ipset=/.youtube-nocookie.com/gfwlist server=/.ccdtr.org/127.0.0.1#7913 ipset=/.ccdtr.org/gfwlist server=/.kwcg.ca/127.0.0.1#7913 @@ -9014,72 +9004,72 @@ server=/.twitstat.com/127.0.0.1#7913 ipset=/.twitstat.com/gfwlist server=/.hidemyass.com/127.0.0.1#7913 ipset=/.hidemyass.com/gfwlist -server=/.airvpn.org/127.0.0.1#7913 -ipset=/.airvpn.org/gfwlist server=/.cari.com.my/127.0.0.1#7913 ipset=/.cari.com.my/gfwlist +server=/.kyohk.net/127.0.0.1#7913 +ipset=/.kyohk.net/gfwlist server=/.mofos.com/127.0.0.1#7913 ipset=/.mofos.com/gfwlist -server=/.ksnews.com.tw/127.0.0.1#7913 -ipset=/.ksnews.com.tw/gfwlist -server=/.poskotanews.com/127.0.0.1#7913 -ipset=/.poskotanews.com/gfwlist -server=/.portablevpn.nl/127.0.0.1#7913 -ipset=/.portablevpn.nl/gfwlist -server=/.adultfriendfinder.com/127.0.0.1#7913 -ipset=/.adultfriendfinder.com/gfwlist +server=/.cdn.printfriendly.com/127.0.0.1#7913 +ipset=/.cdn.printfriendly.com/gfwlist +server=/.www.powerpointninja.com/127.0.0.1#7913 +ipset=/.www.powerpointninja.com/gfwlist +server=/.minghui-school.org/127.0.0.1#7913 +ipset=/.minghui-school.org/gfwlist +server=/.powercx.com/127.0.0.1#7913 +ipset=/.powercx.com/gfwlist server=/.cn.uptodown.com/127.0.0.1#7913 ipset=/.cn.uptodown.com/gfwlist -server=/.bit.ly/127.0.0.1#7913 -ipset=/.bit.ly/gfwlist -server=/.pornsocket.com/127.0.0.1#7913 -ipset=/.pornsocket.com/gfwlist +server=/.potvpn.com/127.0.0.1#7913 +ipset=/.potvpn.com/gfwlist +server=/.godns.work/127.0.0.1#7913 +ipset=/.godns.work/gfwlist server=/.beaconevents.com/127.0.0.1#7913 ipset=/.beaconevents.com/gfwlist -server=/.alternate-tools.com/127.0.0.1#7913 -ipset=/.alternate-tools.com/gfwlist -server=/.discuss.com.hk/127.0.0.1#7913 -ipset=/.discuss.com.hk/gfwlist -server=/.pornmm.net/127.0.0.1#7913 -ipset=/.pornmm.net/gfwlist +server=/.adultfriendfinder.com/127.0.0.1#7913 +ipset=/.adultfriendfinder.com/gfwlist +server=/.bit.ly/127.0.0.1#7913 +ipset=/.bit.ly/gfwlist +server=/.hk.gradconnection.com/127.0.0.1#7913 +ipset=/.hk.gradconnection.com/gfwlist server=/.raggedbanner.com/127.0.0.1#7913 ipset=/.raggedbanner.com/gfwlist -server=/.erabaru.net/127.0.0.1#7913 -ipset=/.erabaru.net/gfwlist +server=/.poskotanews.com/127.0.0.1#7913 +ipset=/.poskotanews.com/gfwlist server=/.dyndns-pics.com/127.0.0.1#7913 ipset=/.dyndns-pics.com/gfwlist +server=/.portablevpn.nl/127.0.0.1#7913 +ipset=/.portablevpn.nl/gfwlist +server=/.boobstagram.com/127.0.0.1#7913 +ipset=/.boobstagram.com/gfwlist +server=/.qiandao.today/127.0.0.1#7913 +ipset=/.qiandao.today/gfwlist server=/.google.lv/127.0.0.1#7913 ipset=/.google.lv/gfwlist server=/.clarionproject.org/127.0.0.1#7913 ipset=/.clarionproject.org/gfwlist -server=/.qiandao.today/127.0.0.1#7913 -ipset=/.qiandao.today/gfwlist -server=/.band.us/127.0.0.1#7913 -ipset=/.band.us/gfwlist -server=/.pornbase.org/127.0.0.1#7913 -ipset=/.pornbase.org/gfwlist -server=/.chinesegay.org/127.0.0.1#7913 -ipset=/.chinesegay.org/gfwlist -server=/.porn.com/127.0.0.1#7913 -ipset=/.porn.com/gfwlist -server=/.murmur.tw/127.0.0.1#7913 -ipset=/.murmur.tw/gfwlist +server=/.cahr.org.tw/127.0.0.1#7913 +ipset=/.cahr.org.tw/gfwlist +server=/.jukujo-club.com/127.0.0.1#7913 +ipset=/.jukujo-club.com/gfwlist +server=/.pornsocket.com/127.0.0.1#7913 +ipset=/.pornsocket.com/gfwlist server=/.teddysun.com/127.0.0.1#7913 ipset=/.teddysun.com/gfwlist -server=/.bewww.net/127.0.0.1#7913 -ipset=/.bewww.net/gfwlist -server=/.cmule.com/127.0.0.1#7913 -ipset=/.cmule.com/gfwlist +server=/.chinesegay.org/127.0.0.1#7913 +ipset=/.chinesegay.org/gfwlist +server=/.lflinkup.com/127.0.0.1#7913 +ipset=/.lflinkup.com/gfwlist server=/.google.mn/127.0.0.1#7913 ipset=/.google.mn/gfwlist -server=/.if.ttt/127.0.0.1#7913 -ipset=/.if.ttt/gfwlist +server=/.5278.cc/127.0.0.1#7913 +ipset=/.5278.cc/gfwlist server=/.wikileaks-forum.com/127.0.0.1#7913 ipset=/.wikileaks-forum.com/gfwlist -server=/.pokerstars.net/127.0.0.1#7913 -ipset=/.pokerstars.net/gfwlist -server=/.brizzly.com/127.0.0.1#7913 -ipset=/.brizzly.com/gfwlist +server=/.cmule.com/127.0.0.1#7913 +ipset=/.cmule.com/gfwlist +server=/.pornbase.org/127.0.0.1#7913 +ipset=/.pornbase.org/gfwlist server=/.dtiblog.com/127.0.0.1#7913 ipset=/.dtiblog.com/gfwlist server=/.228.net.tw/127.0.0.1#7913 @@ -9088,16 +9078,16 @@ server=/.rsdlmonitor.com/127.0.0.1#7913 ipset=/.rsdlmonitor.com/gfwlist server=/.talkboxapp.com/127.0.0.1#7913 ipset=/.talkboxapp.com/gfwlist -server=/.like.com/127.0.0.1#7913 -ipset=/.like.com/gfwlist -server=/.forum.baby-kingdom.com/127.0.0.1#7913 -ipset=/.forum.baby-kingdom.com/gfwlist -server=/.pmatehunter.com/127.0.0.1#7913 -ipset=/.pmatehunter.com/gfwlist +server=/.porn.com/127.0.0.1#7913 +ipset=/.porn.com/gfwlist +server=/.my-proxy.com/127.0.0.1#7913 +ipset=/.my-proxy.com/gfwlist +server=/.brizzly.com/127.0.0.1#7913 +ipset=/.brizzly.com/gfwlist server=/.search.xxx/127.0.0.1#7913 ipset=/.search.xxx/gfwlist -server=/.admob.com/127.0.0.1#7913 -ipset=/.admob.com/gfwlist +server=/.forum.baby-kingdom.com/127.0.0.1#7913 +ipset=/.forum.baby-kingdom.com/gfwlist server=/.www.zensur.freerk.com/127.0.0.1#7913 ipset=/.www.zensur.freerk.com/gfwlist server=/.google.tk/127.0.0.1#7913 @@ -9106,144 +9096,144 @@ server=/.chromium.org/127.0.0.1#7913 ipset=/.chromium.org/gfwlist server=/.stoweboyd.com/127.0.0.1#7913 ipset=/.stoweboyd.com/gfwlist -server=/.plunder.com/127.0.0.1#7913 -ipset=/.plunder.com/gfwlist +server=/.ddns.ms/127.0.0.1#7913 +ipset=/.ddns.ms/gfwlist server=/.acevpn.com/127.0.0.1#7913 ipset=/.acevpn.com/gfwlist -server=/.plays.com.tw/127.0.0.1#7913 -ipset=/.plays.com.tw/gfwlist +server=/.bitfinex.com/127.0.0.1#7913 +ipset=/.bitfinex.com/gfwlist server=/.weiboscope.jmsc.hku.hk/127.0.0.1#7913 ipset=/.weiboscope.jmsc.hku.hk/gfwlist server=/.qgirl.com.tw/127.0.0.1#7913 ipset=/.qgirl.com.tw/gfwlist +server=/.cirosantilli.com/127.0.0.1#7913 +ipset=/.cirosantilli.com/gfwlist server=/.autodraw.com/127.0.0.1#7913 ipset=/.autodraw.com/gfwlist server=/.123rf.com/127.0.0.1#7913 ipset=/.123rf.com/gfwlist +server=/.pmatehunter.com/127.0.0.1#7913 +ipset=/.pmatehunter.com/gfwlist server=/.9gag.com/127.0.0.1#7913 ipset=/.9gag.com/gfwlist -server=/.pictures.playboy.com/127.0.0.1#7913 -ipset=/.pictures.playboy.com/gfwlist -server=/.sikaozhe1997.github.io/127.0.0.1#7913 -ipset=/.sikaozhe1997.github.io/gfwlist -server=/.bmfinn.com/127.0.0.1#7913 -ipset=/.bmfinn.com/gfwlist -server=/.css.pixnet.in/127.0.0.1#7913 -ipset=/.css.pixnet.in/gfwlist +server=/.hsselite.com/127.0.0.1#7913 +ipset=/.hsselite.com/gfwlist +server=/.plurk.com/127.0.0.1#7913 +ipset=/.plurk.com/gfwlist server=/.bbchat.tv/127.0.0.1#7913 ipset=/.bbchat.tv/gfwlist -server=/.piring.com/127.0.0.1#7913 -ipset=/.piring.com/gfwlist -server=/.maiio.net/127.0.0.1#7913 -ipset=/.maiio.net/gfwlist -server=/.anonymise.us/127.0.0.1#7913 -ipset=/.anonymise.us/gfwlist -server=/.xuehua.us/127.0.0.1#7913 -ipset=/.xuehua.us/gfwlist -server=/.pinterest.de/127.0.0.1#7913 -ipset=/.pinterest.de/gfwlist -server=/.goldjizz.com/127.0.0.1#7913 -ipset=/.goldjizz.com/gfwlist -server=/.pinterest.co.kr/127.0.0.1#7913 -ipset=/.pinterest.co.kr/gfwlist -server=/.blog.excite.co.jp/127.0.0.1#7913 -ipset=/.blog.excite.co.jp/gfwlist -server=/.pinimg.com/127.0.0.1#7913 -ipset=/.pinimg.com/gfwlist +server=/.plunder.com/127.0.0.1#7913 +ipset=/.plunder.com/gfwlist +server=/.bmfinn.com/127.0.0.1#7913 +ipset=/.bmfinn.com/gfwlist +server=/.plays.com.tw/127.0.0.1#7913 +ipset=/.plays.com.tw/gfwlist +server=/.playno1.com/127.0.0.1#7913 +ipset=/.playno1.com/gfwlist +server=/.macrovpn.com/127.0.0.1#7913 +ipset=/.macrovpn.com/gfwlist +server=/.ntdtv.com/127.0.0.1#7913 +ipset=/.ntdtv.com/gfwlist +server=/.pictures.playboy.com/127.0.0.1#7913 +ipset=/.pictures.playboy.com/gfwlist +server=/.chinaway.org/127.0.0.1#7913 +ipset=/.chinaway.org/gfwlist +server=/.coolloud.org.tw/127.0.0.1#7913 +ipset=/.coolloud.org.tw/gfwlist server=/.2lipstube.com/127.0.0.1#7913 ipset=/.2lipstube.com/gfwlist server=/.proxomitron.info/127.0.0.1#7913 ipset=/.proxomitron.info/gfwlist -server=/.pin6.com/127.0.0.1#7913 -ipset=/.pin6.com/gfwlist +server=/.css.pixnet.in/127.0.0.1#7913 +ipset=/.css.pixnet.in/gfwlist server=/.moonbbs.com/127.0.0.1#7913 ipset=/.moonbbs.com/gfwlist -server=/.picturesocial.com/127.0.0.1#7913 -ipset=/.picturesocial.com/gfwlist -server=/.picidae.net/127.0.0.1#7913 -ipset=/.picidae.net/gfwlist -server=/.picacomiccn.com/127.0.0.1#7913 -ipset=/.picacomiccn.com/gfwlist +server=/.fanqiangyakexi.net/127.0.0.1#7913 +ipset=/.fanqiangyakexi.net/gfwlist +server=/.pinterest.de/127.0.0.1#7913 +ipset=/.pinterest.de/gfwlist +server=/.pinterest.co.kr/127.0.0.1#7913 +ipset=/.pinterest.co.kr/gfwlist server=/.tuidang.se/127.0.0.1#7913 ipset=/.tuidang.se/gfwlist server=/.ddns.me.uk/127.0.0.1#7913 ipset=/.ddns.me.uk/gfwlist -server=/.ozxw.com/127.0.0.1#7913 -ipset=/.ozxw.com/gfwlist -server=/.friendfeed.com/127.0.0.1#7913 -ipset=/.friendfeed.com/gfwlist -server=/.google.dk/127.0.0.1#7913 -ipset=/.google.dk/gfwlist +server=/.ping.fm/127.0.0.1#7913 +ipset=/.ping.fm/gfwlist +server=/.pin6.com/127.0.0.1#7913 +ipset=/.pin6.com/gfwlist +server=/.picturesocial.com/127.0.0.1#7913 +ipset=/.picturesocial.com/gfwlist server=/.32red.com/127.0.0.1#7913 ipset=/.32red.com/gfwlist -server=/.pfd.org.hk/127.0.0.1#7913 -ipset=/.pfd.org.hk/gfwlist -server=/.freeman2.com/127.0.0.1#7913 -ipset=/.freeman2.com/gfwlist -server=/.perfectvpn.net/127.0.0.1#7913 -ipset=/.perfectvpn.net/gfwlist -server=/.vultryhw.com/127.0.0.1#7913 -ipset=/.vultryhw.com/gfwlist +server=/.picidae.net/127.0.0.1#7913 +ipset=/.picidae.net/gfwlist +server=/.cdnews.com.tw/127.0.0.1#7913 +ipset=/.cdnews.com.tw/gfwlist server=/.avaaz.org/127.0.0.1#7913 ipset=/.avaaz.org/gfwlist -server=/.boysmaster.com/127.0.0.1#7913 -ipset=/.boysmaster.com/gfwlist +server=/.cdn.ampproject.org/127.0.0.1#7913 +ipset=/.cdn.ampproject.org/gfwlist +server=/.contactmagazine.net/127.0.0.1#7913 +ipset=/.contactmagazine.net/gfwlist +server=/.phmsociety.org/127.0.0.1#7913 +ipset=/.phmsociety.org/gfwlist server=/.rfa.org/127.0.0.1#7913 ipset=/.rfa.org/gfwlist server=/.twitzap.com/127.0.0.1#7913 ipset=/.twitzap.com/gfwlist -server=/.percy.in/127.0.0.1#7913 -ipset=/.percy.in/gfwlist +server=/.pfd.org.hk/127.0.0.1#7913 +ipset=/.pfd.org.hk/gfwlist server=/.8-d.com/127.0.0.1#7913 ipset=/.8-d.com/gfwlist -server=/.phmsociety.org/127.0.0.1#7913 -ipset=/.phmsociety.org/gfwlist -server=/.peoplenews.tw/127.0.0.1#7913 -ipset=/.peoplenews.tw/gfwlist -server=/.mingpaomonthly.com/127.0.0.1#7913 -ipset=/.mingpaomonthly.com/gfwlist +server=/.chinadialogue.net/127.0.0.1#7913 +ipset=/.chinadialogue.net/gfwlist server=/.amnesty.org.hk/127.0.0.1#7913 ipset=/.amnesty.org.hk/gfwlist +server=/.mingpaomonthly.com/127.0.0.1#7913 +ipset=/.mingpaomonthly.com/gfwlist +server=/.mlcool.com/127.0.0.1#7913 +ipset=/.mlcool.com/gfwlist server=/.gdzf.org/127.0.0.1#7913 ipset=/.gdzf.org/gfwlist -server=/.penthouse.com/127.0.0.1#7913 -ipset=/.penthouse.com/gfwlist -server=/.blog.pentalogic.net/127.0.0.1#7913 -ipset=/.blog.pentalogic.net/gfwlist +server=/.perfectvpn.net/127.0.0.1#7913 +ipset=/.perfectvpn.net/gfwlist +server=/.percy.in/127.0.0.1#7913 +ipset=/.percy.in/gfwlist server=/.beevpn.com/127.0.0.1#7913 ipset=/.beevpn.com/gfwlist -server=/.passiontimes.hk/127.0.0.1#7913 -ipset=/.passiontimes.hk/gfwlist -server=/.1688.com.au/127.0.0.1#7913 -ipset=/.1688.com.au/gfwlist +server=/.pbs.org/127.0.0.1#7913 +ipset=/.pbs.org/gfwlist +server=/.ngensis.com/127.0.0.1#7913 +ipset=/.ngensis.com/gfwlist server=/.hrichina.org/127.0.0.1#7913 ipset=/.hrichina.org/gfwlist server=/.e123.hk/127.0.0.1#7913 ipset=/.e123.hk/gfwlist server=/.newtaiwan.com.tw/127.0.0.1#7913 ipset=/.newtaiwan.com.tw/gfwlist -server=/.pemulihan.or.id/127.0.0.1#7913 -ipset=/.pemulihan.or.id/gfwlist +server=/.peoplenews.tw/127.0.0.1#7913 +ipset=/.peoplenews.tw/gfwlist server=/.phuquocservices.com/127.0.0.1#7913 ipset=/.phuquocservices.com/gfwlist server=/.dolf.org.hk/127.0.0.1#7913 ipset=/.dolf.org.hk/gfwlist server=/.bitshare.com/127.0.0.1#7913 ipset=/.bitshare.com/gfwlist -server=/.flickrhivemind.net/127.0.0.1#7913 -ipset=/.flickrhivemind.net/gfwlist +server=/.aobo.com.au/127.0.0.1#7913 +ipset=/.aobo.com.au/gfwlist server=/.footwiball.com/127.0.0.1#7913 ipset=/.footwiball.com/gfwlist server=/.laomiu.com/127.0.0.1#7913 ipset=/.laomiu.com/gfwlist -server=/.aobo.com.au/127.0.0.1#7913 -ipset=/.aobo.com.au/gfwlist -server=/.peeasian.com/127.0.0.1#7913 -ipset=/.peeasian.com/gfwlist +server=/.penthouse.com/127.0.0.1#7913 +ipset=/.penthouse.com/gfwlist +server=/.blog.pentalogic.net/127.0.0.1#7913 +ipset=/.blog.pentalogic.net/gfwlist server=/.deezer.com/127.0.0.1#7913 ipset=/.deezer.com/gfwlist -server=/.greenfieldbookstore.com.hk/127.0.0.1#7913 -ipset=/.greenfieldbookstore.com.hk/gfwlist +server=/.hgseav.com/127.0.0.1#7913 +ipset=/.hgseav.com/gfwlist server=/.bailandaily.com/127.0.0.1#7913 ipset=/.bailandaily.com/gfwlist server=/.bitc.bme.emory.edu/127.0.0.1#7913 @@ -9252,20 +9242,20 @@ server=/.ntd.tv/127.0.0.1#7913 ipset=/.ntd.tv/gfwlist server=/.dessci.com/127.0.0.1#7913 ipset=/.dessci.com/gfwlist -server=/.peacehall.com/127.0.0.1#7913 -ipset=/.peacehall.com/gfwlist -server=/.peace.ca/127.0.0.1#7913 -ipset=/.peace.ca/gfwlist +server=/.cointobe.com/127.0.0.1#7913 +ipset=/.cointobe.com/gfwlist +server=/.whatbrowser.org/127.0.0.1#7913 +ipset=/.whatbrowser.org/gfwlist server=/.rolia.net/127.0.0.1#7913 ipset=/.rolia.net/gfwlist -server=/.pdproxy.com/127.0.0.1#7913 -ipset=/.pdproxy.com/gfwlist +server=/.pemulihan.or.id/127.0.0.1#7913 +ipset=/.pemulihan.or.id/gfwlist server=/.whitebear.freebearblog.org/127.0.0.1#7913 ipset=/.whitebear.freebearblog.org/gfwlist server=/.dalailamahindi.com/127.0.0.1#7913 ipset=/.dalailamahindi.com/gfwlist -server=/.whatbrowser.org/127.0.0.1#7913 -ipset=/.whatbrowser.org/gfwlist +server=/.peeasian.com/127.0.0.1#7913 +ipset=/.peeasian.com/gfwlist server=/.25u.com/127.0.0.1#7913 ipset=/.25u.com/gfwlist server=/.erodoujinworld.com/127.0.0.1#7913 @@ -9280,106 +9270,106 @@ server=/.letou.com/127.0.0.1#7913 ipset=/.letou.com/gfwlist server=/.duckmylife.com/127.0.0.1#7913 ipset=/.duckmylife.com/gfwlist -server=/.api-verify.recaptcha.net/127.0.0.1#7913 -ipset=/.api-verify.recaptcha.net/gfwlist -server=/.chuang-yen.org/127.0.0.1#7913 -ipset=/.chuang-yen.org/gfwlist -server=/.joachims.org/127.0.0.1#7913 -ipset=/.joachims.org/gfwlist -server=/.chromestatus.com/127.0.0.1#7913 -ipset=/.chromestatus.com/gfwlist +server=/.peacehall.com/127.0.0.1#7913 +ipset=/.peacehall.com/gfwlist +server=/.onmypc.info/127.0.0.1#7913 +ipset=/.onmypc.info/gfwlist server=/.cnpolitics.org/127.0.0.1#7913 ipset=/.cnpolitics.org/gfwlist +server=/.chromestatus.com/127.0.0.1#7913 +ipset=/.chromestatus.com/gfwlist +server=/.peace.ca/127.0.0.1#7913 +ipset=/.peace.ca/gfwlist server=/.goodtv.tv/127.0.0.1#7913 ipset=/.goodtv.tv/gfwlist -server=/.pbxes.org/127.0.0.1#7913 -ipset=/.pbxes.org/gfwlist +server=/.bignews.org/127.0.0.1#7913 +ipset=/.bignews.org/gfwlist server=/.liberal.org.hk/127.0.0.1#7913 ipset=/.liberal.org.hk/gfwlist server=/.news.hkpeanut.com/127.0.0.1#7913 ipset=/.news.hkpeanut.com/gfwlist -server=/.bignews.org/127.0.0.1#7913 -ipset=/.bignews.org/gfwlist -server=/.metarthunter.com/127.0.0.1#7913 -ipset=/.metarthunter.com/gfwlist server=/.ss.carryzhou.com/127.0.0.1#7913 ipset=/.ss.carryzhou.com/gfwlist -server=/.pbxes.com/127.0.0.1#7913 -ipset=/.pbxes.com/gfwlist +server=/.metarthunter.com/127.0.0.1#7913 +ipset=/.metarthunter.com/gfwlist +server=/.pdproxy.com/127.0.0.1#7913 +ipset=/.pdproxy.com/gfwlist +server=/.blockless.com/127.0.0.1#7913 +ipset=/.blockless.com/gfwlist server=/.dreamamateurs.com/127.0.0.1#7913 ipset=/.dreamamateurs.com/gfwlist server=/.justmysocks1.net/127.0.0.1#7913 ipset=/.justmysocks1.net/gfwlist server=/.nexttv.com.tw/127.0.0.1#7913 ipset=/.nexttv.com.tw/gfwlist -server=/.blockless.com/127.0.0.1#7913 -ipset=/.blockless.com/gfwlist -server=/.myav.com.tw/127.0.0.1#7913 -ipset=/.myav.com.tw/gfwlist +server=/.pbxes.com/127.0.0.1#7913 +ipset=/.pbxes.com/gfwlist +server=/.wiki.jqueryui.com/127.0.0.1#7913 +ipset=/.wiki.jqueryui.com/gfwlist server=/.kepard.com/127.0.0.1#7913 ipset=/.kepard.com/gfwlist server=/.nalandabodhi.org/127.0.0.1#7913 ipset=/.nalandabodhi.org/gfwlist -server=/.pbs.org/127.0.0.1#7913 -ipset=/.pbs.org/gfwlist -server=/.pastie.org/127.0.0.1#7913 -ipset=/.pastie.org/gfwlist -server=/.pastebin.com/127.0.0.1#7913 -ipset=/.pastebin.com/gfwlist server=/.epac.to/127.0.0.1#7913 ipset=/.epac.to/gfwlist +server=/.mychinanews.com/127.0.0.1#7913 +ipset=/.mychinanews.com/gfwlist +server=/.alternativeto.net/127.0.0.1#7913 +ipset=/.alternativeto.net/gfwlist +server=/.bwh1.net/127.0.0.1#7913 +ipset=/.bwh1.net/gfwlist server=/.thecenter.mit.edu/127.0.0.1#7913 ipset=/.thecenter.mit.edu/gfwlist server=/.3-a.net/127.0.0.1#7913 ipset=/.3-a.net/gfwlist -server=/.passion.com/127.0.0.1#7913 -ipset=/.passion.com/gfwlist -server=/.partypoker.com/127.0.0.1#7913 -ipset=/.partypoker.com/gfwlist +server=/.icu-project.org/127.0.0.1#7913 +ipset=/.icu-project.org/gfwlist +server=/.d100.net/127.0.0.1#7913 +ipset=/.d100.net/gfwlist server=/.mingpaotor.com/127.0.0.1#7913 ipset=/.mingpaotor.com/gfwlist server=/.haproxy.org/127.0.0.1#7913 ipset=/.haproxy.org/gfwlist server=/.mponline.hk/127.0.0.1#7913 ipset=/.mponline.hk/gfwlist -server=/.d100.net/127.0.0.1#7913 -ipset=/.d100.net/gfwlist +server=/.pastie.org/127.0.0.1#7913 +ipset=/.pastie.org/gfwlist server=/.newsdh.com/127.0.0.1#7913 ipset=/.newsdh.com/gfwlist -server=/.dynawebinc.com/127.0.0.1#7913 -ipset=/.dynawebinc.com/gfwlist +server=/.passiontimes.hk/127.0.0.1#7913 +ipset=/.passiontimes.hk/gfwlist server=/.3arabtv.com/127.0.0.1#7913 ipset=/.3arabtv.com/gfwlist server=/.xbookcn.com/127.0.0.1#7913 ipset=/.xbookcn.com/gfwlist -server=/.google.nl/127.0.0.1#7913 -ipset=/.google.nl/gfwlist -server=/.eastturkestan.com/127.0.0.1#7913 -ipset=/.eastturkestan.com/gfwlist -server=/.civilhrfront.org/127.0.0.1#7913 -ipset=/.civilhrfront.org/gfwlist -server=/.jigglegifs.com/127.0.0.1#7913 -ipset=/.jigglegifs.com/gfwlist +server=/.passion.com/127.0.0.1#7913 +ipset=/.passion.com/gfwlist +server=/.partypoker.com/127.0.0.1#7913 +ipset=/.partypoker.com/gfwlist +server=/.cdpusa.org/127.0.0.1#7913 +ipset=/.cdpusa.org/gfwlist +server=/.icfcdn.com/127.0.0.1#7913 +ipset=/.icfcdn.com/gfwlist server=/.meyou.jp/127.0.0.1#7913 ipset=/.meyou.jp/gfwlist server=/.etools.ncol.com/127.0.0.1#7913 ipset=/.etools.ncol.com/gfwlist +server=/.bbs.junglobal.net/127.0.0.1#7913 +ipset=/.bbs.junglobal.net/gfwlist +server=/.mymusic.net.tw/127.0.0.1#7913 +ipset=/.mymusic.net.tw/gfwlist server=/.pacopacomama.com/127.0.0.1#7913 ipset=/.pacopacomama.com/gfwlist -server=/.ozyoyo.com/127.0.0.1#7913 -ipset=/.ozyoyo.com/gfwlist -server=/.ozvoice.org/127.0.0.1#7913 -ipset=/.ozvoice.org/gfwlist -server=/.bbs.ozchinese.com/127.0.0.1#7913 -ipset=/.bbs.ozchinese.com/gfwlist +server=/.packetix.net/127.0.0.1#7913 +ipset=/.packetix.net/gfwlist server=/.my.opera.com/127.0.0.1#7913 ipset=/.my.opera.com/gfwlist -server=/.ow.ly/127.0.0.1#7913 -ipset=/.ow.ly/gfwlist -server=/.inthenameofconfuciusmovie.com/127.0.0.1#7913 -ipset=/.inthenameofconfuciusmovie.com/gfwlist +server=/.ozyoyo.com/127.0.0.1#7913 +ipset=/.ozyoyo.com/gfwlist server=/.crossvpn.net/127.0.0.1#7913 ipset=/.crossvpn.net/gfwlist +server=/.ozvoice.org/127.0.0.1#7913 +ipset=/.ozvoice.org/gfwlist server=/.urbandictionary.com/127.0.0.1#7913 ipset=/.urbandictionary.com/gfwlist server=/.freemuse.org/127.0.0.1#7913 @@ -9388,24 +9378,24 @@ server=/.commentshk.com/127.0.0.1#7913 ipset=/.commentshk.com/gfwlist server=/.waselpro.com/127.0.0.1#7913 ipset=/.waselpro.com/gfwlist -server=/.jinbushe.org/127.0.0.1#7913 -ipset=/.jinbushe.org/gfwlist +server=/.htl.li/127.0.0.1#7913 +ipset=/.htl.li/gfwlist server=/.catholic.org.hk/127.0.0.1#7913 ipset=/.catholic.org.hk/gfwlist -server=/.91porn.com/127.0.0.1#7913 -ipset=/.91porn.com/gfwlist +server=/.ht.ly/127.0.0.1#7913 +ipset=/.ht.ly/gfwlist server=/.gamousa.com/127.0.0.1#7913 ipset=/.gamousa.com/gfwlist -server=/.oursweb.net/127.0.0.1#7913 -ipset=/.oursweb.net/gfwlist +server=/.jizzthis.com/127.0.0.1#7913 +ipset=/.jizzthis.com/gfwlist server=/.spaces.hightail.com/127.0.0.1#7913 ipset=/.spaces.hightail.com/gfwlist server=/.grandtrial.org/127.0.0.1#7913 ipset=/.grandtrial.org/gfwlist server=/.xfinity.com/127.0.0.1#7913 ipset=/.xfinity.com/gfwlist -server=/.oursteps.com.au/127.0.0.1#7913 -ipset=/.oursteps.com.au/gfwlist +server=/.break.com/127.0.0.1#7913 +ipset=/.break.com/gfwlist server=/.tibettelegraph.com/127.0.0.1#7913 ipset=/.tibettelegraph.com/gfwlist server=/.citizenscommission.hk/127.0.0.1#7913 @@ -9414,36 +9404,36 @@ server=/.rfalive1.akacast.akamaistream.net/127.0.0.1#7913 ipset=/.rfalive1.akacast.akamaistream.net/gfwlist server=/.googlezip.net/127.0.0.1#7913 ipset=/.googlezip.net/gfwlist +server=/.ourdearamy.com/127.0.0.1#7913 +ipset=/.ourdearamy.com/gfwlist server=/.otnd.org/127.0.0.1#7913 ipset=/.otnd.org/gfwlist -server=/.osfoora.com/127.0.0.1#7913 -ipset=/.osfoora.com/gfwlist server=/.taiwan-sex.com/127.0.0.1#7913 ipset=/.taiwan-sex.com/gfwlist -server=/.tui.orzdream.com/127.0.0.1#7913 -ipset=/.tui.orzdream.com/gfwlist -server=/.t.orzdream.com/127.0.0.1#7913 -ipset=/.t.orzdream.com/gfwlist +server=/.osfoora.com/127.0.0.1#7913 +ipset=/.osfoora.com/gfwlist +server=/.psiphon.civisec.org/127.0.0.1#7913 +ipset=/.psiphon.civisec.org/gfwlist server=/.google.fi/127.0.0.1#7913 ipset=/.google.fi/gfwlist server=/.bcc.com.tw/127.0.0.1#7913 ipset=/.bcc.com.tw/gfwlist -server=/.fzh999.net/127.0.0.1#7913 -ipset=/.fzh999.net/gfwlist -server=/.orient-doll.com/127.0.0.1#7913 -ipset=/.orient-doll.com/gfwlist +server=/.4chan.com/127.0.0.1#7913 +ipset=/.4chan.com/gfwlist +server=/.tui.orzdream.com/127.0.0.1#7913 +ipset=/.tui.orzdream.com/gfwlist server=/.coursehero.com/127.0.0.1#7913 ipset=/.coursehero.com/gfwlist server=/.pobieramy.top/127.0.0.1#7913 ipset=/.pobieramy.top/gfwlist -server=/.orgfree.com/127.0.0.1#7913 -ipset=/.orgfree.com/gfwlist +server=/.t.orzdream.com/127.0.0.1#7913 +ipset=/.t.orzdream.com/gfwlist server=/.helloss.pw/127.0.0.1#7913 ipset=/.helloss.pw/gfwlist -server=/.lbank.info/127.0.0.1#7913 -ipset=/.lbank.info/gfwlist -server=/.orgasm.com/127.0.0.1#7913 -ipset=/.orgasm.com/gfwlist +server=/.orient-doll.com/127.0.0.1#7913 +ipset=/.orient-doll.com/gfwlist +server=/.orgfree.com/127.0.0.1#7913 +ipset=/.orgfree.com/gfwlist server=/.darktoy.net/127.0.0.1#7913 ipset=/.darktoy.net/gfwlist server=/.btctrade.im/127.0.0.1#7913 @@ -9454,46 +9444,46 @@ server=/.rapidgator.net/127.0.0.1#7913 ipset=/.rapidgator.net/gfwlist server=/.tmdfish.com/127.0.0.1#7913 ipset=/.tmdfish.com/gfwlist -server=/.4chan.com/127.0.0.1#7913 -ipset=/.4chan.com/gfwlist server=/.organcare.org.tw/127.0.0.1#7913 ipset=/.organcare.org.tw/gfwlist server=/.www.orchidbbs.com/127.0.0.1#7913 ipset=/.www.orchidbbs.com/gfwlist -server=/.bebo.com/127.0.0.1#7913 -ipset=/.bebo.com/gfwlist server=/.openwebster.com/127.0.0.1#7913 ipset=/.openwebster.com/gfwlist -server=/.iu45.com/127.0.0.1#7913 -ipset=/.iu45.com/gfwlist -server=/.opendemocracy.net/127.0.0.1#7913 -ipset=/.opendemocracy.net/gfwlist -server=/.bbs.junglobal.net/127.0.0.1#7913 -ipset=/.bbs.junglobal.net/gfwlist -server=/.shadowsocks.be/127.0.0.1#7913 -ipset=/.shadowsocks.be/gfwlist -server=/.open.com.hk/127.0.0.1#7913 -ipset=/.open.com.hk/gfwlist +server=/.bebo.com/127.0.0.1#7913 +ipset=/.bebo.com/gfwlist server=/.hkvwet.com/127.0.0.1#7913 ipset=/.hkvwet.com/gfwlist +server=/.iu45.com/127.0.0.1#7913 +ipset=/.iu45.com/gfwlist +server=/.cna.com.tw/127.0.0.1#7913 +ipset=/.cna.com.tw/gfwlist +server=/.kyoyue.com/127.0.0.1#7913 +ipset=/.kyoyue.com/gfwlist +server=/.shadowsocks.be/127.0.0.1#7913 +ipset=/.shadowsocks.be/gfwlist +server=/.chinesepen.org/127.0.0.1#7913 +ipset=/.chinesepen.org/gfwlist +server=/.epochtimes.co.il/127.0.0.1#7913 +ipset=/.epochtimes.co.il/gfwlist server=/.nic.google/127.0.0.1#7913 ipset=/.nic.google/gfwlist server=/.hk.video.news.yahoo.com/127.0.0.1#7913 ipset=/.hk.video.news.yahoo.com/gfwlist -server=/.cna.com.tw/127.0.0.1#7913 -ipset=/.cna.com.tw/gfwlist -server=/.onmoon.com/127.0.0.1#7913 -ipset=/.onmoon.com/gfwlist +server=/.chushigangdrug.ch/127.0.0.1#7913 +ipset=/.chushigangdrug.ch/gfwlist +server=/.opendemocracy.net/127.0.0.1#7913 +ipset=/.opendemocracy.net/gfwlist server=/.yes-news.com/127.0.0.1#7913 ipset=/.yes-news.com/gfwlist -server=/.onmoon.net/127.0.0.1#7913 -ipset=/.onmoon.net/gfwlist +server=/.dalailama.mn/127.0.0.1#7913 +ipset=/.dalailama.mn/gfwlist server=/.hkcoc.weather.com.hk/127.0.0.1#7913 ipset=/.hkcoc.weather.com.hk/gfwlist server=/.wuguoguang.com/127.0.0.1#7913 ipset=/.wuguoguang.com/gfwlist -server=/.nytimes.com/127.0.0.1#7913 -ipset=/.nytimes.com/gfwlist +server=/.dnssec.net/127.0.0.1#7913 +ipset=/.dnssec.net/gfwlist server=/.myforum.com.uk/127.0.0.1#7913 ipset=/.myforum.com.uk/gfwlist server=/.eslite.com/127.0.0.1#7913 @@ -9502,68 +9492,68 @@ server=/.grow.google/127.0.0.1#7913 ipset=/.grow.google/gfwlist server=/.drtuber.com/127.0.0.1#7913 ipset=/.drtuber.com/gfwlist -server=/.chushigangdrug.ch/127.0.0.1#7913 -ipset=/.chushigangdrug.ch/gfwlist -server=/.chinainterimgov.org/127.0.0.1#7913 -ipset=/.chinainterimgov.org/gfwlist +server=/.epochtimes.jp/127.0.0.1#7913 +ipset=/.epochtimes.jp/gfwlist +server=/.tellme.pw/127.0.0.1#7913 +ipset=/.tellme.pw/gfwlist server=/.khabdha.org/127.0.0.1#7913 ipset=/.khabdha.org/gfwlist -server=/.htkou.net/127.0.0.1#7913 -ipset=/.htkou.net/gfwlist +server=/.bjzc.org/127.0.0.1#7913 +ipset=/.bjzc.org/gfwlist server=/.githubassets.com/127.0.0.1#7913 ipset=/.githubassets.com/gfwlist -server=/.hhdcb3office.org/127.0.0.1#7913 -ipset=/.hhdcb3office.org/gfwlist +server=/.onlinecha.com/127.0.0.1#7913 +ipset=/.onlinecha.com/gfwlist server=/.hkdailynews.com.hk/127.0.0.1#7913 ipset=/.hkdailynews.com.hk/gfwlist server=/.hk.jiepang.com/127.0.0.1#7913 ipset=/.hk.jiepang.com/gfwlist -server=/.dalailama.mn/127.0.0.1#7913 -ipset=/.dalailama.mn/gfwlist +server=/.mediachinese.com/127.0.0.1#7913 +ipset=/.mediachinese.com/gfwlist server=/.softether.org/127.0.0.1#7913 ipset=/.softether.org/gfwlist -server=/.epochtimes.jp/127.0.0.1#7913 -ipset=/.epochtimes.jp/gfwlist -server=/.bjzc.org/127.0.0.1#7913 -ipset=/.bjzc.org/gfwlist +server=/.ablwang.com/127.0.0.1#7913 +ipset=/.ablwang.com/gfwlist +server=/.forum.omy.sg/127.0.0.1#7913 +ipset=/.forum.omy.sg/gfwlist +server=/.no-ip.org/127.0.0.1#7913 +ipset=/.no-ip.org/gfwlist server=/.omnitalk.org/127.0.0.1#7913 ipset=/.omnitalk.org/gfwlist -server=/.881903.com/127.0.0.1#7913 -ipset=/.881903.com/gfwlist +server=/.dw-world.com/127.0.0.1#7913 +ipset=/.dw-world.com/gfwlist server=/.olumpo.com/127.0.0.1#7913 ipset=/.olumpo.com/gfwlist -server=/.material.io/127.0.0.1#7913 -ipset=/.material.io/gfwlist -server=/.filmy.olabloga.pl/127.0.0.1#7913 -ipset=/.filmy.olabloga.pl/gfwlist +server=/.arte.tv/127.0.0.1#7913 +ipset=/.arte.tv/gfwlist server=/.fileflyer.com/127.0.0.1#7913 ipset=/.fileflyer.com/gfwlist server=/.rcam.target.com/127.0.0.1#7913 ipset=/.rcam.target.com/gfwlist -server=/.ogate.org/127.0.0.1#7913 -ipset=/.ogate.org/gfwlist -server=/.arte.tv/127.0.0.1#7913 -ipset=/.arte.tv/gfwlist -server=/.ogaoga.org/127.0.0.1#7913 -ipset=/.ogaoga.org/gfwlist +server=/.itemdb.com/127.0.0.1#7913 +ipset=/.itemdb.com/gfwlist server=/.chrlawyers.hk/127.0.0.1#7913 ipset=/.chrlawyers.hk/gfwlist +server=/.nflximg.com/127.0.0.1#7913 +ipset=/.nflximg.com/gfwlist +server=/.ghostpath.com/127.0.0.1#7913 +ipset=/.ghostpath.com/gfwlist server=/.tumview.com/127.0.0.1#7913 ipset=/.tumview.com/gfwlist -server=/.offbeatchina.com/127.0.0.1#7913 -ipset=/.offbeatchina.com/gfwlist +server=/.ogaoga.org/127.0.0.1#7913 +ipset=/.ogaoga.org/gfwlist server=/.lighten.org.tw/127.0.0.1#7913 ipset=/.lighten.org.tw/gfwlist server=/.gist.githubusercontent.com/127.0.0.1#7913 ipset=/.gist.githubusercontent.com/gfwlist server=/.jiji.com/127.0.0.1#7913 ipset=/.jiji.com/gfwlist +server=/.offbeatchina.com/127.0.0.1#7913 +ipset=/.offbeatchina.com/gfwlist server=/.ocaspro.com/127.0.0.1#7913 ipset=/.ocaspro.com/gfwlist -server=/.observechina.net/127.0.0.1#7913 -ipset=/.observechina.net/gfwlist -server=/.hst.net.tw/127.0.0.1#7913 -ipset=/.hst.net.tw/gfwlist +server=/.hk32168.com/127.0.0.1#7913 +ipset=/.hk32168.com/gfwlist server=/.badoo.com/127.0.0.1#7913 ipset=/.badoo.com/gfwlist server=/.potato.im/127.0.0.1#7913 @@ -9574,14 +9564,14 @@ server=/.huobipro.com/127.0.0.1#7913 ipset=/.huobipro.com/gfwlist server=/.codeshare.io/127.0.0.1#7913 ipset=/.codeshare.io/gfwlist -server=/.angelfire.com/127.0.0.1#7913 -ipset=/.angelfire.com/gfwlist +server=/.androidify.com/127.0.0.1#7913 +ipset=/.androidify.com/gfwlist server=/.fanqiang.tk/127.0.0.1#7913 ipset=/.fanqiang.tk/gfwlist -server=/.nyaa.eu/127.0.0.1#7913 -ipset=/.nyaa.eu/gfwlist -server=/.cbc.ca/127.0.0.1#7913 -ipset=/.cbc.ca/gfwlist +server=/.observechina.net/127.0.0.1#7913 +ipset=/.observechina.net/gfwlist +server=/.nylonstockingsonline.com/127.0.0.1#7913 +ipset=/.nylonstockingsonline.com/gfwlist server=/.login.target.com/127.0.0.1#7913 ipset=/.login.target.com/gfwlist server=/.appsto.re/127.0.0.1#7913 @@ -9598,104 +9588,104 @@ server=/.babynet.com.hk/127.0.0.1#7913 ipset=/.babynet.com.hk/gfwlist server=/.rfi.fr/127.0.0.1#7913 ipset=/.rfi.fr/gfwlist -server=/.nvquan.org/127.0.0.1#7913 -ipset=/.nvquan.org/gfwlist -server=/.widevine.com/127.0.0.1#7913 -ipset=/.widevine.com/gfwlist -server=/.nvdst.com/127.0.0.1#7913 -ipset=/.nvdst.com/gfwlist -server=/.nuvid.com/127.0.0.1#7913 -ipset=/.nuvid.com/gfwlist +server=/.hsjp.net/127.0.0.1#7913 +ipset=/.hsjp.net/gfwlist +server=/.mixpod.com/127.0.0.1#7913 +ipset=/.mixpod.com/gfwlist +server=/.facebook.hu/127.0.0.1#7913 +ipset=/.facebook.hu/gfwlist +server=/.nyaa.eu/127.0.0.1#7913 +ipset=/.nyaa.eu/gfwlist server=/.airasia.com/127.0.0.1#7913 ipset=/.airasia.com/gfwlist server=/.liuhanyu.com/127.0.0.1#7913 ipset=/.liuhanyu.com/gfwlist server=/.curvefish.com/127.0.0.1#7913 ipset=/.curvefish.com/gfwlist -server=/.nurgo-software.com/127.0.0.1#7913 -ipset=/.nurgo-software.com/gfwlist -server=/.rocksdb.org/127.0.0.1#7913 -ipset=/.rocksdb.org/gfwlist +server=/.akamaihd.net/127.0.0.1#7913 +ipset=/.akamaihd.net/gfwlist +server=/.whatsapp.com/127.0.0.1#7913 +ipset=/.whatsapp.com/gfwlist server=/.surfeasy.com.au/127.0.0.1#7913 ipset=/.surfeasy.com.au/gfwlist -server=/.cbs.ntu.edu.tw/127.0.0.1#7913 -ipset=/.cbs.ntu.edu.tw/gfwlist +server=/.nvdst.com/127.0.0.1#7913 +ipset=/.nvdst.com/gfwlist server=/.torvpn.com/127.0.0.1#7913 ipset=/.torvpn.com/gfwlist -server=/.co.ng.mil/127.0.0.1#7913 -ipset=/.co.ng.mil/gfwlist -server=/.ied2k.net/127.0.0.1#7913 -ipset=/.ied2k.net/gfwlist -server=/.hkusu.net/127.0.0.1#7913 -ipset=/.hkusu.net/gfwlist +server=/.cbs.ntu.edu.tw/127.0.0.1#7913 +ipset=/.cbs.ntu.edu.tw/gfwlist +server=/.debug.com/127.0.0.1#7913 +ipset=/.debug.com/gfwlist +server=/.ntdtvla.com/127.0.0.1#7913 +ipset=/.ntdtvla.com/gfwlist server=/.ddc.com.tw/127.0.0.1#7913 ipset=/.ddc.com.tw/gfwlist -server=/.ggpht.com/127.0.0.1#7913 -ipset=/.ggpht.com/gfwlist -server=/.3ren.ca/127.0.0.1#7913 -ipset=/.3ren.ca/gfwlist +server=/.gcr.io/127.0.0.1#7913 +ipset=/.gcr.io/gfwlist +server=/.igfw.net/127.0.0.1#7913 +ipset=/.igfw.net/gfwlist +server=/.kinmen.org.tw/127.0.0.1#7913 +ipset=/.kinmen.org.tw/gfwlist +server=/.androidtv.com/127.0.0.1#7913 +ipset=/.androidtv.com/gfwlist server=/.ntdtv.co.kr/127.0.0.1#7913 ipset=/.ntdtv.co.kr/gfwlist -server=/.ntdtv.com/127.0.0.1#7913 -ipset=/.ntdtv.com/gfwlist -server=/.nps.gov/127.0.0.1#7913 -ipset=/.nps.gov/gfwlist server=/.sharpdaily.hk/127.0.0.1#7913 ipset=/.sharpdaily.hk/gfwlist server=/.caochangqing.com/127.0.0.1#7913 ipset=/.caochangqing.com/gfwlist server=/.go141.com/127.0.0.1#7913 ipset=/.go141.com/gfwlist -server=/.news.now.com/127.0.0.1#7913 -ipset=/.news.now.com/gfwlist +server=/.nps.gov/127.0.0.1#7913 +ipset=/.nps.gov/gfwlist server=/.pussyspace.com/127.0.0.1#7913 ipset=/.pussyspace.com/gfwlist -server=/.novelasia.com/127.0.0.1#7913 -ipset=/.novelasia.com/gfwlist -server=/.kagyu.org.za/127.0.0.1#7913 -ipset=/.kagyu.org.za/gfwlist +server=/.cloud.mail.ru/127.0.0.1#7913 +ipset=/.cloud.mail.ru/gfwlist +server=/.noypf.com/127.0.0.1#7913 +ipset=/.noypf.com/gfwlist server=/.thlib.org/127.0.0.1#7913 ipset=/.thlib.org/gfwlist server=/.cdjp.org/127.0.0.1#7913 ipset=/.cdjp.org/gfwlist -server=/.cloud.mail.ru/127.0.0.1#7913 -ipset=/.cloud.mail.ru/gfwlist +server=/.novelasia.com/127.0.0.1#7913 +ipset=/.novelasia.com/gfwlist server=/.athenaeizou.com/127.0.0.1#7913 ipset=/.athenaeizou.com/gfwlist server=/.paradisehill.cc/127.0.0.1#7913 ipset=/.paradisehill.cc/gfwlist -server=/.ltn.com.tw/127.0.0.1#7913 -ipset=/.ltn.com.tw/gfwlist -server=/.nextmag.com.tw/127.0.0.1#7913 -ipset=/.nextmag.com.tw/gfwlist -server=/.myfreshnet.com/127.0.0.1#7913 -ipset=/.myfreshnet.com/gfwlist -server=/.nakuz.com/127.0.0.1#7913 -ipset=/.nakuz.com/gfwlist -server=/.blogspot.com/127.0.0.1#7913 -ipset=/.blogspot.com/gfwlist -server=/.servehttp.com/127.0.0.1#7913 -ipset=/.servehttp.com/gfwlist -server=/.opendn.xyz/127.0.0.1#7913 -ipset=/.opendn.xyz/gfwlist +server=/.mypop3.net/127.0.0.1#7913 +ipset=/.mypop3.net/gfwlist +server=/.nhentai.net/127.0.0.1#7913 +ipset=/.nhentai.net/gfwlist +server=/.archive.today/127.0.0.1#7913 +ipset=/.archive.today/gfwlist +server=/.bettervpn.com/127.0.0.1#7913 +ipset=/.bettervpn.com/gfwlist server=/.bb-chat.tv/127.0.0.1#7913 ipset=/.bb-chat.tv/gfwlist -server=/.gotdns.ch/127.0.0.1#7913 -ipset=/.gotdns.ch/gfwlist +server=/.aofriend.com/127.0.0.1#7913 +ipset=/.aofriend.com/gfwlist +server=/.naol.ca/127.0.0.1#7913 +ipset=/.naol.ca/gfwlist +server=/.search.yahoo.com/127.0.0.1#7913 +ipset=/.search.yahoo.com/gfwlist +server=/.opendn.xyz/127.0.0.1#7913 +ipset=/.opendn.xyz/gfwlist server=/.joyourself.com/127.0.0.1#7913 ipset=/.joyourself.com/gfwlist server=/.proxynetwork.org.uk/127.0.0.1#7913 ipset=/.proxynetwork.org.uk/gfwlist -server=/.search.yahoo.com/127.0.0.1#7913 -ipset=/.search.yahoo.com/gfwlist +server=/.gotdns.ch/127.0.0.1#7913 +ipset=/.gotdns.ch/gfwlist server=/.coinegg.com/127.0.0.1#7913 ipset=/.coinegg.com/gfwlist -server=/.taiwanyes.ning.com/127.0.0.1#7913 -ipset=/.taiwanyes.ning.com/gfwlist -server=/.nintendium.com/127.0.0.1#7913 -ipset=/.nintendium.com/gfwlist server=/.atlaspost.com/127.0.0.1#7913 ipset=/.atlaspost.com/gfwlist +server=/.juyuange.org/127.0.0.1#7913 +ipset=/.juyuange.org/gfwlist +server=/.njactb.org/127.0.0.1#7913 +ipset=/.njactb.org/gfwlist server=/.taiwankiss.com/127.0.0.1#7913 ipset=/.taiwankiss.com/gfwlist server=/.173ng.com/127.0.0.1#7913 @@ -9704,52 +9694,52 @@ server=/.tor.updatestar.com/127.0.0.1#7913 ipset=/.tor.updatestar.com/gfwlist server=/.yeahteentube.com/127.0.0.1#7913 ipset=/.yeahteentube.com/gfwlist -server=/.aceros-de-hispania.com/127.0.0.1#7913 -ipset=/.aceros-de-hispania.com/gfwlist -server=/.ngensis.com/127.0.0.1#7913 -ipset=/.ngensis.com/gfwlist -server=/.nga.mil/127.0.0.1#7913 -ipset=/.nga.mil/gfwlist +server=/.ltn.com.tw/127.0.0.1#7913 +ipset=/.ltn.com.tw/gfwlist +server=/.av.nightlife141.com/127.0.0.1#7913 +ipset=/.av.nightlife141.com/gfwlist +server=/.chinapress.com.my/127.0.0.1#7913 +ipset=/.chinapress.com.my/gfwlist server=/.secretgarden.no/127.0.0.1#7913 ipset=/.secretgarden.no/gfwlist server=/.adelaidebbs.com/127.0.0.1#7913 ipset=/.adelaidebbs.com/gfwlist server=/.daozhongxing.org/127.0.0.1#7913 ipset=/.daozhongxing.org/gfwlist -server=/.harunyahya.com/127.0.0.1#7913 -ipset=/.harunyahya.com/gfwlist -server=/.chinapress.com.my/127.0.0.1#7913 -ipset=/.chinapress.com.my/gfwlist -server=/.www.gmiddle.com/127.0.0.1#7913 -ipset=/.www.gmiddle.com/gfwlist -server=/.mywww.biz/127.0.0.1#7913 -ipset=/.mywww.biz/gfwlist -server=/.next11.co.jp/127.0.0.1#7913 -ipset=/.next11.co.jp/gfwlist +server=/.ae.org/127.0.0.1#7913 +ipset=/.ae.org/gfwlist +server=/.aboluowang.com/127.0.0.1#7913 +ipset=/.aboluowang.com/gfwlist +server=/.nga.mil/127.0.0.1#7913 +ipset=/.nga.mil/gfwlist +server=/.888poker.com/127.0.0.1#7913 +ipset=/.888poker.com/gfwlist +server=/.boomssr.com/127.0.0.1#7913 +ipset=/.boomssr.com/gfwlist server=/.twister.net.co/127.0.0.1#7913 ipset=/.twister.net.co/gfwlist server=/.hudson.org/127.0.0.1#7913 ipset=/.hudson.org/gfwlist -server=/.enlighten.org.tw/127.0.0.1#7913 -ipset=/.enlighten.org.tw/gfwlist +server=/.jingsim.org/127.0.0.1#7913 +ipset=/.jingsim.org/gfwlist server=/.apkplz.com/127.0.0.1#7913 ipset=/.apkplz.com/gfwlist -server=/.888poker.com/127.0.0.1#7913 -ipset=/.888poker.com/gfwlist -server=/.google.tm/127.0.0.1#7913 -ipset=/.google.tm/gfwlist -server=/.foxtang.com/127.0.0.1#7913 -ipset=/.foxtang.com/gfwlist -server=/.newtalk.tw/127.0.0.1#7913 -ipset=/.newtalk.tw/gfwlist +server=/.4irc.com/127.0.0.1#7913 +ipset=/.4irc.com/gfwlist +server=/.godsdirectcontact.co.uk/127.0.0.1#7913 +ipset=/.godsdirectcontact.co.uk/gfwlist +server=/.nextmag.com.tw/127.0.0.1#7913 +ipset=/.nextmag.com.tw/gfwlist +server=/.next11.co.jp/127.0.0.1#7913 +ipset=/.next11.co.jp/gfwlist server=/.braumeister.org/127.0.0.1#7913 ipset=/.braumeister.org/gfwlist server=/.huaxin.ph/127.0.0.1#7913 ipset=/.huaxin.ph/gfwlist -server=/.spotify.com/127.0.0.1#7913 -ipset=/.spotify.com/gfwlist -server=/.futuremessage.org/127.0.0.1#7913 -ipset=/.futuremessage.org/gfwlist +server=/.organiccrap.com/127.0.0.1#7913 +ipset=/.organiccrap.com/gfwlist +server=/.itasoftware.com/127.0.0.1#7913 +ipset=/.itasoftware.com/gfwlist server=/.tweetcs.com/127.0.0.1#7913 ipset=/.tweetcs.com/gfwlist server=/.decodet.co/127.0.0.1#7913 @@ -9758,8 +9748,8 @@ server=/.zillionk.com/127.0.0.1#7913 ipset=/.zillionk.com/gfwlist server=/.pinkrod.com/127.0.0.1#7913 ipset=/.pinkrod.com/gfwlist -server=/.backchina.com/127.0.0.1#7913 -ipset=/.backchina.com/gfwlist +server=/.newstarnet.com/127.0.0.1#7913 +ipset=/.newstarnet.com/gfwlist server=/.istars.co.nz/127.0.0.1#7913 ipset=/.istars.co.nz/gfwlist server=/.dpp.org.tw/127.0.0.1#7913 @@ -9768,50 +9758,50 @@ server=/.yangjianli.com/127.0.0.1#7913 ipset=/.yangjianli.com/gfwlist server=/.vpnbook.com/127.0.0.1#7913 ipset=/.vpnbook.com/gfwlist -server=/.alabout.com/127.0.0.1#7913 -ipset=/.alabout.com/gfwlist -server=/.allowed.org/127.0.0.1#7913 -ipset=/.allowed.org/gfwlist -server=/.freechinaforum.org/127.0.0.1#7913 -ipset=/.freechinaforum.org/gfwlist server=/.mefound.com/127.0.0.1#7913 ipset=/.mefound.com/gfwlist +server=/.zhao.1984.city/127.0.0.1#7913 +ipset=/.zhao.1984.city/gfwlist +server=/.freechinaforum.org/127.0.0.1#7913 +ipset=/.freechinaforum.org/gfwlist +server=/.newnews.ca/127.0.0.1#7913 +ipset=/.newnews.ca/gfwlist server=/.comparitech.com/127.0.0.1#7913 ipset=/.comparitech.com/gfwlist server=/.tibetanaidproject.org/127.0.0.1#7913 ipset=/.tibetanaidproject.org/gfwlist -server=/.slyip.net/127.0.0.1#7913 -ipset=/.slyip.net/gfwlist -server=/.juyuange.org/127.0.0.1#7913 -ipset=/.juyuange.org/gfwlist -server=/.hecaitou.net/127.0.0.1#7913 -ipset=/.hecaitou.net/gfwlist +server=/.ndr.de/127.0.0.1#7913 +ipset=/.ndr.de/gfwlist +server=/.questvisual.com/127.0.0.1#7913 +ipset=/.questvisual.com/gfwlist +server=/.steamcommunity.com/127.0.0.1#7913 +ipset=/.steamcommunity.com/gfwlist server=/.americanunfinished.com/127.0.0.1#7913 ipset=/.americanunfinished.com/gfwlist -server=/.lockestek.com/127.0.0.1#7913 -ipset=/.lockestek.com/gfwlist -server=/.navyfamily.navy.mil/127.0.0.1#7913 -ipset=/.navyfamily.navy.mil/gfwlist +server=/.oikos.com.tw/127.0.0.1#7913 +ipset=/.oikos.com.tw/gfwlist +server=/.avmoo.com/127.0.0.1#7913 +ipset=/.avmoo.com/gfwlist server=/.mo.nightlife141.com/127.0.0.1#7913 ipset=/.mo.nightlife141.com/gfwlist server=/.muchosucko.com/127.0.0.1#7913 ipset=/.muchosucko.com/gfwlist -server=/.crwdcntrl.net/127.0.0.1#7913 -ipset=/.crwdcntrl.net/gfwlist -server=/.questvisual.com/127.0.0.1#7913 -ipset=/.questvisual.com/gfwlist -server=/.ghostpath.com/127.0.0.1#7913 -ipset=/.ghostpath.com/gfwlist -server=/.avmoo.com/127.0.0.1#7913 -ipset=/.avmoo.com/gfwlist -server=/.laptoplockdown.com/127.0.0.1#7913 -ipset=/.laptoplockdown.com/gfwlist +server=/.blip.tv/127.0.0.1#7913 +ipset=/.blip.tv/gfwlist +server=/.nko.navy.mil/127.0.0.1#7913 +ipset=/.nko.navy.mil/gfwlist +server=/.earlytibet.com/127.0.0.1#7913 +ipset=/.earlytibet.com/gfwlist server=/.line.naver.jp/127.0.0.1#7913 ipset=/.line.naver.jp/gfwlist +server=/.laptoplockdown.com/127.0.0.1#7913 +ipset=/.laptoplockdown.com/gfwlist +server=/.memorybbs.com/127.0.0.1#7913 +ipset=/.memorybbs.com/gfwlist server=/.briefdream.com/127.0.0.1#7913 ipset=/.briefdream.com/gfwlist -server=/.chubold.com/127.0.0.1#7913 -ipset=/.chubold.com/gfwlist +server=/.etaa.org.au/127.0.0.1#7913 +ipset=/.etaa.org.au/gfwlist server=/.nat.moe/127.0.0.1#7913 ipset=/.nat.moe/gfwlist server=/.uighur.narod.ru/127.0.0.1#7913 @@ -9820,46 +9810,46 @@ server=/.gigporno.ru/127.0.0.1#7913 ipset=/.gigporno.ru/gfwlist server=/.heavy-r.com/127.0.0.1#7913 ipset=/.heavy-r.com/gfwlist -server=/.earlytibet.com/127.0.0.1#7913 -ipset=/.earlytibet.com/gfwlist server=/.naol.cc/127.0.0.1#7913 ipset=/.naol.cc/gfwlist -server=/.naol.ca/127.0.0.1#7913 -ipset=/.naol.ca/gfwlist server=/.solarsystem.nasa.gov/127.0.0.1#7913 ipset=/.solarsystem.nasa.gov/gfwlist +server=/.googlechinawebmaster.com/127.0.0.1#7913 +ipset=/.googlechinawebmaster.com/gfwlist +server=/.superpages.com/127.0.0.1#7913 +ipset=/.superpages.com/gfwlist server=/.hacg.li/127.0.0.1#7913 ipset=/.hacg.li/gfwlist -server=/.mypop3.net/127.0.0.1#7913 -ipset=/.mypop3.net/gfwlist +server=/.freemorenews.com/127.0.0.1#7913 +ipset=/.freemorenews.com/gfwlist server=/.news.tvb.com/127.0.0.1#7913 ipset=/.news.tvb.com/gfwlist server=/.myspacecdn.com/127.0.0.1#7913 ipset=/.myspacecdn.com/gfwlist server=/.dronedj.com/127.0.0.1#7913 ipset=/.dronedj.com/gfwlist -server=/.mysinablog.com/127.0.0.1#7913 -ipset=/.mysinablog.com/gfwlist +server=/.mymom.info/127.0.0.1#7913 +ipset=/.mymom.info/gfwlist server=/.onedumb.com/127.0.0.1#7913 ipset=/.onedumb.com/gfwlist server=/.search.aol.com/127.0.0.1#7913 ipset=/.search.aol.com/gfwlist -server=/.chinacomments.org/127.0.0.1#7913 -ipset=/.chinacomments.org/gfwlist +server=/.mypopescu.com/127.0.0.1#7913 +ipset=/.mypopescu.com/gfwlist server=/.vpncup.com/127.0.0.1#7913 ipset=/.vpncup.com/gfwlist server=/.pagodabox.com/127.0.0.1#7913 ipset=/.pagodabox.com/gfwlist -server=/.mymom.info/127.0.0.1#7913 -ipset=/.mymom.info/gfwlist +server=/.zhao.jinhai.de/127.0.0.1#7913 +ipset=/.zhao.jinhai.de/gfwlist server=/.turbobit.net/127.0.0.1#7913 ipset=/.turbobit.net/gfwlist server=/.ithelp.ithome.com.tw/127.0.0.1#7913 ipset=/.ithelp.ithome.com.tw/gfwlist server=/.dnsrd.com/127.0.0.1#7913 ipset=/.dnsrd.com/gfwlist -server=/.mychinanews.com/127.0.0.1#7913 -ipset=/.mychinanews.com/gfwlist +server=/.bbnradio.org/127.0.0.1#7913 +ipset=/.bbnradio.org/gfwlist server=/.emaga.com/127.0.0.1#7913 ipset=/.emaga.com/gfwlist server=/.tibetanyouthcongress.org/127.0.0.1#7913 @@ -9870,28 +9860,28 @@ server=/.24hrs.ca/127.0.0.1#7913 ipset=/.24hrs.ca/gfwlist server=/.gts-vpn.com/127.0.0.1#7913 ipset=/.gts-vpn.com/gfwlist -server=/.tibetlibre.free.fr/127.0.0.1#7913 -ipset=/.tibetlibre.free.fr/gfwlist server=/.hacg.club/127.0.0.1#7913 ipset=/.hacg.club/gfwlist -server=/.my-proxy.com/127.0.0.1#7913 -ipset=/.my-proxy.com/gfwlist +server=/.api-secure.recaptcha.net/127.0.0.1#7913 +ipset=/.api-secure.recaptcha.net/gfwlist +server=/.engagedaily.org/127.0.0.1#7913 +ipset=/.engagedaily.org/gfwlist server=/.tweets.seraph.me/127.0.0.1#7913 ipset=/.tweets.seraph.me/gfwlist server=/.avcool.com/127.0.0.1#7913 ipset=/.avcool.com/gfwlist -server=/.api-secure.recaptcha.net/127.0.0.1#7913 -ipset=/.api-secure.recaptcha.net/gfwlist -server=/.adpl.org.hk/127.0.0.1#7913 -ipset=/.adpl.org.hk/gfwlist +server=/.googlesyndication.com/127.0.0.1#7913 +ipset=/.googlesyndication.com/gfwlist +server=/.christusrex.org/127.0.0.1#7913 +ipset=/.christusrex.org/gfwlist +server=/.ifan.cz.cc/127.0.0.1#7913 +ipset=/.ifan.cz.cc/gfwlist server=/.my-formosa.com/127.0.0.1#7913 ipset=/.my-formosa.com/gfwlist -server=/.engagedaily.org/127.0.0.1#7913 -ipset=/.engagedaily.org/gfwlist server=/.qz.com/127.0.0.1#7913 ipset=/.qz.com/gfwlist -server=/.rebatesrule.net/127.0.0.1#7913 -ipset=/.rebatesrule.net/gfwlist +server=/.falungong.club/127.0.0.1#7913 +ipset=/.falungong.club/gfwlist server=/.karkhung.com/127.0.0.1#7913 ipset=/.karkhung.com/gfwlist server=/.abematv.akamaized.net/127.0.0.1#7913 @@ -9900,40 +9890,40 @@ server=/.huobi.com/127.0.0.1#7913 ipset=/.huobi.com/gfwlist server=/.peacefire.org/127.0.0.1#7913 ipset=/.peacefire.org/gfwlist -server=/.googlesyndication.com/127.0.0.1#7913 -ipset=/.googlesyndication.com/gfwlist -server=/.epochhk.com/127.0.0.1#7913 -ipset=/.epochhk.com/gfwlist server=/.muslimvideo.com/127.0.0.1#7913 ipset=/.muslimvideo.com/gfwlist -server=/.gjczz.com/127.0.0.1#7913 -ipset=/.gjczz.com/gfwlist -server=/.1dumb.com/127.0.0.1#7913 -ipset=/.1dumb.com/gfwlist -server=/.tw.bid.yahoo.com/127.0.0.1#7913 -ipset=/.tw.bid.yahoo.com/gfwlist -server=/.edubridge.com/127.0.0.1#7913 -ipset=/.edubridge.com/gfwlist -server=/.etaa.org.au/127.0.0.1#7913 -ipset=/.etaa.org.au/gfwlist server=/.behance.net/127.0.0.1#7913 ipset=/.behance.net/gfwlist -server=/.erodoujinlog.com/127.0.0.1#7913 -ipset=/.erodoujinlog.com/gfwlist -server=/.mswe1.org/127.0.0.1#7913 -ipset=/.mswe1.org/gfwlist -server=/.dnssec.net/127.0.0.1#7913 -ipset=/.dnssec.net/gfwlist -server=/.dizhidizhi.com/127.0.0.1#7913 -ipset=/.dizhidizhi.com/gfwlist +server=/.multiproxy.org/127.0.0.1#7913 +ipset=/.multiproxy.org/gfwlist +server=/.gjczz.com/127.0.0.1#7913 +ipset=/.gjczz.com/gfwlist +server=/.edubridge.com/127.0.0.1#7913 +ipset=/.edubridge.com/gfwlist +server=/.gifree.com/127.0.0.1#7913 +ipset=/.gifree.com/gfwlist +server=/.atnext.com/127.0.0.1#7913 +ipset=/.atnext.com/gfwlist +server=/.dlyoutube.com/127.0.0.1#7913 +ipset=/.dlyoutube.com/gfwlist +server=/.3boys2girls.com/127.0.0.1#7913 +ipset=/.3boys2girls.com/gfwlist +server=/.great-roc.org/127.0.0.1#7913 +ipset=/.great-roc.org/gfwlist +server=/.iyouport.com/127.0.0.1#7913 +ipset=/.iyouport.com/gfwlist +server=/.funkyimg.com/127.0.0.1#7913 +ipset=/.funkyimg.com/gfwlist +server=/.9bis.com/127.0.0.1#7913 +ipset=/.9bis.com/gfwlist server=/.anysex.com/127.0.0.1#7913 ipset=/.anysex.com/gfwlist server=/.tuo8.red/127.0.0.1#7913 ipset=/.tuo8.red/gfwlist server=/.mp3buscador.com/127.0.0.1#7913 ipset=/.mp3buscador.com/gfwlist -server=/.greenreadings.com/127.0.0.1#7913 -ipset=/.greenreadings.com/gfwlist +server=/.daiphapinfo.net/127.0.0.1#7913 +ipset=/.daiphapinfo.net/gfwlist server=/.movements.org/127.0.0.1#7913 ipset=/.movements.org/gfwlist server=/.dwnews.net/127.0.0.1#7913 @@ -9942,76 +9932,76 @@ server=/.mousebreaker.com/127.0.0.1#7913 ipset=/.mousebreaker.com/gfwlist server=/.jihadology.net/127.0.0.1#7913 ipset=/.jihadology.net/gfwlist -server=/.funkyimg.com/127.0.0.1#7913 -ipset=/.funkyimg.com/gfwlist -server=/.moroneta.com/127.0.0.1#7913 -ipset=/.moroneta.com/gfwlist -server=/.barenakedislam.com/127.0.0.1#7913 -ipset=/.barenakedislam.com/gfwlist +server=/.4pu.com/127.0.0.1#7913 +ipset=/.4pu.com/gfwlist +server=/.filthdump.com/127.0.0.1#7913 +ipset=/.filthdump.com/gfwlist server=/.c1522.mooo.com/127.0.0.1#7913 ipset=/.c1522.mooo.com/gfwlist -server=/.falun-ny.net/127.0.0.1#7913 -ipset=/.falun-ny.net/gfwlist +server=/.bithumb.com/127.0.0.1#7913 +ipset=/.bithumb.com/gfwlist +server=/.dailyview.tw/127.0.0.1#7913 +ipset=/.dailyview.tw/gfwlist server=/.wego.here.com/127.0.0.1#7913 ipset=/.wego.here.com/gfwlist server=/.myparagliding.com/127.0.0.1#7913 ipset=/.myparagliding.com/gfwlist server=/.exploader.net/127.0.0.1#7913 ipset=/.exploader.net/gfwlist -server=/.monocloud.me/127.0.0.1#7913 -ipset=/.monocloud.me/gfwlist -server=/.4pu.com/127.0.0.1#7913 -ipset=/.4pu.com/gfwlist +server=/.gcc.org.hk/127.0.0.1#7913 +ipset=/.gcc.org.hk/gfwlist +server=/.hoxx.com/127.0.0.1#7913 +ipset=/.hoxx.com/gfwlist server=/.mihk.hk/127.0.0.1#7913 ipset=/.mihk.hk/gfwlist -server=/.beijingzx.org/127.0.0.1#7913 -ipset=/.beijingzx.org/gfwlist -server=/.mog.com/127.0.0.1#7913 -ipset=/.mog.com/gfwlist -server=/.dailyview.tw/127.0.0.1#7913 -ipset=/.dailyview.tw/gfwlist -server=/.now.im/127.0.0.1#7913 -ipset=/.now.im/gfwlist -server=/.mobile01.com/127.0.0.1#7913 -ipset=/.mobile01.com/gfwlist -server=/.in-disguise.com/127.0.0.1#7913 -ipset=/.in-disguise.com/gfwlist +server=/.monocloud.me/127.0.0.1#7913 +ipset=/.monocloud.me/gfwlist server=/.cristyli.com/127.0.0.1#7913 ipset=/.cristyli.com/gfwlist -server=/.imgchili.net/127.0.0.1#7913 -ipset=/.imgchili.net/gfwlist -server=/.mmaaxx.com/127.0.0.1#7913 -ipset=/.mmaaxx.com/gfwlist -server=/.nyaa.si/127.0.0.1#7913 -ipset=/.nyaa.si/gfwlist +server=/.hideipvpn.com/127.0.0.1#7913 +ipset=/.hideipvpn.com/gfwlist server=/.corumcollege.com/127.0.0.1#7913 ipset=/.corumcollege.com/gfwlist -server=/.mlcool.com/127.0.0.1#7913 -ipset=/.mlcool.com/gfwlist +server=/.backpackers.com.tw/127.0.0.1#7913 +ipset=/.backpackers.com.tw/gfwlist +server=/.in-disguise.com/127.0.0.1#7913 +ipset=/.in-disguise.com/gfwlist +server=/.mobile01.com/127.0.0.1#7913 +ipset=/.mobile01.com/gfwlist +server=/.mmaaxx.com/127.0.0.1#7913 +ipset=/.mmaaxx.com/gfwlist +server=/.mixx.com/127.0.0.1#7913 +ipset=/.mixx.com/gfwlist +server=/.nyaa.si/127.0.0.1#7913 +ipset=/.nyaa.si/gfwlist +server=/.faiththedog.info/127.0.0.1#7913 +ipset=/.faiththedog.info/gfwlist +server=/.freeviewmovies.com/127.0.0.1#7913 +ipset=/.freeviewmovies.com/gfwlist server=/.tycool.com/127.0.0.1#7913 ipset=/.tycool.com/gfwlist server=/.eisbb.com/127.0.0.1#7913 ipset=/.eisbb.com/gfwlist -server=/.mixpod.com/127.0.0.1#7913 -ipset=/.mixpod.com/gfwlist -server=/.chinman.net/127.0.0.1#7913 -ipset=/.chinman.net/gfwlist -server=/.faiththedog.info/127.0.0.1#7913 -ipset=/.faiththedog.info/gfwlist -server=/.twblogger.com/127.0.0.1#7913 -ipset=/.twblogger.com/gfwlist -server=/.minzhuzhanxian.com/127.0.0.1#7913 -ipset=/.minzhuzhanxian.com/gfwlist server=/.ministrybooks.org/127.0.0.1#7913 ipset=/.ministrybooks.org/gfwlist -server=/.calgarychinese.com/127.0.0.1#7913 -ipset=/.calgarychinese.com/gfwlist -server=/.jpopforum.net/127.0.0.1#7913 -ipset=/.jpopforum.net/gfwlist server=/.minhhue.net/127.0.0.1#7913 ipset=/.minhhue.net/gfwlist server=/.mingshengbao.com/127.0.0.1#7913 ipset=/.mingshengbao.com/gfwlist +server=/.twblogger.com/127.0.0.1#7913 +ipset=/.twblogger.com/gfwlist +server=/.chinapost.com.tw/127.0.0.1#7913 +ipset=/.chinapost.com.tw/gfwlist +server=/.hougaige.com/127.0.0.1#7913 +ipset=/.hougaige.com/gfwlist +server=/.calgarychinese.com/127.0.0.1#7913 +ipset=/.calgarychinese.com/gfwlist +server=/.jpopforum.net/127.0.0.1#7913 +ipset=/.jpopforum.net/gfwlist +server=/.mingpao.com/127.0.0.1#7913 +ipset=/.mingpao.com/gfwlist +server=/.mingjingtimes.com/127.0.0.1#7913 +ipset=/.mingjingtimes.com/gfwlist server=/.vpnaccounts.com/127.0.0.1#7913 ipset=/.vpnaccounts.com/gfwlist server=/.mihua.org/127.0.0.1#7913 @@ -10022,26 +10012,26 @@ server=/.englishpen.org/127.0.0.1#7913 ipset=/.englishpen.org/gfwlist server=/.teachparentstech.org/127.0.0.1#7913 ipset=/.teachparentstech.org/gfwlist -server=/.mingpaony.com/127.0.0.1#7913 -ipset=/.mingpaony.com/gfwlist -server=/.mergersandinquisitions.org/127.0.0.1#7913 -ipset=/.mergersandinquisitions.org/gfwlist -server=/.mingpao.com/127.0.0.1#7913 -ipset=/.mingpao.com/gfwlist -server=/.entnt.com/127.0.0.1#7913 -ipset=/.entnt.com/gfwlist -server=/.mingjinglishi.com/127.0.0.1#7913 -ipset=/.mingjinglishi.com/gfwlist -server=/.onmypc.us/127.0.0.1#7913 -ipset=/.onmypc.us/gfwlist -server=/.chinapost.com.tw/127.0.0.1#7913 -ipset=/.chinapost.com.tw/gfwlist -server=/.hougaige.com/127.0.0.1#7913 -ipset=/.hougaige.com/gfwlist server=/.minghui.or.kr/127.0.0.1#7913 ipset=/.minghui.or.kr/gfwlist +server=/.mergersandinquisitions.org/127.0.0.1#7913 +ipset=/.mergersandinquisitions.org/gfwlist server=/.mindrolling.org/127.0.0.1#7913 ipset=/.mindrolling.org/gfwlist +server=/.entnt.com/127.0.0.1#7913 +ipset=/.entnt.com/gfwlist +server=/.now.im/127.0.0.1#7913 +ipset=/.now.im/gfwlist +server=/.onmypc.us/127.0.0.1#7913 +ipset=/.onmypc.us/gfwlist +server=/.eastturkestan.com/127.0.0.1#7913 +ipset=/.eastturkestan.com/gfwlist +server=/.middle-way.net/127.0.0.1#7913 +ipset=/.middle-way.net/gfwlist +server=/.bbs.mikocon.com/127.0.0.1#7913 +ipset=/.bbs.mikocon.com/gfwlist +server=/.michaelanti.com/127.0.0.1#7913 +ipset=/.michaelanti.com/gfwlist server=/.mercyprophet.org/127.0.0.1#7913 ipset=/.mercyprophet.org/gfwlist server=/.sunwinism.joinbbs.net/127.0.0.1#7913 @@ -10052,62 +10042,62 @@ server=/.duihua.org/127.0.0.1#7913 ipset=/.duihua.org/gfwlist server=/.cuihua.org/127.0.0.1#7913 ipset=/.cuihua.org/gfwlist -server=/.ipalter.com/127.0.0.1#7913 -ipset=/.ipalter.com/gfwlist -server=/.middle-way.net/127.0.0.1#7913 -ipset=/.middle-way.net/gfwlist -server=/.asg.to/127.0.0.1#7913 -ipset=/.asg.to/gfwlist -server=/.bbs.mikocon.com/127.0.0.1#7913 -ipset=/.bbs.mikocon.com/gfwlist -server=/.dalailamaquotes.org/127.0.0.1#7913 -ipset=/.dalailamaquotes.org/gfwlist -server=/.amoiist.com/127.0.0.1#7913 -ipset=/.amoiist.com/gfwlist -server=/.wiki.moegirl.org/127.0.0.1#7913 -ipset=/.wiki.moegirl.org/gfwlist -server=/.michaelanti.com/127.0.0.1#7913 -ipset=/.michaelanti.com/gfwlist server=/.mhradio.org/127.0.0.1#7913 ipset=/.mhradio.org/gfwlist -server=/.itsky.it/127.0.0.1#7913 -ipset=/.itsky.it/gfwlist -server=/.chhongbi.org/127.0.0.1#7913 -ipset=/.chhongbi.org/gfwlist -server=/.metacafe.com/127.0.0.1#7913 -ipset=/.metacafe.com/gfwlist -server=/.tw.yahoo.com/127.0.0.1#7913 -ipset=/.tw.yahoo.com/gfwlist -server=/.meripet.biz/127.0.0.1#7913 -ipset=/.meripet.biz/gfwlist +server=/.foxtang.com/127.0.0.1#7913 +ipset=/.foxtang.com/gfwlist +server=/.asg.to/127.0.0.1#7913 +ipset=/.asg.to/gfwlist +server=/.google.vu/127.0.0.1#7913 +ipset=/.google.vu/gfwlist +server=/.dotsub.com/127.0.0.1#7913 +ipset=/.dotsub.com/gfwlist +server=/.googlemashups.com/127.0.0.1#7913 +ipset=/.googlemashups.com/gfwlist +server=/.wiki.moegirl.org/127.0.0.1#7913 +ipset=/.wiki.moegirl.org/gfwlist server=/.bbg.gov/127.0.0.1#7913 ipset=/.bbg.gov/gfwlist -server=/.memri.org/127.0.0.1#7913 -ipset=/.memri.org/gfwlist -server=/.kawaiikawaii.jp/127.0.0.1#7913 -ipset=/.kawaiikawaii.jp/gfwlist -server=/.olympicwatch.org/127.0.0.1#7913 -ipset=/.olympicwatch.org/gfwlist -server=/.memorybbs.com/127.0.0.1#7913 -ipset=/.memorybbs.com/gfwlist -server=/.webmproject.org/127.0.0.1#7913 -ipset=/.webmproject.org/gfwlist +server=/.meteorshowersonline.com/127.0.0.1#7913 +ipset=/.meteorshowersonline.com/gfwlist +server=/.metacafe.com/127.0.0.1#7913 +ipset=/.metacafe.com/gfwlist +server=/.chhongbi.org/127.0.0.1#7913 +ipset=/.chhongbi.org/gfwlist +server=/.meshrep.com/127.0.0.1#7913 +ipset=/.meshrep.com/gfwlist server=/.meirixiaochao.com/127.0.0.1#7913 ipset=/.meirixiaochao.com/gfwlist -server=/.megavideo.com/127.0.0.1#7913 -ipset=/.megavideo.com/gfwlist -server=/.crd-net.org/127.0.0.1#7913 -ipset=/.crd-net.org/gfwlist server=/.ns3.name/127.0.0.1#7913 ipset=/.ns3.name/gfwlist server=/.google.is/127.0.0.1#7913 ipset=/.google.is/gfwlist +server=/.unseen.is/127.0.0.1#7913 +ipset=/.unseen.is/gfwlist +server=/.kawaiikawaii.jp/127.0.0.1#7913 +ipset=/.kawaiikawaii.jp/gfwlist +server=/.olympicwatch.org/127.0.0.1#7913 +ipset=/.olympicwatch.org/gfwlist +server=/.megavideo.com/127.0.0.1#7913 +ipset=/.megavideo.com/gfwlist +server=/.webmproject.org/127.0.0.1#7913 +ipset=/.webmproject.org/gfwlist server=/.nflxvideo.net/127.0.0.1#7913 ipset=/.nflxvideo.net/gfwlist server=/.bic2011.org/127.0.0.1#7913 ipset=/.bic2011.org/gfwlist -server=/.huaren4us.com/127.0.0.1#7913 -ipset=/.huaren4us.com/gfwlist +server=/.crd-net.org/127.0.0.1#7913 +ipset=/.crd-net.org/gfwlist +server=/.megaproxy.com/127.0.0.1#7913 +ipset=/.megaproxy.com/gfwlist +server=/.meansys.com/127.0.0.1#7913 +ipset=/.meansys.com/gfwlist +server=/.mcaf.ee/127.0.0.1#7913 +ipset=/.mcaf.ee/gfwlist +server=/.chinafreepress.org/127.0.0.1#7913 +ipset=/.chinafreepress.org/gfwlist +server=/.dish.com/127.0.0.1#7913 +ipset=/.dish.com/gfwlist server=/.thehousenews.com/127.0.0.1#7913 ipset=/.thehousenews.com/gfwlist server=/.jav68.tv/127.0.0.1#7913 @@ -10124,30 +10114,30 @@ server=/.mathable.io/127.0.0.1#7913 ipset=/.mathable.io/gfwlist server=/.marxists.org/127.0.0.1#7913 ipset=/.marxists.org/gfwlist -server=/.marxist.com/127.0.0.1#7913 -ipset=/.marxist.com/gfwlist +server=/.kagyu.org.za/127.0.0.1#7913 +ipset=/.kagyu.org.za/gfwlist server=/.theinitium.com/127.0.0.1#7913 ipset=/.theinitium.com/gfwlist server=/.blog.expofutures.com/127.0.0.1#7913 ipset=/.blog.expofutures.com/gfwlist -server=/.civicparty.hk/127.0.0.1#7913 -ipset=/.civicparty.hk/gfwlist -server=/.twimg.com/127.0.0.1#7913 -ipset=/.twimg.com/gfwlist +server=/.martsangkagyuofficial.org/127.0.0.1#7913 +ipset=/.martsangkagyuofficial.org/gfwlist +server=/.disconnect.me/127.0.0.1#7913 +ipset=/.disconnect.me/gfwlist server=/.cineastentreff.de/127.0.0.1#7913 ipset=/.cineastentreff.de/gfwlist server=/.mansion.com/127.0.0.1#7913 ipset=/.mansion.com/gfwlist -server=/.enanyang.my/127.0.0.1#7913 -ipset=/.enanyang.my/gfwlist server=/.maniash.com/127.0.0.1#7913 ipset=/.maniash.com/gfwlist +server=/.bjs.org/127.0.0.1#7913 +ipset=/.bjs.org/gfwlist server=/.welovecock.com/127.0.0.1#7913 ipset=/.welovecock.com/gfwlist server=/.international-news.newsmagazine.asia/127.0.0.1#7913 ipset=/.international-news.newsmagazine.asia/gfwlist -server=/.dotsub.com/127.0.0.1#7913 -ipset=/.dotsub.com/gfwlist +server=/.boxun.tv/127.0.0.1#7913 +ipset=/.boxun.tv/gfwlist server=/.e-info.org.tw/127.0.0.1#7913 ipset=/.e-info.org.tw/gfwlist server=/.marguerite.su/127.0.0.1#7913 @@ -10156,14 +10146,14 @@ server=/.getchu.com/127.0.0.1#7913 ipset=/.getchu.com/gfwlist server=/.appsocks.net/127.0.0.1#7913 ipset=/.appsocks.net/gfwlist +server=/.marc.info/127.0.0.1#7913 +ipset=/.marc.info/gfwlist server=/.maplew.com/127.0.0.1#7913 ipset=/.maplew.com/gfwlist +server=/.apigee.com/127.0.0.1#7913 +ipset=/.apigee.com/gfwlist server=/.makkahnewspaper.com/127.0.0.1#7913 ipset=/.makkahnewspaper.com/gfwlist -server=/.madthumbs.com/127.0.0.1#7913 -ipset=/.madthumbs.com/gfwlist -server=/.madrau.com/127.0.0.1#7913 -ipset=/.madrau.com/gfwlist server=/.sowers.org.hk/127.0.0.1#7913 ipset=/.sowers.org.hk/gfwlist server=/.clearharmony.net/127.0.0.1#7913 @@ -10172,100 +10162,100 @@ server=/.authorizeddns.us/127.0.0.1#7913 ipset=/.authorizeddns.us/gfwlist server=/.kendatire.com/127.0.0.1#7913 ipset=/.kendatire.com/gfwlist -server=/.lupm.org/127.0.0.1#7913 -ipset=/.lupm.org/gfwlist +server=/.madrau.com/127.0.0.1#7913 +ipset=/.madrau.com/gfwlist server=/.scache2.vzw.com/127.0.0.1#7913 ipset=/.scache2.vzw.com/gfwlist server=/.multiply.com/127.0.0.1#7913 ipset=/.multiply.com/gfwlist +server=/.i1.hk/127.0.0.1#7913 +ipset=/.i1.hk/gfwlist +server=/.lupm.org/127.0.0.1#7913 +ipset=/.lupm.org/gfwlist server=/.lsmradio.com/127.0.0.1#7913 ipset=/.lsmradio.com/gfwlist -server=/.lsmkorean.org/127.0.0.1#7913 -ipset=/.lsmkorean.org/gfwlist -server=/.lsforum.net/127.0.0.1#7913 -ipset=/.lsforum.net/gfwlist server=/.yourtrap.com/127.0.0.1#7913 ipset=/.yourtrap.com/gfwlist server=/.freewebs.com/127.0.0.1#7913 ipset=/.freewebs.com/gfwlist -server=/.looktoronto.com/127.0.0.1#7913 -ipset=/.looktoronto.com/gfwlist -server=/.shiksha.com/127.0.0.1#7913 -ipset=/.shiksha.com/gfwlist +server=/.lsmkorean.org/127.0.0.1#7913 +ipset=/.lsmkorean.org/gfwlist +server=/.lsforum.net/127.0.0.1#7913 +ipset=/.lsforum.net/gfwlist server=/.gmozomg.izihost.org/127.0.0.1#7913 ipset=/.gmozomg.izihost.org/gfwlist server=/.eromanga-kingdom.com/127.0.0.1#7913 ipset=/.eromanga-kingdom.com/gfwlist server=/.nudezz.com/127.0.0.1#7913 ipset=/.nudezz.com/gfwlist -server=/.secure.logmein.com/127.0.0.1#7913 -ipset=/.secure.logmein.com/gfwlist -server=/.yt.be/127.0.0.1#7913 -ipset=/.yt.be/gfwlist +server=/.epochhk.com/127.0.0.1#7913 +ipset=/.epochhk.com/gfwlist +server=/.lrip.org/127.0.0.1#7913 +ipset=/.lrip.org/gfwlist server=/.cactusvpn.com/127.0.0.1#7913 ipset=/.cactusvpn.com/gfwlist server=/.google.gl/127.0.0.1#7913 ipset=/.google.gl/gfwlist -server=/.erepublik.com/127.0.0.1#7913 -ipset=/.erepublik.com/gfwlist +server=/.google.am/127.0.0.1#7913 +ipset=/.google.am/gfwlist server=/.mqxd.org/127.0.0.1#7913 ipset=/.mqxd.org/gfwlist -server=/.artstation.com/127.0.0.1#7913 -ipset=/.artstation.com/gfwlist +server=/.looktoronto.com/127.0.0.1#7913 +ipset=/.looktoronto.com/gfwlist server=/.blogcity.me/127.0.0.1#7913 ipset=/.blogcity.me/gfwlist -server=/.18onlygirls.com/127.0.0.1#7913 -ipset=/.18onlygirls.com/gfwlist -server=/.lkcn.net/127.0.0.1#7913 -ipset=/.lkcn.net/gfwlist -server=/.ddhw.info/127.0.0.1#7913 -ipset=/.ddhw.info/gfwlist -server=/.ettoday.net/127.0.0.1#7913 -ipset=/.ettoday.net/gfwlist +server=/.yt.be/127.0.0.1#7913 +ipset=/.yt.be/gfwlist +server=/.jex.com/127.0.0.1#7913 +ipset=/.jex.com/gfwlist +server=/.erepublik.com/127.0.0.1#7913 +ipset=/.erepublik.com/gfwlist +server=/.artstation.com/127.0.0.1#7913 +ipset=/.artstation.com/gfwlist server=/.neverforget8964.org/127.0.0.1#7913 ipset=/.neverforget8964.org/gfwlist server=/.howtoforge.com/127.0.0.1#7913 ipset=/.howtoforge.com/gfwlist server=/.jav2be.com/127.0.0.1#7913 ipset=/.jav2be.com/gfwlist -server=/.mjlsh.usc.cuhk.edu.hk/127.0.0.1#7913 -ipset=/.mjlsh.usc.cuhk.edu.hk/gfwlist +server=/.secure.logmein.com/127.0.0.1#7913 +ipset=/.secure.logmein.com/gfwlist server=/.cdn.assets.lfpcontent.com/127.0.0.1#7913 ipset=/.cdn.assets.lfpcontent.com/gfwlist server=/.legalporno.com/127.0.0.1#7913 ipset=/.legalporno.com/gfwlist -server=/.fangong.org/127.0.0.1#7913 -ipset=/.fangong.org/gfwlist -server=/.liudejun.com/127.0.0.1#7913 -ipset=/.liudejun.com/gfwlist -server=/.culture.tw/127.0.0.1#7913 -ipset=/.culture.tw/gfwlist +server=/.ddhw.info/127.0.0.1#7913 +ipset=/.ddhw.info/gfwlist +server=/.lkcn.net/127.0.0.1#7913 +ipset=/.lkcn.net/gfwlist +server=/.coolstuffinc.com/127.0.0.1#7913 +ipset=/.coolstuffinc.com/gfwlist server=/.eucasino.com/127.0.0.1#7913 ipset=/.eucasino.com/gfwlist -server=/.buffered.com/127.0.0.1#7913 -ipset=/.buffered.com/gfwlist -server=/.blog.cnyes.com/127.0.0.1#7913 -ipset=/.blog.cnyes.com/gfwlist +server=/.ettoday.net/127.0.0.1#7913 +ipset=/.ettoday.net/gfwlist +server=/.culture.tw/127.0.0.1#7913 +ipset=/.culture.tw/gfwlist server=/.faqserv.com/127.0.0.1#7913 ipset=/.faqserv.com/gfwlist -server=/.classicalguitarblog.net/127.0.0.1#7913 -ipset=/.classicalguitarblog.net/gfwlist +server=/.buffered.com/127.0.0.1#7913 +ipset=/.buffered.com/gfwlist server=/.forum.idsam.com/127.0.0.1#7913 ipset=/.forum.idsam.com/gfwlist server=/.woxinghuiguo.com/127.0.0.1#7913 ipset=/.woxinghuiguo.com/gfwlist server=/.quitccp.org/127.0.0.1#7913 ipset=/.quitccp.org/gfwlist -server=/.line-apps.com/127.0.0.1#7913 -ipset=/.line-apps.com/gfwlist +server=/.changeip.org/127.0.0.1#7913 +ipset=/.changeip.org/gfwlist server=/.telegra.ph/127.0.0.1#7913 ipset=/.telegra.ph/gfwlist -server=/.baijie.org/127.0.0.1#7913 -ipset=/.baijie.org/gfwlist +server=/.linglingfa.com/127.0.0.1#7913 +ipset=/.linglingfa.com/gfwlist server=/.cdw.com/127.0.0.1#7913 ipset=/.cdw.com/gfwlist -server=/.blogs.libraryinformationtechnology.com/127.0.0.1#7913 -ipset=/.blogs.libraryinformationtechnology.com/gfwlist +server=/.line-apps.com/127.0.0.1#7913 +ipset=/.line-apps.com/gfwlist server=/.chrome.com/127.0.0.1#7913 ipset=/.chrome.com/gfwlist server=/.waiwaier.com/127.0.0.1#7913 @@ -10274,26 +10264,26 @@ server=/.cap.org.hk/127.0.0.1#7913 ipset=/.cap.org.hk/gfwlist server=/.big.one/127.0.0.1#7913 ipset=/.big.one/gfwlist -server=/.danke4china.net/127.0.0.1#7913 -ipset=/.danke4china.net/gfwlist -server=/.hopto.org/127.0.0.1#7913 -ipset=/.hopto.org/gfwlist -server=/.chenguangcheng.com/127.0.0.1#7913 -ipset=/.chenguangcheng.com/gfwlist -server=/.nflxso.net/127.0.0.1#7913 -ipset=/.nflxso.net/gfwlist -server=/.dalailama.com/127.0.0.1#7913 -ipset=/.dalailama.com/gfwlist -server=/.jiehua.cz/127.0.0.1#7913 -ipset=/.jiehua.cz/gfwlist +server=/.bookepub.com/127.0.0.1#7913 +ipset=/.bookepub.com/gfwlist +server=/.ccue.ca/127.0.0.1#7913 +ipset=/.ccue.ca/gfwlist +server=/.erodaizensyu.com/127.0.0.1#7913 +ipset=/.erodaizensyu.com/gfwlist +server=/.blogs.libraryinformationtechnology.com/127.0.0.1#7913 +ipset=/.blogs.libraryinformationtechnology.com/gfwlist +server=/.fapdu.com/127.0.0.1#7913 +ipset=/.fapdu.com/gfwlist +server=/.googlegroups.com/127.0.0.1#7913 +ipset=/.googlegroups.com/gfwlist server=/.tcpspeed.com/127.0.0.1#7913 ipset=/.tcpspeed.com/gfwlist server=/.sthoo.com/127.0.0.1#7913 ipset=/.sthoo.com/gfwlist -server=/.chn.chosun.com/127.0.0.1#7913 -ipset=/.chn.chosun.com/gfwlist -server=/.godsdirectcontact.co.uk/127.0.0.1#7913 -ipset=/.godsdirectcontact.co.uk/gfwlist +server=/.dalailama.com/127.0.0.1#7913 +ipset=/.dalailama.com/gfwlist +server=/.google.nl/127.0.0.1#7913 +ipset=/.google.nl/gfwlist server=/.chinachannel.hk/127.0.0.1#7913 ipset=/.chinachannel.hk/gfwlist server=/.python.com.tw/127.0.0.1#7913 @@ -10306,34 +10296,34 @@ server=/.mynetav.net/127.0.0.1#7913 ipset=/.mynetav.net/gfwlist server=/.taiwanjustice.net/127.0.0.1#7913 ipset=/.taiwanjustice.net/gfwlist -server=/.hkheadline.com/127.0.0.1#7913 -ipset=/.hkheadline.com/gfwlist +server=/.chn.chosun.com/127.0.0.1#7913 +ipset=/.chn.chosun.com/gfwlist server=/.tweetrans.com/127.0.0.1#7913 ipset=/.tweetrans.com/gfwlist -server=/.kui.name/127.0.0.1#7913 -ipset=/.kui.name/gfwlist +server=/.ice.audionow.com/127.0.0.1#7913 +ipset=/.ice.audionow.com/gfwlist server=/.godoc.org/127.0.0.1#7913 ipset=/.godoc.org/gfwlist server=/.etaiwannews.com/127.0.0.1#7913 ipset=/.etaiwannews.com/gfwlist -server=/.daiphapinfo.net/127.0.0.1#7913 -ipset=/.daiphapinfo.net/gfwlist -server=/.doujincafe.com/127.0.0.1#7913 -ipset=/.doujincafe.com/gfwlist +server=/.lalulalu.com/127.0.0.1#7913 +ipset=/.lalulalu.com/gfwlist +server=/.actfortibet.org/127.0.0.1#7913 +ipset=/.actfortibet.org/gfwlist server=/.hkfaa.com/127.0.0.1#7913 ipset=/.hkfaa.com/gfwlist server=/.www.moztw.org/127.0.0.1#7913 ipset=/.www.moztw.org/gfwlist server=/.arctosia.com/127.0.0.1#7913 ipset=/.arctosia.com/gfwlist +server=/.doujincafe.com/127.0.0.1#7913 +ipset=/.doujincafe.com/gfwlist +server=/.itsky.it/127.0.0.1#7913 +ipset=/.itsky.it/gfwlist +server=/.kui.name/127.0.0.1#7913 +ipset=/.kui.name/gfwlist server=/.daftporn.com/127.0.0.1#7913 ipset=/.daftporn.com/gfwlist -server=/.faceless.me/127.0.0.1#7913 -ipset=/.faceless.me/gfwlist -server=/.konachan.com/127.0.0.1#7913 -ipset=/.konachan.com/gfwlist -server=/.ssr.tools/127.0.0.1#7913 -ipset=/.ssr.tools/gfwlist server=/.cw.com.tw/127.0.0.1#7913 ipset=/.cw.com.tw/gfwlist server=/.abitno.linpie.com/127.0.0.1#7913 @@ -10344,70 +10334,70 @@ server=/.hitbtc.com/127.0.0.1#7913 ipset=/.hitbtc.com/gfwlist server=/.xuchao.org/127.0.0.1#7913 ipset=/.xuchao.org/gfwlist -server=/.imagevenue.com/127.0.0.1#7913 -ipset=/.imagevenue.com/gfwlist +server=/.gun-world.net/127.0.0.1#7913 +ipset=/.gun-world.net/gfwlist server=/.kingdomsalvation.org/127.0.0.1#7913 ipset=/.kingdomsalvation.org/gfwlist server=/.voanews.com/127.0.0.1#7913 ipset=/.voanews.com/gfwlist -server=/.kichiku-doujinko.com/127.0.0.1#7913 -ipset=/.kichiku-doujinko.com/gfwlist +server=/.iav19.com/127.0.0.1#7913 +ipset=/.iav19.com/gfwlist +server=/.hotav.tv/127.0.0.1#7913 +ipset=/.hotav.tv/gfwlist server=/.btspread.com/127.0.0.1#7913 ipset=/.btspread.com/gfwlist -server=/.tubepornclassic.com/127.0.0.1#7913 -ipset=/.tubepornclassic.com/gfwlist server=/.tibet.org/127.0.0.1#7913 ipset=/.tibet.org/gfwlist server=/.fb.com/127.0.0.1#7913 ipset=/.fb.com/gfwlist -server=/.army.mil/127.0.0.1#7913 -ipset=/.army.mil/gfwlist +server=/.keezmovies.com/127.0.0.1#7913 +ipset=/.keezmovies.com/gfwlist server=/.foreignpolicy.com/127.0.0.1#7913 ipset=/.foreignpolicy.com/gfwlist server=/.biblesforamerica.org/127.0.0.1#7913 ipset=/.biblesforamerica.org/gfwlist -server=/.kantie.org/127.0.0.1#7913 -ipset=/.kantie.org/gfwlist -server=/.kagyuoffice.org/127.0.0.1#7913 -ipset=/.kagyuoffice.org/gfwlist +server=/.flyvpn.com/127.0.0.1#7913 +ipset=/.flyvpn.com/gfwlist +server=/.kawase.com/127.0.0.1#7913 +ipset=/.kawase.com/gfwlist server=/.bipic.net/127.0.0.1#7913 ipset=/.bipic.net/gfwlist -server=/.ablwang.com/127.0.0.1#7913 -ipset=/.ablwang.com/gfwlist +server=/.kantie.org/127.0.0.1#7913 +ipset=/.kantie.org/gfwlist server=/.javhip.com/127.0.0.1#7913 ipset=/.javhip.com/gfwlist server=/.cnd.org/127.0.0.1#7913 ipset=/.cnd.org/gfwlist server=/.dalailamajapanese.com/127.0.0.1#7913 ipset=/.dalailamajapanese.com/gfwlist -server=/.imgur.com/127.0.0.1#7913 -ipset=/.imgur.com/gfwlist -server=/.blogger.com/127.0.0.1#7913 -ipset=/.blogger.com/gfwlist +server=/.pincong.rocks/127.0.0.1#7913 +ipset=/.pincong.rocks/gfwlist +server=/.kagyuoffice.org/127.0.0.1#7913 +ipset=/.kagyuoffice.org/gfwlist +server=/.indiandefensenews.in/127.0.0.1#7913 +ipset=/.indiandefensenews.in/gfwlist server=/.jwmusic.org/127.0.0.1#7913 ipset=/.jwmusic.org/gfwlist -server=/.juziyue.com/127.0.0.1#7913 -ipset=/.juziyue.com/gfwlist server=/.jtvnw.net/127.0.0.1#7913 ipset=/.jtvnw.net/gfwlist -server=/.itemdb.com/127.0.0.1#7913 -ipset=/.itemdb.com/gfwlist +server=/.juziyue.com/127.0.0.1#7913 +ipset=/.juziyue.com/gfwlist server=/.openallweb.com/127.0.0.1#7913 ipset=/.openallweb.com/gfwlist -server=/.jubushoushen.com/127.0.0.1#7913 -ipset=/.jubushoushen.com/gfwlist -server=/.bbs-tw.com/127.0.0.1#7913 -ipset=/.bbs-tw.com/gfwlist -server=/.zb.com/127.0.0.1#7913 -ipset=/.zb.com/gfwlist server=/.cnn.com/127.0.0.1#7913 ipset=/.cnn.com/gfwlist +server=/.mrslove.com/127.0.0.1#7913 +ipset=/.mrslove.com/gfwlist +server=/.zb.com/127.0.0.1#7913 +ipset=/.zb.com/gfwlist +server=/.jubushoushen.com/127.0.0.1#7913 +ipset=/.jubushoushen.com/gfwlist server=/.qtweeter.com/127.0.0.1#7913 ipset=/.qtweeter.com/gfwlist server=/.pcdvd.com.tw/127.0.0.1#7913 ipset=/.pcdvd.com.tw/gfwlist -server=/.mrslove.com/127.0.0.1#7913 -ipset=/.mrslove.com/gfwlist +server=/.joachims.org/127.0.0.1#7913 +ipset=/.joachims.org/gfwlist server=/.llss.me/127.0.0.1#7913 ipset=/.llss.me/gfwlist server=/.guaneryu.com/127.0.0.1#7913 @@ -10420,14 +10410,14 @@ server=/.jkforum.net/127.0.0.1#7913 ipset=/.jkforum.net/gfwlist server=/.blogtd.net/127.0.0.1#7913 ipset=/.blogtd.net/gfwlist -server=/.dns-stuff.com/127.0.0.1#7913 -ipset=/.dns-stuff.com/gfwlist -server=/.badjojo.com/127.0.0.1#7913 -ipset=/.badjojo.com/gfwlist -server=/.alexlur.org/127.0.0.1#7913 -ipset=/.alexlur.org/gfwlist server=/.abebooks.com/127.0.0.1#7913 ipset=/.abebooks.com/gfwlist +server=/.bewww.net/127.0.0.1#7913 +ipset=/.bewww.net/gfwlist +server=/.alexlur.org/127.0.0.1#7913 +ipset=/.alexlur.org/gfwlist +server=/.fflick.com/127.0.0.1#7913 +ipset=/.fflick.com/gfwlist server=/.digisfera.com/127.0.0.1#7913 ipset=/.digisfera.com/gfwlist server=/.myradio.hk/127.0.0.1#7913 @@ -10436,154 +10426,154 @@ server=/.ttvnw.net/127.0.0.1#7913 ipset=/.ttvnw.net/gfwlist server=/.ftp1.biz/127.0.0.1#7913 ipset=/.ftp1.biz/gfwlist -server=/.daodu14.jigsy.com/127.0.0.1#7913 -ipset=/.daodu14.jigsy.com/gfwlist -server=/.fflick.com/127.0.0.1#7913 -ipset=/.fflick.com/gfwlist -server=/.aenhancers.com/127.0.0.1#7913 -ipset=/.aenhancers.com/gfwlist -server=/.onmypc.org/127.0.0.1#7913 -ipset=/.onmypc.org/gfwlist +server=/.hkcoc.com/127.0.0.1#7913 +ipset=/.hkcoc.com/gfwlist server=/.bitcointalk.org/127.0.0.1#7913 ipset=/.bitcointalk.org/gfwlist server=/.aiweiwei.com/127.0.0.1#7913 ipset=/.aiweiwei.com/gfwlist +server=/.jigglegifs.com/127.0.0.1#7913 +ipset=/.jigglegifs.com/gfwlist +server=/.dafagood.com/127.0.0.1#7913 +ipset=/.dafagood.com/gfwlist +server=/.wizcrafts.net/127.0.0.1#7913 +ipset=/.wizcrafts.net/gfwlist server=/.toodoc.com/127.0.0.1#7913 ipset=/.toodoc.com/gfwlist -server=/.javbus.co/127.0.0.1#7913 -ipset=/.javbus.co/gfwlist -server=/.javakiba.org/127.0.0.1#7913 -ipset=/.javakiba.org/gfwlist -server=/.getlantern.org/127.0.0.1#7913 -ipset=/.getlantern.org/gfwlist -server=/.iyouport.com/127.0.0.1#7913 -ipset=/.iyouport.com/gfwlist +server=/.xbtce.com/127.0.0.1#7913 +ipset=/.xbtce.com/gfwlist +server=/.google.sc/127.0.0.1#7913 +ipset=/.google.sc/gfwlist +server=/.bbci.co.uk/127.0.0.1#7913 +ipset=/.bbci.co.uk/gfwlist +server=/.almostmy.com/127.0.0.1#7913 +ipset=/.almostmy.com/gfwlist server=/.englishfromengland.co.uk/127.0.0.1#7913 ipset=/.englishfromengland.co.uk/gfwlist server=/.seevpn.com/127.0.0.1#7913 ipset=/.seevpn.com/gfwlist server=/.c2cx.com/127.0.0.1#7913 ipset=/.c2cx.com/gfwlist -server=/.iverycd.com/127.0.0.1#7913 -ipset=/.iverycd.com/gfwlist +server=/.get.how/127.0.0.1#7913 +ipset=/.get.how/gfwlist server=/.xinqimeng.over-blog.com/127.0.0.1#7913 ipset=/.xinqimeng.over-blog.com/gfwlist server=/.malaysiakini.com/127.0.0.1#7913 ipset=/.malaysiakini.com/gfwlist -server=/.get.dev/127.0.0.1#7913 -ipset=/.get.dev/gfwlist -server=/.bbci.co.uk/127.0.0.1#7913 -ipset=/.bbci.co.uk/gfwlist server=/.italiatibet.org/127.0.0.1#7913 ipset=/.italiatibet.org/gfwlist -server=/.get.how/127.0.0.1#7913 -ipset=/.get.how/gfwlist -server=/.gartlive.com/127.0.0.1#7913 -ipset=/.gartlive.com/gfwlist +server=/.fochk.org/127.0.0.1#7913 +ipset=/.fochk.org/gfwlist +server=/.animecrazy.net/127.0.0.1#7913 +ipset=/.animecrazy.net/gfwlist +server=/.dns2go.com/127.0.0.1#7913 +ipset=/.dns2go.com/gfwlist +server=/.isohunt.com/127.0.0.1#7913 +ipset=/.isohunt.com/gfwlist server=/.pornoxo.com/127.0.0.1#7913 ipset=/.pornoxo.com/gfwlist server=/.chinesen.de/127.0.0.1#7913 ipset=/.chinesen.de/gfwlist -server=/.israbox.com/127.0.0.1#7913 -ipset=/.israbox.com/gfwlist +server=/.islam.org.hk/127.0.0.1#7913 +ipset=/.islam.org.hk/gfwlist server=/.ns1.name/127.0.0.1#7913 ipset=/.ns1.name/gfwlist -server=/.animecrazy.net/127.0.0.1#7913 -ipset=/.animecrazy.net/gfwlist -server=/.ikstar.com/127.0.0.1#7913 -ipset=/.ikstar.com/gfwlist -server=/.goldstep.net/127.0.0.1#7913 -ipset=/.goldstep.net/gfwlist -server=/.manta.com/127.0.0.1#7913 -ipset=/.manta.com/gfwlist -server=/.isgreat.org/127.0.0.1#7913 -ipset=/.isgreat.org/gfwlist -server=/.dns2go.com/127.0.0.1#7913 -ipset=/.dns2go.com/gfwlist -server=/.lingvodics.com/127.0.0.1#7913 -ipset=/.lingvodics.com/gfwlist -server=/.bodog88.com/127.0.0.1#7913 -ipset=/.bodog88.com/gfwlist -server=/.chinese.irib.ir/127.0.0.1#7913 -ipset=/.chinese.irib.ir/gfwlist -server=/.ipvanish.com/127.0.0.1#7913 -ipset=/.ipvanish.com/gfwlist -server=/.maiplus.com/127.0.0.1#7913 -ipset=/.maiplus.com/gfwlist server=/.premproxy.com/127.0.0.1#7913 ipset=/.premproxy.com/gfwlist +server=/.ikstar.com/127.0.0.1#7913 +ipset=/.ikstar.com/gfwlist +server=/.chinese.irib.ir/127.0.0.1#7913 +ipset=/.chinese.irib.ir/gfwlist +server=/.manta.com/127.0.0.1#7913 +ipset=/.manta.com/gfwlist +server=/.ipvanish.com/127.0.0.1#7913 +ipset=/.ipvanish.com/gfwlist +server=/.inthenameofconfuciusmovie.com/127.0.0.1#7913 +ipset=/.inthenameofconfuciusmovie.com/gfwlist +server=/.lingvodics.com/127.0.0.1#7913 +ipset=/.lingvodics.com/gfwlist +server=/.bgvpn.com/127.0.0.1#7913 +ipset=/.bgvpn.com/gfwlist +server=/.bangchen.net/127.0.0.1#7913 +ipset=/.bangchen.net/gfwlist +server=/.alkasir.com/127.0.0.1#7913 +ipset=/.alkasir.com/gfwlist +server=/.maiplus.com/127.0.0.1#7913 +ipset=/.maiplus.com/gfwlist +server=/.info-graf.fr/127.0.0.1#7913 +ipset=/.info-graf.fr/gfwlist server=/.google.rw/127.0.0.1#7913 ipset=/.google.rw/gfwlist server=/.asiatgp.com/127.0.0.1#7913 ipset=/.asiatgp.com/gfwlist -server=/.bgvpn.com/127.0.0.1#7913 -ipset=/.bgvpn.com/gfwlist -server=/.info-graf.fr/127.0.0.1#7913 -ipset=/.info-graf.fr/gfwlist -server=/.indiandefensenews.in/127.0.0.1#7913 -ipset=/.indiandefensenews.in/gfwlist -server=/.6parkbbs.com/127.0.0.1#7913 -ipset=/.6parkbbs.com/gfwlist -server=/.18board.info/127.0.0.1#7913 -ipset=/.18board.info/gfwlist -server=/.aisex.com/127.0.0.1#7913 -ipset=/.aisex.com/gfwlist -server=/.alkasir.com/127.0.0.1#7913 -ipset=/.alkasir.com/gfwlist +server=/.addictedtocoffee.de/127.0.0.1#7913 +ipset=/.addictedtocoffee.de/gfwlist server=/.impact.org.au/127.0.0.1#7913 ipset=/.impact.org.au/gfwlist +server=/.exrates.me/127.0.0.1#7913 +ipset=/.exrates.me/gfwlist server=/.imkev.com/127.0.0.1#7913 ipset=/.imkev.com/gfwlist server=/.img.ly/127.0.0.1#7913 ipset=/.img.ly/gfwlist +server=/.cdpa.url.tw/127.0.0.1#7913 +ipset=/.cdpa.url.tw/gfwlist +server=/.almasdarnews.com/127.0.0.1#7913 +ipset=/.almasdarnews.com/gfwlist +server=/.alvinalexander.com/127.0.0.1#7913 +ipset=/.alvinalexander.com/gfwlist +server=/.canalporno.com/127.0.0.1#7913 +ipset=/.canalporno.com/gfwlist +server=/.igfw.tech/127.0.0.1#7913 +ipset=/.igfw.tech/gfwlist server=/.myeclipseide.com/127.0.0.1#7913 ipset=/.myeclipseide.com/gfwlist server=/.say2.info/127.0.0.1#7913 ipset=/.say2.info/gfwlist -server=/.hrcchina.org/127.0.0.1#7913 -ipset=/.hrcchina.org/gfwlist -server=/.danwei.org/127.0.0.1#7913 -ipset=/.danwei.org/gfwlist -server=/.alvinalexander.com/127.0.0.1#7913 -ipset=/.alvinalexander.com/gfwlist -server=/.igfw.tech/127.0.0.1#7913 -ipset=/.igfw.tech/gfwlist -server=/.javbus.com/127.0.0.1#7913 -ipset=/.javbus.com/gfwlist -server=/.canalporno.com/127.0.0.1#7913 -ipset=/.canalporno.com/gfwlist -server=/.huayuworld.org/127.0.0.1#7913 -ipset=/.huayuworld.org/gfwlist server=/.bestvpnservice.com/127.0.0.1#7913 ipset=/.bestvpnservice.com/gfwlist +server=/.danwei.org/127.0.0.1#7913 +ipset=/.danwei.org/gfwlist +server=/.ied2k.net/127.0.0.1#7913 +ipset=/.ied2k.net/gfwlist +server=/.dizhidizhi.com/127.0.0.1#7913 +ipset=/.dizhidizhi.com/gfwlist +server=/.javbus.com/127.0.0.1#7913 +ipset=/.javbus.com/gfwlist +server=/.enewstree.com/127.0.0.1#7913 +ipset=/.enewstree.com/gfwlist +server=/.freenetproject.org/127.0.0.1#7913 +ipset=/.freenetproject.org/gfwlist +server=/.rebatesrule.net/127.0.0.1#7913 +ipset=/.rebatesrule.net/gfwlist server=/.falundafa-sacramento.org/127.0.0.1#7913 ipset=/.falundafa-sacramento.org/gfwlist server=/.21andy.com/127.0.0.1#7913 ipset=/.21andy.com/gfwlist server=/.treemall.com.tw/127.0.0.1#7913 ipset=/.treemall.com.tw/gfwlist -server=/.i-cable.com/127.0.0.1#7913 -ipset=/.i-cable.com/gfwlist +server=/.ccthere.com/127.0.0.1#7913 +ipset=/.ccthere.com/gfwlist server=/.you-get.org/127.0.0.1#7913 ipset=/.you-get.org/gfwlist server=/.falundafa-nc.org/127.0.0.1#7913 ipset=/.falundafa-nc.org/gfwlist server=/.student.tw/127.0.0.1#7913 ipset=/.student.tw/gfwlist -server=/.cclifefl.org/127.0.0.1#7913 -ipset=/.cclifefl.org/gfwlist +server=/.drepung.org/127.0.0.1#7913 +ipset=/.drepung.org/gfwlist server=/.facebookquotes4u.com/127.0.0.1#7913 ipset=/.facebookquotes4u.com/gfwlist -server=/.centralnation.com/127.0.0.1#7913 -ipset=/.centralnation.com/gfwlist -server=/.freeddns.org/127.0.0.1#7913 -ipset=/.freeddns.org/gfwlist server=/.hungerstrikeforaids.org/127.0.0.1#7913 ipset=/.hungerstrikeforaids.org/gfwlist +server=/.freeddns.org/127.0.0.1#7913 +ipset=/.freeddns.org/gfwlist +server=/.huayuworld.org/127.0.0.1#7913 +ipset=/.huayuworld.org/gfwlist server=/.vpnfire.com/127.0.0.1#7913 ipset=/.vpnfire.com/gfwlist -server=/.huashangnews.com/127.0.0.1#7913 -ipset=/.huashangnews.com/gfwlist +server=/.huaren4us.com/127.0.0.1#7913 +ipset=/.huaren4us.com/gfwlist server=/.huanghuagang.org/127.0.0.1#7913 ipset=/.huanghuagang.org/gfwlist server=/.creadersnet.com/127.0.0.1#7913 @@ -10592,34 +10582,34 @@ server=/.qi-gong.me/127.0.0.1#7913 ipset=/.qi-gong.me/gfwlist server=/.nydus.ca/127.0.0.1#7913 ipset=/.nydus.ca/gfwlist -server=/.hsselite.com/127.0.0.1#7913 -ipset=/.hsselite.com/gfwlist +server=/.chaturbate.com/127.0.0.1#7913 +ipset=/.chaturbate.com/gfwlist server=/.www.sciencemag.org/127.0.0.1#7913 ipset=/.www.sciencemag.org/gfwlist server=/.drgan.net/127.0.0.1#7913 ipset=/.drgan.net/gfwlist server=/.google.cd/127.0.0.1#7913 ipset=/.google.cd/gfwlist -server=/.hsjp.net/127.0.0.1#7913 -ipset=/.hsjp.net/gfwlist +server=/.futuremessage.org/127.0.0.1#7913 +ipset=/.futuremessage.org/gfwlist +server=/.hrcchina.org/127.0.0.1#7913 +ipset=/.hrcchina.org/gfwlist server=/.hqcdp.org/127.0.0.1#7913 ipset=/.hqcdp.org/gfwlist -server=/.chaturbate.com/127.0.0.1#7913 -ipset=/.chaturbate.com/gfwlist -server=/.dalailamafoundation.org/127.0.0.1#7913 -ipset=/.dalailamafoundation.org/gfwlist -server=/.bbsone.com/127.0.0.1#7913 -ipset=/.bbsone.com/gfwlist +server=/.hotshame.com/127.0.0.1#7913 +ipset=/.hotshame.com/gfwlist +server=/.hornygamer.com/127.0.0.1#7913 +ipset=/.hornygamer.com/gfwlist server=/.tibetanpaintings.com/127.0.0.1#7913 ipset=/.tibetanpaintings.com/gfwlist server=/.vidble.com/127.0.0.1#7913 ipset=/.vidble.com/gfwlist server=/.nwtca.org/127.0.0.1#7913 ipset=/.nwtca.org/gfwlist -server=/.hkcmi.edu/127.0.0.1#7913 -ipset=/.hkcmi.edu/gfwlist -server=/.hideipvpn.com/127.0.0.1#7913 -ipset=/.hideipvpn.com/gfwlist +server=/.hkheadline.com/127.0.0.1#7913 +ipset=/.hkheadline.com/gfwlist +server=/.fanqiangzhe.com/127.0.0.1#7913 +ipset=/.fanqiangzhe.com/gfwlist server=/.nokogiri.org/127.0.0.1#7913 ipset=/.nokogiri.org/gfwlist server=/.edmontonchina.cn/127.0.0.1#7913 @@ -10628,112 +10618,112 @@ server=/.thisav.com/127.0.0.1#7913 ipset=/.thisav.com/gfwlist server=/.blog.inoreader.com/127.0.0.1#7913 ipset=/.blog.inoreader.com/gfwlist -server=/.heqinglian.net/127.0.0.1#7913 -ipset=/.heqinglian.net/gfwlist +server=/.cusu.hk/127.0.0.1#7913 +ipset=/.cusu.hk/gfwlist server=/.dalailamafilm.com/127.0.0.1#7913 ipset=/.dalailamafilm.com/gfwlist -server=/.helpzhuling.org/127.0.0.1#7913 -ipset=/.helpzhuling.org/gfwlist -server=/.glass8.eu/127.0.0.1#7913 -ipset=/.glass8.eu/gfwlist +server=/.theguardian.com/127.0.0.1#7913 +ipset=/.theguardian.com/gfwlist +server=/.bbsone.com/127.0.0.1#7913 +ipset=/.bbsone.com/gfwlist server=/.picasaweb.com/127.0.0.1#7913 ipset=/.picasaweb.com/gfwlist -server=/.bongacams.com/127.0.0.1#7913 -ipset=/.bongacams.com/gfwlist -server=/.googleweblight.com/127.0.0.1#7913 -ipset=/.googleweblight.com/gfwlist +server=/.hideme.nl/127.0.0.1#7913 +ipset=/.hideme.nl/gfwlist +server=/.hideman.net/127.0.0.1#7913 +ipset=/.hideman.net/gfwlist server=/.electrek.co/127.0.0.1#7913 ipset=/.electrek.co/gfwlist -server=/.prism-break.org/127.0.0.1#7913 -ipset=/.prism-break.org/gfwlist -server=/.beyondfirewall.com/127.0.0.1#7913 -ipset=/.beyondfirewall.com/gfwlist -server=/.hk.gradconnection.com/127.0.0.1#7913 -ipset=/.hk.gradconnection.com/gfwlist +server=/.hhdcb3office.org/127.0.0.1#7913 +ipset=/.hhdcb3office.org/gfwlist +server=/.discord.gg/127.0.0.1#7913 +ipset=/.discord.gg/gfwlist +server=/.glass8.eu/127.0.0.1#7913 +ipset=/.glass8.eu/gfwlist server=/.allinfa.com/127.0.0.1#7913 ipset=/.allinfa.com/gfwlist -server=/.brutaltgp.com/127.0.0.1#7913 -ipset=/.brutaltgp.com/gfwlist -server=/.breakwall.net/127.0.0.1#7913 -ipset=/.breakwall.net/gfwlist +server=/.heqinglian.net/127.0.0.1#7913 +ipset=/.heqinglian.net/gfwlist +server=/.oculuscdn.com/127.0.0.1#7913 +ipset=/.oculuscdn.com/gfwlist server=/.xysblogs.org/127.0.0.1#7913 ipset=/.xysblogs.org/gfwlist -server=/.gov.tw/127.0.0.1#7913 -ipset=/.gov.tw/gfwlist +server=/.helpzhuling.org/127.0.0.1#7913 +ipset=/.helpzhuling.org/gfwlist server=/.aptoide.com/127.0.0.1#7913 ipset=/.aptoide.com/gfwlist -server=/.gun-world.net/127.0.0.1#7913 -ipset=/.gun-world.net/gfwlist -server=/.100ke.org/127.0.0.1#7913 -ipset=/.100ke.org/gfwlist +server=/.bongacams.com/127.0.0.1#7913 +ipset=/.bongacams.com/gfwlist +server=/.cam4.sg/127.0.0.1#7913 +ipset=/.cam4.sg/gfwlist server=/.van001.com/127.0.0.1#7913 ipset=/.van001.com/gfwlist server=/.superzooi.com/127.0.0.1#7913 ipset=/.superzooi.com/gfwlist -server=/.godfootsteps.org/127.0.0.1#7913 -ipset=/.godfootsteps.org/gfwlist +server=/.beyondfirewall.com/127.0.0.1#7913 +ipset=/.beyondfirewall.com/gfwlist server=/.twftp.org/127.0.0.1#7913 ipset=/.twftp.org/gfwlist -server=/.dajiyuan.eu/127.0.0.1#7913 -ipset=/.dajiyuan.eu/gfwlist +server=/.expekt.com/127.0.0.1#7913 +ipset=/.expekt.com/gfwlist server=/.youtubekids.com/127.0.0.1#7913 ipset=/.youtubekids.com/gfwlist -server=/.archive.today/127.0.0.1#7913 -ipset=/.archive.today/gfwlist +server=/.wozy.in/127.0.0.1#7913 +ipset=/.wozy.in/gfwlist server=/.twitturk.com/127.0.0.1#7913 ipset=/.twitturk.com/gfwlist -server=/.bl-doujinsouko.com/127.0.0.1#7913 -ipset=/.bl-doujinsouko.com/gfwlist +server=/.freexinwen.com/127.0.0.1#7913 +ipset=/.freexinwen.com/gfwlist server=/.pk.com/127.0.0.1#7913 ipset=/.pk.com/gfwlist -server=/.git.io/127.0.0.1#7913 -ipset=/.git.io/gfwlist +server=/.goldbet.com/127.0.0.1#7913 +ipset=/.goldbet.com/gfwlist server=/.wjbk.org/127.0.0.1#7913 ipset=/.wjbk.org/gfwlist server=/.gongmeng.info/127.0.0.1#7913 ipset=/.gongmeng.info/gfwlist -server=/.ghut.org/127.0.0.1#7913 -ipset=/.ghut.org/gfwlist +server=/.godsdirectcontact.org.tw/127.0.0.1#7913 +ipset=/.godsdirectcontact.org.tw/gfwlist server=/.thebobs.com/127.0.0.1#7913 ipset=/.thebobs.com/gfwlist -server=/.geocities.com/127.0.0.1#7913 -ipset=/.geocities.com/gfwlist +server=/.godfootsteps.org/127.0.0.1#7913 +ipset=/.godfootsteps.org/gfwlist server=/.blogdns.org/127.0.0.1#7913 ipset=/.blogdns.org/gfwlist -server=/.g6hentai.com/127.0.0.1#7913 -ipset=/.g6hentai.com/gfwlist +server=/.goagent.biz/127.0.0.1#7913 +ipset=/.goagent.biz/gfwlist server=/.messenger.com/127.0.0.1#7913 ipset=/.messenger.com/gfwlist server=/.chinaaffairs.org/127.0.0.1#7913 ipset=/.chinaaffairs.org/gfwlist server=/.nobelprize.org/127.0.0.1#7913 ipset=/.nobelprize.org/gfwlist -server=/.fzh999.com/127.0.0.1#7913 -ipset=/.fzh999.com/gfwlist +server=/.bl-doujinsouko.com/127.0.0.1#7913 +ipset=/.bl-doujinsouko.com/gfwlist server=/.uncyclopedia.tw/127.0.0.1#7913 ipset=/.uncyclopedia.tw/gfwlist -server=/.asiansexdiary.com/127.0.0.1#7913 -ipset=/.asiansexdiary.com/gfwlist -server=/.freeyellow.com/127.0.0.1#7913 -ipset=/.freeyellow.com/gfwlist +server=/.girlbanker.com/127.0.0.1#7913 +ipset=/.girlbanker.com/gfwlist +server=/.geocities.com/127.0.0.1#7913 +ipset=/.geocities.com/gfwlist server=/.canadameet.com/127.0.0.1#7913 ipset=/.canadameet.com/gfwlist -server=/.freexinwen.com/127.0.0.1#7913 -ipset=/.freexinwen.com/gfwlist -server=/.freenetproject.org/127.0.0.1#7913 -ipset=/.freenetproject.org/gfwlist -server=/.tw.money.yahoo.com/127.0.0.1#7913 -ipset=/.tw.money.yahoo.com/gfwlist -server=/.b0ne.com/127.0.0.1#7913 -ipset=/.b0ne.com/gfwlist -server=/.flgjustice.org/127.0.0.1#7913 -ipset=/.flgjustice.org/gfwlist +server=/.fzh999.net/127.0.0.1#7913 +ipset=/.fzh999.net/gfwlist +server=/.glorystar.me/127.0.0.1#7913 +ipset=/.glorystar.me/gfwlist +server=/.gaywatch.com/127.0.0.1#7913 +ipset=/.gaywatch.com/gfwlist +server=/.en.favotter.net/127.0.0.1#7913 +ipset=/.en.favotter.net/gfwlist +server=/.g6hentai.com/127.0.0.1#7913 +ipset=/.g6hentai.com/gfwlist server=/.heartyit.com/127.0.0.1#7913 ipset=/.heartyit.com/gfwlist server=/.wwe.com/127.0.0.1#7913 ipset=/.wwe.com/gfwlist -server=/.whatsapp.com/127.0.0.1#7913 -ipset=/.whatsapp.com/gfwlist +server=/.fzh999.com/127.0.0.1#7913 +ipset=/.fzh999.com/gfwlist server=/.nobel.se/127.0.0.1#7913 ipset=/.nobel.se/gfwlist server=/.molihua.org/127.0.0.1#7913 @@ -10742,30 +10732,30 @@ server=/.bloomberg.com/127.0.0.1#7913 ipset=/.bloomberg.com/gfwlist server=/.tvplayvideos.com/127.0.0.1#7913 ipset=/.tvplayvideos.com/gfwlist -server=/.tellme.pw/127.0.0.1#7913 -ipset=/.tellme.pw/gfwlist -server=/.fourface.nodesnoop.com/127.0.0.1#7913 -ipset=/.fourface.nodesnoop.com/gfwlist +server=/.frootvpn.com/127.0.0.1#7913 +ipset=/.frootvpn.com/gfwlist +server=/.freeyellow.com/127.0.0.1#7913 +ipset=/.freeyellow.com/gfwlist server=/.amiblockedornot.com/127.0.0.1#7913 ipset=/.amiblockedornot.com/gfwlist server=/.mad-ar.ch/127.0.0.1#7913 ipset=/.mad-ar.ch/gfwlist server=/.twurl.nl/127.0.0.1#7913 ipset=/.twurl.nl/gfwlist -server=/.en.favotter.net/127.0.0.1#7913 -ipset=/.en.favotter.net/gfwlist -server=/.www.americorps.gov/127.0.0.1#7913 -ipset=/.www.americorps.gov/gfwlist +server=/.b0ne.com/127.0.0.1#7913 +ipset=/.b0ne.com/gfwlist +server=/.12bet.com/127.0.0.1#7913 +ipset=/.12bet.com/gfwlist server=/.namgyalmonastery.org/127.0.0.1#7913 ipset=/.namgyalmonastery.org/gfwlist -server=/.fan-qiang.com/127.0.0.1#7913 -ipset=/.fan-qiang.com/gfwlist -server=/.24smile.org/127.0.0.1#7913 -ipset=/.24smile.org/gfwlist +server=/.nytimes.com/127.0.0.1#7913 +ipset=/.nytimes.com/gfwlist +server=/.google.no/127.0.0.1#7913 +ipset=/.google.no/gfwlist server=/.mansionpoker.com/127.0.0.1#7913 ipset=/.mansionpoker.com/gfwlist -server=/.asiaharvest.org/127.0.0.1#7913 -ipset=/.asiaharvest.org/gfwlist +server=/.fan-qiang.com/127.0.0.1#7913 +ipset=/.fan-qiang.com/gfwlist server=/.thinkwithgoogle.com/127.0.0.1#7913 ipset=/.thinkwithgoogle.com/gfwlist server=/.kakao.com/127.0.0.1#7913 @@ -10774,82 +10764,82 @@ server=/.hwinfo.com/127.0.0.1#7913 ipset=/.hwinfo.com/gfwlist server=/.businesstoday.com.tw/127.0.0.1#7913 ipset=/.businesstoday.com.tw/gfwlist -server=/.fangeming.com/127.0.0.1#7913 -ipset=/.fangeming.com/gfwlist +server=/.24smile.org/127.0.0.1#7913 +ipset=/.24smile.org/gfwlist +server=/.asiaharvest.org/127.0.0.1#7913 +ipset=/.asiaharvest.org/gfwlist +server=/.fangong.org/127.0.0.1#7913 +ipset=/.fangong.org/gfwlist server=/.etowns.org/127.0.0.1#7913 ipset=/.etowns.org/gfwlist -server=/.bakgeekhome.tk/127.0.0.1#7913 -ipset=/.bakgeekhome.tk/gfwlist -server=/.eromangadouzin.com/127.0.0.1#7913 -ipset=/.eromangadouzin.com/gfwlist server=/.epochtimes-romania.com/127.0.0.1#7913 ipset=/.epochtimes-romania.com/gfwlist -server=/.ernestmandel.org/127.0.0.1#7913 -ipset=/.ernestmandel.org/gfwlist +server=/.ggpht.com/127.0.0.1#7913 +ipset=/.ggpht.com/gfwlist server=/.showtime.jp/127.0.0.1#7913 ipset=/.showtime.jp/gfwlist -server=/.entermap.com/127.0.0.1#7913 -ipset=/.entermap.com/gfwlist -server=/.64museum.org/127.0.0.1#7913 -ipset=/.64museum.org/gfwlist +server=/.uukanshu.com/127.0.0.1#7913 +ipset=/.uukanshu.com/gfwlist +server=/.onmypc.net/127.0.0.1#7913 +ipset=/.onmypc.net/gfwlist server=/.bloombergview.com/127.0.0.1#7913 ipset=/.bloombergview.com/gfwlist -server=/.emanna.com/127.0.0.1#7913 -ipset=/.emanna.com/gfwlist +server=/.100ke.org/127.0.0.1#7913 +ipset=/.100ke.org/gfwlist server=/.al-islam.com/127.0.0.1#7913 ipset=/.al-islam.com/gfwlist server=/.aofriend.com.au/127.0.0.1#7913 ipset=/.aofriend.com.au/gfwlist server=/.wo3t.wordpress.com/127.0.0.1#7913 ipset=/.wo3t.wordpress.com/gfwlist -server=/.cirosantilli.com/127.0.0.1#7913 -ipset=/.cirosantilli.com/gfwlist -server=/.googlemashups.com/127.0.0.1#7913 -ipset=/.googlemashups.com/gfwlist +server=/.ernestmandel.org/127.0.0.1#7913 +ipset=/.ernestmandel.org/gfwlist +server=/.adpl.org.hk/127.0.0.1#7913 +ipset=/.adpl.org.hk/gfwlist server=/.apetube.com/127.0.0.1#7913 ipset=/.apetube.com/gfwlist server=/.googlelabs.com/127.0.0.1#7913 ipset=/.googlelabs.com/gfwlist server=/.h528.com/127.0.0.1#7913 ipset=/.h528.com/gfwlist -server=/.dynamicdns.me.uk/127.0.0.1#7913 -ipset=/.dynamicdns.me.uk/gfwlist -server=/.boxun.tv/127.0.0.1#7913 -ipset=/.boxun.tv/gfwlist +server=/.enlighten.org.tw/127.0.0.1#7913 +ipset=/.enlighten.org.tw/gfwlist +server=/.emulefans.com/127.0.0.1#7913 +ipset=/.emulefans.com/gfwlist server=/.justdied.com/127.0.0.1#7913 ipset=/.justdied.com/gfwlist server=/.rsf-chinese.org/127.0.0.1#7913 ipset=/.rsf-chinese.org/gfwlist -server=/.research.google/127.0.0.1#7913 -ipset=/.research.google/gfwlist -server=/.9bis.com/127.0.0.1#7913 -ipset=/.9bis.com/gfwlist +server=/.facebook.com/127.0.0.1#7913 +ipset=/.facebook.com/gfwlist +server=/.lighti.me/127.0.0.1#7913 +ipset=/.lighti.me/gfwlist server=/.dns1.us/127.0.0.1#7913 ipset=/.dns1.us/gfwlist -server=/.dlsite.com/127.0.0.1#7913 -ipset=/.dlsite.com/gfwlist +server=/.amoiist.com/127.0.0.1#7913 +ipset=/.amoiist.com/gfwlist server=/.fangongheike.com/127.0.0.1#7913 ipset=/.fangongheike.com/gfwlist server=/.muzi.com/127.0.0.1#7913 ipset=/.muzi.com/gfwlist -server=/.googlemail.com/127.0.0.1#7913 -ipset=/.googlemail.com/gfwlist -server=/.chromecast.com/127.0.0.1#7913 -ipset=/.chromecast.com/gfwlist +server=/.bangyoulater.com/127.0.0.1#7913 +ipset=/.bangyoulater.com/gfwlist +server=/.6park.com/127.0.0.1#7913 +ipset=/.6park.com/gfwlist server=/.google.to/127.0.0.1#7913 ipset=/.google.to/gfwlist -server=/.barnabu.co.uk/127.0.0.1#7913 -ipset=/.barnabu.co.uk/gfwlist -server=/.blog.calibre-ebook.com/127.0.0.1#7913 -ipset=/.blog.calibre-ebook.com/gfwlist -server=/.avbody.tv/127.0.0.1#7913 -ipset=/.avbody.tv/gfwlist +server=/.dlsite.com/127.0.0.1#7913 +ipset=/.dlsite.com/gfwlist +server=/.chromecast.com/127.0.0.1#7913 +ipset=/.chromecast.com/gfwlist +server=/.bangbrosnetwork.com/127.0.0.1#7913 +ipset=/.bangbrosnetwork.com/gfwlist server=/.destroy-china.jp/127.0.0.1#7913 ipset=/.destroy-china.jp/gfwlist -server=/.cdpusa.org/127.0.0.1#7913 -ipset=/.cdpusa.org/gfwlist -server=/.ccthere.com/127.0.0.1#7913 -ipset=/.ccthere.com/gfwlist +server=/.bx.tl/127.0.0.1#7913 +ipset=/.bx.tl/gfwlist +server=/.breakwall.net/127.0.0.1#7913 +ipset=/.breakwall.net/gfwlist server=/.blogspot.jp/127.0.0.1#7913 ipset=/.blogspot.jp/gfwlist server=/.fatbtc.com/127.0.0.1#7913 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/proxy_host b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/proxy_host index e69de29bb2..1c0ba9d38e 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/proxy_host +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/proxy_host @@ -0,0 +1,8 @@ +googleapis.cn +googleapis.com +xn--ngstr-lra8j.com +v2ex.com +gstatic.com +google.com.tw +google.com.hk +github.com \ No newline at end of file diff --git a/package/lienol/redsocks2/Makefile b/package/lienol/redsocks2/Makefile index 2fbe1a0f57..2bbcd8f072 100644 --- a/package/lienol/redsocks2/Makefile +++ b/package/lienol/redsocks2/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/lienol/tcping/Makefile b/package/lienol/tcping/Makefile index ee6b59d258..ff9ab1a42e 100644 --- a/package/lienol/tcping/Makefile +++ b/package/lienol/tcping/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2021 ImmortalWrt -# +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/network/services/igmpproxy/Makefile b/package/network/services/igmpproxy/Makefile index 488de6630d..4f3785cfa4 100644 --- a/package/network/services/igmpproxy/Makefile +++ b/package/network/services/igmpproxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=igmpproxy -PKG_VERSION:=0.2.1 -PKG_RELEASE:=4 +PKG_VERSION:=0.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/pali/igmpproxy/releases/download/${PKG_VERSION}/ -PKG_HASH:=d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1 +PKG_HASH:=d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb PKG_MAINTAINER:=Felix Fietkau include $(INCLUDE_DIR)/package.mk @@ -39,14 +39,6 @@ define Package/igmpproxy/conffiles /etc/config/igmpproxy endef -TARGET_CFLAGS += -Dlog=igmpproxy_log - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/src \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" -endef - define Package/igmpproxy/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/igmpproxy.config $(1)/etc/config/igmpproxy diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 7a25b35755..a466c82e9f 100644 --- a/package/network/utils/bpftools/Makefile +++ b/package/network/utils/bpftools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bpftools -PKG_VERSION:=5.10.10 +PKG_VERSION:=5.11.2 PKG_RELEASE:=1 PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x -PKG_HASH:=60ed866fa951522a5255ea37ec3ac2006d3f3427d4783a13ef478464f37cdb19 +PKG_HASH:=904a5b3cbaf5264ef8da6c7a5445fa7ea19168ad77fb83a7cc1b8ba95d52d0a0 PKG_MAINTAINER:=Tony Ambardar diff --git a/package/network/utils/bpftools/patches/005-tools-arch-powerpc-fix-EDEADLOCK-redefinition-errors.patch b/package/network/utils/bpftools/patches/005-tools-arch-powerpc-fix-EDEADLOCK-redefinition-errors.patch index 66c00a325f..996ffc43ee 100644 --- a/package/network/utils/bpftools/patches/005-tools-arch-powerpc-fix-EDEADLOCK-redefinition-errors.patch +++ b/package/network/utils/bpftools/patches/005-tools-arch-powerpc-fix-EDEADLOCK-redefinition-errors.patch @@ -39,8 +39,6 @@ Signed-off-by: Tony Ambardar tools/arch/powerpc/include/uapi/asm/errno.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/tools/arch/powerpc/include/uapi/asm/errno.h b/tools/arch/powerpc/include/uapi/asm/errno.h -index cc79856896a1..4ba87de32be0 100644 --- a/tools/arch/powerpc/include/uapi/asm/errno.h +++ b/tools/arch/powerpc/include/uapi/asm/errno.h @@ -2,6 +2,7 @@ @@ -51,6 +49,3 @@ index cc79856896a1..4ba87de32be0 100644 #include #undef EDEADLOCK --- -2.25.1 - diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 79bfe567a5..388a151ee0 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=5.10.0 +PKG_VERSION:=5.11.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=a54a34ae309c0406b2d1fb3a46158613ffb83d33fefd5d4a27f0010237ac53e9 +PKG_HASH:=c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 @@ -47,7 +47,7 @@ $(call Package/iproute2/Default) VARIANT:=full PROVIDES:=ip ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full - DEPENDS:=+libnl-tiny +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +libcap + DEPENDS:=+libnl-tiny +libbpf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +libcap endef define Package/tc @@ -55,56 +55,59 @@ $(call Package/iproute2/Default) TITLE:=Traffic control utility VARIANT:=tc PROVIDES:=tc - DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap + DEPENDS:=+kmod-sched-core +libxtables +libbpf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap endef define Package/genl $(call Package/iproute2/Default) TITLE:=General netlink utility frontend - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap + DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap endef define Package/ip-bridge $(call Package/iproute2/Default) TITLE:=Bridge configuration utility from iproute2 - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap + DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap endef define Package/ss $(call Package/iproute2/Default) TITLE:=Socket statistics utility - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap +kmod-netlink-diag + DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap +kmod-netlink-diag endef define Package/nstat $(call Package/iproute2/Default) TITLE:=Network statistics utility - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap + DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap endef define Package/devlink $(call Package/iproute2/Default) TITLE:=Network devlink utility - DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap + DEPENDS:=+libmnl +PACKAGE_ip-full:libcap endef define Package/rdma $(call Package/iproute2/Default) TITLE:=Network rdma utility - DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap + DEPENDS:=+libmnl +PACKAGE_ip-full:libcap endef ifeq ($(BUILD_VARIANT),tiny) IP_CONFIG_TINY:=y + LIBBPF_FORCE:=off endif ifeq ($(BUILD_VARIANT),full) HAVE_ELF:=y - HAVE_CAP:=y + LIBBPF_FORCE:=on + HAVE_CAP:=n endif ifeq ($(BUILD_VARIANT),tc) HAVE_ELF:=y + LIBBPF_FORCE:=on SHARED_LIBS:=y endif @@ -122,26 +125,29 @@ define Build/Configure endef TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections +TARGET_LDFLAGS += -Wl,--gc-sections -Wl,--as-needed TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny MAKE_FLAGS += \ KERNEL_INCLUDE="$(LINUX_DIR)/user_headers/include" \ SHARED_LIBS=$(SHARED_LIBS) \ IP_CONFIG_TINY=$(IP_CONFIG_TINY) \ + LIBBPF_FORCE=$(LIBBPF_FORCE) \ HAVE_ELF=$(HAVE_ELF) \ HAVE_MNL=$(HAVE_MNL) \ HAVE_CAP=$(HAVE_CAP) \ IPT_LIB_DIR=/usr/lib/iptables \ XT_LIB_DIR=/usr/lib/iptables \ - FPIC="$(FPIC)" + FPIC="$(FPIC)" \ + $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') define Build/Compile +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/include/iproute2 + $(CP) $(PKG_BUILD_DIR)/include/bpf_elf.h $(1)/usr/include/iproute2 $(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink}.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ diff --git a/package/network/utils/iproute2/patches/100-configure.patch b/package/network/utils/iproute2/patches/100-configure.patch index 0c19b2086a..f70b7199b6 100644 --- a/package/network/utils/iproute2/patches/100-configure.patch +++ b/package/network/utils/iproute2/patches/100-configure.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -34,7 +34,8 @@ int main(int argc, char **argv) { +@@ -39,7 +39,8 @@ int main(int argc, char **argv) { } EOF diff --git a/package/network/utils/iproute2/patches/130-no_netem.patch b/package/network/utils/iproute2/patches/130-no_netem.patch index aa93366f29..7d2fa03945 100644 --- a/package/network/utils/iproute2/patches/130-no_netem.patch +++ b/package/network/utils/iproute2/patches/130-no_netem.patch @@ -4,8 +4,8 @@ CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v --SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man -+SUBDIRS=lib ip tc bridge misc genl tipc devlink rdma man +-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man ++SUBDIRS=lib ip tc bridge misc genl tipc devlink rdma dcb man LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a LDLIBS += $(LIBNETLINK) diff --git a/package/network/utils/iproute2/patches/140-allow_pfifo_fast.patch b/package/network/utils/iproute2/patches/140-allow_pfifo_fast.patch index bb898a40d6..13de48f412 100644 --- a/package/network/utils/iproute2/patches/140-allow_pfifo_fast.patch +++ b/package/network/utils/iproute2/patches/140-allow_pfifo_fast.patch @@ -1,6 +1,6 @@ --- a/tc/q_fifo.c +++ b/tc/q_fifo.c -@@ -99,5 +99,6 @@ struct qdisc_util pfifo_head_drop_qdisc_ +@@ -95,5 +95,6 @@ struct qdisc_util pfifo_head_drop_qdisc_ struct qdisc_util pfifo_fast_qdisc_util = { .id = "pfifo_fast", diff --git a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch index 20cd0766a1..a11a2a3fab 100644 --- a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch +++ b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -257,7 +257,7 @@ check_selinux() +@@ -367,7 +367,7 @@ check_selinux() check_mnl() { diff --git a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch index d25c719f8e..c780022d1a 100644 --- a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch +++ b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -230,7 +230,7 @@ EOF +@@ -235,7 +235,7 @@ EOF check_elf() { diff --git a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch index d15549e3d2..8cd4e4ae6a 100644 --- a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch +++ b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -315,7 +315,7 @@ EOF +@@ -425,7 +425,7 @@ EOF check_cap() { diff --git a/package/network/utils/iproute2/patches/160-libnetlink-pic.patch b/package/network/utils/iproute2/patches/160-libnetlink-pic.patch index aad87a1e4f..145ec7a9ea 100644 --- a/package/network/utils/iproute2/patches/160-libnetlink-pic.patch +++ b/package/network/utils/iproute2/patches/160-libnetlink-pic.patch @@ -7,5 +7,5 @@ -CFLAGS += -fPIC +CFLAGS += $(FPIC) - UTILOBJ = utils.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ - inet_proto.o namespace.o json_writer.o json_print.o \ + UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ + inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \ diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch index c9b28dfe77..d5e5b36936 100644 --- a/package/network/utils/iproute2/patches/170-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch @@ -25,7 +25,7 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -48,10 +48,16 @@ static void usage(void) +@@ -64,10 +64,16 @@ static void usage(void) fprintf(stderr, "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n" " ip [ -force ] -batch filename\n" @@ -42,7 +42,7 @@ " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " -h[uman-readable] | -iec | -j[son] | -p[retty] |\n" " -f[amily] { inet | inet6 | mpls | bridge | link } |\n" -@@ -74,36 +80,50 @@ static const struct cmd { +@@ -90,36 +96,50 @@ static const struct cmd { int (*func)(int argc, char **argv); } cmds[] = { { "address", do_ipaddr }, @@ -103,6 +103,6 @@ + CFLAGS += -DIPROUTE2_TINY +endif + - UTILOBJ = utils.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ - inet_proto.o namespace.o json_writer.o json_print.o \ - names.o color.o bpf.o exec.o fs.o cg_map.o + UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ + inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \ + names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o diff --git a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch index 0d3cbe8dfb..bf335e0800 100644 --- a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch +++ b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -301,14 +301,8 @@ EOF +@@ -411,14 +411,8 @@ EOF if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then echo "no" else diff --git a/package/network/utils/iproute2/patches/300-selinux-configurable.patch b/package/network/utils/iproute2/patches/300-selinux-configurable.patch index 4cda30f978..33c5279aec 100644 --- a/package/network/utils/iproute2/patches/300-selinux-configurable.patch +++ b/package/network/utils/iproute2/patches/300-selinux-configurable.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -244,7 +244,7 @@ check_elf() +@@ -354,7 +354,7 @@ check_libbpf() check_selinux() # SELinux is a compile time option in the ss utility { diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index 2b5f96b206..46bd871ccb 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -12,7 +12,7 @@ PKG_RELEASE:=1 PKG_MAINTAINER:= PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates +PKG_SOURCE_URL:=@DEBIAN/pool/main/c/ca-certificates PKG_HASH:=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665 PKG_INSTALL:=1 diff --git a/package/system/selinux-policy/Makefile b/package/system/selinux-policy/Makefile index 8f5a290fa6..759a8eff93 100644 --- a/package/system/selinux-policy/Makefile +++ b/package/system/selinux-policy/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=selinux-policy PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git -PKG_VERSION:=0.6 -PKG_MIRROR_HASH:=55a27eab67f39a03ba586691984a04234d16b97e816bca17ac42c94aae01c3c6 +PKG_VERSION:=0.7 +PKG_MIRROR_HASH:=f9c555dfa2bb16e6bfd86f1481aad26fce72e5aa45e297e1b39636b6dd0ce021 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index db5fc6c034..50290a2134 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -30,7 +30,12 @@ get_dhcp_ntp_servers() { validate_ntp_section() { uci_load_validate system timeserver "$1" "$2" \ - 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)' + 'dhcp_interface:list(string)' \ + 'enable_server:bool:0' \ + 'enabled:bool:1' \ + 'interface:string' \ + 'server:list(host)' \ + 'use_dhcp:bool:1' } start_ntpd_instance() { @@ -49,7 +54,10 @@ start_ntpd_instance() { procd_open_instance procd_set_param command "$PROG" -n -N - [ "$enable_server" = "1" ] && procd_append_param command -l + if [ "$enable_server" = "1" ]; then + procd_append_param command -l + [ -n "$interface" ] && procd_append_param command -I $interface + fi [ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT" for peer in $server; do procd_append_param command -p $peer diff --git a/scripts/download.pl b/scripts/download.pl index 8d40646694..59d29f19d3 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -196,6 +196,10 @@ foreach my $mirror (@ARGV) { } } elsif ($mirror =~ /^\@OPENWRT$/) { # use OpenWrt source server directly + } elsif ($mirror =~ /^\@DEBIAN\/(.+)$/) { + push @mirrors, "https://ftp.debian.org/debian/$1"; + push @mirrors, "https://mirror.leaseweb.com/debian/$1"; + push @mirrors, "https://mirror.netcologne.de/debian/$1"; } elsif ($mirror =~ /^\@APACHE\/(.+)$/) { push @mirrors, "https://mirrors.cloud.tencent.com/apache/$1"; push @mirrors, "https://mirrors.aliyun.com/apache/$1"; @@ -259,6 +263,7 @@ foreach my $mirror (@ARGV) { push @mirrors, "ftp://www.mirrorservice.org/sites/ftp.kernel.org/pub/$dir"; } } elsif ($mirror =~ /^\@GNOME\/(.+)$/) { + push @mirrors, "https://download.gnome.org/sources/$1"; push @mirrors, "https://mirrors.ustc.edu.cn/gnome/sources/$1"; push @mirrors, "https://mirror.csclub.uwaterloo.ca/gnome/sources/$1"; push @mirrors, "http://ftp.acc.umu.se/pub/GNOME/sources/$1"; diff --git a/toolchain/Makefile b/toolchain/Makefile index 5dccf8f829..b095d13ac3 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -29,7 +29,7 @@ curdir:=toolchain # subdirectories to descend into -$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm) +$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm) autoconf-lean # builddir dependencies ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) @@ -48,6 +48,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/compile $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile $(curdir)/kernel-headers/compile $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/compile + $(curdir)/autoconf-lean/compile:=$(curdir)/gcc/final/compile endif ifndef DUMP_TARGET_DB diff --git a/toolchain/autoconf-lean/Makefile b/toolchain/autoconf-lean/Makefile new file mode 100644 index 0000000000..5971e9fe5e --- /dev/null +++ b/toolchain/autoconf-lean/Makefile @@ -0,0 +1,65 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=autoconf-lean +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2012-09-01 +PKG_SOURCE_URL:=https://github.com/GregorR/autoconf-lean +PKG_SOURCE_VERSION:=bd81206959881c511b28e16e81b0a281fd15bd02 + +PKG_HASH:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 + +HOST_FIXUP := autoreconf + +HOST_BUILD_PREFIX:=$(TOOLCHAIN_DIR) +BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) + +include $(INCLUDE_DIR)/host-build.mk + +HOST_CONFIG_SITE:=$(CURDIR)/config.site + +CONFIGURE_PATH := config-site-generator + +HOST_CONFIGURE_VARS := \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CXXFLAGS="$(TARGET_CXXFLAGS)" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" + +HOST_CONFIGURE_ARGS := \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=$(TOOLCHAIN_DIR) \ + --exec-prefix=$(TOOLCHAIN_DIR) \ + --bindir=$(TOOLCHAIN_DIR)/bin \ + --sbindir=$(TOOLCHAIN_DIR)/sbin \ + --libexecdir=$(TOOLCHAIN_DIR)/lib + +HOST_MAKE_VARS := + +HOST_MAKE_FLAGS := + +define Host/Configure + $(call Host/Configure/Default,,,config-site-generator) +endef + +define Host/Compile + $(MAKE) -C $(HOST_BUILD_DIR)/config-site-generator +endef + +define Host/Install + grep -v '/' \ + $(HOST_BUILD_DIR)/config-site-generator/config.site \ + > $(TOOLCHAIN_DIR)/config.site +endef + +$(eval $(call HostBuild)) diff --git a/toolchain/autoconf-lean/config.site b/toolchain/autoconf-lean/config.site new file mode 100644 index 0000000000..d2625160ef --- /dev/null +++ b/toolchain/autoconf-lean/config.site @@ -0,0 +1,1630 @@ +# generic defaults for speeding up generating the real config.site +ac_cv_c_backslash_a=${ac_cv_c_backslash_a=yes} +ac_cv_c_compiler_gnu=${ac_cv_c_compiler_gnu=yes} +ac_cv_c_const=${ac_cv_c_const=yes} +ac_cv_c_flexmember=${ac_cv_c_flexmember=yes} +ac_cv_c_inline=${ac_cv_c_inline=inline} +ac_cv_c_int16_t=${ac_cv_c_int16_t=yes} +ac_cv_c_int32_t=${ac_cv_c_int32_t=yes} +ac_cv_c_int64_t=${ac_cv_c_int64_t=yes} +ac_cv_c_int8_t=${ac_cv_c_int8_t=yes} +ac_cv_c_restrict=${ac_cv_c_restrict=__restrict} +ac_cv_c_stringize=${ac_cv_c_stringize=yes} +ac_cv_c_typeof=${ac_cv_c_typeof=typeof} +ac_cv_c_uint16_t=${ac_cv_c_uint16_t=yes} +ac_cv_c_uint32_t=${ac_cv_c_uint32_t=yes} +ac_cv_c_uint64_t=${ac_cv_c_uint64_t=yes} +ac_cv_c_uint8_t=${ac_cv_c_uint8_t=yes} +ac_cv_c_vararrays=${ac_cv_c_vararrays=yes} +ac_cv_c_volatile=${ac_cv_c_volatile=yes} +ac_cv_cxx_compiler_gnu=${ac_cv_cxx_compiler_gnu=yes} +ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} +ac_cv_func___adjtimex=${ac_cv_func___adjtimex=yes} +ac_cv_func___va_copy=${ac_cv_func___va_copy=no} +ac_cv_func__doprnt=${ac_cv_func__doprnt=no} +ac_cv_func__exit=${ac_cv_func__exit=yes} +ac_cv_func_a64l=${ac_cv_func_a64l=yes} +ac_cv_func_abort=${ac_cv_func_abort=yes} +ac_cv_func_abs=${ac_cv_func_abs=yes} +ac_cv_func_accept=${ac_cv_func_accept=yes} +ac_cv_func_access=${ac_cv_func_access=yes} +ac_cv_func_acos=${ac_cv_func_acos=yes} +ac_cv_func_acosf=${ac_cv_func_acosf=yes} +ac_cv_func_acosh=${ac_cv_func_acosh=yes} +ac_cv_func_acoshf=${ac_cv_func_acoshf=yes} +ac_cv_func_acoshl=${ac_cv_func_acoshl=yes} +ac_cv_func_acosl=${ac_cv_func_acosl=yes} +ac_cv_func_addmntent=${ac_cv_func_addmntent=yes} +ac_cv_func_adjtime=${ac_cv_func_adjtime=yes} +ac_cv_func_adjtimex=${ac_cv_func_adjtimex=yes} +ac_cv_func_aio_cancel=${ac_cv_func_aio_cancel=yes} +ac_cv_func_aio_error=${ac_cv_func_aio_error=yes} +ac_cv_func_aio_fsync=${ac_cv_func_aio_fsync=yes} +ac_cv_func_aio_read=${ac_cv_func_aio_read=yes} +ac_cv_func_aio_return=${ac_cv_func_aio_return=yes} +ac_cv_func_aio_suspend=${ac_cv_func_aio_suspend=yes} +ac_cv_func_aio_write=${ac_cv_func_aio_write=yes} +ac_cv_func_alarm=${ac_cv_func_alarm=yes} +ac_cv_func_alloca_works=${ac_cv_func_alloca_works=yes} +ac_cv_func_alphasort64=${ac_cv_func_alphasort64=yes} +ac_cv_func_alphasort=${ac_cv_func_alphasort=yes} +ac_cv_func_asctime=${ac_cv_func_asctime=yes} +ac_cv_func_asctime_r=${ac_cv_func_asctime_r=yes} +ac_cv_func_asin=${ac_cv_func_asin=yes} +ac_cv_func_asinf=${ac_cv_func_asinf=yes} +ac_cv_func_asinh=${ac_cv_func_asinh=yes} +ac_cv_func_asinhf=${ac_cv_func_asinhf=yes} +ac_cv_func_asinhl=${ac_cv_func_asinhl=yes} +ac_cv_func_asinl=${ac_cv_func_asinl=yes} +ac_cv_func_asprintf=${ac_cv_func_asprintf=yes} +ac_cv_func_atan2=${ac_cv_func_atan2=yes} +ac_cv_func_atan2f=${ac_cv_func_atan2f=yes} +ac_cv_func_atan2l=${ac_cv_func_atan2l=yes} +ac_cv_func_atan=${ac_cv_func_atan=yes} +ac_cv_func_atanf=${ac_cv_func_atanf=yes} +ac_cv_func_atanh=${ac_cv_func_atanh=yes} +ac_cv_func_atanhf=${ac_cv_func_atanhf=yes} +ac_cv_func_atanhl=${ac_cv_func_atanhl=yes} +ac_cv_func_atanl=${ac_cv_func_atanl=yes} +ac_cv_func_atexit=${ac_cv_func_atexit=yes} +ac_cv_func_atof=${ac_cv_func_atof=yes} +ac_cv_func_atoi=${ac_cv_func_atoi=yes} +ac_cv_func_atol=${ac_cv_func_atol=yes} +ac_cv_func_atoll=${ac_cv_func_atoll=yes} +ac_cv_func_basename=${ac_cv_func_basename=yes} +ac_cv_func_bcmp=${ac_cv_func_bcmp=yes} +ac_cv_func_bcopy=${ac_cv_func_bcopy=yes} +ac_cv_func_bind=${ac_cv_func_bind=yes} +ac_cv_func_bind_textdomain_codeset=${ac_cv_func_bind_textdomain_codeset=yes} +ac_cv_func_bindtextdomain=${ac_cv_func_bindtextdomain=yes} +ac_cv_func_brk=${ac_cv_func_brk=yes} +ac_cv_func_bsd_signal=${ac_cv_func_bsd_signal=yes} +ac_cv_func_bsearch=${ac_cv_func_bsearch=yes} +ac_cv_func_btowc=${ac_cv_func_btowc=yes} +ac_cv_func_bzero=${ac_cv_func_bzero=yes} +ac_cv_func_cabs=${ac_cv_func_cabs=yes} +ac_cv_func_cabsf=${ac_cv_func_cabsf=yes} +ac_cv_func_cabsl=${ac_cv_func_cabsl=yes} +ac_cv_func_cacos=${ac_cv_func_cacos=yes} +ac_cv_func_cacosf=${ac_cv_func_cacosf=yes} +ac_cv_func_cacosh=${ac_cv_func_cacosh=yes} +ac_cv_func_cacoshf=${ac_cv_func_cacoshf=yes} +ac_cv_func_cacoshl=${ac_cv_func_cacoshl=yes} +ac_cv_func_cacosl=${ac_cv_func_cacosl=yes} +ac_cv_func_calloc=${ac_cv_func_calloc=yes} +ac_cv_func_capget=${ac_cv_func_capget=yes} +ac_cv_func_capset=${ac_cv_func_capset=yes} +ac_cv_func_carg=${ac_cv_func_carg=yes} +ac_cv_func_cargf=${ac_cv_func_cargf=yes} +ac_cv_func_cargl=${ac_cv_func_cargl=yes} +ac_cv_func_casin=${ac_cv_func_casin=yes} +ac_cv_func_casinf=${ac_cv_func_casinf=yes} +ac_cv_func_casinh=${ac_cv_func_casinh=yes} +ac_cv_func_casinhf=${ac_cv_func_casinhf=yes} +ac_cv_func_casinhl=${ac_cv_func_casinhl=yes} +ac_cv_func_casinl=${ac_cv_func_casinl=yes} +ac_cv_func_catan=${ac_cv_func_catan=yes} +ac_cv_func_catanf=${ac_cv_func_catanf=yes} +ac_cv_func_catanh=${ac_cv_func_catanh=yes} +ac_cv_func_catanhf=${ac_cv_func_catanhf=yes} +ac_cv_func_catanhl=${ac_cv_func_catanhl=yes} +ac_cv_func_catanl=${ac_cv_func_catanl=yes} +ac_cv_func_catclose=${ac_cv_func_catclose=yes} +ac_cv_func_catgets=${ac_cv_func_catgets=yes} +ac_cv_func_catopen=${ac_cv_func_catopen=yes} +ac_cv_func_cbrt=${ac_cv_func_cbrt=yes} +ac_cv_func_cbrtf=${ac_cv_func_cbrtf=yes} +ac_cv_func_cbrtl=${ac_cv_func_cbrtl=yes} +ac_cv_func_ccos=${ac_cv_func_ccos=yes} +ac_cv_func_ccosf=${ac_cv_func_ccosf=yes} +ac_cv_func_ccosh=${ac_cv_func_ccosh=yes} +ac_cv_func_ccoshf=${ac_cv_func_ccoshf=yes} +ac_cv_func_ccoshl=${ac_cv_func_ccoshl=yes} +ac_cv_func_ccosl=${ac_cv_func_ccosl=yes} +ac_cv_func_ceil=${ac_cv_func_ceil=yes} +ac_cv_func_ceilf=${ac_cv_func_ceilf=yes} +ac_cv_func_ceill=${ac_cv_func_ceill=yes} +ac_cv_func_cexp=${ac_cv_func_cexp=yes} +ac_cv_func_cexpf=${ac_cv_func_cexpf=yes} +ac_cv_func_cexpl=${ac_cv_func_cexpl=yes} +ac_cv_func_cfgetispeed=${ac_cv_func_cfgetispeed=yes} +ac_cv_func_cfgetospeed=${ac_cv_func_cfgetospeed=yes} +ac_cv_func_cfmakeraw=${ac_cv_func_cfmakeraw=yes} +ac_cv_func_cfsetispeed=${ac_cv_func_cfsetispeed=yes} +ac_cv_func_cfsetospeed=${ac_cv_func_cfsetospeed=yes} +ac_cv_func_cfsetspeed=${ac_cv_func_cfsetspeed=yes} +ac_cv_func_chdir=${ac_cv_func_chdir=yes} +ac_cv_func_chmod=${ac_cv_func_chmod=yes} +ac_cv_func_chown=${ac_cv_func_chown=yes} +ac_cv_func_chown_works=${ac_cv_func_chown_works=no} +ac_cv_func_chroot=${ac_cv_func_chroot=yes} +ac_cv_func_cimag=${ac_cv_func_cimag=yes} +ac_cv_func_cimagf=${ac_cv_func_cimagf=yes} +ac_cv_func_cimagl=${ac_cv_func_cimagl=yes} +ac_cv_func_clearenv=${ac_cv_func_clearenv=yes} +ac_cv_func_clearerr=${ac_cv_func_clearerr=yes} +ac_cv_func_clearerr_unlocked=${ac_cv_func_clearerr_unlocked=yes} +ac_cv_func_clock=${ac_cv_func_clock=yes} +ac_cv_func_clock_getcpuclockid=${ac_cv_func_clock_getcpuclockid=yes} +ac_cv_func_clock_getres=${ac_cv_func_clock_getres=yes} +ac_cv_func_clock_gettime=${ac_cv_func_clock_gettime=yes} +ac_cv_func_clock_nanosleep=${ac_cv_func_clock_nanosleep=yes} +ac_cv_func_clock_settime=${ac_cv_func_clock_settime=yes} +ac_cv_func_clog=${ac_cv_func_clog=yes} +ac_cv_func_clogf=${ac_cv_func_clogf=yes} +ac_cv_func_clogl=${ac_cv_func_clogl=yes} +ac_cv_func_clone=${ac_cv_func_clone=yes} +ac_cv_func_close=${ac_cv_func_close=yes} +ac_cv_func_closedir=${ac_cv_func_closedir=yes} +ac_cv_func_closedir_void=${ac_cv_func_closedir_void=yes} +ac_cv_func_closelog=${ac_cv_func_closelog=yes} +ac_cv_func_confstr=${ac_cv_func_confstr=yes} +ac_cv_func_conj=${ac_cv_func_conj=yes} +ac_cv_func_conjf=${ac_cv_func_conjf=yes} +ac_cv_func_conjl=${ac_cv_func_conjl=yes} +ac_cv_func_connect=${ac_cv_func_connect=yes} +ac_cv_func_copysign=${ac_cv_func_copysign=yes} +ac_cv_func_copysignf=${ac_cv_func_copysignf=yes} +ac_cv_func_copysignl=${ac_cv_func_copysignl=yes} +ac_cv_func_cos=${ac_cv_func_cos=yes} +ac_cv_func_cosf=${ac_cv_func_cosf=yes} +ac_cv_func_cosh=${ac_cv_func_cosh=yes} +ac_cv_func_coshf=${ac_cv_func_coshf=yes} +ac_cv_func_coshl=${ac_cv_func_coshl=yes} +ac_cv_func_cosl=${ac_cv_func_cosl=yes} +ac_cv_func_cpow=${ac_cv_func_cpow=yes} +ac_cv_func_cpowf=${ac_cv_func_cpowf=yes} +ac_cv_func_cpowl=${ac_cv_func_cpowl=yes} +ac_cv_func_cproj=${ac_cv_func_cproj=yes} +ac_cv_func_cprojf=${ac_cv_func_cprojf=yes} +ac_cv_func_cprojl=${ac_cv_func_cprojl=yes} +ac_cv_func_creal=${ac_cv_func_creal=yes} +ac_cv_func_crealf=${ac_cv_func_crealf=yes} +ac_cv_func_creall=${ac_cv_func_creall=yes} +ac_cv_func_creat64=${ac_cv_func_creat64=yes} +ac_cv_func_creat=${ac_cv_func_creat=yes} +ac_cv_func_crypt=${ac_cv_func_crypt=yes} +ac_cv_func_crypt_r=${ac_cv_func_crypt_r=yes} +ac_cv_func_csin=${ac_cv_func_csin=yes} +ac_cv_func_csinf=${ac_cv_func_csinf=yes} +ac_cv_func_csinh=${ac_cv_func_csinh=yes} +ac_cv_func_csinhf=${ac_cv_func_csinhf=yes} +ac_cv_func_csinhl=${ac_cv_func_csinhl=yes} +ac_cv_func_csinl=${ac_cv_func_csinl=yes} +ac_cv_func_csqrt=${ac_cv_func_csqrt=yes} +ac_cv_func_csqrtf=${ac_cv_func_csqrtf=yes} +ac_cv_func_csqrtl=${ac_cv_func_csqrtl=yes} +ac_cv_func_ctan=${ac_cv_func_ctan=yes} +ac_cv_func_ctanf=${ac_cv_func_ctanf=yes} +ac_cv_func_ctanh=${ac_cv_func_ctanh=yes} +ac_cv_func_ctanhf=${ac_cv_func_ctanhf=yes} +ac_cv_func_ctanhl=${ac_cv_func_ctanhl=yes} +ac_cv_func_ctanl=${ac_cv_func_ctanl=yes} +ac_cv_func_ctermid=${ac_cv_func_ctermid=yes} +ac_cv_func_ctime=${ac_cv_func_ctime=yes} +ac_cv_func_ctime_r=${ac_cv_func_ctime_r=yes} +ac_cv_func_cuserid=${ac_cv_func_cuserid=yes} +ac_cv_func_daemon=${ac_cv_func_daemon=yes} +ac_cv_func_daylight=${ac_cv_func_daylight=yes} +ac_cv_func_dcgettext=${ac_cv_func_dcgettext=yes} +ac_cv_func_dcngettext=${ac_cv_func_dcngettext=yes} +ac_cv_func_delete_module=${ac_cv_func_delete_module=yes} +ac_cv_func_dgettext=${ac_cv_func_dgettext=yes} +ac_cv_func_difftime=${ac_cv_func_difftime=yes} +ac_cv_func_dirfd=${ac_cv_func_dirfd=yes} +ac_cv_func_dirname=${ac_cv_func_dirname=yes} +ac_cv_func_div=${ac_cv_func_div=yes} +ac_cv_func_dlclose=${ac_cv_func_dlclose=yes} +ac_cv_func_dlerror=${ac_cv_func_dlerror=yes} +ac_cv_func_dlopen=${ac_cv_func_dlopen=yes} +ac_cv_func_dlsym=${ac_cv_func_dlsym=yes} +ac_cv_func_dn_expand=${ac_cv_func_dn_expand=yes} +ac_cv_func_dngettext=${ac_cv_func_dngettext=yes} +ac_cv_func_dprintf=${ac_cv_func_dprintf=yes} +ac_cv_func_drand48=${ac_cv_func_drand48=yes} +ac_cv_func_dup2=${ac_cv_func_dup2=yes} +ac_cv_func_dup=${ac_cv_func_dup=yes} +ac_cv_func_duplocale=${ac_cv_func_duplocale=yes} +ac_cv_func_ecvt=${ac_cv_func_ecvt=yes} +ac_cv_func_endgrent=${ac_cv_func_endgrent=yes} +ac_cv_func_endhostent=${ac_cv_func_endhostent=yes} +ac_cv_func_endmntent=${ac_cv_func_endmntent=yes} +ac_cv_func_endnetent=${ac_cv_func_endnetent=yes} +ac_cv_func_endprotoent=${ac_cv_func_endprotoent=yes} +ac_cv_func_endpwent=${ac_cv_func_endpwent=yes} +ac_cv_func_endservent=${ac_cv_func_endservent=yes} +ac_cv_func_endspent=${ac_cv_func_endspent=yes} +ac_cv_func_endusershell=${ac_cv_func_endusershell=yes} +ac_cv_func_endutent=${ac_cv_func_endutent=yes} +ac_cv_func_endutxent=${ac_cv_func_endutxent=yes} +ac_cv_func_environ=${ac_cv_func_environ=yes} +ac_cv_func_epoll_create1=${ac_cv_func_epoll_create1=yes} +ac_cv_func_epoll_create=${ac_cv_func_epoll_create=yes} +ac_cv_func_epoll_ctl=${ac_cv_func_epoll_ctl=yes} +ac_cv_func_epoll_pwait=${ac_cv_func_epoll_pwait=yes} +ac_cv_func_epoll_wait=${ac_cv_func_epoll_wait=yes} +ac_cv_func_erand48=${ac_cv_func_erand48=yes} +ac_cv_func_erf=${ac_cv_func_erf=yes} +ac_cv_func_erfc=${ac_cv_func_erfc=yes} +ac_cv_func_erfcf=${ac_cv_func_erfcf=yes} +ac_cv_func_erfcl=${ac_cv_func_erfcl=yes} +ac_cv_func_erff=${ac_cv_func_erff=yes} +ac_cv_func_erfl=${ac_cv_func_erfl=yes} +ac_cv_func_err=${ac_cv_func_err=yes} +ac_cv_func_errx=${ac_cv_func_errx=yes} +ac_cv_func_eventfd=${ac_cv_func_eventfd=yes} +ac_cv_func_eventfd_read=${ac_cv_func_eventfd_read=yes} +ac_cv_func_eventfd_write=${ac_cv_func_eventfd_write=yes} +ac_cv_func_execl=${ac_cv_func_execl=yes} +ac_cv_func_execle=${ac_cv_func_execle=yes} +ac_cv_func_execlp=${ac_cv_func_execlp=yes} +ac_cv_func_execv=${ac_cv_func_execv=yes} +ac_cv_func_execve=${ac_cv_func_execve=yes} +ac_cv_func_execvp=${ac_cv_func_execvp=yes} +ac_cv_func_exit=${ac_cv_func_exit=yes} +ac_cv_func_exp10=${ac_cv_func_exp10=yes} +ac_cv_func_exp10f=${ac_cv_func_exp10f=yes} +ac_cv_func_exp10l=${ac_cv_func_exp10l=yes} +ac_cv_func_exp2=${ac_cv_func_exp2=yes} +ac_cv_func_exp2f=${ac_cv_func_exp2f=yes} +ac_cv_func_exp2l=${ac_cv_func_exp2l=yes} +ac_cv_func_exp=${ac_cv_func_exp=yes} +ac_cv_func_expf=${ac_cv_func_expf=yes} +ac_cv_func_expl=${ac_cv_func_expl=yes} +ac_cv_func_expm1=${ac_cv_func_expm1=yes} +ac_cv_func_expm1f=${ac_cv_func_expm1f=yes} +ac_cv_func_expm1l=${ac_cv_func_expm1l=yes} +ac_cv_func_fabs=${ac_cv_func_fabs=yes} +ac_cv_func_fabsf=${ac_cv_func_fabsf=yes} +ac_cv_func_fabsl=${ac_cv_func_fabsl=yes} +ac_cv_func_faccessat=${ac_cv_func_faccessat=yes} +ac_cv_func_fchdir=${ac_cv_func_fchdir=yes} +ac_cv_func_fchmod=${ac_cv_func_fchmod=yes} +ac_cv_func_fchmodat=${ac_cv_func_fchmodat=yes} +ac_cv_func_fchown=${ac_cv_func_fchown=yes} +ac_cv_func_fchownat=${ac_cv_func_fchownat=yes} +ac_cv_func_fclose=${ac_cv_func_fclose=yes} +ac_cv_func_fcntl=${ac_cv_func_fcntl=yes} +ac_cv_func_fcvt=${ac_cv_func_fcvt=yes} +ac_cv_func_fdatasync=${ac_cv_func_fdatasync=yes} +ac_cv_func_fdim=${ac_cv_func_fdim=yes} +ac_cv_func_fdimf=${ac_cv_func_fdimf=yes} +ac_cv_func_fdiml=${ac_cv_func_fdiml=yes} +ac_cv_func_fdopen=${ac_cv_func_fdopen=yes} +ac_cv_func_fdopendir=${ac_cv_func_fdopendir=yes} +ac_cv_func_feclearexcept=${ac_cv_func_feclearexcept=yes} +ac_cv_func_fegetenv=${ac_cv_func_fegetenv=yes} +ac_cv_func_fegetexceptflag=${ac_cv_func_fegetexceptflag=yes} +ac_cv_func_fegetround=${ac_cv_func_fegetround=yes} +ac_cv_func_feholdexcept=${ac_cv_func_feholdexcept=yes} +ac_cv_func_feof=${ac_cv_func_feof=yes} +ac_cv_func_feof_unlocked=${ac_cv_func_feof_unlocked=yes} +ac_cv_func_feraiseexcept=${ac_cv_func_feraiseexcept=yes} +ac_cv_func_ferror=${ac_cv_func_ferror=yes} +ac_cv_func_ferror_unlocked=${ac_cv_func_ferror_unlocked=yes} +ac_cv_func_fesetenv=${ac_cv_func_fesetenv=yes} +ac_cv_func_fesetexceptflag=${ac_cv_func_fesetexceptflag=yes} +ac_cv_func_fesetround=${ac_cv_func_fesetround=yes} +ac_cv_func_fetestexcept=${ac_cv_func_fetestexcept=yes} +ac_cv_func_feupdateenv=${ac_cv_func_feupdateenv=yes} +ac_cv_func_fexecve=${ac_cv_func_fexecve=yes} +ac_cv_func_fflush=${ac_cv_func_fflush=yes} +ac_cv_func_fflush_unlocked=${ac_cv_func_fflush_unlocked=yes} +ac_cv_func_ffs=${ac_cv_func_ffs=yes} +ac_cv_func_fgetc=${ac_cv_func_fgetc=yes} +ac_cv_func_fgetc_unlocked=${ac_cv_func_fgetc_unlocked=yes} +ac_cv_func_fgetln=${ac_cv_func_fgetln=yes} +ac_cv_func_fgetpos64=${ac_cv_func_fgetpos64=yes} +ac_cv_func_fgetpos=${ac_cv_func_fgetpos=yes} +ac_cv_func_fgetpwent=${ac_cv_func_fgetpwent=yes} +ac_cv_func_fgets=${ac_cv_func_fgets=yes} +ac_cv_func_fgets_unlocked=${ac_cv_func_fgets_unlocked=yes} +ac_cv_func_fgetwc=${ac_cv_func_fgetwc=yes} +ac_cv_func_fgetwc_unlocked=${ac_cv_func_fgetwc_unlocked=yes} +ac_cv_func_fgetws=${ac_cv_func_fgetws=yes} +ac_cv_func_fgetws_unlocked=${ac_cv_func_fgetws_unlocked=yes} +ac_cv_func_fgetxattr=${ac_cv_func_fgetxattr=yes} +ac_cv_func_fileno=${ac_cv_func_fileno=yes} +ac_cv_func_fileno_unlocked=${ac_cv_func_fileno_unlocked=yes} +ac_cv_func_flistxattr=${ac_cv_func_flistxattr=yes} +ac_cv_func_flock=${ac_cv_func_flock=yes} +ac_cv_func_flockfile=${ac_cv_func_flockfile=yes} +ac_cv_func_floor=${ac_cv_func_floor=yes} +ac_cv_func_floorf=${ac_cv_func_floorf=yes} +ac_cv_func_floorl=${ac_cv_func_floorl=yes} +ac_cv_func_fma=${ac_cv_func_fma=yes} +ac_cv_func_fmaf=${ac_cv_func_fmaf=yes} +ac_cv_func_fmal=${ac_cv_func_fmal=yes} +ac_cv_func_fmax=${ac_cv_func_fmax=yes} +ac_cv_func_fmaxf=${ac_cv_func_fmaxf=yes} +ac_cv_func_fmaxl=${ac_cv_func_fmaxl=yes} +ac_cv_func_fmemopen=${ac_cv_func_fmemopen=yes} +ac_cv_func_fmin=${ac_cv_func_fmin=yes} +ac_cv_func_fminf=${ac_cv_func_fminf=yes} +ac_cv_func_fminl=${ac_cv_func_fminl=yes} +ac_cv_func_fmod=${ac_cv_func_fmod=yes} +ac_cv_func_fmodf=${ac_cv_func_fmodf=yes} +ac_cv_func_fmodl=${ac_cv_func_fmodl=yes} +ac_cv_func_fnmatch=${ac_cv_func_fnmatch=yes} +ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=cross} +ac_cv_func_fopen64=${ac_cv_func_fopen64=yes} +ac_cv_func_fopen=${ac_cv_func_fopen=yes} +ac_cv_func_fork=${ac_cv_func_fork=yes} +ac_cv_func_fork_works=${ac_cv_func_fork_works=yes} +ac_cv_func_forkpty=${ac_cv_func_forkpty=yes} +ac_cv_func_fpathconf=${ac_cv_func_fpathconf=yes} +ac_cv_func_fprintf=${ac_cv_func_fprintf=yes} +ac_cv_func_fpurge=${ac_cv_func_fpurge=yes} +ac_cv_func_fputc=${ac_cv_func_fputc=yes} +ac_cv_func_fputc_unlocked=${ac_cv_func_fputc_unlocked=yes} +ac_cv_func_fputs=${ac_cv_func_fputs=yes} +ac_cv_func_fputs_unlocked=${ac_cv_func_fputs_unlocked=yes} +ac_cv_func_fputwc=${ac_cv_func_fputwc=yes} +ac_cv_func_fputwc_unlocked=${ac_cv_func_fputwc_unlocked=yes} +ac_cv_func_fputws=${ac_cv_func_fputws=yes} +ac_cv_func_fputws_unlocked=${ac_cv_func_fputws_unlocked=yes} +ac_cv_func_fread=${ac_cv_func_fread=yes} +ac_cv_func_fread_unlocked=${ac_cv_func_fread_unlocked=yes} +ac_cv_func_free=${ac_cv_func_free=yes} +ac_cv_func_freeaddrinfo=${ac_cv_func_freeaddrinfo=yes} +ac_cv_func_freelocale=${ac_cv_func_freelocale=yes} +ac_cv_func_fremovexattr=${ac_cv_func_fremovexattr=yes} +ac_cv_func_freopen64=${ac_cv_func_freopen64=yes} +ac_cv_func_freopen=${ac_cv_func_freopen=yes} +ac_cv_func_frexp=${ac_cv_func_frexp=yes} +ac_cv_func_frexpf=${ac_cv_func_frexpf=yes} +ac_cv_func_frexpl=${ac_cv_func_frexpl=yes} +ac_cv_func_fscanf=${ac_cv_func_fscanf=yes} +ac_cv_func_fseek=${ac_cv_func_fseek=yes} +ac_cv_func_fseeko64=${ac_cv_func_fseeko64=yes} +ac_cv_func_fseeko=${ac_cv_func_fseeko=yes} +ac_cv_func_fsetpos64=${ac_cv_func_fsetpos64=yes} +ac_cv_func_fsetpos=${ac_cv_func_fsetpos=yes} +ac_cv_func_fsetxattr=${ac_cv_func_fsetxattr=yes} +ac_cv_func_fstat64=${ac_cv_func_fstat64=yes} +ac_cv_func_fstat=${ac_cv_func_fstat=yes} +ac_cv_func_fstatat64=${ac_cv_func_fstatat64=yes} +ac_cv_func_fstatat=${ac_cv_func_fstatat=yes} +ac_cv_func_fstatfs64=${ac_cv_func_fstatfs64=yes} +ac_cv_func_fstatfs=${ac_cv_func_fstatfs=yes} +ac_cv_func_fstatvfs64=${ac_cv_func_fstatvfs64=yes} +ac_cv_func_fstatvfs=${ac_cv_func_fstatvfs=yes} +ac_cv_func_fsync=${ac_cv_func_fsync=yes} +ac_cv_func_ftell=${ac_cv_func_ftell=yes} +ac_cv_func_ftello64=${ac_cv_func_ftello64=yes} +ac_cv_func_ftello=${ac_cv_func_ftello=yes} +ac_cv_func_ftok=${ac_cv_func_ftok=yes} +ac_cv_func_ftruncate64=${ac_cv_func_ftruncate64=yes} +ac_cv_func_ftruncate=${ac_cv_func_ftruncate=yes} +ac_cv_func_ftrylockfile=${ac_cv_func_ftrylockfile=yes} +ac_cv_func_ftw64=${ac_cv_func_ftw64=yes} +ac_cv_func_ftw=${ac_cv_func_ftw=yes} +ac_cv_func_funlockfile=${ac_cv_func_funlockfile=yes} +ac_cv_func_futimens=${ac_cv_func_futimens=yes} +ac_cv_func_futimes=${ac_cv_func_futimes=yes} +ac_cv_func_fwide=${ac_cv_func_fwide=yes} +ac_cv_func_fwprintf=${ac_cv_func_fwprintf=yes} +ac_cv_func_fwrite=${ac_cv_func_fwrite=yes} +ac_cv_func_fwrite_unlocked=${ac_cv_func_fwrite_unlocked=yes} +ac_cv_func_fwscanf=${ac_cv_func_fwscanf=yes} +ac_cv_func_gai_strerror=${ac_cv_func_gai_strerror=yes} +ac_cv_func_gcvt=${ac_cv_func_gcvt=yes} +ac_cv_func_get_current_dir_name=${ac_cv_func_get_current_dir_name=yes} +ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} +ac_cv_func_getc=${ac_cv_func_getc=yes} +ac_cv_func_getc_unlocked=${ac_cv_func_getc_unlocked=yes} +ac_cv_func_getchar=${ac_cv_func_getchar=yes} +ac_cv_func_getchar_unlocked=${ac_cv_func_getchar_unlocked=yes} +ac_cv_func_getcwd=${ac_cv_func_getcwd=yes} +ac_cv_func_getdate=${ac_cv_func_getdate=yes} +ac_cv_func_getdate_err=${ac_cv_func_getdate_err=yes} +ac_cv_func_getdelim=${ac_cv_func_getdelim=yes} +ac_cv_func_getdents64=${ac_cv_func_getdents64=yes} +ac_cv_func_getdents=${ac_cv_func_getdents=yes} +ac_cv_func_getdomainname=${ac_cv_func_getdomainname=yes} +ac_cv_func_getdtablesize=${ac_cv_func_getdtablesize=yes} +ac_cv_func_getegid=${ac_cv_func_getegid=yes} +ac_cv_func_getenv=${ac_cv_func_getenv=yes} +ac_cv_func_geteuid=${ac_cv_func_geteuid=yes} +ac_cv_func_getgid=${ac_cv_func_getgid=yes} +ac_cv_func_getgrent=${ac_cv_func_getgrent=yes} +ac_cv_func_getgrgid=${ac_cv_func_getgrgid=yes} +ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes} +ac_cv_func_getgrnam=${ac_cv_func_getgrnam=yes} +ac_cv_func_getgrnam_r=${ac_cv_func_getgrnam_r=yes} +ac_cv_func_getgrouplist=${ac_cv_func_getgrouplist=yes} +ac_cv_func_getgroups=${ac_cv_func_getgroups=yes} +ac_cv_func_getgroups_works=${ac_cv_func_getgroups_works=no} +ac_cv_func_gethostbyaddr=${ac_cv_func_gethostbyaddr=yes} +ac_cv_func_gethostbyaddr_r=${ac_cv_func_gethostbyaddr_r=yes} +ac_cv_func_gethostbyname2=${ac_cv_func_gethostbyname2=yes} +ac_cv_func_gethostbyname2_r=${ac_cv_func_gethostbyname2_r=yes} +ac_cv_func_gethostbyname=${ac_cv_func_gethostbyname=yes} +ac_cv_func_gethostbyname_r=${ac_cv_func_gethostbyname_r=yes} +ac_cv_func_gethostent=${ac_cv_func_gethostent=yes} +ac_cv_func_gethostid=${ac_cv_func_gethostid=yes} +ac_cv_func_gethostname=${ac_cv_func_gethostname=yes} +ac_cv_func_getitimer=${ac_cv_func_getitimer=yes} +ac_cv_func_getline=${ac_cv_func_getline=yes} +ac_cv_func_getloadavg=${ac_cv_func_getloadavg=yes} +ac_cv_func_getloadavg_setgid=${ac_cv_func_getloadavg_setgid=no} +ac_cv_func_getlogin=${ac_cv_func_getlogin=yes} +ac_cv_func_getlogin_r=${ac_cv_func_getlogin_r=yes} +ac_cv_func_getmntent=${ac_cv_func_getmntent=yes} +ac_cv_func_getmntent_r=${ac_cv_func_getmntent_r=yes} +ac_cv_func_getnameinfo=${ac_cv_func_getnameinfo=yes} +ac_cv_func_getnetbyaddr=${ac_cv_func_getnetbyaddr=yes} +ac_cv_func_getnetbyname=${ac_cv_func_getnetbyname=yes} +ac_cv_func_getnetent=${ac_cv_func_getnetent=yes} +ac_cv_func_getopt=${ac_cv_func_getopt=yes} +ac_cv_func_getopt_long=${ac_cv_func_getopt_long=yes} +ac_cv_func_getopt_long_only=${ac_cv_func_getopt_long_only=yes} +ac_cv_func_getpagesize=${ac_cv_func_getpagesize=yes} +ac_cv_func_getpass=${ac_cv_func_getpass=yes} +ac_cv_func_getpeername=${ac_cv_func_getpeername=yes} +ac_cv_func_getpgid=${ac_cv_func_getpgid=yes} +ac_cv_func_getpgrp=${ac_cv_func_getpgrp=yes} +ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes} +ac_cv_func_getpid=${ac_cv_func_getpid=yes} +ac_cv_func_getppid=${ac_cv_func_getppid=yes} +ac_cv_func_getpriority=${ac_cv_func_getpriority=yes} +ac_cv_func_getprotobyname=${ac_cv_func_getprotobyname=yes} +ac_cv_func_getprotobynumber=${ac_cv_func_getprotobynumber=yes} +ac_cv_func_getprotoent=${ac_cv_func_getprotoent=yes} +ac_cv_func_getpwent=${ac_cv_func_getpwent=yes} +ac_cv_func_getpwnam=${ac_cv_func_getpwnam=yes} +ac_cv_func_getpwnam_r=${ac_cv_func_getpwnam_r=yes} +ac_cv_func_getpwuid=${ac_cv_func_getpwuid=yes} +ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} +ac_cv_func_getresgid=${ac_cv_func_getresgid=yes} +ac_cv_func_getresuid=${ac_cv_func_getresuid=yes} +ac_cv_func_getrlimit64=${ac_cv_func_getrlimit64=yes} +ac_cv_func_getrlimit=${ac_cv_func_getrlimit=yes} +ac_cv_func_getrusage=${ac_cv_func_getrusage=yes} +ac_cv_func_gets=${ac_cv_func_gets=yes} +ac_cv_func_getservbyname=${ac_cv_func_getservbyname=yes} +ac_cv_func_getservbyname_r=${ac_cv_func_getservbyname_r=yes} +ac_cv_func_getservbyport=${ac_cv_func_getservbyport=yes} +ac_cv_func_getservbyport_r=${ac_cv_func_getservbyport_r=yes} +ac_cv_func_getservent=${ac_cv_func_getservent=yes} +ac_cv_func_getsid=${ac_cv_func_getsid=yes} +ac_cv_func_getsockname=${ac_cv_func_getsockname=yes} +ac_cv_func_getsockopt=${ac_cv_func_getsockopt=yes} +ac_cv_func_getspent=${ac_cv_func_getspent=yes} +ac_cv_func_getspnam=${ac_cv_func_getspnam=yes} +ac_cv_func_getspnam_r=${ac_cv_func_getspnam_r=yes} +ac_cv_func_getsubopt=${ac_cv_func_getsubopt=yes} +ac_cv_func_gettext=${ac_cv_func_gettext=yes} +ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday=yes} +ac_cv_func_getuid=${ac_cv_func_getuid=yes} +ac_cv_func_getusershell=${ac_cv_func_getusershell=yes} +ac_cv_func_getutent=${ac_cv_func_getutent=yes} +ac_cv_func_getutid=${ac_cv_func_getutid=yes} +ac_cv_func_getutline=${ac_cv_func_getutline=yes} +ac_cv_func_getutxent=${ac_cv_func_getutxent=yes} +ac_cv_func_getutxid=${ac_cv_func_getutxid=yes} +ac_cv_func_getutxline=${ac_cv_func_getutxline=yes} +ac_cv_func_getw=${ac_cv_func_getw=yes} +ac_cv_func_getwc=${ac_cv_func_getwc=yes} +ac_cv_func_getwc_unlocked=${ac_cv_func_getwc_unlocked=yes} +ac_cv_func_getwchar=${ac_cv_func_getwchar=yes} +ac_cv_func_getwchar_unlocked=${ac_cv_func_getwchar_unlocked=yes} +ac_cv_func_getxattr=${ac_cv_func_getxattr=yes} +ac_cv_func_glob64=${ac_cv_func_glob64=yes} +ac_cv_func_glob=${ac_cv_func_glob=yes} +ac_cv_func_globfree64=${ac_cv_func_globfree64=yes} +ac_cv_func_globfree=${ac_cv_func_globfree=yes} +ac_cv_func_gmtime=${ac_cv_func_gmtime=yes} +ac_cv_func_gmtime_r=${ac_cv_func_gmtime_r=yes} +ac_cv_func_grantpt=${ac_cv_func_grantpt=yes} +ac_cv_func_h_errno=${ac_cv_func_h_errno=yes} +ac_cv_func_hasmntopt=${ac_cv_func_hasmntopt=yes} +ac_cv_func_hcreate=${ac_cv_func_hcreate=yes} +ac_cv_func_hdestroy=${ac_cv_func_hdestroy=yes} +ac_cv_func_hsearch=${ac_cv_func_hsearch=yes} +ac_cv_func_hstrerror=${ac_cv_func_hstrerror=yes} +ac_cv_func_htonl=${ac_cv_func_htonl=yes} +ac_cv_func_htons=${ac_cv_func_htons=yes} +ac_cv_func_hypot=${ac_cv_func_hypot=yes} +ac_cv_func_hypotf=${ac_cv_func_hypotf=yes} +ac_cv_func_hypotl=${ac_cv_func_hypotl=yes} +ac_cv_func_iconv=${ac_cv_func_iconv=yes} +ac_cv_func_iconv_close=${ac_cv_func_iconv_close=yes} +ac_cv_func_iconv_open=${ac_cv_func_iconv_open=yes} +ac_cv_func_if_freenameindex=${ac_cv_func_if_freenameindex=yes} +ac_cv_func_if_indextoname=${ac_cv_func_if_indextoname=yes} +ac_cv_func_if_nameindex=${ac_cv_func_if_nameindex=yes} +ac_cv_func_if_nametoindex=${ac_cv_func_if_nametoindex=yes} +ac_cv_func_ilogb=${ac_cv_func_ilogb=yes} +ac_cv_func_ilogbf=${ac_cv_func_ilogbf=yes} +ac_cv_func_ilogbl=${ac_cv_func_ilogbl=yes} +ac_cv_func_imaxabs=${ac_cv_func_imaxabs=yes} +ac_cv_func_imaxdiv=${ac_cv_func_imaxdiv=yes} +ac_cv_func_in6addr_any=${ac_cv_func_in6addr_any=yes} +ac_cv_func_in6addr_loopback=${ac_cv_func_in6addr_loopback=yes} +ac_cv_func_index=${ac_cv_func_index=yes} +ac_cv_func_inet_addr=${ac_cv_func_inet_addr=yes} +ac_cv_func_inet_aton=${ac_cv_func_inet_aton=yes} +ac_cv_func_inet_ntoa=${ac_cv_func_inet_ntoa=yes} +ac_cv_func_inet_ntop=${ac_cv_func_inet_ntop=yes} +ac_cv_func_inet_pton=${ac_cv_func_inet_pton=yes} +ac_cv_func_init_module=${ac_cv_func_init_module=yes} +ac_cv_func_initgroups=${ac_cv_func_initgroups=yes} +ac_cv_func_initstate=${ac_cv_func_initstate=yes} +ac_cv_func_inotify_add_watch=${ac_cv_func_inotify_add_watch=yes} +ac_cv_func_inotify_init1=${ac_cv_func_inotify_init1=yes} +ac_cv_func_inotify_init=${ac_cv_func_inotify_init=yes} +ac_cv_func_inotify_rm_watch=${ac_cv_func_inotify_rm_watch=yes} +ac_cv_func_insque=${ac_cv_func_insque=yes} +ac_cv_func_ioctl=${ac_cv_func_ioctl=yes} +ac_cv_func_ioperm=${ac_cv_func_ioperm=yes} +ac_cv_func_iopl=${ac_cv_func_iopl=yes} +ac_cv_func_isalnum=${ac_cv_func_isalnum=yes} +ac_cv_func_isalnum_l=${ac_cv_func_isalnum_l=yes} +ac_cv_func_isalpha=${ac_cv_func_isalpha=yes} +ac_cv_func_isalpha_l=${ac_cv_func_isalpha_l=yes} +ac_cv_func_isascii=${ac_cv_func_isascii=yes} +ac_cv_func_isastream=${ac_cv_func_isastream=yes} +ac_cv_func_isatty=${ac_cv_func_isatty=yes} +ac_cv_func_isblank=${ac_cv_func_isblank=yes} +ac_cv_func_isblank_l=${ac_cv_func_isblank_l=yes} +ac_cv_func_iscntrl=${ac_cv_func_iscntrl=yes} +ac_cv_func_iscntrl_l=${ac_cv_func_iscntrl_l=yes} +ac_cv_func_isdigit=${ac_cv_func_isdigit=yes} +ac_cv_func_isdigit_l=${ac_cv_func_isdigit_l=yes} +ac_cv_func_isgraph=${ac_cv_func_isgraph=yes} +ac_cv_func_isgraph_l=${ac_cv_func_isgraph_l=yes} +ac_cv_func_islower=${ac_cv_func_islower=yes} +ac_cv_func_islower_l=${ac_cv_func_islower_l=yes} +ac_cv_func_isprint=${ac_cv_func_isprint=yes} +ac_cv_func_isprint_l=${ac_cv_func_isprint_l=yes} +ac_cv_func_ispunct=${ac_cv_func_ispunct=yes} +ac_cv_func_ispunct_l=${ac_cv_func_ispunct_l=yes} +ac_cv_func_isspace=${ac_cv_func_isspace=yes} +ac_cv_func_isspace_l=${ac_cv_func_isspace_l=yes} +ac_cv_func_isupper=${ac_cv_func_isupper=yes} +ac_cv_func_isupper_l=${ac_cv_func_isupper_l=yes} +ac_cv_func_iswalnum=${ac_cv_func_iswalnum=yes} +ac_cv_func_iswalnum_l=${ac_cv_func_iswalnum_l=yes} +ac_cv_func_iswalpha=${ac_cv_func_iswalpha=yes} +ac_cv_func_iswalpha_l=${ac_cv_func_iswalpha_l=yes} +ac_cv_func_iswblank=${ac_cv_func_iswblank=yes} +ac_cv_func_iswblank_l=${ac_cv_func_iswblank_l=yes} +ac_cv_func_iswcntrl=${ac_cv_func_iswcntrl=yes} +ac_cv_func_iswcntrl_l=${ac_cv_func_iswcntrl_l=yes} +ac_cv_func_iswctype=${ac_cv_func_iswctype=yes} +ac_cv_func_iswctype_l=${ac_cv_func_iswctype_l=yes} +ac_cv_func_iswdigit=${ac_cv_func_iswdigit=yes} +ac_cv_func_iswdigit_l=${ac_cv_func_iswdigit_l=yes} +ac_cv_func_iswgraph=${ac_cv_func_iswgraph=yes} +ac_cv_func_iswgraph_l=${ac_cv_func_iswgraph_l=yes} +ac_cv_func_iswlower=${ac_cv_func_iswlower=yes} +ac_cv_func_iswlower_l=${ac_cv_func_iswlower_l=yes} +ac_cv_func_iswprint=${ac_cv_func_iswprint=yes} +ac_cv_func_iswprint_l=${ac_cv_func_iswprint_l=yes} +ac_cv_func_iswpunct=${ac_cv_func_iswpunct=yes} +ac_cv_func_iswpunct_l=${ac_cv_func_iswpunct_l=yes} +ac_cv_func_iswspace=${ac_cv_func_iswspace=yes} +ac_cv_func_iswspace_l=${ac_cv_func_iswspace_l=yes} +ac_cv_func_iswupper=${ac_cv_func_iswupper=yes} +ac_cv_func_iswupper_l=${ac_cv_func_iswupper_l=yes} +ac_cv_func_iswxdigit=${ac_cv_func_iswxdigit=yes} +ac_cv_func_iswxdigit_l=${ac_cv_func_iswxdigit_l=yes} +ac_cv_func_isxdigit=${ac_cv_func_isxdigit=yes} +ac_cv_func_isxdigit_l=${ac_cv_func_isxdigit_l=yes} +ac_cv_func_j0=${ac_cv_func_j0=yes} +ac_cv_func_j0f=${ac_cv_func_j0f=yes} +ac_cv_func_j1=${ac_cv_func_j1=yes} +ac_cv_func_j1f=${ac_cv_func_j1f=yes} +ac_cv_func_jn=${ac_cv_func_jn=yes} +ac_cv_func_jnf=${ac_cv_func_jnf=yes} +ac_cv_func_jrand48=${ac_cv_func_jrand48=yes} +ac_cv_func_kill=${ac_cv_func_kill=yes} +ac_cv_func_killpg=${ac_cv_func_killpg=yes} +ac_cv_func_klogctl=${ac_cv_func_klogctl=yes} +ac_cv_func_l64a=${ac_cv_func_l64a=yes} +ac_cv_func_labs=${ac_cv_func_labs=yes} +ac_cv_func_lchmod=${ac_cv_func_lchmod=yes} +ac_cv_func_lchown=${ac_cv_func_lchown=yes} +ac_cv_func_lckpwdf=${ac_cv_func_lckpwdf=yes} +ac_cv_func_lcong48=${ac_cv_func_lcong48=yes} +ac_cv_func_ldexp=${ac_cv_func_ldexp=yes} +ac_cv_func_ldexpf=${ac_cv_func_ldexpf=yes} +ac_cv_func_ldexpl=${ac_cv_func_ldexpl=yes} +ac_cv_func_ldiv=${ac_cv_func_ldiv=yes} +ac_cv_func_lfind=${ac_cv_func_lfind=yes} +ac_cv_func_lgamma=${ac_cv_func_lgamma=yes} +ac_cv_func_lgamma_r=${ac_cv_func_lgamma_r=yes} +ac_cv_func_lgammaf=${ac_cv_func_lgammaf=yes} +ac_cv_func_lgammaf_r=${ac_cv_func_lgammaf_r=yes} +ac_cv_func_lgammal=${ac_cv_func_lgammal=yes} +ac_cv_func_lgammal_r=${ac_cv_func_lgammal_r=yes} +ac_cv_func_lgetxattr=${ac_cv_func_lgetxattr=yes} +ac_cv_func_link=${ac_cv_func_link=yes} +ac_cv_func_linkat=${ac_cv_func_linkat=yes} +ac_cv_func_lio_listio=${ac_cv_func_lio_listio=yes} +ac_cv_func_listen=${ac_cv_func_listen=yes} +ac_cv_func_listxattr=${ac_cv_func_listxattr=yes} +ac_cv_func_llabs=${ac_cv_func_llabs=yes} +ac_cv_func_lldiv=${ac_cv_func_lldiv=yes} +ac_cv_func_llistxattr=${ac_cv_func_llistxattr=yes} +ac_cv_func_llrint=${ac_cv_func_llrint=yes} +ac_cv_func_llrintf=${ac_cv_func_llrintf=yes} +ac_cv_func_llrintl=${ac_cv_func_llrintl=yes} +ac_cv_func_llround=${ac_cv_func_llround=yes} +ac_cv_func_llroundf=${ac_cv_func_llroundf=yes} +ac_cv_func_llroundl=${ac_cv_func_llroundl=yes} +ac_cv_func_localeconv=${ac_cv_func_localeconv=yes} +ac_cv_func_localtime=${ac_cv_func_localtime=yes} +ac_cv_func_localtime_r=${ac_cv_func_localtime_r=yes} +ac_cv_func_lockf64=${ac_cv_func_lockf64=yes} +ac_cv_func_lockf=${ac_cv_func_lockf=yes} +ac_cv_func_log10=${ac_cv_func_log10=yes} +ac_cv_func_log10f=${ac_cv_func_log10f=yes} +ac_cv_func_log10l=${ac_cv_func_log10l=yes} +ac_cv_func_log1p=${ac_cv_func_log1p=yes} +ac_cv_func_log1pf=${ac_cv_func_log1pf=yes} +ac_cv_func_log1pl=${ac_cv_func_log1pl=yes} +ac_cv_func_log2=${ac_cv_func_log2=yes} +ac_cv_func_log2f=${ac_cv_func_log2f=yes} +ac_cv_func_log2l=${ac_cv_func_log2l=yes} +ac_cv_func_log=${ac_cv_func_log=yes} +ac_cv_func_logb=${ac_cv_func_logb=yes} +ac_cv_func_logbf=${ac_cv_func_logbf=yes} +ac_cv_func_logbl=${ac_cv_func_logbl=yes} +ac_cv_func_logf=${ac_cv_func_logf=yes} +ac_cv_func_logl=${ac_cv_func_logl=yes} +ac_cv_func_longjmp=${ac_cv_func_longjmp=yes} +ac_cv_func_lrand48=${ac_cv_func_lrand48=yes} +ac_cv_func_lremovexattr=${ac_cv_func_lremovexattr=yes} +ac_cv_func_lrint=${ac_cv_func_lrint=yes} +ac_cv_func_lrintf=${ac_cv_func_lrintf=yes} +ac_cv_func_lrintl=${ac_cv_func_lrintl=yes} +ac_cv_func_lround=${ac_cv_func_lround=yes} +ac_cv_func_lroundf=${ac_cv_func_lroundf=yes} +ac_cv_func_lroundl=${ac_cv_func_lroundl=yes} +ac_cv_func_lsearch=${ac_cv_func_lsearch=yes} +ac_cv_func_lseek64=${ac_cv_func_lseek64=yes} +ac_cv_func_lseek=${ac_cv_func_lseek=yes} +ac_cv_func_lsetxattr=${ac_cv_func_lsetxattr=yes} +ac_cv_func_lstat64=${ac_cv_func_lstat64=yes} +ac_cv_func_lstat=${ac_cv_func_lstat=yes} +ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} +ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} +ac_cv_func_lutimes=${ac_cv_func_lutimes=yes} +ac_cv_func_madvise=${ac_cv_func_madvise=yes} +ac_cv_func_malloc=${ac_cv_func_malloc=yes} +ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} +ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} +ac_cv_func_mblen=${ac_cv_func_mblen=yes} +ac_cv_func_mbrlen=${ac_cv_func_mbrlen=yes} +ac_cv_func_mbrtowc=${ac_cv_func_mbrtowc=yes} +ac_cv_func_mbsinit=${ac_cv_func_mbsinit=yes} +ac_cv_func_mbsnrtowcs=${ac_cv_func_mbsnrtowcs=yes} +ac_cv_func_mbsrtowcs=${ac_cv_func_mbsrtowcs=yes} +ac_cv_func_mbstowcs=${ac_cv_func_mbstowcs=yes} +ac_cv_func_mbtowc=${ac_cv_func_mbtowc=yes} +ac_cv_func_memalign=${ac_cv_func_memalign=yes} +ac_cv_func_memccpy=${ac_cv_func_memccpy=yes} +ac_cv_func_memchr=${ac_cv_func_memchr=yes} +ac_cv_func_memcmp=${ac_cv_func_memcmp=yes} +ac_cv_func_memcmp_clean=${ac_cv_func_memcmp_clean=yes} +ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes} +ac_cv_func_memcpy=${ac_cv_func_memcpy=yes} +ac_cv_func_memmove=${ac_cv_func_memmove=yes} +ac_cv_func_mempcpy=${ac_cv_func_mempcpy=yes} +ac_cv_func_memrchr=${ac_cv_func_memrchr=yes} +ac_cv_func_memset=${ac_cv_func_memset=yes} +ac_cv_func_mkdir=${ac_cv_func_mkdir=yes} +ac_cv_func_mkdirat=${ac_cv_func_mkdirat=yes} +ac_cv_func_mkdtemp=${ac_cv_func_mkdtemp=yes} +ac_cv_func_mkfifo=${ac_cv_func_mkfifo=yes} +ac_cv_func_mkfifoat=${ac_cv_func_mkfifoat=yes} +ac_cv_func_mknod=${ac_cv_func_mknod=yes} +ac_cv_func_mknodat=${ac_cv_func_mknodat=yes} +ac_cv_func_mkstemp64=${ac_cv_func_mkstemp64=yes} +ac_cv_func_mkstemp=${ac_cv_func_mkstemp=yes} +ac_cv_func_mktemp=${ac_cv_func_mktemp=yes} +ac_cv_func_mktime=${ac_cv_func_mktime=yes} +ac_cv_func_mlock=${ac_cv_func_mlock=yes} +ac_cv_func_mlockall=${ac_cv_func_mlockall=yes} +ac_cv_func_mmap64=${ac_cv_func_mmap64=yes} +ac_cv_func_mmap=${ac_cv_func_mmap=yes} +ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=no} +ac_cv_func_modf=${ac_cv_func_modf=yes} +ac_cv_func_modff=${ac_cv_func_modff=yes} +ac_cv_func_modfl=${ac_cv_func_modfl=yes} +ac_cv_func_mount=${ac_cv_func_mount=yes} +ac_cv_func_mprotect=${ac_cv_func_mprotect=yes} +ac_cv_func_mq_close=${ac_cv_func_mq_close=yes} +ac_cv_func_mq_getattr=${ac_cv_func_mq_getattr=yes} +ac_cv_func_mq_notify=${ac_cv_func_mq_notify=yes} +ac_cv_func_mq_open=${ac_cv_func_mq_open=yes} +ac_cv_func_mq_receive=${ac_cv_func_mq_receive=yes} +ac_cv_func_mq_send=${ac_cv_func_mq_send=yes} +ac_cv_func_mq_setattr=${ac_cv_func_mq_setattr=yes} +ac_cv_func_mq_timedreceive=${ac_cv_func_mq_timedreceive=yes} +ac_cv_func_mq_timedsend=${ac_cv_func_mq_timedsend=yes} +ac_cv_func_mq_unlink=${ac_cv_func_mq_unlink=yes} +ac_cv_func_mrand48=${ac_cv_func_mrand48=yes} +ac_cv_func_mremap=${ac_cv_func_mremap=yes} +ac_cv_func_msgctl=${ac_cv_func_msgctl=yes} +ac_cv_func_msgget=${ac_cv_func_msgget=yes} +ac_cv_func_msgrcv=${ac_cv_func_msgrcv=yes} +ac_cv_func_msgsnd=${ac_cv_func_msgsnd=yes} +ac_cv_func_msync=${ac_cv_func_msync=yes} +ac_cv_func_munlock=${ac_cv_func_munlock=yes} +ac_cv_func_munlockall=${ac_cv_func_munlockall=yes} +ac_cv_func_munmap=${ac_cv_func_munmap=yes} +ac_cv_func_nan=${ac_cv_func_nan=yes} +ac_cv_func_nanf=${ac_cv_func_nanf=yes} +ac_cv_func_nanl=${ac_cv_func_nanl=yes} +ac_cv_func_nanosleep=${ac_cv_func_nanosleep=yes} +ac_cv_func_nearbyint=${ac_cv_func_nearbyint=yes} +ac_cv_func_nearbyintf=${ac_cv_func_nearbyintf=yes} +ac_cv_func_nearbyintl=${ac_cv_func_nearbyintl=yes} +ac_cv_func_newlocale=${ac_cv_func_newlocale=yes} +ac_cv_func_nextafter=${ac_cv_func_nextafter=yes} +ac_cv_func_nextafterf=${ac_cv_func_nextafterf=yes} +ac_cv_func_nextafterl=${ac_cv_func_nextafterl=yes} +ac_cv_func_nexttoward=${ac_cv_func_nexttoward=yes} +ac_cv_func_nexttowardf=${ac_cv_func_nexttowardf=yes} +ac_cv_func_nexttowardl=${ac_cv_func_nexttowardl=yes} +ac_cv_func_nftw64=${ac_cv_func_nftw64=yes} +ac_cv_func_nftw=${ac_cv_func_nftw=yes} +ac_cv_func_ngettext=${ac_cv_func_ngettext=yes} +ac_cv_func_nice=${ac_cv_func_nice=yes} +ac_cv_func_nl_langinfo=${ac_cv_func_nl_langinfo=yes} +ac_cv_func_nl_langinfo_l=${ac_cv_func_nl_langinfo_l=yes} +ac_cv_func_nrand48=${ac_cv_func_nrand48=yes} +ac_cv_func_ntohl=${ac_cv_func_ntohl=yes} +ac_cv_func_ntohs=${ac_cv_func_ntohs=yes} +ac_cv_func_obstack=${ac_cv_func_obstack=no} +ac_cv_func_open64=${ac_cv_func_open64=yes} +ac_cv_func_open=${ac_cv_func_open=yes} +ac_cv_func_open_memstream=${ac_cv_func_open_memstream=yes} +ac_cv_func_open_wmemstream=${ac_cv_func_open_wmemstream=yes} +ac_cv_func_openat64=${ac_cv_func_openat64=yes} +ac_cv_func_openat=${ac_cv_func_openat=yes} +ac_cv_func_opendir=${ac_cv_func_opendir=yes} +ac_cv_func_openlog=${ac_cv_func_openlog=yes} +ac_cv_func_openpty=${ac_cv_func_openpty=yes} +ac_cv_func_optarg=${ac_cv_func_optarg=yes} +ac_cv_func_opterr=${ac_cv_func_opterr=yes} +ac_cv_func_optind=${ac_cv_func_optind=yes} +ac_cv_func_optopt=${ac_cv_func_optopt=yes} +ac_cv_func_pathconf=${ac_cv_func_pathconf=yes} +ac_cv_func_pause=${ac_cv_func_pause=yes} +ac_cv_func_pclose=${ac_cv_func_pclose=yes} +ac_cv_func_perror=${ac_cv_func_perror=yes} +ac_cv_func_pipe2=${ac_cv_func_pipe2=yes} +ac_cv_func_pipe=${ac_cv_func_pipe=yes} +ac_cv_func_pivot_root=${ac_cv_func_pivot_root=yes} +ac_cv_func_poll=${ac_cv_func_poll=yes} +ac_cv_func_popen=${ac_cv_func_popen=yes} +ac_cv_func_posix_fadvise=${ac_cv_func_posix_fadvise=yes} +ac_cv_func_posix_fallocate=${ac_cv_func_posix_fallocate=yes} +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_posix_madvise=${ac_cv_func_posix_madvise=yes} +ac_cv_func_posix_memalign=${ac_cv_func_posix_memalign=yes} +ac_cv_func_posix_openpt=${ac_cv_func_posix_openpt=yes} +ac_cv_func_posix_spawn=${ac_cv_func_posix_spawn=yes} +ac_cv_func_posix_spawn_file_actions_addclose=${ac_cv_func_posix_spawn_file_actions_addclose=yes} +ac_cv_func_posix_spawn_file_actions_adddup2=${ac_cv_func_posix_spawn_file_actions_adddup2=yes} +ac_cv_func_posix_spawn_file_actions_addopen=${ac_cv_func_posix_spawn_file_actions_addopen=yes} +ac_cv_func_posix_spawn_file_actions_destroy=${ac_cv_func_posix_spawn_file_actions_destroy=yes} +ac_cv_func_posix_spawn_file_actions_init=${ac_cv_func_posix_spawn_file_actions_init=yes} +ac_cv_func_posix_spawnattr_destroy=${ac_cv_func_posix_spawnattr_destroy=yes} +ac_cv_func_posix_spawnattr_getflags=${ac_cv_func_posix_spawnattr_getflags=yes} +ac_cv_func_posix_spawnattr_getpgroup=${ac_cv_func_posix_spawnattr_getpgroup=yes} +ac_cv_func_posix_spawnattr_getsigdefault=${ac_cv_func_posix_spawnattr_getsigdefault=yes} +ac_cv_func_posix_spawnattr_getsigmask=${ac_cv_func_posix_spawnattr_getsigmask=yes} +ac_cv_func_posix_spawnattr_init=${ac_cv_func_posix_spawnattr_init=yes} +ac_cv_func_posix_spawnattr_setflags=${ac_cv_func_posix_spawnattr_setflags=yes} +ac_cv_func_posix_spawnattr_setpgroup=${ac_cv_func_posix_spawnattr_setpgroup=yes} +ac_cv_func_posix_spawnattr_setsigdefault=${ac_cv_func_posix_spawnattr_setsigdefault=yes} +ac_cv_func_posix_spawnattr_setsigmask=${ac_cv_func_posix_spawnattr_setsigmask=yes} +ac_cv_func_posix_spawnp=${ac_cv_func_posix_spawnp=yes} +ac_cv_func_pow10=${ac_cv_func_pow10=yes} +ac_cv_func_pow10f=${ac_cv_func_pow10f=yes} +ac_cv_func_pow10l=${ac_cv_func_pow10l=yes} +ac_cv_func_pow=${ac_cv_func_pow=yes} +ac_cv_func_powf=${ac_cv_func_powf=yes} +ac_cv_func_powl=${ac_cv_func_powl=yes} +ac_cv_func_prctl=${ac_cv_func_prctl=yes} +ac_cv_func_pread64=${ac_cv_func_pread64=yes} +ac_cv_func_pread=${ac_cv_func_pread=yes} +ac_cv_func_printf=${ac_cv_func_printf=yes} +ac_cv_func_prlimit=${ac_cv_func_prlimit=yes} +ac_cv_func_process_vm_readv=${ac_cv_func_process_vm_readv=yes} +ac_cv_func_process_vm_writev=${ac_cv_func_process_vm_writev=yes} +ac_cv_func_pselect=${ac_cv_func_pselect=yes} +ac_cv_func_psiginfo=${ac_cv_func_psiginfo=yes} +ac_cv_func_psignal=${ac_cv_func_psignal=yes} +ac_cv_func_pstat_getdynamic=${ac_cv_func_pstat_getdynamic=no} +ac_cv_func_pthread_atfork=${ac_cv_func_pthread_atfork=yes} +ac_cv_func_pthread_attr_destroy=${ac_cv_func_pthread_attr_destroy=yes} +ac_cv_func_pthread_attr_getdetachstate=${ac_cv_func_pthread_attr_getdetachstate=yes} +ac_cv_func_pthread_attr_getguardsize=${ac_cv_func_pthread_attr_getguardsize=yes} +ac_cv_func_pthread_attr_getschedparam=${ac_cv_func_pthread_attr_getschedparam=yes} +ac_cv_func_pthread_attr_getscope=${ac_cv_func_pthread_attr_getscope=yes} +ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes} +ac_cv_func_pthread_attr_getstacksize=${ac_cv_func_pthread_attr_getstacksize=yes} +ac_cv_func_pthread_attr_init=${ac_cv_func_pthread_attr_init=yes} +ac_cv_func_pthread_attr_setdetachstate=${ac_cv_func_pthread_attr_setdetachstate=yes} +ac_cv_func_pthread_attr_setguardsize=${ac_cv_func_pthread_attr_setguardsize=yes} +ac_cv_func_pthread_attr_setschedparam=${ac_cv_func_pthread_attr_setschedparam=yes} +ac_cv_func_pthread_attr_setscope=${ac_cv_func_pthread_attr_setscope=yes} +ac_cv_func_pthread_attr_setstack=${ac_cv_func_pthread_attr_setstack=yes} +ac_cv_func_pthread_attr_setstacksize=${ac_cv_func_pthread_attr_setstacksize=yes} +ac_cv_func_pthread_barrier_destroy=${ac_cv_func_pthread_barrier_destroy=yes} +ac_cv_func_pthread_barrier_init=${ac_cv_func_pthread_barrier_init=yes} +ac_cv_func_pthread_barrier_wait=${ac_cv_func_pthread_barrier_wait=yes} +ac_cv_func_pthread_barrierattr_destroy=${ac_cv_func_pthread_barrierattr_destroy=yes} +ac_cv_func_pthread_barrierattr_getpshared=${ac_cv_func_pthread_barrierattr_getpshared=yes} +ac_cv_func_pthread_barrierattr_init=${ac_cv_func_pthread_barrierattr_init=yes} +ac_cv_func_pthread_barrierattr_setpshared=${ac_cv_func_pthread_barrierattr_setpshared=yes} +ac_cv_func_pthread_cancel=${ac_cv_func_pthread_cancel=yes} +ac_cv_func_pthread_cond_broadcast=${ac_cv_func_pthread_cond_broadcast=yes} +ac_cv_func_pthread_cond_destroy=${ac_cv_func_pthread_cond_destroy=yes} +ac_cv_func_pthread_cond_init=${ac_cv_func_pthread_cond_init=yes} +ac_cv_func_pthread_cond_signal=${ac_cv_func_pthread_cond_signal=yes} +ac_cv_func_pthread_cond_timedwait=${ac_cv_func_pthread_cond_timedwait=yes} +ac_cv_func_pthread_cond_wait=${ac_cv_func_pthread_cond_wait=yes} +ac_cv_func_pthread_condattr_destroy=${ac_cv_func_pthread_condattr_destroy=yes} +ac_cv_func_pthread_condattr_getclock=${ac_cv_func_pthread_condattr_getclock=yes} +ac_cv_func_pthread_condattr_getpshared=${ac_cv_func_pthread_condattr_getpshared=yes} +ac_cv_func_pthread_condattr_init=${ac_cv_func_pthread_condattr_init=yes} +ac_cv_func_pthread_condattr_setclock=${ac_cv_func_pthread_condattr_setclock=yes} +ac_cv_func_pthread_condattr_setpshared=${ac_cv_func_pthread_condattr_setpshared=yes} +ac_cv_func_pthread_create=${ac_cv_func_pthread_create=yes} +ac_cv_func_pthread_detach=${ac_cv_func_pthread_detach=yes} +ac_cv_func_pthread_equal=${ac_cv_func_pthread_equal=yes} +ac_cv_func_pthread_exit=${ac_cv_func_pthread_exit=yes} +ac_cv_func_pthread_getconcurrency=${ac_cv_func_pthread_getconcurrency=yes} +ac_cv_func_pthread_getspecific=${ac_cv_func_pthread_getspecific=yes} +ac_cv_func_pthread_join=${ac_cv_func_pthread_join=yes} +ac_cv_func_pthread_key_create=${ac_cv_func_pthread_key_create=yes} +ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} +ac_cv_func_pthread_kill=${ac_cv_func_pthread_kill=yes} +ac_cv_func_pthread_mutex_consistent=${ac_cv_func_pthread_mutex_consistent=yes} +ac_cv_func_pthread_mutex_destroy=${ac_cv_func_pthread_mutex_destroy=yes} +ac_cv_func_pthread_mutex_init=${ac_cv_func_pthread_mutex_init=yes} +ac_cv_func_pthread_mutex_lock=${ac_cv_func_pthread_mutex_lock=yes} +ac_cv_func_pthread_mutex_timedlock=${ac_cv_func_pthread_mutex_timedlock=yes} +ac_cv_func_pthread_mutex_trylock=${ac_cv_func_pthread_mutex_trylock=yes} +ac_cv_func_pthread_mutex_unlock=${ac_cv_func_pthread_mutex_unlock=yes} +ac_cv_func_pthread_mutexattr_destroy=${ac_cv_func_pthread_mutexattr_destroy=yes} +ac_cv_func_pthread_mutexattr_getpshared=${ac_cv_func_pthread_mutexattr_getpshared=yes} +ac_cv_func_pthread_mutexattr_getrobust=${ac_cv_func_pthread_mutexattr_getrobust=yes} +ac_cv_func_pthread_mutexattr_gettype=${ac_cv_func_pthread_mutexattr_gettype=yes} +ac_cv_func_pthread_mutexattr_init=${ac_cv_func_pthread_mutexattr_init=yes} +ac_cv_func_pthread_mutexattr_setpshared=${ac_cv_func_pthread_mutexattr_setpshared=yes} +ac_cv_func_pthread_mutexattr_setrobust=${ac_cv_func_pthread_mutexattr_setrobust=yes} +ac_cv_func_pthread_mutexattr_settype=${ac_cv_func_pthread_mutexattr_settype=yes} +ac_cv_func_pthread_once=${ac_cv_func_pthread_once=yes} +ac_cv_func_pthread_rwlock_destroy=${ac_cv_func_pthread_rwlock_destroy=yes} +ac_cv_func_pthread_rwlock_init=${ac_cv_func_pthread_rwlock_init=yes} +ac_cv_func_pthread_rwlock_rdlock=${ac_cv_func_pthread_rwlock_rdlock=yes} +ac_cv_func_pthread_rwlock_timedrdlock=${ac_cv_func_pthread_rwlock_timedrdlock=yes} +ac_cv_func_pthread_rwlock_timedwrlock=${ac_cv_func_pthread_rwlock_timedwrlock=yes} +ac_cv_func_pthread_rwlock_tryrdlock=${ac_cv_func_pthread_rwlock_tryrdlock=yes} +ac_cv_func_pthread_rwlock_trywrlock=${ac_cv_func_pthread_rwlock_trywrlock=yes} +ac_cv_func_pthread_rwlock_unlock=${ac_cv_func_pthread_rwlock_unlock=yes} +ac_cv_func_pthread_rwlock_wrlock=${ac_cv_func_pthread_rwlock_wrlock=yes} +ac_cv_func_pthread_rwlockattr_destroy=${ac_cv_func_pthread_rwlockattr_destroy=yes} +ac_cv_func_pthread_rwlockattr_getpshared=${ac_cv_func_pthread_rwlockattr_getpshared=yes} +ac_cv_func_pthread_rwlockattr_init=${ac_cv_func_pthread_rwlockattr_init=yes} +ac_cv_func_pthread_rwlockattr_setpshared=${ac_cv_func_pthread_rwlockattr_setpshared=yes} +ac_cv_func_pthread_self=${ac_cv_func_pthread_self=yes} +ac_cv_func_pthread_setcancelstate=${ac_cv_func_pthread_setcancelstate=yes} +ac_cv_func_pthread_setcanceltype=${ac_cv_func_pthread_setcanceltype=yes} +ac_cv_func_pthread_setconcurrency=${ac_cv_func_pthread_setconcurrency=yes} +ac_cv_func_pthread_setspecific=${ac_cv_func_pthread_setspecific=yes} +ac_cv_func_pthread_sigmask=${ac_cv_func_pthread_sigmask=yes} +ac_cv_func_pthread_spin_destroy=${ac_cv_func_pthread_spin_destroy=yes} +ac_cv_func_pthread_spin_init=${ac_cv_func_pthread_spin_init=yes} +ac_cv_func_pthread_spin_lock=${ac_cv_func_pthread_spin_lock=yes} +ac_cv_func_pthread_spin_trylock=${ac_cv_func_pthread_spin_trylock=yes} +ac_cv_func_pthread_spin_unlock=${ac_cv_func_pthread_spin_unlock=yes} +ac_cv_func_pthread_testcancel=${ac_cv_func_pthread_testcancel=yes} +ac_cv_func_ptrace=${ac_cv_func_ptrace=yes} +ac_cv_func_ptsname=${ac_cv_func_ptsname=yes} +ac_cv_func_ptsname_r=${ac_cv_func_ptsname_r=yes} +ac_cv_func_putc=${ac_cv_func_putc=yes} +ac_cv_func_putc_unlocked=${ac_cv_func_putc_unlocked=yes} +ac_cv_func_putchar=${ac_cv_func_putchar=yes} +ac_cv_func_putchar_unlocked=${ac_cv_func_putchar_unlocked=yes} +ac_cv_func_putenv=${ac_cv_func_putenv=yes} +ac_cv_func_puts=${ac_cv_func_puts=yes} +ac_cv_func_pututline=${ac_cv_func_pututline=yes} +ac_cv_func_pututxline=${ac_cv_func_pututxline=yes} +ac_cv_func_putw=${ac_cv_func_putw=yes} +ac_cv_func_putwc=${ac_cv_func_putwc=yes} +ac_cv_func_putwc_unlocked=${ac_cv_func_putwc_unlocked=yes} +ac_cv_func_putwchar=${ac_cv_func_putwchar=yes} +ac_cv_func_putwchar_unlocked=${ac_cv_func_putwchar_unlocked=yes} +ac_cv_func_pwrite64=${ac_cv_func_pwrite64=yes} +ac_cv_func_pwrite=${ac_cv_func_pwrite=yes} +ac_cv_func_qsort=${ac_cv_func_qsort=yes} +ac_cv_func_raise=${ac_cv_func_raise=yes} +ac_cv_func_rand=${ac_cv_func_rand=yes} +ac_cv_func_rand_r=${ac_cv_func_rand_r=yes} +ac_cv_func_random=${ac_cv_func_random=yes} +ac_cv_func_read=${ac_cv_func_read=yes} +ac_cv_func_readdir64=${ac_cv_func_readdir64=yes} +ac_cv_func_readdir64_r=${ac_cv_func_readdir64_r=yes} +ac_cv_func_readdir=${ac_cv_func_readdir=yes} +ac_cv_func_readdir_r=${ac_cv_func_readdir_r=yes} +ac_cv_func_readlink=${ac_cv_func_readlink=yes} +ac_cv_func_readlinkat=${ac_cv_func_readlinkat=yes} +ac_cv_func_readv=${ac_cv_func_readv=yes} +ac_cv_func_realloc=${ac_cv_func_realloc=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realpath=${ac_cv_func_realpath=yes} +ac_cv_func_reboot=${ac_cv_func_reboot=yes} +ac_cv_func_recv=${ac_cv_func_recv=yes} +ac_cv_func_recvfrom=${ac_cv_func_recvfrom=yes} +ac_cv_func_recvmsg=${ac_cv_func_recvmsg=yes} +ac_cv_func_regcomp=${ac_cv_func_regcomp=yes} +ac_cv_func_regerror=${ac_cv_func_regerror=yes} +ac_cv_func_regexec=${ac_cv_func_regexec=yes} +ac_cv_func_regfree=${ac_cv_func_regfree=yes} +ac_cv_func_remainder=${ac_cv_func_remainder=yes} +ac_cv_func_remainderf=${ac_cv_func_remainderf=yes} +ac_cv_func_remainderl=${ac_cv_func_remainderl=yes} +ac_cv_func_remove=${ac_cv_func_remove=yes} +ac_cv_func_removexattr=${ac_cv_func_removexattr=yes} +ac_cv_func_remque=${ac_cv_func_remque=yes} +ac_cv_func_remquo=${ac_cv_func_remquo=yes} +ac_cv_func_remquof=${ac_cv_func_remquof=yes} +ac_cv_func_remquol=${ac_cv_func_remquol=yes} +ac_cv_func_rename=${ac_cv_func_rename=yes} +ac_cv_func_renameat=${ac_cv_func_renameat=yes} +ac_cv_func_res_init=${ac_cv_func_res_init=yes} +ac_cv_func_res_query=${ac_cv_func_res_query=yes} +ac_cv_func_res_search=${ac_cv_func_res_search=yes} +ac_cv_func_rewind=${ac_cv_func_rewind=yes} +ac_cv_func_rewinddir=${ac_cv_func_rewinddir=yes} +ac_cv_func_rindex=${ac_cv_func_rindex=yes} +ac_cv_func_rint=${ac_cv_func_rint=yes} +ac_cv_func_rintf=${ac_cv_func_rintf=yes} +ac_cv_func_rintl=${ac_cv_func_rintl=yes} +ac_cv_func_rmdir=${ac_cv_func_rmdir=yes} +ac_cv_func_round=${ac_cv_func_round=yes} +ac_cv_func_roundf=${ac_cv_func_roundf=yes} +ac_cv_func_roundl=${ac_cv_func_roundl=yes} +ac_cv_func_sbrk=${ac_cv_func_sbrk=yes} +ac_cv_func_scalb=${ac_cv_func_scalb=yes} +ac_cv_func_scalbf=${ac_cv_func_scalbf=yes} +ac_cv_func_scalbln=${ac_cv_func_scalbln=yes} +ac_cv_func_scalblnf=${ac_cv_func_scalblnf=yes} +ac_cv_func_scalblnl=${ac_cv_func_scalblnl=yes} +ac_cv_func_scalbn=${ac_cv_func_scalbn=yes} +ac_cv_func_scalbnf=${ac_cv_func_scalbnf=yes} +ac_cv_func_scalbnl=${ac_cv_func_scalbnl=yes} +ac_cv_func_scandir64=${ac_cv_func_scandir64=yes} +ac_cv_func_scandir=${ac_cv_func_scandir=yes} +ac_cv_func_scanf=${ac_cv_func_scanf=yes} +ac_cv_func_sched_get_priority_max=${ac_cv_func_sched_get_priority_max=yes} +ac_cv_func_sched_get_priority_min=${ac_cv_func_sched_get_priority_min=yes} +ac_cv_func_sched_getparam=${ac_cv_func_sched_getparam=yes} +ac_cv_func_sched_getscheduler=${ac_cv_func_sched_getscheduler=yes} +ac_cv_func_sched_rr_get_interval=${ac_cv_func_sched_rr_get_interval=yes} +ac_cv_func_sched_setparam=${ac_cv_func_sched_setparam=yes} +ac_cv_func_sched_setscheduler=${ac_cv_func_sched_setscheduler=yes} +ac_cv_func_sched_yield=${ac_cv_func_sched_yield=yes} +ac_cv_func_seed48=${ac_cv_func_seed48=yes} +ac_cv_func_seekdir=${ac_cv_func_seekdir=yes} +ac_cv_func_select=${ac_cv_func_select=yes} +ac_cv_func_select_args=${ac_cv_func_select_args='int,fd_set *,struct timeval *'} +ac_cv_func_sem_close=${ac_cv_func_sem_close=yes} +ac_cv_func_sem_destroy=${ac_cv_func_sem_destroy=yes} +ac_cv_func_sem_getvalue=${ac_cv_func_sem_getvalue=yes} +ac_cv_func_sem_init=${ac_cv_func_sem_init=yes} +ac_cv_func_sem_open=${ac_cv_func_sem_open=yes} +ac_cv_func_sem_post=${ac_cv_func_sem_post=yes} +ac_cv_func_sem_timedwait=${ac_cv_func_sem_timedwait=yes} +ac_cv_func_sem_trywait=${ac_cv_func_sem_trywait=yes} +ac_cv_func_sem_unlink=${ac_cv_func_sem_unlink=yes} +ac_cv_func_sem_wait=${ac_cv_func_sem_wait=yes} +ac_cv_func_semctl=${ac_cv_func_semctl=yes} +ac_cv_func_semget=${ac_cv_func_semget=yes} +ac_cv_func_semop=${ac_cv_func_semop=yes} +ac_cv_func_send=${ac_cv_func_send=yes} +ac_cv_func_sendfile64=${ac_cv_func_sendfile64=yes} +ac_cv_func_sendfile=${ac_cv_func_sendfile=yes} +ac_cv_func_sendmsg=${ac_cv_func_sendmsg=yes} +ac_cv_func_sendto=${ac_cv_func_sendto=yes} +ac_cv_func_setbuf=${ac_cv_func_setbuf=yes} +ac_cv_func_setbuffer=${ac_cv_func_setbuffer=yes} +ac_cv_func_setegid=${ac_cv_func_setegid=yes} +ac_cv_func_setenv=${ac_cv_func_setenv=yes} +ac_cv_func_seteuid=${ac_cv_func_seteuid=yes} +ac_cv_func_setfsgid=${ac_cv_func_setfsgid=yes} +ac_cv_func_setfsuid=${ac_cv_func_setfsuid=yes} +ac_cv_func_setgid=${ac_cv_func_setgid=yes} +ac_cv_func_setgrent=${ac_cv_func_setgrent=yes} +ac_cv_func_setgrent_void=${ac_cv_func_setgrent_void=yes} +ac_cv_func_setgroups=${ac_cv_func_setgroups=yes} +ac_cv_func_sethostent=${ac_cv_func_sethostent=yes} +ac_cv_func_sethostname=${ac_cv_func_sethostname=yes} +ac_cv_func_setitimer=${ac_cv_func_setitimer=yes} +ac_cv_func_setjmp=${ac_cv_func_setjmp=yes} +ac_cv_func_setlinebuf=${ac_cv_func_setlinebuf=yes} +ac_cv_func_setlocale=${ac_cv_func_setlocale=yes} +ac_cv_func_setlogmask=${ac_cv_func_setlogmask=yes} +ac_cv_func_setmntent=${ac_cv_func_setmntent=yes} +ac_cv_func_setnetent=${ac_cv_func_setnetent=yes} +ac_cv_func_setpgid=${ac_cv_func_setpgid=yes} +ac_cv_func_setpgrp=${ac_cv_func_setpgrp=yes} +ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes} +ac_cv_func_setpriority=${ac_cv_func_setpriority=yes} +ac_cv_func_setprotoent=${ac_cv_func_setprotoent=yes} +ac_cv_func_setpwent=${ac_cv_func_setpwent=yes} +ac_cv_func_setregid=${ac_cv_func_setregid=yes} +ac_cv_func_setresgid=${ac_cv_func_setresgid=yes} +ac_cv_func_setresuid=${ac_cv_func_setresuid=no} +ac_cv_func_setreuid=${ac_cv_func_setreuid=yes} +ac_cv_func_setrlimit64=${ac_cv_func_setrlimit64=yes} +ac_cv_func_setrlimit=${ac_cv_func_setrlimit=yes} +ac_cv_func_setservent=${ac_cv_func_setservent=yes} +ac_cv_func_setsid=${ac_cv_func_setsid=yes} +ac_cv_func_setsockopt=${ac_cv_func_setsockopt=yes} +ac_cv_func_setspent=${ac_cv_func_setspent=yes} +ac_cv_func_setstate=${ac_cv_func_setstate=yes} +ac_cv_func_settimeofday=${ac_cv_func_settimeofday=yes} +ac_cv_func_setuid=${ac_cv_func_setuid=yes} +ac_cv_func_setusershell=${ac_cv_func_setusershell=yes} +ac_cv_func_setutent=${ac_cv_func_setutent=yes} +ac_cv_func_setutxent=${ac_cv_func_setutxent=yes} +ac_cv_func_setvbuf=${ac_cv_func_setvbuf=yes} +ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no} +ac_cv_func_setxattr=${ac_cv_func_setxattr=yes} +ac_cv_func_shm_open=${ac_cv_func_shm_open=yes} +ac_cv_func_shm_unlink=${ac_cv_func_shm_unlink=yes} +ac_cv_func_shmat=${ac_cv_func_shmat=yes} +ac_cv_func_shmctl=${ac_cv_func_shmctl=yes} +ac_cv_func_shmdt=${ac_cv_func_shmdt=yes} +ac_cv_func_shmget=${ac_cv_func_shmget=yes} +ac_cv_func_shutdown=${ac_cv_func_shutdown=yes} +ac_cv_func_sigaction=${ac_cv_func_sigaction=yes} +ac_cv_func_sigaddset=${ac_cv_func_sigaddset=yes} +ac_cv_func_sigaltstack=${ac_cv_func_sigaltstack=yes} +ac_cv_func_sigdelset=${ac_cv_func_sigdelset=yes} +ac_cv_func_sigemptyset=${ac_cv_func_sigemptyset=yes} +ac_cv_func_sigfillset=${ac_cv_func_sigfillset=yes} +ac_cv_func_sighold=${ac_cv_func_sighold=yes} +ac_cv_func_sigignore=${ac_cv_func_sigignore=yes} +ac_cv_func_siginterrupt=${ac_cv_func_siginterrupt=yes} +ac_cv_func_sigisemptyset=${ac_cv_func_sigisemptyset=yes} +ac_cv_func_sigismember=${ac_cv_func_sigismember=yes} +ac_cv_func_siglongjmp=${ac_cv_func_siglongjmp=yes} +ac_cv_func_signal=${ac_cv_func_signal=yes} +ac_cv_func_signalfd=${ac_cv_func_signalfd=yes} +ac_cv_func_signgam=${ac_cv_func_signgam=yes} +ac_cv_func_significand=${ac_cv_func_significand=yes} +ac_cv_func_significandf=${ac_cv_func_significandf=yes} +ac_cv_func_sigpause=${ac_cv_func_sigpause=yes} +ac_cv_func_sigpending=${ac_cv_func_sigpending=yes} +ac_cv_func_sigprocmask=${ac_cv_func_sigprocmask=yes} +ac_cv_func_sigqueue=${ac_cv_func_sigqueue=yes} +ac_cv_func_sigrelse=${ac_cv_func_sigrelse=yes} +ac_cv_func_sigset=${ac_cv_func_sigset=yes} +ac_cv_func_sigsetjmp=${ac_cv_func_sigsetjmp=yes} +ac_cv_func_sigsuspend=${ac_cv_func_sigsuspend=yes} +ac_cv_func_sigtimedwait=${ac_cv_func_sigtimedwait=yes} +ac_cv_func_sigwait=${ac_cv_func_sigwait=yes} +ac_cv_func_sigwaitinfo=${ac_cv_func_sigwaitinfo=yes} +ac_cv_func_sin=${ac_cv_func_sin=yes} +ac_cv_func_sincos=${ac_cv_func_sincos=yes} +ac_cv_func_sincosf=${ac_cv_func_sincosf=yes} +ac_cv_func_sincosl=${ac_cv_func_sincosl=yes} +ac_cv_func_sinf=${ac_cv_func_sinf=yes} +ac_cv_func_sinh=${ac_cv_func_sinh=yes} +ac_cv_func_sinhf=${ac_cv_func_sinhf=yes} +ac_cv_func_sinhl=${ac_cv_func_sinhl=yes} +ac_cv_func_sinl=${ac_cv_func_sinl=yes} +ac_cv_func_sleep=${ac_cv_func_sleep=yes} +ac_cv_func_snprintf=${ac_cv_func_snprintf=yes} +ac_cv_func_sockatmark=${ac_cv_func_sockatmark=yes} +ac_cv_func_socket=${ac_cv_func_socket=yes} +ac_cv_func_socketpair=${ac_cv_func_socketpair=yes} +ac_cv_func_splice=${ac_cv_func_splice=yes} +ac_cv_func_sprintf=${ac_cv_func_sprintf=yes} +ac_cv_func_sqrt=${ac_cv_func_sqrt=yes} +ac_cv_func_sqrtf=${ac_cv_func_sqrtf=yes} +ac_cv_func_sqrtl=${ac_cv_func_sqrtl=yes} +ac_cv_func_srand48=${ac_cv_func_srand48=yes} +ac_cv_func_srand=${ac_cv_func_srand=yes} +ac_cv_func_srandom=${ac_cv_func_srandom=yes} +ac_cv_func_sscanf=${ac_cv_func_sscanf=yes} +ac_cv_func_stat64=${ac_cv_func_stat64=yes} +ac_cv_func_stat=${ac_cv_func_stat=yes} +ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} +ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} +ac_cv_func_statfs64=${ac_cv_func_statfs64=yes} +ac_cv_func_statfs=${ac_cv_func_statfs=yes} +ac_cv_func_statvfs64=${ac_cv_func_statvfs64=yes} +ac_cv_func_statvfs=${ac_cv_func_statvfs=yes} +ac_cv_func_stderr=${ac_cv_func_stderr=yes} +ac_cv_func_stdin=${ac_cv_func_stdin=yes} +ac_cv_func_stdout=${ac_cv_func_stdout=yes} +ac_cv_func_stime=${ac_cv_func_stime=yes} +ac_cv_func_stpcpy=${ac_cv_func_stpcpy=yes} +ac_cv_func_stpncpy=${ac_cv_func_stpncpy=yes} +ac_cv_func_strcasecmp=${ac_cv_func_strcasecmp=yes} +ac_cv_func_strcasecmp_l=${ac_cv_func_strcasecmp_l=yes} +ac_cv_func_strcasestr=${ac_cv_func_strcasestr=yes} +ac_cv_func_strcat=${ac_cv_func_strcat=yes} +ac_cv_func_strchr=${ac_cv_func_strchr=yes} +ac_cv_func_strchrnul=${ac_cv_func_strchrnul=yes} +ac_cv_func_strcmp=${ac_cv_func_strcmp=yes} +ac_cv_func_strcoll=${ac_cv_func_strcoll=yes} +ac_cv_func_strcoll_l=${ac_cv_func_strcoll_l=yes} +ac_cv_func_strcoll_works=${ac_cv_func_strcoll_works=no} +ac_cv_func_strcpy=${ac_cv_func_strcpy=yes} +ac_cv_func_strcspn=${ac_cv_func_strcspn=yes} +ac_cv_func_strdup=${ac_cv_func_strdup=yes} +ac_cv_func_strerror=${ac_cv_func_strerror=yes} +ac_cv_func_strerror_l=${ac_cv_func_strerror_l=yes} +ac_cv_func_strerror_r=${ac_cv_func_strerror_r=yes} +ac_cv_func_strerror_r_char_p=${ac_cv_func_strerror_r_char_p=no} +ac_cv_func_strfmon=${ac_cv_func_strfmon=yes} +ac_cv_func_strfmon_l=${ac_cv_func_strfmon_l=yes} +ac_cv_func_strftime=${ac_cv_func_strftime=yes} +ac_cv_func_strftime_l=${ac_cv_func_strftime_l=yes} +ac_cv_func_strlcat=${ac_cv_func_strlcat=yes} +ac_cv_func_strlcpy=${ac_cv_func_strlcpy=yes} +ac_cv_func_strlen=${ac_cv_func_strlen=yes} +ac_cv_func_strncasecmp=${ac_cv_func_strncasecmp=yes} +ac_cv_func_strncasecmp_l=${ac_cv_func_strncasecmp_l=yes} +ac_cv_func_strncat=${ac_cv_func_strncat=yes} +ac_cv_func_strncmp=${ac_cv_func_strncmp=yes} +ac_cv_func_strncpy=${ac_cv_func_strncpy=yes} +ac_cv_func_strndup=${ac_cv_func_strndup=yes} +ac_cv_func_strnlen=${ac_cv_func_strnlen=yes} +ac_cv_func_strpbrk=${ac_cv_func_strpbrk=yes} +ac_cv_func_strptime=${ac_cv_func_strptime=yes} +ac_cv_func_strrchr=${ac_cv_func_strrchr=yes} +ac_cv_func_strsep=${ac_cv_func_strsep=yes} +ac_cv_func_strsignal=${ac_cv_func_strsignal=yes} +ac_cv_func_strspn=${ac_cv_func_strspn=yes} +ac_cv_func_strstr=${ac_cv_func_strstr=yes} +ac_cv_func_strtod=${ac_cv_func_strtod=no} +ac_cv_func_strtof=${ac_cv_func_strtof=yes} +ac_cv_func_strtoimax=${ac_cv_func_strtoimax=yes} +ac_cv_func_strtok=${ac_cv_func_strtok=yes} +ac_cv_func_strtok_r=${ac_cv_func_strtok_r=yes} +ac_cv_func_strtol=${ac_cv_func_strtol=yes} +ac_cv_func_strtold=${ac_cv_func_strtold=yes} +ac_cv_func_strtoll=${ac_cv_func_strtoll=yes} +ac_cv_func_strtoul=${ac_cv_func_strtoul=yes} +ac_cv_func_strtoull=${ac_cv_func_strtoull=yes} +ac_cv_func_strtoumax=${ac_cv_func_strtoumax=yes} +ac_cv_func_strverscmp=${ac_cv_func_strverscmp=yes} +ac_cv_func_strxfrm=${ac_cv_func_strxfrm=yes} +ac_cv_func_strxfrm_l=${ac_cv_func_strxfrm_l=yes} +ac_cv_func_swab=${ac_cv_func_swab=yes} +ac_cv_func_swapoff=${ac_cv_func_swapoff=yes} +ac_cv_func_swapon=${ac_cv_func_swapon=yes} +ac_cv_func_swprintf=${ac_cv_func_swprintf=yes} +ac_cv_func_swscanf=${ac_cv_func_swscanf=yes} +ac_cv_func_symlink=${ac_cv_func_symlink=yes} +ac_cv_func_symlinkat=${ac_cv_func_symlinkat=yes} +ac_cv_func_sync=${ac_cv_func_sync=yes} +ac_cv_func_syscall=${ac_cv_func_syscall=yes} +ac_cv_func_sysconf=${ac_cv_func_sysconf=yes} +ac_cv_func_sysinfo=${ac_cv_func_sysinfo=yes} +ac_cv_func_syslog=${ac_cv_func_syslog=yes} +ac_cv_func_system=${ac_cv_func_system=yes} +ac_cv_func_tan=${ac_cv_func_tan=yes} +ac_cv_func_tanf=${ac_cv_func_tanf=yes} +ac_cv_func_tanh=${ac_cv_func_tanh=yes} +ac_cv_func_tanhf=${ac_cv_func_tanhf=yes} +ac_cv_func_tanhl=${ac_cv_func_tanhl=yes} +ac_cv_func_tanl=${ac_cv_func_tanl=yes} +ac_cv_func_tcdrain=${ac_cv_func_tcdrain=yes} +ac_cv_func_tcflow=${ac_cv_func_tcflow=yes} +ac_cv_func_tcflush=${ac_cv_func_tcflush=yes} +ac_cv_func_tcgetattr=${ac_cv_func_tcgetattr=yes} +ac_cv_func_tcgetpgrp=${ac_cv_func_tcgetpgrp=yes} +ac_cv_func_tcgetsid=${ac_cv_func_tcgetsid=yes} +ac_cv_func_tcsendbreak=${ac_cv_func_tcsendbreak=yes} +ac_cv_func_tcsetattr=${ac_cv_func_tcsetattr=yes} +ac_cv_func_tcsetpgrp=${ac_cv_func_tcsetpgrp=yes} +ac_cv_func_tdelete=${ac_cv_func_tdelete=yes} +ac_cv_func_tdestroy=${ac_cv_func_tdestroy=yes} +ac_cv_func_telldir=${ac_cv_func_telldir=yes} +ac_cv_func_tempnam=${ac_cv_func_tempnam=yes} +ac_cv_func_textdomain=${ac_cv_func_textdomain=yes} +ac_cv_func_tfind=${ac_cv_func_tfind=yes} +ac_cv_func_tgamma=${ac_cv_func_tgamma=yes} +ac_cv_func_tgammaf=${ac_cv_func_tgammaf=yes} +ac_cv_func_tgammal=${ac_cv_func_tgammal=yes} +ac_cv_func_time=${ac_cv_func_time=yes} +ac_cv_func_timegm=${ac_cv_func_timegm=yes} +ac_cv_func_timer_create=${ac_cv_func_timer_create=yes} +ac_cv_func_timer_delete=${ac_cv_func_timer_delete=yes} +ac_cv_func_timer_getoverrun=${ac_cv_func_timer_getoverrun=yes} +ac_cv_func_timer_gettime=${ac_cv_func_timer_gettime=yes} +ac_cv_func_timer_settime=${ac_cv_func_timer_settime=yes} +ac_cv_func_times=${ac_cv_func_times=yes} +ac_cv_func_timezone=${ac_cv_func_timezone=yes} +ac_cv_func_tmpfile64=${ac_cv_func_tmpfile64=yes} +ac_cv_func_tmpfile=${ac_cv_func_tmpfile=yes} +ac_cv_func_tmpnam=${ac_cv_func_tmpnam=yes} +ac_cv_func_toascii=${ac_cv_func_toascii=yes} +ac_cv_func_tolower=${ac_cv_func_tolower=yes} +ac_cv_func_tolower_l=${ac_cv_func_tolower_l=yes} +ac_cv_func_toupper=${ac_cv_func_toupper=yes} +ac_cv_func_toupper_l=${ac_cv_func_toupper_l=yes} +ac_cv_func_towctrans=${ac_cv_func_towctrans=yes} +ac_cv_func_towctrans_l=${ac_cv_func_towctrans_l=yes} +ac_cv_func_towlower=${ac_cv_func_towlower=yes} +ac_cv_func_towlower_l=${ac_cv_func_towlower_l=yes} +ac_cv_func_towupper=${ac_cv_func_towupper=yes} +ac_cv_func_towupper_l=${ac_cv_func_towupper_l=yes} +ac_cv_func_trunc=${ac_cv_func_trunc=yes} +ac_cv_func_truncate64=${ac_cv_func_truncate64=yes} +ac_cv_func_truncate=${ac_cv_func_truncate=yes} +ac_cv_func_truncf=${ac_cv_func_truncf=yes} +ac_cv_func_truncl=${ac_cv_func_truncl=yes} +ac_cv_func_tsearch=${ac_cv_func_tsearch=yes} +ac_cv_func_ttyname=${ac_cv_func_ttyname=yes} +ac_cv_func_ttyname_r=${ac_cv_func_ttyname_r=yes} +ac_cv_func_twalk=${ac_cv_func_twalk=yes} +ac_cv_func_tzname=${ac_cv_func_tzname=yes} +ac_cv_func_tzset=${ac_cv_func_tzset=yes} +ac_cv_func_ualarm=${ac_cv_func_ualarm=yes} +ac_cv_func_ulckpwdf=${ac_cv_func_ulckpwdf=yes} +ac_cv_func_ulimit=${ac_cv_func_ulimit=yes} +ac_cv_func_umask=${ac_cv_func_umask=yes} +ac_cv_func_umount2=${ac_cv_func_umount2=yes} +ac_cv_func_umount=${ac_cv_func_umount=yes} +ac_cv_func_uname=${ac_cv_func_uname=yes} +ac_cv_func_ungetc=${ac_cv_func_ungetc=yes} +ac_cv_func_ungetwc=${ac_cv_func_ungetwc=yes} +ac_cv_func_unlink=${ac_cv_func_unlink=yes} +ac_cv_func_unlinkat=${ac_cv_func_unlinkat=yes} +ac_cv_func_unlockpt=${ac_cv_func_unlockpt=yes} +ac_cv_func_unsetenv=${ac_cv_func_unsetenv=yes} +ac_cv_func_unshare=${ac_cv_func_unshare=yes} +ac_cv_func_updwtmp=${ac_cv_func_updwtmp=yes} +ac_cv_func_updwtmpx=${ac_cv_func_updwtmpx=yes} +ac_cv_func_uselocale=${ac_cv_func_uselocale=yes} +ac_cv_func_usleep=${ac_cv_func_usleep=yes} +ac_cv_func_utime=${ac_cv_func_utime=yes} +ac_cv_func_utime_null=${ac_cv_func_utime_null=yes} +ac_cv_func_utimensat=${ac_cv_func_utimensat=yes} +ac_cv_func_utimes=${ac_cv_func_utimes=yes} +ac_cv_func_va_copy=${ac_cv_func_va_copy=no} +ac_cv_func_vasprintf=${ac_cv_func_vasprintf=yes} +ac_cv_func_vdprintf=${ac_cv_func_vdprintf=yes} +ac_cv_func_verr=${ac_cv_func_verr=yes} +ac_cv_func_verrx=${ac_cv_func_verrx=yes} +ac_cv_func_versionsort=${ac_cv_func_versionsort=yes} +ac_cv_func_vfork=${ac_cv_func_vfork=yes} +ac_cv_func_vfork_works=${ac_cv_func_vfork_works=yes} +ac_cv_func_vfprintf=${ac_cv_func_vfprintf=yes} +ac_cv_func_vfscanf=${ac_cv_func_vfscanf=yes} +ac_cv_func_vfwprintf=${ac_cv_func_vfwprintf=yes} +ac_cv_func_vfwscanf=${ac_cv_func_vfwscanf=yes} +ac_cv_func_vhangup=${ac_cv_func_vhangup=yes} +ac_cv_func_vmsplice=${ac_cv_func_vmsplice=yes} +ac_cv_func_vprintf=${ac_cv_func_vprintf=yes} +ac_cv_func_vscanf=${ac_cv_func_vscanf=yes} +ac_cv_func_vsnprintf=${ac_cv_func_vsnprintf=yes} +ac_cv_func_vsprintf=${ac_cv_func_vsprintf=yes} +ac_cv_func_vsscanf=${ac_cv_func_vsscanf=yes} +ac_cv_func_vswprintf=${ac_cv_func_vswprintf=yes} +ac_cv_func_vswscanf=${ac_cv_func_vswscanf=yes} +ac_cv_func_vsyslog=${ac_cv_func_vsyslog=yes} +ac_cv_func_vwarn=${ac_cv_func_vwarn=yes} +ac_cv_func_vwarnx=${ac_cv_func_vwarnx=yes} +ac_cv_func_vwprintf=${ac_cv_func_vwprintf=yes} +ac_cv_func_vwscanf=${ac_cv_func_vwscanf=yes} +ac_cv_func_wait3=${ac_cv_func_wait3=yes} +ac_cv_func_wait4=${ac_cv_func_wait4=yes} +ac_cv_func_wait=${ac_cv_func_wait=yes} +ac_cv_func_waitid=${ac_cv_func_waitid=yes} +ac_cv_func_waitpid=${ac_cv_func_waitpid=yes} +ac_cv_func_warn=${ac_cv_func_warn=yes} +ac_cv_func_warnx=${ac_cv_func_warnx=yes} +ac_cv_func_wcpcpy=${ac_cv_func_wcpcpy=yes} +ac_cv_func_wcpncpy=${ac_cv_func_wcpncpy=yes} +ac_cv_func_wcrtomb=${ac_cv_func_wcrtomb=yes} +ac_cv_func_wcscasecmp=${ac_cv_func_wcscasecmp=yes} +ac_cv_func_wcscasecmp_l=${ac_cv_func_wcscasecmp_l=yes} +ac_cv_func_wcscat=${ac_cv_func_wcscat=yes} +ac_cv_func_wcschr=${ac_cv_func_wcschr=yes} +ac_cv_func_wcscmp=${ac_cv_func_wcscmp=yes} +ac_cv_func_wcscoll=${ac_cv_func_wcscoll=yes} +ac_cv_func_wcscoll_l=${ac_cv_func_wcscoll_l=yes} +ac_cv_func_wcscpy=${ac_cv_func_wcscpy=yes} +ac_cv_func_wcscspn=${ac_cv_func_wcscspn=yes} +ac_cv_func_wcsdup=${ac_cv_func_wcsdup=yes} +ac_cv_func_wcsftime=${ac_cv_func_wcsftime=yes} +ac_cv_func_wcslen=${ac_cv_func_wcslen=yes} +ac_cv_func_wcsncasecmp=${ac_cv_func_wcsncasecmp=yes} +ac_cv_func_wcsncasecmp_l=${ac_cv_func_wcsncasecmp_l=yes} +ac_cv_func_wcsncat=${ac_cv_func_wcsncat=yes} +ac_cv_func_wcsncmp=${ac_cv_func_wcsncmp=yes} +ac_cv_func_wcsncpy=${ac_cv_func_wcsncpy=yes} +ac_cv_func_wcsnlen=${ac_cv_func_wcsnlen=yes} +ac_cv_func_wcsnrtombs=${ac_cv_func_wcsnrtombs=yes} +ac_cv_func_wcspbrk=${ac_cv_func_wcspbrk=yes} +ac_cv_func_wcsrchr=${ac_cv_func_wcsrchr=yes} +ac_cv_func_wcsrtombs=${ac_cv_func_wcsrtombs=yes} +ac_cv_func_wcsspn=${ac_cv_func_wcsspn=yes} +ac_cv_func_wcsstr=${ac_cv_func_wcsstr=yes} +ac_cv_func_wcstod=${ac_cv_func_wcstod=yes} +ac_cv_func_wcstof=${ac_cv_func_wcstof=yes} +ac_cv_func_wcstoimax=${ac_cv_func_wcstoimax=yes} +ac_cv_func_wcstok=${ac_cv_func_wcstok=yes} +ac_cv_func_wcstol=${ac_cv_func_wcstol=yes} +ac_cv_func_wcstold=${ac_cv_func_wcstold=yes} +ac_cv_func_wcstoll=${ac_cv_func_wcstoll=yes} +ac_cv_func_wcstombs=${ac_cv_func_wcstombs=yes} +ac_cv_func_wcstoul=${ac_cv_func_wcstoul=yes} +ac_cv_func_wcstoull=${ac_cv_func_wcstoull=yes} +ac_cv_func_wcstoumax=${ac_cv_func_wcstoumax=yes} +ac_cv_func_wcswcs=${ac_cv_func_wcswcs=yes} +ac_cv_func_wcswidth=${ac_cv_func_wcswidth=yes} +ac_cv_func_wcsxfrm=${ac_cv_func_wcsxfrm=yes} +ac_cv_func_wcsxfrm_l=${ac_cv_func_wcsxfrm_l=yes} +ac_cv_func_wctob=${ac_cv_func_wctob=yes} +ac_cv_func_wctomb=${ac_cv_func_wctomb=yes} +ac_cv_func_wctrans=${ac_cv_func_wctrans=yes} +ac_cv_func_wctrans_l=${ac_cv_func_wctrans_l=yes} +ac_cv_func_wctype=${ac_cv_func_wctype=yes} +ac_cv_func_wctype_l=${ac_cv_func_wctype_l=yes} +ac_cv_func_wcwidth=${ac_cv_func_wcwidth=yes} +ac_cv_func_wmemchr=${ac_cv_func_wmemchr=yes} +ac_cv_func_wmemcmp=${ac_cv_func_wmemcmp=yes} +ac_cv_func_wmemcpy=${ac_cv_func_wmemcpy=yes} +ac_cv_func_wmemmove=${ac_cv_func_wmemmove=yes} +ac_cv_func_wmemset=${ac_cv_func_wmemset=yes} +ac_cv_func_wordexp=${ac_cv_func_wordexp=yes} +ac_cv_func_wordfree=${ac_cv_func_wordfree=yes} +ac_cv_func_working_mktime=${ac_cv_func_working_mktime=no} +ac_cv_func_wprintf=${ac_cv_func_wprintf=yes} +ac_cv_func_write=${ac_cv_func_write=yes} +ac_cv_func_writev=${ac_cv_func_writev=yes} +ac_cv_func_wscanf=${ac_cv_func_wscanf=yes} +ac_cv_func_y0=${ac_cv_func_y0=yes} +ac_cv_func_y0f=${ac_cv_func_y0f=yes} +ac_cv_func_y1=${ac_cv_func_y1=yes} +ac_cv_func_y1f=${ac_cv_func_y1f=yes} +ac_cv_func_yn=${ac_cv_func_yn=yes} +ac_cv_func_ynf=${ac_cv_func_ynf=yes} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} +ac_cv_have_decl_strerror_r=${ac_cv_have_decl_strerror_r=yes} +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes} +ac_cv_header_aio_h=${ac_cv_header_aio_h=yes} +ac_cv_header_alloca_h=${ac_cv_header_alloca_h=yes} +ac_cv_header_ar_h=${ac_cv_header_ar_h=yes} +ac_cv_header_arpa_inet_h=${ac_cv_header_arpa_inet_h=yes} +ac_cv_header_arpa_nameser_h=${ac_cv_header_arpa_nameser_h=yes} +ac_cv_header_arpa_telnet_h=${ac_cv_header_arpa_telnet_h=yes} +ac_cv_header_assert_h=${ac_cv_header_assert_h=yes} +ac_cv_header_byteswap_h=${ac_cv_header_byteswap_h=yes} +ac_cv_header_complex_h=${ac_cv_header_complex_h=yes} +ac_cv_header_cpio_h=${ac_cv_header_cpio_h=yes} +ac_cv_header_crypt_h=${ac_cv_header_crypt_h=yes} +ac_cv_header_ctype_h=${ac_cv_header_ctype_h=yes} +ac_cv_header_dirent_dirent_h=${ac_cv_header_dirent_dirent_h=yes} +ac_cv_header_dirent_h=${ac_cv_header_dirent_h=yes} +ac_cv_header_dlfcn_h=${ac_cv_header_dlfcn_h=yes} +ac_cv_header_elf_h=${ac_cv_header_elf_h=yes} +ac_cv_header_endian_h=${ac_cv_header_endian_h=yes} +ac_cv_header_err_h=${ac_cv_header_err_h=yes} +ac_cv_header_errno_h=${ac_cv_header_errno_h=yes} +ac_cv_header_fcntl_h=${ac_cv_header_fcntl_h=yes} +ac_cv_header_features_h=${ac_cv_header_features_h=yes} +ac_cv_header_fenv_h=${ac_cv_header_fenv_h=yes} +ac_cv_header_float_h=${ac_cv_header_float_h=yes} +ac_cv_header_fnmatch_h=${ac_cv_header_fnmatch_h=yes} +ac_cv_header_ftw_h=${ac_cv_header_ftw_h=yes} +ac_cv_header_getopt_h=${ac_cv_header_getopt_h=yes} +ac_cv_header_glob_h=${ac_cv_header_glob_h=yes} +ac_cv_header_grp_h=${ac_cv_header_grp_h=yes} +ac_cv_header_iconv_h=${ac_cv_header_iconv_h=yes} +ac_cv_header_inttypes_h=${ac_cv_header_inttypes_h=yes} +ac_cv_header_iso646_h=${ac_cv_header_iso646_h=yes} +ac_cv_header_langinfo_h=${ac_cv_header_langinfo_h=yes} +ac_cv_header_lastlog_h=${ac_cv_header_lastlog_h=yes} +ac_cv_header_libgen_h=${ac_cv_header_libgen_h=yes} +ac_cv_header_libintl_h=${ac_cv_header_libintl_h=yes} +ac_cv_header_limits_h=${ac_cv_header_limits_h=yes} +ac_cv_header_locale_h=${ac_cv_header_locale_h=yes} +ac_cv_header_malloc_h=${ac_cv_header_malloc_h=yes} +ac_cv_header_math_h=${ac_cv_header_math_h=yes} +ac_cv_header_memory_h=${ac_cv_header_memory_h=yes} +ac_cv_header_mntent_h=${ac_cv_header_mntent_h=yes} +ac_cv_header_monetary_h=${ac_cv_header_monetary_h=yes} +ac_cv_header_mqueue_h=${ac_cv_header_mqueue_h=yes} +ac_cv_header_net_ethernet_h=${ac_cv_header_net_ethernet_h=yes} +ac_cv_header_net_if_arp_h=${ac_cv_header_net_if_arp_h=yes} +ac_cv_header_net_if_h=${ac_cv_header_net_if_h=yes} +ac_cv_header_net_route_h=${ac_cv_header_net_route_h=yes} +ac_cv_header_netdb_h=${ac_cv_header_netdb_h=yes} +ac_cv_header_netinet_icmp6_h=${ac_cv_header_netinet_icmp6_h=yes} +ac_cv_header_netinet_if_ether_h=${ac_cv_header_netinet_if_ether_h=yes} +ac_cv_header_netinet_in_h=${ac_cv_header_netinet_in_h=yes} +ac_cv_header_netinet_in_systm_h=${ac_cv_header_netinet_in_systm_h=yes} +ac_cv_header_netinet_ip6_h=${ac_cv_header_netinet_ip6_h=yes} +ac_cv_header_netinet_ip_h=${ac_cv_header_netinet_ip_h=yes} +ac_cv_header_netinet_ip_icmp_h=${ac_cv_header_netinet_ip_icmp_h=yes} +ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} +ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} +ac_cv_header_netinet_tcp_h=${ac_cv_header_netinet_tcp_h=yes} +ac_cv_header_netinet_udp_h=${ac_cv_header_netinet_udp_h=yes} +ac_cv_header_netpacket_packet_h=${ac_cv_header_netpacket_packet_h=yes} +ac_cv_header_nl_types_h=${ac_cv_header_nl_types_h=yes} +ac_cv_header_paths_h=${ac_cv_header_paths_h=yes} +ac_cv_header_poll_h=${ac_cv_header_poll_h=yes} +ac_cv_header_pthread_h=${ac_cv_header_pthread_h=yes} +ac_cv_header_pty_h=${ac_cv_header_pty_h=yes} +ac_cv_header_pwd_h=${ac_cv_header_pwd_h=yes} +ac_cv_header_regex_h=${ac_cv_header_regex_h=yes} +ac_cv_header_resolv_h=${ac_cv_header_resolv_h=yes} +ac_cv_header_sched_h=${ac_cv_header_sched_h=yes} +ac_cv_header_search_h=${ac_cv_header_search_h=yes} +ac_cv_header_semaphore_h=${ac_cv_header_semaphore_h=yes} +ac_cv_header_setjmp_h=${ac_cv_header_setjmp_h=yes} +ac_cv_header_shadow_h=${ac_cv_header_shadow_h=yes} +ac_cv_header_signal_h=${ac_cv_header_signal_h=yes} +ac_cv_header_spawn_h=${ac_cv_header_spawn_h=yes} +ac_cv_header_stat_broken=${ac_cv_header_stat_broken=no} +ac_cv_header_stdarg_h=${ac_cv_header_stdarg_h=yes} +ac_cv_header_stdbool_h=${ac_cv_header_stdbool_h=yes} +ac_cv_header_stdc=${ac_cv_header_stdc=yes} +ac_cv_header_stddef_h=${ac_cv_header_stddef_h=yes} +ac_cv_header_stdint_h=${ac_cv_header_stdint_h=yes} +ac_cv_header_stdio_ext_h=${ac_cv_header_stdio_ext_h=yes} +ac_cv_header_stdio_h=${ac_cv_header_stdio_h=yes} +ac_cv_header_stdlib_h=${ac_cv_header_stdlib_h=yes} +ac_cv_header_string_h=${ac_cv_header_string_h=yes} +ac_cv_header_strings_h=${ac_cv_header_strings_h=yes} +ac_cv_header_stropts_h=${ac_cv_header_stropts_h=yes} +ac_cv_header_sys_cdefs_h=${ac_cv_header_sys_cdefs_h=yes} +ac_cv_header_sys_epoll_h=${ac_cv_header_sys_epoll_h=yes} +ac_cv_header_sys_eventfd_h=${ac_cv_header_sys_eventfd_h=yes} +ac_cv_header_sys_file_h=${ac_cv_header_sys_file_h=yes} +ac_cv_header_sys_fsuid_h=${ac_cv_header_sys_fsuid_h=yes} +ac_cv_header_sys_inotify_h=${ac_cv_header_sys_inotify_h=yes} +ac_cv_header_sys_io_h=${ac_cv_header_sys_io_h=yes} +ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes} +ac_cv_header_sys_ipc_h=${ac_cv_header_sys_ipc_h=yes} +ac_cv_header_sys_kd_h=${ac_cv_header_sys_kd_h=yes} +ac_cv_header_sys_klog_h=${ac_cv_header_sys_klog_h=yes} +ac_cv_header_sys_mman_h=${ac_cv_header_sys_mman_h=yes} +ac_cv_header_sys_mount_h=${ac_cv_header_sys_mount_h=yes} +ac_cv_header_sys_msg_h=${ac_cv_header_sys_msg_h=yes} +ac_cv_header_sys_param_h=${ac_cv_header_sys_param_h=yes} +ac_cv_header_sys_poll_h=${ac_cv_header_sys_poll_h=yes} +ac_cv_header_sys_prctl_h=${ac_cv_header_sys_prctl_h=yes} +ac_cv_header_sys_procfs_h=${ac_cv_header_sys_procfs_h=yes} +ac_cv_header_sys_ptrace_h=${ac_cv_header_sys_ptrace_h=yes} +ac_cv_header_sys_reboot_h=${ac_cv_header_sys_reboot_h=yes} +ac_cv_header_sys_reg_h=${ac_cv_header_sys_reg_h=yes} +ac_cv_header_sys_resource_h=${ac_cv_header_sys_resource_h=yes} +ac_cv_header_sys_select_h=${ac_cv_header_sys_select_h=yes} +ac_cv_header_sys_sem_h=${ac_cv_header_sys_sem_h=yes} +ac_cv_header_sys_sendfile_h=${ac_cv_header_sys_sendfile_h=yes} +ac_cv_header_sys_shm_h=${ac_cv_header_sys_shm_h=yes} +ac_cv_header_sys_signalfd_h=${ac_cv_header_sys_signalfd_h=yes} +ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes} +ac_cv_header_sys_soundcard_h=${ac_cv_header_sys_soundcard_h=yes} +ac_cv_header_sys_stat_h=${ac_cv_header_sys_stat_h=yes} +ac_cv_header_sys_statfs_h=${ac_cv_header_sys_statfs_h=yes} +ac_cv_header_sys_statvfs_h=${ac_cv_header_sys_statvfs_h=yes} +ac_cv_header_sys_stropts_h=${ac_cv_header_sys_stropts_h=yes} +ac_cv_header_sys_swap_h=${ac_cv_header_sys_swap_h=yes} +ac_cv_header_sys_syscall_h=${ac_cv_header_sys_syscall_h=yes} +ac_cv_header_sys_sysctl_h=${ac_cv_header_sys_sysctl_h=no} +ac_cv_header_sys_sysinfo_h=${ac_cv_header_sys_sysinfo_h=yes} +ac_cv_header_sys_syslog_h=${ac_cv_header_sys_syslog_h=yes} +ac_cv_header_sys_sysmacros_h=${ac_cv_header_sys_sysmacros_h=yes} +ac_cv_header_sys_time_h=${ac_cv_header_sys_time_h=yes} +ac_cv_header_sys_times_h=${ac_cv_header_sys_times_h=yes} +ac_cv_header_sys_timex_h=${ac_cv_header_sys_timex_h=yes} +ac_cv_header_sys_types_h=${ac_cv_header_sys_types_h=yes} +ac_cv_header_sys_types_h_makedev=${ac_cv_header_sys_types_h_makedev=yes} +ac_cv_header_sys_ucontext_h=${ac_cv_header_sys_ucontext_h=yes} +ac_cv_header_sys_uio_h=${ac_cv_header_sys_uio_h=yes} +ac_cv_header_sys_un_h=${ac_cv_header_sys_un_h=yes} +ac_cv_header_sys_user_h=${ac_cv_header_sys_user_h=yes} +ac_cv_header_sys_utsname_h=${ac_cv_header_sys_utsname_h=yes} +ac_cv_header_sys_vfs_h=${ac_cv_header_sys_vfs_h=yes} +ac_cv_header_sys_vt_h=${ac_cv_header_sys_vt_h=yes} +ac_cv_header_sys_wait_h=${ac_cv_header_sys_wait_h=yes} +ac_cv_header_sys_xattr_h=${ac_cv_header_sys_xattr_h=yes} +ac_cv_header_syscall_h=${ac_cv_header_syscall_h=yes} +ac_cv_header_sysexits_h=${ac_cv_header_sysexits_h=yes} +ac_cv_header_syslog_h=${ac_cv_header_syslog_h=yes} +ac_cv_header_tar_h=${ac_cv_header_tar_h=yes} +ac_cv_header_termios_h=${ac_cv_header_termios_h=yes} +ac_cv_header_tgmath_h=${ac_cv_header_tgmath_h=yes} +ac_cv_header_time=${ac_cv_header_time=yes} +ac_cv_header_time_h=${ac_cv_header_time_h=yes} +ac_cv_header_ucontext_h=${ac_cv_header_ucontext_h=yes} +ac_cv_header_ulimit_h=${ac_cv_header_ulimit_h=yes} +ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes} +ac_cv_header_utime_h=${ac_cv_header_utime_h=yes} +ac_cv_header_utmp_h=${ac_cv_header_utmp_h=yes} +ac_cv_header_utmpx_h=${ac_cv_header_utmpx_h=yes} +ac_cv_header_vfork_h=${ac_cv_header_vfork_h=no} +ac_cv_header_wchar_h=${ac_cv_header_wchar_h=yes} +ac_cv_header_wctype_h=${ac_cv_header_wctype_h=yes} +ac_cv_header_wordexp_h=${ac_cv_header_wordexp_h=yes} +ac_cv_lib_crypt_main=${ac_cv_lib_crypt_main=yes} +ac_cv_lib_dl_main=${ac_cv_lib_dl_main=yes} +ac_cv_lib_error_at_line=${ac_cv_lib_error_at_line=no} +ac_cv_lib_kstat_kstat_open=${ac_cv_lib_kstat_kstat_open=no} +ac_cv_lib_lex=${ac_cv_lib_lex='none needed'} +ac_cv_lib_m_main=${ac_cv_lib_m_main=yes} +ac_cv_lib_pthread_main=${ac_cv_lib_pthread_main=yes} +ac_cv_lib_resolv_main=${ac_cv_lib_resolv_main=yes} +ac_cv_lib_rt_main=${ac_cv_lib_rt_main=yes} +ac_cv_lib_socket_main=${ac_cv_lib_socket_main=no} +ac_cv_lib_util_main=${ac_cv_lib_util_main=yes} +ac_cv_lib_xnet_main=${ac_cv_lib_xnet_main=yes} +ac_cv_member_struct_dirent_d_ino=${ac_cv_member_struct_dirent_d_ino=yes} +ac_cv_member_struct_dirent_d_type=${ac_cv_member_struct_dirent_d_type=yes} +ac_cv_member_struct_stat_st_blocks=${ac_cv_member_struct_stat_st_blocks=yes} +ac_cv_member_struct_tm_tm_zone=${ac_cv_member_struct_tm_tm_zone=yes} +ac_cv_objext=${ac_cv_objext=o} +ac_cv_prog_AWK=${ac_cv_prog_AWK=gawk} +ac_cv_prog_LEX=${ac_cv_prog_LEX=flex} +ac_cv_prog_cc_c89=${ac_cv_prog_cc_c89=} +ac_cv_prog_cc_c99=${ac_cv_prog_cc_c99=} +ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes} +ac_cv_prog_cc_stdc=${ac_cv_prog_cc_stdc=} +ac_cv_prog_cxx_c_o=${ac_cv_prog_cxx_c_o=yes} +ac_cv_prog_cxx_g=${ac_cv_prog_cxx_g=yes} +ac_cv_prog_gcc_traditional=${ac_cv_prog_gcc_traditional=no} +ac_cv_prog_lex_root=${ac_cv_prog_lex_root=lex.yy} +ac_cv_prog_lex_yytext_pointer=${ac_cv_prog_lex_yytext_pointer=no} +ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes} +ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} +ac_cv_search_getmntent=${ac_cv_search_getmntent='none required'} +ac_cv_search_opendir=${ac_cv_search_opendir='none required'} +ac_cv_struct_tm=${ac_cv_struct_tm=time.h} +ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=no} +ac_cv_sys_interpreter=${ac_cv_sys_interpreter=yes} +ac_cv_sys_largefile_CC=${ac_cv_sys_largefile_CC=no} +ac_cv_sys_largefile_source=${ac_cv_sys_largefile_source=no} +ac_cv_sys_long_file_names=${ac_cv_sys_long_file_names=yes} +ac_cv_sys_posix_termios=${ac_cv_sys_posix_termios=yes} +ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes} +ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes} +ac_cv_sys_tiocgwinsz_in_termios_h=${ac_cv_sys_tiocgwinsz_in_termios_h=no} +ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} +ac_cv_type__Bool=${ac_cv_type__Bool=yes} +ac_cv_type_getgroups=${ac_cv_type_getgroups=gid_t} +ac_cv_type_intmax_t=${ac_cv_type_intmax_t=yes} +ac_cv_type_intptr_t=${ac_cv_type_intptr_t=yes} +ac_cv_type_long_double=${ac_cv_type_long_double=yes} +ac_cv_type_long_long_int=${ac_cv_type_long_long_int=yes} +ac_cv_type_mbstate_t=${ac_cv_type_mbstate_t=yes} +ac_cv_type_mode_t=${ac_cv_type_mode_t=yes} +ac_cv_type_off_t=${ac_cv_type_off_t=yes} +ac_cv_type_pid_t=${ac_cv_type_pid_t=yes} +ac_cv_type_size_t=${ac_cv_type_size_t=yes} +ac_cv_type_ssize_t=${ac_cv_type_ssize_t=yes} +ac_cv_type_uid_t=${ac_cv_type_uid_t=yes} +ac_cv_type_uintmax_t=${ac_cv_type_uintmax_t=yes} +ac_cv_type_uintptr_t=${ac_cv_type_uintptr_t=yes} +ac_cv_type_unsigned_long_long_int=${ac_cv_type_unsigned_long_long_int=yes} +ac_cv_working_alloca_h=${ac_cv_working_alloca_h=yes} +am_cv_ar_interface=${am_cv_ar_interface=ar} +am_cv_make_support_nested_variables=${am_cv_make_support_nested_variables=yes} +am_cv_prog_cc_c_o=${am_cv_prog_cc_c_o=yes} diff --git a/toolchain/autoconf-lean/patches/100-remove-unused-checks.patch b/toolchain/autoconf-lean/patches/100-remove-unused-checks.patch new file mode 100644 index 0000000000..aa26336fe0 --- /dev/null +++ b/toolchain/autoconf-lean/patches/100-remove-unused-checks.patch @@ -0,0 +1,93 @@ +--- a/config-site-generator/configure.ac ++++ b/config-site-generator/configure.ac +@@ -31,16 +31,16 @@ AC_PROG_GCC_TRADITIONAL + AC_PROG_CXX + AC_PROG_CXXCPP + AC_PROG_CXX_C_O +-AC_PROG_OBJC +-AC_PROG_OBJCPP +-AC_PROG_OBJCXX +-AC_PROG_OBJCXXCPP ++#AC_PROG_OBJC ++#AC_PROG_OBJCPP ++#AC_PROG_OBJCXX ++#AC_PROG_OBJCXXCPP + #AC_ERLANG_PATH_ERLC + #AC_ERLANG_PATH_ERL +-AC_PROG_F77 +-AC_PROG_FC +-AC_PROG_F77_C_O +-AC_PROG_FC_C_O ++#AC_PROG_F77 ++#AC_PROG_FC ++#AC_PROG_F77_C_O ++#AC_PROG_FC_C_O + #AC_PROG_GO + AC_PROG_AWK + AC_PROG_GREP +@@ -52,13 +52,13 @@ AC_PROG_LEX + AC_PROG_LN_S + AC_PROG_RANLIB + AC_PROG_SED +-AC_PROG_YACC ++#AC_PROG_YACC + + AM_PROG_AS + + # Checks for system services. +-AC_PATH_X +-AC_PATH_XTRA ++#AC_PATH_X ++#AC_PATH_XTRA + AC_SYS_INTERPRETER + AC_SYS_LARGEFILE + AC_SYS_LONG_FILE_NAMES +@@ -163,27 +163,27 @@ AC_C_FLEXIBLE_ARRAY_MEMBER + AC_C_VARARRAYS + AC_C_TYPEOF + AC_C_PROTOTYPES +-AC_F77_LIBRARY_LDFLAGS +-AC_FC_LIBRARY_LDFLAGS +-AC_F77_DUMMY_MAIN +-AC_FC_DUMMY_MAIN +-AC_F77_MAIN +-AC_FC_MAIN +-AC_F77_WRAPPERS +-AC_FC_WRAPPERS +-AC_F77_FUNC +-AC_FC_FUNC +-AC_FC_PP_SRCEXT +-AC_FC_PP_DEFINE +-AC_FC_FREEFORM +-AC_FC_FIXEDFORM +-AC_FC_LINE_LENGTH +-AC_FC_CHECK_BOUNDS +-AC_F77_IMPLICIT_NONE +-AC_FC_IMPLICIT_NONE +-AC_FC_MODULE_EXTENSION +-AC_FC_MODULE_FLAG +-AC_FC_MODULE_OUTPUT_FLAG ++#AC_F77_LIBRARY_LDFLAGS ++#AC_FC_LIBRARY_LDFLAGS ++#AC_F77_DUMMY_MAIN ++#AC_FC_DUMMY_MAIN ++#AC_F77_MAIN ++#AC_FC_MAIN ++#AC_F77_WRAPPERS ++#AC_FC_WRAPPERS ++#AC_F77_FUNC ++#AC_FC_FUNC ++#AC_FC_PP_SRCEXT ++#AC_FC_PP_DEFINE ++#AC_FC_FREEFORM ++#AC_FC_FIXEDFORM ++#AC_FC_LINE_LENGTH ++#AC_FC_CHECK_BOUNDS ++#AC_F77_IMPLICIT_NONE ++#AC_FC_IMPLICIT_NONE ++#AC_FC_MODULE_EXTENSION ++#AC_FC_MODULE_FLAG ++#AC_FC_MODULE_OUTPUT_FLAG + + # Checks for library functions. + AC_FUNC_ALLOCA diff --git a/toolchain/autoconf-lean/patches/120-add-extra-checks.patch b/toolchain/autoconf-lean/patches/120-add-extra-checks.patch new file mode 100644 index 0000000000..382e6e5ad1 --- /dev/null +++ b/toolchain/autoconf-lean/patches/120-add-extra-checks.patch @@ -0,0 +1,49 @@ +--- a/config-site-generator/configure.ac ++++ b/config-site-generator/configure.ac +@@ -23,6 +23,7 @@ AC_DEFUN([AC_MSG_ERROR], [ + test -e conftest.dir && rm -rf conftest.dir ]) + + # Checks for programs. ++AC_PROG_CC + AC_PROG_CC_C89 + AC_PROG_CC_C_O + AC_PROG_CPP +@@ -52,9 +53,11 @@ AC_PROG_LEX + AC_PROG_LN_S + AC_PROG_RANLIB + AC_PROG_SED ++AC_PROG_LEX + #AC_PROG_YACC + + AM_PROG_AS ++AM_PROG_AR + + # Checks for system services. + #AC_PATH_X +@@ -118,6 +121,8 @@ sys/ucontext.h sys/uio.h sys/un.h sys/us + sys/wait.h sys/xattr.h tar.h termios.h tgmath.h time.h ucontext.h ulimit.h \ + unistd.h utime.h utmp.h utmpx.h wchar.h wctype.h wordexp.h + ]) ++# extra headers ++AC_CHECK_HEADERS([sys/cdefs.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_GETGROUPS +@@ -217,6 +222,17 @@ AC_FUNC_STRTOLD + AC_FUNC_UTIME_NULL + AC_FUNC_VPRINTF + ++AC_CHECK_SIZEOF(short) ++AC_CHECK_SIZEOF(int) ++AC_CHECK_SIZEOF(long) ++AC_CHECK_SIZEOF(long long) ++AC_CHECK_SIZEOF(unsigned int) ++AC_CHECK_SIZEOF(unsigned long) ++AC_CHECK_SIZEOF(unsigned long long) ++AC_CHECK_SIZEOF(off_t) ++AC_CHECK_SIZEOF(size_t) ++AC_CHECK_SIZEOF(ssize_t) ++ + # Functions list scraped from musl 0.9.4 x86_64 + AC_CHECK_FUNCS([ \ + a64l abort abs accept access acos acosf acosh acoshf acoshl acosl addmntent \ diff --git a/tools/Makefile b/tools/Makefile index 45d9c77b37..8e46c009bf 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,11 +21,11 @@ ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar BUILD_B43_TOOLS = y endif -tools-y += autoconf autoconf-archive automake bc bison cmake dosfstools +tools-y += autoconf autoconf-archive automake bc bison cmake cpio dosfstools tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage tools-y += mklibs mm-macros mtd-utils mtools padjffs2 patch-image patchelf -tools-y += pkg-config quilt squashfskit4 sstrip ucl upx zip zlib zstd +tools-y += pkg-config quilt squashfskit4 sstrip ucl upx xxd zip zlib zstd tools-$(BUILD_B43_TOOLS) += b43-tools tools-$(BUILD_ISL) += isl tools-$(BUILD_TOOLCHAIN) += expat gmp libelf mpc mpfr diff --git a/tools/cpio/Makefile b/tools/cpio/Makefile new file mode 100644 index 0000000000..2852209847 --- /dev/null +++ b/tools/cpio/Makefile @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only +include $(TOPDIR)/rules.mk + +PKG_NAME:=cpio +PKG_CPE_ID:=cpe:/a:gnu:cpio +PKG_VERSION:=2.13 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNU/cpio +PKG_HASH:=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d + +include $(INCLUDE_DIR)/host-build.mk + +$(eval $(call HostBuild)) diff --git a/tools/cpio/patches/001-duplicate-program-name.patch b/tools/cpio/patches/001-duplicate-program-name.patch new file mode 100644 index 0000000000..57ff4c3cad --- /dev/null +++ b/tools/cpio/patches/001-duplicate-program-name.patch @@ -0,0 +1,20 @@ +author Sergey Poznyakoff + +https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb + +* src/global.c: Remove superfluous declaration of program_name + +diff --git a/src/global.c b/src/global.c +index fb3abe9..acf92bc 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -184,9 +184,6 @@ unsigned int warn_option = 0; + /* Extract to standard output? */ + bool to_stdout_option = false; + +-/* The name this program was run with. */ +-char *program_name; +- + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ + int (*xstat) (); diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index e9daa4b6ad..61bc27b90e 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -9,7 +9,7 @@ PKG_VERSION:=1.25.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/f/fakeroot +PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot PKG_HASH:=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/tools/mklibs/Makefile b/tools/mklibs/Makefile index 48b1eace40..7c9ffffbad 100644 --- a/tools/mklibs/Makefile +++ b/tools/mklibs/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=mklibs PKG_VERSION:=0.1.44 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mklibs/ +PKG_SOURCE_URL:=@DEBIAN/pool/main/m/mklibs/ PKG_HASH:=3af0b6bd35e5b6fc58d8b68827fbae2ff6b7e20dd2b238ccb9b49d84722066c2 HOST_FIXUP:=autoreconf diff --git a/tools/xxd/Makefile b/tools/xxd/Makefile new file mode 100644 index 0000000000..c3cc6863cc --- /dev/null +++ b/tools/xxd/Makefile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xxd +PKG_VERSION:=1.10 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://grail.cba.csuohio.edu/~somos/ +PKG_HASH:=9bf05c19b9084973e3cc877696a7f9881a5c87fa5a9fa438d9962519726559f9 +PKG_CPE_ID:=cpe:/a:vim:vim + +include $(INCLUDE_DIR)/host-build.mk + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/xxd $(STAGING_DIR_HOST)/bin/ +endef + +$(eval $(call HostBuild))