docsis: add diplexer config

Author: olebowle

SOURCES/docsis_dialplan.patch

@@ -159,20 +159,20 @@ diff --git a/src/docsis_common.h b/src/docsis_common.h
 index a3aeefe..b94460e 100644
 --- a/src/docsis_common.h
 +++ b/src/docsis_common.h
-@@ -32,11 +32,11 @@
+@@ -25,10 +25,10 @@
+ #define _DOCSIS_COMMON_H
 
- 
- #ifndef NUM_IDENTIFIERS
--#define NUM_IDENTIFIERS 1427
+ /* needed in docsis_symtable.h */
+-#define NUM_IDENTIFIERS 1539
 +#define NUM_IDENTIFIERS 9000
- #endif /*  NUM_IDENTIFIERS, needed in docsis_symtable.h  */
 
  #define MAXINT 2000000000
 -#define TLV_VSIZE 1024
 +#define TLV_VSIZE 16384
  #define TRUE 1
  #define FALSE 0
 
+
 diff --git a/src/docsis_decode.c b/src/docsis_decode.c
 index b0a5b77..f4e6ce5 100644
 --- a/src/docsis_decode.c

SOURCES/docsis_edge.patch

@@ -0,0 +1,27 @@
+diff --git a/src/docsis_common.h b/src/docsis_common.h
+index 424418e..3e626da 100644
+--- a/src/docsis_common.h
++++ b/src/docsis_common.h
+@@ -25,7 +25,7 @@
+ #define _DOCSIS_COMMON_H
+ 
+ /* needed in docsis_symtable.h */
+-#define NUM_IDENTIFIERS 1536
++#define NUM_IDENTIFIERS 1539
+ 
+ #define MAXINT 2000000000
+ #define TLV_VSIZE 1024
+diff --git a/src/docsis_symtable.h b/src/docsis_symtable.h
+index bb2b070..b8a1d76 100644
+--- a/src/docsis_symtable.h
++++ b/src/docsis_symtable.h
+@@ -106,6 +106,9 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
+ { 271,    "EnergyManagementCapabilities",      44,     144,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 5.44 MULPIv3.0-I24 Annex C.1.3.1.43 */
+ { 272,    "CDOCSISCapabilityEncoding",         45,     144,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 5.45 MULPIv3.0-I24 Annex C.1.3.1.44 */
+ { 273,    "CMSTATUSACK",                       46,     144,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 5.46 MULPIv3.0-I24 Annex C.1.3.1.45 */
++{ 1536,   "DownstreamLowerBandEdgeSupport",    54,     144,    (encode_hexstr),         (decode_hexstr),         0,           1             }, /* TLV 5.54 MULPIv3.1-I25 Annex C.1.3.1.53 */
++{ 1537,   "DownstreamUpperBandEdgeSupport",    55,     144,    (encode_hexstr),         (decode_hexstr),         0,           1             }, /* TLV 5.55 MULPIv3.1-I25 Annex C.1.3.1.54 */
++{ 1538,   "DiplexerUpperBandEdgeSupport",      56,     144,    (encode_uchar),          (decode_uchar),          0,           4             }, /* TLV 5.56 MULPIv3.1-I25 Annex C.1.3.1.55 */
+ { 4,      "CmMic",                             6,      0,      (encode_nothing),        (decode_md5),            0,           0             }, /* TLV 6 MULPIv3.0-I24 Annex C.1.1.5 */
+ { 5,      "CmtsMic",                           7,      0,      (encode_nothing),        (decode_md5),            0,           0             }, /* TLV 7 MULPIv3.0-I24 Annex C.1.1.6 */
+ { 14,     "SwUpgradeFilename",                 9,      0,      (encode_string),         (decode_string),         0,           0             }, /* TLV 9 MULPIv3.0-I24 Annex C.1.2.3 */

SPECS/docsis.spec

@@ -1,13 +1,14 @@
 Name: docsis
-Version: 0.9.8.r393.gd7c9643
-Release: 2
+Version: 0.9.8.r402.g24c9f9f
+Release: 1
 Summary: Human-readable text to binary configuration file converter
 
 Group: Applications/Communications
 License: GPLv2
 URL: http://docsis.sourceforge.net
-Source: https://github.com/rlaager/%{name}/archive/d7c9643.tar.gz
-Patch: docsis_dialplan.patch
+Source: https://github.com/rlaager/%{name}/archive/24c9f9f.tar.gz
+Patch0: docsis_edge.patch
+Patch1: docsis_dialplan.patch
 
 BuildRequires: autoconf automake libtool glib2-devel bison flex net-snmp-devel
 
@@ -17,7 +18,7 @@ text configuration file. This tool is fully compliant with the following specs:
 CM-SP-eRouter-I12, DPoE-SP-DEMARCv1.0-I04, CM-SP-L2VPN-I13, CM-SP-MULPIv3.0-I24
 
 %prep
-%autosetup -p1 -n docsis-d7c9643a66bff27278cf9096e7e4a6b7c0427142
+%autosetup -p1 -n docsis-24c9f9f8cbcaa5e55fe0d6ce189d1e56c3cc5c94
 sed -i 's/\[gm4 gnum4 m4\], \[notfound\],\[/\[gm4 gnum4 m4\], \[notfound\],\[\/usr\/bin:/' configure.ac
 
 %build
@@ -37,6 +38,12 @@ cp mibs/*.txt %{buildroot}%{_datarootdir}/snmp/mibs
 %{_datarootdir}/snmp/mibs/*.txt
 
 %changelog
+* Mon Jan 27 2025 Ole Ernst <ole.ernst@nmsprime.com> - 0.9.8.r402.g24c9f9f-1
+- Bump to latest commit
+- Add C.1.3.1.53 Downstream Lower Band Edge Configuration
+- Add C.1.3.1.54 Downstream Upper Band Edge Configuration
+- Add C.1.3.1.55 Diplexer Upstream Upper Band Edge Configuration
+
 * Tue Nov 08 2022 Ole Ernst <ole.ernst@nmsprime.com> - 0.9.8.r393.gd7c9643-2
 - Fix compiling with Almalinux 9