From b907af0c5395d9a8a37df80bdd078fc269886245 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Sun, 24 May 2015 14:16:34 -0400 Subject: [PATCH 01/23] Added removeNonConformingTopLevelTLV() to remove TopLevel TLVs that are not defined in the Dictionary. --- .../comcast/oscar/compiler/DPoECompiler.java | 6 + .../examples/DPoEConfigurationFileTest.java | 129 +++++++++--------- 2 files changed, 73 insertions(+), 62 deletions(-) diff --git a/src/com/comcast/oscar/compiler/DPoECompiler.java b/src/com/comcast/oscar/compiler/DPoECompiler.java index 8b29cde..eeb9b6a 100644 --- a/src/com/comcast/oscar/compiler/DPoECompiler.java +++ b/src/com/comcast/oscar/compiler/DPoECompiler.java @@ -52,5 +52,11 @@ public int getDPoEVersion() { return this.iDPoEVersion; } + /** + * This method removes TopLevel TLVs that are not defined the Dictionary + */ + public void removeNonConformingTopLevelTLV() { + + } } diff --git a/src/com/comcast/oscar/examples/DPoEConfigurationFileTest.java b/src/com/comcast/oscar/examples/DPoEConfigurationFileTest.java index adf5661..383fb59 100644 --- a/src/com/comcast/oscar/examples/DPoEConfigurationFileTest.java +++ b/src/com/comcast/oscar/examples/DPoEConfigurationFileTest.java @@ -14,74 +14,79 @@ public class DPoEConfigurationFileTest { public static void main(String[] args) { - + /* BINARY FILE TO TEXT */ - File dpoeConfigFile = TestDirectoryStructure.fInputDirFileName("DPoE-1.cm"); + File dpoeConfigFile = TestDirectoryStructure.fInputDirFileName("DPoE.bin"); - ConfigurationFileExport cfe = new ConfigurationFileExport (dpoeConfigFile,ConfigurationFileExport.DPOE_VER_20); + System.out.println(TlvBuilder.tlvDump(HexString.fileToByteArray(dpoeConfigFile))); - System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); + System.out.println("-------------------------------------------------------------------------------------"); + + ConfigurationFileExport cfe = new ConfigurationFileExport (dpoeConfigFile,ConfigurationFileExport.DPOE_VER_20); - - /*CONFIGURATION FILE OBJECT TO TEXT*/ - ConfigurationFile cf = null; - try { - cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,cfe.getTlvBuilder()); - } catch (TlvException e) { - e.printStackTrace(); - } - - cfe = new ConfigurationFileExport (cf); - - System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); - - /*TlvBuilder to Text*/ - - TlvBuilder tb = new TlvBuilder(); - try { - tb.add(new HexString(cf.toByteArray())); - } catch (TlvException e) { - e.printStackTrace(); - } - - cfe = new ConfigurationFileExport (tb,ConfigurationFileExport.DPOE_VER_20); - - System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); - - /*Text to Text*/ - ConfigurationFileImport cfi = new ConfigurationFileImport(new StringBuilder(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV))); - - cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,cfi.getTlvBuilder()); - - cfe = new ConfigurationFileExport (cf); - System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); - - /*Text To Binary*/ - cfi = new ConfigurationFileImport(new StringBuilder(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV))); - - cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,cfi.getTlvBuilder()); - - cf.setConfigurationFileName(TestDirectoryStructure.fOutputDirFileName("DPoE-1-Test.bin")); - - cf.writeToDisk(); - - /*Binary File To Text*/ - - tb = new TlvBuilder(); - - try { - tb.add(new HexString(HexString.fileToByteArray(TestDirectoryStructure.fOutputDirFileName("DPoE-1-Test.bin")))); - } catch (TlvException e) { - e.printStackTrace(); + + if (false) { + + /*CONFIGURATION FILE OBJECT TO TEXT*/ + ConfigurationFile cf = null; + try { + cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,cfe.getTlvBuilder()); + } catch (TlvException e) { + e.printStackTrace(); + } + + cfe = new ConfigurationFileExport (cf); + + System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); + + /*TlvBuilder to Text*/ + + TlvBuilder tb = new TlvBuilder(); + try { + tb.add(new HexString(cf.toByteArray())); + } catch (TlvException e) { + e.printStackTrace(); + } + + cfe = new ConfigurationFileExport (tb,ConfigurationFileExport.DPOE_VER_20); + + System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); + + /*Text to Text*/ + ConfigurationFileImport cfi = new ConfigurationFileImport(new StringBuilder(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV))); + + cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,cfi.getTlvBuilder()); + + cfe = new ConfigurationFileExport (cf); + + System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); + + /*Text To Binary*/ + cfi = new ConfigurationFileImport(new StringBuilder(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV))); + + cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,cfi.getTlvBuilder()); + + cf.setConfigurationFileName(TestDirectoryStructure.fOutputDirFileName("DPoE-1-Test.bin")); + + cf.writeToDisk(); + + /*Binary File To Text*/ + + tb = new TlvBuilder(); + + try { + tb.add(new HexString(HexString.fileToByteArray(TestDirectoryStructure.fOutputDirFileName("DPoE-1-Test.bin")))); + } catch (TlvException e) { + e.printStackTrace(); + } + + cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,tb); + + cfe = new ConfigurationFileExport (cf); + + System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); } - - cf = new ConfigurationFile(ConfigurationFile.DPOE_VER_20,tb); - - cfe = new ConfigurationFileExport (cf); - - System.out.println(cfe.toPrettyPrint(ConfigurationFileExport.EXPORT_FOUND_TLV)); - } } From df41c17e161d2a97aa6eee9d4eac1a69307a92e3 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Sun, 24 May 2015 14:21:07 -0400 Subject: [PATCH 02/23] Updated Whitespace --- src/com/comcast/oscar/tlv/TlvBuilder.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/com/comcast/oscar/tlv/TlvBuilder.java b/src/com/comcast/oscar/tlv/TlvBuilder.java index e712f39..f3ec95b 100644 --- a/src/com/comcast/oscar/tlv/TlvBuilder.java +++ b/src/com/comcast/oscar/tlv/TlvBuilder.java @@ -43,12 +43,9 @@ public class TlvBuilder implements TlvBuild { private static boolean debug = Boolean.FALSE; - protected List lsTlvBuffer = new ArrayList(); - + protected List lsTlvBuffer = new ArrayList(); protected byte[] baTlvBuffer = null; - protected List lbTlvBuilder = new ArrayList(); - protected Map miiTlvTypeTpByteLength = new HashMap(); public final static byte TLV_LENGTH_POS_OFFSET = 0x01; From 8bcf417cd7afb281f7d25771a75f4cdc4552307f Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Sun, 24 May 2015 15:57:44 -0400 Subject: [PATCH 03/23] Added DictionarySQLQueries.getTopLevelTLV() --- .../dictionary/DictionarySQLQueries.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/com/comcast/oscar/dictionary/DictionarySQLQueries.java b/src/com/comcast/oscar/dictionary/DictionarySQLQueries.java index 7db9a00..b20937e 100644 --- a/src/com/comcast/oscar/dictionary/DictionarySQLQueries.java +++ b/src/com/comcast/oscar/dictionary/DictionarySQLQueries.java @@ -6,6 +6,7 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.json.JSONArray; @@ -270,6 +271,53 @@ public JSONArray getAllTlvDefinition(int iCableLabsConfigType) { return jsonArrTlvDictionary; } + /** + * + * @return List of TopLevel TLV in Integers + */ + public List getTopLevelTLV() { + Statement statement = null; + ResultSet resultSet = null; + + List liTopLevelTLV = new ArrayList(); + + String sqlQuery = + "SELECT * " + + "FROM " + + this.sDictionaryTableName + " " + + "WHERE " + + Dictionary.DB_TBL_COL_PARENT_ID + " = '0'"; + + if (debug) + System.out.println("DictionarySQLQueries.getTopLevelTLV() SQL_QUERY: " + sqlQuery); + + try { + statement = commSqlConnection.createStatement(); + } catch (SQLException e) { + + e.printStackTrace(); + } + + try { + resultSet = statement.executeQuery(sqlQuery); + + while (resultSet.next()) { + + if (debug) + System.out.println("DictionarySQLQueries.getTopLevelTLV()-> TLV-NAME: " + resultSet.getString("TLV_NAME")); + + liTopLevelTLV.add(resultSet.getInt(Dictionary.DB_TBL_COL_TYPE)); + } + + + } catch (SQLException e) { + + e.printStackTrace(); + } + + return liTopLevelTLV; + } + /** * From d58bed0627c206f863f0ea77e83f2304a7cee43b Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Sun, 24 May 2015 16:18:54 -0400 Subject: [PATCH 04/23] Fixed Issued when a Binary file is converted to Text and contain TLVs that are not defined for a DPoE configuration file. Signed-off-by: Maurice Garcia --- .../comcast/oscar/compiler/DPoECompiler.java | 12 ++++++++- .../ConfigurationFileExport.java | 27 ++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/com/comcast/oscar/compiler/DPoECompiler.java b/src/com/comcast/oscar/compiler/DPoECompiler.java index eeb9b6a..01aa702 100644 --- a/src/com/comcast/oscar/compiler/DPoECompiler.java +++ b/src/com/comcast/oscar/compiler/DPoECompiler.java @@ -1,6 +1,9 @@ package com.comcast.oscar.compiler; +import com.comcast.oscar.cablelabsdefinitions.Constants; import com.comcast.oscar.configurationfile.ConfigurationFileTypeConstants; +import com.comcast.oscar.tlv.TlvBuilder; +import com.comcast.oscar.tlv.TlvException; /** * @bannerLicense @@ -55,7 +58,14 @@ public int getDPoEVersion() { /** * This method removes TopLevel TLVs that are not defined the Dictionary */ - public void removeNonConformingTopLevelTLV() { + public void removeNonDictionaryTopLevelTLV() { + + try { + baTlvBuffer = TlvBuilder.stripTlv(17, + TlvBuilder.stripTlv(Constants.CM_MIC, baTlvBuffer)); + } catch (TlvException e) { + e.printStackTrace(); + } } diff --git a/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java b/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java index 4e69d56..1928564 100644 --- a/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java +++ b/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java @@ -58,6 +58,7 @@ public class ConfigurationFileExport { + /*House the Configuration Byte Array */ private byte[] bTLV; private final boolean debug = Boolean.FALSE; @@ -1185,9 +1186,12 @@ private void init() { private void init(int iConfigurationFileType) { initBER(); - + if ((iConfigurationFileType >= DPOE_VER_10) || (iConfigurationFileType <= DPOE_VER_20)) { + + removeNonDictionaryTopLevelTLV(); + sConfigurationFileStart = "DPoE"; } } @@ -1318,6 +1322,11 @@ private StringBuilder banner() { return sbBanner; } + /** + * + * @param joTlvDictionary - JSON OBject of the Dictionary + * @return the Hint for the datatype that is used + */ private String getDisplayHint(JSONObject joTlvDictionary) { String sDisplayHint = ""; @@ -1395,5 +1404,21 @@ private String getDisplayHint(JSONObject joTlvDictionary) { return sDisplayHint; } + + /** + * This method will remove all TopLevel TLV that are not defined in the Dictionary + */ + private void removeNonDictionaryTopLevelTLV() { + /* Get TopLevel List*/ + + List liTopLevel = dsqDictionarySQLQueries.getTopLevelTLV(); + + if(debug) + System.out.println("removeNonDictionaryTopLevelTLV(): " + liTopLevel); + + /*Create new ByteArray*/ + bTLV = TlvBuilder.fetchTlv(liTopLevel, bTLV); + + } } From edff6eb23a3a2634255aa06379ddb0fc4264c2b3 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Sun, 24 May 2015 16:20:12 -0400 Subject: [PATCH 05/23] Update to v2.1.1 --- src/com/comcast/oscar/constants/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/comcast/oscar/constants/Constants.java b/src/com/comcast/oscar/constants/Constants.java index ad45232..1f46a38 100644 --- a/src/com/comcast/oscar/constants/Constants.java +++ b/src/com/comcast/oscar/constants/Constants.java @@ -23,7 +23,7 @@ public class Constants { private static final String TAB = "\t"; - public static final String OSCAR_VERSION = "2.1"; + public static final String OSCAR_VERSION = "2.1.1"; public static final String OSCAR_CLI_USAGE = "java -jar oscar.jar -k -i <.txt> -o <.bin> -c"; public static final String OSCAR_CLI_HEADER = "/* OSCAR -> OpenSource Cable modem file AssembleR v" + OSCAR_VERSION + " */"; public static final String OSCAR_CLI_NO_ARGS = "Type --help for information"; From 4cb97393761060bda9880c31037bd5bea6868460 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Sun, 24 May 2015 19:53:45 -0400 Subject: [PATCH 06/23] Added more Error handling Signed-off-by: Maurice Garcia --- src/com/comcast/oscar/netsnmp/NetSNMP.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/com/comcast/oscar/netsnmp/NetSNMP.java b/src/com/comcast/oscar/netsnmp/NetSNMP.java index 680251c..3380e46 100644 --- a/src/com/comcast/oscar/netsnmp/NetSNMP.java +++ b/src/com/comcast/oscar/netsnmp/NetSNMP.java @@ -50,6 +50,7 @@ public class NetSNMP { static { + /*If no Mapping Exist, Create a new Mapping file */ FixNullNetSNMPJSON(); omNetSNMP = new ObjectMapper(); @@ -57,14 +58,17 @@ public class NetSNMP { bmDotTextMap = new DualHashBidiMap(); try { - bmDotTextMap = omNetSNMP.readValue(DirectoryStructureNetSNMP.fNetSNMPJSON(), + bmDotTextMap = omNetSNMP.readValue( DirectoryStructureNetSNMP.fNetSNMPJSON(), new TypeReference>() {}); } catch (JsonParseException e) { - e.printStackTrace(); + System.out.println( "Error in reading " + Constants.DOTTED_TEXTUAL_NetSNMP_MAP_FILE + + ", Delete File"); } catch (JsonMappingException e) { - e.printStackTrace(); + System.out.println( "Error in reading " + Constants.DOTTED_TEXTUAL_NetSNMP_MAP_FILE + + ", Delete File"); } catch (IOException e) { - e.printStackTrace(); + System.out.println( "Error in reading " + Constants.DOTTED_TEXTUAL_NetSNMP_MAP_FILE + + ", Delete File"); } } @@ -101,14 +105,15 @@ public static String toDottedOID(String sOID) { /* Not a clean way to do it, but it works */ String sSnmpTranslate = Constants.SNMP_TRANSLATE_CMD + - Constants.MIB_PARAMETER + - Constants.SNMP_TRANSLATE_OID_NAME_2_OID_DEC + - sOID.replaceAll("\\s+1", " .iso") - .replaceAll("\\s+\\.1", " .iso"); + Constants.MIB_PARAMETER + + Constants.SNMP_TRANSLATE_OID_NAME_2_OID_DEC + + sOID.replaceAll("\\s+1", " .iso") + .replaceAll("\\s+\\.1", " .iso"); if (debug|localDebug) System.out.println("NetSNMP.toDottedOID(): " + sSnmpTranslate); + /* Get the String Return */ sDottedOID = runSnmpTranslate(sSnmpTranslate).get(0); /* Add Converted OIDS to Map for later Storage */ From 821d8b237ff0bbb02da902849b5876cb65e6adb3 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Mon, 25 May 2015 11:57:33 -0400 Subject: [PATCH 07/23] Fixed Reorder issue in Decompiling of DPoE File --- .../ConfigurationFileExport.java | 31 +++++++++++++++---- src/com/comcast/oscar/tlv/TlvBuilder.java | 1 - 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java b/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java index 1928564..61eeb81 100644 --- a/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java +++ b/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -1409,15 +1410,33 @@ private String getDisplayHint(JSONObject joTlvDictionary) { * This method will remove all TopLevel TLV that are not defined in the Dictionary */ private void removeNonDictionaryTopLevelTLV() { - /* Get TopLevel List*/ - - List liTopLevel = dsqDictionarySQLQueries.getTopLevelTLV(); - if(debug) - System.out.println("removeNonDictionaryTopLevelTLV(): " + liTopLevel); + Boolean localDebug = Boolean.TRUE; + + /* Get TopLevel List*/ + List liTopLevelDict = dsqDictionarySQLQueries.getTopLevelTLV(); + + List liTopLevelCFE = null; + + try { + liTopLevelCFE = getTlvBuilder().getTopLevelTlvList(); + } catch (TlvException e) { + e.printStackTrace(); + } + + /*This will create a single instance of each Type */ + liTopLevelCFE = new ArrayList(new LinkedHashSet(liTopLevelCFE)); + + /*Remove Types that are not suppose to be here */ + liTopLevelCFE.retainAll(liTopLevelDict); + + if(debug|localDebug) { + System.out.println("removeNonDictionaryTopLevelTLV() -> DICT: " + liTopLevelDict); + System.out.println("removeNonDictionaryTopLevelTLV() -> CFE remove DICT: " + liTopLevelCFE); + } /*Create new ByteArray*/ - bTLV = TlvBuilder.fetchTlv(liTopLevel, bTLV); + bTLV = TlvBuilder.fetchTlv(liTopLevelCFE, bTLV); } diff --git a/src/com/comcast/oscar/tlv/TlvBuilder.java b/src/com/comcast/oscar/tlv/TlvBuilder.java index f3ec95b..5d8f4d6 100644 --- a/src/com/comcast/oscar/tlv/TlvBuilder.java +++ b/src/com/comcast/oscar/tlv/TlvBuilder.java @@ -546,7 +546,6 @@ public byte[] toByteArray() { /** * - * @return a list of TopLevel TLV * @see com.comcast.oscar.tlv.TlvBuild#getTopLevelTlvList() */ public List getTopLevelTlvList() { From da707c5027640bbfc30720ddaf425f097628eb63 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Mon, 25 May 2015 11:59:40 -0400 Subject: [PATCH 08/23] Signed-off-by: Maurice Garcia --- .../oscar/configurationfile/ConfigurationFileExport.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java b/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java index 61eeb81..aef984b 100644 --- a/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java +++ b/src/com/comcast/oscar/configurationfile/ConfigurationFileExport.java @@ -1408,10 +1408,11 @@ private String getDisplayHint(JSONObject joTlvDictionary) { /** * This method will remove all TopLevel TLV that are not defined in the Dictionary + * Currently support 1 byte Length TLVs */ private void removeNonDictionaryTopLevelTLV() { - Boolean localDebug = Boolean.TRUE; + Boolean localDebug = Boolean.FALSE; /* Get TopLevel List*/ List liTopLevelDict = dsqDictionarySQLQueries.getTopLevelTLV(); @@ -1427,7 +1428,7 @@ private void removeNonDictionaryTopLevelTLV() { /*This will create a single instance of each Type */ liTopLevelCFE = new ArrayList(new LinkedHashSet(liTopLevelCFE)); - /*Remove Types that are not suppose to be here */ + /*Remove Types that are not suppose to be There */ liTopLevelCFE.retainAll(liTopLevelDict); if(debug|localDebug) { From 3613b93c2462b2d4e428aa99584efd1e2218a9b0 Mon Sep 17 00:00:00 2001 From: Maurice Garcia Date: Mon, 25 May 2015 02:39:52 -0400 Subject: [PATCH 09/23] Javadoc Update --- doc/allclasses-frame.html | 24 +- doc/allclasses-noframe.html | 24 +- .../comcast/oscar/ber/BEROIDConversion.html | 204 +-- doc/com/comcast/oscar/ber/BERService.html | 422 ++++--- .../comcast/oscar/ber/OIDBERConversion.html | 175 ++- .../OIDCollectionDuplicationValidation.html | 152 ++- doc/com/comcast/oscar/ber/OIDToJSONArray.html | 169 ++- .../oscar/ber/class-use/BEROIDConversion.html | 45 +- .../oscar/ber/class-use/BERService.html | 37 +- .../oscar/ber/class-use/OIDBERConversion.html | 37 +- .../OIDCollectionDuplicationValidation.html | 37 +- .../oscar/ber/class-use/OIDToJSONArray.html | 37 +- doc/com/comcast/oscar/ber/package-frame.html | 5 +- .../comcast/oscar/ber/package-summary.html | 47 +- doc/com/comcast/oscar/ber/package-tree.html | 49 +- doc/com/comcast/oscar/ber/package-use.html | 41 +- .../comcast/oscar/buildbulk/BulkBuild.html | 243 ++-- .../oscar/buildbulk/MergeBulkBuild.html | 193 +-- .../buildbulk/MergeBulkBuildException.html | 128 +- .../oscar/buildbulk/class-use/BulkBuild.html | 37 +- .../buildbulk/class-use/MergeBulkBuild.html | 37 +- .../class-use/MergeBulkBuildException.html | 37 +- .../oscar/buildbulk/package-frame.html | 5 +- .../oscar/buildbulk/package-summary.html | 49 +- .../comcast/oscar/buildbulk/package-tree.html | 45 +- .../comcast/oscar/buildbulk/package-use.html | 37 +- .../oscar/cablelabsdefinitions/Constants.html | 395 +++--- .../class-use/Constants.html | 37 +- .../cablelabsdefinitions/package-frame.html | 5 +- .../cablelabsdefinitions/package-summary.html | 47 +- .../cablelabsdefinitions/package-tree.html | 41 +- .../cablelabsdefinitions/package-use.html | 37 +- doc/com/comcast/oscar/cli/BuildOptions.html | 278 ++++ doc/com/comcast/oscar/cli/CommandRun.html | 190 +-- doc/com/comcast/oscar/cli/Main.html | 108 +- .../oscar/cli/class-use/BuildOptions.html | 124 ++ .../oscar/cli/class-use/CommandRun.html | 37 +- doc/com/comcast/oscar/cli/class-use/Main.html | 37 +- doc/com/comcast/oscar/cli/commands/CVC.html | 189 +-- .../comcast/oscar/cli/commands/Decompile.html | 324 +++++ .../oscar/cli/commands/DigitmapDisplay.html | 130 +- .../oscar/cli/commands/DigitmapInsert.html | 156 ++- .../cli/commands/DownstreamFrequency.html | 124 +- .../comcast/oscar/cli/commands/Firmware.html | 124 +- .../oscar/cli/commands/FullTLVDisplay.html | 119 +- .../oscar/cli/commands/HexDisplay.html | 144 ++- doc/com/comcast/oscar/cli/commands/Input.html | 167 ++- .../oscar/cli/commands/JSONDisplay.html | 138 +- .../comcast/oscar/cli/commands/JSONtoTLV.html | 151 ++- doc/com/comcast/oscar/cli/commands/Key.html | 130 +- .../comcast/oscar/cli/commands/MaxCPE.html | 124 +- .../comcast/oscar/cli/commands/MergeBulk.html | 403 ++++++ doc/com/comcast/oscar/cli/commands/OID.html | 156 ++- .../comcast/oscar/cli/commands/Output.html | 145 ++- .../oscar/cli/commands/Specification.html | 173 ++- .../oscar/cli/commands/TFTPServer.html | 189 +-- doc/com/comcast/oscar/cli/commands/TLV.html | 124 +- .../oscar/cli/commands/TLVDescription.html | 145 ++- .../comcast/oscar/cli/commands/TLVtoJSON.html | 145 ++- .../oscar/cli/commands/TextFormat.html | 237 ++++ .../comcast/oscar/cli/commands/Translate.html | 301 +++++ .../oscar/cli/commands/class-use/CVC.html | 37 +- .../cli/commands/class-use/Decompile.html | 124 ++ .../commands/class-use/DigitmapDisplay.html | 37 +- .../commands/class-use/DigitmapInsert.html | 37 +- .../class-use/DownstreamFrequency.html | 37 +- .../cli/commands/class-use/Firmware.html | 37 +- .../commands/class-use/FullTLVDisplay.html | 37 +- .../cli/commands/class-use/HexDisplay.html | 37 +- .../oscar/cli/commands/class-use/Input.html | 37 +- .../cli/commands/class-use/JSONDisplay.html | 37 +- .../cli/commands/class-use/JSONtoTLV.html | 37 +- .../oscar/cli/commands/class-use/Key.html | 37 +- .../oscar/cli/commands/class-use/MaxCPE.html | 37 +- .../cli/commands/class-use/MergeBulk.html | 124 ++ .../oscar/cli/commands/class-use/OID.html | 37 +- .../oscar/cli/commands/class-use/Output.html | 37 +- .../cli/commands/class-use/Specification.html | 37 +- .../cli/commands/class-use/TFTPServer.html | 37 +- .../oscar/cli/commands/class-use/TLV.html | 37 +- .../commands/class-use/TLVDescription.html | 37 +- .../cli/commands/class-use/TLVtoJSON.html | 37 +- .../cli/commands/class-use/TextFormat.html | 124 ++ .../cli/commands/class-use/Translate.html | 124 ++ .../oscar/cli/commands/package-frame.html | 9 +- .../oscar/cli/commands/package-summary.html | 89 +- .../oscar/cli/commands/package-tree.html | 81 +- .../oscar/cli/commands/package-use.html | 37 +- doc/com/comcast/oscar/cli/package-frame.html | 6 +- .../comcast/oscar/cli/package-summary.html | 53 +- doc/com/comcast/oscar/cli/package-tree.html | 44 +- doc/com/comcast/oscar/cli/package-use.html | 37 +- .../oscar/compiler/CompilerException.html | 128 +- .../comcast/oscar/compiler/DPoECompiler.html | 163 ++- .../comcast/oscar/compiler/DPoEConstants.html | 102 +- .../oscar/compiler/DocsisCompiler.html | 284 +++-- .../oscar/compiler/DocsisConstants.html | 102 +- .../oscar/compiler/PacketCableCompiler.html | 249 ++-- .../oscar/compiler/PacketCableConstants.html | 172 ++- .../compiler/class-use/CompilerException.html | 37 +- .../compiler/class-use/DPoECompiler.html | 37 +- .../compiler/class-use/DPoEConstants.html | 37 +- .../compiler/class-use/DocsisCompiler.html | 43 +- .../compiler/class-use/DocsisConstants.html | 37 +- .../class-use/PacketCableCompiler.html | 37 +- .../class-use/PacketCableConstants.html | 37 +- .../comcast/oscar/compiler/package-frame.html | 5 +- .../oscar/compiler/package-summary.html | 49 +- .../comcast/oscar/compiler/package-tree.html | 55 +- .../comcast/oscar/compiler/package-use.html | 41 +- .../CommonTlvInsertions.html | 582 +++++---- .../configurationfile/ConfigurationFile.html | 439 ++++--- .../ConfigurationFileException.html | 128 +- .../ConfigurationFileExport.html | 411 +++--- .../ConfigurationFileImport.html | 240 ++-- .../ConfigurationFileTypeConstants.html | 111 +- .../configurationfile/DigitMapOperation.html | 205 +-- .../class-use/CommonTlvInsertions.html | 47 +- .../class-use/ConfigurationFile.html | 73 +- .../class-use/ConfigurationFileException.html | 65 +- .../class-use/ConfigurationFileExport.html | 43 +- .../class-use/ConfigurationFileImport.html | 47 +- .../ConfigurationFileTypeConstants.html | 37 +- .../class-use/DigitMapOperation.html | 37 +- .../configurationfile/package-frame.html | 5 +- .../configurationfile/package-summary.html | 49 +- .../oscar/configurationfile/package-tree.html | 53 +- .../oscar/configurationfile/package-use.html | 47 +- .../comcast/oscar/constants/Constants.html | 158 ++- .../oscar/constants/class-use/Constants.html | 37 +- .../oscar/constants/package-frame.html | 5 +- .../oscar/constants/package-summary.html | 47 +- .../comcast/oscar/constants/package-tree.html | 41 +- .../comcast/oscar/constants/package-use.html | 37 +- .../datatype/DataTypeDictionaryReference.html | 207 +-- .../datatype/DataTypeFormatConversion.html | 564 +++++---- .../datatype/DataTypeFormatException.html | 128 +- .../DataTypeDictionaryReference.html | 37 +- .../class-use/DataTypeFormatConversion.html | 37 +- .../class-use/DataTypeFormatException.html | 55 +- .../comcast/oscar/datatype/package-frame.html | 5 +- .../oscar/datatype/package-summary.html | 49 +- .../comcast/oscar/datatype/package-tree.html | 45 +- .../comcast/oscar/datatype/package-use.html | 41 +- .../comcast/oscar/dictionary/Dictionary.html | 323 +++-- .../dictionary/DictionarySQLConstants.html | 116 +- .../dictionary/DictionarySQLQueries.html | 291 +++-- .../DictionarySQLQueriesException.html | 128 +- .../oscar/dictionary/DictionaryTLV.html | 247 ++-- .../dictionary/class-use/Dictionary.html | 49 +- .../class-use/DictionarySQLConstants.html | 37 +- .../class-use/DictionarySQLQueries.html | 47 +- .../DictionarySQLQueriesException.html | 37 +- .../dictionary/class-use/DictionaryTLV.html | 37 +- .../oscar/dictionary/package-frame.html | 7 +- .../oscar/dictionary/package-summary.html | 93 +- .../oscar/dictionary/package-tree.html | 51 +- .../comcast/oscar/dictionary/package-use.html | 129 +- .../oscar/interpreter/Interpreter.html | 148 ++- .../interpreter/class-use/Interpreter.html | 37 +- .../oscar/interpreter/package-frame.html | 5 +- .../oscar/interpreter/package-summary.html | 47 +- .../oscar/interpreter/package-tree.html | 41 +- .../oscar/interpreter/package-use.html | 37 +- doc/com/comcast/oscar/netsnmp/Constants.html | 149 ++- .../NetSNMP.DirectoryStructureNetSNMP.html | 116 +- doc/com/comcast/oscar/netsnmp/NetSNMP.html | 190 +-- .../oscar/netsnmp/class-use/Constants.html | 37 +- .../NetSNMP.DirectoryStructureNetSNMP.html | 37 +- .../oscar/netsnmp/class-use/NetSNMP.html | 37 +- .../comcast/oscar/netsnmp/package-frame.html | 5 +- .../oscar/netsnmp/package-summary.html | 47 +- .../comcast/oscar/netsnmp/package-tree.html | 47 +- .../comcast/oscar/netsnmp/package-use.html | 37 +- .../parser/TlvConfigurationFileParser.html | 531 ++++---- .../class-use/TlvConfigurationFileParser.html | 37 +- .../parser/class-use/tlvBaseListener.html | 43 +- .../oscar/parser/class-use/tlvLexer.html | 37 +- .../oscar/parser/class-use/tlvListener.html | 49 +- .../class-use/tlvParser.BeginContext.html | 61 +- .../tlvParser.ConfigTypeContext.html | 67 +- .../class-use/tlvParser.DataTypeContext.html | 63 +- .../class-use/tlvParser.EmptyTLVContext.html | 65 +- .../class-use/tlvParser.OidContext.html | 63 +- .../class-use/tlvParser.STlvContext.html | 71 +- .../class-use/tlvParser.SnmpContext.html | 81 +- .../class-use/tlvParser.SnmpTypeContext.html | 63 +- .../class-use/tlvParser.StartTLVContext.html | 71 +- .../class-use/tlvParser.SubContext.html | 73 +- .../class-use/tlvParser.SubTLVContext.html | 67 +- .../class-use/tlvParser.SubTypeContext.html | 63 +- .../tlvParser.SubTypeValueContext.html | 67 +- .../class-use/tlvParser.TlvContext.html | 71 +- .../class-use/tlvParser.TypeContext.html | 61 +- .../class-use/tlvParser.TypeValueContext.html | 67 +- .../class-use/tlvParser.ValueContext.html | 63 +- .../oscar/parser/class-use/tlvParser.html | 37 +- .../comcast/oscar/parser/package-frame.html | 7 +- .../comcast/oscar/parser/package-summary.html | 55 +- .../comcast/oscar/parser/package-tree.html | 83 +- doc/com/comcast/oscar/parser/package-use.html | 51 +- .../comcast/oscar/parser/tlvBaseListener.html | 915 ++++++++------ doc/com/comcast/oscar/parser/tlvLexer.html | 683 ++++++---- doc/com/comcast/oscar/parser/tlvListener.html | 651 ++++++---- .../oscar/parser/tlvParser.BeginContext.html | 167 +-- .../parser/tlvParser.ConfigTypeContext.html | 137 +- .../parser/tlvParser.DataTypeContext.html | 137 +- .../parser/tlvParser.EmptyTLVContext.html | 155 +-- .../oscar/parser/tlvParser.OidContext.html | 137 +- .../oscar/parser/tlvParser.STlvContext.html | 149 ++- .../oscar/parser/tlvParser.SnmpContext.html | 185 +-- .../parser/tlvParser.SnmpTypeContext.html | 137 +- .../parser/tlvParser.StartTLVContext.html | 161 +-- .../oscar/parser/tlvParser.SubContext.html | 167 +-- .../oscar/parser/tlvParser.SubTLVContext.html | 161 +-- .../parser/tlvParser.SubTypeContext.html | 143 ++- .../parser/tlvParser.SubTypeValueContext.html | 209 +-- .../oscar/parser/tlvParser.TlvContext.html | 149 ++- .../oscar/parser/tlvParser.TypeContext.html | 143 ++- .../parser/tlvParser.TypeValueContext.html | 209 +-- .../oscar/parser/tlvParser.ValueContext.html | 137 +- doc/com/comcast/oscar/parser/tlvParser.html | 1033 ++++++++++----- .../Main.DirectoryStructureAntlr.html | 140 ++- doc/com/comcast/oscar/parserbuilder/Main.html | 113 +- .../Main.DirectoryStructureAntlr.html | 37 +- .../oscar/parserbuilder/class-use/Main.html | 37 +- .../oscar/parserbuilder/package-frame.html | 5 +- .../oscar/parserbuilder/package-summary.html | 47 +- .../oscar/parserbuilder/package-tree.html | 45 +- .../oscar/parserbuilder/package-use.html | 37 +- doc/com/comcast/oscar/sql/SQLDefintion.html | 124 +- doc/com/comcast/oscar/sql/SqlConnection.html | 144 ++- .../oscar/sql/class-use/SQLDefintion.html | 37 +- .../oscar/sql/class-use/SqlConnection.html | 47 +- doc/com/comcast/oscar/sql/package-frame.html | 5 +- .../comcast/oscar/sql/package-summary.html | 47 +- doc/com/comcast/oscar/sql/package-tree.html | 43 +- doc/com/comcast/oscar/sql/package-use.html | 43 +- .../oscar/sql/queries/DPoESqlQuery.html | 124 +- .../oscar/sql/queries/DocsisSqlQuery.html | 187 +-- .../sql/queries/DocsisSqlQueryException.html | 124 +- .../sql/queries/PacketCableSqlQuery.html | 170 ++- .../queries/PacketCableSqlQueryConstants.html | 270 ++-- .../queries/PacketCableSqlQueryException.html | 128 +- .../sql/queries/class-use/DPoESqlQuery.html | 37 +- .../sql/queries/class-use/DocsisSqlQuery.html | 43 +- .../class-use/DocsisSqlQueryException.html | 37 +- .../class-use/PacketCableSqlQuery.html | 37 +- .../PacketCableSqlQueryConstants.html | 37 +- .../PacketCableSqlQueryException.html | 37 +- .../oscar/sql/queries/package-frame.html | 5 +- .../oscar/sql/queries/package-summary.html | 49 +- .../oscar/sql/queries/package-tree.html | 55 +- .../oscar/sql/queries/package-use.html | 41 +- doc/com/comcast/oscar/tlv/TlvAssembler.html | 133 +- doc/com/comcast/oscar/tlv/TlvBuild.html | 177 +-- doc/com/comcast/oscar/tlv/TlvBuilder.html | 1117 +++++++++++------ doc/com/comcast/oscar/tlv/TlvDisassemble.html | 224 ++-- doc/com/comcast/oscar/tlv/TlvException.html | 128 +- .../comcast/oscar/tlv/TlvVariableBinding.html | 431 ++++--- .../oscar/tlv/class-use/TlvAssembler.html | 37 +- .../comcast/oscar/tlv/class-use/TlvBuild.html | 55 +- .../oscar/tlv/class-use/TlvBuilder.html | 129 +- .../oscar/tlv/class-use/TlvDisassemble.html | 37 +- .../oscar/tlv/class-use/TlvException.html | 117 +- .../tlv/class-use/TlvVariableBinding.html | 51 +- doc/com/comcast/oscar/tlv/package-frame.html | 7 +- .../comcast/oscar/tlv/package-summary.html | 51 +- doc/com/comcast/oscar/tlv/package-tree.html | 59 +- doc/com/comcast/oscar/tlv/package-use.html | 47 +- .../oscar/utilities/BinaryConversion.html | 185 +-- doc/com/comcast/oscar/utilities/CheckSum.html | 111 +- .../oscar/utilities/DirectoryStructure.html | 255 ++-- doc/com/comcast/oscar/utilities/Disk.html | 131 +- .../oscar/utilities/FileConversions.html | 111 +- doc/com/comcast/oscar/utilities/HexDump.html | 229 ++-- .../comcast/oscar/utilities/HexString.html | 642 ++++++---- .../comcast/oscar/utilities/JSONTools.html | 250 ++-- .../comcast/oscar/utilities/PrettyPrint.html | 142 ++- doc/com/comcast/oscar/utilities/Zip.html | 128 +- .../utilities/class-use/BinaryConversion.html | 37 +- .../oscar/utilities/class-use/CheckSum.html | 37 +- .../class-use/DirectoryStructure.html | 69 +- .../oscar/utilities/class-use/Disk.html | 37 +- .../utilities/class-use/FileConversions.html | 37 +- .../oscar/utilities/class-use/HexDump.html | 37 +- .../oscar/utilities/class-use/HexString.html | 67 +- .../oscar/utilities/class-use/JSONTools.html | 37 +- .../utilities/class-use/PrettyPrint.html | 37 +- .../oscar/utilities/class-use/Zip.html | 37 +- .../oscar/utilities/package-frame.html | 5 +- .../oscar/utilities/package-summary.html | 47 +- .../comcast/oscar/utilities/package-tree.html | 59 +- .../comcast/oscar/utilities/package-use.html | 70 +- doc/constant-values.html | 155 +-- doc/deprecated-list.html | 57 +- doc/help-doc.html | 39 +- doc/index-files/index-1.html | 107 +- doc/index-files/index-10.html | 55 +- doc/index-files/index-11.html | 49 +- doc/index-files/index-12.html | 83 +- doc/index-files/index-13.html | 159 +-- doc/index-files/index-14.html | 73 +- doc/index-files/index-15.html | 147 ++- doc/index-files/index-16.html | 327 ++--- doc/index-files/index-17.html | 119 +- doc/index-files/index-18.html | 307 ++--- doc/index-files/index-19.html | 609 ++++----- doc/index-files/index-2.html | 285 ++--- doc/index-files/index-20.html | 69 +- doc/index-files/index-21.html | 109 +- doc/index-files/index-22.html | 63 +- doc/index-files/index-23.html | 51 +- doc/index-files/index-24.html | 59 +- doc/index-files/index-3.html | 253 ++-- doc/index-files/index-4.html | 451 +++---- doc/index-files/index-5.html | 527 ++++---- doc/index-files/index-6.html | 123 +- doc/index-files/index-7.html | 331 ++--- doc/index-files/index-8.html | 131 +- doc/index-files/index-9.html | 253 ++-- doc/index.html | 2 +- doc/overview-frame.html | 8 +- doc/overview-summary.html | 43 +- doc/overview-tree.html | 261 ++-- doc/package-list | 1 - doc/script.js | 30 + doc/serialized-form.html | 69 +- 328 files changed, 23605 insertions(+), 15342 deletions(-) create mode 100644 doc/com/comcast/oscar/cli/BuildOptions.html create mode 100644 doc/com/comcast/oscar/cli/class-use/BuildOptions.html create mode 100644 doc/com/comcast/oscar/cli/commands/Decompile.html create mode 100644 doc/com/comcast/oscar/cli/commands/MergeBulk.html create mode 100644 doc/com/comcast/oscar/cli/commands/TextFormat.html create mode 100644 doc/com/comcast/oscar/cli/commands/Translate.html create mode 100644 doc/com/comcast/oscar/cli/commands/class-use/Decompile.html create mode 100644 doc/com/comcast/oscar/cli/commands/class-use/MergeBulk.html create mode 100644 doc/com/comcast/oscar/cli/commands/class-use/TextFormat.html create mode 100644 doc/com/comcast/oscar/cli/commands/class-use/Translate.html create mode 100644 doc/script.js diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index 4ef295c..19add32 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -2,28 +2,26 @@ - + All Classes - + + -

All Classes

+

All Classes

diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html index f9ec3fc..91ae7b3 100644 --- a/doc/allclasses-noframe.html +++ b/doc/allclasses-noframe.html @@ -2,28 +2,26 @@ - + All Classes - + + -

All Classes

+

All Classes

diff --git a/doc/com/comcast/oscar/ber/BEROIDConversion.html b/doc/com/comcast/oscar/ber/BEROIDConversion.html index 669fb26..f6836a4 100644 --- a/doc/com/comcast/oscar/ber/BEROIDConversion.html +++ b/doc/com/comcast/oscar/ber/BEROIDConversion.html @@ -2,25 +2,38 @@ - + BEROIDConversion - + + -
+
- + + +