Merge pull request #92 from batfish/unstable

Unstable
batfish · Apr 7, 2017 · f2716d1 · f2716d1
2 parents 32d946c + 5fed58d
commit f2716d1
Show file tree

Hide file tree

Showing 56 changed files with 7,420 additions and 3,601 deletions.
diff --git a/projects/batfish-common-protocol/src/org/batfish/common/Version.java b/projects/batfish-common-protocol/src/org/batfish/common/Version.java
@@ -8,7 +8,7 @@ public final class Version {
 
    private static final String UNKNOWN_VERSION = "0.0.0";
 
-   private static final String VERSION = "0.13.0";
+   private static final String VERSION = "0.14.0";
 
    public static void checkCompatibleVersion(String myName, String otherName,
          String otherVersion) {

diff --git a/projects/batfish-common-protocol/src/org/batfish/datamodel/NamedPort.java b/projects/batfish-common-protocol/src/org/batfish/datamodel/NamedPort.java
@@ -51,6 +51,7 @@ public enum NamedPort {
    LOGINtcp_OR_WHOudp(513),
    LOTUSNOTES(1352),
    LPD(515),
+   MICROSOFT_DS(445),
    /**
     * not authoritative
     */

diff --git a/projects/batfish/build.xml b/projects/batfish/build.xml
@@ -281,13 +281,18 @@
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_bgp.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_callhome.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_common.g4"/>
+               <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_crypto.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_eigrp.g4"/>
+               <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_hsrp.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_ignored.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_interface.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_isis.g4"/>
+               <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_line.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_logging.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_mpls.g4"/>
+               <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_ntp.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_ospf.g4"/>
+               <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_pim.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_qos.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_rip.g4"/>
                <fileset dir="src/org/batfish/grammar/cisco" includes="Cisco_routemap.g4"/>