history-museum/clash
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change: use uint16 for Metadata SrcPort and DstPort

Browse Source
This commit is contained in:
Dreamacro
2023-08-03 23:20:40 +08:00
parent 47b6eb1700
commit c0e51f8556
13 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
constant/metadata.go
View File

@ -67,9 +67,9 @@ type Metadata struct {
Type Type `json:"type"`
SrcIP net.IP `json:"sourceIP"`
DstIP net.IP `json:"destinationIP"`
SrcPort string `json:"sourcePort"`
DstPort string `json:"destinationPort"`
InboundPort string `json:"inboundPort"`
SrcPort Port `json:"sourcePort"`
DstPort Port `json:"destinationPort"`
InboundPort uint16 `json:"inboundPort"`
Host string `json:"host"`
DNSMode DNSMode `json:"dnsMode"`
ProcessPath string `json:"processPath"`
@ -79,11 +79,11 @@ type Metadata struct {
}
func (m *Metadata) RemoteAddress() string {
return net.JoinHostPort(m.String(), m.DstPort)
return net.JoinHostPort(m.String(), m.DstPort.String())
}
func (m *Metadata) SourceAddress() string {
return net.JoinHostPort(m.SrcIP.String(), m.SrcPort)
return net.JoinHostPort(m.SrcIP.String(), m.SrcPort.String())
}
func (m *Metadata) AddrType() int {
@ -117,10 +117,9 @@ func (m *Metadata) UDPAddr() *net.UDPAddr {
if m.NetWork != UDP || m.DstIP == nil {
return nil
}
port, _ := strconv.ParseUint(m.DstPort, 10, 16)
return &net.UDPAddr{
IP: m.DstIP,
Port: int(port),
Port: int(m.DstPort),
}
}
@ -137,3 +136,14 @@ func (m *Metadata) String() string {
func (m *Metadata) Valid() bool {
return m.Host != "" || m.DstIP != nil
}
// Port is used to compatible with old version
type Port uint16
func (n Port) MarshalJSON() ([]byte, error) {
return json.Marshal(n.String())
}
func (n Port) String() string {
return strconv.FormatUint(uint64(n), 10)
}