浏览代码

x/net/ipv4: don't enable advanced features on OS X 10.7 and below

Looks like OS X 10.8 is the safe harbor.

LGTM=iant
R=iant
CC=golang-codereviews
https://golang.org/cl/167630043
Mikio Hara 11 年之前
父节点
当前提交
0d3526158c
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      ipv4/sys_darwin.go

+ 5 - 3
ipv4/sys_darwin.go

@@ -47,9 +47,11 @@ func init() {
 			continue
 			continue
 		}
 		}
 	}
 	}
-	// The IP_PKTINFO was introduced in OS X 10.7 (Darwin
-	// 11.0.0). See http://support.apple.com/kb/HT1633.
-	if i > 2 || i == 2 && osver[0] >= '1' && osver[1] >= '1' {
+	// The IP_PKTINFO and protocol-independent multicast API were
+	// introduced in OS X 10.7 (Darwin 11.0.0). But it looks like
+	// those features require OS X 10.8 (Darwin 12.0.0) and above.
+	// See http://support.apple.com/kb/HT1633.
+	if i > 2 || i == 2 && osver[0] >= '1' && osver[1] >= '2' {
 		ctlOpts[ctlPacketInfo].name = sysIP_PKTINFO
 		ctlOpts[ctlPacketInfo].name = sysIP_PKTINFO
 		ctlOpts[ctlPacketInfo].length = sysSizeofInetPktinfo
 		ctlOpts[ctlPacketInfo].length = sysSizeofInetPktinfo
 		ctlOpts[ctlPacketInfo].marshal = marshalPacketInfo
 		ctlOpts[ctlPacketInfo].marshal = marshalPacketInfo