diff --git a/README.md b/README.md index 4bba3b6..a5fef0b 100644 --- a/README.md +++ b/README.md @@ -23,5 +23,4 @@ src-git bgme https://git.bgme.bid/bgme/openwrt-bgme-feed.git - einat-ebpf: https://github.com/muink/openwrt-einat-ebpf - luci-app-einat: https://github.com/muink/luci-app-einat.git -- smartdns: https://github.com/pymumu/openwrt-smartdns -- luci-app-smartdns: https://github.com/pymumu/luci-app-smartdns +- smartdns: https://github.com/openwrt/packages/tree/master/net/smartdns diff --git a/einat-ebpf/Makefile b/einat-ebpf/Makefile index 36ea3f7..4e12691 100644 --- a/einat-ebpf/Makefile +++ b/einat-ebpf/Makefile @@ -5,17 +5,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=einat-ebpf -PKG_UPSTREAM_VERSION:=0.1.9 +PKG_UPSTREAM_VERSION:=0.1.8 PKG_UPSTREAM_GITHASH:= PKG_VERSION:=$(PKG_UPSTREAM_VERSION)$(if $(PKG_UPSTREAM_GITHASH),~$(call version_abbrev,$(PKG_UPSTREAM_GITHASH))) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ifeq ($(PKG_UPSTREAM_GITHASH),) PKG_SOURCE_URL:=https://codeload.github.com/EHfive/einat-ebpf/tar.gz/refs/tags/v$(PKG_UPSTREAM_VERSION)? -PKG_HASH:=1f1544580b7e8725e3a5b382a7c46b3a50d15d4dbfcbf45aba72dd6d9cce873c +PKG_HASH:=3e47810e852dbad4cffeee1df8d3fea4018e4bda331ffc72f8e9a88f3c73d034 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz else @@ -55,9 +55,7 @@ include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/rust/rust-package.mk # Don't ignore Cargo.lock -ifeq ($(shell grep -o 'RUST_PKG_LOCKED' $(TOPDIR)/feeds/packages/lang/rust/rust-package.mk 2>/dev/null),) - Build/Compile:=$(call Build/Compile/Cargo,,--locked) -endif +Build/Compile:=$(call Build/Compile/Cargo,,--locked) # The LLVM_PATH var is required so that einat's build script finds llvm-strip TARGET_PATH_PKG:=$(LLVM_PATH):$(TARGET_PATH_PKG) diff --git a/fakehttp/Makefile b/fakehttp/Makefile deleted file mode 100644 index 44e6eba..0000000 --- a/fakehttp/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# Copyright (C) 2025 Yuxi Yang - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fakehttp -PKG_UPSTREAM_NAME:=FakeHTTP -PKG_UPSTREAM_VERSION:=0.9.18 -PKG_UPSTREAM_GITHASH:= -PKG_VERSION:=$(PKG_UPSTREAM_VERSION)$(if $(PKG_UPSTREAM_GITHASH),~$(call version_abbrev,$(PKG_UPSTREAM_GITHASH))) -PKG_RELEASE:=3 - -PKG_SOURCE_SUBDIR:=$(PKG_UPSTREAM_NAME)-$(PKG_UPSTREAM_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) - -ifeq ($(PKG_UPSTREAM_GITHASH),) -PKG_SOURCE_URL:=https://codeload.github.com/MikeWang000000/FakeHTTP/tar.gz/refs/tags/$(PKG_UPSTREAM_VERSION)? -PKG_HASH:=c95c4d46e122390b0dcfd8509c708a6fc6817fb3e325cb966bf81a62bae973be - -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -else -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/MikeWang000000/FakeHTTP.git -PKG_SOURCE_VERSION:=$(PKG_UPSTREAM_GITHASH) -PKG_MIRROR_HASH:=skip - -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION).tar.gz -endif - -PKG_MAINTAINER:=Yuxi Yang -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Obfuscate all your TCP connections into HTTP protocol. - URL:=https://github.com/MikeWang000000/FakeHTTP - DEPENDS:=+libmnl +libnfnetlink +libnetfilter-queue +kmod-nft-queue +nftables -endef - -define Package/$(PKG_NAME)/conffiles -/etc/config/fakehttp -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/fakehttp $(1)/usr/sbin/fakehttp - - $(INSTALL_DIR) $(1)/etc/init.d/ - $(INSTALL_BIN) $(CURDIR)/files/fakehttp.init $(1)/etc/init.d/fakehttp - - $(INSTALL_DIR) $(1)/etc/config/ - $(INSTALL_CONF) $(CURDIR)/files/fakehttp.config $(1)/etc/config/fakehttp - - $(INSTALL_DIR) $(1)/etc/fakehttp/ - $(INSTALL_CONF) $(CURDIR)/files/fakehtttp.payload $(1)/etc/fakehttp/example_payload -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file diff --git a/fakehttp/files/fakehttp.config b/fakehttp/files/fakehttp.config deleted file mode 100644 index 387da51..0000000 --- a/fakehttp/files/fakehttp.config +++ /dev/null @@ -1,42 +0,0 @@ -config globals 'globals' - option enabled '0' - list interface 'eth0' - option silent '0' - -config payload - option enabled '1' - option type 'http' - option payload 'node-36-250-1-90.speedtest.cn' - option comment '' - -config payload - option enabled '0' - option type 'https' - option payload 'node-36-250-1-90.speedtest.cn' - option comment '' - -config payload - option enabled '0' - option type 'binary' - option payload '/etc/fakehttp/example_payload' - option comment '' - -config advanced 'advanced' - # -f skip firewall rules - option skip '0' - # -g disable hop count estimation - option disable_estimation '0' - # -y raise TTL dynamically to % of estimated hops - option pct '-1' - # -m fwmark for bypassing the queue - option fwmark_bypassing '-1' - # -x set the mask for fwmark - option fwmark_handle '-1' - # -n netfilter queue number - option queue_number '-1' - # -r duplicate generated packets for times - option repeat '-1' - # -t TTL for generated packets - option ttl '-1' - # -z use iptables commands instead of nft - option use_iptables '0' \ No newline at end of file diff --git a/fakehttp/files/fakehttp.init b/fakehttp/files/fakehttp.init deleted file mode 100644 index a5a92af..0000000 --- a/fakehttp/files/fakehttp.init +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh /etc/rc.common - -USE_PROCD=1 -START=99 -STOP=01 - -PROG="/usr/sbin/fakehttp" -NAME="fakehttp" - -service_triggers() { - procd_add_reload_trigger "${NAME}" -} - -add_interface() { - local ifname="$1" - - procd_append_param command "-i" "${ifname}" - procd_append_param netdev "${ifname}" -} - -add_payload() { - local section="$1" - - local enabled - config_get_bool enabled "${section}" "enabled" "0" - - if [ "${enabled}" -eq "1" ] - then - local type payload - config_get type "${section}" "type" "" - config_get payload "${section}" "payload" "" - case "${type}" in - "http") - procd_append_param command "-h" "${payload}" - ;; - "https") - procd_append_param command "-e" "${payload}" - ;; - "binary") - procd_append_param command "-b" "${payload}" - ;; - esac - fi -} - -test_bool_then_append() { - local section="$1" - local config_option="$2" - local command_option="$3" - - local tmp - config_get_bool tmp "${section}" "${config_option}" "0" - [ "${tmp}" -eq "1" ] && procd_append_param command "${command_option}" -} - -test_number_then_append() { - local section="$1" - local config_option="$2" - local command_option="$3" - - local tmp - config_get tmp "${section}" "${config_option}" "-1" - [ "${tmp}" -gt "0" ] && procd_append_param command "${command_option}" "${tmp}" -} - -add_advanced() { - test_bool_then_append "advanced" "skip" "-f" - test_bool_then_append "advanced" "disable_estimation" "-g" - test_number_then_append "advanced" "pct" "-y" - test_number_then_append "advanced" "fwmark_bypassing" "-m" - test_number_then_append "advanced" "fwmark_handle" "-x" - test_number_then_append "advanced" "queue_number" "-n" - test_number_then_append "advanced" "repeat" "-r" - test_number_then_append "advanced" "ttl" "-t" - test_bool_then_append "advanced" "use_iptables" "-z" -} - -fakehttp_instance() { - config_load "${NAME}" - - local enabled - config_get_bool enabled "globals" "enabled" "0" - [ "${enabled}" -eq "1" ] || return 0 - - procd_open_instance - procd_set_param command "${PROG}" - config_list_foreach "globals" "interface" add_interface - test_bool_then_append "globals" "silent" "-s" - config_foreach add_payload "payload" - add_advanced - - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_set_param respawn - - procd_close_instance -} - -start_service() { - fakehttp_instance -} - -reload_service() { - stop - start -} \ No newline at end of file diff --git a/fakehttp/files/fakehtttp.payload b/fakehttp/files/fakehtttp.payload deleted file mode 100644 index 4875d4a..0000000 --- a/fakehttp/files/fakehtttp.payload +++ /dev/null @@ -1,19 +0,0 @@ -GET /download?size=25000000&r=0.8063093007466539 HTTP/1.1 -Host: node-36-250-1-90.speedtest.cn:51090 -User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.7103.48 Safari/537.36 -Accept: */* -Accept-Language: en-US,en;q=0.5 -Accept-Encoding: gzip, deflate, br, zstd -Origin: https://www.speedtest.cn -DNT: 1 -Sec-GPC: 1 -Connection: keep-alive -Referer: https://www.speedtest.cn/ -Sec-Fetch-Dest: empty -Sec-Fetch-Mode: cors -Sec-Fetch-Site: same-site -sec-ch-ua-platform: "Windows" -sec-ch-ua: "Not/A)Brand";v="8", "Chromium";v="136", "Google Chrome";v="136" -sec-ch-ua-mobile: ?0 -Pragma: no-cache -Cache-Control: no-cache \ No newline at end of file diff --git a/luci-app-fakehttp/.gitignore b/luci-app-fakehttp/.gitignore deleted file mode 100644 index d17de19..0000000 --- a/luci-app-fakehttp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -local_test.sh -/tmp \ No newline at end of file diff --git a/luci-app-fakehttp/LICENSE b/luci-app-fakehttp/LICENSE deleted file mode 100644 index 10a69e7..0000000 --- a/luci-app-fakehttp/LICENSE +++ /dev/null @@ -1,232 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. - -“This License” refers to version 3 of the GNU General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based on the Program. - -To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. - -A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. - - c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - - a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. - - d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or authors of the material; or - - e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. - -All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. - -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - luci-app-fakehttp Copyright (C) 2025 Yuxi Yang - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. - -You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/luci-app-fakehttp/Makefile b/luci-app-fakehttp/Makefile deleted file mode 100644 index 56e26b7..0000000 --- a/luci-app-fakehttp/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# Copyright (C) 2025 Yuxi Yang - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI Support for fakehttp -LUCI_DEPENDS:=+luci-base +fakehttp -LUCI_PKGARCH:=all - -PKG_MAINTAINER:=Yuxi Yang -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=LICENSE - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-fakehttp/htdocs/luci-static/resources/view/fakehttp.js b/luci-app-fakehttp/htdocs/luci-static/resources/view/fakehttp.js deleted file mode 100644 index 901c419..0000000 --- a/luci-app-fakehttp/htdocs/luci-static/resources/view/fakehttp.js +++ /dev/null @@ -1,74 +0,0 @@ -"use strict"; -"require view"; -"require form"; -"require uci"; -"require tools.widgets as widgets"; - -const conf = "fakehttp"; -const instance = "fakehttp"; - -return view.extend({ - load: function () { - return Promise.all([uci.load(conf)]); - }, - render: function (res) { - let m, s, o; - - m = new form.Map( - "fakehttp", - _("FakeHTTP"), - _("Obfuscate all your TCP connections into HTTP protocol.") - ); - - // General Settings - s = m.section(form.TypedSection, "globals", _("General Settings")); - s.anonymous = true; - - o = s.option(form.Flag, "enabled", _("Enable")); - o.default = 0; - o.rmempty = false; - - o = s.option(form.Flag, "silent", _("Enable silent mode")); - o.default = 1; - o.rmempty = false; - - o = s.option( - widgets.DeviceSelect, - "interface", - _("Interfaces"), - _("work on specified network interface") - ); - o.multiple = true; - o.nocreate = true; - o.rmempty = false; - - // Payload Settings - s = m.section(form.GridSection, "payload", _("Payload Settings")); - s.addremove = true; - s.anonymous = true; - s.sortable = true; - s.nodescriptions = true; - - o = s.option(form.Flag, "enabled", _("Enable")); - o.default = 0; - o.editable = true; - o.rmempty = false; - - o = s.option(form.ListValue, "type", _("Type")); - o.value("http", "HTTP"); - o.value("https", "HTTPS"); - o.value("binary", "Binary"); - o.editable = true; - o.rmempty = false; - - o = s.option(form.Value, "payload", _("Payload")); - o.editable = true; - o.rmempty = false; - - o = s.option(form.Value, "comment", _("Comment")); - o.editable = true; - o.default = ""; - - return m.render(); - }, -}); diff --git a/luci-app-fakehttp/root/usr/share/luci/menu.d/luci-app-fakehttp.json b/luci-app-fakehttp/root/usr/share/luci/menu.d/luci-app-fakehttp.json deleted file mode 100644 index a03f261..0000000 --- a/luci-app-fakehttp/root/usr/share/luci/menu.d/luci-app-fakehttp.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin/services/fakehttp": { - "title": "FakeHTTP", - "order": 60, - "action": { - "type": "view", - "path": "fakehttp" - }, - "depends": { - "acl": ["luci-app-fakehttp"] - } - } -} diff --git a/luci-app-fakehttp/root/usr/share/rpcd/acl.d/luci-app-fakehttp.json b/luci-app-fakehttp/root/usr/share/rpcd/acl.d/luci-app-fakehttp.json deleted file mode 100644 index f03a07a..0000000 --- a/luci-app-fakehttp/root/usr/share/rpcd/acl.d/luci-app-fakehttp.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "luci-app-fakehttp": { - "description": "Grant UCI and RPC access to LuCI app fakehttp", - "read": { - "uci": ["fakehttp"] - }, - "write": { - "uci": ["fakehttp"] - } - } -} diff --git a/luci-app-smartdns/Makefile b/luci-app-smartdns/Makefile index ea5d973..deade50 100644 --- a/luci-app-smartdns/Makefile +++ b/luci-app-smartdns/Makefile @@ -4,30 +4,21 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=luci-app-smartdns -PKG_VERSION:=1.2025.47.2 -PKG_RELEASE:=2 - PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Nick Peng +PKG_VERSION:=1.2025.47 +PKG_RELEASE:=1 LUCI_TITLE:=LuCI for smartdns LUCI_DESCRIPTION:=Provides Luci for smartdns +LUCI_DEPENDS:=+smartdns LUCI_PKGARCH:=all -LUCI_DEPENDS:=+luci-base +smartdns \ - +PACKAGE_$(PKG_NAME)_INCLUDE_smartdns_ui:smartdns-ui - -include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME)/config # shown in make menuconfig help $(LUCI_TITLE) Version: $(PKG_VERSION)-$(PKG_RELEASE) - -config PACKAGE_$(PKG_NAME)_INCLUDE_smartdns_ui - bool "Include smartdns-ui" - default n endef include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/log.js b/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/log.js index ff8c95f..e5a8fe6 100644 --- a/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/log.js +++ b/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/log.js @@ -90,7 +90,7 @@ return view.extend({ var button = ev.target; button.disabled = true; button.textContent = _('Clear Logs...'); - fs.exec('/usr/libexec/smartdns-call', ['clear_log']) + fs.exec_direct('/usr/libexec/smartdns-call', ['clear_log']) .then(function () { button.textContent = _('Logs cleared successfully!'); setTimeout(function () { @@ -114,9 +114,9 @@ return view.extend({ poll.add(L.bind(function () { - return fs.exec('/usr/libexec/smartdns-call', ['tail']) + return fs.exec_direct('/usr/libexec/smartdns-call', ['tail']) .then(function (res) { - var log = E('pre', { 'wrap': 'pre' }, [res.stdout.trim() || _('Log is clean.')]); + var log = E('pre', { 'wrap': 'pre' }, [res.trim() || _('Log is clean.')]); dom.content(log_textarea, log); log.scrollTop = log.scrollHeight; diff --git a/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js b/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js index 987c137..e4a4d98 100644 --- a/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js +++ b/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js @@ -61,18 +61,8 @@ function smartdnsRenderStatus(res) { var smartdnsEnable = uci.get_first('smartdns', 'smartdns', 'enabled'); var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server'); - var uiEnable = uci.get_first('smartdns', 'smartdns', 'ui') || "0"; - var uiPort = uci.get_first('smartdns', 'smartdns', 'ui_port') || "6080"; - if (isRunning) { renderHTML += "SmartDNS - " + _("RUNNING") + ""; - - if (uiEnable === '1') { - var protocol = window.location.protocol; - var hostname = window.location.hostname; - var uiLink = protocol + "//" + hostname + ":" + uiPort; - renderHTML += "  " + _("Open the WebUI") + ""; - } } else { renderHTML += "SmartDNS - " + _("NOT RUNNING") + ""; if (smartdnsEnable === '1') { @@ -94,28 +84,17 @@ function smartdnsRenderStatus(res) { return renderHTML; } - -function isSmartdnsUiAvailable() { - return fs.stat('/usr/lib/smartdns_ui.so').then(function (res) { - return res && res.type === 'file'; - }).catch(function () { - return false; - }); -} - return view.extend({ load: function () { return Promise.all([ uci.load('dhcp'), uci.load('smartdns'), - isSmartdnsUiAvailable() ]); }, render: function (stats) { var m, s, o; var ss, so; var servers, download_files; - var hasUi = stats[2]; m = new form.Map('smartdns', _('SmartDNS')); m.title = _("SmartDNS Server"); @@ -187,31 +166,6 @@ return view.extend({ o.rmempty = false; o.default = o.enabled; - //WebUI - if (hasUi) { - o = s.taboption("settings", form.Flag, "ui", _("Enable WebUI"), _("Enable or disable smartdns webui plugin.")); - o.rmempty = false; - o.default = o.disabled; - - o = s.taboption("settings", form.Value, "ui_port", _("WebUI Port"), _("WebUI server port.")); - o.placeholder = 6080; - o.datatype = "port"; - o.rempty = false; - o.depends('ui', '1'); - - o = s.taboption("settings", form.Value, "ui_data_dir", _("WebUI Data Dir"), _("Directory for storing the webui database.")); - o.placeholder = "/var/lib/smartdns"; - o.datatype = "string"; - o.rempty = false; - o.depends('ui', '1'); - - o = s.taboption("settings", form.Value, "ui_log_max_age", _("WebUI Log Retention"), _("Number of days to retain webui logs.")); - o.placeholder = 30; - o.datatype = "uinteger"; - o.rempty = false; - o.depends('ui', '1'); - } - /////////////////////////////////////// // advanced settings; /////////////////////////////////////// @@ -868,7 +822,7 @@ return view.extend({ // Upstream servers; //////////////// s = m.section(form.GridSection, "server", _("Upstream Servers"), - _("Upstream Servers, support UDP, TCP, DoT, DoH, DoQ, DoH3 protocol. Please configure multiple DNS servers, " + _("Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, " + "including multiple foreign DNS servers.")); s.anonymous = true; s.addremove = true; @@ -899,7 +853,6 @@ return view.extend({ o.depends("type", "udp"); o.depends("type", "tcp"); o.depends("type", "tls"); - o.depends("type", "quic"); // type; o = s.taboption("general", form.ListValue, "type", _("type"), _("DNS Server type")); @@ -908,8 +861,6 @@ return view.extend({ o.value("tcp", _("tcp")); o.value("tls", _("tls")); o.value("https", _("https")); - o.value("quic", _("quic")); - o.value("h3", _("h3")); o.default = "udp"; o.rempty = false; @@ -953,10 +904,8 @@ return view.extend({ o.datatype = "string" o.rempty = true o.modalonly = true; - o.depends("type", "tls"); - o.depends("type", "https"); - o.depends("type", "quic"); - o.depends("type", "h3"); + o.depends("type", "tls") + o.depends("type", "https") // certificate verify o = s.taboption("advanced", form.Flag, "no_check_certificate", _("No check certificate"), @@ -964,10 +913,8 @@ return view.extend({ o.rmempty = true o.default = o.disabled o.modalonly = true; - o.depends("type", "tls"); - o.depends("type", "https"); - o.depends("type", "quic"); - o.depends("type", "h3"); + o.depends("type", "tls") + o.depends("type", "https") // SNI host name o = s.taboption("advanced", form.Value, "host_name", _("TLS SNI name"), @@ -976,10 +923,8 @@ return view.extend({ o.datatype = "hostname" o.rempty = true o.modalonly = true; - o.depends("type", "tls"); - o.depends("type", "https"); - o.depends("type", "quic"); - o.depends("type", "h3"); + o.depends("type", "tls") + o.depends("type", "https") // http host o = s.taboption("advanced", form.Value, "http_host", _("HTTP Host"), @@ -988,8 +933,7 @@ return view.extend({ o.datatype = "hostname" o.rempty = true o.modalonly = true; - o.depends("type", "https"); - o.depends("type", "h3"); + o.depends("type", "https") // SPKI pin o = s.taboption("advanced", form.Value, "spki_pin", _("TLS SPKI Pinning"), @@ -999,10 +943,8 @@ return view.extend({ o.datatype = "string" o.rempty = true o.modalonly = true; - o.depends("type", "tls"); - o.depends("type", "https"); - o.depends("type", "quic"); - o.depends("type", "h3"); + o.depends("type", "tls") + o.depends("type", "https") // mark o = s.taboption("advanced", form.Value, "set_mark", _("Marking Packets"), @@ -1038,13 +980,6 @@ return view.extend({ return true; } - // fallback - o = s.taboption("advanced", form.Flag, "fallback", _("Fallback"), - _("Mark this server as a fallback server, use it only when default servers fail.")) - o.default = o.disabled - o.rmempty = true - o.modalonly = true - // other args o = s.taboption("advanced", form.Value, "addition_arg", _("Additional Server Args"), _("Additional Args for upstream dns servers")) diff --git a/luci-app-smartdns/po/templates/smartdns.pot b/luci-app-smartdns/po/templates/smartdns.pot index fe9c6a6..7a2203f 100644 --- a/luci-app-smartdns/po/templates/smartdns.pot +++ b/luci-app-smartdns/po/templates/smartdns.pot @@ -1,1216 +1,1129 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: log.js:80 -msgid "Loading..." -msgstr "" - -#: log.js:82 smartdns.js:146 -msgid "Collecting data ..." -msgstr "" - -#: log.js:92 -msgid "Clear Logs..." -msgstr "" - -#: log.js:95 -msgid "Logs cleared successfully!" -msgstr "" - -#: log.js:98 log.js:108 log.js:112 -msgid "Clear Logs" -msgstr "" - -#: log.js:101 log.js:119 -msgid "Log is clean." -msgstr "" - -#: log.js:105 -msgid "Failed to clear log." -msgstr "" - -#: log.js:127 -msgid "Log file does not exist." -msgstr "" - -#: log.js:129 -#, javascript-format -msgid "Unknown error: %s" -msgstr "" - -#: log.js:142 -msgid "Back SmartDNS" -msgstr "" - -#: log.js:151 -#, javascript-format -msgid "Refresh every %s seconds." -msgstr "" - -#: smartdns.js:68 +#: smartdns.js:65 msgid "RUNNING" msgstr "" -#: smartdns.js:74 -msgid "Open the WebUI" -msgstr "" - -#: smartdns.js:77 +#: smartdns.js:67 msgid "NOT RUNNING" msgstr "" -#: smartdns.js:79 +#: smartdns.js:69 msgid "Please check the system logs and check if the configuration is valid." msgstr "" -#: smartdns.js:91 +#: smartdns.js:81 msgid "Dnsmasq Forwarded To Smartdns Failure" msgstr "" -#: smartdns.js:120 +#: smartdns.js:99 msgid "SmartDNS" msgstr "" -#: smartdns.js:121 +#: smartdns.js:100 msgid "SmartDNS Server" msgstr "" -#: smartdns.js:122 +#: smartdns.js:101 msgid "" "SmartDNS is a local high-performance DNS server, supports finding fastest " "IP, supports ad filtering, and supports avoiding DNS poisoning." msgstr "" -#: smartdns.js:153 +#: smartdns.js:125 +msgid "Collecting data ..." +msgstr "" + +#: smartdns.js:132 msgid "Settings" msgstr "" -#: smartdns.js:153 smartdns.js:156 smartdns.js:877 +#: smartdns.js:132 smartdns.js:135 smartdns.js:816 msgid "General Settings" msgstr "" -#: smartdns.js:157 smartdns.js:878 smartdns.js:1063 +#: smartdns.js:136 smartdns.js:817 smartdns.js:983 msgid "Advanced Settings" msgstr "" -#: smartdns.js:158 +#: smartdns.js:137 msgid "Second Server Settings" msgstr "" -#: smartdns.js:159 +#: smartdns.js:138 msgid "DNS64 Server Settings" msgstr "" -#: smartdns.js:160 +#: smartdns.js:139 msgid "Download Files Setting" msgstr "" -#: smartdns.js:160 +#: smartdns.js:139 msgid "" "Download domain list files for domain-rule and include config files, please " "refresh the page after download to take effect." msgstr "" -#: smartdns.js:161 +#: smartdns.js:140 msgid "Proxy Server Settings" msgstr "" -#: smartdns.js:162 +#: smartdns.js:141 msgid "Custom Settings" msgstr "" -#: smartdns.js:167 smartdns.js:524 smartdns.js:881 smartdns.js:1066 smartdns.js:1453 smartdns.js:1633 +#: smartdns.js:146 smartdns.js:478 smartdns.js:820 smartdns.js:986 +#: smartdns.js:1373 smartdns.js:1553 msgid "Enable" msgstr "" -#: smartdns.js:167 +#: smartdns.js:146 msgid "Enable or disable smartdns server" msgstr "" -#: smartdns.js:172 +#: smartdns.js:151 msgid "Server Name" msgstr "" -#: smartdns.js:172 +#: smartdns.js:151 msgid "Smartdns server name" msgstr "" -#: smartdns.js:178 smartdns.js:530 +#: smartdns.js:157 smartdns.js:484 msgid "Local Port" msgstr "" -#: smartdns.js:179 +#: smartdns.js:158 msgid "" "Smartdns local server port, smartdns will be automatically set as main dns " "when the port is 53." msgstr "" -#: smartdns.js:186 +#: smartdns.js:165 msgid "Automatically Set Dnsmasq" msgstr "" -#: smartdns.js:186 +#: smartdns.js:165 msgid "Automatically set as upstream of dnsmasq when port changes." msgstr "" -#: smartdns.js:192 -msgid "Enable WebUI" -msgstr "" - -#: smartdns.js:192 -msgid "Enable or disable smartdns webui plugin." -msgstr "" - -#: smartdns.js:196 -msgid "WebUI Port" -msgstr "" - -#: smartdns.js:196 -msgid "WebUI server port." -msgstr "" - -#: smartdns.js:202 -msgid "WebUI Data Dir" -msgstr "" - -#: smartdns.js:202 -msgid "Directory for storing the webui database." -msgstr "" - -#: smartdns.js:208 -msgid "WebUI Log Retention" -msgstr "" - -#: smartdns.js:208 -msgid "Number of days to retain webui logs." -msgstr "" - -#: smartdns.js:219 smartdns.js:1128 smartdns.js:1287 smartdns.js:1510 +#: smartdns.js:173 smartdns.js:1048 smartdns.js:1207 smartdns.js:1430 msgid "Speed Check Mode" msgstr "" -#: smartdns.js:219 smartdns.js:1128 smartdns.js:1287 smartdns.js:1510 +#: smartdns.js:173 smartdns.js:1048 smartdns.js:1207 smartdns.js:1430 msgid "Smartdns speed check mode." msgstr "" -#: smartdns.js:222 smartdns.js:263 smartdns.js:795 smartdns.js:1131 smartdns.js:1290 smartdns.js:1332 smartdns.js:1506 smartdns.js:1514 +#: smartdns.js:176 smartdns.js:217 smartdns.js:749 smartdns.js:1051 +#: smartdns.js:1210 smartdns.js:1252 smartdns.js:1426 smartdns.js:1434 msgid "default" msgstr "" -#: smartdns.js:227 smartdns.js:1136 smartdns.js:1295 smartdns.js:1494 smartdns.js:1519 +#: smartdns.js:181 smartdns.js:1056 smartdns.js:1215 smartdns.js:1414 +#: smartdns.js:1439 msgid "None" msgstr "" -#: smartdns.js:246 smartdns.js:1155 smartdns.js:1314 smartdns.js:1538 +#: smartdns.js:200 smartdns.js:1075 smartdns.js:1234 smartdns.js:1458 msgid "TCP port is empty" msgstr "" -#: smartdns.js:252 smartdns.js:1161 smartdns.js:1320 smartdns.js:1544 +#: smartdns.js:206 smartdns.js:1081 smartdns.js:1240 smartdns.js:1464 msgid "Speed check mode is invalid." msgstr "" -#: smartdns.js:259 +#: smartdns.js:213 msgid "Response Mode" msgstr "" -#: smartdns.js:260 +#: smartdns.js:214 msgid "" "Smartdns response mode, First Ping: return the first ping IP, Fastest IP: " "return the fastest IP, Fastest Response: return the fastest DNS response." msgstr "" -#: smartdns.js:264 +#: smartdns.js:218 msgid "First Ping" msgstr "" -#: smartdns.js:265 +#: smartdns.js:219 msgid "Fastest IP" msgstr "" -#: smartdns.js:266 +#: smartdns.js:220 msgid "Fastest Response" msgstr "" -#: smartdns.js:269 smartdns.js:537 +#: smartdns.js:223 smartdns.js:491 msgid "TCP Server" msgstr "" -#: smartdns.js:269 smartdns.js:537 +#: smartdns.js:223 smartdns.js:491 msgid "Enable TCP DNS Server" msgstr "" -#: smartdns.js:274 +#: smartdns.js:228 msgid "DOT Server" msgstr "" -#: smartdns.js:274 +#: smartdns.js:228 msgid "Enable DOT DNS Server" msgstr "" -#: smartdns.js:278 +#: smartdns.js:232 msgid "DOT Server Port" msgstr "" -#: smartdns.js:278 +#: smartdns.js:232 msgid "Smartdns DOT server port." msgstr "" -#: smartdns.js:286 +#: smartdns.js:240 msgid "DOH Server" msgstr "" -#: smartdns.js:286 +#: smartdns.js:240 msgid "Enable DOH DNS Server" msgstr "" -#: smartdns.js:290 +#: smartdns.js:244 msgid "DOH Server Port" msgstr "" -#: smartdns.js:290 +#: smartdns.js:244 msgid "Smartdns DOH server port." msgstr "" -#: smartdns.js:297 +#: smartdns.js:251 msgid "Server Cert" msgstr "" -#: smartdns.js:297 +#: smartdns.js:251 msgid "Server certificate file path." msgstr "" -#: smartdns.js:304 +#: smartdns.js:258 msgid "Server Cert Key" msgstr "" -#: smartdns.js:304 +#: smartdns.js:258 msgid "Server certificate key file path." msgstr "" -#: smartdns.js:311 +#: smartdns.js:265 msgid "Server Cert Key Pass" msgstr "" -#: smartdns.js:311 +#: smartdns.js:265 msgid "Server certificate key file password." msgstr "" -#: smartdns.js:318 +#: smartdns.js:272 msgid "IPV6 Server" msgstr "" -#: smartdns.js:318 +#: smartdns.js:272 msgid "Enable IPV6 DNS Server" msgstr "" -#: smartdns.js:323 +#: smartdns.js:277 msgid "Bind Device" msgstr "" -#: smartdns.js:323 +#: smartdns.js:277 msgid "Listen only on the specified interfaces." msgstr "" -#: smartdns.js:328 +#: smartdns.js:282 msgid "Bind Device Name" msgstr "" -#: smartdns.js:328 +#: smartdns.js:282 msgid "Name of device name listen on." msgstr "" -#: smartdns.js:334 smartdns.js:1168 smartdns.js:1327 smartdns.js:1501 +#: smartdns.js:288 smartdns.js:1088 smartdns.js:1247 smartdns.js:1421 msgid "Dual-stack IP Selection" msgstr "" -#: smartdns.js:335 smartdns.js:1169 smartdns.js:1328 smartdns.js:1502 +#: smartdns.js:289 smartdns.js:1089 smartdns.js:1248 smartdns.js:1422 msgid "Enable IP selection between IPV4 and IPV6" msgstr "" -#: smartdns.js:340 +#: smartdns.js:294 msgid "Domain prefetch" msgstr "" -#: smartdns.js:341 +#: smartdns.js:295 msgid "Enable domain prefetch, accelerate domain response speed." msgstr "" -#: smartdns.js:346 +#: smartdns.js:300 msgid "Serve expired" msgstr "" -#: smartdns.js:347 +#: smartdns.js:301 msgid "" "Attempts to serve old responses from cache with a TTL of 0 in the response " "without waiting for the actual resolution to finish." msgstr "" -#: smartdns.js:352 +#: smartdns.js:306 msgid "Cache Size" msgstr "" -#: smartdns.js:352 +#: smartdns.js:306 msgid "DNS domain result cache size" msgstr "" -#: smartdns.js:356 +#: smartdns.js:310 msgid "Cache Persist" msgstr "" -#: smartdns.js:356 +#: smartdns.js:310 msgid "Write cache to disk on exit and load on startup." msgstr "" -#: smartdns.js:361 +#: smartdns.js:315 msgid "Resolve Local Hostnames" msgstr "" -#: smartdns.js:361 +#: smartdns.js:315 msgid "Resolve local hostnames by reading Dnsmasq lease file." msgstr "" -#: smartdns.js:366 +#: smartdns.js:320 msgid "mDNS Lookup" msgstr "" -#: smartdns.js:366 +#: smartdns.js:320 msgid "Resolve local network hostname via mDNS protocol." msgstr "" -#: smartdns.js:371 smartdns.js:589 smartdns.js:1174 smartdns.js:1336 smartdns.js:1550 +#: smartdns.js:325 smartdns.js:543 smartdns.js:1094 smartdns.js:1256 +#: smartdns.js:1470 msgid "Force AAAA SOA" msgstr "" -#: smartdns.js:371 smartdns.js:589 smartdns.js:1174 smartdns.js:1336 smartdns.js:1550 +#: smartdns.js:325 smartdns.js:543 smartdns.js:1094 smartdns.js:1256 +#: smartdns.js:1470 msgid "Force AAAA SOA." msgstr "" -#: smartdns.js:376 smartdns.js:594 smartdns.js:1179 +#: smartdns.js:330 smartdns.js:548 smartdns.js:1099 msgid "Force HTTPS SOA" msgstr "" -#: smartdns.js:376 smartdns.js:594 smartdns.js:1179 +#: smartdns.js:330 smartdns.js:548 smartdns.js:1099 msgid "Force HTTPS SOA." msgstr "" -#: smartdns.js:381 smartdns.js:602 smartdns.js:1184 smartdns.js:1340 smartdns.js:1556 +#: smartdns.js:335 smartdns.js:556 smartdns.js:1104 smartdns.js:1260 +#: smartdns.js:1476 msgid "IPset Name" msgstr "" -#: smartdns.js:381 smartdns.js:602 smartdns.js:1184 smartdns.js:1340 smartdns.js:1556 +#: smartdns.js:335 smartdns.js:556 smartdns.js:1104 smartdns.js:1260 +#: smartdns.js:1476 msgid "IPset name." msgstr "" -#: smartdns.js:393 smartdns.js:414 smartdns.js:614 smartdns.js:1196 smartdns.js:1352 +#: smartdns.js:347 smartdns.js:368 smartdns.js:568 smartdns.js:1116 +#: smartdns.js:1272 msgid "ipset name format error, format: [#[4|6]:]ipsetname" msgstr "" -#: smartdns.js:401 +#: smartdns.js:355 msgid "No Speed IPset Name" msgstr "" -#: smartdns.js:402 +#: smartdns.js:356 msgid "Ipset name, Add domain result to ipset when speed check fails." msgstr "" -#: smartdns.js:422 smartdns.js:621 smartdns.js:1204 smartdns.js:1359 smartdns.js:1562 +#: smartdns.js:376 smartdns.js:575 smartdns.js:1124 smartdns.js:1279 +#: smartdns.js:1482 msgid "NFTset Name" msgstr "" -#: smartdns.js:422 smartdns.js:621 smartdns.js:1204 smartdns.js:1359 smartdns.js:1562 +#: smartdns.js:376 smartdns.js:575 smartdns.js:1124 smartdns.js:1279 +#: smartdns.js:1482 msgid "NFTset name, format: [#[4|6]:[family#table#set]]" msgstr "" -#: smartdns.js:434 smartdns.js:455 smartdns.js:633 smartdns.js:1216 smartdns.js:1371 smartdns.js:1575 +#: smartdns.js:388 smartdns.js:409 smartdns.js:587 smartdns.js:1136 +#: smartdns.js:1291 smartdns.js:1495 msgid "NFTset name format error, format: [#[4|6]:[family#table#set]]" msgstr "" -#: smartdns.js:442 +#: smartdns.js:396 msgid "No Speed NFTset Name" msgstr "" -#: smartdns.js:443 +#: smartdns.js:397 msgid "" "Nftset name, Add domain result to nftset when speed check fails, format: " "[#[4|6]:[family#table#set]]" msgstr "" -#: smartdns.js:463 +#: smartdns.js:417 msgid "Domain TTL" msgstr "" -#: smartdns.js:463 +#: smartdns.js:417 msgid "TTL for all domain result." msgstr "" -#: smartdns.js:467 +#: smartdns.js:421 msgid "Domain TTL Min" msgstr "" -#: smartdns.js:468 +#: smartdns.js:422 msgid "Minimum TTL for all domain result." msgstr "" -#: smartdns.js:475 +#: smartdns.js:429 msgid "Domain TTL Max" msgstr "" -#: smartdns.js:476 +#: smartdns.js:430 msgid "Maximum TTL for all domain result." msgstr "" -#: smartdns.js:480 +#: smartdns.js:434 msgid "Reply Domain TTL Max" msgstr "" -#: smartdns.js:481 +#: smartdns.js:435 msgid "Reply maximum TTL for all domain result." msgstr "" -#: smartdns.js:485 smartdns.js:641 smartdns.js:1049 +#: smartdns.js:439 smartdns.js:595 smartdns.js:969 msgid "Additional Server Args" msgstr "" -#: smartdns.js:486 smartdns.js:642 +#: smartdns.js:440 smartdns.js:596 msgid "" "Additional server args, refer to the help description of the bind option." msgstr "" -#: smartdns.js:492 smartdns.js:1225 +#: smartdns.js:446 smartdns.js:1145 msgid "Include Config Files
/etc/smartdns/conf.d" msgstr "" -#: smartdns.js:493 smartdns.js:1226 +#: smartdns.js:447 smartdns.js:1146 msgid "" "Include other config files from /etc/smartdns/conf.d or custom path, can be " "downloaded from the download page." msgstr "" -#: smartdns.js:506 +#: smartdns.js:460 msgid "Hosts File" msgstr "" -#: smartdns.js:506 +#: smartdns.js:460 msgid "Include hosts file." msgstr "" -#: smartdns.js:525 +#: smartdns.js:479 msgid "Enable or disable second DNS server." msgstr "" -#: smartdns.js:530 +#: smartdns.js:484 msgid "Smartdns local server port" msgstr "" -#: smartdns.js:542 smartdns.js:917 smartdns.js:1103 smartdns.js:1262 smartdns.js:1461 +#: smartdns.js:496 smartdns.js:853 smartdns.js:1023 smartdns.js:1182 +#: smartdns.js:1381 msgid "Server Group" msgstr "" -#: smartdns.js:543 +#: smartdns.js:497 msgid "Query DNS through specific dns server group, such as office, home." msgstr "" -#: smartdns.js:549 +#: smartdns.js:503 msgid "Skip Speed Check" msgstr "" -#: smartdns.js:550 +#: smartdns.js:504 msgid "Do not check speed." msgstr "" -#: smartdns.js:555 +#: smartdns.js:509 msgid "Skip Address Rules" msgstr "" -#: smartdns.js:556 +#: smartdns.js:510 msgid "Skip address rules." msgstr "" -#: smartdns.js:561 +#: smartdns.js:515 msgid "Skip Nameserver Rule" msgstr "" -#: smartdns.js:562 +#: smartdns.js:516 msgid "Skip nameserver rules." msgstr "" -#: smartdns.js:567 +#: smartdns.js:521 msgid "Skip Ipset Rule" msgstr "" -#: smartdns.js:568 +#: smartdns.js:522 msgid "Skip ipset rules." msgstr "" -#: smartdns.js:573 +#: smartdns.js:527 msgid "Skip SOA Address Rule" msgstr "" -#: smartdns.js:574 +#: smartdns.js:528 msgid "Skip SOA address rules." msgstr "" -#: smartdns.js:578 +#: smartdns.js:532 msgid "Skip Dualstack Selection" msgstr "" -#: smartdns.js:579 +#: smartdns.js:533 msgid "Skip Dualstack Selection." msgstr "" -#: smartdns.js:584 +#: smartdns.js:538 msgid "Skip Cache" msgstr "" -#: smartdns.js:584 +#: smartdns.js:538 msgid "Skip Cache." msgstr "" -#: smartdns.js:598 +#: smartdns.js:552 msgid "Skip IP Alias" msgstr "" -#: smartdns.js:649 +#: smartdns.js:603 msgid "DNS64" msgstr "" -#: smartdns.js:657 +#: smartdns.js:611 msgid "Enable Auto Update" msgstr "" -#: smartdns.js:657 +#: smartdns.js:611 msgid "Enable daily (weekly) auto update." msgstr "" -#: smartdns.js:662 +#: smartdns.js:616 msgid "Update Time (Every Week)" msgstr "" -#: smartdns.js:663 +#: smartdns.js:617 msgid "Every Day" msgstr "" -#: smartdns.js:664 +#: smartdns.js:618 msgid "Every Monday" msgstr "" -#: smartdns.js:665 +#: smartdns.js:619 msgid "Every Tuesday" msgstr "" -#: smartdns.js:666 +#: smartdns.js:620 msgid "Every Wednesday" msgstr "" -#: smartdns.js:667 +#: smartdns.js:621 msgid "Every Thursday" msgstr "" -#: smartdns.js:668 +#: smartdns.js:622 msgid "Every Friday" msgstr "" -#: smartdns.js:669 +#: smartdns.js:623 msgid "Every Saturday" msgstr "" -#: smartdns.js:670 +#: smartdns.js:624 msgid "Every Sunday" msgstr "" -#: smartdns.js:674 +#: smartdns.js:628 msgid "Update time (every day)" msgstr "" -#: smartdns.js:680 +#: smartdns.js:634 msgid "Upload Config File" msgstr "" -#: smartdns.js:681 +#: smartdns.js:635 msgid "Upload smartdns config file to /etc/smartdns/conf.d" msgstr "" -#: smartdns.js:687 +#: smartdns.js:641 msgid "Upload Domain List File" msgstr "" -#: smartdns.js:688 +#: smartdns.js:642 msgid "Upload domain list file to /etc/smartdns/domain-set" msgstr "" -#: smartdns.js:694 +#: smartdns.js:648 msgid "Upload File" msgstr "" -#: smartdns.js:700 +#: smartdns.js:654 msgid "Update Files" msgstr "" -#: smartdns.js:709 +#: smartdns.js:663 msgid "Update" msgstr "" -#: smartdns.js:712 +#: smartdns.js:666 msgid "Download Files" msgstr "" -#: smartdns.js:713 +#: smartdns.js:667 msgid "List of files to download." msgstr "" -#: smartdns.js:721 +#: smartdns.js:675 msgid "File Name" msgstr "" -#: smartdns.js:725 +#: smartdns.js:679 msgid "URL" msgstr "" -#: smartdns.js:734 +#: smartdns.js:688 msgid "URL format error, format: http:// or https://" msgstr "" -#: smartdns.js:740 smartdns.js:905 +#: smartdns.js:694 smartdns.js:843 msgid "type" msgstr "" -#: smartdns.js:740 +#: smartdns.js:694 msgid "File Type" msgstr "" -#: smartdns.js:741 +#: smartdns.js:695 msgid "domain list (/etc/smartdns/domain-set)" msgstr "" -#: smartdns.js:742 +#: smartdns.js:696 msgid "smartdns config (/etc/smartdns/conf.d)" msgstr "" -#: smartdns.js:743 +#: smartdns.js:697 msgid "ip-set file (/etc/smartdns/ip-set)" msgstr "" -#: smartdns.js:744 +#: smartdns.js:698 msgid "other file (/etc/smartdns/download)" msgstr "" -#: smartdns.js:748 +#: smartdns.js:702 msgid "Description" msgstr "" -#: smartdns.js:755 +#: smartdns.js:709 msgid "Proxy Server" msgstr "" -#: smartdns.js:755 +#: smartdns.js:709 msgid "Proxy Server URL, format: [socks5|http]://user:pass@ip:port." msgstr "" -#: smartdns.js:763 +#: smartdns.js:717 msgid "" "Proxy server URL format error, format: [socks5|http]://user:pass@ip:port." msgstr "" -#: smartdns.js:773 +#: smartdns.js:727 msgid "smartdns custom settings" msgstr "" -#: smartdns.js:787 +#: smartdns.js:741 msgid "Generate Coredump" msgstr "" -#: smartdns.js:788 +#: smartdns.js:742 msgid "" "Generate Coredump file when smartdns crash, coredump file is located at /tmp/" "smartdns.xxx.core." msgstr "" -#: smartdns.js:792 +#: smartdns.js:746 msgid "Log Level" msgstr "" -#: smartdns.js:804 +#: smartdns.js:758 msgid "Log Output Mode" msgstr "" -#: smartdns.js:807 smartdns.js:848 +#: smartdns.js:760 smartdns.js:761 smartdns.js:786 smartdns.js:787 msgid "file" msgstr "" -#: smartdns.js:808 smartdns.js:849 +#: smartdns.js:762 smartdns.js:788 msgid "syslog" msgstr "" -#: smartdns.js:810 +#: smartdns.js:764 msgid "Log Size" msgstr "" -#: smartdns.js:815 +#: smartdns.js:769 msgid "Log Number" msgstr "" -#: smartdns.js:820 +#: smartdns.js:774 msgid "Log File" msgstr "" -#: smartdns.js:825 smartdns.js:833 -msgid "View Log" -msgstr "" - -#: smartdns.js:840 +#: smartdns.js:779 msgid "Enable Audit Log" msgstr "" -#: smartdns.js:845 +#: smartdns.js:784 msgid "Audit Log Output Mode" msgstr "" -#: smartdns.js:852 +#: smartdns.js:791 msgid "Audit Log Size" msgstr "" -#: smartdns.js:857 +#: smartdns.js:796 msgid "Audit Log Number" msgstr "" -#: smartdns.js:862 +#: smartdns.js:801 msgid "Audit Log File" msgstr "" -#: smartdns.js:870 +#: smartdns.js:809 msgid "Upstream Servers" msgstr "" -#: smartdns.js:871 +#: smartdns.js:810 msgid "" -"Upstream Servers, support UDP, TCP, DoT, DoH, DoQ, DoH3 protocol. Please " -"configure multiple DNS servers, including multiple foreign DNS servers." +"Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS " +"servers, including multiple foreign DNS servers." msgstr "" -#: smartdns.js:887 +#: smartdns.js:826 msgid "DNS Server Name" msgstr "" -#: smartdns.js:890 +#: smartdns.js:829 msgid "ip" msgstr "" -#: smartdns.js:890 +#: smartdns.js:829 msgid "DNS Server ip" msgstr "" -#: smartdns.js:895 +#: smartdns.js:834 msgid "port" msgstr "" -#: smartdns.js:895 +#: smartdns.js:834 msgid "DNS Server port" msgstr "" -#: smartdns.js:905 +#: smartdns.js:843 msgid "DNS Server type" msgstr "" -#: smartdns.js:907 +#: smartdns.js:845 msgid "udp" msgstr "" -#: smartdns.js:908 +#: smartdns.js:846 msgid "tcp" msgstr "" -#: smartdns.js:909 +#: smartdns.js:847 msgid "tls" msgstr "" -#: smartdns.js:910 +#: smartdns.js:848 msgid "https" msgstr "" -#: smartdns.js:911 -msgid "quic" -msgstr "" - -#: smartdns.js:912 -msgid "h3" -msgstr "" - -#: smartdns.js:917 +#: smartdns.js:853 msgid "DNS Server group" msgstr "" -#: smartdns.js:936 +#: smartdns.js:872 msgid "Exclude Default Group" msgstr "" -#: smartdns.js:936 +#: smartdns.js:872 msgid "Exclude DNS Server from default group." msgstr "" -#: smartdns.js:943 +#: smartdns.js:879 msgid "IP Blacklist Filtering" msgstr "" -#: smartdns.js:944 +#: smartdns.js:880 msgid "Filtering IP with blacklist" msgstr "" -#: smartdns.js:950 +#: smartdns.js:886 msgid "TLS Hostname Verify" msgstr "" -#: smartdns.js:951 +#: smartdns.js:887 msgid "Set TLS hostname to verify." msgstr "" -#: smartdns.js:962 +#: smartdns.js:896 msgid "No check certificate" msgstr "" -#: smartdns.js:963 +#: smartdns.js:897 msgid "Do not check certificate." msgstr "" -#: smartdns.js:973 +#: smartdns.js:905 msgid "TLS SNI name" msgstr "" -#: smartdns.js:974 +#: smartdns.js:906 msgid "Sets the server name indication for query. '-' for disable SNI name." msgstr "" -#: smartdns.js:985 +#: smartdns.js:915 msgid "HTTP Host" msgstr "" -#: smartdns.js:986 +#: smartdns.js:916 msgid "" "Set the HTTP host used for the query. Use this parameter when the host of " "the URL address is an IP address." msgstr "" -#: smartdns.js:995 +#: smartdns.js:924 msgid "TLS SPKI Pinning" msgstr "" -#: smartdns.js:996 +#: smartdns.js:925 msgid "" "Used to verify the validity of the TLS server, The value is Base64 encoded " "SPKI fingerprint, leaving blank to indicate that the validity of TLS is not " "verified." msgstr "" -#: smartdns.js:1008 +#: smartdns.js:935 msgid "Marking Packets" msgstr "" -#: smartdns.js:1009 +#: smartdns.js:936 msgid "Set mark on packets." msgstr "" -#: smartdns.js:1016 +#: smartdns.js:943 msgid "Use Proxy" msgstr "" -#: smartdns.js:1017 +#: smartdns.js:944 msgid "Use proxy to connect to upstream DNS server." msgstr "" -#: smartdns.js:1031 +#: smartdns.js:958 msgid "Please set proxy server first." msgstr "" -#: smartdns.js:1035 +#: smartdns.js:962 msgid "Only socks5 proxy support udp server." msgstr "" -#: smartdns.js:1042 -msgid "Fallback" -msgstr "" - -#: smartdns.js:1043 -msgid "" -"Mark this server as a fallback server, use it only when default servers fail." -msgstr "" - -#: smartdns.js:1050 +#: smartdns.js:970 msgid "Additional Args for upstream dns servers" msgstr "" -#: smartdns.js:1058 +#: smartdns.js:978 msgid "Client Rules" msgstr "" -#: smartdns.js:1058 +#: smartdns.js:978 msgid "Client Rules Settings, can achieve parental control functionality." msgstr "" -#: smartdns.js:1062 +#: smartdns.js:982 msgid "Basic Settings" msgstr "" -#: smartdns.js:1064 smartdns.js:1255 +#: smartdns.js:984 smartdns.js:1175 msgid "DNS Block Setting" msgstr "" -#: smartdns.js:1070 +#: smartdns.js:990 msgid "Client Address" msgstr "" -#: smartdns.js:1071 +#: smartdns.js:991 msgid "" "If a client address is specified, only that client will apply this rule. You " "can enter an IP address, such as 1.2.3.4, or a MAC address, such as aa:bb:cc:" "dd:ee:ff." msgstr "" -#: smartdns.js:1092 +#: smartdns.js:1012 msgid "Client address format error, please input ip adress or mac address." msgstr "" -#: smartdns.js:1095 +#: smartdns.js:1015 msgid "Client Address File" msgstr "" -#: smartdns.js:1096 +#: smartdns.js:1016 msgid "Upload client address file, same as Client Address function." msgstr "" -#: smartdns.js:1103 smartdns.js:1262 smartdns.js:1461 +#: smartdns.js:1023 smartdns.js:1182 smartdns.js:1381 msgid "DNS Server group belongs to, such as office, home." msgstr "" -#: smartdns.js:1123 smartdns.js:1282 smartdns.js:1481 +#: smartdns.js:1043 smartdns.js:1202 smartdns.js:1401 #, javascript-format msgid "Server Group %s not exists" msgstr "" -#: smartdns.js:1239 smartdns.js:1385 smartdns.js:1415 smartdns.js:1485 +#: smartdns.js:1159 smartdns.js:1305 smartdns.js:1335 smartdns.js:1405 msgid "Domain List File" msgstr "" -#: smartdns.js:1239 smartdns.js:1415 +#: smartdns.js:1159 smartdns.js:1335 msgid "Upload domain list file." msgstr "" -#: smartdns.js:1250 +#: smartdns.js:1170 msgid "Domain Rules" msgstr "" -#: smartdns.js:1250 +#: smartdns.js:1170 msgid "Domain Rules Settings" msgstr "" -#: smartdns.js:1254 +#: smartdns.js:1174 msgid "DNS Forwarding Setting" msgstr "" -#: smartdns.js:1256 smartdns.js:1443 +#: smartdns.js:1176 smartdns.js:1363 msgid "Domain Rule List" msgstr "" -#: smartdns.js:1256 +#: smartdns.js:1176 msgid "Set Specific domain rule list." msgstr "" -#: smartdns.js:1257 +#: smartdns.js:1177 msgid "Domain Address" msgstr "" -#: smartdns.js:1257 +#: smartdns.js:1177 msgid "Set Specific domain ip address." msgstr "" -#: smartdns.js:1333 smartdns.js:1507 +#: smartdns.js:1253 smartdns.js:1427 msgid "Yes" msgstr "" -#: smartdns.js:1334 smartdns.js:1508 +#: smartdns.js:1254 smartdns.js:1428 msgid "No" msgstr "" -#: smartdns.js:1379 smartdns.js:1583 smartdns.js:1680 +#: smartdns.js:1299 smartdns.js:1503 smartdns.js:1600 msgid "Additional Rule Flag" msgstr "" -#: smartdns.js:1380 smartdns.js:1584 +#: smartdns.js:1300 smartdns.js:1504 msgid "" "Additional Flags for rules, read help on domain-rule for more information." msgstr "" -#: smartdns.js:1386 smartdns.js:1486 +#: smartdns.js:1306 smartdns.js:1406 msgid "" "Upload domain list file, or configure auto download from Download File " "Setting page." msgstr "" -#: smartdns.js:1394 smartdns.js:1423 +#: smartdns.js:1314 smartdns.js:1343 msgid "Domain List" msgstr "" -#: smartdns.js:1394 +#: smartdns.js:1314 msgid "Configure forwarding domain name list." msgstr "" -#: smartdns.js:1423 +#: smartdns.js:1343 msgid "Configure block domain list." msgstr "" -#: smartdns.js:1444 +#: smartdns.js:1364 msgid "Configure domain rule list." msgstr "" -#: smartdns.js:1459 +#: smartdns.js:1379 msgid "Domain Rule Name" msgstr "" -#: smartdns.js:1492 +#: smartdns.js:1412 msgid "Block domain" msgstr "" -#: smartdns.js:1492 +#: smartdns.js:1412 msgid "Block domain." msgstr "" -#: smartdns.js:1594 +#: smartdns.js:1514 msgid "" "Specify an IP address to return for any host in the given domains, Queries " "in the domains are never forwarded and always replied to with the specified " "IP address which may be IPv4 or IPv6." msgstr "" -#: smartdns.js:1613 +#: smartdns.js:1533 msgid "IP Rules" msgstr "" -#: smartdns.js:1613 +#: smartdns.js:1533 msgid "IP Rules Settings" msgstr "" -#: smartdns.js:1617 smartdns.js:1623 +#: smartdns.js:1537 smartdns.js:1543 msgid "IP Rule List" msgstr "" -#: smartdns.js:1617 +#: smartdns.js:1537 msgid "Set Specific ip rule list." msgstr "" -#: smartdns.js:1618 +#: smartdns.js:1538 msgid "IP Blacklist" msgstr "" -#: smartdns.js:1618 +#: smartdns.js:1538 msgid "Set Specific ip blacklist." msgstr "" -#: smartdns.js:1624 +#: smartdns.js:1544 msgid "Configure ip rule list." msgstr "" -#: smartdns.js:1639 +#: smartdns.js:1559 msgid "IP Rule Name" msgstr "" -#: smartdns.js:1643 +#: smartdns.js:1563 msgid "IP Set File" msgstr "" -#: smartdns.js:1643 +#: smartdns.js:1563 msgid "Upload IP set file." msgstr "" -#: smartdns.js:1649 +#: smartdns.js:1569 msgid "IP Addresses" msgstr "" -#: smartdns.js:1649 +#: smartdns.js:1569 msgid "IP addresses, CIDR format." msgstr "" -#: smartdns.js:1654 +#: smartdns.js:1574 msgid "Whitelist IP" msgstr "" -#: smartdns.js:1654 +#: smartdns.js:1574 msgid "Whitelist IP Rule, Accept IP addresses within the range." msgstr "" -#: smartdns.js:1659 +#: smartdns.js:1579 msgid "Blacklist IP" msgstr "" -#: smartdns.js:1659 +#: smartdns.js:1579 msgid "Blacklist IP Rule, Decline IP addresses within the range." msgstr "" -#: smartdns.js:1664 +#: smartdns.js:1584 msgid "Ignore IP" msgstr "" -#: smartdns.js:1664 +#: smartdns.js:1584 msgid "Do not use these IP addresses." msgstr "" -#: smartdns.js:1669 +#: smartdns.js:1589 msgid "Bogus nxdomain" msgstr "" -#: smartdns.js:1669 +#: smartdns.js:1589 msgid "Return SOA when the requested result contains a specified IP address." msgstr "" -#: smartdns.js:1674 +#: smartdns.js:1594 msgid "IP alias" msgstr "" -#: smartdns.js:1674 +#: smartdns.js:1594 msgid "" "IP Address Mapping, Can be used for CDN acceleration with Anycast IP, such " "as Cloudflare's CDN." msgstr "" -#: smartdns.js:1681 +#: smartdns.js:1601 msgid "Additional Flags for rules, read help on ip-rule for more information." msgstr "" -#: smartdns.js:1690 +#: smartdns.js:1610 msgid "" "Configure IP blacklists that will be filtered from the results of specific " "DNS server." msgstr "" -#: smartdns.js:1707 +#: smartdns.js:1627 msgid "Technical Support" msgstr "" -#: smartdns.js:1708 +#: smartdns.js:1628 msgid "If you like this software, please buy me a cup of coffee." msgstr "" -#: smartdns.js:1712 +#: smartdns.js:1632 msgid "SmartDNS official website" msgstr "" -#: smartdns.js:1713 +#: smartdns.js:1633 msgid "open website" msgstr "" -#: smartdns.js:1720 smartdns.js:1721 +#: smartdns.js:1640 smartdns.js:1641 msgid "Report bugs" msgstr "" -#: smartdns.js:1728 +#: smartdns.js:1648 msgid "Donate to smartdns" msgstr "" -#: smartdns.js:1729 +#: smartdns.js:1649 msgid "Donate" msgstr "" -#: smartdns.js:1735 +#: smartdns.js:1655 msgid "Restart Service" msgstr "" -#: smartdns.js:1744 +#: smartdns.js:1664 msgid "Restart" msgstr "" diff --git a/luci-app-smartdns/po/zh_Hans/smartdns.po b/luci-app-smartdns/po/zh_Hans/smartdns.po index e070801..d071fe6 100644 --- a/luci-app-smartdns/po/zh_Hans/smartdns.po +++ b/luci-app-smartdns/po/zh_Hans/smartdns.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-smartdns\n" -"POT-Creation-Date: 2025-10-03 09:04+0000\n" +"POT-Creation-Date: 2025-02-19 23:07+0800\n" "PO-Revision-Date: \n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 3.5\n" "X-Poedit-Basepath: ../../htdocs/luci-static/resources/view/smartdns\n" "X-Poedit-SearchPath-0: .\n" @@ -17,7 +17,7 @@ msgstr "" msgid "Loading..." msgstr "加载中..." -#: log.js:82 smartdns.js:146 +#: log.js:82 smartdns.js:125 msgid "Collecting data ..." msgstr "正在收集数据..." @@ -59,178 +59,142 @@ msgstr "返回 SmartDNS" msgid "Refresh every %s seconds." msgstr "每 %s 秒刷新。" -#: smartdns.js:68 +#: smartdns.js:65 msgid "RUNNING" msgstr "运行中" -#: smartdns.js:74 -msgid "Open the WebUI" -msgstr "打开 WebUI" - -#: smartdns.js:77 +#: smartdns.js:67 msgid "NOT RUNNING" msgstr "未运行" -#: smartdns.js:79 +#: smartdns.js:69 msgid "Please check the system logs and check if the configuration is valid." msgstr "请检查系统日志，并检查配置是否合法。" -#: smartdns.js:91 +#: smartdns.js:81 msgid "Dnsmasq Forwarded To Smartdns Failure" msgstr "重定向dnsmasq到smartdns失败" -#: smartdns.js:120 +#: smartdns.js:99 msgid "SmartDNS" msgstr "SmartDNS" -#: smartdns.js:121 +#: smartdns.js:100 msgid "SmartDNS Server" msgstr "SmartDNS 服务器" -#: smartdns.js:122 +#: smartdns.js:101 msgid "" "SmartDNS is a local high-performance DNS server, supports finding fastest " "IP, supports ad filtering, and supports avoiding DNS poisoning." msgstr "SmartDNS是一个本地高性能DNS服务器，支持返回最快IP，支持广告过滤。" -#: smartdns.js:153 +#: smartdns.js:132 msgid "Settings" msgstr "设置" -#: smartdns.js:153 smartdns.js:156 smartdns.js:877 +#: smartdns.js:132 smartdns.js:135 smartdns.js:828 msgid "General Settings" msgstr "常规设置" -#: smartdns.js:157 smartdns.js:878 smartdns.js:1063 +#: smartdns.js:136 smartdns.js:829 smartdns.js:995 msgid "Advanced Settings" msgstr "高级设置" -#: smartdns.js:158 +#: smartdns.js:137 msgid "Second Server Settings" msgstr "第二DNS服务器" -#: smartdns.js:159 +#: smartdns.js:138 msgid "DNS64 Server Settings" msgstr "DNS64服务器配置" -#: smartdns.js:160 +#: smartdns.js:139 msgid "Download Files Setting" msgstr "下载文件设置" -#: smartdns.js:160 +#: smartdns.js:139 msgid "" "Download domain list files for domain-rule and include config files, please " "refresh the page after download to take effect." msgstr "" "下载域名规则所需要的域名列表文件和smartdns配置文件，下载完成后刷新页面。" -#: smartdns.js:161 +#: smartdns.js:140 msgid "Proxy Server Settings" msgstr "代理服务器设置" -#: smartdns.js:162 +#: smartdns.js:141 msgid "Custom Settings" msgstr "自定义设置" -#: smartdns.js:167 smartdns.js:524 smartdns.js:881 smartdns.js:1066 -#: smartdns.js:1453 smartdns.js:1633 +#: smartdns.js:146 smartdns.js:478 smartdns.js:832 smartdns.js:998 +#: smartdns.js:1385 smartdns.js:1565 msgid "Enable" msgstr "启用" -#: smartdns.js:167 +#: smartdns.js:146 msgid "Enable or disable smartdns server" msgstr "启用或禁用SmartDNS服务" -#: smartdns.js:172 +#: smartdns.js:151 msgid "Server Name" msgstr "服务器名称" -#: smartdns.js:172 +#: smartdns.js:151 msgid "Smartdns server name" msgstr "SmartDNS的服务器名称，默认为smartdns，留空为主机名" -#: smartdns.js:178 smartdns.js:530 +#: smartdns.js:157 smartdns.js:484 msgid "Local Port" msgstr "本地端口" -#: smartdns.js:179 +#: smartdns.js:158 msgid "" "Smartdns local server port, smartdns will be automatically set as main dns " "when the port is 53." msgstr "" "SmartDNS本地服务端口，当端口号设置为53时，smartdns将会自动配置为主dns。" -#: smartdns.js:186 +#: smartdns.js:165 msgid "Automatically Set Dnsmasq" msgstr "自动设置Dnsmasq" -#: smartdns.js:186 +#: smartdns.js:165 msgid "Automatically set as upstream of dnsmasq when port changes." msgstr "端口更改时自动设为 dnsmasq 的上游。" -#: smartdns.js:192 -msgid "Enable WebUI" -msgstr "启用WebUI" - -#: smartdns.js:192 -msgid "Enable or disable smartdns webui plugin." -msgstr "启用或禁用SmartDNS WebUI插件。" - -#: smartdns.js:196 -msgid "WebUI Port" -msgstr "WebUI端口" - -#: smartdns.js:196 -msgid "WebUI server port." -msgstr "WebUI服务端口。" - -#: smartdns.js:202 -msgid "WebUI Data Dir" -msgstr "WebUI数据库目录" - -#: smartdns.js:202 -msgid "Directory for storing the webui database." -msgstr "用于存储WebUI数据库的目录。" - -#: smartdns.js:208 -msgid "WebUI Log Retention" -msgstr "WebUI日志保存天数" - -#: smartdns.js:208 -msgid "Number of days to retain webui logs." -msgstr "保留WebUI日志的天数。" - -#: smartdns.js:219 smartdns.js:1128 smartdns.js:1287 smartdns.js:1510 +#: smartdns.js:173 smartdns.js:1060 smartdns.js:1219 smartdns.js:1442 msgid "Speed Check Mode" msgstr "测速模式" -#: smartdns.js:219 smartdns.js:1128 smartdns.js:1287 smartdns.js:1510 +#: smartdns.js:173 smartdns.js:1060 smartdns.js:1219 smartdns.js:1442 msgid "Smartdns speed check mode." msgstr "SmartDNS测速模式。" -#: smartdns.js:222 smartdns.js:263 smartdns.js:795 smartdns.js:1131 -#: smartdns.js:1290 smartdns.js:1332 smartdns.js:1506 smartdns.js:1514 +#: smartdns.js:176 smartdns.js:217 smartdns.js:749 smartdns.js:1063 +#: smartdns.js:1222 smartdns.js:1264 smartdns.js:1438 smartdns.js:1446 msgid "default" msgstr "默认" -#: smartdns.js:227 smartdns.js:1136 smartdns.js:1295 smartdns.js:1494 -#: smartdns.js:1519 +#: smartdns.js:181 smartdns.js:1068 smartdns.js:1227 smartdns.js:1426 +#: smartdns.js:1451 msgid "None" msgstr "无" -#: smartdns.js:246 smartdns.js:1155 smartdns.js:1314 smartdns.js:1538 +#: smartdns.js:200 smartdns.js:1087 smartdns.js:1246 smartdns.js:1470 msgid "TCP port is empty" msgstr "TCP端口号为空" -#: smartdns.js:252 smartdns.js:1161 smartdns.js:1320 smartdns.js:1544 +#: smartdns.js:206 smartdns.js:1093 smartdns.js:1252 smartdns.js:1476 msgid "Speed check mode is invalid." msgstr "测速模式无效。" -#: smartdns.js:259 +#: smartdns.js:213 msgid "Response Mode" msgstr "响应模式" -#: smartdns.js:260 +#: smartdns.js:214 msgid "" "Smartdns response mode, First Ping: return the first ping IP, Fastest IP: " "return the fastest IP, Fastest Response: return the fastest DNS response." @@ -238,276 +202,276 @@ msgstr "" "SmartDNS响应模式，最快PING： 返回最早有ping结果的IP，速度适中；最快IP： 返回" "最快IP，查询请求可能延长； 最快响应：返回最快响应的结果，查询请求时间短。" -#: smartdns.js:264 +#: smartdns.js:218 msgid "First Ping" msgstr "最快PING" -#: smartdns.js:265 +#: smartdns.js:219 msgid "Fastest IP" msgstr "最快IP" -#: smartdns.js:266 +#: smartdns.js:220 msgid "Fastest Response" msgstr "最快响应" -#: smartdns.js:269 smartdns.js:537 +#: smartdns.js:223 smartdns.js:491 msgid "TCP Server" msgstr "TCP服务器" -#: smartdns.js:269 smartdns.js:537 +#: smartdns.js:223 smartdns.js:491 msgid "Enable TCP DNS Server" msgstr "启用TCP服务器。" -#: smartdns.js:274 +#: smartdns.js:228 msgid "DOT Server" msgstr "DOT服务器" -#: smartdns.js:274 +#: smartdns.js:228 msgid "Enable DOT DNS Server" msgstr "启用DOT服务器" -#: smartdns.js:278 +#: smartdns.js:232 msgid "DOT Server Port" msgstr "DOT服务器端口" -#: smartdns.js:278 +#: smartdns.js:232 msgid "Smartdns DOT server port." msgstr "Smartdns DOT服务器端口号。" -#: smartdns.js:286 +#: smartdns.js:240 msgid "DOH Server" msgstr "DOH服务器" -#: smartdns.js:286 +#: smartdns.js:240 msgid "Enable DOH DNS Server" msgstr "启用DOH服务器" -#: smartdns.js:290 +#: smartdns.js:244 msgid "DOH Server Port" msgstr "DOH服务器端口" -#: smartdns.js:290 +#: smartdns.js:244 msgid "Smartdns DOH server port." msgstr "Smartdns DOH服务器端口号" -#: smartdns.js:297 +#: smartdns.js:251 msgid "Server Cert" msgstr "服务器证书" -#: smartdns.js:297 +#: smartdns.js:251 msgid "Server certificate file path." msgstr "服务器证书文件路径。" -#: smartdns.js:304 +#: smartdns.js:258 msgid "Server Cert Key" msgstr "服务器证书私钥" -#: smartdns.js:304 +#: smartdns.js:258 msgid "Server certificate key file path." msgstr "服务器证书私钥文件路径。" -#: smartdns.js:311 +#: smartdns.js:265 msgid "Server Cert Key Pass" msgstr "服务器证书私钥密码" -#: smartdns.js:311 +#: smartdns.js:265 msgid "Server certificate key file password." msgstr "服务器证书私钥文件密码。" -#: smartdns.js:318 +#: smartdns.js:272 msgid "IPV6 Server" msgstr "IPV6服务器" -#: smartdns.js:318 +#: smartdns.js:272 msgid "Enable IPV6 DNS Server" msgstr "启用IPV6服务器。" -#: smartdns.js:323 +#: smartdns.js:277 msgid "Bind Device" msgstr "绑定到设备" -#: smartdns.js:323 +#: smartdns.js:277 msgid "Listen only on the specified interfaces." msgstr "监听在指定的设备上，避免非本地网络的DNS查询请求。" -#: smartdns.js:328 +#: smartdns.js:282 msgid "Bind Device Name" msgstr "绑定的设备名称" -#: smartdns.js:328 +#: smartdns.js:282 msgid "Name of device name listen on." msgstr "绑定的设备名称。" -#: smartdns.js:334 smartdns.js:1168 smartdns.js:1327 smartdns.js:1501 +#: smartdns.js:288 smartdns.js:1100 smartdns.js:1259 smartdns.js:1433 msgid "Dual-stack IP Selection" msgstr "双栈IP优选" -#: smartdns.js:335 smartdns.js:1169 smartdns.js:1328 smartdns.js:1502 +#: smartdns.js:289 smartdns.js:1101 smartdns.js:1260 smartdns.js:1434 msgid "Enable IP selection between IPV4 and IPV6" msgstr "启用 IPV4 和 IPV6 间的 IP 优选策略。" -#: smartdns.js:340 +#: smartdns.js:294 msgid "Domain prefetch" msgstr "域名预加载" -#: smartdns.js:341 +#: smartdns.js:295 msgid "Enable domain prefetch, accelerate domain response speed." msgstr "启用域名预加载，加速域名响应速度。" -#: smartdns.js:346 +#: smartdns.js:300 msgid "Serve expired" msgstr "缓存过期服务" -#: smartdns.js:347 +#: smartdns.js:301 msgid "" "Attempts to serve old responses from cache with a TTL of 0 in the response " "without waiting for the actual resolution to finish." msgstr "查询性能优化，有请求时尝试回应TTL为0的过期记录，以避免查询等待。" -#: smartdns.js:352 +#: smartdns.js:306 msgid "Cache Size" msgstr "缓存大小" -#: smartdns.js:352 +#: smartdns.js:306 msgid "DNS domain result cache size" msgstr "缓存DNS的结果，缓存大小，配置零则不缓存。" -#: smartdns.js:356 +#: smartdns.js:310 msgid "Cache Persist" msgstr "持久化缓存" -#: smartdns.js:356 +#: smartdns.js:310 msgid "Write cache to disk on exit and load on startup." msgstr "退出时保存cache到磁盘，启动时加载。" -#: smartdns.js:361 +#: smartdns.js:315 msgid "Resolve Local Hostnames" msgstr "解析本地主机名" -#: smartdns.js:361 +#: smartdns.js:315 msgid "Resolve local hostnames by reading Dnsmasq lease file." msgstr "读取Dnsmasq的租约文件解析本地主机名。" -#: smartdns.js:366 +#: smartdns.js:320 msgid "mDNS Lookup" msgstr "mDNS查询" -#: smartdns.js:366 +#: smartdns.js:320 msgid "Resolve local network hostname via mDNS protocol." msgstr "使用mDNS协议解析本地网络主机名。" -#: smartdns.js:371 smartdns.js:589 smartdns.js:1174 smartdns.js:1336 -#: smartdns.js:1550 +#: smartdns.js:325 smartdns.js:543 smartdns.js:1106 smartdns.js:1268 +#: smartdns.js:1482 msgid "Force AAAA SOA" msgstr "停用IPV6地址解析" -#: smartdns.js:371 smartdns.js:589 smartdns.js:1174 smartdns.js:1336 -#: smartdns.js:1550 +#: smartdns.js:325 smartdns.js:543 smartdns.js:1106 smartdns.js:1268 +#: smartdns.js:1482 msgid "Force AAAA SOA." msgstr "停用IPV6地址解析。" -#: smartdns.js:376 smartdns.js:594 smartdns.js:1179 +#: smartdns.js:330 smartdns.js:548 smartdns.js:1111 msgid "Force HTTPS SOA" msgstr "停用HTTPS记录解析" -#: smartdns.js:376 smartdns.js:594 smartdns.js:1179 +#: smartdns.js:330 smartdns.js:548 smartdns.js:1111 msgid "Force HTTPS SOA." msgstr "停用HTTPS记录解析。" -#: smartdns.js:381 smartdns.js:602 smartdns.js:1184 smartdns.js:1340 -#: smartdns.js:1556 +#: smartdns.js:335 smartdns.js:556 smartdns.js:1116 smartdns.js:1272 +#: smartdns.js:1488 msgid "IPset Name" msgstr "IPset名称" -#: smartdns.js:381 smartdns.js:602 smartdns.js:1184 smartdns.js:1340 -#: smartdns.js:1556 +#: smartdns.js:335 smartdns.js:556 smartdns.js:1116 smartdns.js:1272 +#: smartdns.js:1488 msgid "IPset name." msgstr "IPset名称。" -#: smartdns.js:393 smartdns.js:414 smartdns.js:614 smartdns.js:1196 -#: smartdns.js:1352 +#: smartdns.js:347 smartdns.js:368 smartdns.js:568 smartdns.js:1128 +#: smartdns.js:1284 msgid "ipset name format error, format: [#[4|6]:]ipsetname" msgstr "IPset名称格式错误，格式：[#[4|6]:]ipsetname" -#: smartdns.js:401 +#: smartdns.js:355 msgid "No Speed IPset Name" msgstr "无速度时IPSet名称" -#: smartdns.js:402 +#: smartdns.js:356 msgid "Ipset name, Add domain result to ipset when speed check fails." msgstr "IPset名称，当测速失败时，将查询到的结果添加到对应的IPSet集合中。" -#: smartdns.js:422 smartdns.js:621 smartdns.js:1204 smartdns.js:1359 -#: smartdns.js:1562 +#: smartdns.js:376 smartdns.js:575 smartdns.js:1136 smartdns.js:1291 +#: smartdns.js:1494 msgid "NFTset Name" msgstr "NFTSet名称" -#: smartdns.js:422 smartdns.js:621 smartdns.js:1204 smartdns.js:1359 -#: smartdns.js:1562 +#: smartdns.js:376 smartdns.js:575 smartdns.js:1136 smartdns.js:1291 +#: smartdns.js:1494 msgid "NFTset name, format: [#[4|6]:[family#table#set]]" msgstr "NFTSet名称，格式：[#[4|6]:[family#table#set]]" -#: smartdns.js:434 smartdns.js:455 smartdns.js:633 smartdns.js:1216 -#: smartdns.js:1371 smartdns.js:1575 +#: smartdns.js:388 smartdns.js:409 smartdns.js:587 smartdns.js:1148 +#: smartdns.js:1303 smartdns.js:1507 msgid "NFTset name format error, format: [#[4|6]:[family#table#set]]" msgstr "NFTSet名称格式错误，格式：[#[4|6]:[family#table#set]]" -#: smartdns.js:442 +#: smartdns.js:396 msgid "No Speed NFTset Name" msgstr "无速度时NFTSet名称" -#: smartdns.js:443 +#: smartdns.js:397 msgid "" "Nftset name, Add domain result to nftset when speed check fails, format: " "[#[4|6]:[family#table#set]]" msgstr "NFTset名称，当测速失败时，将查询到的结果添加到对应的NFTSet集合中。" -#: smartdns.js:463 +#: smartdns.js:417 msgid "Domain TTL" msgstr "域名TTL" -#: smartdns.js:463 +#: smartdns.js:417 msgid "TTL for all domain result." msgstr "设置所有域名的 TTL 值。" -#: smartdns.js:467 +#: smartdns.js:421 msgid "Domain TTL Min" msgstr "域名TTL最小值" -#: smartdns.js:468 +#: smartdns.js:422 msgid "Minimum TTL for all domain result." msgstr "所有域名的最小 TTL 值。" -#: smartdns.js:475 +#: smartdns.js:429 msgid "Domain TTL Max" msgstr "域名TTL最大值" -#: smartdns.js:476 +#: smartdns.js:430 msgid "Maximum TTL for all domain result." msgstr "所有域名的最大 TTL 值。" -#: smartdns.js:480 +#: smartdns.js:434 msgid "Reply Domain TTL Max" msgstr "回应的域名TTL最大值" -#: smartdns.js:481 +#: smartdns.js:435 msgid "Reply maximum TTL for all domain result." msgstr "设置返回给客户端的域名TTL最大值。" -#: smartdns.js:485 smartdns.js:641 smartdns.js:1049 +#: smartdns.js:439 smartdns.js:595 smartdns.js:981 msgid "Additional Server Args" msgstr "额外的服务器参数" -#: smartdns.js:486 smartdns.js:642 +#: smartdns.js:440 smartdns.js:596 msgid "" "Additional server args, refer to the help description of the bind option." msgstr "额外的服务器参数，参考bind选项的帮助说明。" -#: smartdns.js:492 smartdns.js:1225 +#: smartdns.js:446 smartdns.js:1157 msgid "Include Config Files
/etc/smartdns/conf.d" msgstr "包含配置文件
/etc/smartdns/conf.d" -#: smartdns.js:493 smartdns.js:1226 +#: smartdns.js:447 smartdns.js:1158 msgid "" "Include other config files from /etc/smartdns/conf.d or custom path, can be " "downloaded from the download page." @@ -515,418 +479,410 @@ msgstr "" "包含配置文件，路径为/etc/smartdns/conf.d，或自定义配置文件路径，可以从下载页" "面配置自动下载。" -#: smartdns.js:506 +#: smartdns.js:460 msgid "Hosts File" msgstr "Hosts文件" -#: smartdns.js:506 +#: smartdns.js:460 msgid "Include hosts file." msgstr "包含hosts文件。" -#: smartdns.js:525 +#: smartdns.js:479 msgid "Enable or disable second DNS server." msgstr "是否启用第二DNS服务器。" -#: smartdns.js:530 +#: smartdns.js:484 msgid "Smartdns local server port" msgstr "SmartDNS本地服务端口" -#: smartdns.js:542 smartdns.js:917 smartdns.js:1103 smartdns.js:1262 -#: smartdns.js:1461 +#: smartdns.js:496 smartdns.js:865 smartdns.js:1035 smartdns.js:1194 +#: smartdns.js:1393 msgid "Server Group" msgstr "服务器组" -#: smartdns.js:543 +#: smartdns.js:497 msgid "Query DNS through specific dns server group, such as office, home." msgstr "使用指定服务器组查询，比如office, home。" -#: smartdns.js:549 +#: smartdns.js:503 msgid "Skip Speed Check" msgstr "跳过测速" -#: smartdns.js:550 +#: smartdns.js:504 msgid "Do not check speed." msgstr "禁用测速。" -#: smartdns.js:555 +#: smartdns.js:509 msgid "Skip Address Rules" msgstr "跳过address规则" -#: smartdns.js:556 +#: smartdns.js:510 msgid "Skip address rules." msgstr "跳过address规则。" -#: smartdns.js:561 +#: smartdns.js:515 msgid "Skip Nameserver Rule" msgstr "跳过Nameserver规则" -#: smartdns.js:562 +#: smartdns.js:516 msgid "Skip nameserver rules." msgstr "跳过Nameserver规则。" -#: smartdns.js:567 +#: smartdns.js:521 msgid "Skip Ipset Rule" msgstr "跳过ipset规则" -#: smartdns.js:568 +#: smartdns.js:522 msgid "Skip ipset rules." msgstr "跳过ipset规则。" -#: smartdns.js:573 +#: smartdns.js:527 msgid "Skip SOA Address Rule" msgstr "跳过address SOA(#)规则" -#: smartdns.js:574 +#: smartdns.js:528 msgid "Skip SOA address rules." msgstr "跳过address SOA(#)规则。" -#: smartdns.js:578 +#: smartdns.js:532 msgid "Skip Dualstack Selection" msgstr "跳过双栈优选" -#: smartdns.js:579 +#: smartdns.js:533 msgid "Skip Dualstack Selection." msgstr "跳过双栈优选。" -#: smartdns.js:584 +#: smartdns.js:538 msgid "Skip Cache" msgstr "跳过cache" -#: smartdns.js:584 +#: smartdns.js:538 msgid "Skip Cache." msgstr "跳过cache。" -#: smartdns.js:598 +#: smartdns.js:552 msgid "Skip IP Alias" msgstr "跳过IP别名" -#: smartdns.js:649 +#: smartdns.js:603 msgid "DNS64" msgstr "DNS64" -#: smartdns.js:657 +#: smartdns.js:611 msgid "Enable Auto Update" msgstr "启用自动更新" -#: smartdns.js:657 +#: smartdns.js:611 msgid "Enable daily (weekly) auto update." msgstr "启用每日（每周）自动更新" -#: smartdns.js:662 +#: smartdns.js:616 msgid "Update Time (Every Week)" msgstr "更新时间（每周）" -#: smartdns.js:663 +#: smartdns.js:617 msgid "Every Day" msgstr "每天" -#: smartdns.js:664 +#: smartdns.js:618 msgid "Every Monday" msgstr "每周一" -#: smartdns.js:665 +#: smartdns.js:619 msgid "Every Tuesday" msgstr "每周二" -#: smartdns.js:666 +#: smartdns.js:620 msgid "Every Wednesday" msgstr "每周三" -#: smartdns.js:667 +#: smartdns.js:621 msgid "Every Thursday" msgstr "每周四" -#: smartdns.js:668 +#: smartdns.js:622 msgid "Every Friday" msgstr "每周五" -#: smartdns.js:669 +#: smartdns.js:623 msgid "Every Saturday" msgstr "每周六" -#: smartdns.js:670 +#: smartdns.js:624 msgid "Every Sunday" msgstr "每周日" -#: smartdns.js:674 +#: smartdns.js:628 msgid "Update time (every day)" msgstr "更新时间（每天）" -#: smartdns.js:680 +#: smartdns.js:634 msgid "Upload Config File" msgstr "上传配置文件" -#: smartdns.js:681 +#: smartdns.js:635 msgid "Upload smartdns config file to /etc/smartdns/conf.d" msgstr "上传配置文件到/etc/smartdns/conf.d" -#: smartdns.js:687 +#: smartdns.js:641 msgid "Upload Domain List File" msgstr "上传域名列表文件" -#: smartdns.js:688 +#: smartdns.js:642 msgid "Upload domain list file to /etc/smartdns/domain-set" msgstr "上传域名列表文件到/etc/smartdns/domain-set" -#: smartdns.js:694 +#: smartdns.js:648 msgid "Upload File" msgstr "上传文件" -#: smartdns.js:700 +#: smartdns.js:654 msgid "Update Files" msgstr "更新文件" -#: smartdns.js:709 +#: smartdns.js:663 msgid "Update" msgstr "更新" -#: smartdns.js:712 +#: smartdns.js:666 msgid "Download Files" msgstr "下载文件" -#: smartdns.js:713 +#: smartdns.js:667 msgid "List of files to download." msgstr "下载文件列表。" -#: smartdns.js:721 +#: smartdns.js:675 msgid "File Name" msgstr "文件名" -#: smartdns.js:725 +#: smartdns.js:679 msgid "URL" msgstr "URL" -#: smartdns.js:734 +#: smartdns.js:688 msgid "URL format error, format: http:// or https://" msgstr "URL格式错误，格式：http://或https://" -#: smartdns.js:740 smartdns.js:905 +#: smartdns.js:694 smartdns.js:855 msgid "type" msgstr "类型" -#: smartdns.js:740 +#: smartdns.js:694 msgid "File Type" msgstr "文件类型" -#: smartdns.js:741 +#: smartdns.js:695 msgid "domain list (/etc/smartdns/domain-set)" msgstr "域名列表（/etc/smartdns/domain-set）" -#: smartdns.js:742 +#: smartdns.js:696 msgid "smartdns config (/etc/smartdns/conf.d)" msgstr "smartdns 配置文件（/etc/smartdns/conf.d）" -#: smartdns.js:743 +#: smartdns.js:697 msgid "ip-set file (/etc/smartdns/ip-set)" msgstr "IP集合列表文件（/etc/smartdns/ip-set）" -#: smartdns.js:744 +#: smartdns.js:698 msgid "other file (/etc/smartdns/download)" msgstr "其它文件（/etc/smartdns/download）" -#: smartdns.js:748 +#: smartdns.js:702 msgid "Description" msgstr "描述" -#: smartdns.js:755 +#: smartdns.js:709 msgid "Proxy Server" msgstr "代理服务器" -#: smartdns.js:755 +#: smartdns.js:709 msgid "Proxy Server URL, format: [socks5|http]://user:pass@ip:port." msgstr "代理服务器地址，格式：[socks5|http]://user:pass@ip:port。" -#: smartdns.js:763 +#: smartdns.js:717 msgid "" "Proxy server URL format error, format: [socks5|http]://user:pass@ip:port." msgstr "代理服务器地址格式错误，格式：[socks5|http]://user:pass@ip:port。" -#: smartdns.js:773 +#: smartdns.js:727 msgid "smartdns custom settings" msgstr "smartdns 自定义设置，具体配置参数参考指导" -#: smartdns.js:787 +#: smartdns.js:741 msgid "Generate Coredump" msgstr "生成coredump" -#: smartdns.js:788 +#: smartdns.js:742 msgid "" "Generate Coredump file when smartdns crash, coredump file is located at /tmp/" "smartdns.xxx.core." msgstr "" "当smartdns异常时生成coredump文件，coredump文件在/tmp/smartdns.xxx.core." -#: smartdns.js:792 +#: smartdns.js:746 msgid "Log Level" msgstr "日志级别" -#: smartdns.js:804 +#: smartdns.js:758 msgid "Log Output Mode" msgstr "日志输出模式" -#: smartdns.js:807 smartdns.js:848 +#: smartdns.js:760 smartdns.js:761 smartdns.js:798 smartdns.js:799 msgid "file" msgstr "文件" -#: smartdns.js:808 smartdns.js:849 +#: smartdns.js:762 smartdns.js:800 msgid "syslog" msgstr "系统日志" -#: smartdns.js:810 +#: smartdns.js:764 msgid "Log Size" msgstr "日志大小" -#: smartdns.js:815 +#: smartdns.js:769 msgid "Log Number" msgstr "日志数量" -#: smartdns.js:820 +#: smartdns.js:774 msgid "Log File" msgstr "日志文件路径" -#: smartdns.js:825 smartdns.js:833 +#: smartdns.js:779 smartdns.js:787 msgid "View Log" msgstr "查看日志" -#: smartdns.js:840 +#: smartdns.js:791 msgid "Enable Audit Log" msgstr "启用审计日志" -#: smartdns.js:845 +#: smartdns.js:796 msgid "Audit Log Output Mode" msgstr "审计日志输出模式" -#: smartdns.js:852 +#: smartdns.js:803 msgid "Audit Log Size" msgstr "审计日志大小" -#: smartdns.js:857 +#: smartdns.js:808 msgid "Audit Log Number" msgstr "审计日志数量" -#: smartdns.js:862 +#: smartdns.js:813 msgid "Audit Log File" msgstr "审计日志文件路径" -#: smartdns.js:870 +#: smartdns.js:821 msgid "Upstream Servers" msgstr "上游服务器" -#: smartdns.js:871 +#: smartdns.js:822 msgid "" -"Upstream Servers, support UDP, TCP, DoT, DoH, DoQ, DoH3 protocol. Please " -"configure multiple DNS servers, including multiple foreign DNS servers." +"Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS " +"servers, including multiple foreign DNS servers." msgstr "" -"上游 DNS 服务器，支持 UDP，TCP，DoT，DoH，DoQ，DoH3 协议。请配置多个上游 DNS " -"服务器，包括多个国内外服务器。" +"上游 DNS 服务器，支持 UDP，TCP 协议。请配置多个上游 DNS 服务器，包括多个国内" +"外服务器。" -#: smartdns.js:887 +#: smartdns.js:838 msgid "DNS Server Name" msgstr "DNS服务器名称" -#: smartdns.js:890 +#: smartdns.js:841 msgid "ip" msgstr "ip" -#: smartdns.js:890 +#: smartdns.js:841 msgid "DNS Server ip" msgstr "DNS服务器IP" -#: smartdns.js:895 +#: smartdns.js:846 msgid "port" msgstr "端口" -#: smartdns.js:895 +#: smartdns.js:846 msgid "DNS Server port" msgstr "DNS服务器端口" -#: smartdns.js:905 +#: smartdns.js:855 msgid "DNS Server type" msgstr "协议类型" -#: smartdns.js:907 +#: smartdns.js:857 msgid "udp" msgstr "udp" -#: smartdns.js:908 +#: smartdns.js:858 msgid "tcp" msgstr "tcp" -#: smartdns.js:909 +#: smartdns.js:859 msgid "tls" msgstr "tls" -#: smartdns.js:910 +#: smartdns.js:860 msgid "https" msgstr "https" -#: smartdns.js:911 -msgid "quic" -msgstr "quic" - -#: smartdns.js:912 -msgid "h3" -msgstr "h3" - -#: smartdns.js:917 +#: smartdns.js:865 msgid "DNS Server group" msgstr "服务器组" -#: smartdns.js:936 +#: smartdns.js:884 msgid "Exclude Default Group" msgstr "从默认组中排除" -#: smartdns.js:936 +#: smartdns.js:884 msgid "Exclude DNS Server from default group." msgstr "从default默认服务器组中排除。" -#: smartdns.js:943 +#: smartdns.js:891 msgid "IP Blacklist Filtering" msgstr "IP黑名单过滤" -#: smartdns.js:944 +#: smartdns.js:892 msgid "Filtering IP with blacklist" msgstr "使用IP黑名单过滤" -#: smartdns.js:950 +#: smartdns.js:898 msgid "TLS Hostname Verify" msgstr "校验TLS主机名" -#: smartdns.js:951 +#: smartdns.js:899 msgid "Set TLS hostname to verify." msgstr "设置校验TLS主机名。" -#: smartdns.js:962 +#: smartdns.js:908 msgid "No check certificate" msgstr "停用证书校验" -#: smartdns.js:963 +#: smartdns.js:909 msgid "Do not check certificate." msgstr "不校验证书的合法性。" -#: smartdns.js:973 +#: smartdns.js:917 msgid "TLS SNI name" msgstr "TLS SNI名称" -#: smartdns.js:974 +#: smartdns.js:918 msgid "Sets the server name indication for query. '-' for disable SNI name." msgstr "设置服务器SNI名称，‘-’表示禁用SNI名称。" -#: smartdns.js:985 +#: smartdns.js:927 msgid "HTTP Host" msgstr "HTTP主机" -#: smartdns.js:986 +#: smartdns.js:928 msgid "" "Set the HTTP host used for the query. Use this parameter when the host of " "the URL address is an IP address." msgstr "设置查询时使用的HTTP主机，当URL地址的host是IP地址时，使用此参数。" -#: smartdns.js:995 +#: smartdns.js:936 msgid "TLS SPKI Pinning" msgstr "TLS SPKI 指纹" -#: smartdns.js:996 +#: smartdns.js:937 msgid "" "Used to verify the validity of the TLS server, The value is Base64 encoded " "SPKI fingerprint, leaving blank to indicate that the validity of TLS is not " @@ -935,64 +891,55 @@ msgstr "" "用于校验 TLS 服务器的有效性，数值为 Base64 编码的 SPKI 指纹，留空表示不验证 " "TLS 的合法性。" -#: smartdns.js:1008 +#: smartdns.js:947 msgid "Marking Packets" msgstr "数据包标记" -#: smartdns.js:1009 +#: smartdns.js:948 msgid "Set mark on packets." msgstr "设置数据包标记。" -#: smartdns.js:1016 +#: smartdns.js:955 msgid "Use Proxy" msgstr "使用代理" -#: smartdns.js:1017 +#: smartdns.js:956 msgid "Use proxy to connect to upstream DNS server." msgstr "使用代理连接上游DNS服务器。" -#: smartdns.js:1031 +#: smartdns.js:970 msgid "Please set proxy server first." msgstr "请先设置代理服务器。" -#: smartdns.js:1035 +#: smartdns.js:974 msgid "Only socks5 proxy support udp server." msgstr "仅SOCKS5代理支持UDP服务器。" -#: smartdns.js:1042 -msgid "Fallback" -msgstr "备用服务器" - -#: smartdns.js:1043 -msgid "" -"Mark this server as a fallback server, use it only when default servers fail." -msgstr "使用该服务器作为备用服务器，在默认服务器失效时启用。" - -#: smartdns.js:1050 +#: smartdns.js:982 msgid "Additional Args for upstream dns servers" msgstr "额外的上游 DNS 服务器参数" -#: smartdns.js:1058 +#: smartdns.js:990 msgid "Client Rules" msgstr "客户端规则" -#: smartdns.js:1058 +#: smartdns.js:990 msgid "Client Rules Settings, can achieve parental control functionality." msgstr "客户端规则设置，可以实现家长控制功能。" -#: smartdns.js:1062 +#: smartdns.js:994 msgid "Basic Settings" msgstr "基本设置" -#: smartdns.js:1064 smartdns.js:1255 +#: smartdns.js:996 smartdns.js:1187 msgid "DNS Block Setting" msgstr "域名屏蔽设置" -#: smartdns.js:1070 +#: smartdns.js:1002 msgid "Client Address" msgstr "客户端地址" -#: smartdns.js:1071 +#: smartdns.js:1003 msgid "" "If a client address is specified, only that client will apply this rule. You " "can enter an IP address, such as 1.2.3.4, or a MAC address, such as aa:bb:cc:" @@ -1001,115 +948,115 @@ msgstr "" "如果指定了客户端，那么对应的客户端会应用相应的规则，可以输入IP地址，如：" "1.2.3.4，或MAC地址，如：aa:bb:cc:dd:ee:ff。" -#: smartdns.js:1092 +#: smartdns.js:1024 msgid "Client address format error, please input ip adress or mac address." msgstr "客户端地址格式错误，请输入 IP 地址或 mac 地址。" -#: smartdns.js:1095 +#: smartdns.js:1027 msgid "Client Address File" msgstr "客户端地址文件" -#: smartdns.js:1096 +#: smartdns.js:1028 msgid "Upload client address file, same as Client Address function." msgstr "上传客户端地址文件，与客户端地址功能相同。" -#: smartdns.js:1103 smartdns.js:1262 smartdns.js:1461 +#: smartdns.js:1035 smartdns.js:1194 smartdns.js:1393 msgid "DNS Server group belongs to, such as office, home." msgstr "设置服务器组，例如office，home" -#: smartdns.js:1123 smartdns.js:1282 smartdns.js:1481 +#: smartdns.js:1055 smartdns.js:1214 smartdns.js:1413 #, javascript-format msgid "Server Group %s not exists" msgstr "服务器组%s不存在" -#: smartdns.js:1239 smartdns.js:1385 smartdns.js:1415 smartdns.js:1485 +#: smartdns.js:1171 smartdns.js:1317 smartdns.js:1347 smartdns.js:1417 msgid "Domain List File" msgstr "域名列表文件" -#: smartdns.js:1239 smartdns.js:1415 +#: smartdns.js:1171 smartdns.js:1347 msgid "Upload domain list file." msgstr "上传域名列表文件" -#: smartdns.js:1250 +#: smartdns.js:1182 msgid "Domain Rules" msgstr "域名规则" -#: smartdns.js:1250 +#: smartdns.js:1182 msgid "Domain Rules Settings" msgstr "域名规则设置" -#: smartdns.js:1254 +#: smartdns.js:1186 msgid "DNS Forwarding Setting" msgstr "域名分流设置" -#: smartdns.js:1256 smartdns.js:1443 +#: smartdns.js:1188 smartdns.js:1375 msgid "Domain Rule List" msgstr "域名规则列表" -#: smartdns.js:1256 +#: smartdns.js:1188 msgid "Set Specific domain rule list." msgstr "设置指定域名的规则列表。" -#: smartdns.js:1257 +#: smartdns.js:1189 msgid "Domain Address" msgstr "域名地址" -#: smartdns.js:1257 +#: smartdns.js:1189 msgid "Set Specific domain ip address." msgstr "设置指定域名的IP地址。" -#: smartdns.js:1333 smartdns.js:1507 +#: smartdns.js:1265 smartdns.js:1439 msgid "Yes" msgstr "是" -#: smartdns.js:1334 smartdns.js:1508 +#: smartdns.js:1266 smartdns.js:1440 msgid "No" msgstr "否" -#: smartdns.js:1379 smartdns.js:1583 smartdns.js:1680 +#: smartdns.js:1311 smartdns.js:1515 smartdns.js:1612 msgid "Additional Rule Flag" msgstr "额外规则标识" -#: smartdns.js:1380 smartdns.js:1584 +#: smartdns.js:1312 smartdns.js:1516 msgid "" "Additional Flags for rules, read help on domain-rule for more information." msgstr "额外的规则标识，具体参考domain-rule的帮助说明。" -#: smartdns.js:1386 smartdns.js:1486 +#: smartdns.js:1318 smartdns.js:1418 msgid "" "Upload domain list file, or configure auto download from Download File " "Setting page." msgstr "上传域名列表文件，或在下载文件设置页面设置自动下载。" -#: smartdns.js:1394 smartdns.js:1423 +#: smartdns.js:1326 smartdns.js:1355 msgid "Domain List" msgstr "域名列表" -#: smartdns.js:1394 +#: smartdns.js:1326 msgid "Configure forwarding domain name list." msgstr "配置分流域名列表" -#: smartdns.js:1423 +#: smartdns.js:1355 msgid "Configure block domain list." msgstr "配置屏蔽域名列表" -#: smartdns.js:1444 +#: smartdns.js:1376 msgid "Configure domain rule list." msgstr "配置域名规则列表" -#: smartdns.js:1459 +#: smartdns.js:1391 msgid "Domain Rule Name" msgstr "域名规则名称" -#: smartdns.js:1492 +#: smartdns.js:1424 msgid "Block domain" msgstr "屏蔽域名" -#: smartdns.js:1492 +#: smartdns.js:1424 msgid "Block domain." msgstr "屏蔽域名。" -#: smartdns.js:1594 +#: smartdns.js:1526 msgid "" "Specify an IP address to return for any host in the given domains, Queries " "in the domains are never forwarded and always replied to with the specified " @@ -1118,139 +1065,139 @@ msgstr "" "配置特定域名返回特定的IP地址，域名查询将不到上游服务器请求，直接返回配置的IP" "地址，可用于广告屏蔽。" -#: smartdns.js:1613 +#: smartdns.js:1545 msgid "IP Rules" msgstr "IP规则" -#: smartdns.js:1613 +#: smartdns.js:1545 msgid "IP Rules Settings" msgstr "IP规则设置" -#: smartdns.js:1617 smartdns.js:1623 +#: smartdns.js:1549 smartdns.js:1555 msgid "IP Rule List" msgstr "IP规则列表" -#: smartdns.js:1617 +#: smartdns.js:1549 msgid "Set Specific ip rule list." msgstr "设置对应IP的规则。" -#: smartdns.js:1618 +#: smartdns.js:1550 msgid "IP Blacklist" msgstr "IP黑名单" -#: smartdns.js:1618 +#: smartdns.js:1550 msgid "Set Specific ip blacklist." msgstr "设置指定的 IP 黑名单列表。" -#: smartdns.js:1624 +#: smartdns.js:1556 msgid "Configure ip rule list." msgstr "配置IP规则列表" -#: smartdns.js:1639 +#: smartdns.js:1571 msgid "IP Rule Name" msgstr "IP规则名称" -#: smartdns.js:1643 +#: smartdns.js:1575 msgid "IP Set File" msgstr "IP集合列表文件" -#: smartdns.js:1643 +#: smartdns.js:1575 msgid "Upload IP set file." msgstr "上传IP集合列表文件。" -#: smartdns.js:1649 +#: smartdns.js:1581 msgid "IP Addresses" msgstr "IP地址" -#: smartdns.js:1649 +#: smartdns.js:1581 msgid "IP addresses, CIDR format." msgstr "IP地址，CIDR格式。" -#: smartdns.js:1654 +#: smartdns.js:1586 msgid "Whitelist IP" msgstr "白名单" -#: smartdns.js:1654 +#: smartdns.js:1586 msgid "Whitelist IP Rule, Accept IP addresses within the range." msgstr "白名单规则，接受指定范围的IP地址。" -#: smartdns.js:1659 +#: smartdns.js:1591 msgid "Blacklist IP" msgstr "黑名单" -#: smartdns.js:1659 +#: smartdns.js:1591 msgid "Blacklist IP Rule, Decline IP addresses within the range." msgstr "黑名单规则，拒绝指定范围的IP地址。" -#: smartdns.js:1664 +#: smartdns.js:1596 msgid "Ignore IP" msgstr "忽略IP" -#: smartdns.js:1664 +#: smartdns.js:1596 msgid "Do not use these IP addresses." msgstr "忽略这些IP地址" -#: smartdns.js:1669 +#: smartdns.js:1601 msgid "Bogus nxdomain" msgstr "假冒IP" -#: smartdns.js:1669 +#: smartdns.js:1601 msgid "Return SOA when the requested result contains a specified IP address." msgstr "当结果包含对应范围的IP时，返回SOA。" -#: smartdns.js:1674 +#: smartdns.js:1606 msgid "IP alias" msgstr "IP别名" -#: smartdns.js:1674 +#: smartdns.js:1606 msgid "" "IP Address Mapping, Can be used for CDN acceleration with Anycast IP, such " "as Cloudflare's CDN." msgstr "IP地址映射，可用于支持AnyCast IP的CDN加速，比如Cloudflare的CDN。" -#: smartdns.js:1681 +#: smartdns.js:1613 msgid "Additional Flags for rules, read help on ip-rule for more information." msgstr "额外的规则标识，具体参考ip-rule的帮助说明。" -#: smartdns.js:1690 +#: smartdns.js:1622 msgid "" "Configure IP blacklists that will be filtered from the results of specific " "DNS server." msgstr "配置需要从指定域名服务器结果过滤的IP黑名单。" -#: smartdns.js:1707 +#: smartdns.js:1639 msgid "Technical Support" msgstr "技术支持" -#: smartdns.js:1708 +#: smartdns.js:1640 msgid "If you like this software, please buy me a cup of coffee." msgstr "如果本软件对你有帮助，请给作者加个蛋。" -#: smartdns.js:1712 +#: smartdns.js:1644 msgid "SmartDNS official website" msgstr "SmartDNS官方网站" -#: smartdns.js:1713 +#: smartdns.js:1645 msgid "open website" msgstr "打开网站" -#: smartdns.js:1720 smartdns.js:1721 +#: smartdns.js:1652 smartdns.js:1653 msgid "Report bugs" msgstr "报告BUG" -#: smartdns.js:1728 +#: smartdns.js:1660 msgid "Donate to smartdns" msgstr "捐助smartdns项目" -#: smartdns.js:1729 +#: smartdns.js:1661 msgid "Donate" msgstr "捐助" -#: smartdns.js:1735 +#: smartdns.js:1667 msgid "Restart Service" msgstr "重启服务" -#: smartdns.js:1744 +#: smartdns.js:1676 msgid "Restart" msgstr "重启" diff --git a/smartdns/Makefile b/smartdns/Makefile index 5539aa1..3b08f81 100644 --- a/smartdns/Makefile +++ b/smartdns/Makefile @@ -1,23 +1,23 @@ # -# Copyright (c) 2018-2025 Nick Peng (pymumu@gmail.com) +# Copyright (c) 2018-2023 Nick Peng (pymumu@gmail.com) # This is free software, licensed under the GNU General Public License v3. # include $(TOPDIR)/rules.mk PKG_NAME:=smartdns -PKG_VERSION:=1.2025.47 -PKG_RELEASE:=1 +PKG_VERSION:=1.2025.46.2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git -PKG_MIRROR_HASH:=04d1ca0990a840a6e5fd05fe8c59b6c71e661a07d6e131e863441f3a9925b9c8 -PKG_SOURCE_VERSION:=0f1912ab020ea9a60efac4732442f0bb7093f40b +PKG_SOURCE_VERSION:=20f56745c4f2ad2a5a4e1fb927770b3cb8122a69 +PKG_MIRROR_HASH:=29b32ee0c275a4b845b28c53a2597b43f4d3f04676e04b9c53aae5ecaf3c6f94 SMARTDNS_WEBUI_VERSION:=1.0.0 -SMARTDNS_WEBUI_SOURCE_PROTO:=git +SMAETDNS_WEBUI_SOURCE_PROTO:=git SMARTDNS_WEBUI_SOURCE_URL:=https://github.com/pymumu/smartdns-webui.git -SMARTDNS_WEBUI_SOURCE_VERSION:=c322303eac2ebee389f4a72a002163552e552f74 +SMARTDNS_WEBUI_SOURCE_VERSION:=7bbd1a6f6a7038ecb6cfbf424615aa7831bc1cea SMARTDNS_WEBUI_FILE:=smartdns-webui-$(SMARTDNS_WEBUI_VERSION).tar.gz PKG_MAINTAINER:=Nick Peng @@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 -# node compile is slow, so do not use it, download node manually. +# node compile is slow, so do not use it, doownload node manually. # PACKAGE_smartdns-ui:node/host PKG_BUILD_DEPENDS:=PACKAGE_smartdns-ui:rust/host @@ -46,7 +46,7 @@ endef define Package/smartdns $(Package/smartdns/default) TITLE:=smartdns server - DEPENDS:=+libpthread +libopenssl +libatomic + DEPENDS:=+libpthread +libopenssl endef define Package/smartdns/description @@ -93,7 +93,7 @@ define Package/smartdns-ui/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/smartdns/conf.d/ $(INSTALL_DIR) $(1)/usr/share/smartdns/wwwroot - $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugin/smartdns-ui/target/smartdns_ui.so $(1)/usr/lib/smartdns_ui.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugin/smartdns-ui/target/libsmartdns_ui.so $(1)/usr/lib/libsmartdns_ui.so $(CP) $(PKG_BUILD_DIR)/smartdns-webui/out/* $(1)/usr/share/smartdns/wwwroot endef @@ -104,19 +104,18 @@ define Build/Compile/smartdns-webui endef define Build/Compile/smartdns-ui - cargo install --force --locked bindgen-cli + cargo install --force --locked --root $(CARGO_HOME) bindgen-cli CARGO_BUILD_ARGS="$(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") --profile $(CARGO_PKG_PROFILE)" - +$(CARGO_PKG_VARS) CARGO_BUILD_ARGS="$(CARGO_BUILD_ARGS)" CC=$(TARGET_CC) \ + +$(CARGO_PKG_VARS) CARGO_BUILD_ARGS="$(CARGO_BUILD_ARGS)" CC="$(TARGET_CC)" \ PATH="$$(PATH):$(CARGO_HOME)/bin" \ - AWS_LC_SYS_CFLAGS="-O0" \ make -C $(PKG_BUILD_DIR)/plugin/smartdns-ui endef define Download/smartdns-webui FILE:=$(SMARTDNS_WEBUI_FILE) - PROTO:=$(SMARTDNS_WEBUI_SOURCE_PROTO) + PROTO:=$(SMAETDNS_WEBUI_SOURCE_PROTO) URL:=$(SMARTDNS_WEBUI_SOURCE_URL) - MIRROR_HASH:=29970b932d9abdb2a53085d71b4f4964ec3291d8d7c49794a04f2c35fbc6b665 + MIRROR_HASH:=b3f4f73b746ee169708f6504c52b33d9bbeb7c269b731bd7de4f61d0ad212d74 VERSION:=$(SMARTDNS_WEBUI_SOURCE_VERSION) HASH:=$(SMARTDNS_WEBUI_HASH) SUBDIR:=smartdns-webui @@ -141,3 +140,4 @@ endef $(eval $(call BuildPackage,smartdns)) $(eval $(call RustBinPackage,smartdns-ui)) $(eval $(call BuildPackage,smartdns-ui)) + diff --git a/update-subtree.sh b/update-subtree.sh index fbebea6..8bb9053 100644 --- a/update-subtree.sh +++ b/update-subtree.sh @@ -4,9 +4,5 @@ cd "$(dirname "$0")" git subtree pull --prefix=einat-ebpf --squash https://github.com/muink/openwrt-einat-ebpf.git master git subtree pull --prefix=luci-app-einat --squash https://github.com/muink/luci-app-einat.git master - git subtree pull --prefix=smartdns --squash https://github.com/pymumu/openwrt-smartdns.git master -git subtree pull --prefix=luci-app-smartdns --squash https://github.com/pymumu/luci-app-smartdns.git master - -git subtree pull --prefix=fakehttp --squash https://github.com/yingziwu/openwrt-fakehttp.git main -git subtree pull --prefix=luci-app-fakehttp --squash https://github.com/yingziwu/luci-app-fakehttp.git main +git subtree pull --prefix=luci-app-smartdns --squash https://github.com/pymumu/luci-app-smartdns.git master \ No newline at end of file