Skip to content

simpler #28

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
swizzley wants to merge 2 commits into
base: master
Choose a base branch
from
Open

simpler #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0656fcf
simpler
swizzley Feb 9, 2019
5d9ace6
proper config for refactored water tun
swizzley Feb 9, 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
2 changes: 1 addition & 1 deletion hop/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func NewClient(cfg HopClientConfig) error {

go hopClient.cleanUp()

iface, err := newTun("")
iface, err := newTun()
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions hop/iface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ var invalidAddr = errors.New("Invalid device ip address")

var tun_peer net.IP

func newTun(name string) (iface *water.Interface, err error) {
func newTun() (iface *water.Interface, err error) {

iface, err = water.NewTUN(name)
iface, err = water.New(water.Config{})
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion hop/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func NewServer(cfg HopServerConfig) error {
hopServer.toNet = make([]chan *udpPacket, (cfg.HopEnd - cfg.HopStart + 1))
hopServer.ippool = new(hopIPPool)

iface, err := newTun("")
iface, err := newTun()
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/chnroute-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -

OLDGW=$(ip route show 0/0 | head -n1 | grep 'via' | grep -Po '\d+\.\d+\.\d+\.\d+')
OLDGW=$(ip route show 0/0 | awk '{print $3}')

if [ $OLDGW == '' ]; then
exit 0
Expand Down