Extract NTP printing

This method is required to dissect some RADIUS attributes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e4bdd9ba884cb2eb6f3105077ab163449dfa7fd..832f20c7b0886a934116a5ef4c36a33e52e3c40f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -933,6 +933,7 @@ set(NETDISSECT_SOURCE_LIST_C
     netdissect-alloc.c
     nlpid.c
     oui.c
+    ntp.c
     parsenfsfh.c
     print.c
     print-802_11.c

diff --git a/INSTALL.txt b/INSTALL.txt
index 662eb0c3316063b65b88776f0a859d1a90cb5358..e907f38c4ef4e38824e8dde84d08e7dc08a65497 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -85,6 +85,8 @@ machdep.h     - machine dependent definitions
 makemib                - mib to header script
 mib.h          - mib definitions
 missing/*      - replacements for missing library functions
+ntp.c          - functions to handle ntp structs
+ntp.h          - declarations of functions to handle ntp structs
 mkdep          - construct Makefile dependency list
 mpls.h         - MPLS definitions
 nameser.h      - DNS definitions

diff --git a/Makefile.in b/Makefile.in
index 65c9c4898415ff413c0154d032353ba4afb18dbc..0fe4d7297db328fea0663701733d5449ecbfbaac 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,6 +88,7 @@ LIBNETDISSECT_SRC=\
        netdissect.c \
        netdissect-alloc.c \
        nlpid.c \
+       ntp.c \
        oui.c \
        parsenfsfh.c \
        print.c \
@@ -294,6 +295,7 @@ HDR = \
        nfs.h \
        nfsfh.h \
        nlpid.h \
+       ntp.h \
        openflow.h \
        ospf.h \
        oui.h \

diff --git a/ntp.c b/ntp.c
new file mode 100644 (file)
index 0000000..4d17932
--- /dev/null
+++ b/ntp.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "ntp.h"
+
+#include "extract.h"
+
+#define        JAN_1970        INT64_T_CONSTANT(2208988800)    /* 1970 - 1900 in seconds */
+
+void
+p_ntp_time(netdissect_options *ndo,
+          const struct l_fixedpt *lfp)
+{
+       uint32_t i;
+       uint32_t uf;
+       uint32_t f;
+       double ff;
+
+       i = GET_BE_U_4(lfp->int_part);
+       uf = GET_BE_U_4(lfp->fraction);
+       ff = uf;
+       if (ff < 0.0)           /* some compilers are buggy */
+               ff += FMAXINT;
+       ff = ff / FMAXINT;                      /* shift radix point by 32 bits */
+       f = (uint32_t)(ff * 1000000000.0);      /* treat fraction as parts per billion */
+       ND_PRINT("%u.%09u", i, f);
+
+#ifdef HAVE_STRFTIME
+       /*
+        * print the UTC time in human-readable format.
+        */
+       if (i) {
+           int64_t seconds_64bit = (int64_t)i - JAN_1970;
+           time_t seconds;
+           struct tm *tm;
+           char time_buf[128];
+
+           seconds = (time_t)seconds_64bit;
+           if (seconds != seconds_64bit) {
+               /*
+                * It doesn't fit into a time_t, so we can't hand it
+                * to gmtime.
+                */
+               ND_PRINT(" (unrepresentable)");
+           } else {
+               tm = gmtime(&seconds);
+               if (tm == NULL) {
+                   /*
+                    * gmtime() can't handle it.
+                    * (Yes, that might happen with some version of
+                    * Microsoft's C library.)
+                    */
+                   ND_PRINT(" (unrepresentable)");
+               } else {
+                   /* use ISO 8601 (RFC3339) format */
+                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%SZ", tm);
+                   ND_PRINT(" (%s)", time_buf);
+               }
+           }
+       }
+#endif
+}

diff --git a/ntp.h b/ntp.h
new file mode 100644 (file)
index 0000000..6b5ff95
--- /dev/null
+++ b/ntp.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#include "netdissect-stdinc.h"
+
+#include "netdissect.h"
+
+/*
+ * Structure definitions for NTP fixed point values
+ *
+ *    0                          1                   2                   3
+ *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |                        Integer Part                          |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |                        Fraction Part                         |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *    0                          1                   2                   3
+ *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |           Integer Part       |     Fraction Part             |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+struct l_fixedpt {
+       nd_uint32_t int_part;
+       nd_uint32_t fraction;
+};
+
+struct s_fixedpt {
+       nd_uint16_t int_part;
+       nd_uint16_t fraction;
+};
+
+#define        FMAXINT (4294967296.0)  /* floating point rep. of MAXINT */
+
+void p_ntp_time(netdissect_options *, const struct l_fixedpt *);

diff --git a/print-ntp.c b/print-ntp.c
index 57bbf54d59e9666fb7aea37bbc8eb2220498b215..42853f780e00be3977b34e7089246f865241f9f6 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -46,44 +46,13 @@
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ntp.h"
 
 /*
  * Based on ntp.h from the U of MD implementation
  *     This file is based on Version 2 of the NTP spec (RFC1119).
  */
 
-/*
- *  Definitions for the masses
- */
-#define        JAN_1970        INT64_T_CONSTANT(2208988800)    /* 1970 - 1900 in seconds */
-
-/*
- * Structure definitions for NTP fixed point values
- *
- *    0                          1                   2                   3
- *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |                        Integer Part                          |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |                        Fraction Part                         |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *    0                          1                   2                   3
- *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |           Integer Part       |     Fraction Part             |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-struct l_fixedpt {
-       nd_uint32_t int_part;
-       nd_uint32_t fraction;
-};
-
-struct s_fixedpt {
-       nd_uint16_t int_part;
-       nd_uint16_t fraction;
-};
-
 /* rfc2030
  *                      1                   2                   3
  *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -186,7 +155,6 @@ struct ntp_time_data {
 #define        INFO_REPLY      63      /* **** THIS implementation dependent **** */
 
 static void p_sfix(netdissect_options *ndo, const struct s_fixedpt *);
-static void p_ntp_time(netdissect_options *, const struct l_fixedpt *);
 static void p_ntp_delta(netdissect_options *, const struct l_fixedpt *, const struct l_fixedpt *);
 static void p_poll(netdissect_options *, const int);
 
@@ -518,62 +486,6 @@ p_sfix(netdissect_options *ndo,
        ND_PRINT("%d.%06d", i, f);
 }
 
-#define        FMAXINT (4294967296.0)  /* floating point rep. of MAXINT */
-
-static void
-p_ntp_time(netdissect_options *ndo,
-          const struct l_fixedpt *lfp)
-{
-       uint32_t i;
-       uint32_t uf;
-       uint32_t f;
-       double ff;
-
-       i = GET_BE_U_4(lfp->int_part);
-       uf = GET_BE_U_4(lfp->fraction);
-       ff = uf;
-       if (ff < 0.0)           /* some compilers are buggy */
-               ff += FMAXINT;
-       ff = ff / FMAXINT;                      /* shift radix point by 32 bits */
-       f = (uint32_t)(ff * 1000000000.0);      /* treat fraction as parts per billion */
-       ND_PRINT("%u.%09u", i, f);
-
-#ifdef HAVE_STRFTIME
-       /*
-        * print the UTC time in human-readable format.
-        */
-       if (i) {
-           int64_t seconds_64bit = (int64_t)i - JAN_1970;
-           time_t seconds;
-           struct tm *tm;
-           char time_buf[128];
-
-           seconds = (time_t)seconds_64bit;
-           if (seconds != seconds_64bit) {
-               /*
-                * It doesn't fit into a time_t, so we can't hand it
-                * to gmtime.
-                */
-               ND_PRINT(" (unrepresentable)");
-           } else {
-               tm = gmtime(&seconds);
-               if (tm == NULL) {
-                   /*
-                    * gmtime() can't handle it.
-                    * (Yes, that might happen with some version of
-                    * Microsoft's C library.)
-                    */
-                   ND_PRINT(" (unrepresentable)");
-               } else {
-                   /* use ISO 8601 (RFC3339) format */
-                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%SZ", tm);
-                   ND_PRINT(" (%s)", time_buf);
-               }
-           }
-       }
-#endif
-}
-
 /* Prints time difference between *lfp and *olfp */
 static void
 p_ntp_delta(netdissect_options *ndo,

diff --git a/win32/prj/GNUmakefile b/win32/prj/GNUmakefile
index 85d30ff4b4a01c55427947cb72f4b36c6825f9d2..3ef40053ef80d0dac60abc7e728f2d335f6b563c 100644 (file)
--- a/win32/prj/GNUmakefile
+++ b/win32/prj/GNUmakefile
@@ -42,6 +42,7 @@ OBJS = \
        ../../machdep.o \
        ../../oui.o \
        ../../parsenfsfh.o \
+       ../../ntp.o \
        ../../print-802_11.o \
        ../../print-ah.o \
        ../../print-aodv.o \

diff --git a/win32/prj/WinDump.dsp b/win32/prj/WinDump.dsp
index f920cb2c602a0723578bec3100c4703a703bed70..45bf3704cb291e1906c248c9b49561d2134d3b6f 100644 (file)
--- a/win32/prj/WinDump.dsp
+++ b/win32/prj/WinDump.dsp
@@ -125,6 +125,10 @@ SOURCE=..\..\missing\getopt_long.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\ntp.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gmpls.c
 # End Source File
 # Begin Source File

diff --git a/win32/prj/WinDump.vcproj b/win32/prj/WinDump.vcproj
index 3a56204f385f81b9d381e28999acea9b65c5acc2..d159f8e9fa26c7441c893f9badcab6c81bb8a646 100644 (file)
--- a/win32/prj/WinDump.vcproj
+++ b/win32/prj/WinDump.vcproj
@@ -424,6 +424,28 @@
                                />
                        </FileConfiguration>
                </File>
+               <File
+                       RelativePath="..\..\ntp.c"
+                       >
+                       <FileConfiguration
+                               Name="Debug|Win32"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions=""
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|Win32"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions=""
+                               />
+                       </FileConfiguration>
+               </File>
                <File
                        RelativePath="..\..\gmpls.c"
                        >