From 6bf243794bfae2b1b79b153cf9a4807006e321f3 Mon Sep 17 00:00:00 2001 From: sjlleo Date: Wed, 4 Jan 2023 12:30:35 +0800 Subject: [PATCH 1/3] chore: update readme about LeoMoeAPI --- README.md | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f914a2f9..255aaa8e 100644 --- a/README.md +++ b/README.md @@ -6,24 +6,45 @@ ## NextTrace -Document Language: English | [简体中文](README_zh_CN.md) - An open source visual routing tool that pursues light weight, developed using Golang. 2022/12/18: Due to time and effort, it is becoming more and more difficult to maintain 2 branches at the same time, so I will be phasing out support for the NextTrace Enhanced version in the near future. I will resume updating the `Enhanced` version when I have more time. -## IP Data Copyright +## LeoMoeAPI Credit NextTrace 重点在于研究 Go 语言 Traceroute 的实现，其 LeoMoeAPI 的地理位置信息并没有原始数据的支撑，故也不可能有商用版本。 -LeoMoeAPI 的数据受到多家数据源的版权限制，**仅供路由跟踪地理位置的展示参考使用**，我们不对数据提供准度做任何保证，如用于其他用途后果自负，特此告知。 +LeoMoeAPI 存在部分社区贡献者校准的数据，也包含了部分其他第三方数据库的数据，这些数据的所有权归校准者、第三方数据库所有，**仅供路由跟踪地理位置的展示参考使用**，我们不对数据提供准度做任何保证，请尊重他们的成果，如用于其他用途后果自负，特此告知。 + +1. 对于辛勤提供马来西亚地区节点的 samleong123、全球节点的 TOHUNET Looking Glass 以及来自 Misaka 的 Ping.sx 表示感谢，目前 80% 以上的可靠校准数据出自这些节点的 ping / mtr 报告。 + +2. 同时感谢 isyekong 在基于 rDNS 校准上思路以及数据上做出的贡献，LeoMoeAPI 正在加快对 rDNS 的解析功能研发，目前已经做到部分骨干网的地理位置自动化解析，但存在一定误判。 +我们希望 NextTrace 在未来能成为对 One-Man ISP 友好的 Traceroute 工具，我们也在尽可能完善对这些 ASN 的微型骨干网的校准。 + +3. 在开发上，我要由衷感谢 missuo 以及 zhshch 在 Go 交叉编译、设计理念以及 TCP/UDP Traceroute 重构上的帮助、tsosunchia 在 TraceMap 上的倾力支持。 + +4. 我还要感谢 FFEE_CO、TheresaQWQ、stydxm 和其他朋友的帮助。LeoMoeAPI自首次发布以来得到了很多各方面的支持，所以我想把他们都归功于此。 + +我们希望您能够在使用时尽可能多多反馈 IP 地理位置错误（详见 issue），这样它就能够在第一时间得到校准，他人也会因此而受益。 NextTrace focuses on Golang Traceroute implementations, and its LeoMoeAPI geolocation information is not supported by raw data, so a commercial version is not possible. The LeoMoeAPI data is subject to copyright restrictions from multiple data sources, and is only used for the purpose of displaying the geolocation of route tracing. +1. We would like to credit samleong123 for providing nodes in Malaysia, TOHUNET Looking Glass for global nodes, and Ping.sx from Misaka, where more than 80% of reliable calibration data comes from ping/mtr reports. + +2. At the same time, we would like to credit isyekong for their contribution on rDNS-based calibration ideas and data. LeoMoeAPI is accelerating the development of rDNS resolution function, and has already achieved automated geolocation resolution for some backbone networks, but there are some misjudgments. We hope that NextTrace will become a One-Man ISP-friendly traceroute tool in the future, and we are working on improving the calibration of these ASN micro-backbones as much as possible. + +3. In terms of development, I would like to credit missuo and zhshch for their help with Go cross-compilation, design concepts and TCP/UDP Traceroute refactoring, and tsosunchia for their support on TraceMap. + +4. I would also like to credit FFEE_CO, TheresaQWQ, stydxm and others for their help. leoMoeAPI has received a lot of support since its first release, so I would like to credit them all! + +We hope you can give us as much feedback as possible on IP geolocation errors (see issue) so that it can be calibrated in the first place and others can benefit from it. + ## How To Use +Document Language: English | [简体中文](README_zh_CN.md) + ### Automated Installation ```bash From ba879335805f33966a5f4b0603ab4ed8203267a2 Mon Sep 17 00:00:00 2001 From: YekongTAT Date: Sun, 8 Jan 2023 19:32:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nt_install.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nt_install.sh b/nt_install.sh index ef5fe1f3..16331f0d 100644 --- a/nt_install.sh +++ b/nt_install.sh @@ -17,10 +17,14 @@ checkSystemArch() { arch=$(uname -m) if [[ $arch == "x86_64" ]]; then archParam="amd64" - fi - - if [[ $arch == "aarch64" ]]; then + elif [[ $arch == "i386" ]]; then + archParam="386" + elif [[ $arch == "aarch64" ]]; then archParam="arm64" + elif [[ $arch == "armv7l" ]] || [[ $arch == "armv7ml" ]]; then + archParam="armv7" + elif [[ $arch == "mips" ]]; then + archParam="mips" fi } From b435a36ee432a39415ffb7b2fcdada6faa213767 Mon Sep 17 00:00:00 2001 From: YekongTAT Date: Sun, 8 Jan 2023 20:56:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?downPath=20=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 部分奇怪的系统可能没有 `/usr/local` 目录，如果目录不存在就把 `nexttrace` 放到 `/usr/local` --- nt_install.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nt_install.sh b/nt_install.sh index 16331f0d..6f8b9cb0 100644 --- a/nt_install.sh +++ b/nt_install.sh @@ -32,7 +32,14 @@ checkSystemDistribution() { case "$OSTYPE" in linux*) osDistribution="linux" + + if [ ! -d "/usr/local" ]; + then + downPath="/usr/bin/nexttrace" + else downPath="/usr/local/bin/nexttrace" + fi + ;; *) echo "unknown: $OSTYPE" @@ -113,7 +120,7 @@ changeMode() { runBinrayFileHelp() { if [ -e ${downPath} ]; then ${downPath} -V - echo -e "${Tips} 一切准备就绪！使用命令 nexttrace 1.1.1.1 开始您的第一次路由测试吧~ 更多进阶命令玩法可以用 nexttrace -h 查看哦\n 关于软件卸载，因为nexttrace是绿色版单文件，卸载只需输入命令 rm /usr/local/bin/nexttrace 即可" + echo -e "${Tips} 一切准备就绪！使用命令 nexttrace 1.1.1.1 开始您的第一次路由测试吧~ 更多进阶命令玩法可以用 nexttrace -h 查看哦\n 关于软件卸载，因为nexttrace是绿色版单文件，卸载只需输入命令 rm ${downPath} 即可" fi }