Commit Graph

38258 Commits

Author SHA1 Message Date
Bill Meier 586ea8d092 Add call to add_new_data_source() for a newly created REAL_DATA tvb.
svn path=/trunk/; revision=40203
2011-12-14 18:58:08 +00:00
Bill Meier ee3936cd48 (Trivial) remove commented out calls to tvb_free().
svn path=/trunk/; revision=40202
2011-12-14 18:40:03 +00:00
Bill Meier d57950889e tvb_free() can (now) be called from plugins on Windows
svn path=/trunk/; revision=40201
2011-12-14 18:33:00 +00:00
Sake Blok 418863f88d Fix for bug 6032:
After changing the ssl_keys UAT, reparse the list and reload the keys.


svn path=/trunk/; revision=40200
2011-12-14 18:24:41 +00:00
Bill Meier 1460765248 Fix tvb memory leak.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3917

svn path=/trunk/; revision=40199
2011-12-14 17:35:22 +00:00
Bill Meier 13ad9f1071 Fix a tvbuff memory leak;
Also: Wireshark code change attributions are usually only in the svn log.

svn path=/trunk/; revision=40198
2011-12-14 15:19:14 +00:00
Bill Meier d281828b06 Fix a (sort-of) memory leak: Use ep_alloc'd rather than se_alloc'd memory for a tvbuff;
svn path=/trunk/; revision=40197
2011-12-14 14:39:16 +00:00
Guy Harris 44b29ee2ef Put back the source MAC address, but do it right, in one column_add_fstr()
call, and using ep_address_to_str(), so it can handle any address type,
including AT_NONE if the source address isn't available.

svn path=/trunk/; revision=40196
2011-12-14 05:23:57 +00:00
Guy Harris 343e983384 Refer to a PID of 0x0002 as the PID for the HP Teaming heartbeat
protocol.

Point to an HP document o the protocol, and discuss the two ways to hook
up the dissector.

Don't bother checking the destination address - either the OUI/PID
suffices, or the MAC address is both necessary and, presumably,
sufficient and we need to introduce a heuristic dissector table for SNAP
frames.  What's more, there's no guarantee that the destination address
is a MAC address - it might be absent, e.g. because you're capturing on
the Linux "any" device and are getting the "Linux cooked" header, with
only a destination address.

Don't put the source address into the Info column - it's already in the
source column *if* it exists (which it might not, for packets captured
from the "any" device and sent by the machine doing the capturing).

svn path=/trunk/; revision=40195
2011-12-14 02:55:26 +00:00
Guy Harris 0bd7a24d4b Put back the checks for null arguments, but report a dissector bug if
we're given null pointers.

Put in comments clarifying that some routines intentionally do *not*
null terminate the strings they produce.

svn path=/trunk/; revision=40194
2011-12-14 02:46:16 +00:00
Guy Harris dfe020b5f9 Back the previous change out; I'll be checking in a change to throw a
dissector bug exception in cases where a null pointer was passed, as
those really *are* dissector bugs (and I have a fix for the bug in
question in the HP Teaming heartbeat dissector, which I'll be checking
in later).

svn path=/trunk/; revision=40193
2011-12-14 02:03:05 +00:00
Bill Meier 29c17df6a5 Fix [-Wunused-but-set-variable] gcc warning;
Use consistent indentation.

svn path=/trunk/; revision=40192
2011-12-14 00:06:16 +00:00
Bill Meier 63c71a7090 Use consistent indentation.
svn path=/trunk/; revision=40191
2011-12-13 23:47:47 +00:00
Bill Meier 44c3525d14 Fix memory leak.
svn path=/trunk/; revision=40190
2011-12-13 23:16:13 +00:00
Bill Meier ececcf6811 Fix a memory leak.
svn path=/trunk/; revision=40189
2011-12-13 23:03:16 +00:00
Bill Meier 312f95f56c Convert "4 space tabs" to spaces; Minor reformatting.
svn path=/trunk/; revision=40188
2011-12-13 23:02:29 +00:00
Bill Meier 1311b2ab83 Fix tvb memory leak; Fix hex byte display for Unicode XML.
svn path=/trunk/; revision=40187
2011-12-13 22:49:59 +00:00
Bill Meier 1c3504bd6e Fix tvbuff memory leak.
svn path=/trunk/; revision=40186
2011-12-13 21:51:33 +00:00
Bill Meier 9c8a91f259 Use consistent indentation.
svn path=/trunk/; revision=40185
2011-12-13 21:03:57 +00:00
Chris Maynard e3834e30b3 Don't close the field tag here; it's now closed with </field>.
svn path=/trunk/; revision=40184
2011-12-13 20:07:21 +00:00
Bill Meier ec42a2bd1d Move proto_reg_handoff...(0 to the end of the file as per Wireshark convention.
Minor whitespace cleanup.

svn path=/trunk/; revision=40183
2011-12-13 19:58:47 +00:00
Bill Meier 6d3f5ff143 Fix: Execution Tracing High-Detail field selection highlighting seemingly wrong bytes in hex view pane.
Actual problem:
  A REAL_DATA tvbuff wasn't being added to the "data_sources"
  for a frame. When displaying the frame, when a field referencing the tvb was selected
  for display there was no 'hex bytes' tab for the field and so bytes ended up being
  highlighted in the currently displayed hex bytes tab (thus highlighting bytes in a pane
  not related to the field).

  Consider: Add some code in field creation (proto_tree_add...) to at least warn if
            a field is being created using a tvb whose data_source is not in the
            data_sources list for the frame ?

svn path=/trunk/; revision=40182
2011-12-13 19:54:19 +00:00
Martin Mathieson 70e2a50ad1 Initialise 'sub_tree' to NULL, to avoid warnings about possibly using
uninitialised.  The warnings are bogus, but could have been avoided, as the test
to see if we're using a compression profile is redundant/will always be TRUE
in those functions...

Also removed some unnecessary braces from switch cases (no local variables were defined).

svn path=/trunk/; revision=40181
2011-12-13 19:46:24 +00:00
Guy Harris 9924dd3acf The last element of an h248_pkg_param_t should be a pointer.
svn path=/trunk/; revision=40180
2011-12-13 18:56:01 +00:00
Anders Broman 031da40d79 h248_e_implicit = FALSE;
svn path=/trunk/; revision=40179
2011-12-13 17:59:27 +00:00
Martin Mathieson 6b6cc2f9df Fix typo
svn path=/trunk/; revision=40178
2011-12-13 17:35:45 +00:00
Anders Broman d47335b133 From Per Liedberg:
RoHC dissection improvment.

svn path=/trunk/; revision=40177
2011-12-13 17:13:50 +00:00
Chris Maynard 47116e864c Protect against NULL pointers as input. Based on the stacktrace provided, this should avoid crashes reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6634
svn path=/trunk/; revision=40176
2011-12-13 16:50:34 +00:00
Guy Harris d94bd07f99 Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports any
form of corruption/bogosity in a file, including in a file header as
well as in records in the file.  Change the error message
wtap_strerror() returns for it to reflect that.

Use it for some file header problems for which it wasn't already being
used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only
be used for files that we have no reason to believe are invalid but that
have a version number we don't know about or some other
non-link-layer-encapsulation-type value we don't know about.

svn path=/trunk/; revision=40175
2011-12-13 09:53:50 +00:00
Guy Harris 1df4ee9109 Crank up the maximum frame table size to 512*2^20 packets, that being a
small amount bigger than the maximum possible number of packets in a
NetMon file.

svn path=/trunk/; revision=40174
2011-12-13 06:45:16 +00:00
Bill Meier 4a976f1be7 Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff().
svn path=/trunk/; revision=40173
2011-12-13 04:01:33 +00:00
Chris Maynard 37bb6e88fd Add the -H and -W options to the "tshark -h" output. Ref: http://www.wireshark.org/lists/wireshark-users/201112/msg00044.html
svn path=/trunk/; revision=40172
2011-12-13 03:17:49 +00:00
Bill Meier 199da73e21 Prevent memory leakage of uncompress tvb and associated data buffer (step 1).
(tvb memory leak will actually remain until a bug in tvbuff.c is also fixed).

svn path=/trunk/; revision=40171
2011-12-13 02:56:44 +00:00
Guy Harris c3da1f23d3 Add missing checks for a too-large packet, so we don't blow up trying to
allocate a huge buffer.

svn path=/trunk/; revision=40170
2011-12-13 02:42:42 +00:00
Guy Harris dd92029afa Check for a bogus record size. Fixes bug 6670.
svn path=/trunk/; revision=40169
2011-12-13 02:00:41 +00:00
Guy Harris 89303e99c4 Add an arbitrary limit on the maximum size of the frame table, so that
we don't crash.  Fixes bug 6669.

svn path=/trunk/; revision=40168
2011-12-13 01:49:27 +00:00
Guy Harris c8182253c8 Add missing checks for a too-large packet, so we don't blow up trying to
allocate a huge buffer; fixes bug 6668.

Also add some other checks for invalid records.

svn path=/trunk/; revision=40167
2011-12-13 01:24:12 +00:00
Guy Harris 73a808f9bc Add missing check for a too-large packet, so we don't blow up trying to
allocate a huge buffer; fixes bug 6667.

svn path=/trunk/; revision=40166
2011-12-13 01:05:52 +00:00
Guy Harris b669a11931 Add missing check for a too-large packet, so we don't blow up trying to
allocate a huge buffer; fixes bug 6666.

svn path=/trunk/; revision=40165
2011-12-13 00:57:09 +00:00
Guy Harris c1f993eef5 Clamp the reported length of a packet at G_MAXINT for now, to avoid
crashes due to having no tvbuffs for an epan_dissect_t.

Fixes bug 6663 and its soon-to-be-duplicates.

svn path=/trunk/; revision=40164
2011-12-13 00:44:22 +00:00
Bill Meier 95977fcc8b Fix a memory leak of a tvb.
svn path=/trunk/; revision=40163
2011-12-13 00:02:30 +00:00
Chris Maynard c3a535a5bf Add missing </field> for data tree. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3809
svn path=/trunk/; revision=40162
2011-12-12 19:24:49 +00:00
Chris Maynard 1153ff7b56 Fix incorrect "pos=0" pdml values. Resolves the issue reported in comment 4 of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2432 and closes the bug.
svn path=/trunk/; revision=40161
2011-12-12 18:35:49 +00:00
Anders Broman ee9a02e12d From Asmita:
Update to csg2 r7

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6661

svn path=/trunk/; revision=40160
2011-12-12 17:42:24 +00:00
Jaap Keuter b6872d0a3b From Roy Marples:
ICMPv6 DNSSL option can contain padding, which does not represent a malformed option.

svn path=/trunk/; revision=40159
2011-12-12 08:18:18 +00:00
Jaap Keuter 10ca01fb1b Allow for true error reporing.
Move the comment to where it's intended.

svn path=/trunk/; revision=40158
2011-12-12 07:56:45 +00:00
Anders Broman f5f746f54f From Mike Morrin:
eliminates the global variable for tracking which nibble is
to be decoded by taking advantage of the fact that half octet IEs always occur
in pairs, and thus a pair can be grouped together for decoding.

There was probably also some confusion caused by the macros UPPER_NIBBLE and
LOWER_NIBBLE because the GSM bit numbering is opposite to Wireshark internal
numbering, so I have changed these to be LEFT_NIBBLE and RIGHT_NIBBLE, which
corresponds to the display format in Wireshark.

The dissection order of half octet IEs has been adjusted where necessary to
align with the ordering shown in the GSM specifications.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6658

svn path=/trunk/; revision=40157
2011-12-12 07:24:57 +00:00
Anders Broman 9d0fa5cfcb - Change the tree layout to mimic packet-pdcp-lte.c
- Add IPv6 static chain dissectoin
- Part of IPv6 dynamic chain dissectoin

svn path=/trunk/; revision=40156
2011-12-12 06:58:37 +00:00
Chris Maynard da449008f1 Well, until someone has the time to write ct2ext(), just return the content type, which is better than nothing.
svn path=/trunk/; revision=40155
2011-12-12 00:35:51 +00:00
Chris Maynard cbb120e626 If no filename, include the packet number in the generic name. TODO: Implement the ct2ext() function.
svn path=/trunk/; revision=40154
2011-12-12 00:27:32 +00:00