Fixed MS/TP capture utility to scan files created by other capture utilities (i.e. Johnson Controls) that don't have the fixed 65535 SNAP length in the global header.

2012-07-23 16:56:19 +00:00
parent 8988790bff
commit 6013b2dc19
1 changed files with 3 additions and 3 deletions
@@ -609,8 +609,8 @@ static bool test_global_header(
            return false;
        }
        count = fread(&snaplen, sizeof(snaplen), 1, pFile);
-        if ((count != 1) || (snaplen != 65535)) {
-            fprintf(stderr, "mstpcap: invalid length of captured packets\n");
+        if (count != 1) {
+            fprintf(stderr, "mstpcap: unable to read SNAP length\n");
            fclose(pFile);
            pFile = NULL;
            return false;
@@ -823,7 +823,7 @@ int main(
            if (test_global_header(argv[2])) {
                while (read_received_packet(mstp_port)) {
                    packet_count++;
-                    fprintf(stderr, "\r%hu packets", packet_count);
+                    fprintf(stderr, "\r%u packets", (unsigned)packet_count);
                }
                if (packet_count) {
                    packet_statistics_print();