Changed WhoHas and I-Have to use CharacterString instead of forcing ANSI X34 and C Strings. Affected all demos and ports object name, so I changed the object name function name to make sure it was noticed.

2011-03-24 16:53:02 +00:00
parent 75d88abf77
commit deab12a5e1
74 changed files with 1566 additions and 850 deletions
@@ -484,12 +484,118 @@ bool characterstring_printable(
                    break;
                }
            }
+        } else {
+            status = true;
        }
    }

    return status;
 }

+/* Basic UTF-8 manipulation routines
+  by Jeff Bezanson
+  placed in the public domain Fall 2005 */
+static const char trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/* based on the valid_utf8 routine from the PCRE library by Philip Hazel
+   length is in bytes, since without knowing whether the string is valid
+   it's hard to know how many characters there are! */
+static int utf8_isvalid(const char *str, int length)
+{
+    const unsigned char *p, *pend = (unsigned char*)str + length;
+    unsigned char c;
+    int ab;
+
+    for (p = (unsigned char*)str; p < pend; p++) {
+        c = *p;
+        /* null in middle of string */
+        if (c == 0) {
+            return 0;
+        }
+        /* ASCII character */
+        if (c < 128) {
+            continue;
+        }
+        if ((c & 0xc0) != 0xc0) {
+            return 0;
+        }
+        ab = trailingBytesForUTF8[c];
+        if (length < ab) {
+            return 0;
+        }
+        length -= ab;
+
+        p++;
+        /* Check top bits in the second byte */
+        if ((*p & 0xc0) != 0x80) {
+            return 0;
+        }
+        /* Check for overlong sequences for each different length */
+        switch (ab) {
+            /* Check for xx00 000x */
+        case 1:
+            if ((c & 0x3e) == 0) return 0;
+            continue;   /* We know there aren't any more bytes to check */
+
+            /* Check for 1110 0000, xx0x xxxx */
+        case 2:
+            if (c == 0xe0 && (*p & 0x20) == 0) return 0;
+            break;
+
+            /* Check for 1111 0000, xx00 xxxx */
+        case 3:
+            if (c == 0xf0 && (*p & 0x30) == 0) return 0;
+            break;
+
+            /* Check for 1111 1000, xx00 0xxx */
+        case 4:
+            if (c == 0xf8 && (*p & 0x38) == 0) return 0;
+            break;
+
+            /* Check for leading 0xfe or 0xff,
+               and then for 1111 1100, xx00 00xx */
+        case 5:
+            if (c == 0xfe || c == 0xff ||
+                (c == 0xfc && (*p & 0x3c) == 0)) return 0;
+            break;
+        }
+
+        /* Check for valid bytes after the 2nd, if any; all must start 10 */
+        while (--ab > 0) {
+            if ((*(++p) & 0xc0) != 0x80) return 0;
+        }
+    }
+
+    return 1;
+}
+
+bool characterstring_valid(
+    BACNET_CHARACTER_STRING * char_string)
+{
+    bool valid = false; /* return value */
+
+    if (char_string->encoding < MAX_CHARACTER_STRING_ENCODING) {
+        if (char_string->encoding == CHARACTER_UTF8) {
+            if (utf8_isvalid(char_string->value, char_string->length)) {
+                valid = true;
+            }
+        } else {
+            valid = true;
+        }
+    }
+
+    return valid;
+}
+
 /* returns false if the string exceeds capacity
   initialize by using value=NULL */
 bool octetstring_init(