Little log messages refactoring

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

diff --git a/src/govpn/cmd/govpn-client/main.go b/src/govpn/cmd/govpn-client/main.go
index d88bb46028c26643713e7a1cc09aa368d562e355..f85908145f4a74637df75d22834bc0d82ae9442a 100644 (file)
--- a/src/govpn/cmd/govpn-client/main.go
+++ b/src/govpn/cmd/govpn-client/main.go
@@ -121,7 +121,7 @@ MainCycle:
                }
                select {
                case <-termSignal:
-                       log.Fatalln("Finishing...")
+                       log.Fatalln("Finishing")
                        termination <- struct{}{}
                        break MainCycle
                case <-timeouted:

diff --git a/src/govpn/cmd/govpn-client/proxy.go b/src/govpn/cmd/govpn-client/proxy.go
index a0a9a5459739bb9cfdc44607e1f41f46e482fc86..bde828e289f2e77c1b0d5d36ffc85422754bfda4 100644 (file)
--- a/src/govpn/cmd/govpn-client/proxy.go
+++ b/src/govpn/cmd/govpn-client/proxy.go
@@ -50,5 +50,6 @@ func proxyTCP(timeouted, rehandshaking, termination chan struct{}) {
        if err != nil || resp.StatusCode != http.StatusOK {
                log.Fatalln("Unexpected response from proxy")
        }
+       log.Println("Connected to proxy:", *proxyAddr)
        go handleTCP(conn, timeouted, rehandshaking, termination)
 }

diff --git a/src/govpn/cmd/govpn-client/tcp.go b/src/govpn/cmd/govpn-client/tcp.go
index 511955c4400a8a48d8e337e45a9b7b57b2d8443a..9a1794a59d6c30f0cb4e586a8d3a342b67c3f356 100644 (file)
--- a/src/govpn/cmd/govpn-client/tcp.go
+++ b/src/govpn/cmd/govpn-client/tcp.go
@@ -36,8 +36,9 @@ func startTCP(timeouted, rehandshaking, termination chan struct{}) {
        }
        conn, err := net.DialTCP("tcp", nil, remote)
        if err != nil {
-               log.Fatalln("Can not connect to remote address:", err)
+               log.Fatalln("Can not connect to address:", err)
        }
+       log.Println("Connected to TCP:" + *remoteAddr)
        handleTCP(conn, timeouted, rehandshaking, termination)
 }
 
@@ -57,13 +58,16 @@ HandshakeCycle:
                default:
                }
                if prev == govpn.MTU {
+                       log.Println("Timeouted waiting for the packet")
+                       timeouted <- struct{}{}
                        break HandshakeCycle
                }
 
                conn.SetReadDeadline(time.Now().Add(time.Duration(timeout) * time.Second))
                n, err = conn.Read(buf[prev:])
                if err != nil {
-                       // Either EOFed or timeouted
+                       log.Println("Connection timeouted")
+                       timeouted <- struct{}{}
                        break HandshakeCycle
                }
 
@@ -124,13 +128,14 @@ TransportCycle:
                default:
                }
                if prev == govpn.MTU {
+                       log.Println("Timeouted waiting for the packet")
                        timeouted <- struct{}{}
                        break TransportCycle
                }
                conn.SetReadDeadline(time.Now().Add(time.Duration(timeout) * time.Second))
                n, err = conn.Read(buf[prev:])
                if err != nil {
-                       // Either EOFed or timeouted
+                       log.Println("Connection timeouted")
                        timeouted <- struct{}{}
                        break TransportCycle
                }
@@ -144,6 +149,7 @@ TransportCycle:
                        continue
                }
                if !peer.PktProcess(buf[:i+govpn.NonceSize], tap, false) {
+                       log.Println("Unauthenticated packet, dropping connection")
                        timeouted <- struct{}{}
                        break TransportCycle
                }

diff --git a/src/govpn/cmd/govpn-client/udp.go b/src/govpn/cmd/govpn-client/udp.go
index 0df7ab13a4b2c23f2b223932f24dc4a74a49af41..b4398f327a0b69931fa87350e34be004b97a7719 100644 (file)
--- a/src/govpn/cmd/govpn-client/udp.go
+++ b/src/govpn/cmd/govpn-client/udp.go
@@ -36,6 +36,7 @@ func startUDP(timeouted, rehandshaking, termination chan struct{}) {
        if err != nil {
                log.Fatalln("Can not listen on UDP:", err)
        }
+       log.Println("Connected to UDP:" + *remoteAddr)
 
        hs := govpn.HandshakeStart(*remoteAddr, conn, conf)
        buf := make([]byte, govpn.MTU)
@@ -66,6 +67,7 @@ MainCycle:
                        if peer.PktProcess(buf[:n], tap, true) {
                                timeouts = 0
                        } else {
+                               log.Println("Unauthenticated packet")
                                timeouts++
                        }
                        if atomic.LoadInt64(&peer.BytesIn)+atomic.LoadInt64(&peer.BytesOut) > govpn.MaxBytesPerKey {

diff --git a/src/govpn/cmd/govpn-server/proxy.go b/src/govpn/cmd/govpn-server/proxy.go
index c05a3604887492cfb28405cad3c64b0ec355efd7..1a9f81461e66526cfadd5d36c47fa979fe1c3c57 100644 (file)
--- a/src/govpn/cmd/govpn-server/proxy.go
+++ b/src/govpn/cmd/govpn-server/proxy.go
@@ -36,7 +36,7 @@ func (p proxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func proxyStart() {
-       log.Println("HTTP proxy listening on:", *proxy)
+       log.Println("HTTP proxy listening on:" + *proxy)
        s := &http.Server{
                Addr:    *proxy,
                Handler: proxyHandler{},

diff --git a/src/govpn/cmd/govpn-server/tcp.go b/src/govpn/cmd/govpn-server/tcp.go
index d8deaa19b2a4eb6ffda801807ce26db82b56d6ce..6dd3a010437e3ca2632eea60f519475bd2c0e3bd 100644 (file)
--- a/src/govpn/cmd/govpn-server/tcp.go
+++ b/src/govpn/cmd/govpn-server/tcp.go
@@ -37,7 +37,7 @@ func startTCP() {
        if err != nil {
                log.Fatalln("Can not listen on TCP:", err)
        }
-       log.Println("Listening on TCP", *bindAddr)
+       log.Println("Listening on TCP:" + *bindAddr)
        go func() {
                for {
                        conn, err := listener.AcceptTCP()
@@ -90,6 +90,7 @@ func handleTCP(conn net.Conn) {
                        continue
                }
                hs.Zero()
+               log.Println("Peer handshake finished:", addr, peer.Id.String())
                peersByIdLock.RLock()
                addrPrev, exists := peersById[*peer.Id]
                peersByIdLock.RUnlock()
@@ -116,7 +117,7 @@ func handleTCP(conn net.Conn) {
                        peersByIdLock.Unlock()
                        kpLock.Unlock()
                        go peerReady(*ps)
-                       log.Println("Rehandshake finished:", peer.Id.String())
+                       log.Println("Rehandshake processed:", peer.Id.String())
                } else {
                        ifaceName, err := callUp(peer.Id)
                        if err != nil {
@@ -142,7 +143,7 @@ func handleTCP(conn net.Conn) {
                        peersLock.Unlock()
                        peersByIdLock.Unlock()
                        kpLock.Unlock()
-                       log.Println("New peer:", peer.Id.String())
+                       log.Println("Peer created:", peer.Id.String())
                }
                break
        }
@@ -178,6 +179,10 @@ func handleTCP(conn net.Conn) {
                        continue
                }
                if !peer.PktProcess(buf[:i+govpn.NonceSize], tap, false) {
+                       log.Println(
+                               "Unauthenticated packet, dropping connection",
+                               addr, peer.Id.String(),
+                       )
                        break
                }
                binary.BigEndian.PutUint64(nonceExpectation, peer.NonceExpect)

diff --git a/src/govpn/cmd/govpn-server/udp.go b/src/govpn/cmd/govpn-server/udp.go
index 4a57d87aa7d2098ba4bb8327f85bb6d9654a5568..2c6a0f3b4fb2e8b011c2816e5a8530a1bab41ce6 100644 (file)
--- a/src/govpn/cmd/govpn-server/udp.go
+++ b/src/govpn/cmd/govpn-server/udp.go
@@ -48,7 +48,8 @@ func startUDP() {
        if err != nil {
                log.Fatalln("Can not listen on UDP:", err)
        }
-       log.Println("Listening on UDP", *bindAddr)
+       log.Println("Listening on UDP:" + *bindAddr)
+
        udpBufs <- make([]byte, govpn.MTU)
        go func() {
                var buf []byte
@@ -65,9 +66,9 @@ func startUDP() {
                var conf *govpn.PeerConf
                for {
                        buf = <-udpBufs
-
                        n, raddr, err = conn.ReadFromUDP(buf)
                        if err != nil {
+                               log.Println("Unexpected error when receiving", err)
                                break
                        }
                        addr = raddr.String()
@@ -95,7 +96,7 @@ func startUDP() {
                                goto Finished
                        }
 
-                       log.Println("Peer handshake finished:", addr)
+                       log.Println("Peer handshake finished:", addr, peer.Id.String())
                        hs.Zero()
                        hsLock.Lock()
                        delete(handshakes, addr)
@@ -134,7 +135,7 @@ func startUDP() {
                                        <-udpBufs
                                        <-udpBufs
                                }(*ps)
-                               log.Println("Rehandshake finished:", peer.Id.String())
+                               log.Println("Rehandshake processed:", peer.Id.String())
                        } else {
                                go func(addr string, peer *govpn.Peer) {
                                        ifaceName, err := callUp(peer.Id)
@@ -165,7 +166,7 @@ func startUDP() {
                                        peersLock.Unlock()
                                        peersByIdLock.Unlock()
                                        kpLock.Unlock()
-                                       log.Println("New peer:", peer.Id.String())
+                                       log.Println("Peer created:", peer.Id.String())
                                }(addr, peer)
                        }
                        goto Finished
@@ -177,7 +178,7 @@ func startUDP() {
                        }
                        conf = peerId.Conf()
                        if conf == nil {
-                               log.Println("Can not get peer configuration:", peerId.String())
+                               log.Println("Unable to get peer configuration:", peerId.String())
                                goto Finished
                        }
                        hs = govpn.NewHandshake(