Commit Graph

44273 Commits

Author SHA1 Message Date
Evan Huus f88d8e48c1 Update wmem docs to include new type field.
svn path=/trunk/; revision=46815
2012-12-27 22:38:48 +00:00
Evan Huus dc98756ca4 Store the type of each wmem allocator.
svn path=/trunk/; revision=46814
2012-12-27 22:31:42 +00:00
Evan Huus 347a8a2115 Add full modelines and minor whitespace fixes.
svn path=/trunk/; revision=46812
2012-12-27 18:58:08 +00:00
Gerald Combs 77caa2d86c Remove an unused variable.
svn path=/trunk/; revision=46811
2012-12-27 17:52:50 +00:00
Gerald Combs e6baf22f8c Make sure our loops terminate.
svn path=/trunk/; revision=46810
2012-12-27 17:23:40 +00:00
Michael Tüxen 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
Gerald Combs cbec3bbaf7 Move common profile code to ui/profile.[ch].
svn path=/trunk/; revision=46808
2012-12-27 17:10:51 +00:00
Gerald Combs f35d5f15f4 Add "+", "-", and "copy" images. Document their origins.
svn path=/trunk/; revision=46807
2012-12-27 17:09:15 +00:00
Anders Broman 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
Guy Harris 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
Guy Harris 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
Anders Broman 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
Anders Broman 01432aaf5c Add Media Independent Handover Protocol ethertype
svn path=/trunk/; revision=46801
2012-12-27 11:19:46 +00:00
Guy Harris f79410f0cd Tabs -> spaces.
svn path=/trunk/; revision=46800
2012-12-26 22:34:39 +00:00
Guy Harris 7df01d368e Update a comment.
svn path=/trunk/; revision=46799
2012-12-26 22:34:09 +00:00
Guy Harris 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
Guy Harris 5c2a86ebc8 Update a comment.
svn path=/trunk/; revision=46795
2012-12-26 22:13:34 +00:00
Guy Harris 46e9f63fb2 Do array bounds checking.
svn path=/trunk/; revision=46793
2012-12-26 22:05:41 +00:00
Guy Harris 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
Guy Harris 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
Evan Huus 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
Anders Broman 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
Anders Broman 8106e33188 Make dumpcap build on Windows
svn path=/trunk/; revision=46788
2012-12-26 15:02:32 +00:00
Guy Harris 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
Evan Huus 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
Evan Huus 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
Anders Broman eb34f28b9f if 0 out debug code
svn path=/trunk/; revision=46784
2012-12-26 12:34:08 +00:00
Anders Broman 369fe110c2 if 0 out debug code
svn path=/trunk/; revision=46783
2012-12-26 12:31:50 +00:00
Anders Broman fe7a2570db Move summary related stuff to summary_dlg
svn path=/trunk/; revision=46782
2012-12-26 12:29:43 +00:00
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 1825519526 On I/O errors when opening a file, use wtap_close() to clean up, to make
sure we clean up everything.

svn path=/trunk/; revision=46773
2012-12-26 11:59:47 +00:00
Guy Harris 29acae89d9 OK, see if not using an enum gets rid of "implicit conversion shortens
64-bit value to 32 bits" warnings on 32-bit compilers.  According to
6.1.3.3 "Enumeration constants" of C90, "An identifier declared as an
enumeration constant has type int", so there may be signed vs. unsigned
issues.

svn path=/trunk/; revision=46772
2012-12-26 11:46:48 +00:00
Guy Harris ea888f9113 Squelch some more discarding-qualifiers warnings.
svn path=/trunk/; revision=46771
2012-12-26 11:27:21 +00:00
Guy Harris ef175a2208 Squelch some more discarding-qualifiers warnings.
svn path=/trunk/; revision=46770
2012-12-26 11:24:39 +00:00
Guy Harris 1cd57ad3c5 bytestring_to_str() now returns a const char *; assign its result to a
const char *, not a char *.

svn path=/trunk/; revision=46769
2012-12-26 10:54:03 +00:00
Guy Harris 544efd26a6 And another 64-bit-to-32-bit conversion on 32-bit platforms.
svn path=/trunk/; revision=46768
2012-12-26 10:49:05 +00:00
Guy Harris 4fc5688f87 simple_dialog_primary_start() and simple_dialog_primary_end() are now
declared as returning const char *s; make it so.

svn path=/trunk/; revision=46767
2012-12-26 10:33:02 +00:00
Guy Harris 852ee34955 Another 64-bit-to-32-bit warning that shows up in 32-bit environments.
svn path=/trunk/; revision=46766
2012-12-26 10:30:34 +00:00
Guy Harris c1245c6b32 Change wireshark_gen.py to make the operation argument to routines a
"const char *", as it is now expected to be.  Regenerate the dissectors.

Update the URL for OmniOrb.

In README.parlay, use idl2wrs in the sample command.

svn path=/trunk/; revision=46765
2012-12-26 10:28:03 +00:00
Guy Harris ce0d04c6d2 Hopefully this case is OK in C++; bit-fields can't be enums in standard
C, so....

svn path=/trunk/; revision=46764
2012-12-26 09:59:18 +00:00
Guy Harris 688b567111 And more 64-bit-to-32-bit time issues on 32-bit platforms.
svn path=/trunk/; revision=46763
2012-12-26 09:56:18 +00:00
Guy Harris 15feaf9744 OK, I give up.
svn path=/trunk/; revision=46759
2012-12-26 07:08:24 +00:00
Guy Harris dd1505428c Another ILP32 Y2.038K warning.
svn path=/trunk/; revision=46758
2012-12-26 07:05:42 +00:00
Guy Harris 6d678c20d6 OK, does *this* convince the compiler that the loop isn't ever going to
be infinite?

svn path=/trunk/; revision=46757
2012-12-26 06:56:17 +00:00
Guy Harris 7f40879104 Squelch a (Y2.038K) warning.
svn path=/trunk/; revision=46756
2012-12-26 06:41:49 +00:00
Guy Harris 229ec8c545 OK, *this* isn't a possibly-infinite loop.
svn path=/trunk/; revision=46755
2012-12-26 06:39:53 +00:00
Guy Harris 34633f5fe3 Widen some loop variables, in the hopes that it'll squelch some loop
warnings.

svn path=/trunk/; revision=46754
2012-12-26 06:20:59 +00:00