packet-link16: Link 16 message dissector (MIL-STD-6016)

[metze/wireshark/wip.git] / dftest.c

diff --git a/dftest.c b/dftest.c
index d8492e09150e9d65072e65eee544671e747aaed4..db9eeb0d2c0e15a004e46e4dd58078691c96dc56 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -1,8 +1,6 @@
 /* dftest.c
  * Shows display filter byte-code, for debugging dfilter routines.
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -19,12 +17,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -32,27 +28,24 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef NEED_STRERROR_H
-#include "strerror.h"
-#endif
-
 #include <glib.h>
-#include <epan/epan.h>
 
+#include <epan/epan.h>
 #include <epan/timestamp.h>
-#include <epan/plugins.h>
-#include <epan/filesystem.h>
-#include <wsutil/privileges.h>
 #include <epan/prefs.h>
-#include "util.h"
-#include "epan/dfilter/dfilter.h"
-#include "register.h"
+#include <epan/dfilter/dfilter.h>
 
-packet_info    pi;
+#include <wsutil/plugins.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/privileges.h>
+#include <wsutil/report_err.h>
+
+#include "ui/util.h"
+#include "register.h"
 
 static void failure_message(const char *msg_format, va_list ap);
 static void open_failure_message(const char *filename, int err,
-    gboolean for_writing);
+       gboolean for_writing);
 static void read_failure_message(const char *filename, int err);
 static void write_failure_message(const char *filename, int err);
 
@@ -64,13 +57,12 @@ main(int argc, char **argv)
        char            *gpf_path, *pf_path;
        int             gpf_open_errno, gpf_read_errno;
        int             pf_open_errno, pf_read_errno;
-       e_prefs         *prefs;
        dfilter_t       *df;
 
        /*
         * Get credential information for later use.
         */
-       get_credential_info();
+       init_process_policies();
 
        /*
         * Attempt to get the pathname of the executable file.
@@ -78,51 +70,49 @@ main(int argc, char **argv)
        init_progfile_dir_error = init_progfile_dir(argv[0], main);
        if (init_progfile_dir_error != NULL) {
                fprintf(stderr, "dftest: Can't get pathname of dftest program: %s.\n",
-                   init_progfile_dir_error);
+                       init_progfile_dir_error);
        }
 
+       init_report_err(failure_message, open_failure_message,
+                       read_failure_message, write_failure_message);
+
        timestamp_set_type(TS_RELATIVE);
+       timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
 
        /* Register all dissectors; we must do this before checking for the
           "-g" flag, as the "-g" flag dumps a list of fields registered
           by the dissectors, and we must do it before we read the preferences,
           in case any dissectors register preferences. */
-       epan_init(register_all_protocols,
-                 register_all_protocol_handoffs, NULL, NULL,
-                 failure_message, open_failure_message, read_failure_message,
-                 write_failure_message);
-
-       /* now register the preferences for any non-dissector modules.
-       we must do that before we read the preferences as well. */
-       prefs_register_modules();
+       epan_init(register_all_protocols, register_all_protocol_handoffs,
+                 NULL, NULL);
 
        /* set the c-language locale to the native environment. */
        setlocale(LC_ALL, "");
 
-       prefs = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
-           &pf_open_errno, &pf_read_errno, &pf_path);
+       read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
+               &pf_open_errno, &pf_read_errno, &pf_path);
        if (gpf_path != NULL) {
                if (gpf_open_errno != 0) {
                        fprintf(stderr,
-                           "can't open global preferences file \"%s\": %s.\n",
-                           pf_path, strerror(gpf_open_errno));
+                               "can't open global preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(gpf_open_errno));
                }
                if (gpf_read_errno != 0) {
                        fprintf(stderr,
-                           "I/O error reading global preferences file \"%s\": %s.\n",
-                           pf_path, strerror(gpf_read_errno));
+                               "I/O error reading global preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(gpf_read_errno));
                }
        }
        if (pf_path != NULL) {
                if (pf_open_errno != 0) {
                        fprintf(stderr,
-                           "can't open your preferences file \"%s\": %s.\n",
-                           pf_path, strerror(pf_open_errno));
+                               "can't open your preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(pf_open_errno));
                }
                if (pf_read_errno != 0) {
                        fprintf(stderr,
-                           "I/O error reading your preferences file \"%s\": %s.\n",
-                           pf_path, strerror(pf_read_errno));
+                               "I/O error reading your preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(pf_read_errno));
                }
        }
 
@@ -148,15 +138,15 @@ main(int argc, char **argv)
                epan_cleanup();
                exit(2);
        }
-       printf("dfilter ptr = 0x%08x\n", GPOINTER_TO_INT(df));
 
-       printf("\n\n");
+       printf("\n");
 
        if (df == NULL)
                printf("Filter is empty\n");
        else
                dfilter_dump(df);
 
+       dfilter_free(df);
        epan_cleanup();
        exit(0);
 }
@@ -190,7 +180,7 @@ static void
 read_failure_message(const char *filename, int err)
 {
        fprintf(stderr, "dftest: An error occurred while reading from the file \"%s\": %s.\n",
-           filename, strerror(err));
+               filename, g_strerror(err));
 }
 
 /*
@@ -200,5 +190,5 @@ static void
 write_failure_message(const char *filename, int err)
 {
        fprintf(stderr, "dftest: An error occurred while writing to the file \"%s\": %s.\n",
-           filename, strerror(err));
+               filename, g_strerror(err));
 }