Parse AsPath from string; get originating / transiting

.gitignore

@@ -18,3 +18,14 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+
+*.iml
+*.ipr
+*.iws
+.idea
+target
+atlassian-ide-plugin.xml
+.settings
+.DS_Store
+
+*.swp

.travis.yml

@@ -0,0 +1 @@
+language: java

README.md

@@ -3,7 +3,4 @@ java-mrt
 
 Java library to parse the binary MRT format.
 
-I have used this library over the last years extensively.
-Please send any bug fixes to me paaguti :#at#: gmail _dot_ com
-
 This library is released under LGPL license. Read LICENSE.txt.

build.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name = "Paquete análisis BGP-4" default = "rebuild">
-  <property name = "outputdir"  value = "."/>
-  <property name = "classdir"   value = "./bin" />
-  <property name = "sourcedir"  value = "./src" />
+  <property name = "outputdir"  value = "./target"/>
+  <property name = "classdir"   value = "./target/classes" />
+  <property name = "sourcedir"  value = "./src/main/java" />
   <property name = "debug"      value = "false" />
-  <property name = "mrt.main.class" value = "org.java-mrt.progs.route_btoa" />
+  <property name = "mrt.main.class" value = "org.javamrt.progs.route_btoa" />
 
   <target name = "cleansrc" description = "Borra los backups">
     <tstamp/>

pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>net.apnic.mrt</groupId>
+    <artifactId>mrt</artifactId>
+    <version>0.0.3-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>Java MRT File Dumper</name>
+    <description>Java Multi-Threaded Routing Toolkit File Dumper</description>
+    <url>https://github.com/APNIC-net/java-mrt</url>
+
+    <scm>
+        <url>>https://github.com/APNIC-net/java-mrt</url>
+        <connection>scm:git:git@github.com:APNIC-net/java-mrt.git</connection>
+        <developerConnection>scm:git:git@github.com:APNIC-net/java-mrt.git</developerConnection>
+    </scm>
+
+    <distributionManagement>
+        <repository>
+            <id>nexus-staging</id>
+            <name>Nexus Staging Repository</name>
+            <url>http://nexus.apnic.net:8081/nexus/content/repositories/staging</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://nexus.apnic.net:8081/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.javamrt.progs.route_btoa</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/org/javamrt/mrt/AS.java → src/main/java/org/javamrt/mrt/AS.java

@@ -6,7 +6,10 @@
 
 package org.javamrt.mrt;
 
+import java.math.BigInteger;
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 /**
  * @author paag
@@ -16,81 +19,44 @@
 public class AS implements Comparable<AS>, Comparator<AS> {
 	public static final int AS_TRANS = 23456;
 	public static final AS NullAS = new AS(0);
-	// protected long ASnumber;
-	protected byte ASCode[] = {0,0,0,0};
+	private long asNumber;
 
 	protected AS() {
 	}
 
 	public AS(long ASnumber) {
-		setASCode(ASnumber & 0xffffffff);
+		asNumber = ASnumber & 0xffffffffL;
 	}
 
-	public AS(byte[] as) throws Exception {
-		setASCode(as);
-	}
-
-
-	private void setASCode(long val) {
-		for (int i = 0; i < 4; i++)
-			ASCode[i] = (byte) ((val >> ((3 - i) * 8)) & 0xff);
-	}
-
-	private void setASCode(byte[] newval) throws Exception {
-		if (newval.length == 2) {
-			this.ASCode[0] =
-			this.ASCode[1] = 0;
-			this.ASCode[2] = newval[0];
-			this.ASCode[3] = newval[1];
-		} else if (newval.length == 4) {
-			this.ASCode[0] = newval[0];
-			this.ASCode[1] = newval[1];
-			this.ASCode[2] = newval[2];
-			this.ASCode[3] = newval[3];
-		} else
-			throw new Exception(String.format("AS must be 2 or 4 bytes long (%d not allowed)",newval.length));
+	public AS(byte[] as) {
+		if (as.length != 2 && as.length != 4) {
+			throw new IllegalArgumentException(String.format("AS must be 2 or 4 bytes long (%d not allowed)", as.length));
+		}
+		asNumber = new BigInteger(1, as).longValue();
 	}
 
 	public long getASN() {
-		long result = 0;
-		for (int i=0; i<ASCode.length;i++) {
-			result = (result << 8) & 0xffffff00;
-			result = result | (ASCode[i] & 0x000000ff);
-		}
-		return result;
+		return asNumber;
 	}
 
 	public void setASN(long ASnumber) {
-		this.setASCode(ASnumber & 0xffffffff);
+		this.asNumber = ASnumber & 0xffffffffL;
 	}
 
-//	public long getASN() {
-//		return this.ASnumber;
-//	}
-
-
 	public int compareTo(org.javamrt.mrt.AS other) {
 		return compare(this, other);
 	}
 
 	public int compare(org.javamrt.mrt.AS as1, org.javamrt.mrt.AS as2) {
-		for (int i=0;i<4;i++) {
-			if (as1.ASCode[i] == as2.ASCode[i])
-				continue;
-			return ((int)as1.ASCode[i] & 0xff) - ((int)as2.ASCode[i] & 0xff);
-		}
-		return 0;
+		return Long.compare(as1.asNumber, as2.asNumber);
 	}
 
 	/**
 	 * @param AS other
 	 * @return true if the other AS
 	 */
 	private boolean equals(AS other) {
-		for (int i=0; i<4; i++)
-			if (this.ASCode[i] != other.ASCode[i])
-				return false;
-		return true;
+		return other != null && this.asNumber == other.asNumber;
 	}
 
 	/**
@@ -118,38 +84,36 @@ public boolean equals(Object other) {
 		return false;
 	}
 
+	@Override
+	public int hashCode() {
+		return Long.hashCode(asNumber);
+	}
+
 	/**
 	 * @return true if this is a 4 byte AS number
 	 */
 	public boolean is4Byte() {
-		return this.ASCode[0] != 0 || this.ASCode[1] != 0;
+		return asNumber > 0xFFFFL;
 	}
 
 	/**
-	 * @return true if the AS number is 23456, the 4 byte AS place holder
-	 * comparison is byte by byte
+	 * @return true if the AS number is 23456
 	 */
 	public boolean isPlaceholder() {
-		return this.equals(AS_TRANS);
+		return asNumber == AS_TRANS;
 	}
 
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
-		if (this.equals(0))        return "AS_NULL";
-		if (this.equals(AS_TRANS)) return "AS_TRANS";
-		if (this.is4Byte())        return String.format("%d.%d",hiWord(),loWord());
-		return String.format("%d", loWord());
-	}
+// this has never worked, so do not think we should fix it now
+//		if (this.equals(0))        return "AS_NULL";
+//		if (this.equals(AS_TRANS)) return "AS_TRANS";
 
-	private int hiWord() {
-		return ((this.ASCode[0] & 0xff) << 8) | (this.ASCode[1] & 0xff);
+		return String.valueOf(asNumber);
 	}
 
-	private int loWord() {
-		return ((this.ASCode[2] & 0xff) << 8) | (this.ASCode[3] & 0xff);
-	}
 	/**
 	 * @param prefix
 	 * @return a String containing the prefix followed by the AS textual representation
@@ -173,11 +137,22 @@ public static AS parseString(String asspec) throws Exception {
 				asnum = asnum * 0x10000L + asnum1;
 				result = new AS(asnum);
 			} else {
-				result = new AS(Long.parseLong(asspec));
+				long number = Long.parseLong(asspec);
+				if (number < 0 || number > 0xFFFFFFFFL) {
+					throw new IllegalArgumentException("number must be in [0,4294967295]");
+				}
+				result = new AS(number);
 			}
 		} else {
 			throw new Exception ("Incorrect AS specification: "+asspec);
 		}
 		return result;
 	}
+
+	/**
+	 * @return list of ASNs, especially useful when not interested in whether it is some type of set, but just want to deal with the numbers
+	 */
+	public List<AS> getASList() {
+		return Collections.singletonList(this);
+	}
 }

src/main/java/org/javamrt/mrt/ASConfedSequence.java

@@ -0,0 +1,30 @@
+// This file is part of java-mrt
+// A library to parse MRT files
+
+// This file is released under LGPL 3.0
+// http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+
+package org.javamrt.mrt;
+
+import java.util.List;
+import java.util.LinkedList;
+import java.util.stream.Collectors;
+
+public class ASConfedSequence extends AS {
+    LinkedList<AS> asList;
+
+    public ASConfedSequence(List<AS> asList) {
+        this.asList = new LinkedList<>();
+        this.asList.addAll(asList);
+    }
+
+    @Override
+    public String toString() {
+        return asList.stream().map(AS::toString).collect(Collectors.joining(" ", "[", "]"));
+    }
+
+    @Override
+    public List<AS> getASList() {
+        return this.asList;
+    }
+}

src/main/java/org/javamrt/mrt/ASConfedSet.java

@@ -0,0 +1,32 @@
+// This file is part of java-mrt
+// A library to parse MRT files
+
+// This file is released under LGPL 3.0
+// http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+
+package org.javamrt.mrt;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ASConfedSet extends AS {
+
+    private LinkedList<AS> asList;
+
+    public ASConfedSet(final List<AS> asList) {
+        this.asList = new LinkedList<>();
+        this.asList.addAll(asList);
+    }
+
+    @Override
+    public String toString() {
+        return asList.stream().map(AS::toString).collect(Collectors.joining(" ", "{", "}"));
+    }
+
+    @Override
+    public List<AS> getASList() {
+        return this.asList;
+    }
+}
+