xiaoqidun/qqwry
1
0
Fork 0
mirror of https://github.com/xiaoqidun/qqwry.git synced 2023-06-27 14:38:22 +08:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: xiaoqidun:c30cc99c4ef8e31d9ec48a395b2400e20ad6e0f0
Branches Tags
xiaoqidun:main
...
compare: xiaoqidun:3caa55c1c70e34a13e37595d1b23295b09791415
Branches Tags
xiaoqidun:main

2 Commits
c30cc99c4e ... 3caa55c1c7

Author SHA1 Message Date
xiaoqidun
3caa55c1c7 feat(错误信息): 没有找到ip时返回err 2021-01-21 16:03:36 +08:00
xiaoqidun
d196a86e24 fix(修正查询): 修正部分IP查询错误 2021-01-21 15:51:55 +08:00
1 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

21
qqwry.go
View File

@ -82,6 +82,7 @@ func QueryIP(queryIp string) (country string, area string, err error) {
} }
} }
if offset <= 0 { if offset <= 0 {
err = errors.New("ip not found")
return return
} }
posM := offset + 4 posM := offset + 4
@ -91,14 +92,14 @@ func QueryIP(queryIp string) (country string, area string, err error) {
case redirectMode1: case redirectMode1:
posC := byte3ToUInt32(data[posM+1 : posM+4]) posC := byte3ToUInt32(data[posM+1 : posM+4])
mode = data[posC] mode = data[posC]
var cA uint32 = 0 posCA := posC
if mode == redirectMode2 { if mode == redirectMode2 {
cA = byte3ToUInt32(data[posC+1 : posC+4]) posCA = byte3ToUInt32(data[posC+1 : posC+4])
posC += 4 posC += 4
} }
for i := cA; i < dataLen; i++ { for i := posCA; i < dataLen; i++ {
if data[i] == 0 { if data[i] == 0 {
country = string(data[cA:i]) country = string(data[posCA:i])
break break
} }
} }
@ -107,19 +108,19 @@ func QueryIP(queryIp string) (country string, area string, err error) {
} }
areaPos = posC areaPos = posC
case redirectMode2: case redirectMode2:
cA := byte3ToUInt32(data[posM+1 : posM+4]) posCA := byte3ToUInt32(data[posM+1 : posM+4])
for i := cA; i < dataLen; i++ { for i := posCA; i < dataLen; i++ {
if data[i] == 0 { if data[i] == 0 {
country = string(data[cA:i]) country = string(data[posCA:i])
break break
} }
} }
areaPos = offset + 8 areaPos = offset + 8
default: default:
cA := offset + 4 posCA := offset + 4
for i := cA; i < dataLen; i++ { for i := posCA; i < dataLen; i++ {
if data[i] == 0 { if data[i] == 0 {
country = string(data[cA:i]) country = string(data[posCA:i])
break break
} }
} }