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

From Michael McCartney (bug 2246): 

Enhancement to allow dec option when parsing offset.

svn path=/trunk/; revision=24272
This commit is contained in:
Stig Bjørlykke 2008-02-05 21:31:18 +00:00
parent 63a40511e8
commit 273ea4b70d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
text2pcap.c
View File

@ -1024,7 +1024,7 @@ usage (void)
" <output-filename> specifies output filename (use - for standard output)\n"
"\n"
"Input:\n"
" -o hex|oct parse offsets as (h)ex or (o)ctal, default is hex\n"
" -o hex|oct|dec parse offsets as (h)ex, (o)ctal or (d)ecimal, default is hex\n"
" -t <timefmt> treats the text before the packet as a date/time code;\n"
" the specified argument is a format string of the sort \n"
" supported by strptime.\n"
@ -1096,11 +1096,15 @@ parse_options (int argc, char *argv[])
case 'l': pcap_link_type = strtol(optarg, NULL, 0); break;
case 'm': max_offset = strtol(optarg, NULL, 0); break;
case 'o':
if (optarg[0]!='h' && optarg[0] != 'o') {
if (optarg[0]!='h' && optarg[0] != 'o' && optarg[0] != 'd') {
fprintf(stderr, "Bad argument for '-o': %s\n", optarg);
usage();
}
offset_base = (optarg[0]=='o') ? 8 : 16;
switch(optarg[0]) {
case 'o': offset_base = 8; break;
case 'h': offset_base = 16; break;
case 'd': offset_base = 10; break;
}
break;
case 'e':
hdr_ethernet = TRUE;