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

Fix serializer

Browse source
This commit is contained in:
世界 2023-08-20 13:05:20 +08:00
parent 4db0062caa
commit 620f3a3b88
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
common/metadata/serializer.go
View file

@ -51,7 +51,7 @@ func NewSerializer(options ...SerializerOption) *Serializer {
func (s *Serializer) WriteAddress(buffer *buf.Buffer, addr Socksaddr) error { func (s *Serializer) WriteAddress(buffer *buf.Buffer, addr Socksaddr) error {
var af Family var af Family
if !addr.IsValid() { if !addr.IsValid() {
af = AddressFamilyFqdn af = AddressFamilyEmpty
} else if addr.IsIPv4() { } else if addr.IsIPv4() {
af = AddressFamilyIPv4 af = AddressFamilyIPv4
} else if addr.IsIPv6() { } else if addr.IsIPv6() {
@ -67,9 +67,10 @@ func (s *Serializer) WriteAddress(buffer *buf.Buffer, addr Socksaddr) error {
if err != nil { if err != nil {
return err return err
} }
if addr.Addr.IsValid() { switch af {
case AddressFamilyIPv4, AddressFamilyIPv6:
_, err = buffer.Write(addr.Addr.AsSlice()) _, err = buffer.Write(addr.Addr.AsSlice())
} else { case AddressFamilyFqdn:
err = WriteSocksString(buffer, addr.Fqdn) err = WriteSocksString(buffer, addr.Fqdn)
} }
return err return err
@ -77,12 +78,7 @@ func (s *Serializer) WriteAddress(buffer *buf.Buffer, addr Socksaddr) error {
func (s *Serializer) AddressLen(addr Socksaddr) int { func (s *Serializer) AddressLen(addr Socksaddr) int {
if !addr.IsValid() { if !addr.IsValid() {
_, supportEmpty := s.familyByteMap[AddressFamilyEmpty] return 1
if supportEmpty {
return 1
} else {
return 2
}
} else if addr.IsIPv4() { } else if addr.IsIPv4() {
return 5 return 5
} else if addr.IsIPv6() { } else if addr.IsIPv6() {
@ -113,7 +109,7 @@ func (s *Serializer) WriteAddrPort(writer io.Writer, destination Socksaddr) erro
} }
if s.portFirst { if s.portFirst {
err = s.WriteAddress(buffer, destination) err = s.WriteAddress(buffer, destination)
} else { } else if destination.IsValid() {
err = s.WritePort(buffer, destination.Port) err = s.WritePort(buffer, destination.Port)
} }
if err != nil { if err != nil {
@ -126,7 +122,11 @@ func (s *Serializer) WriteAddrPort(writer io.Writer, destination Socksaddr) erro
} }
func (s *Serializer) AddrPortLen(destination Socksaddr) int { func (s *Serializer) AddrPortLen(destination Socksaddr) int {
return s.AddressLen(destination) + 2 if destination.IsValid() {
return s.AddressLen(destination) + 2
} else {
return s.AddressLen(destination)
}
} }
func (s *Serializer) ReadAddress(reader io.Reader) (Socksaddr, error) { func (s *Serializer) ReadAddress(reader io.Reader) (Socksaddr, error) {
@ -184,7 +184,7 @@ func (s *Serializer) ReadAddrPort(reader io.Reader) (destination Socksaddr, err
} }
if s.portFirst { if s.portFirst {
addr, err = s.ReadAddress(reader) addr, err = s.ReadAddress(reader)
} else { } else if addr.IsValid() {
port, err = s.ReadPort(reader) port, err = s.ReadPort(reader)
} }
if err != nil { if err != nil {