aboutsummaryrefslogtreecommitdiffstats
path: root/rawshark.c
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2008-03-01 05:16:45 +0000
committerStephen Fisher <steve@stephen-fisher.com>2008-03-01 05:16:45 +0000
commit56226b49b8818f12ccaef777f427834958dc5dba (patch)
tree7b42047b1a68cbcc4e11173f6726c47b25c6ae3e /rawshark.c
parent61caa0b5b9bd530493e6a66fb9b6e38c1b29404a (diff)
Custom column updates:
- Change apply / prepare / ... as filter to use the field's value, which is now stored in fdata as well as cinfo. Now we don't have to reprocess the entire packet list when using these features. This also prevents the use of these features from overwriting custom column information. (custom columns can now be used in apply / prepare ... as filter) - Break col_expr and col_expr_val out into a struct that is included not only in cinfo, but now also fdata. - Have col_custom_set_fstr() quote FT_STRING & FT_STRINGZ when storing the col_expr_val value (for filter creation). svn path=/trunk/; revision=24511
Diffstat (limited to 'rawshark.c')
-rw-r--r--rawshark.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rawshark.c b/rawshark.c
index 2d7615d9bd..97c91178d2 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -770,8 +770,8 @@ main(int argc, char *argv[])
else
cfile.cinfo.col_buf[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
cfile.cinfo.col_fence[i] = 0;
- cfile.cinfo.col_expr[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
- cfile.cinfo.col_expr_val[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
+ cfile.cinfo.col_expr.col_expr[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
+ cfile.cinfo.col_expr.col_expr_val[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
}
for (i = 0; i < cfile.cinfo.num_cols; i++) {