TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2025-11-12 19:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

IP库阶段性提交（未完成）

Browse Source
This commit is contained in:
GoEdgeLab
2022-08-14 16:33:11 +08:00
parent 37d28d7fd7
commit c4fade1cdd
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkg/iplibrary/ip.db
View File

Binary file not shown.

13
pkg/iplibrary/reader.go
View File

@@ -169,14 +169,15 @@ func (this *Reader) parse(data []byte) (left []byte, err error) {
return nil, errors.New("invalid ip version '" + string(line) + "'") return nil, errors.New("invalid ip version '" + string(line) + "'")
} }
var ipFrom uint64
var ipTo uint64
if len(pieces[2]) == 0 { if len(pieces[2]) == 0 {
pieces[2] = pieces[1] pieces[2] = pieces[1]
} ipFrom = types.Uint64(pieces[1])
ipTo = types.Uint64(pieces[2])
var ipFrom = types.Uint64(pieces[1]) } else {
var ipTo = types.Uint64(pieces[2]) ipFrom = types.Uint64(pieces[1])
if ipFrom > ipTo { ipTo = types.Uint64(pieces[2]) + ipFrom
ipFrom, ipTo = ipTo, ipFrom
} }
if version == "4" { if version == "4" {

11
pkg/iplibrary/writer.go
View File

@@ -96,13 +96,20 @@ func (this *Writer) Write(ipFrom string, ipTo string, countryId int64, provinceI
} }
// 1 // 1
pieces = append(pieces, types.String(configutils.IP2Long(fromIP))) var fromIPLong = configutils.IP2Long(fromIP)
var toIPLong = configutils.IP2Long(toIP)
if toIPLong < fromIPLong {
fromIPLong, toIPLong = toIPLong, fromIPLong
}
pieces = append(pieces, types.String(fromIPLong))
if ipFrom == ipTo { if ipFrom == ipTo {
// 2 // 2
pieces = append(pieces, "") pieces = append(pieces, "")
} else { } else {
// 2 // 2
pieces = append(pieces, types.String(configutils.IP2Long(toIP))) pieces = append(pieces, types.String(toIPLong-fromIPLong))
} }
// 3 // 3