From Pascal Quantin:

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

diff --git a/tap-protocolinfo.c b/tap-protocolinfo.c
index 4f9c4b934a0da526b9477934366f4785bcb2387a..a3f2b3766625ed04398c4cbe6f73961d3958d890 100644 (file)
--- a/tap-protocolinfo.c
+++ b/tap-protocolinfo.c
@@ -6,17 +6,17 @@
  * 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
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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.
@@ -41,7 +41,6 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
-#include "register.h"
 
 typedef struct _pci_t {
        char *filter;
@@ -64,11 +63,11 @@ protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const vo
         * 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.
+        * To prevent a crash, we check whether INFO column is writable
+        * and, if not, 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");
+       if (!check_col(pinfo->cinfo, COL_INFO)) {
+               fprintf(stderr, "tshark: the proto,colinfo tap doesn't work if the INFO column isn't being printed.\n");
                exit(1);
        }
        gp=proto_get_finfo_ptr_array(edt->tree, rs->hf_index);
@@ -123,15 +122,13 @@ protocolinfo_init(const char *optarg, void* userdata _U_)
                rs->filter=NULL;
        }
 
-       error_string=register_tap_listener("frame", rs, rs->filter, NULL, protocolinfo_packet, NULL);
+       error_string=register_tap_listener("frame", rs, rs->filter, TL_REQUIRES_PROTO_TREE, NULL, protocolinfo_packet, NULL);
        if(error_string){
                /* error, we failed to attach to the tap. complain and clean up */
                fprintf(stderr, "tshark: Couldn't register proto,colinfo tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
-               if(rs->filter){
-                       g_free(rs->filter);
-               }
+               g_free(rs->filter);
                g_free(rs);
 
                exit(1);