diff options
| -rw-r--r-- | epan/column-utils.c | 3 | ||||
| -rw-r--r-- | epan/column.c | 14 | ||||
| -rw-r--r-- | epan/column_info.h | 1 | ||||
| -rw-r--r-- | epan/expert.c | 3 |
4 files changed, 19 insertions, 2 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 1931fec65c..17314931fb 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1353,6 +1353,9 @@ col_fill_in(packet_info *pinfo) case COL_BSSGP_TLLI: /* done by packet-bssgp.c */ break; + case COL_EXPERT: /* done by expert.c */ + break; + case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */ g_assert_not_reached(); break; diff --git a/epan/column.c b/epan/column.c index b246d097aa..b6a95c5c0d 100644 --- a/epan/column.c +++ b/epan/column.c @@ -95,14 +95,14 @@ col_format_to_string(gint fmt) { "%H", "%P", "%y", - "%v", + "%z", "%q", "%f", "%U", "%E", "%C", "%l", - "%z" + "%a" }; if (fmt < 0 || fmt >= NUM_COL_FMTS) @@ -168,6 +168,7 @@ static const gchar *dlist[NUM_COL_FMTS] = { "TEI", /* XXX - why is it missing in column_utils.c and elsewhere? */ "Frame Relay DLCI", /* COL_FR_DLCI */ "GPRS BSSGP TLLI", /* COL_BSSGP_TLLI */ + "Expert Info Severity", /* COL_EXPERT */ }; const gchar * @@ -286,6 +287,9 @@ get_column_format_matches(gboolean *fmt_list, gint format) { case COL_BSSGP_TLLI: fmt_list[COL_BSSGP_TLLI] = TRUE; break; + case COL_EXPERT: + fmt_list[COL_EXPERT] = TRUE; + break; default: break; } @@ -571,6 +575,9 @@ get_column_longest_string(gint format) case COL_BSSGP_TLLI: return "0xffffffff"; break; + case COL_EXPERT: + return "ERROR"; + break; default: /* COL_INFO */ return "Source port: kerberos-master Destination port: kerberos-master"; break; @@ -740,6 +747,9 @@ get_column_format_from_str(gchar *str) { case 'l': return COL_BSSGP_TLLI; break; + case 'a': + return COL_EXPERT; + break; } cptr++; } diff --git a/epan/column_info.h b/epan/column_info.h index b9589b2d09..4976c3e285 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -111,6 +111,7 @@ enum { COL_TEI, /* Q.921 TEI */ COL_FR_DLCI, /* Frame Relay DLCI */ COL_BSSGP_TLLI, /* GPRS BSSGP IE TLLI */ + COL_EXPERT, /* Expert Info */ NUM_COL_FMTS /* Should always be last */ }; diff --git a/epan/expert.c b/epan/expert.c index 984b52a392..3e3d9ee605 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -138,6 +138,9 @@ packet_info *pinfo, proto_item *pi, int group, int severity, const char *format, expert_set_item_flags(pi, group, severity); } + if (check_col(pinfo->cinfo, COL_EXPERT)) + col_add_str(pinfo->cinfo, COL_EXPERT, val_to_str(severity, expert_severity_vals, "?%u?")); + tap_queue_packet(expert_tap, pinfo, ei); } |