X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fpeer.go;fp=src%2Fcypherpunks.ru%2Fgovpn%2Fpeer.go;h=e914cd69f5216903a718a5aaa2ea92bcab1dcd5e;hb=c4ce2306df402e03b7fd0f2f10e07cf21b2babc2;hp=b466161be989b38e0a7c1fce89211c87529e56dc;hpb=012173bd090f87e8dffbc124f41425eef8a9a7f8;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index b466161..e914cd6 100644
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -294,14 +294,17 @@ func newPeer(isClient bool, addr string, conn io.Writer, conf *PeerConf, key *[S
 func (p *Peer) EthProcess(data []byte) error {
 	const paddingSize = 1
 	if len(data) > p.MTU-paddingSize {
-		logger.WithFields(p.LogFields()).WithFields(
+		logger.WithFields(
+			p.LogFields(),
+		).WithFields(
 			p.ConfigurationLogFields(),
 		).WithFields(
 			logrus.Fields{
 				"func":        logFuncPrefix + "Peer.EthProcess",
 				"padding":     paddingSize,
 				"packet_size": len(data),
-			}).Warning("Ignore padded data packet larger than MTU")
+			},
+		).Warning("Ignore padded data packet larger than MTU")
 		return nil
 	}
 	p.BusyT.Lock()
@@ -362,8 +365,13 @@ func (p *Peer) PktProcess(data []byte, tap io.Writer, reorderable bool) bool {
 		"data":        len(data),
 	}
 	if len(data) < MinPktLength {
-		logger.WithFields(p.LogFields()).WithFields(fields).WithField(
-			"minimum_packet_Length", MinPktLength,
+		logger.WithFields(
+			p.LogFields(),
+		).WithFields(
+			fields,
+		).WithField(
+			"minimum_packet_Length",
+			MinPktLength,
 		).Debug("Ignore packet smaller than allowed minimum")
 		return false
 	}
@@ -377,7 +385,9 @@ func (p *Peer) PktProcess(data []byte, tap io.Writer, reorderable bool) bool {
 		var err error
 		out, err = EnclessDecode(p.key, p.nonceR, data[:len(data)-NonceSize])
 		if err != nil {
-			logger.WithFields(p.LogFields()).WithError(err).Debug("Failed to decode encless")
+			logger.WithFields(
+				p.LogFields(),
+			).WithError(err).Debug("Failed to decode encless")
 			p.FramesUnauth++
 			p.BusyR.Unlock()
 			return false
@@ -504,7 +514,9 @@ func PeerTapProcessor(peer *Peer, tap *TAP, terminator chan struct{}) {
 				}
 			case data = <-tap.Sink:
 				if err = peer.EthProcess(data); err != nil {
-					logger.WithFields(fields).WithFields(
+					logger.WithFields(
+						fields,
+					).WithFields(
 						peer.LogFields(),
 					).WithError(err).Warn("Can't process ethernet packet")
 				}
@@ -520,7 +532,9 @@ func PeerTapProcessor(peer *Peer, tap *TAP, terminator chan struct{}) {
 				break CPRProcessor
 			case data = <-tap.Sink:
 				if err = peer.EthProcess(data); err != nil {
-					logger.WithFields(fields).WithFields(
+					logger.WithFields(
+						fields,
+					).WithFields(
 						peer.LogFields(),
 					).WithError(err).Warn("Can't process ethernet packet")
 				}
@@ -528,7 +542,9 @@ func PeerTapProcessor(peer *Peer, tap *TAP, terminator chan struct{}) {
 			}
 			if data == nil {
 				if err = peer.EthProcess(nil); err != nil {
-					logger.WithFields(fields).WithFields(
+					logger.WithFields(
+						fields,
+					).WithFields(
 						peer.LogFields(),
 					).WithError(err).Warn("Can't process nil ethernet packet")
 				}