osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7546 

Make sure unresolved columns are indeed unresolved


svn path=/trunk/; revision=49776
This commit is contained in:
Sake Blok 2013-06-04 21:36:47 +00:00
parent 1bb2081fd2
commit 56cb987ef2
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
epan/column-utils.c
View File

@ -1439,14 +1439,18 @@ col_set_time(column_info *cinfo, const gint el, const nstime_t *ts, const char *
}
static void
col_set_addr(packet_info *pinfo, const int col, const address *addr, const gboolean is_src, const gboolean fill_col_exprs)
col_set_addr(packet_info *pinfo, const int col, const address *addr, const gboolean is_src,
const gboolean fill_col_exprs, const gboolean res)
{
if (addr->type == AT_NONE) {
/* No address, nothing to do */
return;
}
pinfo->cinfo->col_data[col] = se_get_addr_name(addr);
if (res)
pinfo->cinfo->col_data[col] = se_get_addr_name(addr);
else
pinfo->cinfo->col_data[col] = se_address_to_str(addr);
if (!fill_col_exprs)
return;
@ -1739,56 +1743,56 @@ col_fill_in(packet_info *pinfo, const gboolean fill_col_exprs, const gboolean fi
case COL_DEF_SRC:
case COL_RES_SRC: /* COL_DEF_SRC is currently just like COL_RES_SRC */
col_set_addr(pinfo, i, &pinfo->src, TRUE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->src, TRUE, fill_col_exprs, TRUE);
break;
case COL_UNRES_SRC:
col_set_addr(pinfo, i, &pinfo->src, TRUE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->src, TRUE, fill_col_exprs, FALSE);
break;
case COL_DEF_DL_SRC:
case COL_RES_DL_SRC:
col_set_addr(pinfo, i, &pinfo->dl_src, TRUE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->dl_src, TRUE, fill_col_exprs, TRUE);
break;
case COL_UNRES_DL_SRC:
col_set_addr(pinfo, i, &pinfo->dl_src, TRUE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->dl_src, TRUE, fill_col_exprs, FALSE);
break;
case COL_DEF_NET_SRC:
case COL_RES_NET_SRC:
col_set_addr(pinfo, i, &pinfo->net_src, TRUE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->net_src, TRUE, fill_col_exprs, TRUE);
break;
case COL_UNRES_NET_SRC:
col_set_addr(pinfo, i, &pinfo->net_src, TRUE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->net_src, TRUE, fill_col_exprs, FALSE);
break;
case COL_DEF_DST:
case COL_RES_DST: /* COL_DEF_DST is currently just like COL_RES_DST */
col_set_addr(pinfo, i, &pinfo->dst, FALSE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->dst, FALSE, fill_col_exprs, TRUE);
break;
case COL_UNRES_DST:
col_set_addr(pinfo, i, &pinfo->dst, FALSE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->dst, FALSE, fill_col_exprs, FALSE);
break;
case COL_DEF_DL_DST:
case COL_RES_DL_DST:
col_set_addr(pinfo, i, &pinfo->dl_dst, FALSE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->dl_dst, FALSE, fill_col_exprs, TRUE);
break;
case COL_UNRES_DL_DST:
col_set_addr(pinfo, i, &pinfo->dl_dst, FALSE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->dl_dst, FALSE, fill_col_exprs, FALSE);
break;
case COL_DEF_NET_DST:
case COL_RES_NET_DST:
col_set_addr(pinfo, i, &pinfo->net_dst, FALSE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->net_dst, FALSE, fill_col_exprs, TRUE);
break;
case COL_UNRES_NET_DST:
col_set_addr(pinfo, i, &pinfo->net_dst, FALSE, fill_col_exprs);
col_set_addr(pinfo, i, &pinfo->net_dst, FALSE, fill_col_exprs, FALSE);
break;
case COL_DEF_SRC_PORT: