package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-05 16:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor(core): replace net.IP with netip.Addr (#395)

Browse Source
This commit is contained in:
Jason Lyu
2024-08-31 12:00:38 +08:00
committed by GitHub
parent fd98f65994
commit 1f09b4d42d
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/parse.go
View File

@@ -4,6 +4,7 @@ import (
"encoding/base64"
"fmt"
"net"
"net/netip"
"net/url"
"strings"
@@ -178,20 +179,19 @@ func parseRelay(u *url.URL) (proxy.Proxy, error) {
return proxy.NewRelay(address, username, password, opts.NoDelay)
}
func parseMulticastGroups(s string) (multicastGroups []net.IP, _ error) {
ipStrings := strings.Split(s, ",")
for _, ipString := range ipStrings {
if strings.TrimSpace(ipString) == "" {
func parseMulticastGroups(s string) (multicastGroups []netip.Addr, _ error) {
for _, ip := range strings.Split(s, ",") {
if ip = strings.TrimSpace(ip); ip == "" {
continue
}
ip := net.ParseIP(ipString)
if ip == nil {
return nil, fmt.Errorf("invalid IP format: %s", ipString)
addr, err := netip.ParseAddr(ip)
if err != nil {
return nil, err
}
if !ip.IsMulticast() {
return nil, fmt.Errorf("invalid multicast IP address: %s", ipString)
if !addr.IsMulticast() {
return nil, fmt.Errorf("invalid multicast IP: %s", addr)
}
multicastGroups = append(multicastGroups, ip)
multicastGroups = append(multicastGroups, addr)
}
return
}