Skip to content
This repository was archived by the owner on Jan 2, 2024. It is now read-only.

support 'go get', 'go install' #7

Merged
merged 1 commit into from
Oct 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 9 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
/subnet
/bin/*
/pkg/*
/src/gopkg.in/*
/src/sourcegraph.com/*
/src/github.com/alecthomas/*
/src/github.com/derekparker/*
/src/github.com/nicksnyder/*
/src/github.com/nsf/*
/src/github.com/rogpeppe/*
/src/github.com/sqs/*
/src/github.com/zmb3/*
/vendor/src/gopkg.in/*
/vendor/src/sourcegraph.com/*
/vendor/src/github.com/alecthomas/*
/vendor/src/github.com/derekparker/*
/vendor/src/github.com/nicksnyder/*
/vendor/src/github.com/nsf/*
/vendor/src/github.com/rogpeppe/*
/vendor/src/github.com/sqs/*
/vendor/src/github.com/zmb3/*

/ca.crt
/ca.pem
Expand Down
5 changes: 3 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"log"
"os"
"os/signal"
"subnet"
"subnet/cert"
"syscall"

"github.com/twitchyliquid64/subnet/subnet"
"github.com/twitchyliquid64/subnet/subnet/cert"
)

func main() {
Expand Down
File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions src/subnet/client.go → subnet/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"log"
"net"
"runtime"
"subnet/conn"
"sync"
"time"

"github.com/twitchyliquid64/subnet/subnet/conn"

"github.com/songgao/water"
)

Expand Down Expand Up @@ -159,7 +160,7 @@ func (c *Client) netSendRoutine() {

for c.connectionOk && connOK {
pkt, ok := <-c.packetsIn
if !ok{
if !ok {
break
}

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/subnet/conn/tls.go → subnet/conn/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"io/ioutil"
"log"
"subnet/cert"
"github.com/twitchyliquid64/subnet/subnet/cert"
"time"
)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions src/subnet/server.go → subnet/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"errors"
"log"
"net"
"subnet/conn"
"sync"
"time"

"github.com/twitchyliquid64/subnet/subnet/conn"

"github.com/songgao/water"
)

Expand Down Expand Up @@ -78,8 +79,8 @@ func (s *Server) Init(servHost string) (err error) {
if err = SetDevIP(s.intf.Name(), s.localAddr, s.localNetMask, false); err != nil {
return err
}
log.Printf("IP of %s set to %s, localNetMask %s\n", s.intf.Name(), s.localAddr.String(), net.IP(s.localNetMask.Mask).String())

log.Printf("Listen for TLS on %s, IP %s set to %s, localNetMask %s\n",
servHost, s.intf.Name(), s.localAddr.String(), net.IP(s.localNetMask.Mask).String())
return err
}

Expand Down
2 changes: 1 addition & 1 deletion src/subnet/server_conn.go → subnet/server_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/gob"
"log"
"net"
"subnet/conn"
"github.com/twitchyliquid64/subnet/subnet/conn"
)

type serverConn struct {
Expand Down
File renamed without changes.
Loading