Do the floating-point tests closer to what we need.

It's All Very Complicated, so mirror what print-lmp.c does - just do a
calculation based on a particular input value and print the result using
the same format print-lmp.c does, and have tests/TESTrun see what that
result is.

Just do that inside tcpdump.c, so we don't need the fptype stuff.

Author: guyharris

CMakeLists.txt

@@ -1110,7 +1110,7 @@ if(NOT C_ADDITIONAL_FLAGS STREQUAL "")
     set_target_properties(netdissect PROPERTIES COMPILE_FLAGS ${C_ADDITIONAL_FLAGS})
 endif()
 
-set(TCPDUMP_SOURCE_LIST_C fptype.c tcpdump.c)
+set(TCPDUMP_SOURCE_LIST_C tcpdump.c)
 
 if(NOT HAVE_BPF_DUMP)
     set(TCPDUMP_SOURCE_LIST_C ${TCPDUMP_SOURCE_LIST_C} bpf_dump.c)

Makefile.in

@@ -70,7 +70,7 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
 	@rm -f $@
 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
 
-CSRC =	fptype.c tcpdump.c
+CSRC =	tcpdump.c
 
 LIBNETDISSECT_SRC=\
 	addrtoname.c \

fptype.c

@@ -150,8 +150,6 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #include "print.h"
 
-#include "fptype.h"
-
 #ifndef PATH_MAX
 #define PATH_MAX 1024
 #endif
@@ -1903,15 +1901,13 @@ main(int argc, char **argv)
 			 * may differ (e.g., it might be 32-bit, 64-bit,
 			 * or 80-bit).
 			 */
-			switch (float_type_check(0x4e93312d)) {
-
-			case 0x461a5794:
-				printf("FPTYPE1\n");
-				break;
-
-			default:
-				printf("FPTYPE2\n");
-				break;
+			{
+				union { /* int to float conversion buffer */
+					float f;
+					uint32_t i;
+				} f;
+				f.i = 0x4e93312d;
+				printf("%.3f\n", f.f*8/1000000);
 			}
 			return 0;
 

fptype.h

@@ -69,11 +69,17 @@ sub loadconfighash {
     #print Dumper($main::confighhash);
 
     # also run tcpdump --fp-type to get the type of floating-point
-    # arithmetic we're doing, setting a HAVE_{fptype} key
+    # arithmetic we're doing, setting a HAVE_{fptype} key based
+    # on the value it prints
     open(FPTYPE_PIPE, "./tcpdump --fp-type |") or die("piping tcpdump --fp-type failed\n");
-    my $have_fptype = "HAVE_" . <FPTYPE_PIPE>;
+    my $fptype_val = <FPTYPE_PIPE>;
     close(FPTYPE_PIPE);
-    $have_fptype =~ s/^\s+|\s+$//g;
+    my $have_fptype;
+    if($fptype_val == "9877.895") {
+        $have_fptype = "HAVE_FPTYPE1";
+    } else {
+        $have_fptype = "HAVE_FPTYPE2";
+    }
     $main::confighhash->{$have_fptype} = 1;
 
     return $main::confighhash;