Compare commits

..

14 Commits

Author SHA1 Message Date
sjlleo
efdfd9d612 fix: 修复一个多线程路由跟踪错乱的问题 2022-06-03 16:26:01 +08:00
sjlleo
016f06bafd cleanup 2022-06-02 21:51:50 +08:00
sjlleo
1049986ebc cleanup 2022-06-02 21:48:19 +08:00
tsosunchia
80a75288d2 由于9.0.0.0/8 以及11.0.0.0/8大量用于其他IDC业务,因此清除特殊标记 2022-06-02 20:38:43 +08:00
tsosunchia
986b8ce300 Merge remote-tracking branch 'refs/remotes/origin/main'
fetch README
2022-05-31 21:00:07 +08:00
tsosunchia
ab774406ac 减少一处警告 2022-05-31 20:59:56 +08:00
sjlleo
9604b7befe update: announcement 2022-05-31 20:48:39 +08:00
tsosunchia
dc6537005a fix some bugs 2022-05-31 19:41:12 +08:00
tsosunchia
839d227770 fix some bugs 2022-05-31 19:15:39 +08:00
tsosunchia
84e989e71b fix some bugs 2022-05-31 19:15:29 +08:00
tsosunchia
3b74b302cc fix some bugs 2022-05-31 18:35:59 +08:00
tsosunchia
9b0e58359f 改善脚本在国内环境下的表现 2022-05-31 18:27:22 +08:00
tsosunchia
f0d7151144 Update README.md 2022-05-31 18:21:31 +08:00
tsosunchia
3c65c29eff 改善脚本在国内环境下的表现 2022-05-31 18:14:51 +08:00
8 changed files with 180 additions and 93 deletions

View File

@@ -8,24 +8,36 @@
一款开源的可视化路由跟踪工具,使用 Golang 开发。
NextTrace 只是一个实验性项目,不推荐用于生产环境下。对于路由跟踪工具,我们依旧更加推荐 WorstTrace & Besttrace。
## How To Use
### Automated Install
```bash
# Note: This Script Only Supports Linux/macOS, Other Unix-Like Systems are UNAVAILABLE
curl -Ls https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh -O && sudo bash nt_install.sh
curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh -O && sudo bash nt_install.sh
```
* `Release`里面为很多系统以及不同架构提供了编译好的二进制可执行文件,如果没有可以自行编译。
* 一些本项目的必要依赖在`Windows``Golang`底层实现不完全,所以目前`NextTrace``Windows`平台不可用。
```bash
# GHPROXY镜像(在连接raw.githubusercontent.com网络不畅时使用)
curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh -O && sudo bash nt_install.sh
```
- `Release`里面为很多系统以及不同架构提供了编译好的二进制可执行文件,如果没有可以自行编译。
- 一些本项目的必要依赖在`Windows``Golang`底层实现不完全,所以目前`NextTrace``Windows`平台不可用。
### Fast Test
此脚本旨在快速测试服务器的到中国内地的线路,建议新手或者没有自定义`NextTrace`功能需求的用户使用。
```bash
curl -Ls https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh -O && sudo bash quicklytest.sh
curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh -O && sudo bash quicklytest.sh
```
```bash
# GHPROXY镜像(在连接raw.githubusercontent.com网络不畅时使用)
curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh -O && sudo bash quicklytest.sh
```
### Get Started
@@ -149,7 +161,7 @@ Options:
1. 查看是否为常见问题 -> [前往 Github Wiki](https://github.com/xgadget-lab/nexttrace/wiki/FAQ---%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98%E8%A7%A3%E7%AD%94)
2. 不会软件的参数使用 -> [前往 Github Discussions](https://github.com/xgadget-lab/nexttrace/discussions)
3. 疑似BUG、或者功能建议 -> [前往 Github Issues](https://github.com/xgadget-lab/nexttrace/issues)
3. 疑似 BUG、或者功能建议 -> [前往 Github Issues](https://github.com/xgadget-lab/nexttrace/issues)
## Thanks
@@ -169,30 +181,30 @@ Options:
#### China
| ISP | 类型 | 数据源 | 占比 |
| :------------: | :----: | :--------------: | :--: |
| 电信/联通/移动 | 骨干网 | NextTrace | 10% |
| 电信/联通/移动 | 城域网 | 埃文科技 | 90% |
| ISP | 类型 | 数据源 | 占比 |
| :------------: | :----: | :-------: | :--: |
| 电信/联通/移动 | 骨干网 | NextTrace | 10% |
| 电信/联通/移动 | 城域网 | 埃文科技 | 90% |
#### WorldWide
| ISP | 类型 | 数据源 | 占比 |
| :------------: | :----: | :--------------: | :--: |
| Tier-01 | 骨干网 | IPInfo | 2% |
| Tier-01 | 骨干网 | 埃文科技 | 3% |
| ISP | 类型 | 数据源 | 占比 |
| :-----: | :----: | :-------: | :--: |
| Tier-01 | 骨干网 | IPInfo | 2% |
| Tier-01 | 骨干网 | 埃文科技 | 3% |
| Tier-01 | 骨干网 | IPInSight | 5% |
| Tier-01 | 城域网 | IPInSight | 90% |
| Tier-01 | 城域网 | IPInSight | 90% |
| ISP | 类型 | 数据源 | 占比 |
| :------------: | :----: | :--------------: | :--: |
| Others | 骨干网 | IPInSight | 5% |
| Others | 城域网 | IPInSight | 95% |
| ISP | 类型 | 数据源 | 占比 |
| :----: | :----: | :-------: | :--: |
| Others | 骨干网 | IPInSight | 5% |
| Others | 城域网 | IPInSight | 95% |
### IPv6 Database
| ISP | 类型 | 数据源 | 占比 |
| :------------: | :----: | :--------------: | :--: |
| All | 全部 | IP2Location Lite | 100% |
| ISP | 类型 | 数据源 | 占比 |
| :-: | :--: | :--------------: | :--: |
| All | 全部 | IP2Location Lite | 100% |
This product includes IP2Location LITE data available from <a href="https://lite.ip2location.com">https://lite.ip2location.com</a>.

View File

@@ -59,6 +59,32 @@ checkSystemDistribution() {
esac
}
getLocation() {
red "正在获取地理位置信息..."
countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
if [ "$countryCode" == "CN" ]; then
if [[ $auto == True ]]; then
URLprefix="https://ghproxy.com/"
else
read -r -p "检测到国内网络环境,是否使用镜像下载以加速(n/y)[y]" input
case $input in
[yY][eE][sS] | [yY])
URLprefix="https://ghproxy.com/"
;;
[nN][oO] | [nN])
URLprefix=""
red "您选择了不使用镜像,下载可能会变得异常缓慢,或者失败"
;;
*)
URLprefix="https://ghproxy.com/"
;;
esac
fi
fi
}
ask_if() {
local choice=""
red "${1}"
@@ -69,15 +95,15 @@ ask_if() {
#检查脚本更新
check_script_update() {
if [[ ${osDistribution} == "darwin" ]]; then
[ "$(md5 <"${BASH_SOURCE[0]}")" == "$(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" | md5)" ] && return 1 || return 0
[ "$(md5 <"${BASH_SOURCE[0]}")" == "$(curl -sL ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh" | md5)" ] && return 1 || return 0
else
[ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh") | awk '{print $1}')" ] && return 1 || return 0
[ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh") | awk '{print $1}')" ] && return 1 || return 0
fi
}
#更新脚本
update_script() {
if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh"; then
if curl -sL -o "${BASH_SOURCE[0]}" ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh" || curl -sL -o "${BASH_SOURCE[0]}" ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh"; then
red "nt_install.sh更新完成正在重启脚本..."
exec bash "${BASH_SOURCE[0]}" --auto
else
@@ -96,11 +122,6 @@ ask_update_script() {
fi
}
getLocation() {
red "正在获取地理位置信息..."
countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
}
checkPackageManger() {
if [[ ${osDistribution} == "darwin" ]]; then
# brew update
@@ -185,26 +206,27 @@ downloadBinrayFile() {
# red nexttrace_${osDistribution}_${archParam}
latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq ".assets[] | select(.name == \"nexttrace_${osDistribution}_${archParam}\") | .browser_download_url")
latestURL=${latestURL:1:$((${#latestURL} - 1 - 1))}
if [ "$countryCode" == "CN" ]; then
if [[ $auto == True ]]; then
latestURL="https://ghproxy.com/"$latestURL
else
read -r -p "检测到国内网络环境,是否使用镜像下载以加速(n/y)[y]" input
case $input in
[yY][eE][sS] | [yY])
latestURL="https://ghproxy.com/"$latestURL
;;
# if [ "$countryCode" == "CN" ]; then
# if [[ $auto == True ]]; then
# latestURL="https://ghproxy.com/"$latestURL
# else
# read -r -p "检测到国内网络环境,是否使用镜像下载以加速(n/y)[y]" input
# case $input in
# [yY][eE][sS] | [yY])
# latestURL="https://ghproxy.com/"$latestURL
# ;;
[nN][oO] | [nN])
red "您选择了不使用镜像,下载可能会变得异常缓慢,或者失败"
;;
# [nN][oO] | [nN])
# red "您选择了不使用镜像,下载可能会变得异常缓慢,或者失败"
# ;;
*)
latestURL="https://ghproxy.com/"$latestURL
;;
esac
fi
fi
# *)
# latestURL="https://ghproxy.com/"$latestURL
# ;;
# esac
# fi
# fi
latestURL=$URLprefix$latestURL
red "正在下载 NextTrace 二进制文件..."
if wget -O ${downPath} "${latestURL}"; then
@@ -260,6 +282,7 @@ addCronTask() {
checkRootPermit
checkSystemDistribution
checkSystemArch
getLocation
ask_update_script
checkPackageManger
install_software wget
@@ -267,7 +290,6 @@ install_software jq
checkVersion
# Download Procedure
getLocation
downloadBinrayFile
# Run Procedure

View File

@@ -52,11 +52,11 @@ func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
// TODO: 判断阿里云和腾讯云内网,数据不足,有待进一步完善
// TODO: 移动IDC判断到Hop.fetchIPData函数减少API调用
if strings.HasPrefix(ip, "9.") {
res = append(res, "局域网", "腾讯云")
res = append(res, "LAN Address")
} else if strings.HasPrefix(ip, "11.") {
res = append(res, "局域网", "阿里云")
res = append(res, "LAN Address")
} else if data.Country == "" {
res = append(res, "局域网")
res = append(res, "LAN Address")
} else {
// 有些IP的归属信息为空这个时候将ISP的信息填入
if data.Owner == "" {

View File

@@ -2,9 +2,10 @@ package printer
import (
"fmt"
"github.com/xgadget-lab/nexttrace/ipgeo"
"strings"
"github.com/xgadget-lab/nexttrace/ipgeo"
"github.com/xgadget-lab/nexttrace/trace"
"github.com/fatih/color"
@@ -38,7 +39,7 @@ func TracerouteTablePrinter(res *trace.Result) {
if data.City != "" {
tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country+", "+data.Prov+", "+data.City, data.Owner)
} else {
tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country, data.Owner)
tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country + ", " + data.Prov, data.Owner)
}
}
@@ -73,16 +74,18 @@ func tableDataGenerator(h trace.Hop) *rowData {
Hop: fmt.Sprint(h.TTL),
IP: IP,
Latency: lantency,
Country: "局域网",
Owner: "腾讯云",
Country: "LAN Address",
Prov: "LAN Address",
Owner: "",
}
} else if strings.HasPrefix(IP, "11.") {
return &rowData{
Hop: fmt.Sprint(h.TTL),
IP: IP,
Latency: lantency,
Country: "局域网",
Owner: "阿里云",
Country: "LAN Address",
Prov: "LAN Address",
Owner: "",
}
}

View File

@@ -20,12 +20,51 @@ check_root() {
}
checkNexttrace() {
echo -e "${Info} 正在检查Nexttrace...(若未安装NextTrace则开始安装)"
if curl -sL -O "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" || curl -sL -O "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh"; then
if $(which nexttrace >/dev/null 2>&1); then
echo -e "${Info} 您已安装NextTrace,是否检查更新?"
if ask_if "输入n/y以选择:[n]"; then
echo -e "${Info} 正在检查更新..."
else
return
fi
else
echo -e "${Info} 您未安装NextTrace正在开始安装..."
mkdir -p ~/.nexttrace/
cat >~/.nexttrace/ntraceConfig.yml <<EOF
Token:
LeoMoeAPI: NextTraceDemo
IPInfo: ""
Preference:
AlwaysRoutePath: true
EOF
fi
if curl -sL -O ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh" || curl -sL -O ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh"; then
bash nt_install.sh #--auto #>/dev/null
fi
}
getLocation() {
echo -e "${Info} 正在获取地理位置信息..."
countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
if [ "$countryCode" == "CN" ]; then
read -r -p "检测到国内网络环境,是否使用镜像下载以加速(n/y)[y]" input
case $input in
[yY][eE][sS] | [yY])
URLprefix="https://ghproxy.com/"
;;
[nN][oO] | [nN])
URLprefix=""
echo -e "${Info} 您选择了不使用镜像,下载可能会变得异常缓慢,或者失败"
;;
*)
URLprefix="https://ghproxy.com/"
;;
esac
fi
}
ask_if() {
local choice=""
echo -e "${Info} $1"
@@ -43,7 +82,7 @@ checkSystemDistribution() {
osDistribution="linux"
;;
*)
red "unknown: $OSTYPE"
echo -e "${Info} unknown: $OSTYPE"
exit 1
;;
esac
@@ -52,15 +91,15 @@ checkSystemDistribution() {
#检查脚本更新
check_script_update() {
if [[ ${osDistribution} == "darwin" ]]; then
[ "$(md5 <"${BASH_SOURCE[0]}")" == "$(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh" | md5)" ] && return 1 || return 0
[ "$(md5 <"${BASH_SOURCE[0]}")" == "$(curl -sL ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh" | md5)" ] && return 1 || return 0
else
[ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh") | awk '{print $1}')" ] && return 1 || return 0
[ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh") | awk '{print $1}')" ] && return 1 || return 0
fi
}
#更新脚本
update_script() {
if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh"; then
if curl -sL -o "${BASH_SOURCE[0]}" ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh" || curl -sL -o "${BASH_SOURCE[0]}" ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh"; then
echo -e "${Info} quickylytest.sh更新完成正在重启脚本..."
exec bash "${BASH_SOURCE[0]}"
else
@@ -97,15 +136,15 @@ check_mode() {
# [[ "${node}" == "2" ]] && TRACECMD=${TRACECMD}" -report"
# ##
else
TRACECMD=${TRACECMD}" -rdns -realtime"
TRACECMD=${TRACECMD}" -rdns"
# ##Route-Path功能还未完善,临时替代:
# [[ "${node}" == "1" ]] && TRACECMD=${TRACECMD}" -report"
# [[ "${node}" == "2" ]] && TRACECMD=${TRACECMD}" -report"
# ##
fi
echo -e "${Info} 是否输出Route-Path?"
ask_if "输入n/y以选择模式:[n]" && TRACECMD=${TRACECMD}" -report"
# echo -e "${Info} 是否输出Route-Path?"
# ask_if "输入n/y以选择模式:[n]" && TRACECMD=${TRACECMD}" -report"
}
@@ -250,6 +289,7 @@ result_all() {
check_root
checkSystemDistribution
getLocation
ask_update_script
checkNexttrace
check_mode

View File

@@ -74,19 +74,26 @@ func (t *ICMPTracer) listenICMP() {
if msg.N == nil {
continue
}
rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
if err != nil {
log.Println(err)
continue
}
switch rm.Type {
case ipv4.ICMPTypeTimeExceeded:
t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data)
case ipv4.ICMPTypeEchoReply:
t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data)
default:
// log.Println("received icmp message of unknown type", rm.Type)
// 抢在ICMP解析包之前先判断是否和目的地IP一致
// Leo 注释我是伞兵traceroute 居然忘了做包校验...
dstip := net.IP(msg.Msg[24:28])
if dstip.Equal(t.DestIP) || dstip.Equal(net.IPv4zero) {
// 匹配再继续解析包,否则直接丢弃
rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
if err != nil {
log.Println(err)
continue
}
switch rm.Type {
case ipv4.ICMPTypeTimeExceeded:
t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data)
case ipv4.ICMPTypeEchoReply:
t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data)
default:
// log.Println("received icmp message of unknown type", rm.Type)
}
}
}
}

View File

@@ -88,18 +88,21 @@ func (t *TCPTracer) listenICMP() {
if msg.N == nil {
continue
}
rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
if err != nil {
log.Println(err)
continue
}
switch rm.Type {
case ipv4.ICMPTypeTimeExceeded:
t.handleICMPMessage(msg, rm.Body.(*icmp.TimeExceeded).Data)
case ipv4.ICMPTypeDestinationUnreachable:
t.handleICMPMessage(msg, rm.Body.(*icmp.DstUnreach).Data)
default:
//log.Println("received icmp message of unknown type", rm.Type)
dstip := net.IP(msg.Msg[24:28])
if dstip.Equal(t.DestIP) {
rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
if err != nil {
log.Println(err)
continue
}
switch rm.Type {
case ipv4.ICMPTypeTimeExceeded:
t.handleICMPMessage(msg, rm.Body.(*icmp.TimeExceeded).Data)
case ipv4.ICMPTypeDestinationUnreachable:
t.handleICMPMessage(msg, rm.Body.(*icmp.DstUnreach).Data)
default:
//log.Println("received icmp message of unknown type", rm.Type)
}
}
}
}

View File

@@ -39,11 +39,11 @@ func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
// TODO: 判断阿里云和腾讯云内网,数据不足,有待进一步完善
// TODO: 移动IDC判断到Hop.fetchIPData函数减少API调用
if strings.HasPrefix(ip, "9.") {
res = append(res, "局域网", "腾讯云")
res = append(res, "LAN Address", "")
} else if strings.HasPrefix(ip, "11.") {
res = append(res, "局域网", "阿里云")
res = append(res, "LAN Address", "")
} else if data.Country == "" {
res = append(res, "局域网")
res = append(res, "LAN Address")
} else {
// 有些IP的归属信息为空这个时候将ISP的信息填入
if data.Owner == "" {