xiaoqidun/probe
1
0
Fork 0
mirror of https://github.com/xiaoqidun/probe.git synced 2026-01-29 04:58:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(修复功能): 修复IPv6支持

Browse Source
This commit is contained in:
xiaoqidun
2026-01-22 16:05:28 +08:00
parent 2d44a5d5b8
commit 1c2dea15f9
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
probe_stun.go
+14 -11
View File
@@ -136,9 +136,9 @@ func decodeSTUNResponse(data []byte, txID [12]byte) (*stunMessage, error) {
}
// parseAddress 解析STUN属性中的地址信息
// 入参: attrType 属性类型, data 属性值数据
// 入参: attrType 属性类型, data 属性值数据, txID 事务ID用于XOR解码
// 返回: addr 解析出的UDP地址, err 解析错误信息
func parseAddress(attrType uint16, data []byte) (*net.UDPAddr, error) {
func parseAddress(attrType uint16, data []byte, txID [12]byte) (*net.UDPAddr, error) {
if len(data) < 4 {
return nil, errors.New("attribute too short")
}
@@ -157,11 +157,14 @@ func parseAddress(attrType uint16, data []byte) (*net.UDPAddr, error) {
copy(ip, data[4:4+ipLen])
if attrType == attrXorMappedAddress {
port ^= uint16(stunMagicCookie >> 16)
if ipLen == 4 {
mc := make([]byte, 4)
binary.BigEndian.PutUint32(mc, stunMagicCookie)
for i := 0; i < 4; i++ {
ip[i] ^= mc[i]
mc := make([]byte, 4)
binary.BigEndian.PutUint32(mc, stunMagicCookie)
for i := 0; i < 4; i++ {
ip[i] ^= mc[i]
}
if ipLen == 16 {
for i := 4; i < 16; i++ {
ip[i] ^= txID[i-4]
}
}
}
@@ -173,14 +176,14 @@ func parseAddress(attrType uint16, data []byte) (*net.UDPAddr, error) {
func (m *stunMessage) GetMappedAddress() *net.UDPAddr {
for _, attr := range m.Attributes {
if attr.Type == attrXorMappedAddress {
if addr, err := parseAddress(attr.Type, attr.Value); err == nil {
if addr, err := parseAddress(attr.Type, attr.Value, m.Header.ID); err == nil {
return addr
}
}
}
for _, attr := range m.Attributes {
if attr.Type == attrMappedAddress {
if addr, err := parseAddress(attr.Type, attr.Value); err == nil {
if addr, err := parseAddress(attr.Type, attr.Value, m.Header.ID); err == nil {
return addr
}
}
@@ -193,14 +196,14 @@ func (m *stunMessage) GetMappedAddress() *net.UDPAddr {
func (m *stunMessage) GetChangedAddress() *net.UDPAddr {
for _, attr := range m.Attributes {
if attr.Type == attrChangedAddress {
if addr, err := parseAddress(attr.Type, attr.Value); err == nil {
if addr, err := parseAddress(attr.Type, attr.Value, m.Header.ID); err == nil {
return addr
}
}
}
for _, attr := range m.Attributes {
if attr.Type == attrOtherAddress {
if addr, err := parseAddress(attr.Type, attr.Value); err == nil {
if addr, err := parseAddress(attr.Type, attr.Value, m.Header.ID); err == nil {
return addr
}
}