summaryrefslogtreecommitdiff
path: root/src/lib/net/net_linux.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/net/net_linux.go')
-rw-r--r--src/lib/net/net_linux.go30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/net/net_linux.go b/src/lib/net/net_linux.go
index 19ae0b6ae..c384711b1 100644
--- a/src/lib/net/net_linux.go
+++ b/src/lib/net/net_linux.go
@@ -17,16 +17,16 @@ export func IPv4ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.E
return nil, os.EINVAL
}
sa := new(syscall.SockaddrInet4);
- sa.family = syscall.AF_INET;
- sa.port[0] = byte(port>>8);
- sa.port[1] = byte(port);
+ sa.Family = syscall.AF_INET;
+ sa.Port[0] = byte(port>>8);
+ sa.Port[1] = byte(port);
for i := 0; i < IPv4len; i++ {
- sa.addr[i] = p[i]
+ sa.Addr[i] = p[i]
}
return unsafe.pointer(sa).(*syscall.Sockaddr), nil
}
-var IPv6zero [16]byte;
+var _IPv6zero [16]byte;
export func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
p = ToIPv6(p);
@@ -38,35 +38,35 @@ export func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.E
// In IPv6 mode, Linux treats that as meaning "announce on 0.0.0.0",
// which it refuses to do. Rewrite to the IPv6 all zeros.
if p4 := ToIPv4(p); p4 != nil && p4[0] == 0 && p4[1] == 0 && p4[2] == 0 && p4[3] == 0 {
- p = IPv6zero;
+ p = _IPv6zero;
}
sa := new(syscall.SockaddrInet6);
- sa.family = syscall.AF_INET6;
- sa.port[0] = byte(port>>8);
- sa.port[1] = byte(port);
+ sa.Family = syscall.AF_INET6;
+ sa.Port[0] = byte(port>>8);
+ sa.Port[1] = byte(port);
for i := 0; i < IPv6len; i++ {
- sa.addr[i] = p[i]
+ sa.Addr[i] = p[i]
}
return unsafe.pointer(sa).(*syscall.Sockaddr), nil
}
export func SockaddrToIP(sa1 *syscall.Sockaddr) (p []byte, port int, err *os.Error) {
- switch sa1.family {
+ switch sa1.Family {
case syscall.AF_INET:
sa := unsafe.pointer(sa1).(*syscall.SockaddrInet4);
- a := ToIPv6(sa.addr);
+ a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
}
- return a, int(sa.port[0])<<8 + int(sa.port[1]), nil;
+ return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
case syscall.AF_INET6:
sa := unsafe.pointer(sa1).(*syscall.SockaddrInet6);
- a := ToIPv6(sa.addr);
+ a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
}
- return a, int(sa.port[0])<<8 + int(sa.port[1]), nil;
+ return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
default:
return nil, 0, os.EINVAL
}