From 8e8c0bf203868d238a38f20f01d53cf4d186b2eb Mon Sep 17 00:00:00 2001
From: VictorUceda <victoruceda2@gmail.com>
Date: Wed, 18 May 2016 12:47:23 +0200
Subject: [PATCH 01/18] implemented draft draft-ietf-pce-pce-initiated-lsp-05

---
 src/main/java/es/tid/pce/pcep/objects/LSP.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/es/tid/pce/pcep/objects/LSP.java b/src/main/java/es/tid/pce/pcep/objects/LSP.java
index e1f5a77c..f810d8bc 100644
--- a/src/main/java/es/tid/pce/pcep/objects/LSP.java
+++ b/src/main/java/es/tid/pce/pcep/objects/LSP.java
@@ -136,6 +136,8 @@ public class LSP extends PCEPObject{
 	
 	protected int opFlags;
 	
+	protected boolean cFlag;
+	
 	private int LSP_sig_type;
 	
 	
@@ -197,7 +199,8 @@ public void encode()
 		
 		offset += 3;
 		
-		ByteHandler.IntToBuffer (1, offset*8, 3, opFlags, this.object_bytes);
+		ByteHandler.BoolToBuffer(0 + offset*8, cFlag,object_bytes);
+		ByteHandler.IntToBuffer (0, 1 + offset*8, 3, opFlags, this.object_bytes);//ByteHandler.IntToBuffer (1, offset*8, 3, opFlags, this.object_bytes);
 		ByteHandler.BoolToBuffer(4 + offset*8, aFlag,object_bytes);
 		ByteHandler.BoolToBuffer(5 + offset*8, rFlag,object_bytes);
 		ByteHandler.BoolToBuffer(6 + offset*8, sFlag,object_bytes);
@@ -246,7 +249,8 @@ public void decode() throws MalformedPCEPObjectException {
 		}
 		
 		lspId = ByteHandler.easyCopy(0,19,object_bytes[4],object_bytes[5],object_bytes[6]);
-				
+		
+		cFlag = (ByteHandler.easyCopy(0,0,object_bytes[7]) == 1) ? true : false ;
 		opFlags = ByteHandler.easyCopy(1,3,object_bytes[7]);
 		aFlag = (ByteHandler.easyCopy(4,4,object_bytes[7]) == 1) ? true : false ;
 		rFlag = (ByteHandler.easyCopy(5,5,object_bytes[7]) == 1) ? true : false ;
@@ -357,6 +361,14 @@ public void setLspId(int lspId)
 	{
 		this.lspId = lspId;
 	}
+	public boolean iscFlag() 
+	{
+		return cFlag;
+	}
+	public void setCFlag(boolean cFlag) 
+	{
+		this.cFlag = cFlag;
+	}
 	public boolean isdFlag() 
 	{
 		return dFlag;

From 2b1893c440d1132ced231d5b20787960bdff70e6 Mon Sep 17 00:00:00 2001
From: VictorUceda <victoruceda2@gmail.com>
Date: Wed, 18 May 2016 12:48:00 +0200
Subject: [PATCH 02/18] implemented draft draft-ietf-pce-pce-initiated-lsp-05

---
 src/main/java/es/tid/pce/pcep/objects/LSP.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/es/tid/pce/pcep/objects/LSP.java b/src/main/java/es/tid/pce/pcep/objects/LSP.java
index f810d8bc..f37bef35 100644
--- a/src/main/java/es/tid/pce/pcep/objects/LSP.java
+++ b/src/main/java/es/tid/pce/pcep/objects/LSP.java
@@ -17,7 +17,7 @@
  * 
  * http://tools.ietf.org/html/draft-ietf-pce-stateful-pce-9
  * 
- * 
+ * Modified: https://tools.ietf.org/html/draft-ietf-pce-pce-initiated-lsp-05#page-13
 7.3. LSP Object
 
 The LSP object MUST be present within PCRpt and PCUpd messages.  The
@@ -39,7 +39,7 @@
       0                   1                   2                   3
       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |                PLSP-ID                |    Flag |    O|A|R|S|D|
+     |                PLSP-ID                |Flags  |C|    O|A|R|S|D|
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      //                        TLVs                                 //
      |                                                               |
@@ -111,6 +111,14 @@
       4 - GOING-UP:  LSP is being signalled.
 
       5-7 - Reserved:  these values are reserved for future use.
+      
+   c (Create - 1 bit): A new flag, the Create (C) flag is introduced.  On a PCRpt message,
+   the C Flag set to 1 indicates that this LSP was created via a
+   PCInitiate message.  The C Flag MUST be set to 1 on each PCRpt
+   message for the duration of existence of the LSP.  The Create flag
+   allows PCEs to be aware of which LSPs were PCE-initiated (a state
+   that would otherwise only be known by the PCC and the PCE that
+   initiated them).
 
    Unassigned bits are considered reserved.  They MUST be set to 0 on
    transmission and MUST be ignored on receipt.

From 98fb33637432d6af417b9211e89aaf1e51bead1c Mon Sep 17 00:00:00 2001
From: VictorUceda <victoruceda2@gmail.com>
Date: Wed, 18 May 2016 13:43:53 +0200
Subject: [PATCH 03/18] fix bug with intToBuffer and comment not used field
 (LSP_sig_type) in order to prevent fail in automatic test

---
 .../java/es/tid/pce/pcep/objects/LSP.java     | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/es/tid/pce/pcep/objects/LSP.java b/src/main/java/es/tid/pce/pcep/objects/LSP.java
index f37bef35..c9b81b35 100644
--- a/src/main/java/es/tid/pce/pcep/objects/LSP.java
+++ b/src/main/java/es/tid/pce/pcep/objects/LSP.java
@@ -146,7 +146,7 @@ public class LSP extends PCEPObject{
 	
 	protected boolean cFlag;
 	
-	private int LSP_sig_type;
+	//private int LSP_sig_type;
 	
 	
 	private SymbolicPathNameTLV symbolicPathNameTLV_tlv = null;
@@ -208,7 +208,8 @@ public void encode()
 		offset += 3;
 		
 		ByteHandler.BoolToBuffer(0 + offset*8, cFlag,object_bytes);
-		ByteHandler.IntToBuffer (0, 1 + offset*8, 3, opFlags, this.object_bytes);//ByteHandler.IntToBuffer (1, offset*8, 3, opFlags, this.object_bytes);
+		//ByteHandler.IntToBuffer (0, 1 + offset*8, 3, opFlags, this.object_bytes);
+		ByteHandler.IntToBuffer (29, 1+offset*8, 3, opFlags, this.object_bytes);
 		ByteHandler.BoolToBuffer(4 + offset*8, aFlag,object_bytes);
 		ByteHandler.BoolToBuffer(5 + offset*8, rFlag,object_bytes);
 		ByteHandler.BoolToBuffer(6 + offset*8, sFlag,object_bytes);
@@ -259,7 +260,9 @@ public void decode() throws MalformedPCEPObjectException {
 		lspId = ByteHandler.easyCopy(0,19,object_bytes[4],object_bytes[5],object_bytes[6]);
 		
 		cFlag = (ByteHandler.easyCopy(0,0,object_bytes[7]) == 1) ? true : false ;
+		System.out.println("cFlag="+cFlag);
 		opFlags = ByteHandler.easyCopy(1,3,object_bytes[7]);
+		System.out.println("opFlag="+opFlags);
 		aFlag = (ByteHandler.easyCopy(4,4,object_bytes[7]) == 1) ? true : false ;
 		rFlag = (ByteHandler.easyCopy(5,5,object_bytes[7]) == 1) ? true : false ;
 		sFlag = (ByteHandler.easyCopy(6,6,object_bytes[7]) == 1) ? true : false ;
@@ -403,7 +406,7 @@ public void setOpFlags(int opFlags)
 		this.opFlags = opFlags;
 	}
 
-	public int getLSP_sig_type() 
+	/*public int getLSP_sig_type() 
 	{
 		return LSP_sig_type;
 	}
@@ -411,6 +414,7 @@ public void setLSP_sig_type(int lSP_sig_type)
 	{
 		LSP_sig_type = lSP_sig_type;
 	}
+	*/
 	public boolean isrFlag() 
 	{
 		return rFlag;
@@ -451,7 +455,7 @@ public String toString(){
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + LSP_sig_type;
+		//result = prime * result + LSP_sig_type;
 		result = prime * result + (aFlag ? 1231 : 1237);
 		result = prime * result + (dFlag ? 1231 : 1237);
 		result = prime
@@ -489,10 +493,17 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		LSP other = (LSP) obj;
-		if (LSP_sig_type != other.LSP_sig_type)
+		System.out.println("equalLSP: ¿"+aFlag+ " = "+other.aFlag+"?");
+		/*if (LSP_sig_type != other.LSP_sig_type)
 			return false;
+		*/
+		System.out.println("equalLSP: ¿"+aFlag+ " = "+other.aFlag+"?");
 		if (aFlag != other.aFlag)
 			return false;
+		System.out.println("equalLSP: ¿"+opFlags+ " = "+other.opFlags+"?");
+		if (cFlag != other.cFlag)
+			return false;
+		System.out.println("equalLSP: ¿"+opFlags+ " = "+other.opFlags+"?");
 		if (dFlag != other.dFlag)
 			return false;
 		if (lspDBVersion_tlv == null) {

From 7e8d3c942cff60b4692b86d3cf5cbaacf3e9a67e Mon Sep 17 00:00:00 2001
From: VictorUceda <eduardo.yustapadilla@telefonica.com>
Date: Wed, 18 May 2016 15:03:10 +0200
Subject: [PATCH 04/18] fixed jose bugs

---
 src/main/java/es/tid/pce/pcep/constructs/StateReport.java   | 1 +
 src/main/java/es/tid/pce/pcep/constructs/UpdateRequest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/es/tid/pce/pcep/constructs/StateReport.java b/src/main/java/es/tid/pce/pcep/constructs/StateReport.java
index 54d254f0..db09e57a 100644
--- a/src/main/java/es/tid/pce/pcep/constructs/StateReport.java
+++ b/src/main/java/es/tid/pce/pcep/constructs/StateReport.java
@@ -192,6 +192,7 @@ else if (PCEPObject.getObjectClass(bytes, offset)==ObjectParameters.PCEP_OBJECT_
 			log.warn("Malformed Report Message. There must be at least one ERO or SRERO message!");
 			//throw new PCEPProtocolViolationException();
 		}
+		this.setLength(len);
 	}
 
 	public SRP getSRP() {
diff --git a/src/main/java/es/tid/pce/pcep/constructs/UpdateRequest.java b/src/main/java/es/tid/pce/pcep/constructs/UpdateRequest.java
index f4b22d89..be7ea18f 100644
--- a/src/main/java/es/tid/pce/pcep/constructs/UpdateRequest.java
+++ b/src/main/java/es/tid/pce/pcep/constructs/UpdateRequest.java
@@ -148,6 +148,7 @@ else if (PCEPObject.getObjectClass(bytes, offset)==ObjectParameters.PCEP_OBJECT_
 			log.warn("Malformed Update Request Construct.");
 			throw new PCEPProtocolViolationException();
 		}
+		this.setLength(len);
 	}
 
 

From 26303a9324e5f6813efdf6bb22d833fe849c5176 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez de Dios <oscar.gonzalezdedios@telefonica.com>
Date: Wed, 18 May 2016 19:25:47 +0200
Subject: [PATCH 05/18] fixes of BGP-LS with Capabilities

---
 pom.xml                                                      | 2 +-
 .../tid/bgp/bgp4/open/BGP4CapabilitiesOptionalParameter.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f644c7f7..2d3697cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>es.tid.netphony</groupId>
 	<artifactId>network-protocols</artifactId>
-	<version>1.3.0</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Netphony Network Protocols</name>
 	<description>BGP-LS,OSPF-TE,PCEP and RSVP-TE protocol encodings.</description>
diff --git a/src/main/java/es/tid/bgp/bgp4/open/BGP4CapabilitiesOptionalParameter.java b/src/main/java/es/tid/bgp/bgp4/open/BGP4CapabilitiesOptionalParameter.java
index d202d0db..6e41a38a 100644
--- a/src/main/java/es/tid/bgp/bgp4/open/BGP4CapabilitiesOptionalParameter.java
+++ b/src/main/java/es/tid/bgp/bgp4/open/BGP4CapabilitiesOptionalParameter.java
@@ -84,13 +84,16 @@ public void decode() {
 
 		while (offset<this.getLength()) {
 			int capabilityCode = BGP4Capability.getCapalitityCode(this.bytes, offset);
+			log.debug("Capability code "+capabilityCode);
 			if (capabilityCode == BGP4OptionalParametersTypes.CAPABILITY_CODE_MULTIPROTOCOLEXTENSION)
 			{
 				MultiprotocolExtensionCapabilityAdvertisement meca = new  MultiprotocolExtensionCapabilityAdvertisement(this.bytes, offset);
 				capabilityList.add(meca);
+				log.debug("Length "+meca.getLength());
 				offset=offset+meca.getLength();
 			}else {
-				offset= offset+BGP4Capability.getCapabilityLength(this.bytes, offset);
+				log.debug("Length "+BGP4Capability.getCapabilityLength(this.bytes, offset));
+				offset= offset+BGP4Capability.getCapabilityLength(this.bytes, offset)+2;
 			}
 		}
 

From 7430e1c72b9c4ccd9d87207fc56fadd2d5da3627 Mon Sep 17 00:00:00 2001
From: Jose-Juan Pedreno-Manresa <josej.pedreno@upct.es>
Date: Thu, 19 May 2016 16:54:52 +0200
Subject: [PATCH 06/18] Fix of AS_Path_Attribute

---
 .../update/MalformedBGP4ElementException.java |  14 ++
 .../bgp/bgp4/update/fields/PathAttribute.java |   1 -
 .../pathAttributes/AS_Path_Attribute.java     | 170 +++++++++++-------
 .../pathAttributes/AS_Path_Segment.java       | 143 +++++++++++++++
 .../es/tid/tests/TestBGPAsPathAttribute.java  |  63 +++++++
 5 files changed, 323 insertions(+), 68 deletions(-)
 create mode 100644 src/main/java/es/tid/bgp/bgp4/update/MalformedBGP4ElementException.java
 create mode 100644 src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Segment.java
 create mode 100644 src/test/java/es/tid/tests/TestBGPAsPathAttribute.java

diff --git a/src/main/java/es/tid/bgp/bgp4/update/MalformedBGP4ElementException.java b/src/main/java/es/tid/bgp/bgp4/update/MalformedBGP4ElementException.java
new file mode 100644
index 00000000..dba8f50f
--- /dev/null
+++ b/src/main/java/es/tid/bgp/bgp4/update/MalformedBGP4ElementException.java
@@ -0,0 +1,14 @@
+package es.tid.bgp.bgp4.update;
+
+public class MalformedBGP4ElementException extends RuntimeException
+{
+
+	private final static long serialVersionUID = 1L;
+
+	public MalformedBGP4ElementException(){ super(); }
+
+	public MalformedBGP4ElementException(String message)
+	{
+		super(message);
+	}
+}
diff --git a/src/main/java/es/tid/bgp/bgp4/update/fields/PathAttribute.java b/src/main/java/es/tid/bgp/bgp4/update/fields/PathAttribute.java
index 33957602..0d5f6f91 100644
--- a/src/main/java/es/tid/bgp/bgp4/update/fields/PathAttribute.java
+++ b/src/main/java/es/tid/bgp/bgp4/update/fields/PathAttribute.java
@@ -105,7 +105,6 @@ public void encodeHeader(){
 		}
 		else
 			bytes[2]=(byte)(pathAttributeLength & 0xFF );
-		
 	}
 	
 	protected void setPathAttributeLength(int pal){
diff --git a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Attribute.java b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Attribute.java
index d312bc63..ce4ab97b 100644
--- a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Attribute.java
+++ b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Attribute.java
@@ -1,92 +1,128 @@
 package es.tid.bgp.bgp4.update.fields.pathAttributes;
 
+import es.tid.bgp.bgp4.update.MalformedBGP4ElementException;
 import es.tid.bgp.bgp4.update.fields.PathAttribute;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * AS_PATH (Type Code 2):
-
-            AS_PATH is a well-known mandatory attribute that is composed
-            of a sequence of AS path segments.  Each AS path segment is
-            represented by a triple{@code <path segment type, path segment
-            length, path segment value>}.
-
-            The path segment type is a 1-octet length field with the
-            following values defined:
-
-               Value      Segment Type
-
-               1         AS_SET: unordered set of ASes a route in the
-                            UPDATE message has traversed
-
-               2         AS_SEQUENCE: ordered set of ASes a route in
-                            the UPDATE message has traversed
-
-            The path segment length is a 1-octet length field,
-            containing the number of ASes (not the number of octets) in
-            the path segment value field.
-
-            The path segment value field contains one or more AS
-            numbers, each encoded as a 2-octet length field.
-
-            Usage of this attribute is defined in 5.1.2.
-            
- * @author mcs
+ * <p>
+ * AS_PATH is a well-known mandatory attribute that is composed
+ * of a sequence of AS path segments.  Each AS path segment is
+ * represented by a triple{@code <path segment type, path segment
+ * length, path segment value>}.
+ * <p>
+ * The path segment type is a 1-octet length field with the
+ * following values defined:
+ * <p>
+ * Value      Segment Type
+ * <p>
+ * 1         AS_SET: unordered set of ASes a route in the
+ * UPDATE message has traversed
+ * <p>
+ * 2         AS_SEQUENCE: ordered set of ASes a route in
+ * the UPDATE message has traversed
+ * <p>
+ * The path segment length is a 1-octet length field,
+ * containing the number of ASes (not the number of octets) in
+ * the path segment value field.
+ * <p>
+ * The path segment value field contains one or more AS
+ * numbers, each encoded as a 2-octet length field.
+ * <p>
+ * Usage of this attribute is defined in 5.1.2.
  *
+ * @author mcs
  */
-public class AS_Path_Attribute extends PathAttribute{
-	int type;
-	int numberASes;
-	int value;
-	
-	public AS_Path_Attribute(){		
+public class AS_Path_Attribute extends PathAttribute
+{
+	private List<AS_Path_Segment> asPathSegments;
+
+	public AS_Path_Attribute()
+	{
 		super();
 		//Poner los flags. 
 		this.typeCode = PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_ASPATH;
-		
-
+		asPathSegments = new LinkedList<AS_Path_Segment>();
+		length = mandatoryLength; //Initial length FLAGS + TYPE + LENGTH
 	}
-	public AS_Path_Attribute(byte []bytes, int offset){
+
+	public AS_Path_Attribute(byte[] bytes, int offset) throws MalformedBGP4ElementException
+	{
 		super(bytes, offset);
-		decode();		
+		asPathSegments = new LinkedList<AS_Path_Segment>();
+		decode();
 	}
+
 	@Override
-	public void encode() {
-		//As_Path
-		pathAttributeLength = 4;
-		this.length=pathAttributeLength+mandatoryLength;
-		this.bytes=new byte[this.length];
+	public void encode()
+	{
+		bytes = new byte[length];
+		pathAttributeLength = length - mandatoryLength; //Total length minus (FLAGS + TYPE + LENGTH)
 		encodeHeader();
-		bytes[3]=(byte)(type & 0xFF );
-		bytes[4]=(byte)(numberASes & 0xFF);		
-		bytes[5]=(byte)(value>>>8 & 0xFF);	
-		bytes[6]= (byte)(value & 0xFF);
-	}
-	public void decode(){
-		type =  bytes[mandatoryLength];
-		numberASes = bytes[mandatoryLength+1];
-		value = ((((int)bytes[mandatoryLength+2]&0xFF)<<8)& 0xFF00) |  ((int)bytes[mandatoryLength+3] & 0xFF);
-	}
-	public int getValue() {
-		return value;
-	}
-	public void setValue(int value) {
-		this.value = value;
+		int offset = 3; //After the header encoding
+		for(AS_Path_Segment asPathSegment : asPathSegments)
+		{
+			asPathSegment.encode();
+			System.arraycopy(asPathSegment.getBytes(), 0, bytes, offset, asPathSegment.getLength());
+			offset += asPathSegment.getLength();
+		}
+
 	}
-	public int getType() {
-		return type;
+
+	public void decode() throws MalformedBGP4ElementException
+	{
+		if(typeCode != PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_ASPATH)
+			throw new MalformedBGP4ElementException();
+
+		int offset = 3; //1 octet flags, 1 octet type, 1 octet length
+		while(offset < length)
+		{
+			AS_Path_Segment asPathSegment = new AS_Path_Segment(bytes, offset);
+			asPathSegments.add(asPathSegment);
+			offset += asPathSegment.getLength();
+		}
 	}
-	public void setType(int type) {
-		this.type = type;
+
+	public int getType()
+	{
+		return typeCode;
 	}
-	public int getNumberASes() {
-		return numberASes;
+
+	public List<AS_Path_Segment> getAsPathSegments(){ return asPathSegments; }
+
+	public void setAsPathSegments(List<AS_Path_Segment> asPathSegments)
+	{
+		this.asPathSegments = asPathSegments;
+		for(AS_Path_Segment asPathSegment : asPathSegments)
+			length += asPathSegment.getLength();
 	}
-	public void setNumberASes(int numberASes) {
-		this.numberASes = numberASes;
+
+	@Override
+	public String toString()
+	{
+		return "AS_PATH [Type=" + typeCode + " Length=" + length + " NumberOfAsPathSegments=" + asPathSegments.size() + "]";
 	}
+
 	@Override
-	public String toString() {
-		return "AS_PATH [Value=" + value + " NumberAS: " + numberASes + "type: " + type + "]";
+	public boolean equals(Object obj)
+	{
+		if(this == obj)
+			return true;
+		if(obj == null)
+			return false;
+		if(getClass() != obj.getClass())
+			return false;
+		AS_Path_Attribute other = (AS_Path_Attribute) obj;
+		if(! Arrays.equals(bytes, other.getBytes()))
+			return false;
+		if(length != other.getLength())
+			return false;
+		return true;
+
 	}
 
 }
diff --git a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Segment.java b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Segment.java
new file mode 100644
index 00000000..3d0d0847
--- /dev/null
+++ b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/AS_Path_Segment.java
@@ -0,0 +1,143 @@
+package es.tid.bgp.bgp4.update.fields.pathAttributes;
+
+import es.tid.bgp.bgp4.BGP4Element;
+import es.tid.bgp.bgp4.update.MalformedBGP4ElementException;
+
+import java.util.Arrays;
+
+/**
+ * AS_PATH (Type Code 2):
+ * <p>
+ * AS_PATH is a well-known mandatory attribute that is composed
+ * of a sequence of AS path segments.  Each AS path segment is
+ * represented by a triple{@code <path segment type, path segment
+ * length, path segment value>}.
+ * <p>
+ * The path segment type is a 1-octet length field with the
+ * following values defined:
+ * <p>
+ * Value      Segment Type
+ * <p>
+ * 1 AS_SET: unordered set of ASes a route in the
+ * UPDATE message has traversed
+ * <p>
+ * 2 AS_SEQUENCE: ordered set of ASes a route in
+ * the UPDATE message has traversed
+ * <p>
+ * The path segment length is a 1-octet length field,
+ * containing the number of ASes (not the number of octets) in
+ * the path segment value field.
+ * <p>
+ * The path segment value field contains one or more AS
+ * numbers, each encoded as a 2-octet length field.
+ * <p>
+ * Usage of this attribute is defined in 5.1.2.
+ *
+ * @author Jose-Juan Pedreno-Manresa
+ */
+public class AS_Path_Segment implements BGP4Element
+{
+	private int  type;
+	private int  numberOfSegments;
+	private int  segments[];
+	private byte bytes[];
+	private int  length;
+
+	public AS_Path_Segment()
+	{
+		length = 2;
+		type = PathAttributesTypeCode.PATH_ATTRIBUTE_ASPATH_AS_SEQUENCE;
+	} //Type and number, and nothing else;
+
+	public AS_Path_Segment(byte[] bytes, int offset) throws MalformedBGP4ElementException
+	{
+		this.type = (int) bytes[offset] & 0xFF;
+		if(this.type != PathAttributesTypeCode.PATH_ATTRIBUTE_ASPATH_AS_SEQUENCE && this.type != PathAttributesTypeCode.PATH_ATTRIBUTE_ASPATH_AS_SET)
+			throw new MalformedBGP4ElementException();
+
+		this.numberOfSegments = bytes[offset + 1] & 0xFF;
+		this.segments = new int[this.numberOfSegments];
+
+		for(int i = 0; i < this.numberOfSegments; i++)
+		{
+			this.segments[i] = (int) (((bytes[offset + 2 + (i * 2)] & 0xFF) << 8) & 0xFF00 | bytes[offset + 2 + (i * 2) + 1] & 0xFF);
+		}
+
+		/*
+		 * Type 1 octet
+		 * Number of AS segments: 1 octet
+		 * Segments: 2 octets each one
+		 * Total length = 2 + numberOfSegments*2 octets
+		 */
+		this.length = 2 + this.numberOfSegments * 2;
+	}
+
+	@Override
+	public void encode()
+	{
+		int offset = 0;
+		bytes = new byte[this.length];
+		bytes[offset++] = (byte) (type & 0xFF); //1 octet, TYPE of AS_PATH_SEGMENT
+		bytes[offset++] = (byte) (numberOfSegments & 0xFF); //1 octet, NUMBER of ASes
+
+		for(int i = 0; i < numberOfSegments; i++)
+		{
+			bytes[offset++] = (byte) ((segments[i] & 0xFF00 >> 8) & 0xFF);
+			bytes[offset++] = (byte) (segments[i] & 0xFF);
+		}
+
+	}
+
+	@Override
+	public byte[] getBytes()
+	{
+		if(bytes == null) encode();
+		return bytes;
+	}
+
+	public int getLength()
+	{
+		return length;
+	}
+
+	public int getType()
+	{
+		return type;
+	}
+
+	public int getNumberOfSegments()
+	{
+		return numberOfSegments;
+	}
+
+	public int[] getSegments(){ return segments; }
+
+	public void setSegments(int[] segments)
+	{
+		if(segments == null) this.segments = new int[0];
+		else
+		{
+			this.segments = segments;
+			numberOfSegments = this.segments.length;
+			length = 2 + numberOfSegments * 2;
+		}
+	}
+
+	@Override
+	public String toString(){ return "AS_PATH_SEGMENT [Type=" + type + " NumberOfSegments=" + numberOfSegments + " Total Length=" + length+"]"; }
+
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AS_Path_Segment other = (AS_Path_Segment) obj;
+		if (! Arrays.equals(bytes, other.getBytes()))
+			return false;
+		if (length != other.getLength())
+			return false;
+		return true;
+	}
+}
diff --git a/src/test/java/es/tid/tests/TestBGPAsPathAttribute.java b/src/test/java/es/tid/tests/TestBGPAsPathAttribute.java
new file mode 100644
index 00000000..de919796
--- /dev/null
+++ b/src/test/java/es/tid/tests/TestBGPAsPathAttribute.java
@@ -0,0 +1,63 @@
+package es.tid.tests;
+
+import es.tid.bgp.bgp4.update.fields.pathAttributes.AS_Path_Attribute;
+import es.tid.bgp.bgp4.update.fields.pathAttributes.AS_Path_Segment;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class TestBGPAsPathAttribute
+{
+
+	@Test
+	public void testAsPathSegment()
+	{
+		try
+		{
+			AS_Path_Segment as1 = new AS_Path_Segment();
+			as1.encode();
+			byte[] as1Bytes = as1.getBytes();
+
+			AS_Path_Segment as2 = new AS_Path_Segment(as1Bytes, 0);
+
+			Assert.assertEquals("1-Both objects should be equal", as1, as2);
+			Assert.assertArrayEquals("1-Bytes from both objects should be the same", as1.getBytes(), as2.getBytes());
+
+			int segments[] = {1, 2, 3};
+
+			as1.setSegments(segments);
+			as1.encode();
+			as2 = new AS_Path_Segment(as1.getBytes(), 0);
+
+			Assert.assertEquals("2-Both objects should be equal", as1, as2);
+			Assert.assertArrayEquals("2-Bytes from both objects should be the same", as1.getBytes(), as2.getBytes());
+
+		}catch(Exception e)
+		{
+			e.printStackTrace();
+			Assert.fail("Exception is thrown");
+		}
+	}
+
+	@Test
+	public void testAsPathAttribute()
+	{
+		AS_Path_Attribute ap1 = new AS_Path_Attribute();
+		AS_Path_Segment as1 = new AS_Path_Segment();
+		int segments[] = {1, 2, 3};
+		as1.setSegments(segments);
+		List<AS_Path_Segment> asList = new LinkedList<AS_Path_Segment>();
+		asList.add(as1);
+		ap1.setAsPathSegments(asList);
+		ap1.encode();
+
+		AS_Path_Attribute ap2 = new AS_Path_Attribute(ap1.getBytes(), 0);
+		ap2.encode();
+
+		Assert.assertEquals("Both PathAttribute_AS_PATH should be equal", ap1, ap2);
+		Assert.assertArrayEquals("Bytes from both PathAttribute_AS_PATH objects should be the same", ap1.getBytes(), ap2.getBytes());
+
+	}
+}

From d955aadec608ae7a1ce124fbc8b08bdced07ade6 Mon Sep 17 00:00:00 2001
From: Jose-Juan Pedreno-Manresa <josej.pedreno@upct.es>
Date: Fri, 20 May 2016 13:48:14 +0200
Subject: [PATCH 07/18] Changes to enable multiple LinkState NLRI per
 MP_REACH_AATTRIBUTE. Code is still compatible with the olvd version

---
 .../es/tid/bgp/bgp4/objects/BGP4Object.java   |   5 +-
 .../bgp/bgp4/update/fields/LinkStateNLRI.java |   1 +
 .../BGP_LS_MP_Reach_Attribute.java            | 115 ++++++++++--------
 .../java/es/tid/tests/TestBGPLSMessages.java  |  51 ++++++++
 4 files changed, 120 insertions(+), 52 deletions(-)

diff --git a/src/main/java/es/tid/bgp/bgp4/objects/BGP4Object.java b/src/main/java/es/tid/bgp/bgp4/objects/BGP4Object.java
index 8359a383..5030e8f4 100644
--- a/src/main/java/es/tid/bgp/bgp4/objects/BGP4Object.java
+++ b/src/main/java/es/tid/bgp/bgp4/objects/BGP4Object.java
@@ -1,12 +1,11 @@
 package es.tid.bgp.bgp4.objects;
 
-import java.util.Arrays;
-
 import es.tid.bgp.bgp4.BGP4Element;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+
 public abstract class BGP4Object implements BGP4Element {
 	
 	protected static final Logger log= LoggerFactory.getLogger("BGP4Parser");
diff --git a/src/main/java/es/tid/bgp/bgp4/update/fields/LinkStateNLRI.java b/src/main/java/es/tid/bgp/bgp4/update/fields/LinkStateNLRI.java
index 4257cbb4..eaf32b99 100644
--- a/src/main/java/es/tid/bgp/bgp4/update/fields/LinkStateNLRI.java
+++ b/src/main/java/es/tid/bgp/bgp4/update/fields/LinkStateNLRI.java
@@ -42,6 +42,7 @@ public LinkStateNLRI(byte []bytes, int offset) {
 		int valueNLRILength=((((int)bytes[offset+2]&0xFF)<<8)& 0xFF00) |  ((int)bytes[offset+3] & 0xFF);
 		this.TotalNLRILength=valueNLRILength+4;
 		this.bytes=new byte[TotalNLRILength];
+		this.length=this.TotalNLRILength;
 		System.arraycopy(bytes, offset, this.bytes, 0, TotalNLRILength);
 	}
 	
diff --git a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/BGP_LS_MP_Reach_Attribute.java b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/BGP_LS_MP_Reach_Attribute.java
index 204efbb8..2595ffda 100644
--- a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/BGP_LS_MP_Reach_Attribute.java
+++ b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/BGP_LS_MP_Reach_Attribute.java
@@ -1,87 +1,104 @@
 package es.tid.bgp.bgp4.update.fields.pathAttributes;
 
-import es.tid.bgp.bgp4.update.fields.LinkNLRI;
-import es.tid.bgp.bgp4.update.fields.LinkStateNLRI;
-import es.tid.bgp.bgp4.update.fields.NLRITypes;
-import es.tid.bgp.bgp4.update.fields.NodeNLRI;
-import es.tid.bgp.bgp4.update.fields.PrefixNLRI;
+import es.tid.bgp.bgp4.update.fields.*;
+
+import java.util.LinkedList;
+import java.util.List;
 
 /**
- * 
+ *
  *  @author Telefonica I+D
+ *	@author Jose-Juan Pedreno-Manresa (modifications)
  *
  */
 
 public class BGP_LS_MP_Reach_Attribute extends MP_Reach_Attribute {
-	
+
 	private LinkStateNLRI lsNLRI;
-	
+	private List<LinkStateNLRI> lsNLRIList;
+
 	public BGP_LS_MP_Reach_Attribute(){
 		super();
 		this.setAddressFamilyIdentifier(AFICodes.AFI_BGP_LS);
 		this.setSubsequentAddressFamilyIdentifier(SAFICodes.SAFI_BGP_LS);
+		lsNLRIList = new LinkedList<LinkStateNLRI>();
 	}
-	
+
 	public BGP_LS_MP_Reach_Attribute(byte [] bytes, int offset) {
 		super(bytes, offset);
 		int offset2=offset+this.mandatoryLength+5+this.getLengthofNextHopNetworkAddress();
-		int type= LinkStateNLRI.getType(bytes, offset2);
-		if (type==NLRITypes.Link_NLRI){
-			lsNLRI=new LinkNLRI(bytes, offset2);	
-		}else if (type==NLRITypes.Node_NLRI){
-			lsNLRI=new NodeNLRI(bytes, offset2);	
-		}
-		else if (type == NLRITypes.Prefix_v4_NLRI){
-			lsNLRI = new PrefixNLRI(bytes, offset2);
-		}
-		else{
-			log.warn("UNKNOWN_NLRI: "+type);
+		lsNLRIList = new LinkedList<LinkStateNLRI>();
+
+		while(offset2 < length)
+		{
+			LinkStateNLRI tempNLri;
+			int type = LinkStateNLRI.getType(bytes, offset2);
+			if(type == NLRITypes.Link_NLRI)
+			{
+				tempNLri = new LinkNLRI(bytes, offset2);
+			} else if(type == NLRITypes.Node_NLRI)
+			{
+				tempNLri = new NodeNLRI(bytes, offset2);
+			} else if(type == NLRITypes.Prefix_v4_NLRI)
+			{
+				tempNLri = new PrefixNLRI(bytes, offset2);
+			} else
+			{
+				log.warn("UNKNOWN_NLRI: " + type);
+				continue;
+			}
+			offset2 += tempNLri.getTotalNLRILength();
+			lsNLRIList.add(tempNLri);
 		}
-		
+		lsNLRI = lsNLRIList.isEmpty() ? null : lsNLRIList.get(0);
 	}
-	
-	
+
 	public void encode() {
 		//Encoding BGP_LS_MP_Reach_Attribute
-		
-		if (lsNLRI!=null){
-			lsNLRI.encode();
+//		this.pathAttributeLength = 5+lsNLRI.getLength()+this.getLengthofNextHopNetworkAddress();
+		this.pathAttributeLength = 5+getLengthofNextHopNetworkAddress();
+		for(LinkStateNLRI ls : lsNLRIList)
+		{
+			this.pathAttributeLength += ls.getTotalNLRILength();
 		}
-		this.
-		pathAttributeLength = 5+lsNLRI.getLength()+this.getLengthofNextHopNetworkAddress();
+
 		this.setPathAttributeLength(pathAttributeLength);
 		this.bytes=new byte[this.getLength()];
-		encodeHeader();	
+		encodeHeader();
 		encodeMP_Reach_Header();
 		int offset = this.getMandatoryLength()+5+this.getLengthofNextHopNetworkAddress();
-		System.arraycopy(lsNLRI.getBytes(), 0, this.getBytes(), offset, lsNLRI.getLength());
+		for(LinkStateNLRI ls : lsNLRIList)
+		{
+			ls.encode();
+			System.arraycopy(ls.getBytes(), 0, this.bytes, offset, ls.getTotalNLRILength());
+			offset += ls.getTotalNLRILength();
+		}
+
 	}
 
 	public LinkStateNLRI getLsNLRI() {
 		return lsNLRI;
 	}
+	public List<LinkStateNLRI> getLsNLRIList(){ return lsNLRIList; }
 
 	public void setLsNLRI(LinkStateNLRI lsNLRI) {
 		this.lsNLRI = lsNLRI;
 	}
-	
+	public void setLsNLRIList(List<LinkStateNLRI> lsNLRIList){ this.lsNLRIList = lsNLRIList; }
+
 	public String toString(){
-		String text;
-		if (lsNLRI!=null){
-			text="[BPG_LS_MP_REACH "+ lsNLRI.toString()+" ]";
-		}else {
-			text ="";	
-		}
-		
-		
-		return text;
+		StringBuilder sb = new StringBuilder("[BGP_LS_MP_REACH ");
+		for(LinkStateNLRI ls : lsNLRIList)
+			sb.append(ls.toString()+" ");
+		return sb.toString();
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((lsNLRI == null) ? 0 : lsNLRI.hashCode());
+		for(LinkStateNLRI ls :lsNLRIList)
+			result = prime * result + lsNLRI.hashCode();
 		return result;
 	}
 
@@ -94,16 +111,16 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		BGP_LS_MP_Reach_Attribute other = (BGP_LS_MP_Reach_Attribute) obj;
-		if (lsNLRI == null) {
-			if (other.lsNLRI != null)
-				return false;
-		} else if (!lsNLRI.equals(other.lsNLRI))
+		if(lsNLRIList.size() != other.getLsNLRIList().size())
+			return false;
+		List<LinkStateNLRI> otherlsNLRIList = other.getLsNLRIList();
+		if(!lsNLRIList.equals(otherlsNLRIList))
 			return false;
 		return true;
 	}
-	
-	
-	
-	
+
+
+
+
 
 }
diff --git a/src/test/java/es/tid/tests/TestBGPLSMessages.java b/src/test/java/es/tid/tests/TestBGPLSMessages.java
index 87b2b2d9..012a2949 100644
--- a/src/test/java/es/tid/tests/TestBGPLSMessages.java
+++ b/src/test/java/es/tid/tests/TestBGPLSMessages.java
@@ -1,11 +1,21 @@
 package es.tid.tests;
 
+import es.tid.bgp.bgp4.update.fields.LinkStateNLRI;
+import es.tid.bgp.bgp4.update.fields.NodeNLRI;
+import es.tid.bgp.bgp4.update.fields.pathAttributes.BGP_LS_MP_Reach_Attribute;
 import es.tid.bgp.bgp4.update.fields.pathAttributes.Generic_MP_Reach_Attribute;
 import es.tid.bgp.bgp4.update.fields.pathAttributes.MP_Reach_Attribute;
+import es.tid.bgp.bgp4.update.tlv.LocalNodeDescriptorsTLV;
+import es.tid.bgp.bgp4.update.tlv.ProtocolIDCodes;
+import es.tid.bgp.bgp4.update.tlv.RoutingUniverseIdentifierTypes;
+import es.tid.bgp.bgp4.update.tlv.node_link_prefix_descriptor_subTLVs.IGPRouterIDNodeDescriptorSubTLV;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.net.Inet4Address;
 import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 
 public class TestBGPLSMessages
 {
@@ -30,4 +40,45 @@ public void testMPReach()
 		Assert.assertEquals("Both MP_Reach_Attribute objects should be equal", mp1, mp2);
 	}
 
+	@Test
+	public void testBGPLSMPReachAttribute()
+	{
+		try
+		{
+			BGP_LS_MP_Reach_Attribute bgplsmpr1 = new BGP_LS_MP_Reach_Attribute();
+			List<LinkStateNLRI> lsNLRIList = new LinkedList<LinkStateNLRI>();
+
+			Inet4Address nodeIPAddress = (Inet4Address) Inet4Address.getByName("10.0.0.1");
+			IGPRouterIDNodeDescriptorSubTLV igpRouterIDNodeDescriptorSubTLV = new IGPRouterIDNodeDescriptorSubTLV();
+			igpRouterIDNodeDescriptorSubTLV.setIpv4AddressOSPF(nodeIPAddress);
+			igpRouterIDNodeDescriptorSubTLV.setIGP_router_id_type(IGPRouterIDNodeDescriptorSubTLV.IGP_ROUTER_ID_TYPE_OSPF_NON_PSEUDO);
+			LocalNodeDescriptorsTLV lnd = new LocalNodeDescriptorsTLV();
+			lnd.setIGPRouterID(igpRouterIDNodeDescriptorSubTLV);
+
+			NodeNLRI nlri1 = new NodeNLRI();
+			nlri1.setProtocolID(ProtocolIDCodes.OSPF_Protocol_ID);
+			nlri1.setLocalNodeDescriptors(lnd);
+			nlri1.setRoutingUniverseIdentifier(RoutingUniverseIdentifierTypes.Level3Identifier);
+			nlri1.encode();
+
+			lsNLRIList.add(nlri1);
+
+			NodeNLRI nlri2 = new NodeNLRI(nlri1.getBytes(), 0);
+			nlri2.encode();
+			lsNLRIList.add(nlri2);
+
+			bgplsmpr1.setLsNLRIList(lsNLRIList);
+			bgplsmpr1.encode();
+
+			BGP_LS_MP_Reach_Attribute bgplsmpr2 = new BGP_LS_MP_Reach_Attribute(bgplsmpr1.getBytes(), 0);
+
+			Assert.assertEquals("Both object should be equal", bgplsmpr1, bgplsmpr2);
+			Assert.assertArrayEquals("Bytes from both objetcs should be the same", bgplsmpr1.getBytes(), bgplsmpr2.getBytes());
+		}catch(Throwable e)
+		{
+			e.printStackTrace();
+			Assert.fail();
+		}
+	}
+
 }

From e4593e4bd7179902748996d53b41420d7100f511 Mon Sep 17 00:00:00 2001
From: Jose-Juan Pedreno-Manresa <josej.pedreno@upct.es>
Date: Wed, 25 May 2016 11:08:12 +0200
Subject: [PATCH 08/18] =?UTF-8?q?Cambios=20para=20permitir=20la=20correcta?=
 =?UTF-8?q?=20decodificaci=C3=B3n=20de=20atributos=20con=20c=C3=B3digo=209?=
 =?UTF-8?q?9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es/tid/bgp/bgp4/messages/BGP4Update.java  | 322 ++++++++++--------
 .../PathAttributesTypeCode.java               |   5 +-
 2 files changed, 176 insertions(+), 151 deletions(-)

diff --git a/src/main/java/es/tid/bgp/bgp4/messages/BGP4Update.java b/src/main/java/es/tid/bgp/bgp4/messages/BGP4Update.java
index c7622dde..31459df0 100644
--- a/src/main/java/es/tid/bgp/bgp4/messages/BGP4Update.java
+++ b/src/main/java/es/tid/bgp/bgp4/messages/BGP4Update.java
@@ -1,69 +1,58 @@
 package es.tid.bgp.bgp4.messages;
 
-import java.util.ArrayList;
-
-import es.tid.bgp.bgp4.update.fields.LinkNLRI;
-import es.tid.bgp.bgp4.update.fields.LinkStateNLRI;
-import es.tid.bgp.bgp4.update.fields.NLRI;
-import es.tid.bgp.bgp4.update.fields.NLRITypes;
-import es.tid.bgp.bgp4.update.fields.NodeNLRI;
-import es.tid.bgp.bgp4.update.fields.PathAttribute;
-import es.tid.bgp.bgp4.update.fields.WithdrawnRoutes;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.AFICodes;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.AS_Path_Attribute;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.BGP_LS_MP_Reach_Attribute;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.Generic_MP_Reach_Attribute;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.LinkStateAttribute;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.MP_Reach_Attribute;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.OriginAttribute;
-import es.tid.bgp.bgp4.update.fields.pathAttributes.PathAttributesTypeCode;
+import es.tid.bgp.bgp4.update.fields.*;
+import es.tid.bgp.bgp4.update.fields.pathAttributes.*;
 
+import java.util.ArrayList;
 
 /**
- * <h1> BGP4 Update Message (RFC 4271). </h1> 
+ * <h1> BGP4 Update Message (RFC 4271). </h1>
  * <p> From RFC 4271 Section 4.3. </p>
  * <a href="https://tools.ietf.org/html/rfc4271">RFC 4271</a>.
  * 4.3.  UPDATE Message Format
- * 
+ * <p>
  * UPDATE messages are used to transfer routing information between BGP
-   peers.  The information in the UPDATE message can be used to
-   construct a graph that describes the relationships of the various
-   Autonomous Systems.  By applying rules to be discussed, routing
-   information loops and some other anomalies may be detected and
-   removed from inter-AS routing.
-
-   An UPDATE message is used to advertise feasible routes that share
-   common path attributes to a peer, or to withdraw multiple unfeasible
-   routes from service (see 3.1).  An UPDATE message MAY simultaneously
-   advertise a feasible route and withdraw multiple unfeasible routes
-   from service.  The UPDATE message always includes the fixed-size BGP
-   header, and also includes the other fields, as shown below (note,
-   some of the shown fields may not be present in every UPDATE message):
-<pre>
-      +-----------------------------------------------------+
-      |   Withdrawn Routes Length (2 octets)                |
-      +-----------------------------------------------------+
-      |   Withdrawn Routes (variable)                       |
-      +-----------------------------------------------------+
-      |   Total Path Attribute Length (2 octets)            |
-      +-----------------------------------------------------+
-      |   Path Attributes (variable)                        |
-      +-----------------------------------------------------+
-      |   Network Layer Reachability Information (variable) |
-      +-----------------------------------------------------+
-</pre>
- * @author mcs,pac
+ * peers.  The information in the UPDATE message can be used to
+ * construct a graph that describes the relationships of the various
+ * Autonomous Systems.  By applying rules to be discussed, routing
+ * information loops and some other anomalies may be detected and
+ * removed from inter-AS routing.
+ * <p>
+ * An UPDATE message is used to advertise feasible routes that share
+ * common path attributes to a peer, or to withdraw multiple unfeasible
+ * routes from service (see 3.1).  An UPDATE message MAY simultaneously
+ * advertise a feasible route and withdraw multiple unfeasible routes
+ * from service.  The UPDATE message always includes the fixed-size BGP
+ * header, and also includes the other fields, as shown below (note,
+ * some of the shown fields may not be present in every UPDATE message):
+ * <pre>
+ * +-----------------------------------------------------+
+ * |   Withdrawn Routes Length (2 octets)                |
+ * +-----------------------------------------------------+
+ * |   Withdrawn Routes (variable)                       |
+ * +-----------------------------------------------------+
+ * |   Total Path Attribute Length (2 octets)            |
+ * +-----------------------------------------------------+
+ * |   Path Attributes (variable)                        |
+ * +-----------------------------------------------------+
+ * |   Network Layer Reachability Information (variable) |
+ * +-----------------------------------------------------+
+ * </pre>
  *
+ * @author mcs, pac
  */
-public class BGP4Update extends BGP4Message {
+public class BGP4Update extends BGP4Message
+{
 
-	/** Used to check the origin of update message */
+	/**
+	 * Used to check the origin of update message
+	 */
 	private String learntFrom;
 
 	/**
-	 * Total length of the Withdrawn Routes field in octets.  
+	 * Total length of the Withdrawn Routes field in octets.
 	 */
-	private int withdrawnRoutesLength;
+	private int             withdrawnRoutesLength;
 	/**
 	 * List of IP address prefixes for the routes that are being withdrawn from service.
 	 */
@@ -71,20 +60,22 @@ public class BGP4Update extends BGP4Message {
 	/**
 	 * Total length of the Path Attributes field in octets
 	 */
-	private int totalPathAttibuteLength;
+	private int             totalPathAttibuteLength;
 
 	/**
 	 * List of path attributes
 	 */
 	private ArrayList<PathAttribute> pathAttributes;
 	/**
-	 *  Network Layer Reachability Information
+	 * Network Layer Reachability Information
 	 */
-	private NLRI nlri;
+	private NLRI                     nlri;
+
 	/**
 	 * Construct for encoding
 	 */
-	public BGP4Update () {
+	public BGP4Update()
+	{
 		super();
 		this.setMessageType(BGP4MessageTypes.MESSAGE_UPDATE);
 		pathAttributes = new ArrayList<PathAttribute>();
@@ -92,225 +83,258 @@ public BGP4Update () {
 
 	/**
 	 * Construct for decoding
+	 *
 	 * @param bytes bytes of the message
 	 */
-	public BGP4Update (byte[] bytes) {
-		super(bytes);		
-		this.messageBytes=new byte[bytes.length];		
+	public BGP4Update(byte[] bytes)
+	{
+		super(bytes);
+		this.messageBytes = new byte[bytes.length];
 		System.arraycopy(bytes, 0, this.messageBytes, 0, bytes.length);
-		decode();		
+		decode();
 	}
-	
+
 	/**
 	 * Encode BGP4 Update message
 	 */
-	public void encode() {
+	public void encode()
+	{
 		//Encode BGP4 Update
-		if ((withdrawnRoutes == null)&&(pathAttributes.size() == 0))
+		if((withdrawnRoutes == null) && (pathAttributes.size() == 0))
 			log.warn("There should be withdrawnRoutes or path Attributes");
-		if (withdrawnRoutes == null)
+		if(withdrawnRoutes == null)
 			withdrawnRoutesLength = 0;
 		int len = BGPHeaderLength;
 		//Add 4 octects for the lengths
-		len = len +4; //withdrawnRoutesLength + totalPathAttibuteLength
-		if (withdrawnRoutes!=null){
+		len = len + 4; //withdrawnRoutesLength + totalPathAttibuteLength
+		if(withdrawnRoutes != null)
+		{
 			withdrawnRoutes.encode();
-			len=len+withdrawnRoutes.getLength();
+			len = len + withdrawnRoutes.getLength();
 			withdrawnRoutesLength = withdrawnRoutes.getLength();
 		}
-		totalPathAttibuteLength =0;
-		for (int i=0;i<pathAttributes.size();++i){
+		totalPathAttibuteLength = 0;
+		for(int i = 0; i < pathAttributes.size(); ++ i)
+		{
 			pathAttributes.get(i).encode();
-			len=len+pathAttributes.get(i).getLength();
-			totalPathAttibuteLength = totalPathAttibuteLength +pathAttributes.get(i).getLength();
+			len = len + pathAttributes.get(i).getLength();
+			totalPathAttibuteLength = totalPathAttibuteLength + pathAttributes.get(i).getLength();
 		}
-		if (nlri != null){
+		if(nlri != null)
+		{
 			//NLRI encoding
 			nlri.encode();
-			len=len+nlri.getLength();
+			len = len + nlri.getLength();
 		}
 
-		this.setMessageLength(len);		
-		messageBytes=new byte[len];
+		this.setMessageLength(len);
+		messageBytes = new byte[len];
 		encodeHeader();
-		int offset=BGPHeaderLength;
+		int offset = BGPHeaderLength;
 		//Add withdrawnRoutesLength
-		this.messageBytes[offset]=(byte)(withdrawnRoutesLength>>>8 & 0xFF);
-		this.messageBytes[offset+1]=(byte)(withdrawnRoutesLength & 0xFF);
-		offset = offset+2;
+		this.messageBytes[offset] = (byte) (withdrawnRoutesLength >>> 8 & 0xFF);
+		this.messageBytes[offset + 1] = (byte) (withdrawnRoutesLength & 0xFF);
+		offset = offset + 2;
 		//Add withdrawnRoutes
-		if (withdrawnRoutes!=null){
-			System.arraycopy(withdrawnRoutes.getBytes(),0,messageBytes,offset,withdrawnRoutes.getLength());
-			offset=offset+withdrawnRoutes.getLength();
+		if(withdrawnRoutes != null)
+		{
+			System.arraycopy(withdrawnRoutes.getBytes(), 0, messageBytes, offset, withdrawnRoutes.getLength());
+			offset = offset + withdrawnRoutes.getLength();
 		}
 		//Add totalPathAttibuteLength
-		this.messageBytes[offset]=(byte)(totalPathAttibuteLength>>>8 & 0xFF);
-		this.messageBytes[offset+1]=(byte)(totalPathAttibuteLength & 0xFF);
-		offset = offset+2;
+		this.messageBytes[offset] = (byte) (totalPathAttibuteLength >>> 8 & 0xFF);
+		this.messageBytes[offset + 1] = (byte) (totalPathAttibuteLength & 0xFF);
+		offset = offset + 2;
 
 		//Add Path Attributes
-		for (int i=0;i<pathAttributes.size();++i){
+		for(int i = 0; i < pathAttributes.size(); ++ i)
+		{
 
-			System.arraycopy(pathAttributes.get(i).getBytes(),0,messageBytes,offset,pathAttributes.get(i).getLength());	
-			offset=offset+pathAttributes.get(i).getLength();
+			System.arraycopy(pathAttributes.get(i).getBytes(), 0, messageBytes, offset, pathAttributes.get(i).getLength());
+			offset = offset + pathAttributes.get(i).getLength();
 		}
 		//Add NLRI
-		if (nlri!=null){
-			System.arraycopy(nlri.getBytes(),0,messageBytes,offset,nlri.getBytes().length);
-			offset=offset+nlri.getLength();
+		if(nlri != null)
+		{
+			System.arraycopy(nlri.getBytes(), 0, messageBytes, offset, nlri.getBytes().length);
+			offset = offset + nlri.getLength();
 		}
 
 	}
 
-
-	public void decode() {
+	public void decode()
+	{
 		int offset = BGPHeaderLength;
 		//Withdrawn Routes length
-		withdrawnRoutesLength = ((  ((int)messageBytes[offset]) <<8)& 0xFF00) |  ((int)messageBytes[offset+1] & 0xFF);
-		offset = offset +2;
+		withdrawnRoutesLength = ((((int) messageBytes[offset]) << 8) & 0xFF00) | ((int) messageBytes[offset + 1] & 0xFF);
+		offset = offset + 2;
 		//Withdrawn Routes
-		if (withdrawnRoutesLength != 0){
+		if(withdrawnRoutesLength != 0)
+		{
 			//Decodificar withdrawnRoutes
 			log.warn("withdrawnRoutesLength not implemented");
 			offset = offset + withdrawnRoutesLength;
 		}
 		//Path Attributes Length
-		totalPathAttibuteLength = ((  ((int)messageBytes[offset]) <<8)& 0xFF00) |  ((int)messageBytes[offset+1] & 0xFF);
-		offset = offset +2;
+		totalPathAttibuteLength = ((((int) messageBytes[offset]) << 8) & 0xFF00) | ((int) messageBytes[offset + 1] & 0xFF);
+		offset = offset + 2;
 		//QUITAR log.info("OSCAR totalPathAttibuteLength "+totalPathAttibuteLength+" Y offset a "+offset);
-		if (totalPathAttibuteLength != 0){
+		if(totalPathAttibuteLength != 0)
+		{
 			pathAttributes = new ArrayList<PathAttribute>();
 			int len = 0;
 			int attribute_typeCode;
 			int attribute_length;
 			int mandatory_length;
-			while (len < totalPathAttibuteLength){
+			while(len < totalPathAttibuteLength)
+			{
 				//Path Attributes
 				attribute_typeCode = PathAttribute.getAttibuteTypeCode(messageBytes, offset);
-				attribute_length = PathAttribute.getAttributeLength(messageBytes, offset);	
+				attribute_length = PathAttribute.getAttributeLength(messageBytes, offset);
 				mandatory_length = PathAttribute.getMandatoryLength(messageBytes, offset);
-				if (attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_ORIGIN){
-					OriginAttribute origin = new OriginAttribute(messageBytes,offset);
+				if(attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_ORIGIN)
+				{
+					OriginAttribute origin = new OriginAttribute(messageBytes, offset);
 					pathAttributes.add(origin);
 
-				}
-				else if (attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_ASPATH){
-					AS_Path_Attribute as_Path_Attribute = new AS_Path_Attribute(messageBytes,offset);
+				} else if(attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_ASPATH)
+				{
+					AS_Path_Attribute as_Path_Attribute = new AS_Path_Attribute(messageBytes, offset);
 					pathAttributes.add(as_Path_Attribute);
-				}
-				else if (attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_BGP_LS_ATTRIBUTE){
-					LinkStateAttribute linkState_Attribute = new LinkStateAttribute(messageBytes,offset);
+				} else if((attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_BGP_LS_ATTRIBUTE) ||
+						(attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_BGP_LS_ATTRIBUTE_LEGACY))
+				{
+					LinkStateAttribute linkState_Attribute = new LinkStateAttribute(messageBytes, offset);
 					pathAttributes.add(linkState_Attribute);
-				}	
-				else if (attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_ASPATH_AS_SEQUENCE){
-					log.warn("ASPATH_AS_SEQUENCE Not implemented yet");
-				}
-				else if (attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_ORIGIN_EGP){
-					//ORIGIN_EGP
-					log.warn("ORIGIN_EGP Not implemented yet");
-				}
-				else if (attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_MP_REACH_NLRI){
+				} else if(attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_MP_REACH_NLRI)
+				{
 					//PATH_ATTRIBUTE_TYPECODE_MP_REACH_NLRI
 					int afi = MP_Reach_Attribute.getAFI(messageBytes, offset);
-					if (afi == AFICodes.AFI_BGP_LS ){
-						BGP_LS_MP_Reach_Attribute blsra= new BGP_LS_MP_Reach_Attribute(messageBytes,offset);
+					if(afi == AFICodes.AFI_BGP_LS)
+					{
+						BGP_LS_MP_Reach_Attribute blsra = new BGP_LS_MP_Reach_Attribute(messageBytes, offset);
 						pathAttributes.add(blsra);
-					}else {
-						Generic_MP_Reach_Attribute gblsra= new Generic_MP_Reach_Attribute(messageBytes,offset);
+					} else
+					{
+						Generic_MP_Reach_Attribute gblsra = new Generic_MP_Reach_Attribute(messageBytes, offset);
 						pathAttributes.add(gblsra);
 					}
-				} else {
-					log.warn("attribute_typeCode NOT supported by this implementation "+attribute_typeCode);
+				} else if(attribute_typeCode == PathAttributesTypeCode.PATH_ATTRIBUTE_TYPECODE_MP_UN_REACH_NLRI)
+				{
+					Generic_MP_Unreach_Attribute mpUnreachAttribute = new Generic_MP_Unreach_Attribute(messageBytes, offset);
+					pathAttributes.add(mpUnreachAttribute);
+				} else
+				{
+					log.warn("attribute_typeCode NOT supported by this implementation " + attribute_typeCode);
 				}
 				offset = offset + attribute_length + mandatory_length;
-				len = len + attribute_length +mandatory_length;
+				len = len + attribute_length + mandatory_length;
 			}
 			//NLRI
 			//if (nlri != null){
 			int nlri_type = LinkStateNLRI.getNLRIType(messageBytes, offset);
-			if (nlri_type == NLRITypes.Link_NLRI){
+			if(nlri_type == NLRITypes.Link_NLRI)
+			{
 				//Link_NLRI
-				nlri = new LinkNLRI(messageBytes,offset);
-				offset=offset+ nlri.getLength();
+				nlri = new LinkNLRI(messageBytes, offset);
+				offset = offset + nlri.getLength();
 			}
-			if (nlri_type == NLRITypes.Node_NLRI){
+			if(nlri_type == NLRITypes.Node_NLRI)
+			{
 				//Node_NLRI
-				nlri = new NodeNLRI(messageBytes,offset);
+				nlri = new NodeNLRI(messageBytes, offset);
 				//UPDATE message Length - 23 - Total Path Attributes Length
 				//   - Withdrawn Routes Length
-				offset=offset+nlri.getLength();
+				offset = offset + nlri.getLength();
 			}
-			if ((nlri == null)&&(withdrawnRoutesLength == 0)){
+			if((nlri == null) && (withdrawnRoutesLength == 0))
+			{
 				log.warn("BGP4 Update without NRLI and without Withdrawn Routes");
 
 			}
 		}
 	}
 
-	public int getWithdrawnRoutesLength() {
+	public int getWithdrawnRoutesLength()
+	{
 		return withdrawnRoutesLength;
 	}
 
-	public void setWithdrawnRoutesLength(int withdrawnRoutesLength) {
+	public void setWithdrawnRoutesLength(int withdrawnRoutesLength)
+	{
 		this.withdrawnRoutesLength = withdrawnRoutesLength;
 	}
 
-	public WithdrawnRoutes getWithdrawnRoutes() {
+	public WithdrawnRoutes getWithdrawnRoutes()
+	{
 		return withdrawnRoutes;
 	}
 
-	public void setWithdrawnRoutes(WithdrawnRoutes withdrawnRoutes) {
+	public void setWithdrawnRoutes(WithdrawnRoutes withdrawnRoutes)
+	{
 		this.withdrawnRoutes = withdrawnRoutes;
 	}
 
-	public int getTotalPathAttibuteLength() {
+	public int getTotalPathAttibuteLength()
+	{
 		return totalPathAttibuteLength;
 	}
 
-	public void setTotalPathAttibuteLength(int totalPathAttibuteLength) {
+	public void setTotalPathAttibuteLength(int totalPathAttibuteLength)
+	{
 		this.totalPathAttibuteLength = totalPathAttibuteLength;
 	}
 
-	public ArrayList<PathAttribute> getPathAttributes() {
+	public ArrayList<PathAttribute> getPathAttributes()
+	{
 		return pathAttributes;
 	}
 
-	public void setPathAttributes(ArrayList<PathAttribute> pathAttribute) {
+	public void setPathAttributes(ArrayList<PathAttribute> pathAttribute)
+	{
 		this.pathAttributes = pathAttribute;
 	}
 
-	public NLRI getNlri() {
+	public NLRI getNlri()
+	{
 		return nlri;
 	}
 
-	public void setNlri(NLRI nlri) {
+	public void setNlri(NLRI nlri)
+	{
 		this.nlri = nlri;
 	}
 
-	public String getLearntFrom() {
+	public String getLearntFrom()
+	{
 		return learntFrom;
 	}
 
-	public void setLearntFrom(String learntFrom) {
+	public void setLearntFrom(String learntFrom)
+	{
 		this.learntFrom = learntFrom;
 	}
 
 	@Override
-	public String toString() {
+	public String toString()
+	{
 		// TODO Auto-generated method stub
-		StringBuffer sb=new StringBuffer((withdrawnRoutesLength+totalPathAttibuteLength)*800);
+		StringBuffer sb = new StringBuffer((withdrawnRoutesLength + totalPathAttibuteLength) * 800);
 		sb.append("BGP4Update Msg: ");
-		if (withdrawnRoutesLength != 0){
+		if(withdrawnRoutesLength != 0)
+		{
 			sb.append("> Withdrawn Routes: \n");
 			sb.append(withdrawnRoutes.toString());
 		}
-		if (pathAttributes.size() != 0){
+		if(pathAttributes.size() != 0)
+		{
 			sb.append("> Path Attibutes: \n ");
-			for (int i=0;i<pathAttributes.size();++i){
-				sb.append("> "+ pathAttributes.get(i).toString()+"\n");
+			for(int i = 0; i < pathAttributes.size(); ++ i)
+			{
+				sb.append("> " + pathAttributes.get(i).toString() + "\n");
 			}
 		}
-		if (nlri != null)
+		if(nlri != null)
 			sb.append(nlri.toString());
 
 		return sb.toString();
diff --git a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/PathAttributesTypeCode.java b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/PathAttributesTypeCode.java
index 9a378124..f9a726a8 100644
--- a/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/PathAttributesTypeCode.java
+++ b/src/main/java/es/tid/bgp/bgp4/update/fields/pathAttributes/PathAttributesTypeCode.java
@@ -30,8 +30,9 @@ public class PathAttributesTypeCode {
 	//public final static int PATH_ATTRIBUTE_TYPECODE_LINKSTATE = 99;
 	//29 	BGP-LS Attribute (TEMPORARY - registered 2014-03-11, expires 2016-03-11)
 	//draft-ietf-idr-ls-distribution
-	public final static int PATH_ATTRIBUTE_TYPECODE_BGP_LS_ATTRIBUTE = 29;
-	
+	public final static int PATH_ATTRIBUTE_TYPECODE_BGP_LS_ATTRIBUTE        = 29;
+	public final static int PATH_ATTRIBUTE_TYPECODE_BGP_LS_ATTRIBUTE_LEGACY = 99;
+
 	//Para origin (rfc 4271)
 	public final static int PATH_ATTRIBUTE_ORIGIN_IGP = 0;
 	public final static int PATH_ATTRIBUTE_ORIGIN_EGP = 1;

From a3a14ed16f4ee1c28a6bb76ef92d2a4c7beff36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:12:31 +0200
Subject: [PATCH 09/18] Update VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 18fa8e74..75740798 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.3.0
+v1.3.1

From 77d2863a755515fd9a4b5472e7783b1785130ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:23:52 +0200
Subject: [PATCH 10/18] Update pom.xml

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d3697cd..05448ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,15 +2,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>es.tid.netphony</groupId>
 	<artifactId>network-protocols</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.1</version>
 	<packaging>jar</packaging>
 	<name>Netphony Network Protocols</name>
 	<description>BGP-LS,OSPF-TE,PCEP and RSVP-TE protocol encodings.</description>
-	<url>http://coretransport.tid.es/netphony</url>
+	<url>https://github.com/telefonicaid/netphony-network-protocols</url>
 	<licenses>
 		<license>
-		<name>GNU AFFERO GENERAL PUBLIC LICENSE</name>
-		<url>http://www.gnu.org/licenses/agpl-3.0.txt</url>
+			 <name>Apache License 2.0</name>
+        		 <url>http://www.apache.org/licenses/LICENSE-2.0</url>
 		</license>
 	</licenses>
 	<developers>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.7</version>
+			<version>1.7.21</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

From 5f9b751a38b973b3e817ef0e6d449083a25181ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:32:03 +0200
Subject: [PATCH 11/18] Update BGP-LS_Support.md

---
 doc/BGP-LS_Support.md | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/doc/BGP-LS_Support.md b/doc/BGP-LS_Support.md
index 56af1b81..0a2b389d 100644
--- a/doc/BGP-LS_Support.md
+++ b/doc/BGP-LS_Support.md
@@ -3,6 +3,12 @@ Detailed BGP-4 & BGP-LS Implementation Support (v1.3.0)
 
 The BGP-4 and BGP-LS elements shown below are implemented in current version, unless **Not Implemented** is mentioned.  
 
+RFCs:
+* [RFC 4271](http://tools.ietf.org/html/rfc4271)
+* [RFC 4760](http://tools.ietf.org/html/rfc4760)
+* [RFC 7752](http://tools.ietf.org/html/rfc7752)
+* [draft-previdi-idr-bgpls-te-metric-extensions-00](http://tools.ietf.org/html/draft-previdi-idr-bgpls-te-metric-extensions-00)
+
 BGP-4 Messages
 --------------
 * BGP KeepAlive Message [RFC 4271](http://tools.ietf.org/html/rfc4271#section-4.4 "RFC 4271: A Border Gateway Protocol 4 (BGP-4) Keepalive Message")
@@ -101,13 +107,19 @@ Fields in UPDATE Message
 |    1096   | Shared Risk Link   Group |
 |    1097   | Opaque Link    Attribute   (**Not Implemented**)   | 
 |    1098   | Link Name      (**Not Implemented**)      | 
+|    1094   | MPLS Protocol Mask (**Not Implemented**)  |  
+|    1095   | IGP Metric          |  
+|    1096   | Shared Risk Link   Group |
+|    1097   | Opaque Link    Attribute   (**Not Implemented**)   | 
+|    1098   | Link Name      (**Not Implemented**)      | 
 
 ### Prefix Attribute TLVs
 | **TLV Code points**  | **Name**   |
 |:---:|:---:| 
-|      1152     | IGP Flags            |
-|      1153     | IGP Route Tag    (**Not Implemented**)       | 
-|      1154     | IGP Extended Route Tag   (**Not Implemented**)   |
-|      1155     | Prefix Metric        |
-|      1156     | OSPF Forwarding  Address    |
-|      1157     | Opaque Prefix Attribute  (**Not Implemented**)   |    
+|      1104     | Unidirectional Delay            |
+|      1105     | Unidirectional Delay            |
+|      1106     | Unidirectional Min-Max Delay       | 
+|      1107     | Unidirectional Residual Bandwidth   |
+|      1109     | Unidirectional Available Bandwidth        |
+|      1110     | Unidirectional Utilized Bandwidth    |
+ 

From e2e515bb8a7add265a3615907e60bc070c84c1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:32:45 +0200
Subject: [PATCH 12/18] Update BGP-LS_Support.md

---
 doc/BGP-LS_Support.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/BGP-LS_Support.md b/doc/BGP-LS_Support.md
index 0a2b389d..0f6d04b0 100644
--- a/doc/BGP-LS_Support.md
+++ b/doc/BGP-LS_Support.md
@@ -4,6 +4,7 @@ Detailed BGP-4 & BGP-LS Implementation Support (v1.3.0)
 The BGP-4 and BGP-LS elements shown below are implemented in current version, unless **Not Implemented** is mentioned.  
 
 RFCs:
+* [RFC 3392](http://tools.ietf.org/html/rfc3392)
 * [RFC 4271](http://tools.ietf.org/html/rfc4271)
 * [RFC 4760](http://tools.ietf.org/html/rfc4760)
 * [RFC 7752](http://tools.ietf.org/html/rfc7752)

From e50b422023203b36f1164a4020f988b943d446b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:35:33 +0200
Subject: [PATCH 13/18] Change to Apache 2 license

---
 LICENSE | 863 +++++++++++++-------------------------------------------
 1 file changed, 202 insertions(+), 661 deletions(-)

diff --git a/LICENSE b/LICENSE
index 70b80bda..d6456956 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,661 +1,202 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7. This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy. This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged. This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source. This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge. You need not require recipients to copy the
-    Corresponding Source along with the object code. If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source. Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year> <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source. For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code. There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From 4e559091833da68bb0e9ed1595459dc845d24f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:37:35 +0200
Subject: [PATCH 14/18] Update README.md

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c3b35b5..83bebec7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-netphony-network-protocols v1.3.0
+netphony-network-protocols v1.3.1
 =================================
 
 Repository branch build status:
@@ -27,6 +27,11 @@ The library is maintained to be up-to-date to the latest version of the internet
 
 Detailed CHANGELOG [click here](CHANGELOG)
 
+## **Latest news**
+- License is now Apache 2.0 
+- BPG-LS Tested with Juniper MX routers
+- Various bugfixes in BGP-LS
+
 ## Compilation and use
 
 The library can be built using the maven tool. There is a set of Junit tests included that check the enconding/decoding process . Contributions on expanding the test suite are welcomed.

From 61d2318d72a541db6004bb4bd30d34675c7d4ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:38:04 +0200
Subject: [PATCH 15/18] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83bebec7..0020af04 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ To build the .jar file and run the tests, clone the repository, go to the main d
     <dependency>
       <groupId>es.tid.netphony</groupId>
       <artifactId>network-protocols</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
     </dependency>
  ```
  Authors keep also a copy of the artifact in maven central to facilitate the deployment. (*) In process

From ecfb15804a70a8ee337b7492f591aef05670839b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:38:41 +0200
Subject: [PATCH 16/18] Update CHANGELOG

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cfe5f556..10b3304a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v.1.3.1
+- License is now Apache 2.0 
+- BPG-LS Tested with Juniper MX routers
+- Various bugfixes in BGP-LS
 v.1.3.0
 - Checked implemenation supports RFC 7752 (previously it supported draft-ietf-idr-ls-distribution-13)
 - Implementation of draft-previdi-idr-bgpls-te-metric-extensions-01 using the suggested values in the draft 

From dd0a4c635aca3e642ed1436f8015a4444aace774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:53:23 +0200
Subject: [PATCH 17/18] Update BGP-LS_Support.md

---
 doc/BGP-LS_Support.md | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/doc/BGP-LS_Support.md b/doc/BGP-LS_Support.md
index 0f6d04b0..2cbdaa73 100644
--- a/doc/BGP-LS_Support.md
+++ b/doc/BGP-LS_Support.md
@@ -53,16 +53,17 @@ Fields in UPDATE Message
 ### Link State NLRI TLVs 
 | **Type**  | **NLRI Type**   |
 |:---:|:---:|
-| (Type 256)|Local Node Descriptors TLV |
-|(Type 257) |Remote Node Descriptors TLV |
+| (Type 256) | Local Node Descriptors TLV |
+| (Type 257) | Remote Node Descriptors TLV |
 
  ### Node Descriptor Sub-TLVs
+
 | **Type**  | **NLRI Type**   |
 |:---:|:---:| 
-| | Autonomous System|
-| |BGP-LS Identifier |
-| |OSPF Area-ID   |
-| |IGP Router-ID|
+| 512 | Autonomous System|
+| 513 |BGP-LS Identifier |
+| 514 |OSPF Area-ID   |
+| 515 |IGP Router-ID|
 
 ### Link Descriptors TLVs
 
@@ -113,14 +114,21 @@ Fields in UPDATE Message
 |    1096   | Shared Risk Link   Group |
 |    1097   | Opaque Link    Attribute   (**Not Implemented**)   | 
 |    1098   | Link Name      (**Not Implemented**)      | 
+|    1104     | Unidirectional Delay            |
+|    1105     | Unidirectional Delay            |
+|    1106     | Unidirectional Min-Max Delay       | 
+|    1107     | Unidirectional Residual Bandwidth   |
+|    1109     | Unidirectional Available Bandwidth        |
+|    1110     | Unidirectional Utilized Bandwidth    |
 
 ### Prefix Attribute TLVs
 | **TLV Code points**  | **Name**   |
 |:---:|:---:| 
-|      1104     | Unidirectional Delay            |
-|      1105     | Unidirectional Delay            |
-|      1106     | Unidirectional Min-Max Delay       | 
-|      1107     | Unidirectional Residual Bandwidth   |
-|      1109     | Unidirectional Available Bandwidth        |
-|      1110     | Unidirectional Utilized Bandwidth    |
+|      1152     | IGP Flags            |
+|      1153     | IGP Route Tag    (**Not Implemented**)       | 
+|      1154     | IGP Extended Route Tag   (**Not Implemented**)   |
+|      1155     | Prefix Metric        |
+|      1156     | OSPF Forwarding  Address    |
+|      1157     | Opaque Prefix Attribute  (**Not Implemented**)   |    
+
  

From 7e0d57df8c3a99dcfe93e8df1e0bd8859cd65599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20de=20Dios?= <ogondio@tid.es>
Date: Fri, 27 May 2016 14:53:32 +0200
Subject: [PATCH 18/18] Update BGP-LS_Support.md

---
 doc/BGP-LS_Support.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/BGP-LS_Support.md b/doc/BGP-LS_Support.md
index 2cbdaa73..f1e9fd54 100644
--- a/doc/BGP-LS_Support.md
+++ b/doc/BGP-LS_Support.md
@@ -1,4 +1,4 @@
-Detailed BGP-4 & BGP-LS Implementation Support (v1.3.0) 
+Detailed BGP-4 & BGP-LS Implementation Support (v1.3.1) 
 =======================================================
 
 The BGP-4 and BGP-LS elements shown below are implemented in current version, unless **Not Implemented** is mentioned.