Преглед на файлове

unix: add Linux network namespace constants

This adds the NETNSA constants from net_namespace.h, used for creating
and querying network namespace IDs.

Fixes golang/go#26330
Change-Id: I786c4c4771be3eddc4fdb830a52e128aa1a2b9fd
Reviewed-on: https://go-review.googlesource.com/124436
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Casey Callendrello преди 7 години
родител
ревизия
3dc4335d56

+ 11 - 0
unix/linux/types.go

@@ -74,6 +74,7 @@ package unix
 #include <linux/hdreg.h>
 #include <linux/rtc.h>
 #include <linux/blkpg.h>
+#include <linux/net_namespace.h>
 
 // abi/abi.h generated by mkall.go.
 #include "abi/abi.h"
@@ -1539,3 +1540,13 @@ const (
 	BLKPG_DEL_PARTITION    = C.BLKPG_DEL_PARTITION
 	BLKPG_RESIZE_PARTITION = C.BLKPG_RESIZE_PARTITION
 )
+
+// netlink namespace
+// generated from
+// perl -nlE '/^\s*(NETNSA\w+)/ && say "$1 = C.$1"' /usr/include/linux/net_namespace.h
+const (
+	NETNSA_NONE = C.NETNSA_NONE
+	NETNSA_NSID = C.NETNSA_NSID
+	NETNSA_PID  = C.NETNSA_PID
+	NETNSA_FD   = C.NETNSA_FD
+)

+ 2 - 1
unix/mkerrors.sh

@@ -175,6 +175,7 @@ struct ltchars {
 #include <linux/magic.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netlink.h>
+#include <linux/net_namespace.h>
 #include <linux/perf_event.h>
 #include <linux/random.h>
 #include <linux/reboot.h>
@@ -405,7 +406,7 @@ ccflags="$@"
 		$2 ~ /^LINUX_REBOOT_CMD_/ ||
 		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
 		$2 !~ "NLA_TYPE_MASK" &&
-		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
+		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P|NETNSA)_/ ||
 		$2 ~ /^SIOC/ ||
 		$2 ~ /^TIOC/ ||
 		$2 ~ /^TCGET/ ||

+ 2 - 0
unix/zerrors_linux_386.go

@@ -1076,6 +1076,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_amd64.go

@@ -1076,6 +1076,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_arm.go

@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_arm64.go

@@ -1077,6 +1077,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_mips.go

@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_mips64.go

@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_mips64le.go

@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_mipsle.go

@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_ppc64.go

@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_ppc64le.go

@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 2 - 0
unix/zerrors_linux_s390x.go

@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3

+ 7 - 0
unix/ztypes_linux_386.go

@@ -1874,3 +1874,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_amd64.go

@@ -1896,3 +1896,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_arm.go

@@ -1864,3 +1864,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_arm64.go

@@ -1875,3 +1875,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_mips.go

@@ -1869,3 +1869,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_mips64.go

@@ -1877,3 +1877,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_mips64le.go

@@ -1877,3 +1877,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_mipsle.go

@@ -1869,3 +1869,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_ppc64.go

@@ -1885,3 +1885,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_ppc64le.go

@@ -1885,3 +1885,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)

+ 7 - 0
unix/ztypes_linux_s390x.go

@@ -1902,3 +1902,10 @@ const (
 	BLKPG_DEL_PARTITION    = 0x2
 	BLKPG_RESIZE_PARTITION = 0x3
 )
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)