Feature/bip6 win32 debug enhancements (#212)

* Move win32 specific checks to bacport.h module

* Create IPv6 snprintf function in bvlc6.c module

* Improve BIP6 debug for win32 port

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>

src/bacnet/bacapp.c

@@ -54,10 +54,6 @@
 
 /** @file bacapp.c  Utilities for the BACnet_Application_Data_Value */
 
-#if defined(_MSC_VER)
-#define snprintf _snprintf
-#endif
-
 /** @brief Encode application data given by a pointer into the APDU.
  *  Return the number encoded bytes.
  *

src/bacnet/basic/object/gateway/gw_device.c

@@ -62,12 +62,6 @@
 /* os specfic includes */
 #include "bacnet/basic/sys/mstimer.h"
 
-#if defined(__BORLANDC__) || defined(_WIN32)
-/* seems to not be defined in time.h as specified by The Open Group */
-/* difference from UTC and local standard time  */
-long int timezone;
-#endif
-
 /* local forward and external prototypes */
 extern int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata);
 extern bool Device_Write_Property_Local(BACNET_WRITE_PROPERTY_DATA *wp_data);

src/bacnet/datalink/bvlc6.c

@@ -34,6 +34,7 @@
 
 #include <stdint.h> /* for standard integer types uint8_t etc. */
 #include <stdbool.h> /* for the standard bool type. */
+#include <stdio.h>
 #include "bacnet/bacenum.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacint.h"
@@ -640,6 +641,96 @@ bool bvlc6_address_get(BACNET_IP6_ADDRESS *addr,
     return status;
 }
 
+/** Convert IPv6 Address from ASCII
+ *
+ * IPv6 addresses are represented as eight groups, separated by colons,
+ * of four hexadecimal digits.
+ *
+ * For convenience, an IPv6 address may be abbreviated to shorter notations
+ * by application of the following rules according to RFC 5952 [1]:
+ *   - One or more leading zeros from any groups of hexadecimal digits
+ *     are removed; this is usually done to either all or none of the
+ *     leading zeros. For example, the group 0042 is converted to 42.
+ *   - Consecutive sections of zeros are replaced with a double colon (::).
+ *     The double colon may only be used once in an address, as multiple
+ *     use would render the address indeterminate. RFC 5952 requires that
+ *     a double colon not be used to denote an omitted single section of
+ *     zeros.
+ *
+ * [1] https://www.rfc-editor.org/rfc/rfc5952
+ *
+ * Adapted from the uIP TCP/IP stack and the Contiki operating system.
+ * Thank you, Adam Dunkel, and the Swedish Institute of Computer Science.
+ *
+ * @param addr - B/IPv6 address that is parsed
+ * @param buf - B/IPv6 address in 16-bit ASCII hex compressed format
+ * @param buf_size - B/IPv6 address size in bytes
+ *
+ * @return the number of characters which would be generated for the given
+ *  input, excluding the trailing null.
+ * @note buf and buf_size may be null and zero to return only the size
+ */
+int bvlc6_address_to_ascii(BACNET_IP6_ADDRESS *addr, char *buf,
+    size_t buf_size)
+{
+    uint16_t a;
+    unsigned int i;
+    int f = 0;
+    int len = 0;
+    int n = 0;
+
+    if (!addr) {
+        return n;
+    }
+    if (!buf) {
+        return n;
+    }
+    for(i = 0; i < IP6_ADDRESS_MAX; i += 2) {
+        a = (addr->address[i] << 8) + addr->address[i + 1];
+        if ((a == 0) && (f >= 0)) {
+            if (f++ == 0) {
+                len = snprintf(buf, buf_size, "::");
+                if (buf) {
+                    buf += len;
+                }
+                if (len > buf_size) {
+                    buf_size = 0;
+                } else {
+                    buf_size -= len;
+                }
+                n += len;
+            }
+        } else {
+            if (f > 0) {
+                f = -1;
+            } else if (i > 0) {
+                len = snprintf(buf, buf_size, ":");
+                if (buf) {
+                    buf += len;
+                }
+                if (len > buf_size) {
+                    buf_size = 0;
+                } else {
+                    buf_size -= len;
+                }
+                n += len;
+            }
+            len = snprintf(buf, buf_size, "%x", a);
+            if (buf) {
+                buf += len;
+            }
+            if (len > buf_size) {
+                buf_size = 0;
+            } else {
+                buf_size -= len;
+            }
+            n += len;
+        }
+    }
+
+    return true;
+}
+
 /** Convert IPv6 Address from ASCII
  *
  * IPv6 addresses are represented as eight groups, separated by colons,
@@ -672,7 +763,7 @@ bool bvlc6_address_from_ascii(BACNET_IP6_ADDRESS *addr, const char *addrstr)
     unsigned int i = 0;
     char c = 0;
 
-    if (!addrstr) {
+    if (!addr) {
         return false;
     }
     if (!addrstr) {

src/bacnet/datalink/bvlc6.h

@@ -180,6 +180,10 @@ extern "C" {
     bool bvlc6_address_different(
         BACNET_IP6_ADDRESS * dst,
         BACNET_IP6_ADDRESS * src);
+
+    BACNET_STACK_EXPORT
+    int bvlc6_address_to_ascii(BACNET_IP6_ADDRESS *addr, char *buf,
+        size_t buf_size);
     BACNET_STACK_EXPORT
     bool bvlc6_address_from_ascii(
         BACNET_IP6_ADDRESS *addr,