Eric Betts 2 лет назад
Родитель
Сommit
dbe6339695
3 измененных файлов с 24 добавлено и 12 удалено
  1. 18 8
      lib/asn1/SamVersion.c
  2. 3 2
      lib/asn1/SamVersion.h
  3. 3 2
      seader.asn1

+ 18 - 8
lib/asn1/SamVersion.c

@@ -8,37 +8,47 @@
 #include "SamVersion.h"
 
 static asn_TYPE_member_t asn_MBR_SamVersion_1[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct SamVersion, v),
+	{ ATF_NOFLAGS, 0, offsetof(struct SamVersion, version),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		0,
 		{ 0, 0, 0 },
 		0, 0, /* No default value */
-		"v"
+		"version"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct SamVersion, f),
+	{ ATF_NOFLAGS, 0, offsetof(struct SamVersion, firmware),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		0,
 		{ 0, 0, 0 },
 		0, 0, /* No default value */
-		"f"
+		"firmware"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct SamVersion, type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_OCTET_STRING,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"type"
 		},
 };
 static const ber_tlv_tag_t asn_DEF_SamVersion_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static const asn_TYPE_tag2member_t asn_MAP_SamVersion_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* v */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* f */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* version */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* firmware */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* type */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_SamVersion_specs_1 = {
 	sizeof(struct SamVersion),
 	offsetof(struct SamVersion, _asn_ctx),
 	asn_MAP_SamVersion_tag2el_1,
-	2,	/* Count of tags in the map */
+	3,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* First extension addition */
 };
@@ -54,7 +64,7 @@ asn_TYPE_descriptor_t asn_DEF_SamVersion = {
 		/sizeof(asn_DEF_SamVersion_tags_1[0]), /* 1 */
 	{ 0, 0, SEQUENCE_constraint },
 	asn_MBR_SamVersion_1,
-	2,	/* Elements count */
+	3,	/* Elements count */
 	&asn_SPC_SamVersion_specs_1	/* Additional specs */
 };
 

+ 3 - 2
lib/asn1/SamVersion.h

@@ -21,8 +21,9 @@ extern "C" {
 
 /* SamVersion */
 typedef struct SamVersion {
-	OCTET_STRING_t	 v;
-	OCTET_STRING_t	 f;
+	OCTET_STRING_t	 version;
+	OCTET_STRING_t	 firmware;
+	OCTET_STRING_t	 type;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;

+ 3 - 2
seader.asn1

@@ -81,8 +81,9 @@ FrameProtocol ::= ENUMERATED {
 }
 
 SamVersion ::= SEQUENCE {
-  v [0] IMPLICIT OCTET STRING,
-  f [1] IMPLICIT OCTET STRING
+  version [0] IMPLICIT OCTET STRING,
+  firmware [1] IMPLICIT OCTET STRING,
+  type [2] IMPLICIT OCTET STRING
 }
 
 END