From cfaa1796d63e1b6b9986ab93949d8dfff38e5887 Mon Sep 17 00:00:00 2001
From: Daniel Czerwonk <daniel@dan-nrw.de>
Date: Thu, 31 May 2018 21:52:12 +0200
Subject: [PATCH] fixed merge markers
---
protocols/bgp/packet/path_attributes.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/protocols/bgp/packet/path_attributes.go b/protocols/bgp/packet/path_attributes.go
index db23ea94..52fad7ed 100644
--- a/protocols/bgp/packet/path_attributes.go
+++ b/protocols/bgp/packet/path_attributes.go
@@ -252,10 +252,10 @@ func (pa *PathAttribute) decodeCommunities(buf *bytes.Buffer) error {
coms := make([]uint32, count)
for i := uint16(0); i < count; i++ {
- v, err = read4BytesAsUin32(buf)
-+ if err != nil {
-+ return err
-+ }
+ v, err := read4BytesAsUin32(buf)
+ if err != nil {
+ return err
+ }
coms[i] = v
}
--
GitLab