From 398b795c87387d25c889a3bf700b387cd120520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 21 Mar 2015 21:48:36 +0100 Subject: Simplify some err and return logic --- transports/obfs4/packet.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'transports/obfs4/packet.go') diff --git a/transports/obfs4/packet.go b/transports/obfs4/packet.go index 9865c82..461ad54 100644 --- a/transports/obfs4/packet.go +++ b/transports/obfs4/packet.go @@ -69,7 +69,7 @@ func (e InvalidPayloadLengthError) Error() string { var zeroPadBytes [maxPacketPaddingLength]byte -func (conn *obfs4Conn) makePacket(w io.Writer, pktType uint8, data []byte, padLen uint16) (err error) { +func (conn *obfs4Conn) makePacket(w io.Writer, pktType uint8, data []byte, padLen uint16) error { var pkt [framing.MaximumFramePayloadLength]byte if len(data)+int(padLen) > maxPacketPayloadLength { @@ -93,22 +93,19 @@ func (conn *obfs4Conn) makePacket(w io.Writer, pktType uint8, data []byte, padLe // Encode the packet in an AEAD frame. var frame [framing.MaximumSegmentLength]byte - frameLen := 0 - frameLen, err = conn.encoder.Encode(frame[:], pkt[:pktLen]) + frameLen, err := conn.encoder.Encode(frame[:], pkt[:pktLen]) if err != nil { // All encoder errors are fatal. - return + return err } - var wrLen int - wrLen, err = w.Write(frame[:frameLen]) + wrLen, err := w.Write(frame[:frameLen]) if err != nil { - return + return err } else if wrLen < frameLen { - err = io.ErrShortWrite - return + return io.ErrShortWrite } - return + return nil } func (conn *obfs4Conn) readPackets() (err error) { -- cgit v1.2.3