osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make column "filter name" prefixed with _ws. to be the same as other "*shark application filters" created in r52462. 

svn path=/trunk/; revision=52474
This commit is contained in:
Michael Mann 2013-10-09 19:43:02 +00:00
parent 576a16004b
commit ba3e8e070a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tshark.pod
View File

@ -291,9 +291,9 @@ from such an account, it will not list any interfaces.
Add a field to the list of fields to display if B<-T fields> is
selected. This option can be used multiple times on the command line.
At least one field must be provided if the B<-T fields> option is
selected. Column names may be used prefixed with "col."
selected. Column names may be used prefixed with "_ws.col."
Example: B<-e frame.number -e ip.addr -e udp -e col.info>
Example: B<-e frame.number -e ip.addr -e udp -e _ws.col.info>
Giving a protocol rather than a single field will print multiple items
of data about the protocol as a single field. Fields are separated by

2
docbook/wsug_src/WSUG_app_tools.xml
View File

@ -87,7 +87,7 @@ Output:
-x add output of hex and ASCII dump (Packet Bytes)
-T pdml|ps|psml|text|fields
format of text output (def: text)
-e &lt;field&gt; field to print if -Tfields selected (e.g. tcp.port, col.Info);
-e &lt;field&gt; field to print if -Tfields selected (e.g. tcp.port, _ws.col.Info);
this option can be repeated to print multiple fields
-E&lt;fieldsoption&gt;=&lt;value&gt; set options for output when -Tfields selected:
header=y|n switch headers on and off

2
epan/print.c
View File

@ -1382,7 +1382,7 @@ void output_fields_free(output_fields_t* fields)
g_free(fields);
}
#define COLUMN_FIELD_FILTER "col."
#define COLUMN_FIELD_FILTER "_ws.col."
void output_fields_add(output_fields_t *fields, const gchar *field)
{

2
tshark.c
View File

@ -320,7 +320,7 @@ print_usage(gboolean print_ver)
fprintf(output, " -x add output of hex and ASCII dump (Packet Bytes)\n");
fprintf(output, " -T pdml|ps|psml|text|fields\n");
fprintf(output, " format of text output (def: text)\n");
fprintf(output, " -e <field> field to print if -Tfields selected (e.g. tcp.port, col.Info);\n");
fprintf(output, " -e <field> field to print if -Tfields selected (e.g. tcp.port, _ws.col.Info);\n");
fprintf(output, " this option can be repeated to print multiple fields\n");
fprintf(output, " -E<fieldsoption>=<value> set options for output when -Tfields selected:\n");
fprintf(output, " header=y|n switch headers on and off\n");