TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2026-04-25 07:25:18 +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

24
pkg/iplibrary/reader_file.go
View File

@@ -9,10 +9,12 @@ import (
"io"
"net"
"os"
"path/filepath"
"strings"
)
type FileReader struct {
rawReader *Reader
rawReader ReaderInterface
//password string
}
@@ -25,10 +27,15 @@ func NewFileReader(path string, password string) (*FileReader, error) {
_ = fp.Close()
}()
return NewFileDataReader(fp, password)
var version = ReaderVersionV1
if strings.HasSuffix(filepath.Base(path), ".v2.db") {
version = ReaderVersionV2
}
return NewFileDataReader(fp, password, version)
}
func NewFileDataReader(dataReader io.Reader, password string) (*FileReader, error) {
func NewFileDataReader(dataReader io.Reader, password string, readerVersion ReaderVersion) (*FileReader, error) {
if len(password) > 0 {
data, err := io.ReadAll(dataReader)
if err != nil {
@@ -48,7 +55,12 @@ func NewFileDataReader(dataReader io.Reader, password string) (*FileReader, erro
return nil, fmt.Errorf("create gzip reader failed: %w", err)
}
reader, err := NewReader(gzReader)
var reader ReaderInterface
if readerVersion == ReaderVersionV2 {
reader, err = NewReaderV2(gzReader)
} else {
reader, err = NewReaderV1(gzReader)
}
if err != nil {
return nil, err
}
@@ -59,13 +71,13 @@ func NewFileDataReader(dataReader io.Reader, password string) (*FileReader, erro
}
func (this *FileReader) Meta() *Meta {
return this.rawReader.meta
return this.rawReader.Meta()
}
func (this *FileReader) Lookup(ip net.IP) *QueryResult {
return this.rawReader.Lookup(ip)
}
func (this *FileReader) RawReader() *Reader {
func (this *FileReader) RawReader() ReaderInterface {
return this.rawReader
}