summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2019-03-19 13:36:17 +0100
committerMarius Halden <marius.h@lden.org>2019-03-19 13:36:17 +0100
commit477961717bf809dc8305e23c66cd11ccde85672f (patch)
tree28f52d38f093dba7d88128f5b0e85105589d0f06
parent0f317b92dd6cd96a9a0594ff51a5cd5eb12d8ce6 (diff)
downloadgojail-477961717bf809dc8305e23c66cd11ccde85672f.tar.gz
gojail-477961717bf809dc8305e23c66cd11ccde85672f.tar.bz2
gojail-477961717bf809dc8305e23c66cd11ccde85672f.tar.xz
go fmt and add go symbol for JAIL_API_VERSION
-rw-r--r--jail.go20
1 files changed, 12 insertions, 8 deletions
diff --git a/jail.go b/jail.go
index fc6104a..46aa5c1 100644
--- a/jail.go
+++ b/jail.go
@@ -47,9 +47,11 @@ package jail
// return &a[idx];
// }
import "C"
-import "errors"
-import "fmt"
-import "unsafe"
+import (
+ "errors"
+ "fmt"
+ "unsafe"
+)
const (
JAIL_CREATE = C.JAIL_CREATE
@@ -60,9 +62,11 @@ const (
JAIL_SYS_DISABLE = C.JAIL_SYS_DISABLE
JAIL_SYS_NEW = C.JAIL_SYS_NEW
JAIL_SYS_INHERIT = C.JAIL_SYS_INHERIT
+
+ JAIL_API_VERSION = C.JAIL_API_VERSION
)
-var EPerm = errors.New(C.GoString(C.strerror(C.EPERM)))
+var EPerm = errors.New(C.GoString(C.strerror(C.EPERM)))
var EFault = errors.New(C.GoString(C.strerror(C.EFAULT)))
var EInval = errors.New(C.GoString(C.strerror(C.EINVAL)))
var EAgain = errors.New(C.GoString(C.strerror(C.EAGAIN)))
@@ -113,7 +117,7 @@ func mapToIov(params map[string]interface{}) (unsafe.Pointer, int, []unsafe.Poin
C.free(unsafe.Pointer(c_str))
}
- C.set_iov_field((*C.struct_iovec)(iov), C.int(i), ips, C.ulong(C.sizeof_struct_in_addr * len(v_a)))
+ C.set_iov_field((*C.struct_iovec)(iov), C.int(i), ips, C.ulong(C.sizeof_struct_in_addr*len(v_a)))
} else {
panic("Unknown IPv4 type")
}
@@ -146,7 +150,7 @@ func mapToIov(params map[string]interface{}) (unsafe.Pointer, int, []unsafe.Poin
C.free(unsafe.Pointer(c_str))
}
- C.set_iov_field((*C.struct_iovec)(iov), C.int(i), ips, C.ulong(C.sizeof_struct_in6_addr * len(v_a)))
+ C.set_iov_field((*C.struct_iovec)(iov), C.int(i), ips, C.ulong(C.sizeof_struct_in6_addr*len(v_a)))
} else {
panic("Unknown IPv6 type")
}
@@ -170,11 +174,11 @@ func mapToIov(params map[string]interface{}) (unsafe.Pointer, int, []unsafe.Poin
i++
}
- return iov, len(params)*2, freeList
+ return iov, len(params) * 2, freeList
}
func iovToMap(iov unsafe.Pointer, niov int, params map[string]interface{}) {
- for i := 0; i < len(params)*2; i+=2 {
+ for i := 0; i < len(params)*2; i += 2 {
var key *C.char
var key_len C.ulong
var val unsafe.Pointer