From 6e6be3a326c848de4c321fe8e74c35cf21f6e194 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 6 Nov 2018 15:43:09 +0100
Subject: libwg-go: do not mix C style and Go style variable names

---
 app/tools/libwg-go/src/api-android.go     | 10 +++++-----
 app/tools/libwg-go/src/tun/api-android.go |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/tools/libwg-go/src/api-android.go b/app/tools/libwg-go/src/api-android.go
index e57da84f..fb34cc1a 100644
--- a/app/tools/libwg-go/src/api-android.go
+++ b/app/tools/libwg-go/src/api-android.go
@@ -60,7 +60,7 @@ func init() {
 }
 
 //export wgTurnOn
-func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
+func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {
 	interfaceName := string([]byte(ifnameRef))
 
 	logger := &Logger{
@@ -71,9 +71,9 @@ func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
 
 	logger.Debug.Println("Debug log enabled")
 
-	tun, name, err := tun.CreateTUNFromFD(int(tun_fd))
+	tun, name, err := tun.CreateTUNFromFD(int(tunFd))
 	if err != nil {
-		unix.Close(int(tun_fd))
+		unix.Close(int(tunFd))
 		logger.Error.Println(err)
 		return -1
 	}
@@ -86,7 +86,7 @@ func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
 	bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard))
 	setError := ipcSetOperation(device, bufferedSettings)
 	if setError != nil {
-		unix.Close(int(tun_fd))
+		unix.Close(int(tunFd))
 		logger.Error.Println(setError)
 		return -1
 	}
@@ -124,7 +124,7 @@ func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
 		}
 	}
 	if i == math.MaxInt32 {
-		unix.Close(int(tun_fd))
+		unix.Close(int(tunFd))
 		return -1
 	}
 	tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi}
diff --git a/app/tools/libwg-go/src/tun/api-android.go b/app/tools/libwg-go/src/tun/api-android.go
index 4f0dd968..ddc5d117 100644
--- a/app/tools/libwg-go/src/tun/api-android.go
+++ b/app/tools/libwg-go/src/tun/api-android.go
@@ -10,8 +10,8 @@ import (
 	"os"
 )
 
-func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) {
-	file := os.NewFile(uintptr(tun_fd), "/dev/tun")
+func CreateTUNFromFD(tunFd int) (TUNDevice, string, error) {
+	file := os.NewFile(uintptr(tunFd), "/dev/tun")
 	tun := &nativeTun{
 		tunFile: file,
 		fd:      file.Fd(),
@@ -20,7 +20,7 @@ func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) {
 		nopi:    true,
 	}
 	var err error
-	tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd)
+	tun.fdCancel, err = rwcancel.NewRWCancel(tunFd)
 	if err != nil {
 		return nil, "", err
 	}
-- 
cgit v1.2.3-59-g8ed1b