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

Move wireshark's display filter flag to -Y for consistency with tshark. 

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8223

svn path=/trunk/; revision=48653
This commit is contained in:
Evan Huus 2013-03-30 12:15:42 +00:00
parent 037bb3e614
commit 6fa584b0db
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/wireshark.pod.template
View File

@ -11,7 +11,6 @@ S<[ B<-b> E<lt>capture ring buffer optionE<gt> ] ...>
S<[ B<-B> E<lt>capture buffer sizeE<gt> ] >
S<[ B<-c> E<lt>capture packet countE<gt> ]>
S<[ B<-C> E<lt>configuration profileE<gt> ]>
S<[ B<-d> E<lt>display filterE<gt> ]>
S<[ B<-D> ]>
S<[ B<--display=>E<lt>X display to useE<gt> ] >
S<[ B<-f> E<lt>capture filterE<gt> ]>
@ -41,6 +40,7 @@ S<[ B<-v> ]>
S<[ B<-w> E<lt>outfileE<gt> ]>
S<[ B<-X> E<lt>eXtension optionE<gt> ]>
S<[ B<-y> E<lt>capture link typeE<gt> ]>
S<[ B<-Y> E<lt>displaY filterE<gt> ]>
S<[ B<-z> E<lt>statisticsE<gt> ]>
S<[ E<lt>infileE<gt> ]>
@ -301,10 +301,6 @@ data.
Start with the given configuration profile.
=item -d E<lt>display filterE<gt>
Start with the given display filter.
=item -D
Print a list of the interfaces on which B<Wireshark> can capture, and
@ -606,6 +602,10 @@ the interface specified by the last B<-i> option occurring before
this option. If the capture link type is not set specifically,
the default capture link type is used if provided.
=item -Y E<lt>displaY filterE<gt>
Start with the given display filter.
=item -z E<lt>statisticsE<gt>
Get B<Wireshark> to collect various types of statistics and display the result

10
ui/gtk/main.c
View File

@ -1190,7 +1190,7 @@ print_usage(gboolean print_ver) {
fprintf(output, "\n");
fprintf(output, "User interface:\n");
fprintf(output, " -C <config profile> start with specified configuration profile\n");
fprintf(output, " -d <display filter> start with the given display filter\n");
fprintf(output, " -Y <display filter> start with the given display filter\n");
fprintf(output, " -g <packet number> go to specified packet number after \"-r\"\n");
fprintf(output, " -J <jump filter> jump to the first packet matching the (display)\n");
fprintf(output, " filter\n");
@ -2211,7 +2211,7 @@ main(int argc, char *argv[])
#define OPTSTRING_I ""
#endif
#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:C:d:Df:g:Hhi:" OPTSTRING_I "jJ:kK:lLm:nN:o:P:pr:R:Ss:t:u:vw:X:y:z:"
#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:C:Df:g:Hhi:" OPTSTRING_I "jJ:kK:lLm:nN:o:P:pr:R:Ss:t:u:vw:X:y:Y:z:"
static const char optstring[] = OPTSTRING;
@ -2635,9 +2635,6 @@ main(int argc, char *argv[])
case 'C':
/* Configuration profile settings were already processed just ignore them this time*/
break;
case 'd':
dfilter = optarg;
break;
case 'j': /* Search backwards for a matching packet from filter in option J */
jump_backwards = SD_BACKWARD;
break;
@ -2768,6 +2765,9 @@ main(int argc, char *argv[])
case 'X':
/* ext ops were already processed just ignore them this time*/
break;
case 'Y':
dfilter = optarg;
break;
case 'z':
/* We won't call the init function for the stat this soon
as it would disallow MATE's fields (which are registered