From 142d621c0666a2401b990a4ab25f6d97b1a7f925 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 21 Oct 2016 15:35:10 +0100 Subject: [PATCH] go fmt Signed-off-by: Justin Cormack --- alpine/packages/proxy/libproxy/proxy.go | 44 ++++++++++++------------- alpine/packages/proxy/many.go | 2 +- alpine/packages/proxy/one.go | 6 ++-- alpine/packages/proxy/proxy.go | 3 +- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/alpine/packages/proxy/libproxy/proxy.go b/alpine/packages/proxy/libproxy/proxy.go index 14053c1a2..9cfb00b25 100644 --- a/alpine/packages/proxy/libproxy/proxy.go +++ b/alpine/packages/proxy/libproxy/proxy.go @@ -47,26 +47,26 @@ func NewVsockProxy(frontendAddr *vsock.VsockAddr, backendAddr net.Addr) (Proxy, // NewIPProxy creates a Proxy according to the specified frontendAddr and backendAddr. func NewIPProxy(frontendAddr, backendAddr net.Addr) (Proxy, error) { - switch frontendAddr.(type) { - case *net.UDPAddr: - listener, err := net.ListenUDP("udp", frontendAddr.(*net.UDPAddr)) - if err != nil { - return nil, err - } - return NewUDPProxy(frontendAddr, listener, backendAddr.(*net.UDPAddr)) - case *net.TCPAddr: - listener, err := net.Listen("tcp", frontendAddr.String()) - if err != nil { - return nil, err - } - return NewTCPProxy(listener, backendAddr.(*net.TCPAddr)) - case *vsock.VsockAddr: - listener, err := vsock.Listen(frontendAddr.(*vsock.VsockAddr).Port) - if err != nil { - return nil, err - } - return NewTCPProxy(listener, backendAddr.(*net.TCPAddr)) - default: - panic(fmt.Errorf("Unsupported protocol")) - } + switch frontendAddr.(type) { + case *net.UDPAddr: + listener, err := net.ListenUDP("udp", frontendAddr.(*net.UDPAddr)) + if err != nil { + return nil, err + } + return NewUDPProxy(frontendAddr, listener, backendAddr.(*net.UDPAddr)) + case *net.TCPAddr: + listener, err := net.Listen("tcp", frontendAddr.String()) + if err != nil { + return nil, err + } + return NewTCPProxy(listener, backendAddr.(*net.TCPAddr)) + case *vsock.VsockAddr: + listener, err := vsock.Listen(frontendAddr.(*vsock.VsockAddr).Port) + if err != nil { + return nil, err + } + return NewTCPProxy(listener, backendAddr.(*net.TCPAddr)) + default: + panic(fmt.Errorf("Unsupported protocol")) + } } diff --git a/alpine/packages/proxy/many.go b/alpine/packages/proxy/many.go index 9d864bf80..30ff0ff4c 100644 --- a/alpine/packages/proxy/many.go +++ b/alpine/packages/proxy/many.go @@ -3,8 +3,8 @@ package main import ( "encoding/binary" "flag" - "github.com/rneugeba/virtsock/go/vsock" "github.com/rneugeba/virtsock/go/hvsock" + "github.com/rneugeba/virtsock/go/vsock" "log" "net" "proxy/libproxy" diff --git a/alpine/packages/proxy/one.go b/alpine/packages/proxy/one.go index ff8e0ab38..690972426 100644 --- a/alpine/packages/proxy/one.go +++ b/alpine/packages/proxy/one.go @@ -34,9 +34,9 @@ func onePort() { sendOK() if ipP != nil { ipP.Run() - } else { - select{} // sleep forever - } + } else { + select {} // sleep forever + } ctl.Close() // ensure ctl remains alive and un-GCed until here os.Exit(0) } diff --git a/alpine/packages/proxy/proxy.go b/alpine/packages/proxy/proxy.go index adc3b8191..5f1083a6d 100644 --- a/alpine/packages/proxy/proxy.go +++ b/alpine/packages/proxy/proxy.go @@ -12,7 +12,6 @@ import ( var interactiveMode bool - // sendError signals the error to the parent and quits the process. func sendError(err error) { if interactiveMode { @@ -72,7 +71,7 @@ func parseHostContainerAddrs() (host net.Addr, port int, container net.Addr, loc default: log.Fatalf("unsupported protocol %s", *proto) } - localIP = ! *noLocalIP + localIP = !*noLocalIP return host, port, container, localIP }