Skip to content

Commit

Permalink
fix golang lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@changluyi
changluyi committed Jul 10, 2023
1 parent 95c2a80 commit 9ef88df
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 27 deletions.
2 changes: 0 additions & 2 deletions pkg/daemon/gateway_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,6 @@ func (c *Controller) reconcileTProxyIPTableRules(protocol string) error {
continue
}

hostIP := pod.Status.HostIP

subnet, err := c.subnetsLister.Get(subnetName)
if err != nil {
err = fmt.Errorf("failed to get subnet '%s', err: %v", subnetName, err)
Expand Down
46 changes: 23 additions & 23 deletions pkg/tproxy/tproxy_tcp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net"
"os"
"strings"
"syscall"
sys "syscall"
)

// Listener describes a TCP Listener
Expand Down Expand Up @@ -70,12 +70,12 @@ func listenTCP(device, network string, laddr *net.TCPAddr) (net.Listener, error)
defer fileDescriptorSource.Close()

if device != "" {
if err = syscall.BindToDevice(int(fileDescriptorSource.Fd()), device); err != nil {
if err = sys.BindToDevice(int(fileDescriptorSource.Fd()), device); err != nil {

Check failure on line 73 in pkg/tproxy/tproxy_tcp.go

View workflow job for this annotation

GitHub Actions / Build Kube-OVN 

undefined: sys.BindToDevice
return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("set socket option: SO_BINDTODEVICE(%s): %s", device, err)}
}
}

if err = syscall.SetsockoptInt(int(fileDescriptorSource.Fd()), syscall.SOL_IP, syscall.IP_TRANSPARENT, 1); err != nil {
if err = sys.SetsockoptInt(int(fileDescriptorSource.Fd()), sys.SOL_IP, sys.IP_TRANSPARENT, 1); err != nil {

Check failure on line 78 in pkg/tproxy/tproxy_tcp.go

View workflow job for this annotation

GitHub Actions / Build Kube-OVN 

undefined: sys.SOL_IP

Check failure on line 78 in pkg/tproxy/tproxy_tcp.go

View workflow job for this annotation

GitHub Actions / Build Kube-OVN 

undefined: sys.IP_TRANSPARENT
return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("set socket option: IP_TRANSPARENT: %s", err)}
}

Expand All @@ -96,19 +96,19 @@ type Conn struct {
// tcpAddToSockerAddr will convert a TCPAddr
// into a Sockaddr that may be used when
// connecting and binding sockets
func tcpAddrToSocketAddr(addr *net.TCPAddr) (syscall.Sockaddr, error) {
func tcpAddrToSocketAddr(addr *net.TCPAddr) (sys.Sockaddr, error) {
switch {
case addr.IP.To4() != nil:
ip := [4]byte{}
copy(ip[:], addr.IP.To4())

return &syscall.SockaddrInet4{Addr: ip, Port: addr.Port}, nil
return &sys.SockaddrInet4{Addr: ip, Port: addr.Port}, nil

default:
ip := [16]byte{}
copy(ip[:], addr.IP.To16())

return &syscall.SockaddrInet6{Addr: ip, Port: addr.Port}, nil
return &sys.SockaddrInet6{Addr: ip, Port: addr.Port}, nil
}
}

Expand All @@ -118,16 +118,16 @@ func tcpAddrToSocketAddr(addr *net.TCPAddr) (syscall.Sockaddr, error) {
func tcpAddrFamily(net string, laddr, raddr *net.TCPAddr) int {
switch net[len(net)-1] {
case '4':
return syscall.AF_INET
return sys.AF_INET
case '6':
return syscall.AF_INET6
return sys.AF_INET6
}

if (laddr == nil || laddr.IP.To4() != nil) &&
(raddr == nil || laddr.IP.To4() != nil) {
return syscall.AF_INET
return sys.AF_INET
}
return syscall.AF_INET6
return sys.AF_INET6
}

// DialTCP will open a
Expand All @@ -152,41 +152,41 @@ func dialTCP(device string, laddr, raddr *net.TCPAddr, dontAssumeRemote bool, is
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("build local socket address: %s", err)}
}

fileDescriptor, err := syscall.Socket(tcpAddrFamily("tcp", raddr, laddr), syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
fileDescriptor, err := sys.Socket(tcpAddrFamily("tcp", raddr, laddr), sys.SOCK_STREAM, sys.IPPROTO_TCP)
if err != nil {
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("socket open: %s", err)}
}

if device != "" {
if err = syscall.BindToDevice(int(fileDescriptor), device); err != nil {
if err = sys.BindToDevice(int(fileDescriptor), device); err != nil {

Check failure on line 161 in pkg/tproxy/tproxy_tcp.go

View workflow job for this annotation

GitHub Actions / Build Kube-OVN 

undefined: sys.BindToDevice
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: SO_BINDTODEVICE(%s): %s", device, err)}
}
}

if err = syscall.SetsockoptInt(fileDescriptor, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
syscall.Close(fileDescriptor)
if err = sys.SetsockoptInt(fileDescriptor, sys.SOL_SOCKET, sys.SO_REUSEADDR, 1); err != nil {
sys.Close(fileDescriptor)
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: SO_REUSEADDR: %s", err)}
}

if err = syscall.SetsockoptInt(fileDescriptor, syscall.SOL_IP, syscall.IP_TRANSPARENT, 1); err != nil {
syscall.Close(fileDescriptor)
if err = sys.SetsockoptInt(fileDescriptor, sys.SOL_IP, sys.IP_TRANSPARENT, 1); err != nil {

Check failure on line 171 in pkg/tproxy/tproxy_tcp.go

View workflow job for this annotation

GitHub Actions / Build Kube-OVN 

undefined: sys.SOL_IP

Check failure on line 171 in pkg/tproxy/tproxy_tcp.go

View workflow job for this annotation

GitHub Actions / Build Kube-OVN 

undefined: sys.IP_TRANSPARENT
sys.Close(fileDescriptor)
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: IP_TRANSPARENT: %s", err)}
}

if err = syscall.SetNonblock(fileDescriptor, isnonblocking); err != nil {
syscall.Close(fileDescriptor)
if err = sys.SetNonblock(fileDescriptor, isnonblocking); err != nil {
sys.Close(fileDescriptor)
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: SO_NONBLOCK: %s", err)}
}

if !dontAssumeRemote {
if err = syscall.Bind(fileDescriptor, localSocketAddress); err != nil {
syscall.Close(fileDescriptor)
if err = sys.Bind(fileDescriptor, localSocketAddress); err != nil {
sys.Close(fileDescriptor)
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("socket bind: %s", err)}
}
}

if err = syscall.Connect(fileDescriptor, remoteSocketAddress); err != nil && !strings.Contains(err.Error(), "operation now in progress") {
syscall.Close(fileDescriptor)
if err = sys.Connect(fileDescriptor, remoteSocketAddress); err != nil && !strings.Contains(err.Error(), "operation now in progress") {
sys.Close(fileDescriptor)
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("socket connect: %s", err)}
}

Expand All @@ -195,7 +195,7 @@ func dialTCP(device string, laddr, raddr *net.TCPAddr, dontAssumeRemote bool, is

remoteConn, err := net.FileConn(fdFile)
if err != nil {
syscall.Close(fileDescriptor)
sys.Close(fileDescriptor)
return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("convert file descriptor to connection: %s", err)}
}

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/kube-ovn/pod/pod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ var _ = framework.Describe("[group:pod]", func() {
InitialDelaySeconds: 10,
}

pod = podClient.Create(pod)
_ = podClient.Create(pod)
time.Sleep(11 * time.Second)

pod = podClient.GetPod(podName)
Expand Down Expand Up @@ -222,7 +222,7 @@ var _ = framework.Describe("[group:pod]", func() {
InitialDelaySeconds: 10,
}

pod = podClient.Create(pod)
_ = podClient.Create(pod)
time.Sleep(11 * time.Second)

pod = podClient.GetPod(podName)
Expand Down

0 comments on commit 9ef88df

Please sign in to comment.