Ignore routes shorter than /8 or /16 in the IP lookup (closes #57)
check / check (push) Canceled after 0s
check / check (push) Canceled after 0s
The IP lookup tried every mask length down to /0, so a default route or a very short route such as 2000::/3 was reported as the owner of any address it covered until a more specific route was seen. Such a route only says where a peer sends traffic it has no better route for. The lookup now stops at /8 for IPv4 and /16 for IPv6; an address covered only by shorter routes gets "no route found". The live tables still store those routes. README states the limit. Model: opus-5-5
This commit is contained in:
@@ -37,6 +37,14 @@ const (
|
||||
ipv6Bits = 128
|
||||
)
|
||||
|
||||
// The IP lookup does not use routes shorter than these mask lengths. A default
|
||||
// route or a route this short only says where a peer sends traffic it has no
|
||||
// better route for; it does not say who holds the address.
|
||||
const (
|
||||
minLookupMaskLengthV4 = 8
|
||||
minLookupMaskLengthV6 = 16
|
||||
)
|
||||
|
||||
// SQLite memory tuning. cache_size and busy_timeout go in the DSN so every
|
||||
// pooled connection gets them; the heap limits are process-wide and set once.
|
||||
const (
|
||||
@@ -1876,11 +1884,12 @@ func (d *Database) GetIPInfo(ip string) (*IPInfo, error) {
|
||||
// GetIPInfoContext returns comprehensive IP information with context support.
|
||||
//
|
||||
// It finds the most specific live route for the address with point lookups on
|
||||
// the prefix index: for each mask length from the longest (32 or 128) down to 0
|
||||
// it looks up the address's network prefix at that length, and the first length
|
||||
// with a live route wins. That is at most 33 or 129 indexed lookups, however
|
||||
// many routes are live. The prefix is looked up in the text form net/netip
|
||||
// prints, which is the form the prefix handler stores.
|
||||
// the prefix index: for each mask length from the longest (32 or 128) down to
|
||||
// minLookupMaskLengthV4 or minLookupMaskLengthV6 it looks up the address's
|
||||
// network prefix at that length, and the first length with a live route wins.
|
||||
// That is at most 25 or 113 indexed lookups, however many routes are live. The
|
||||
// prefix is looked up in the text form net/netip prints, which is the form the
|
||||
// prefix handler stores.
|
||||
func (d *Database) GetIPInfoContext(ctx context.Context, ip string) (*IPInfo, error) {
|
||||
addr, err := netip.ParseAddr(ip)
|
||||
if err != nil {
|
||||
@@ -1891,9 +1900,11 @@ func (d *Database) GetIPInfoContext(ctx context.Context, ip string) (*IPInfo, er
|
||||
|
||||
info := &IPInfo{IP: ip, IPVersion: ipVersionV6}
|
||||
routesTable, prefixesTable := "live_routes_v6", "prefixes_v6"
|
||||
minMaskLength := minLookupMaskLengthV6
|
||||
if addr.Is4() {
|
||||
info.IPVersion = ipVersionV4
|
||||
routesTable, prefixesTable = "live_routes_v4", "prefixes_v4"
|
||||
minMaskLength = minLookupMaskLengthV4
|
||||
}
|
||||
|
||||
// Route info with peer count and prefix first_seen
|
||||
@@ -1934,7 +1945,7 @@ func (d *Database) GetIPInfoContext(ctx context.Context, ip string) (*IPInfo, er
|
||||
var whoisUpdatedAt sql.NullTime
|
||||
|
||||
found := false
|
||||
for bits := addr.BitLen(); bits >= 0; bits-- {
|
||||
for bits := addr.BitLen(); bits >= minMaskLength; bits-- {
|
||||
prefix := netip.PrefixFrom(addr, bits).Masked().String()
|
||||
err := stmt.QueryRowContext(ctx, prefix).Scan(
|
||||
&info.Netblock,
|
||||
|
||||
Reference in New Issue
Block a user