From 72f5386147a1700258f3f3972bd59d6f9a559c95 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 2 Jun 2005 11:22:56 +0000
Subject: [PATCH] added octet string encoding/decoding.

---
 bacnet-stack/bacdcode.c | 58 +++++++++++++++++++++++++++++++++++++++++
 bacnet-stack/bacdcode.h | 11 ++++++++
 2 files changed, 69 insertions(+)

diff --git a/bacnet-stack/bacdcode.c b/bacnet-stack/bacdcode.c
index 3e49e952..5bbd5174 100644
--- a/bacnet-stack/bacdcode.c
+++ b/bacnet-stack/bacdcode.c
@@ -854,6 +854,64 @@ int encode_tagged_object_id(
     return len;
 }
 
+// from clause 20.2.8 Encoding of an Octet String Value
+// returns the number of apdu bytes consumed
+int encode_octet_string(uint8_t * apdu, const uint8_t *octet_string,
+  unsigned len)
+{
+    unsigned i;
+
+    // limit - 6 octets is the most our tag and type could be
+    if (len > (MAX_APDU - 6))
+        len = MAX_APDU - 6;
+    for (i = 0; i < len; i++) {
+        apdu[i] = char_string[i];
+    }
+
+    return len;
+}
+    
+// from clause 20.2.8 Encoding of an Octet String Value
+// and 20.2.1 General Rules for Encoding BACnet Tags
+// returns the number of apdu bytes consumed
+int encode_tagged_octet_string(uint8_t * apdu, const uint8_t *octet_string,
+  unsigned len)
+{
+    int apdu_len;
+    
+    apdu_len = encode_tag(&apdu[0], BACNET_APPLICATION_TAG_OCTET_STRING,
+        false, len);
+    if ((apdu_len + len) < MAX_APDU)
+      apdu_len += encode_octet_string(&apdu[len], octet_string, len);
+    else
+      apdu_len = 0;
+
+    return apdu_len;
+}
+
+// from clause 20.2.8 Encoding of an Octet String Value
+// and 20.2.1 General Rules for Encoding BACnet Tags
+// returns the number of apdu bytes consumed
+int decode_octet_string(uint8_t * apdu, uint32_t len_value,
+    uint8_t *buffer, size_t buffer_len)
+{
+    int len = 0; // return value
+    uint32_t i = 0; // counter
+
+    // FIXME: issue warning?
+    if (len_value > buffer_len)
+        len_value = buffer_len;
+
+    if (len_value) {
+        for (i = 0; i < len_value; i++) {
+            buffer[i] = apdu[i];
+        }
+        len += len_value;
+    }
+
+    return len;
+}
+
 // from clause 20.2.9 Encoding of a Character String Value
 // returns the number of apdu bytes consumed
 int encode_bacnet_string(uint8_t * apdu, const char *char_string, int len)
diff --git a/bacnet-stack/bacdcode.h b/bacnet-stack/bacdcode.h
index 0e6ff715..2382e987 100644
--- a/bacnet-stack/bacdcode.h
+++ b/bacnet-stack/bacdcode.h
@@ -121,6 +121,17 @@ int encode_context_object_id(uint8_t * apdu, int tag_number,
     int object_type, uint32_t instance);
 int encode_tagged_object_id(uint8_t * apdu, int object_type, uint32_t instance);
 
+// from clause 20.2.8 Encoding of an Octet String Value
+// and 20.2.1 General Rules for Encoding BACnet Tags
+// returns the number of apdu bytes consumed
+int encode_octet_string(uint8_t * apdu, const uint8_t *octet_string,
+  unsigned len);
+int encode_tagged_octet_string(uint8_t * apdu, const uint8_t *octet_string,
+  unsigned len);
+int decode_octet_string(uint8_t * apdu, uint32_t len_value,
+    uint8_t *buffer, size_t buffer_len);
+
+
 // from clause 20.2.9 Encoding of a Character String Value
 // and 20.2.1 General Rules for Encoding BACnet Tags
 // returns the number of apdu bytes consumed