--- trunk/darkstattype.c	2014/03/19 15:40:13	7
+++ trunk/darkstattype.c	2014/03/20 09:49:12	9
@@ -29,13 +29,8 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-// Define FOLLOW_SPECIFICATION to 0 (zero) to go with darkstat's own format as of 3.0.718.
-#define FOLLOW_SPECIFICATION 0
-
-// Define FOLLOW_SPECIFICATION to 1 (one) to go with the format specified in the export-format.txt file.
-//#define FOLLOW_SPECIFICATION 1
-
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -45,6 +40,7 @@ FILE *file = NULL;
 const char *progname = NULL;
 const char *filename = NULL;
 FILE *file = NULL;
+bool follow_specification = false;
 
 int main(int argc, char **argv)
 {
@@ -57,8 +53,12 @@ int main(int argc, char **argv)
   progname = argv[0];
 
   opterr = 0;
-  while ( (i = getopt(argc, argv, "hv")) != -1) {
+  while ( (i = getopt(argc, argv, "fhv")) != -1) {
     switch (i) {
+      case 'f':
+        follow_specification = !follow_specification;
+        break;
+
       case 'h':
         show_usage(EXIT_SUCCESS);
         break;
@@ -93,8 +93,13 @@ void show_usage(int exitcode)
 void show_usage(int exitcode)
 {
   fprintf((exitcode == EXIT_SUCCESS) ? stdout : stderr,
-    "Usage: %s [-h] [-v] filename\n"
-    " E.g.: %s darkstat.db\n",
+    "Usage: %s [-f] [-h] [-v] filename\n"
+    " E.g.: %s darkstat.db\n\n"
+
+    "Options:\n"
+    "-f\tToggle follow strict specification, default is false.\n"
+    "-h\tShow this help message and exit.\n"
+    "-v\tShow version and copyright and exit.\n",
     progname, progname);
 
   exit(exitcode);
@@ -371,41 +376,42 @@ void decode_host_header_v2(void)
   printf("IPv4 address %d.%d.%d.%d\n",
          ipv4address[0], ipv4address[1], ipv4address[2], ipv4address[3]);
 
-#if FOLLOW_SPECIFICATION == 1
-  macaddress[0] = read8u();
-  macaddress[1] = read8u();
-  macaddress[2] = read8u();
-  macaddress[3] = read8u();
-  macaddress[4] = read8u();
-  macaddress[5] = read8u();
+  if (follow_specification == true) {
+    macaddress[0] = read8u();
+    macaddress[1] = read8u();
+    macaddress[2] = read8u();
+    macaddress[3] = read8u();
+    macaddress[4] = read8u();
+    macaddress[5] = read8u();
 
-  print_indentation();
-  printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
+    print_indentation();
+    printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
 
-  lastseen = read64s();
+    lastseen = read64s();
 
-  print_indentation();
-  printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
-  print_time_t(lastseen);
-  puts("");
-#else
-  lastseen = read64s();
+    print_indentation();
+    printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
+    print_time_t(lastseen);
+    puts("");
+  } // if
+  else {
+    lastseen = read64s();
 
-  print_indentation();
-  printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
-  print_time_t(lastseen);
-  puts("");
+    print_indentation();
+    printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
+    print_time_t(lastseen);
+    puts("");
 
-  macaddress[0] = read8u();
-  macaddress[1] = read8u();
-  macaddress[2] = read8u();
-  macaddress[3] = read8u();
-  macaddress[4] = read8u();
-  macaddress[5] = read8u();
+    macaddress[0] = read8u();
+    macaddress[1] = read8u();
+    macaddress[2] = read8u();
+    macaddress[3] = read8u();
+    macaddress[4] = read8u();
+    macaddress[5] = read8u();
 
-  print_indentation();
-  printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
-#endif
+    print_indentation();
+    printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
+  } // else
 
   hostnamelen = read8u();
 
@@ -531,41 +537,42 @@ void decode_host_header_v3(void)
     exit(EXIT_FAILURE);
   } // else
 
-#if FOLLOW_SPECIFICATION == 1
-  macaddress[0] = read8u();
-  macaddress[1] = read8u();
-  macaddress[2] = read8u();
-  macaddress[3] = read8u();
-  macaddress[4] = read8u();
-  macaddress[5] = read8u();
+  if (follow_specification == true) {
+    macaddress[0] = read8u();
+    macaddress[1] = read8u();
+    macaddress[2] = read8u();
+    macaddress[3] = read8u();
+    macaddress[4] = read8u();
+    macaddress[5] = read8u();
 
-  print_indentation();
-  printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
+    print_indentation();
+    printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
 
-  lastseen = read64s();
+    lastseen = read64s();
 
-  print_indentation();
-  printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
-  print_time_t(lastseen);
-  puts("");
-#else
-  lastseen = read64s();
+    print_indentation();
+    printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
+    print_time_t(lastseen);
+    puts("");
+  } // if
+  else {
+    lastseen = read64s();
 
-  print_indentation();
-  printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
-  print_time_t(lastseen);
-  puts("");
+    print_indentation();
+    printf("Last seen 0x%lx = %ld = ", lastseen, lastseen);
+    print_time_t(lastseen);
+    puts("");
 
-  macaddress[0] = read8u();
-  macaddress[1] = read8u();
-  macaddress[2] = read8u();
-  macaddress[3] = read8u();
-  macaddress[4] = read8u();
-  macaddress[5] = read8u();
+    macaddress[0] = read8u();
+    macaddress[1] = read8u();
+    macaddress[2] = read8u();
+    macaddress[3] = read8u();
+    macaddress[4] = read8u();
+    macaddress[5] = read8u();
 
-  print_indentation();
-  printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
-#endif
+    print_indentation();
+    printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", macaddress[0], macaddress[1], macaddress[2], macaddress[3], macaddress[4], macaddress[5]);
+  } // else
 
   hostnamelen = read8u();