From c3f2150b5b67d2964975bdcb8507cb2065faf730 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 11 Jan 2016 00:03:37 +0000
Subject: [PATCH] cosmetic: whitespace

---
 router/sleeve.go | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/router/sleeve.go b/router/sleeve.go
index 529d47be..110d4bac 100644
--- a/router/sleeve.go
+++ b/router/sleeve.go
@@ -428,7 +428,6 @@ func (fwd *sleeveForwarder) logPrefix() string {
 
 func (fwd *sleeveForwarder) Confirm() {
 	log.Debug(fwd.logPrefix(), "Confirm")
-
 	select {
 	case fwd.confirmedChan <- struct{}{}:
 	case <-fwd.finishedChan:
@@ -688,8 +687,7 @@ loop:
 	fwd.errorChan <- err
 }
 
-func (fwd *sleeveForwarder) aggregateAndSend(frame aggregatorFrame,
-	aggChan <-chan aggregatorFrame, enc Encryptor, sender udpSender, limit int) error {
+func (fwd *sleeveForwarder) aggregateAndSend(frame aggregatorFrame, aggChan <-chan aggregatorFrame, enc Encryptor, sender udpSender, limit int) error {
 	// Give up after processing N frames, to avoid starving the
 	// other activities of the forwarder goroutine.
 	i := 0
@@ -889,15 +887,13 @@ func (fwd *sleeveForwarder) handleHeartbeatAck() error {
 	// Send a large frame down the DF channel.  An EMSGSIZE will
 	// result, which is handled in processSendError, prompting
 	// PMTU discovery to start.
-	return fwd.sendSpecial(fwd.crypto.EncDF, fwd.senderDF,
-		make([]byte, PMTUDiscoverySize))
+	return fwd.sendSpecial(fwd.crypto.EncDF, fwd.senderDF, make([]byte, PMTUDiscoverySize))
 }
 
 func (fwd *sleeveForwarder) sendFragTest() error {
 	log.Debug(fwd.logPrefix(), "sendFragTest")
 	fwd.stackFrag = false
-	return fwd.sendSpecial(fwd.crypto.Enc, fwd.sleeve,
-		make([]byte, FragTestSize))
+	return fwd.sendSpecial(fwd.crypto.Enc, fwd.sleeve, make([]byte, FragTestSize))
 }
 
 func (fwd *sleeveForwarder) handleFragTest(frame []byte) error {
@@ -934,16 +930,14 @@ func (fwd *sleeveForwarder) processSendError(err error) error {
 }
 
 func (fwd *sleeveForwarder) sendMTUTest() error {
-	log.Debug(fwd.logPrefix(),
-		"sendMTUTest: mtu candidate ", fwd.mtuCandidate)
-	err := fwd.sendSpecial(fwd.crypto.EncDF, fwd.senderDF,
-		make([]byte, fwd.mtuCandidate+EthernetOverhead))
+	log.Debug(fwd.logPrefix(), "sendMTUTest: mtu candidate ", fwd.mtuCandidate)
+
+	err := fwd.sendSpecial(fwd.crypto.EncDF, fwd.senderDF, make([]byte, fwd.mtuCandidate+EthernetOverhead))
 	if err != nil {
 		return err
 	}
 
-	fwd.mtuTestTimeout = setTimer(fwd.mtuTestTimeout,
-		MTUVerifyTimeout<<fwd.mtuTestsSent)
+	fwd.mtuTestTimeout = setTimer(fwd.mtuTestTimeout, MTUVerifyTimeout<<fwd.mtuTestsSent)
 	fwd.mtuTestsSent++
 	return nil
 }
@@ -961,8 +955,7 @@ func (fwd *sleeveForwarder) handleMTUTestAck(msg []byte) error {
 	}
 
 	mtu := int(binary.BigEndian.Uint16(msg))
-	log.Debug(fwd.logPrefix(),
-		"handleMTUTestAck: for mtu candidate ", mtu)
+	log.Debug(fwd.logPrefix(), "handleMTUTestAck: for mtu candidate ", mtu)
 	if mtu != fwd.mtuCandidate {
 		return nil
 	}
@@ -982,8 +975,8 @@ func (fwd *sleeveForwarder) handleMTUTestFailure() error {
 }
 
 func (fwd *sleeveForwarder) searchMTU() error {
-	log.Debug(fwd.logPrefix(), "searchMTU: ", fwd.mtuHighestGood,
-		fwd.mtuLowestBad)
+	log.Debug(fwd.logPrefix(), "searchMTU: ", fwd.mtuHighestGood, fwd.mtuLowestBad)
+
 	if fwd.mtuHighestGood+1 >= fwd.mtuLowestBad {
 		mtu := fwd.mtuHighestGood
 		log.Print(fwd.logPrefix(), "Effective MTU verified at ", mtu)
@@ -1051,8 +1044,7 @@ func (sender *udpSenderDF) dial() error {
 	defer f.Close()
 
 	// This makes sure all packets we send out have DF set on them.
-	err = syscall.SetsockoptInt(int(f.Fd()), syscall.IPPROTO_IP,
-		syscall.IP_MTU_DISCOVER, syscall.IP_PMTUDISC_DO)
+	err = syscall.SetsockoptInt(int(f.Fd()), syscall.IPPROTO_IP, syscall.IP_MTU_DISCOVER, syscall.IP_PMTUDISC_DO)
 	if err != nil {
 		return err
 	}
@@ -1072,8 +1064,7 @@ func (sender *udpSenderDF) send(msg []byte, raddr *net.UDPAddr) error {
 
 	sender.udpHeader.DstPort = layers.UDPPort(raddr.Port)
 	payload := gopacket.Payload(msg)
-	err := gopacket.SerializeLayers(sender.ipBuf, sender.opts,
-		sender.udpHeader, &payload)
+	err := gopacket.SerializeLayers(sender.ipBuf, sender.opts, sender.udpHeader, &payload)
 	if err != nil {
 		return err
 	}
@@ -1090,10 +1081,8 @@ func (sender *udpSenderDF) send(msg []byte, raddr *net.UDPAddr) error {
 	}
 	defer f.Close()
 
-	log.Print("EMSGSIZE on send, expecting PMTU update (IP packet was ",
-		len(packet), " bytes, payload was ", len(msg), " bytes)")
-	pmtu, err := syscall.GetsockoptInt(int(f.Fd()), syscall.IPPROTO_IP,
-		syscall.IP_MTU)
+	log.Print("EMSGSIZE on send, expecting PMTU update (IP packet was ", len(packet), " bytes, payload was ", len(msg), " bytes)")
+	pmtu, err := syscall.GetsockoptInt(int(f.Fd()), syscall.IPPROTO_IP, syscall.IP_MTU)
 	if err != nil {
 		return err
 	}