c7dd6480e4
Minor fix when building with VS2012 (VC11):
...
Prevents warning:
cl : Command line warning D9002 : ignoring unknown option '/Zd'
svn path=/trunk/; revision=46832
2012-12-28 22:13:05 +00:00
e3b03c9c25
Remove redundant SUBSYSTEM link option from link commands.
...
[ $(guiflags) or $(conflags) specified as part of the link options
includes the SUBSYSTEM option ].
svn path=/trunk/; revision=46831
2012-12-28 21:21:34 +00:00
b6bd189390
Fixes & comments for building Wireshark with VS2012 (VC11)
...
1. Define 'APPVER' appropriately;
Prevents warning message:
LINK : warning LNK4010: invalid subsystem version number 5.0; default subsystem version assumed.
2. Add comment (& ToDo) re using VS2012 to build .exe which will also run on WIndows XP.
svn path=/trunk/; revision=46830
2012-12-28 21:18:19 +00:00
5eacf33f1f
Update wmem documentation for the new allocator.
...
Use the strict allocator when fuzzing (at least until the fuzz-bot starts
running everything under valgrind).
svn path=/trunk/; revision=46829
2012-12-28 17:09:07 +00:00
0c66691b92
Add a strict allocator that does canaries and various other things, for
...
platforms which don't have Valgrind.
Valgrind is still the better choice on platforms which support it.
svn path=/trunk/; revision=46828
2012-12-28 17:04:23 +00:00
5588d07faa
Add missing new dissectors to CMake
...
* Media Independent handover (MIH) (Add in Revison 46802)
* RTCWeb Data Channel Protocol (Add in Revision 46809)
svn path=/trunk/; revision=46827
2012-12-28 14:38:27 +00:00
fee2b8b2b9
Tab => Spaces
...
svn path=/trunk/; revision=46826
2012-12-28 14:38:19 +00:00
bbe198de5e
Fix [ 77%] Building C object CMakeFiles/qtshark.dir/iface_monitor.c.o iface_monitor.c: In function ‘iface_mon_handler2’: iface_monitor.c:101:19: error: ‘IFF_UP’ undeclared (first use in this function) iface_monitor.c:101:19: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [CMakeFiles/qtshark.dir/iface_monitor.c.o] Erreur 1
...
svn path=/trunk/; revision=46825
2012-12-28 14:38:10 +00:00
cdc79cd5e9
Fix [ 76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:194:20: error: variable ‘fl_entry’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
...
svn path=/trunk/; revision=46824
2012-12-28 14:38:02 +00:00
c4650d85c6
Fix [76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:195:20: error: variable ‘profile’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
...
svn path=/trunk/; revision=46823
2012-12-28 14:37:53 +00:00
c6ede6cf55
Use the "if (file_gets(...) == NULL) { fail }" style, as used elsewhere.
...
svn path=/trunk/; revision=46822
2012-12-28 09:10:59 +00:00
41e6e0f7e6
Always check the return value of read_new_line().
...
svn path=/trunk/; revision=46821
2012-12-28 09:10:18 +00:00
97ec82d02e
Make the alignment amount for the wmem block allocator into a #define
...
and use what appears to be the sanest calculation for it that I can find.
svn path=/trunk/; revision=46820
2012-12-27 23:11:47 +00:00
d8b37bafb7
Errors take precedence over EOF; use file_error() after operations that
...
return an "EOF or error" indication - an EOF without an error will
return 0.
In iseries_seek_next_packet(), return an error code of WTAP_ERR_BAD_FILE
and an appropriate error message if we don't find a packet header within
the next ISERIES_MAX_TRACE_LEN lines, don't just return -1 and leave the
error information unchanged.
Setting an argument variable before returning has no effect, so don't do
it (so that we don't leave the mistaken impression that it *is* doing
something).
Clean up indentation.
svn path=/trunk/; revision=46819
2012-12-27 22:59:39 +00:00
bb3b34d7bf
Pre-declare just the enum, and not the typedef to avoid redefinition warnings.
...
svn path=/trunk/; revision=46818
2012-12-27 22:59:29 +00:00
439eaf4aa5
Add documentation about the environment variable.
...
svn path=/trunk/; revision=46817
2012-12-27 22:57:05 +00:00
442b61d0a4
Change the format of the environment variable slightly to allow overriding
...
allocator choice to use any specific allocator, not just simple.
svn path=/trunk/; revision=46816
2012-12-27 22:51:33 +00:00
f88d8e48c1
Update wmem docs to include new type field.
...
svn path=/trunk/; revision=46815
2012-12-27 22:38:48 +00:00
dc98756ca4
Store the type of each wmem allocator.
...
svn path=/trunk/; revision=46814
2012-12-27 22:31:42 +00:00
347a8a2115
Add full modelines and minor whitespace fixes.
...
svn path=/trunk/; revision=46812
2012-12-27 18:58:08 +00:00
77caa2d86c
Remove an unused variable.
...
svn path=/trunk/; revision=46811
2012-12-27 17:52:50 +00:00
e6baf22f8c
Make sure our loops terminate.
...
svn path=/trunk/; revision=46810
2012-12-27 17:23:40 +00:00
c541aa4ab5
Add initial support for
...
http://tools.ietf.org/html/draft-jesup-rtcweb-data-protocol-03
I'll improve the dissector as the ID evolves...
svn path=/trunk/; revision=46809
2012-12-27 17:11:24 +00:00
cbec3bbaf7
Move common profile code to ui/profile.[ch].
...
svn path=/trunk/; revision=46808
2012-12-27 17:10:51 +00:00
f35d5f15f4
Add "+", "-", and "copy" images. Document their origins.
...
svn path=/trunk/; revision=46807
2012-12-27 17:09:15 +00:00
93218a7c76
From Pawel Dziepak:dissect_rpc_array causes assertion fault when array is empty. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8145
...
svn path=/trunk/; revision=46805
2012-12-27 12:55:05 +00:00
db0c2de004
OK, fine, how about 4 characters initializing a 4-character array?
...
svn path=/trunk/; revision=46804
2012-12-27 12:41:24 +00:00
88e9d1c1e5
Do not call wtap_file_read_unknown_bytes() or
...
wtap_file_read_expected_bytes() from an open routine - open routines are
supposed to return -1 on error, 0 if the file doesn't appear to be a
file of the specified type, or 1 if the file does appear to be a file of
the specified type, but those macros will cause the caller to return
FALSE on errors (so that, even if there's an I/O error, it reports "the
file isn't a file of the specified type" rather than "we got an error
trying to read the file").
When doing reads in an open routine before we've concluded that the file
is probably of the right type, return 0, rather than -1, if we get
WTAP_ERR_SHORT_READ - if we don't have enough data to check whether a
file is of a given type, we should keep trying other types, not give up.
For reads done *after* we've concluded the file is probably of the right
type, if a read doesn't return the number of bytes we asked for, but
returns an error of 0, return WTAP_ERR_SHORT_READ - the file is
apparently cut short.
For NetMon and NetXRay/Windows Sniffer files, use a #define for the
magic number size, and use that for both magic numbers.
svn path=/trunk/; revision=46803
2012-12-27 12:19:25 +00:00
12317316ae
From Ankith: Media Independent handover (MIH) protocol dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5881
...
svn path=/trunk/; revision=46802
2012-12-27 11:26:40 +00:00
01432aaf5c
Add Media Independent Handover Protocol ethertype
...
svn path=/trunk/; revision=46801
2012-12-27 11:19:46 +00:00
f79410f0cd
Tabs -> spaces.
...
svn path=/trunk/; revision=46800
2012-12-26 22:34:39 +00:00
7df01d368e
Update a comment.
...
svn path=/trunk/; revision=46799
2012-12-26 22:34:09 +00:00
ab638bb6fc
geoip_db_get_paths() is exported from libwireshark, so it has to exist
...
regardless of whether we have GeoIP or not. However, regardless of
whether it's exported from GeoIP or not, it should return a g_mallocated
string.
svn path=/trunk/; revision=46798
2012-12-26 22:24:15 +00:00
5c2a86ebc8
Update a comment.
...
svn path=/trunk/; revision=46795
2012-12-26 22:13:34 +00:00
46e9f63fb2
Do array bounds checking.
...
svn path=/trunk/; revision=46793
2012-12-26 22:05:41 +00:00
074297d7dd
Make sure we don't sign-extend the (binary) bytes of the message length.
...
svn path=/trunk/; revision=46792
2012-12-26 20:42:23 +00:00
d4b622de36
Don't define geoip_db_get_paths() unless we have GeoIP - we don't use it
...
unless it's defined.
svn path=/trunk/; revision=46791
2012-12-26 20:37:50 +00:00
d520e82bd2
Use casts rather than changing the prototype of pipe_convert_header.
...
It has to be unsigned or else certain headers get misread due to signedness.
svn path=/trunk/; revision=46790
2012-12-26 17:14:31 +00:00
07c92db36b
From Michal Labedzki: To ensure that names are correct copy NULL too This fixes unknown characters sometimes show in src/dst columns, etc. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
...
svn path=/trunk/; revision=46789
2012-12-26 15:28:28 +00:00
8106e33188
Make dumpcap build on Windows
...
svn path=/trunk/; revision=46788
2012-12-26 15:02:32 +00:00
6cb00759cc
Squelch some Windows-only warnings - the third argument to _read() is
...
int, not size_t.
svn path=/trunk/; revision=46787
2012-12-26 13:49:04 +00:00
c2945ff831
Squash some sign-conversion warnings that g++ picks up but gcc does
...
not. QtShark now builds warning-free (for me at least).
svn path=/trunk/; revision=46786
2012-12-26 13:41:30 +00:00
1fafe099ab
Cast away another const warning that only shows up under really recent GCCs.
...
svn path=/trunk/; revision=46785
2012-12-26 13:18:58 +00:00
eb34f28b9f
if 0 out debug code
...
svn path=/trunk/; revision=46784
2012-12-26 12:34:08 +00:00
369fe110c2
if 0 out debug code
...
svn path=/trunk/; revision=46783
2012-12-26 12:31:50 +00:00
fe7a2570db
Move summary related stuff to summary_dlg
...
svn path=/trunk/; revision=46782
2012-12-26 12:29:43 +00:00
3dfac15921
Another 64-bit-to-32-bit warning on 32-bit platforms.
...
svn path=/trunk/; revision=46781
2012-12-26 12:28:40 +00:00
6255cc03f0
Fix another discarded qualifier error.
...
Remove some redundant declarations/definitions from
ui/gtk/capture_dlg.h.
svn path=/trunk/; revision=46780
2012-12-26 12:24:55 +00:00
ec5a6f8c5e
pipe_write_header() should return ssize_t, as it returns the return
...
value from write(), which, at least on UN*X, is ssize_t.
svn path=/trunk/; revision=46779
2012-12-26 12:14:59 +00:00
b467ecfc8b
If the attempt to read the record header fails because we hit the EOF,
...
treat that as "this isn't a CommView file" rather than "this is a bad
file".
svn path=/trunk/; revision=46774
2012-12-26 12:01:14 +00:00
Bill Meier