--- trunk/darkstattype.c	2014/03/20 09:00:33	8
+++ trunk/darkstattype.c	2014/03/21 15:40:57	10
@@ -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,10 +93,11 @@ void show_usage(int exitcode)
 void show_usage(int exitcode)
 {
   fprintf((exitcode == EXIT_SUCCESS) ? stdout : stderr,
-    "Usage: %s [-h] [-v] filename\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);
@@ -177,7 +178,7 @@ void decode_file(void)
 #define FILE_HEADER_V1 0xDA314159U
 
   if ( (fileheader = read32u()) != FILE_HEADER_V1) { // not darkstat export format
-    fprintf(stderr, "%s:%s: file header = 0x%x, not 0x%x\n", progname, filename, fileheader, FILE_HEADER_V1);
+    fprintf(stderr, "%s:%s:%ld: file header = 0x%x, not 0x%x\n", progname, filename, ftell(file), fileheader, FILE_HEADER_V1);
     exit(EXIT_FAILURE);
   } // if
 
@@ -201,7 +202,7 @@ void decode_file(void)
       decode_graph_db_v1();
     } // else if
     else {
-      fprintf(stderr, "%s:%s: unknown section header = 0x%x, neither 0x%x nor 0x%x\n", progname, filename, sectionheader, HOST_DB_V1, GRAPH_DB_V1);
+      fprintf(stderr, "%s:%s:%ld: unknown section header = 0x%x, neither 0x%x nor 0x%x\n", progname, filename, ftell(file), sectionheader, HOST_DB_V1, GRAPH_DB_V1);
       exit(EXIT_FAILURE);
     } // else
   } // for
@@ -253,7 +254,7 @@ void decode_host_db_v1(void)
       decode_host_header_v1();
     } // else if
     else { // unknown host header version
-      fprintf(stderr, "%s:%s: unknown host header = 0x%x, neither 0x%x nor 0x%x nor 0x%x\n", progname, filename, hostheader, HOST_HEADER_V3, HOST_HEADER_V2, HOST_HEADER_V1);
+      fprintf(stderr, "%s:%s:%ld: unknown host header = 0x%x, neither 0x%x nor 0x%x nor 0x%x\n", progname, filename, ftell(file), hostheader, HOST_HEADER_V3, HOST_HEADER_V2, HOST_HEADER_V1);
       exit(EXIT_FAILURE);
     } // else
 
@@ -326,21 +327,21 @@ void decode_host_header_v1(void)
   printf("Bytes out %lu\n", bytesout);
 
   if ( (protosdata = read8u()) != 'P') { // missing protos data
-    fprintf(stderr, "%s: expecting character P, not %c\n", progname, protosdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character P, not %c\n", progname, filename, ftell(file), protosdata);
     exit(EXIT_FAILURE);
   } // if
 
   decode_protos_data();
 
   if ( (tcpdata = read8u()) != 'T') { // missing tcp data
-    fprintf(stderr, "%s: expecting character T, not %c\n", progname, tcpdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character T, not %c\n", progname, filename, ftell(file), tcpdata);
     exit(EXIT_FAILURE);
   } // if
 
   decode_tcp_data();
 
   if ( (udpdata = read8u()) != 'U') { // missing udp data
-    fprintf(stderr, "%s: expecting character U, not %c\n", progname, udpdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character U, not %c\n", progname, filename, ftell(file), udpdata);
     exit(EXIT_FAILURE);
   } // if
 
@@ -375,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();
 
@@ -435,21 +437,21 @@ void decode_host_header_v2(void)
   printf("Bytes out %lu\n", bytesout);
 
   if ( (protosdata = read8u()) != 'P') { // missing protos data
-    fprintf(stderr, "%s: expecting character P, not %c\n", progname, protosdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character P, not %c\n", progname, filename, ftell(file), protosdata);
     exit(EXIT_FAILURE);
   } // if
 
   decode_protos_data();
 
   if ( (tcpdata = read8u()) != 'T') { // missing tcp data
-    fprintf(stderr, "%s: expecting character T, not %c\n", progname, tcpdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character T, not %c\n", progname, filename, ftell(file), tcpdata);
     exit(EXIT_FAILURE);
   } // if
 
   decode_tcp_data();
 
   if ( (udpdata = read8u()) != 'U') { // missing udp data
-    fprintf(stderr, "%s: expecting character U, not %c\n", progname, udpdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character U, not %c\n", progname, filename, ftell(file), udpdata);
     exit(EXIT_FAILURE);
   } // if
 
@@ -531,45 +533,46 @@ void decode_host_header_v3(void)
            ipv6address[15]);
   } // else if
   else { // unknown address family
-    fprintf(stderr, "%s:%s: unknown address family = 0x%x, neither 0x%x nor 0x%x\n", progname, filename, addressfamily, 0x04, 0x06);
+    fprintf(stderr, "%s:%s:%ld: unknown address family = 0x%x, neither 0x%x nor 0x%x\n", progname, filename, ftell(file), addressfamily, 0x04, 0x06);
     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();
 
@@ -595,21 +598,21 @@ void decode_host_header_v3(void)
   printf("Bytes out %lu\n", bytesout);
 
   if ( (protosdata = read8u()) != 'P') { // missing protos data
-    fprintf(stderr, "%s: expecting character P, not %c\n", progname, protosdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character P, not %c\n", progname, filename, ftell(file), protosdata);
     exit(EXIT_FAILURE);
   } // if
 
   decode_protos_data();
 
   if ( (tcpdata = read8u()) != 'T') { // missing tcp data
-    fprintf(stderr, "%s: expecting character T, not %c\n", progname, tcpdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character T, not %c\n", progname, filename, ftell(file), tcpdata);
     exit(EXIT_FAILURE);
   } // if
 
   decode_tcp_data();
 
   if ( (udpdata = read8u()) != 'U') { // missing udp data
-    fprintf(stderr, "%s: expecting character U, not %c\n", progname, udpdata);
+    fprintf(stderr, "%s:%s:%ld: expecting character U, not %c\n", progname, filename, ftell(file), udpdata);
     exit(EXIT_FAILURE);
   } // if
 
@@ -970,13 +973,15 @@ void handle_file_error(void)
 
 void handle_file_error(void)
 {
+  int saved_errno = errno;
+
   if (feof(file) != 0) {
-    fprintf(stderr, "%s:%s: premature end-of-file\n", progname, filename);
+    fprintf(stderr, "%s:%s:%ld: premature end-of-file\n", progname, filename, ftell(file));
     exit(EXIT_FAILURE);
   } // if
 
   if (ferror(file) != 0) {
-    fprintf(stderr, "%s:%s: file error, errno = %s (%d)\n", progname, filename, strerror(errno), errno);
+    fprintf(stderr, "%s:%s:%ld: file error, errno = %s (%d)\n", progname, filename, ftell(file), strerror(saved_errno), saved_errno);
     exit(EXIT_FAILURE);
   } // if
 } // handle_file_error()
@@ -1015,7 +1020,9 @@ void print_time_t(time_t t)
 
   // ISO 8601 format
   if (strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%S%z", stm) == 0) {
-    fprintf(stderr, "%s:%s: strftime() error, errno = %s (%d)\n", progname, filename, strerror(errno), errno);
+    int saved_errno = errno;
+
+    fprintf(stderr, "%s:%s:%ld: strftime() error, errno = %s (%d)\n", progname, filename, ftell(file), strerror(saved_errno), saved_errno);
     exit(EXIT_FAILURE);
   } // if