fix that awful logging in udp

Makefile

@@ -224,6 +224,9 @@ docker-run: docker-volume
 		eyedeekay/$(eephttpd)
 	make follow
 
+c:
+	go build ./i2pkeys
+
 follow:
 	docker logs -f $(eephttpd)
 

README.md.asc

@@ -83,12 +83,12 @@ I'm eventually going to make the manager implement net.Conn. This won't be
 exposed in the default application probably though, but rather as a library.
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwC464ACgkQ11wDs5te
-FOGKFgf+OzcyIHQUDnYz8c3Lu/8auMlELliErsYeqFVZAttYnyo803M4ZNbjPBuU
-vy5e4cnGFkv1UMxGaDFBqXz6dwes7KPPNdkO5ScRhVhcg/3lClEIisD8714zWrpG
-yG0ufhwTa6+3xcFIatGflqI6j4IHOV08v4kIne0yPWoNcVnSp0BpiLXm+I952UrC
-gk12+Xcv84wXpth7QkSA9AChHmFZyN4yO/MVVnwHqrjQ3emnJsfuUnMvGAS0Cgez
-nTIo8f2E70UZlu6IFsNVFPiV8GRvw0E2QiDxklnqB5fQrptNCY1eJBunraopCjga
-/h+PX1sPHyCORL3vBInvgk3LcAf80g==
-=1mFu
+iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwDMGQACgkQ11wDs5te
+FOFzuwf+N55jqKVWK+SxrVGg3+iZK0JZT1DyrL5pUQGWHjl5ImCyGo5C41LJhgyI
+2vErPqJA6//KZsPbFhm4xfxrBhs/x9FfxedQM/vghr+OLtWrbsOkVON5Z2yQKgPU
+12FHgMA25un/WfcS5WyvnzBHfNaDgXw7wEdNi2dsi7DtIrBYCm2Z04U/3LBzN/3z
+mRdilSqHxgvG7ZWYTyZWayxdszWXIEuU6SRB90jtLjTNsWbe0hBuLQN0sZUNXilD
+AU/eBPz9lMD9bX9BarPi8uVGSLe9GahLNowdncrLOaZDkmyhFgm8q7Ay1xfWJIz4
+mX7HlLIKy8Wi6hcbIQPvq0uscr+6LA==
+=JiwB
 -----END PGP SIGNATURE-----

i2pkeys/common.go

@@ -1,9 +1,11 @@
 package i2pkeys
 
 import (
+	"github.com/eyedeekay/sam3"
 	"github.com/gtank/cryptopasta"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 )
 
 func bytes(k [32]byte) []byte {
@@ -69,3 +71,38 @@ func Decrypt(i2pkeypath, aeskeypath string) error {
 	}
 	return nil
 }
+
+func Save(FilePath, TunName, passfile string, SamKeys *sam3.I2PKeys) error {
+	if _, err := os.Stat(filepath.Join(FilePath, TunName+".i2pkeys")); os.IsNotExist(err) {
+		file, err := os.Create(filepath.Join(FilePath, TunName+".i2pkeys"))
+		if err != nil {
+			return err
+		}
+		err = sam3.StoreKeysIncompat(*SamKeys, file)
+		if err != nil {
+			return err
+		}
+		err = Encrypt(filepath.Join(FilePath, TunName+".i2pkeys"), passfile)
+		if err != nil {
+			return err
+		}
+	}
+	file, err := os.Open(filepath.Join(FilePath, TunName+".i2pkeys"))
+	if err != nil {
+		return err
+	}
+	err = Decrypt(filepath.Join(FilePath, TunName+".i2pkeys"), passfile)
+	if err != nil {
+		return err
+	}
+	tempkeys, err := sam3.LoadKeysIncompat(file)
+	if err != nil {
+		return err
+	}
+	SamKeys = &tempkeys
+	err = Encrypt(filepath.Join(FilePath, TunName+".i2pkeys"), passfile)
+	if err != nil {
+		return err
+	}
+	return nil
+}

serve_test/serve.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"time"
 )
 
 import "github.com/eyedeekay/sam-forwarder"
@@ -18,6 +19,7 @@ var (
 	ucport             = "8103"
 	udpserveraddr      *net.UDPAddr
 	udplocaladdr       *net.UDPAddr
+	udpserverconn      *net.UDPConn
 	directory          = "./www"
 	err                error
 	forwarder          *samforwarder.SAMForwarder
@@ -79,23 +81,23 @@ func echo() {
 		log.Fatal(err)
 	}
 	/* Now listen at selected port */
-	ServerConn, err := net.ListenUDP("udp", udpserveraddr)
+	udpserverconn, err = net.ListenUDP("udp", udpserveraddr)
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer ServerConn.Close()
 
 	buf := make([]byte, 1024)
 
 	for {
-		n, addr, err := ServerConn.ReadFromUDP(buf)
+		n, addr, err := udpserverconn.ReadFromUDP(buf)
 		fmt.Printf("received: %s from: %s\n", string(buf[0:n]), addr)
 
 		if err != nil {
 			fmt.Println("error: ", err)
 		}
 
-		ServerConn.WriteTo(buf[0:n], addr)
+		udpserverconn.WriteTo(buf[0:n], addr)
+		time.Sleep(time.Duration(1 * time.Second))
 	}
 }
 
@@ -112,10 +114,10 @@ func serveudp() {
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	go forwarder.Serve()
+	go ssuforwarder.Serve()
 
 	log.Printf("Serving %s on UDP port: %s %s\n", uport, "and on",
-		forwarder.Base32())
+		ssuforwarder.Base32())
 	log.Fatal(http.ListenAndServe("127.0.0.1:"+uport, nil))
 }
 
@@ -135,5 +137,5 @@ func clientudp() {
 	}
 	log.Printf("Connecting %s UDP port: %s %s\n", ucport, "to",
 		forwarder.Base32())
-	go forwarderclient.Serve()
+	go ssuforwarderclient.Serve()
 }

serve_test/serve_test.go

@@ -23,14 +23,18 @@ func TestTCP(t *testing.T) {
 func TestUDP(t *testing.T) {
 	go echo()
 	time.Sleep(time.Duration(60 * time.Second))
+	defer udpserverconn.Close()
 	go serveudp()
 	time.Sleep(time.Duration(60 * time.Second))
 	go clientudp()
 	time.Sleep(time.Duration(60 * time.Second))
-	//conn, err := net.DialUDP("udp", udpserveraddr, "127.0.0.1:"+uport)
-	_, err := net.DialUDP("udp", udpserveraddr, udplocaladdr)
+	conn, err := net.DialUDP("udp", udpserveraddr, udplocaladdr)
+	defer conn.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
-	//log.Println(resp)
+	_, err = conn.Write([]byte("Hello SSU"))
+	if err != nil {
+		t.Fatal("SSU error", err)
+	}
 }

udp/forwarder-udp.go

@@ -237,8 +237,7 @@ func (f *SAMSSUForwarder) Serve() error {
 	log.Printf("Connected to localhost %v\n", f.publishConnection)
 
 	for {
-		log.Printf("Accepted connection %v\n", f.publishConnection)
-		go f.forward()
+		f.forward()
 	}
 }