github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-06 01:03:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #627 from justincormack/go-fmt

Browse Source 
go fmt
This commit is contained in:
Justin Cormack 2016-10-21 15:46:46 +01:00 committed by GitHub
commit 7cdcdb6734
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/packages/proxy/many.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"encoding/binary" "encoding/binary"
"flag" "flag"
"github.com/rneugeba/virtsock/go/vsock"
"github.com/rneugeba/virtsock/go/hvsock" "github.com/rneugeba/virtsock/go/hvsock"
"github.com/rneugeba/virtsock/go/vsock"
"log" "log"
"net" "net"
"proxy/libproxy" "proxy/libproxy"

2
alpine/packages/proxy/one.go
View File

@ -35,7 +35,7 @@ func onePort() {
if ipP != nil { if ipP != nil {
ipP.Run() ipP.Run()
} else { } else {
select{} // sleep forever select {} // sleep forever
} }
ctl.Close() // ensure ctl remains alive and un-GCed until here ctl.Close() // ensure ctl remains alive and un-GCed until here
os.Exit(0) os.Exit(0)

3
alpine/packages/proxy/proxy.go
View File

@ -12,7 +12,6 @@ import (
var interactiveMode bool var interactiveMode bool
// sendError signals the error to the parent and quits the process. // sendError signals the error to the parent and quits the process.
func sendError(err error) { func sendError(err error) {
if interactiveMode { if interactiveMode {
@ -72,7 +71,7 @@ func parseHostContainerAddrs() (host net.Addr, port int, container net.Addr, loc
default: default:
log.Fatalf("unsupported protocol %s", *proto) log.Fatalf("unsupported protocol %s", *proto)
} }
localIP = ! *noLocalIP localIP = !*noLocalIP
return host, port, container, localIP return host, port, container, localIP
} }