Skip to content

Remove the old shutdown protocol #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Remove the old shutdown protocol #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0324ad2
vpnkit: remove the old port forwarding shutdown protocol
djs55 Oct 6, 2018
630d362
go: revendor virtsock to latest master
djs55 Mar 10, 2019
995168d
vpnkit-forwarder: update to new hvsock API
djs55 Mar 10, 2019
a038627
vpnkit-forwarder: remove dead code
djs55 Mar 10, 2019
4a0abb5
Start adding CHANGES.md for 0.4.0
djs55 Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### v0.4.0 (unreleased)
* allow longer paths when forwarding Unix domain sockets

### v0.3.0 (2019-02-06)

* support multiplexing forwarded connections along one Hyper-V socket connection
Expand Down
5 changes: 2 additions & 3 deletions go/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

[[constraint]]
name = "github.com/linuxkit/virtsock"
branch = "10586_fixes"
revision = "8e79449dea0735c1c056d814934dd035734cc97c"

[[constraint]]
name = "github.com/docker/go-p9p"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vpnkit-forwarder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func main() {
func hyperVListener(port int) net.Listener {
serviceID := fmt.Sprintf("%08x-FACB-11E6-BD58-64006A7986D3", port)
svcid, _ := hvsock.GUIDFromString(serviceID)
l, err := hvsock.Listen(hvsock.HypervAddr{VMID: hvsock.GUIDWildcard, ServiceID: svcid})
l, err := hvsock.Listen(hvsock.Addr{VMID: hvsock.GUIDWildcard, ServiceID: svcid})
if err != nil {
log.Fatalf("Failed to bind AF_HVSOCK guid: %s: %v", serviceID, err)
}
Expand Down
11 changes: 0 additions & 11 deletions go/cmd/vpnkit-forwarder/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import (
"log"
"net"
"os"
"os/signal"
"syscall"
)

var interactiveMode bool
Expand Down Expand Up @@ -74,12 +72,3 @@ func parseHostContainerAddrs() (host net.Addr, port int, container net.Addr, loc
localIP = !*noLocalIP
return host, port, container, localIP
}

func handleStopSignals() {
s := make(chan os.Signal, 10)
signal.Notify(s, os.Interrupt, syscall.SIGTERM, syscall.SIGSTOP)

for range s {
os.Exit(0)
}
}
Loading