Merge branch 'develop'

[nncp.git] / src / sp.go

diff --git a/src/sp.go b/src/sp.go
index 66fa0375797d2d53fb1cacea0d6143bcf7b0096e..3de629b59b5108b9c2d49bae226f9041cb8ccbe9 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -438,7 +438,7 @@ func (state *SPState) StartI(conn ConnDeadlined) error {
                        NicenessFmt(state.Nice),
                )
        })
-       conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104
+       conn.SetWriteDeadline(time.Now().Add(DefaultDeadline))
        if err = state.WriteSP(conn, buf, false); err != nil {
                state.Ctx.LogE("sp-startI", les, err, func(les LEs) string {
                        return fmt.Sprintf(
@@ -457,7 +457,7 @@ func (state *SPState) StartI(conn ConnDeadlined) error {
                        NicenessFmt(state.Nice),
                )
        })
-       conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104
+       conn.SetReadDeadline(time.Now().Add(DefaultDeadline))
        if buf, err = state.ReadSP(conn); err != nil {
                state.Ctx.LogE("sp-startI-read", les, err, func(les LEs) string {
                        return fmt.Sprintf(
@@ -537,7 +537,7 @@ func (state *SPState) StartR(conn ConnDeadlined) error {
        }
        les := LEs{{"Nice", int(state.Nice)}}
        state.Ctx.LogD("sp-startR", les, logMsg)
-       conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104
+       conn.SetReadDeadline(time.Now().Add(DefaultDeadline))
        if buf, err = state.ReadSP(conn); err != nil {
                state.Ctx.LogE("sp-startR-read", les, err, logMsg)
                return err
@@ -549,6 +549,9 @@ func (state *SPState) StartR(conn ConnDeadlined) error {
 
        var node *Node
        for _, n := range state.Ctx.Neigh {
+               if n.NoisePub == nil {
+                       continue
+               }
                if subtle.ConstantTimeCompare(state.hs.PeerStatic(), n.NoisePub[:]) == 1 {
                        node = n
                        break
@@ -611,7 +614,7 @@ func (state *SPState) StartR(conn ConnDeadlined) error {
                state.dirUnlock()
                return err
        }
-       conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104
+       conn.SetWriteDeadline(time.Now().Add(DefaultDeadline))
        if err = state.WriteSP(conn, buf, false); err != nil {
                state.Ctx.LogE("sp-startR-write", les, err, func(les LEs) string {
                        return fmt.Sprintf(
@@ -752,7 +755,7 @@ func (state *SPState) StartWorkers(
                                break
                        Deadlined:
                                state.SetDead()
-                               conn.Close() // #nosec G104
+                               conn.Close()
                        case now := <-pingTicker.C:
                                if now.After(state.TxLastSeen.Add(PingTimeout)) {
                                        state.wg.Add(1)
@@ -986,7 +989,7 @@ func (state *SPState) StartWorkers(
                                )
                        }
                        state.Ctx.LogD("sp-sending", append(les, LE{"Size", int64(len(payload))}), logMsg)
-                       conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104
+                       conn.SetWriteDeadline(time.Now().Add(DefaultDeadline))
                        ct, err := state.csOur.Encrypt(nil, nil, payload)
                        if err != nil {
                                state.Ctx.LogE("sp-encrypting", les, err, logMsg)
@@ -1013,7 +1016,7 @@ func (state *SPState) StartWorkers(
                                )
                        }
                        state.Ctx.LogD("sp-recv-wait", les, logMsg)
-                       conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104
+                       conn.SetReadDeadline(time.Now().Add(DefaultDeadline))
                        payload, err := state.ReadSP(conn)
                        if err != nil {
                                if err == io.EOF {
@@ -1087,7 +1090,7 @@ func (state *SPState) StartWorkers(
                state.SetDead()
                state.wg.Done()
                state.SetDead()
-               conn.Close() // #nosec G104
+               conn.Close()
        }()
 
        return nil