From f2fbce03584cb39cb5aa5e08be877fc682e67379 Mon Sep 17 00:00:00 2001 From: tsosunchia <59512455+tsosunchia@users.noreply.github.com> Date: Fri, 26 May 2023 11:13:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8D=E8=BE=93=E5=87=BAGE?= =?UTF-8?q?OIP=E4=BF=A1=E6=81=AF=E7=9A=84=E6=96=B9=E6=B3=95=20PS:=20?= =?UTF-8?q?=E4=B8=BA=E5=A4=96=E9=83=A8=E7=A8=8B=E5=BA=8F=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E9=A2=84=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++-- README_zh_CN.md | 5 +++-- cmd/cmd.go | 4 ++-- ipgeo/ipgeo.go | 6 ++++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 45efc79..cda7ef6 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/x Usage: nexttrace [-h|--help] [-T|--tcp] [-U|--udp] [-F|--fast-trace] [-p|--port ] [-q|--queries ] [--parallel-requests ] [-m|--max-hops ] [-d|--data-provider - (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen)] + (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)] [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path] [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw] [-c|--classic] [-f|--first ] [-M|--map] @@ -211,7 +211,8 @@ Arguments: reached). Default: 30 -d --data-provider Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, - IPInfoLocal, CHUNZHEN]. Default: LeoMoeAPI + IPInfoLocal, CHUNZHEN, disable-geoip]. + Default: LeoMoeAPI -n --no-rdns Do not resolve IP addresses to their domain names -a --always-rdns Always resolve IP addresses to their diff --git a/README_zh_CN.md b/README_zh_CN.md index 5ab867b..3ea33ed 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -183,7 +183,7 @@ nexttrace -T -q 2 --parallel-requests 1 -t -R 2001:4860:4860::8888 Usage: nexttrace [-h|--help] [-T|--tcp] [-U|--udp] [-F|--fast-trace] [-p|--port ] [-q|--queries ] [--parallel-requests ] [-m|--max-hops ] [-d|--data-provider - (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen)] + (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)] [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path] [-r|--report] [--dn42] [-o|--output] [-t|--table] [-c|--classic] [-f|--first ] [-M|--map] @@ -218,7 +218,8 @@ Arguments: reached). Default: 30 -d --data-provider Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, - IPInfoLocal, CHUNZHEN]. Default: LeoMoeAPI + IPInfoLocal, CHUNZHEN, disable-geoip]. + Default: LeoMoeAPI -n --no-rdns Do not resolve IP addresses to their domain names -a --always-rdns Always resolve IP addresses to their diff --git a/cmd/cmd.go b/cmd/cmd.go index 0406a4f..3641085 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -37,8 +37,8 @@ func Excute() { numMeasurements := parser.Int("q", "queries", &argparse.Options{Default: 3, Help: "Set the number of probes per each hop"}) parallelRequests := parser.Int("", "parallel-requests", &argparse.Options{Default: 18, Help: "Set ParallelRequests number. It should be 1 when there is a multi-routing"}) maxHops := parser.Int("m", "max-hops", &argparse.Options{Default: 30, Help: "Set the max number of hops (max TTL to be reached)"}) - dataOrigin := parser.Selector("d", "data-provider", []string{"Ip2region", "ip2region", "IP.SB", "ip.sb", "IPInfo", "ipinfo", "IPInsight", "ipinsight", "IPAPI.com", "ip-api.com", "IPInfoLocal", "ipinfolocal", "chunzhen"}, &argparse.Options{Default: "LeoMoeAPI", - Help: "Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, IPInfoLocal, CHUNZHEN]"}) + dataOrigin := parser.Selector("d", "data-provider", []string{"Ip2region", "ip2region", "IP.SB", "ip.sb", "IPInfo", "ipinfo", "IPInsight", "ipinsight", "IPAPI.com", "ip-api.com", "IPInfoLocal", "ipinfolocal", "chunzhen", "LeoMoeAPI", "leomoeapi", "disable-geoip"}, &argparse.Options{Default: "LeoMoeAPI", + Help: "Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, IPInfoLocal, CHUNZHEN, disable-geoip]"}) noRdns := parser.Flag("n", "no-rdns", &argparse.Options{Help: "Do not resolve IP addresses to their domain names"}) alwaysRdns := parser.Flag("a", "always-rdns", &argparse.Options{Help: "Always resolve IP addresses to their domain names"}) routePath := parser.Flag("P", "route-path", &argparse.Options{Help: "Print traceroute hop path by ASN and location"}) diff --git a/ipgeo/ipgeo.go b/ipgeo/ipgeo.go index 78264b6..14aeb00 100644 --- a/ipgeo/ipgeo.go +++ b/ipgeo/ipgeo.go @@ -49,7 +49,13 @@ func GetSource(s string) Source { return IPInfoLocal case "CHUNZHEN": return Chunzhen + case "DISABLE-GEOIP": + return disableGeoIP default: return LeoIP } } + +func disableGeoIP(ip string) (*IPGeoData, error) { + return &IPGeoData{}, nil +}