commit a460e29a21924f4f93efc28f3ecbf669510c446a
author Pavlin Radoslavov <pavlin@onlab.us> Tue Mar 17 18:04:56 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 18 01:11:59 2015 +0000
tree 6f7a0e49f56e9d749affc5593985bf17204cc670
parent f2114997a37d8890907b1cbcec20a67afc65d5f5

Fix the decoding opf BGP AGGREGATOR Attribute when 4 octets AS is enabled
This fixes ONOS-1318

Change-Id: I5681b574c46626e4092439e28d28831499e9562b

apps/routing/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java

diff --git a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java
index e9abd9c..d05e9ac 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java
@@ -758,9 +758,9 @@
             // 4-octet AS number handling.
             int asPathLen;
             if (bgpSession.isAs4OctetCapable()) {
-                asPathLen = BgpConstants.Update.AsPath.AS_4OCTET_LENGTH;
+                asPathLen = BgpConstants.Update.AS_4OCTET_LENGTH;
             } else {
-                asPathLen = BgpConstants.Update.AsPath.AS_LENGTH;
+                asPathLen = BgpConstants.Update.AS_LENGTH;
             }
 
             // Parse the AS numbers
@@ -774,7 +774,7 @@
             ArrayList<Long> segmentAsNumbers = new ArrayList<>();
             while (pathSegmentLength-- > 0) {
                 long asNumber;
-                if (asPathLen == BgpConstants.Update.AsPath.AS_4OCTET_LENGTH) {
+                if (asPathLen == BgpConstants.Update.AS_4OCTET_LENGTH) {
                     asNumber = message.readUnsignedInt();
                 } else {
                     asNumber = message.readUnsignedShort();
@@ -967,9 +967,16 @@
                                                 int attrFlags,
                                                 ChannelBuffer message)
         throws BgpMessage.BgpParseException {
+        int expectedAttrLen;
+
+        if (bgpSession.isAs4OctetCapable()) {
+            expectedAttrLen = BgpConstants.Update.Aggregator.AS4_LENGTH;
+        } else {
+            expectedAttrLen = BgpConstants.Update.Aggregator.AS2_LENGTH;
+        }
 
         // Check the Attribute Length
-        if (attrLen != BgpConstants.Update.Aggregator.LENGTH) {
+        if (attrLen != expectedAttrLen) {
             // ERROR: Attribute Length Error
             actionsBgpUpdateAttributeLengthError(
                 bgpSession, ctx, attrTypeCode, attrLen, attrFlags, message);
@@ -978,7 +985,12 @@
         }
 
         // The AGGREGATOR AS number
-        long aggregatorAsNumber = message.readUnsignedShort();
+        long aggregatorAsNumber;
+        if (bgpSession.isAs4OctetCapable()) {
+            aggregatorAsNumber = message.readUnsignedInt();
+        } else {
+            aggregatorAsNumber = message.readUnsignedShort();
+        }
         // The AGGREGATOR IP address
         Ip4Address aggregatorIpAddress =
             Ip4Address.valueOf((int) message.readUnsignedInt());