ssure that a config file exists even if null

Makefile

@@ -17,7 +17,7 @@ LOG := log/
 ETC := etc/
 USR := usr/
 LOCAL := local/
-VERSION := 0.32.04
+VERSION := 0.32.05
 
 GO111MODULE=on
 
@@ -27,6 +27,9 @@ echo:
 	find . -path ./.go -prune -o -name "*.i2pkeys" -exec rm {} \;
 	find . -path ./.go -prune -o -name "*.go" -exec cat {} \; | nl
 
+tag:
+	gothub release -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION) -d "I2P Tunnel Management tool for Go applications"
+
 recopy:
 	#find ./tcp/ -name '*.go' -exec cp -rv {} . \;
 	#sed -i '1s|^|//AUTO-GENERATED FOR BACKWARD COMPATIBILITY, USE ./tcp in the future\n|' *.go
@@ -224,9 +227,6 @@ tar:
 		--exclude bin \
 		-cJvf ../$(packagename)_$(VERSION).orig.tar.xz .
 
-tag:
-	gothub release -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION) -d "I2P Tunnel Management tool for Go applications"
-
 sed:
 	sed -i 's|func(\*Conf)|func(samtunnel.SAMTunnel)|g' ./config/*.go
 	sed -i 's|func(c \*Conf)|func(c samtunnel.SAMTunnel)|g' ./config/*.go

go.mod

@@ -3,8 +3,9 @@ module github.com/eyedeekay/sam-forwarder
 go 1.12
 
 require (
+	crawshaw.io/littleboss v0.0.0-20190317185602-8957d0aedcce // indirect
 	github.com/boreq/friendlyhash v0.0.0-20190522010448-1ca64b3ca69e
-	github.com/eyedeekay/httptunnel v0.0.0-20190831065052-9eab288b8a82
+	github.com/eyedeekay/httptunnel v0.0.0-20190831071439-0ff3d5f798fb
 	github.com/eyedeekay/portcheck v0.0.0-20190218044454-bb8718669680
 	github.com/eyedeekay/sam3 v0.0.0-20190730185140-f8d54526ea25
 	github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69
@@ -12,9 +13,4 @@ require (
 	github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26
 	github.com/zserge/lorca v0.1.8
 	github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb
-	golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
-	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
-	golang.org/x/sys v0.0.0-20190830142957-1e83adbbebd0 // indirect
-	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/tools v0.0.0-20190830223141-573d9926052a // indirect
 )

tcp/forwarder-client.go

@@ -36,6 +36,9 @@ type SAMClientForwarder struct {
 }
 
 func (f *SAMClientForwarder) Config() *i2ptunconf.Conf {
+	if f.Conf == nil {
+		f.Conf = i2ptunconf.NewI2PBlankTunConf()
+	}
 	return f.Conf
 }
 

tcp/forwarder.go

@@ -47,6 +47,9 @@ type SAMForwarder struct {
 var err error
 
 func (f *SAMForwarder) Config() *i2ptunconf.Conf {
+	if f.Conf == nil {
+		f.Conf = i2ptunconf.NewI2PBlankTunConf()
+	}
 	return f.Conf
 }
 

udp/forwarder-client-udp.go

@@ -36,6 +36,9 @@ type SAMSSUClientForwarder struct {
 }
 
 func (f *SAMSSUClientForwarder) Config() *i2ptunconf.Conf {
+	if f.Conf == nil {
+		f.Conf = i2ptunconf.NewI2PBlankTunConf()
+	}
 	return f.Conf
 }
 

udp/forwarder-udp.go

@@ -37,6 +37,9 @@ type SAMSSUForwarder struct {
 var err error
 
 func (f *SAMSSUForwarder) Config() *i2ptunconf.Conf {
+	if f.Conf == nil {
+		f.Conf = i2ptunconf.NewI2PBlankTunConf()
+	}
 	return f.Conf
 }