SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 11:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

badoption: Finish netip options

Browse source
This commit is contained in:
世界 2024-12-01 14:33:23 +08:00
parent 3f30aaf25e
commit 478265cd45
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/json/badoption/netip.go
View file

@ -35,6 +35,13 @@ func (a *Addr) UnmarshalJSON(content []byte) error {
type Prefix netip.Prefix type Prefix netip.Prefix
func (p *Prefix) Build(defaultPrefix netip.Prefix) netip.Prefix {
if p == nil {
return defaultPrefix
}
return netip.Prefix(*p)
}
func (p *Prefix) MarshalJSON() ([]byte, error) { func (p *Prefix) MarshalJSON() ([]byte, error) {
return json.Marshal(netip.Prefix(*p).String()) return json.Marshal(netip.Prefix(*p).String())
} }
@ -55,6 +62,13 @@ func (p *Prefix) UnmarshalJSON(content []byte) error {
type Prefixable netip.Prefix type Prefixable netip.Prefix
func (p *Prefixable) Build(defaultPrefix netip.Prefix) netip.Prefix {
if p == nil {
return defaultPrefix
}
return netip.Prefix(*p)
}
func (p *Prefixable) MarshalJSON() ([]byte, error) { func (p *Prefixable) MarshalJSON() ([]byte, error) {
prefix := netip.Prefix(*p) prefix := netip.Prefix(*p)
if prefix.Bits() == prefix.Addr().BitLen() { if prefix.Bits() == prefix.Addr().BitLen() {