TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2025-12-15 21:36:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

更好地支持IPv6

Browse Source
This commit is contained in:
刘祥超
2024-04-06 09:12:17 +08:00
parent 7c5c600e31
commit e54cfa7765
22 changed files with 1237 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/iplibrary/default_ip_library.go
View File

@@ -33,7 +33,7 @@ func InitDefault() error {
}
var library = NewIPLibrary()
err := library.InitFromData(ipLibraryData, "")
err := library.InitFromData(ipLibraryData, "", ReaderVersionV1)
if err != nil {
return err
}
@@ -66,18 +66,18 @@ func LookupIPSummaries(ipList []string) map[string]string /** ip => summary **/
}
type IPLibrary struct {
reader *Reader
reader ReaderInterface
}
func NewIPLibrary() *IPLibrary {
return &IPLibrary{}
}
func NewIPLibraryWithReader(reader *Reader) *IPLibrary {
func NewIPLibraryWithReader(reader ReaderInterface) *IPLibrary {
return &IPLibrary{reader: reader}
}
func (this *IPLibrary) InitFromData(data []byte, password string) error {
func (this *IPLibrary) InitFromData(data []byte, password string, version ReaderVersion) error {
if len(data) == 0 || this.reader != nil {
return nil
}
@@ -99,7 +99,12 @@ func (this *IPLibrary) InitFromData(data []byte, password string) error {
_ = gzipReader.Close()
}()
libReader, err := NewReader(gzipReader)
var libReader ReaderInterface
if version == ReaderVersionV2 {
libReader, err = NewReaderV2(gzipReader)
} else {
libReader, err = NewReaderV1(gzipReader)
}
if err != nil {
return err
}