#include "epan/proto.h"
#include <epan/tap.h>
#include <epan/stat_cmd_args.h>
+#include <epan/strutil.h>
#include "register.h"
typedef struct _pci_t {
* 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);
rs->hf_index=hfi->id;
if((field-filter)>1){
rs->filter=g_malloc(field-filter);
- strncpy(rs->filter,filter,(field-filter)-1);
- rs->filter[(field-filter)-1]=0;
+ g_strlcpy(rs->filter,filter,(field-filter));
} else {
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);