summaryrefslogtreecommitdiff
path: root/src/lib/net/net_darwin.go
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2009-01-16 11:36:44 -0800
committerRob Pike <r@golang.org>2009-01-16 11:36:44 -0800
commit272bd52ee862a8d2d4594f1b2304a89e9666db60 (patch)
tree439b4a96dbf9a16e0d4dc2e5ede96343c18a4a07 /src/lib/net/net_darwin.go
parentb480e90a0efe366a2c1dc9467e98244e4cd6bacb (diff)
downloadgolang-272bd52ee862a8d2d4594f1b2304a89e9666db60.tar.gz
casify syscall and sequelae
R=rsc DELTA=337 (0 added, 1 deleted, 336 changed) OCL=22950 CL=22950
Diffstat (limited to 'src/lib/net/net_darwin.go')
-rw-r--r--src/lib/net/net_darwin.go30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/net/net_darwin.go b/src/lib/net/net_darwin.go
index 2ad0043c5..062f5ea79 100644
--- a/src/lib/net/net_darwin.go
+++ b/src/lib/net/net_darwin.go
@@ -17,12 +17,12 @@ export func IPv4ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.E
return nil, os.EINVAL
}
sa := new(syscall.SockaddrInet4);
- sa.len = syscall.SizeofSockaddrInet4;
- sa.family = syscall.AF_INET;
- sa.port[0] = byte(port>>8);
- sa.port[1] = byte(port);
+ sa.Len = syscall.SizeofSockaddrInet4;
+ 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
}
@@ -33,33 +33,33 @@ export func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.E
return nil, os.EINVAL
}
sa := new(syscall.SockaddrInet6);
- sa.len = syscall.SizeofSockaddrInet6;
- sa.family = syscall.AF_INET6;
- sa.port[0] = byte(port>>8);
- sa.port[1] = byte(port);
+ sa.Len = syscall.SizeofSockaddrInet6;
+ 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 nil, int(sa.port[0])<<8 + int(sa.port[1]), nil;
+ return nil, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
default:
return nil, 0, os.EINVAL
}