guy [Sun, 10 Apr 2011 20:59:10 +0000 (20:59 +0000)]
Rename ws_stat to ws_stat64, and make it take a pointer to a ws_statb64
as an argument, along the lines of ws_fstat64, and, on Windows, make it
use _wstati64, to handle 64-bit file sizes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36547
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 10 Apr 2011 20:51:58 +0000 (20:51 +0000)]
Define ws_statb64 as struct stat *within* the "not Windows" block.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36546
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 10 Apr 2011 19:56:06 +0000 (19:56 +0000)]
Define ws_statb64 to be the appropriate "struct XXX" for a
64-bit-file-size-capable stat call, and use it for ws_fstat64().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36545
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 10 Apr 2011 18:55:06 +0000 (18:55 +0000)]
Add ws_fstat64(), defined to be fstat on UN*X and _fstati64 on Windows.
Use it in some places where we're getting the file size.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36544
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 10 Apr 2011 18:29:56 +0000 (18:29 +0000)]
strcpy -> strncpy.
Coverity 669.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36543
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 10 Apr 2011 18:22:47 +0000 (18:22 +0000)]
Use AC_SYS_LARGEFILE to turn on large file support on platforms that
support it.
Rename ws_lseek to ws_lseek64, as it should be given a 64-bit offset,
and have it use _lseeki64 on Windows, to try to get 64-bit offset
support; AC_SYS_LARGEFILE should cause lseek() to support 64-bit offsets
on UN*X if possible.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36542
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 10 Apr 2011 17:03:43 +0000 (17:03 +0000)]
1.5.1 → 1.5.2. Reenable Babel.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36540
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 10 Apr 2011 17:01:13 +0000 (17:01 +0000)]
Point to RFC 1952 as a description of the gzip file format.
Point to pages for some other compressed file formats we might want to
support.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36539
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 10 Apr 2011 16:53:32 +0000 (16:53 +0000)]
Move the definition of the structure pointed to by a FILE_T into
wiretap/file_wrappers.c; nothing outside of file_wrappers.c needs to
know what it looks like, it just passes around pointers to it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36538
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 10 Apr 2011 16:42:10 +0000 (16:42 +0000)]
Build 1.5.1. Temporarily disable the Babel dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36537
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 10 Apr 2011 16:40:29 +0000 (16:40 +0000)]
Minor whitespace fix.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36536
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 10 Apr 2011 15:03:48 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-04-10]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36534
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 10 Apr 2011 15:01:18 +0000 (15:01 +0000)]
prefs_register_protocol() not needed since no prefs; Coverity #1185 (UNUSED_VALUE).
Also: #include <stdio.h> not needed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36533
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 9 Apr 2011 19:03:04 +0000 (19:03 +0000)]
From Jakub Zawadzki via bug 5809:
Compare frame number when columns are equal.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36532
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 9 Apr 2011 17:18:52 +0000 (17:18 +0000)]
Do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36531
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 9 Apr 2011 17:17:47 +0000 (17:17 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 911;
Fix bug wherein an item was apparently added to the wrong subtree: Coverity 910;
Remove unneeded #includes;
Do whitespace and indentation cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36530
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 9 Apr 2011 17:11:13 +0000 (17:11 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 923-927;
Add braces around around certain code sections for indentation purposes;
Do some indentation & whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36529
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 9 Apr 2011 13:44:00 +0000 (13:44 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 891 & 892;
Also: #include <stdlib.h> & <string.h> not req'd; fix some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36528
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 9 Apr 2011 04:33:26 +0000 (04:33 +0000)]
In packet_list_dissect_and_cache_record(), set the columns to
*something* if we get an error reading the packet from the capture file,
rather than leaving them as null (which will cause a crash).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36527
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 8 Apr 2011 21:21:32 +0000 (21:21 +0000)]
Fix Coverity CID 557.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36526
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 8 Apr 2011 20:06:56 +0000 (20:06 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 990;
Add some missing code: improves display of "main_opcode" field: Coverity 991, 993 & 994;
Fix bug introduced a while back: "changeinfo4" field details aren't displayed: Coverity 992;
Add missing code so READDIR (V4) details are shown in a subtree (as presumably was originally intended);
Fix some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36525
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 8 Apr 2011 19:54:07 +0000 (19:54 +0000)]
From Pascal Quantin:
A patch adding the missing hunks (it looks like extract_asn1_from_spec.pl script is mixing Windows and Linux line endings).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36524
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Fri, 8 Apr 2011 19:52:04 +0000 (19:52 +0000)]
Enhance Vendor Specific Atheros IE
* Replace proto_tree_add_ether/boolean by proto_tree_add_item
* use BASE_CUSTOM for XR beacon interval
* use ENC_* macro for encoding
* replace if(...) by switch(...) for type and subtype (more extensible if new (sub)type)
* add expert info when tag_len is incorrect
Fix also a minor issue with tag_end...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36523
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 8 Apr 2011 19:51:39 +0000 (19:51 +0000)]
Add a relative path to the "#line" directives we produce. Regenerate the
SNMP and SPNEGO dissectors to see if it helps Coverity locate the
original source files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36522
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 8 Apr 2011 17:42:20 +0000 (17:42 +0000)]
Just make the fh member of a wtap_dumper_t a void * for now, and, in all
calls that use it, cast it to whatever it's supposed to be. Making it a
gzFile means you can't use any stdio macros that reach inside the
structure; making it a FILE *, as it used to be, amounts to trying to
use a FILE * as a void * if we're writing a compressed file out.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36521
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 8 Apr 2011 17:36:53 +0000 (17:36 +0000)]
From Pascal Quantin:
Upgrade LTE RRC ASN.1 description to V9.6.0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5815
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36520
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 8 Apr 2011 17:05:05 +0000 (17:05 +0000)]
Add Babel.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36519
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Fri, 8 Apr 2011 16:53:02 +0000 (16:53 +0000)]
From Juliusz Chroboczek via bug #5812: Dissector for the Babel Routing
Protocol (RFC 6126)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36518
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 8 Apr 2011 15:57:44 +0000 (15:57 +0000)]
Make wtap plugins build on windows again.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36517
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 8 Apr 2011 11:58:33 +0000 (11:58 +0000)]
Use tvb_get_ephemeral_string()
prefix hf vars with hf_sip
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36516
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 8 Apr 2011 01:57:02 +0000 (01:57 +0000)]
Change ng_file_read() to take only one size argument - and make it an
unsigned int - to match file_read(). Shrink some arguments, variables,
and structure members appropriately.
Fix an incorrect sizeof - sizeof a pointer is the size of the pointer,
not the size of what it points to.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36515
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 8 Apr 2011 01:55:25 +0000 (01:55 +0000)]
To squelch some compiler warnings, temporarily cast the argument to
ws_lseek() to the appropriate type for the second argument to _lseek()
for Windows or lseek() for UN*X; ultimately, we want to call the
appropriate 64-bit-offset seek routine if available, otherwise cast the
value down and hand it to the 32-bit-offset seek routine.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36514
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 8 Apr 2011 00:28:37 +0000 (00:28 +0000)]
From Jakub Zawadzki:
Steal file_wrappers functions from zlib v2.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36513
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 7 Apr 2011 23:52:37 +0000 (23:52 +0000)]
Use a unique variable name. Fixes Coverity CID 593.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36512
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 7 Apr 2011 23:16:05 +0000 (23:16 +0000)]
Be more picky about our sscanf integer field widths. Hopefully this will
help squelch Coverity CIDs 701-709.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36511
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 7 Apr 2011 21:53:31 +0000 (21:53 +0000)]
From Jakub Zawadzki:
Introduce file_clearerr
I'm unsure of this patch,
gzclearerr() is used to clear the end-of-file mark, but for FILE
there's function which do the same (clearerr).
I created test program if clearerr() is needed for tailing file.
and it seems to work without it (at least on Linux, so for
!HAVE_LIBZ I commented it out).
For now this patch introduce file_clearerr macro, and define it
only when EOF marking must be cleared (i.e. when HAVE_LIBZ and
HAVE_GZCLEARERR are defined).
So everything works like before, patch just to keep same prefix
for file interface :)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36510
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 7 Apr 2011 21:39:49 +0000 (21:39 +0000)]
Make it possible to have a sub dissector dissect the status line diagnostic string should it contain more than a string.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36509
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 7 Apr 2011 20:41:11 +0000 (20:41 +0000)]
Display frame numbers containing min & max SRT's. Other misc. display tweaks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36508
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 7 Apr 2011 20:04:01 +0000 (20:04 +0000)]
From Gisle Vanem: text_import_scanner_lex.h is no longer used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36507
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 7 Apr 2011 16:16:47 +0000 (16:16 +0000)]
Enhance Tag Measurement Request & Report
* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding
* ...
My first commit !
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36506
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 7 Apr 2011 14:07:54 +0000 (14:07 +0000)]
(Trivial) Fix a typo & some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36505
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 7 Apr 2011 13:41:25 +0000 (13:41 +0000)]
Until the minimum glib version requirement is changed from 2.4 to at least 2.8,
use g_try_malloc() instead of g_try_malloc0(). This should make the Solaris
buildbot happy again.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36504
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 6 Apr 2011 22:51:25 +0000 (22:51 +0000)]
Fix Coverity 1181: REVERSE_INULL & improve code:
- Use g_try_malloc0() instead of g_malloc0() since the latter will
fail and abort the program. Leave the NULL return check.
- Don't dereference pointer before checking that it's valid.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36503
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 6 Apr 2011 19:57:39 +0000 (19:57 +0000)]
Enhancement bug #5796: Add Atheros vendor specific 802.11 IE parsing
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36502
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Wed, 6 Apr 2011 19:48:11 +0000 (19:48 +0000)]
Add computation of median and change standard deviation calculation to "sample"
standard deviation. Split statistics output onto 2 lines.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36501
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 6 Apr 2011 18:59:36 +0000 (18:59 +0000)]
Either remove or use unused values found by Coverity. Fixes CIDs
1169-1172.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36500
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 6 Apr 2011 18:48:07 +0000 (18:48 +0000)]
Add RoHC to the ethertypes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36499
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 6 Apr 2011 16:34:45 +0000 (16:34 +0000)]
From Peter via bug #5798: Don't try to run svnversion if it isn't
executable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36498
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 6 Apr 2011 15:01:42 +0000 (15:01 +0000)]
From Johan Wåhl:
Add dissection of feature list flags.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36497
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 6 Apr 2011 12:19:38 +0000 (12:19 +0000)]
Use the correct handle when registering "media_type" "application/vnd.3gpp2.sms": Coverity 835.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36496
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 6 Apr 2011 09:59:21 +0000 (09:59 +0000)]
Fixed blurb for BER Error.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36495
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 6 Apr 2011 08:52:42 +0000 (08:52 +0000)]
Made "BER Error" filterable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36494
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 6 Apr 2011 07:09:56 +0000 (07:09 +0000)]
From Jakub Zawadzki:
file-wrappers.[ch] is used only for reading files, and mode is always
"rb".
Attached patch removes 'mode' argument from file_open() & filed_open().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36493
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 6 Apr 2011 06:59:19 +0000 (06:59 +0000)]
From Jakub Zawadzki: fix the type of an argument.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36492
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 6 Apr 2011 06:51:19 +0000 (06:51 +0000)]
From Jakub Zawadzki:
file_read(buf, bsize, count, file) macro is compilant with fread
function and takes elements count+ size of each element, however to make
it compilant with gzread() it always returns number of bytes.
In wiretap file_read() this is not really used, file_read is called
either with bsize set to 1 or count to 1.
Attached patch remove bsize argument from macro.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36491
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 6 Apr 2011 06:24:19 +0000 (06:24 +0000)]
Add a comment
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36490
f5534014-38df-0310-8fa8-
9805f1628bb7
kukosa [Wed, 6 Apr 2011 06:20:50 +0000 (06:20 +0000)]
RFC5806 Diversion header
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36489
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 6 Apr 2011 06:20:32 +0000 (06:20 +0000)]
Missing decoding for CalledPartyBCD number in CAMEL
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5788
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36488
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 6 Apr 2011 01:41:03 +0000 (01:41 +0000)]
IMHO capinfos, when finished processing, should exit with an error status
if an error occurred while processing.
E.G.,: For the default (no -C option):
'capinfos invalid.xxx' or 'capinfos a.pcap invalid.xxx c.pcap'
should exit with an error status
(after processing all the input args) if there is an error for invalid.xxx.
With this fix, I expect fuzz-test.sh (and list_protos_in_cap.sh
and presumably other scripts) will work a bit more as as expected.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36487
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 6 Apr 2011 00:07:52 +0000 (00:07 +0000)]
Fix Coverity 1062: UNUSED_VALUE
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36486
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 5 Apr 2011 23:26:56 +0000 (23:26 +0000)]
Set the correct properties ....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36485
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 5 Apr 2011 23:03:21 +0000 (23:03 +0000)]
Set the correct properties ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36484
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 5 Apr 2011 22:38:12 +0000 (22:38 +0000)]
Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36483
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 5 Apr 2011 22:33:37 +0000 (22:33 +0000)]
More manifest fixes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36482
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 5 Apr 2011 20:50:49 +0000 (20:50 +0000)]
Mark pinfo as unused with _U_ to avoid compiler warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36481
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 5 Apr 2011 20:21:59 +0000 (20:21 +0000)]
Add ICMP tap support, and add a tshark tap to measure such things as:
* Number of ICMP echo requests, replies, lost replies and percent loss.
* Min, Max, Average SRT (Service Response Time), and standard deviation.
(This is my first tap, so hopefully I didn't miss something, but we'll see ...)
TODO: Add a Wireshark tap.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36480
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 5 Apr 2011 19:21:16 +0000 (19:21 +0000)]
foo="\windows\style\pathname"; printf "$foo" isn't going to work too well in the general case ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36479
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 5 Apr 2011 18:01:33 +0000 (18:01 +0000)]
1. Remove \r from tshark output so output OK on Windows cygwin bash.
2. Error messsages to stderr.
3. Check capinfos return value to verify that file is a valid capture file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36478
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 5 Apr 2011 17:27:30 +0000 (17:27 +0000)]
Fix a few more typos and reformat some of the comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36477
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 5 Apr 2011 16:14:19 +0000 (16:14 +0000)]
Remove the manifest as a prerequisite for packaging.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36476
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 5 Apr 2011 15:49:56 +0000 (15:49 +0000)]
Compile fix: camel_obj_id -> obj_id.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36475
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 5 Apr 2011 15:43:15 +0000 (15:43 +0000)]
Actually get the oid string ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36474
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 5 Apr 2011 15:33:56 +0000 (15:33 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 858;
Fix two cases where items appear to be added to the wrong tree: Coverioty 856 & 857.
Also: remove some unneeded #includes& do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36473
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 5 Apr 2011 15:09:32 +0000 (15:09 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 882;
Also: #include <string.h> not req'd
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36472
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Tue, 5 Apr 2011 14:28:33 +0000 (14:28 +0000)]
Fix a typo in the help message.
Reported by Matthias Wellmeyer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36471
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 5 Apr 2011 05:50:45 +0000 (05:50 +0000)]
From Jose Pedro Oliveira:
#ifdef HAVE_LIBGCRYPT block includes a line too many.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5803
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36470
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 5 Apr 2011 02:35:32 +0000 (02:35 +0000)]
Remove some unused hf_ variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36469
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 5 Apr 2011 02:18:28 +0000 (02:18 +0000)]
From Felix Kraemer: fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5694 :
This patch adds the capability to create BACnet statistics trees.
Find the respective menu items under 'Statistics->BACnet'.
Packets can be sorted by different criteria:
- Src/Dst IP adresses
- Instance ID
- Object Type
- Service
From me:
- Don't use C++/C99-style comments.
- Name variables for tick_stat_node() don't need to be static.
- Change updateBacnetInfoValue() to require 'data' to be ep_ allocated. Change
the couple of calls that did not send in ep_ allocated data to do so.
- Change one or two functions to be static.
- Do not use (memory-unsafe) g_sprintf().
- Use ep_strconcat() instead of leaking memory with g_strconcat().
- Put back one if(tree) that doesn't appear to do any harm.
- Remove variable declarations and #includes from the header file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36468
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 5 Apr 2011 01:21:19 +0000 (01:21 +0000)]
Set BIN_DIR to . by default. Use tr to replace colons with newlines.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36467
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 20:03:27 +0000 (20:03 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 850;
Also: remove some unneeded #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36466
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 19:41:51 +0000 (19:41 +0000)]
Fix "MISSING_BREAK"; Coverity 436.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36465
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 19:23:39 +0000 (19:23 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 846 & 848;
Also: remove some unneeded #includes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36464
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Mon, 4 Apr 2011 19:15:31 +0000 (19:15 +0000)]
More console tweaks. But how to prevent prompt from being displayed before
command finishes without requiring, "start /wait <command>"?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36463
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 4 Apr 2011 19:10:30 +0000 (19:10 +0000)]
Based on idea from Bill Meier:
A little script to extract the protocols used in given capture files.
(Just so I don't have to remember how to do it again.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36462
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 4 Apr 2011 18:43:59 +0000 (18:43 +0000)]
Fix up indentation
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36461
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 18:41:49 +0000 (18:41 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 836;
Also: remove some unneeded #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36460
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 18:13:22 +0000 (18:13 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 832-834.
Also: white space cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36459
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 4 Apr 2011 18:03:24 +0000 (18:03 +0000)]
More console tweaks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36458
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 4 Apr 2011 17:56:16 +0000 (17:56 +0000)]
Fix Coverity 1137, 1138, 1139: UNUSED_VALUE
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36457
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 17:49:32 +0000 (17:49 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 829 & 830;
Fix a minor bug wherein a number of proto_tree_add_...() used the wrong tree: Coverity 831;
Remove some unneeded #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36456
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 4 Apr 2011 17:48:07 +0000 (17:48 +0000)]
Only call destroy_console() when we create a console (pointed out by
Chris Maynard).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36455
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 4 Apr 2011 17:42:37 +0000 (17:42 +0000)]
Fix compilation error:
packet-amqp.c:5617:5: error: "/*" within comment
Cause:
Previous comment wasn't terminated right
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36454
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 17:24:17 +0000 (17:24 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 827;
Comment out some currently unused code: Coverity 828.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36453
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 4 Apr 2011 17:11:56 +0000 (17:11 +0000)]
On Windows, try to use an existing console for our messages. Create one if
it doesn't exist.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36452
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 16:54:02 +0000 (16:54 +0000)]
Don't assign to a variable if the value won't be used: Coverity 826;
Also: Remove some uneeded #includes & use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36451
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Mon, 4 Apr 2011 16:15:27 +0000 (16:15 +0000)]
Fix some typos.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36450
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 16:13:42 +0000 (16:13 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 823 & 824;
Fix a minor bug wherein a proto_tree_add_text used the wrong tree: Coverity 825;
Remove some unneeded #includes;
Use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36449
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 4 Apr 2011 15:41:07 +0000 (15:41 +0000)]
Don't build a manifest if we don't need one.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36448
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 15:38:19 +0000 (15:38 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 820/821;
Also: #include <stdio.h> & <string.h> not required;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36447
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 4 Apr 2011 15:31:33 +0000 (15:31 +0000)]
Don't assign to a variable if the value won't be used: Coverity 817-821.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36446
f5534014-38df-0310-8fa8-
9805f1628bb7