Skip to content

GitLab

Commit a4b7753f authored by Juan Batiz-Benet's avatar Juan Batiz-Benet
Browse files
Options

use constants, fix ipv6 bug

parent b9067889
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
codec.go
View file @ a4b7753f
...@@ -66,12 +66,14 @@ func bytesToString(b []byte) (ret string, err error) { ...@@ -66,12 +66,14 @@ func bytesToString(b []byte) (ret string, err error) {
func addressStringToBytes(p *Protocol, s string) []byte { func addressStringToBytes(p *Protocol, s string) []byte {
switch p.Code { switch p.Code {
// ipv4,6 case P_IP4: // ipv4
case 4, 41:
return net.ParseIP(s).To4() return net.ParseIP(s).To4()
case P_IP6: // ipv6
return net.ParseIP(s).To16()
// tcp udp dccp sctp // tcp udp dccp sctp
case 6, 17, 33, 132: case P_TCP, P_UDP, P_DCCP, P_SCTP:
b := make([]byte, 2) b := make([]byte, 2)
i, err := strconv.Atoi(s) i, err := strconv.Atoi(s)
if err == nil { if err == nil {
...@@ -87,11 +89,11 @@ func addressBytesToString(p *Protocol, b []byte) string { ...@@ -87,11 +89,11 @@ func addressBytesToString(p *Protocol, b []byte) string {
switch p.Code { switch p.Code {
// ipv4,6 // ipv4,6
case 4, 41: case P_IP4, P_IP6:
return net.IP(b).String() return net.IP(b).String()
// tcp udp dccp sctp // tcp udp dccp sctp
case 6, 17, 33, 132: case P_TCP, P_UDP, P_DCCP, P_SCTP:
i := binary.BigEndian.Uint16(b) i := binary.BigEndian.Uint16(b)
return strconv.Itoa(int(i)) return strconv.Itoa(int(i))
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment