From 97dda6148397c704e0d95b4c0775be02924234b7 Mon Sep 17 00:00:00 2001
From: nadoo <287492+nadoo@users.noreply.github.com>
Date: Thu, 21 Sep 2017 23:13:44 +0800
Subject: [PATCH] redir: avoid underscore in func name

---
 redir_linux.go       | 10 ++++++----
 redir_linux_other.go |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/redir_linux.go b/redir_linux.go
index a2879bf..170397b 100644
--- a/redir_linux.go
+++ b/redir_linux.go
@@ -11,8 +11,10 @@ import (
 )
 
 const (
-	SO_ORIGINAL_DST      = 80 // from linux/include/uapi/linux/netfilter_ipv4.h
-	IP6T_SO_ORIGINAL_DST = 80 // from linux/include/uapi/linux/netfilter_ipv6/ip6_tables.h
+	// from linux/include/uapi/linux/netfilter_ipv4.h
+	SO_ORIGINAL_DST = 80
+	// from linux/include/uapi/linux/netfilter_ipv6/ip6_tables.h
+	IP6T_SO_ORIGINAL_DST = 80
 )
 
 type RedirProxy struct {
@@ -103,7 +105,7 @@ func getOrigDst(conn net.Conn, ipv6 bool) (Addr, error) {
 	}
 
 	if ipv6 {
-		return ipv6_getorigdst(fd)
+		return getorigdstIPv6(fd)
 	}
 
 	return getorigdst(fd)
@@ -127,7 +129,7 @@ func getorigdst(fd uintptr) (Addr, error) {
 
 // Call ipv6_getorigdst() from linux/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
 // NOTE: I haven't tried yet but it should work since Linux 3.8.
-func ipv6_getorigdst(fd uintptr) (Addr, error) {
+func getorigdstIPv6(fd uintptr) (Addr, error) {
 	raw := syscall.RawSockaddrInet6{}
 	siz := unsafe.Sizeof(raw)
 	if err := socketcall(GETSOCKOPT, fd, syscall.IPPROTO_IPV6, IP6T_SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&raw)), uintptr(unsafe.Pointer(&siz)), 0); err != nil {
diff --git a/redir_linux_other.go b/redir_linux_other.go
index 96f9561..6589afc 100644
--- a/redir_linux_other.go
+++ b/redir_linux_other.go
@@ -4,6 +4,7 @@ package main
 
 import "syscall"
 
+// GETSOCKOPT from syscall
 const GETSOCKOPT = syscall.SYS_GETSOCKOPT
 
 func socketcall(call, a0, a1, a2, a3, a4, a5 uintptr) error {