Convenient time.Since()

[nncp.git] / src / sp.go

diff --git a/src/sp.go b/src/sp.go
index 29fbf9b5f2945d70c725f888babbb4b023d2eb6f..3bef9c3cf63105d68ee5d9d14ab16bee1e048134 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -287,21 +287,22 @@ func (state *SPState) dirUnlock() {
 
 func (state *SPState) WriteSP(dst io.Writer, payload []byte, ping bool) error {
        state.writeSPBuf.Reset()
-       n, err := xdr.Marshal(&state.writeSPBuf, SPRaw{
+       if _, err := xdr.Marshal(&state.writeSPBuf, SPRaw{
                Magic:   MagicNNCPSv1.B,
                Payload: payload,
-       })
+       }); err != nil {
+               return err
+       }
+       n, err := dst.Write(state.writeSPBuf.Bytes())
        if err != nil {
                return err
        }
-       if n, err = dst.Write(state.writeSPBuf.Bytes()); err == nil {
-               state.TxLastSeen = time.Now()
-               state.TxBytes += int64(n)
-               if !ping {
-                       state.TxLastNonPing = state.TxLastSeen
-               }
+       state.TxLastSeen = time.Now()
+       state.TxBytes += int64(n)
+       if !ping {
+               state.TxLastNonPing = state.TxLastSeen
        }
-       return err
+       return nil
 }
 
 func (state *SPState) ReadSP(src io.Reader) ([]byte, error) {
@@ -1118,7 +1119,7 @@ func (state *SPState) Wait() bool {
        state.wg.Wait()
        close(state.payloads)
        close(state.pings)
-       state.Duration = time.Now().Sub(state.started)
+       state.Duration = time.Since(state.started)
        state.dirUnlock()
        state.RxSpeed = state.RxBytes
        state.TxSpeed = state.TxBytes