Preparations for using the latest GTK 2.8 files for now only gettext is updated.

[obnox/wireshark/wip.git] / tap-protocolinfo.c

diff --git a/tap-protocolinfo.c b/tap-protocolinfo.c
index eade2065be752f095c9e379d2ce6844eae30447b..484df8090585d03aa6fa0adbf9fa3105745e8059 100644 (file)
--- a/tap-protocolinfo.c
+++ b/tap-protocolinfo.c
@@ -1,10 +1,10 @@
 /* tap-protocolinfo.c
  * protohierstat   2002 Ronnie Sahlberg
  *
- * $Id: tap-protocolinfo.c,v 1.4 2003/05/03 00:48:33 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  * 
  * This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* This module provides Protocol Column Info tap for tethereal */
+/* This module provides Protocol Column Info tap for tshark */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -38,7 +38,8 @@
 #include "epan/epan_dissect.h"
 #include "epan/column-utils.h"
 #include "epan/proto.h"
-#include "tap.h"
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
 #include "register.h"
 
 typedef struct _pci_t {
@@ -48,13 +49,27 @@ typedef struct _pci_t {
 
 
 static int
-protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, void *dummy _U_)
+protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_)
 {
        pci_t *rs=prs;
        GPtrArray *gp;
        guint i;
        char *str;
 
+       /*
+        * XXX - there needs to be a way for "protocolinfo_init()" to
+        * find out whether the columns are being generated and, if not,
+        * to report an error and exit, as the whole point of this tap
+        * is to modify the columns, and if the columns aren't being
+        * displayed, that makes this tap somewhat pointless.
+        *
+        * To prevent a crash, we check whether pinfo->cinfo is null
+        * and, if so, we report that error and exit.
+        */
+       if (pinfo->cinfo == NULL) {
+               fprintf(stderr, "tshark: the proto,colinfo tap doesn't work if the columns aren't being printed.\n");
+               exit(1);
+       }
        gp=proto_get_finfo_ptr_array(edt->tree, rs->hf_index);
        if(!gp){
                return 0;
@@ -64,7 +79,6 @@ protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, void *du
                str=proto_construct_dfilter_string(gp->pdata[i], NULL);
                if(str){
                        col_append_fstr(pinfo->cinfo, COL_INFO, "  %s",str);
-                       g_free(str);
                }
        }
        return 0;
@@ -73,11 +87,11 @@ protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, void *du
 
 
 static void
-protocolinfo_init(char *optarg)
+protocolinfo_init(const char *optarg, void* userdata _U_)
 {
        pci_t *rs;
-       char *field=NULL;
-       char *filter=NULL;
+       const char *field=NULL;
+       const char *filter=NULL;
        header_field_info *hfi;
        GString *error_string;
 
@@ -89,13 +103,13 @@ protocolinfo_init(char *optarg)
                }
        }
        if(!field){
-               fprintf(stderr, "tethereal: invalid \"-z proto,colinfo,<filter>,<field>\" argument\n");
+               fprintf(stderr, "tshark: invalid \"-z proto,colinfo,<filter>,<field>\" argument\n");
                exit(1);
        }
 
        hfi=proto_registrar_get_byname(field);
        if(!hfi){
-               fprintf(stderr, "tethereal: Field \"%s\" does not exist.\n", field);
+               fprintf(stderr, "tshark: Field \"%s\" doesn't exist.\n", field);
                exit(1);
        }
 
@@ -112,7 +126,7 @@ protocolinfo_init(char *optarg)
        error_string=register_tap_listener("frame", rs, rs->filter, NULL, protocolinfo_packet, NULL);
        if(error_string){
                /* error, we failed to attach to the tap. complain and clean up */
-               fprintf(stderr, "tethereal: Couldn't register proto,colinfo tap: %s\n",
+               fprintf(stderr, "tshark: Couldn't register proto,colinfo tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
                if(rs->filter){
@@ -128,6 +142,6 @@ protocolinfo_init(char *optarg)
 void
 register_tap_listener_protocolinfo(void)
 {
-       register_ethereal_tap("proto,colinfo,", protocolinfo_init);
+       register_stat_cmd_arg("proto,colinfo,", protocolinfo_init,NULL);
 }