ChenKaiLiuG/GoEdgeCommon
1
0
Fork 0
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

80
pkg/iplibrary/reader_result.go
View File

@@ -213,13 +213,21 @@ func (this *QueryResult) RegionSummary() string {
func (this *QueryResult) realCountryId() uint16 {
if this.item != nil {
switch item := this.item.(type) {
case *ipv4Item:
case *ipv4ItemV1:
return item.Region.CountryId
case ipv4Item:
case ipv4ItemV1:
return item.Region.CountryId
case *ipv6Item:
case *ipv6ItemV1:
return item.Region.CountryId
case ipv6Item:
case ipv6ItemV1:
return item.Region.CountryId
case *ipv4ItemV2:
return item.Region.CountryId
case ipv4ItemV2:
return item.Region.CountryId
case *ipv6ItemV2:
return item.Region.CountryId
case ipv6ItemV2:
return item.Region.CountryId
}
@@ -230,13 +238,21 @@ func (this *QueryResult) realCountryId() uint16 {
func (this *QueryResult) realProvinceId() uint16 {
if this.item != nil {
switch item := this.item.(type) {
case *ipv4Item:
case *ipv4ItemV1:
return item.Region.ProvinceId
case ipv4Item:
case ipv4ItemV1:
return item.Region.ProvinceId
case *ipv6Item:
case *ipv6ItemV1:
return item.Region.ProvinceId
case ipv6Item:
case ipv6ItemV1:
return item.Region.ProvinceId
case *ipv4ItemV2:
return item.Region.ProvinceId
case ipv4ItemV2:
return item.Region.ProvinceId
case *ipv6ItemV2:
return item.Region.ProvinceId
case ipv6ItemV2:
return item.Region.ProvinceId
}
@@ -247,13 +263,21 @@ func (this *QueryResult) realProvinceId() uint16 {
func (this *QueryResult) realCityId() uint32 {
if this.item != nil {
switch item := this.item.(type) {
case *ipv4Item:
case *ipv4ItemV1:
return item.Region.CityId
case ipv4Item:
case ipv4ItemV1:
return item.Region.CityId
case *ipv6Item:
case *ipv6ItemV1:
return item.Region.CityId
case ipv6Item:
case ipv6ItemV1:
return item.Region.CityId
case *ipv4ItemV2:
return item.Region.CityId
case ipv4ItemV2:
return item.Region.CityId
case *ipv6ItemV2:
return item.Region.CityId
case ipv6ItemV2:
return item.Region.CityId
}
@@ -264,13 +288,21 @@ func (this *QueryResult) realCityId() uint32 {
func (this *QueryResult) realTownId() uint32 {
if this.item != nil {
switch item := this.item.(type) {
case *ipv4Item:
case *ipv4ItemV1:
return item.Region.TownId
case ipv4Item:
case ipv4ItemV1:
return item.Region.TownId
case *ipv6Item:
case *ipv6ItemV1:
return item.Region.TownId
case ipv6Item:
case ipv6ItemV1:
return item.Region.TownId
case *ipv4ItemV2:
return item.Region.TownId
case ipv4ItemV2:
return item.Region.TownId
case *ipv6ItemV2:
return item.Region.TownId
case ipv6ItemV2:
return item.Region.TownId
}
@@ -281,13 +313,21 @@ func (this *QueryResult) realTownId() uint32 {
func (this *QueryResult) realProviderId() uint16 {
if this.item != nil {
switch item := this.item.(type) {
case *ipv4Item:
case *ipv4ItemV1:
return item.Region.ProviderId
case ipv4Item:
case ipv4ItemV1:
return item.Region.ProviderId
case *ipv6Item:
case *ipv6ItemV1:
return item.Region.ProviderId
case ipv6Item:
case ipv6ItemV1:
return item.Region.ProviderId
case *ipv4ItemV2:
return item.Region.ProviderId
case ipv4ItemV2:
return item.Region.ProviderId
case *ipv6ItemV2:
return item.Region.ProviderId
case ipv6ItemV2:
return item.Region.ProviderId
}