golang: Use seccomp_version API to obtain library version

kcwong-verseon · mheon · commit 9814e55a2e59 · 2017-04-07T16:42:32.000-04:00
* add three C functions to retrieve the major, minor and micro
  version values from `seccomp_version()` when that's available
  under v2.3.x or newer
* has to change type from `int` to `uint` as that's the type
  used in `struct scmp_version`

Signed-off-by: K.C. Wong &lt;kcwong@verseon.com&gt;
[MH: Tweaked commit message]
Signed-off-by: Matthew Heon &lt;matthew.heon@gmail.com&gt;
diff --git a/seccomp.go b/seccomp.go
@@ -324,7 +324,7 @@ func (a ScmpAction) GetReturnCode() int16 {
 // GetLibraryVersion returns the version of the library the bindings are built
 // against.
 // The version is formatted as follows: Major.Minor.Micro
-func GetLibraryVersion() (major, minor, micro int) {
+func GetLibraryVersion() (major, minor, micro uint) {
 	return verMajor, verMinor, verMicro
 }
 
diff --git a/seccomp_internal.go b/seccomp_internal.go
@@ -120,9 +120,37 @@ const int      C_CMP_GE            = (int)SCMP_CMP_GE;
 const int      C_CMP_GT            = (int)SCMP_CMP_GT;
 const int      C_CMP_MASKED_EQ     = (int)SCMP_CMP_MASKED_EQ;
 
-const int      C_VERSION_MAJOR     = SCMP_VER_MAJOR;
-const int      C_VERSION_MINOR     = SCMP_VER_MINOR;
-const int      C_VERSION_MICRO     = SCMP_VER_MICRO;
+#if SCMP_VER_MAJOR == 2 && SCMP_VER_MINOR >= 3
+unsigned int get_major_version()
+{
+       return seccomp_version()->major;
+}
+
+unsigned int get_minor_version()
+{
+       return seccomp_version()->minor;
+}
+
+unsigned int get_micro_version()
+{
+       return seccomp_version()->micro;
+}
+#else
+unsigned int get_major_version()
+{
+       return (unsigned int)SCMP_MAJOR_VERSION;
+}
+
+unsigned int get_minor_version()
+{
+       return (unsigned int)SCMP_MINOR_VERSION;
+}
+
+unsigned int get_micro_version()
+{
+       return (unsigned int)SCMP_MICRO_VERSION;
+}
+#endif
 
 typedef struct scmp_arg_cmp* scmp_cast_t;
 
@@ -177,15 +205,15 @@ var (
 	// Error thrown on bad filter context
 	errBadFilter = fmt.Errorf("filter is invalid or uninitialized")
 	// Constants representing library major, minor, and micro versions
-	verMajor = int(C.C_VERSION_MAJOR)
-	verMinor = int(C.C_VERSION_MINOR)
-	verMicro = int(C.C_VERSION_MICRO)
+	verMajor = uint(C.get_major_version())
+	verMinor = uint(C.get_minor_version())
+	verMicro = uint(C.get_micro_version())
 )
 
 // Nonexported functions
 
 // Check if library version is greater than or equal to the given one
-func checkVersionAbove(major, minor, micro int) bool {
+func checkVersionAbove(major, minor, micro uint) bool {
 	return (verMajor > major) ||
 		(verMajor == major && verMinor > minor) ||
 		(verMajor == major && verMinor == minor && verMicro >= micro)

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ func (a ScmpAction) GetReturnCode() int16 {`
`324`	`324`	`// GetLibraryVersion returns the version of the library the bindings are built`
`325`	`325`	`// against.`
`326`	`326`	`// The version is formatted as follows: Major.Minor.Micro`
`327`		`-func GetLibraryVersion() (major, minor, micro int) {`
	`327`	`+func GetLibraryVersion() (major, minor, micro uint) {`
`328`	`328`	`return verMajor, verMinor, verMicro`
`329`	`329`	`}`
`330`	`330`