Commit Graph

45458 Commits

Author SHA1 Message Date
Guy Harris 958574da78 If the length value is bad, an exception will be thrown; we don't need
the item for the length, as we aren't explicitly checking it and
attaching expert info items to it.

svn path=/trunk/; revision=48070
2013-03-04 22:01:29 +00:00
Evan Huus 1cece569c8 From Jiri Novak via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8424
Extend RTP dissector with ED-137 extension

From me: Don't try to dissect a non-existent payload (see comment #9
on the bug).

svn path=/trunk/; revision=48069
2013-03-04 22:00:48 +00:00
Guy Harris 029c5bdbac Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'.
Give URLs for the 3gpp.org pages for all those specs.

Add #defines for all the GTP v1 extension header types we handle.

"gtp_prime" is a Boolean; make it a gboolean.

Dissect the first 4 octets of the header one field at a time, so that if
the packet is cut short by a snapshot length we at least dissect what's
there.

32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is;
assume it's the same as the header for GTP v0.

Once we've fetched the length field from the fixed-length portion of the
header, set the length of the tvbuff to the sum of the offset past the
fixed-length portion and the length field, to catch running past that
value.

Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the
presence of those fields, to make it a bit clearer what's being checked
for.

Don't actually add those fields to the protocol tree unless the flag for
the field is set.

We only need one chunk of code to handle extension headers.

Make that chunk a loop, and put the header in as an FT_NONE item, with
the length, header data, and next header under it.  Put the initial next
header field in as well.  (We treat this like IPv6 extension headers,
with the next header field being part of the previous header, rather
than like a set of TLVs, with the next header field being the type value
of its header.)

Fail if the extension header length is zero.

Use the reported length when processing IEs or T-PDU payload.

svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
Bill Meier 0463fc2622 Fix a minor typo in SVN #48065
svn path=/trunk/; revision=48067
2013-03-04 21:04:57 +00:00
Jakub Zawadzki 3de8c555d9 [NPL] Treat all keywords as seperates token, when really needed accept it as ID.
This seems to be much easier to maintain...

svn path=/trunk/; revision=48066
2013-03-04 21:00:09 +00:00
Bill Meier 1fb0ac3983 Fir Gtk 3.8 & newer: gtk_scrolled_window_add_with_viewport() ==> gtk_container_add().
svn path=/trunk/; revision=48065
2013-03-04 19:20:39 +00:00
Pascal Quantin 0efdddc61f From Josef Zila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8408 :
Add configurable TCP and UDP ports for MEMCACHE dissector

svn path=/trunk/; revision=48064
2013-03-04 17:48:56 +00:00
Alexis La Goutte 42dce2d033 Add 802.11 Tag RSNI IE (65)
(Not tested...)

svn path=/trunk/; revision=48063
2013-03-04 17:16:35 +00:00
Alexis La Goutte 512a68479c From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8432 BE (3) AC is wrongly named as "Video" in (qos_acs)
In the array of WME AC names, the name for tid 3 is wrongly named as "Video" it should be "Best Effort" instead.

#BACKPORT(1.8,1.6)

svn path=/trunk/; revision=48062
2013-03-04 17:16:26 +00:00
Alexis La Goutte ea4c5708b2 Add 802.11 Tag Antenna (64)
svn path=/trunk/; revision=48061
2013-03-04 17:16:17 +00:00
Alexis La Goutte 95dff87ead Add 802.11 Tag BSS Average Access Delay IE (63)
svn path=/trunk/; revision=48060
2013-03-04 17:16:07 +00:00
Alexis La Goutte 8b76610965 Display "Select Decryption Mode" in Decryption Key Management (Broken by revision 47005)
svn path=/trunk/; revision=48059
2013-03-04 17:15:58 +00:00
Alexis La Goutte 4ee92ef970 Fix indent (Tabs => Spaces)
svn path=/trunk/; revision=48058
2013-03-04 17:15:48 +00:00
Alexis La Goutte 430c8b13e3 Add 802.11 BSS AC Access Delay IE (68)
(Only display the value in decimal don't yet display the Average Access Delay , See 8.4.2.41 BSS Average Access Delay element )

svn path=/trunk/; revision=48057
2013-03-04 17:15:40 +00:00
Alexis La Goutte 5a43ae12f6 Fix typo about BSS AC/AVG Access Delay
svn path=/trunk/; revision=48056
2013-03-04 17:15:24 +00:00
Alexis La Goutte 089f1832af Enhance HT Control (proto_tree_add_uint/boolean/* => proto_tree_add_item
svn path=/trunk/; revision=48055
2013-03-04 17:15:09 +00:00
Alexis La Goutte 559aa015d6 Remove expert_info for unknown/undecode Atheros frame...
svn path=/trunk/; revision=48054
2013-03-04 17:14:58 +00:00
Alexis La Goutte e16ea8d71e From 802.11-2012.pdf
Enhance Extended Capabilities IE (127)
* Update list of supported bits...
* ...

svn path=/trunk/; revision=48053
2013-03-04 17:14:49 +00:00
Alexis La Goutte f725d4c261 Fix typo about length of BSS Available Admission Capacity IE
svn path=/trunk/; revision=48052
2013-03-04 17:14:37 +00:00
Alexis La Goutte 433c051348 From ArubaOS 6.2.x : new Aruba RADIUS Attributes with new Aruba feature (AirGroup, MDPS, CPPM...)
(Aruba620) #show aaa radius-attributes | include Aruba
Aruba-Mdps-Device-Version       21     String       Aruba      14823
Aruba-Mdps-Max-Devices          18     Integer      Aruba      14823
Aruba-Location-Id               6      String       Aruba      14823
Aruba-Template-User             8      String       Aruba      14823
Aruba-No-DHCP-Fingerprint       14     Integer      Aruba      14823
Aruba-AirGroup-Device-Type      27     Integer      Aruba      14823
Aruba-Mdps-Device-Udid          15     String       Aruba      14823
Aruba-AirGroup-Shared-User      25     String       Aruba      14823
Aruba-Mdps-Device-Serial        22     String       Aruba      14823
Aruba-User-Role                 1      String       Aruba      14823
Aruba-Port-Id                   7      String       Aruba      14823
Aruba-Priv-Admin-User           3      Integer      Aruba      14823
Aruba-Mdps-Device-Product       20     String       Aruba      14823
Aruba-User-Vlan                 2      Integer      Aruba      14823
Aruba-AirGroup-Shared-Role      26     String       Aruba      14823
Aruba-Device-Type               12     String       Aruba      14823
Aruba-Mdps-Device-Imei          16     String       Aruba      14823
Aruba-Essid-Name                5      String       Aruba      14823
Aruba-AP-Group                  10     String       Aruba      14823
Aruba-CPPM-Role                 23     String       Aruba      14823
Aruba-Mdps-Device-Name          19     String       Aruba      14823
Aruba-AirGroup-User-Name        24     String       Aruba      14823
Aruba-Mdps-Device-Iccid         17     String       Aruba      14823
Aruba-Framed-IPv6-Address       11     String       Aruba      14823
Aruba-AP-Name                   13     String       Aruba      14823
Aruba-Named-User-Vlan           9      String       Aruba      14823
Aruba-Admin-Role                4      String       Aruba      14823

svn path=/trunk/; revision=48051
2013-03-04 17:14:24 +00:00
Bill Meier fcb58073ef Whitespace & indentation cleanup.
svn path=/trunk/; revision=48050
2013-03-04 16:36:40 +00:00
Evan Huus 8569907b9f From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8339
This patch adds a new public API, proto_tree_add_bitmask_len(), identical to
proto_tree_add_bitmask() but using a caller-supplied length rather than an
inferred one. The underlying proto_item_add_bitmask_tree() code is modified
to display only fields for which all defined bits are available, and to
ignore bits that have no corresponding defined field ("forward compatibility"
cases).

From me: minor edits, see the bug for more details.

svn path=/trunk/; revision=48049
2013-03-04 14:18:18 +00:00
Anders Broman e12ac388b0 Use explicit casts.
svn path=/trunk/; revision=48048
2013-03-04 07:25:57 +00:00
Chris Maynard 67d195080b Change "Display filter:" to "Read filter:". They are not the same.
#BACKPORT(1.8, 1.6) 

svn path=/trunk/; revision=48047
2013-03-04 06:58:40 +00:00
Chris Maynard e9907716a2 With Jim Young's suggestion, revert r43785. Currently the file->open dialog contains a *Read* filter field, not a display filter, so after the packets matching the read filter are loaded, there is no actual display filter applied. This resolves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8344
svn path=/trunk/; revision=48046
2013-03-04 06:49:01 +00:00
Anders Broman 37a86e4de6 Use explicit casts.
svn path=/trunk/; revision=48045
2013-03-04 06:48:36 +00:00
Bill Meier c9dee3bdda For GTK 3.4 and newer: use GtkColorChooserWidget;
(Implemented using a bit of a hack).

svn path=/trunk/; revision=48044
2013-03-04 04:53:44 +00:00
Anders Broman 04ec1e0984 Use explicit casts.
svn path=/trunk/; revision=48043
2013-03-03 21:22:25 +00:00
Gerald Combs a79e5d5b94 Check to see if GLib's printf routines support the X/Open / POSIX
thousands grouping (') flag and use it in format_size if it's available.
As far as I can tell this translates to "everywhere except Windows and
OpenBSD". According to the various build logs at

https://build.opensuse.org/package/show?package=mingw32-glib2&project=windows%3Amingw%3Awin32

the OBS GLib packages enable GLib's internal printf implementation from
Gnulib which means we *should* be able to enable this on Windows.
Unfortunately this doesn't appear to be the case.

svn path=/trunk/; revision=48042
2013-03-03 19:34:58 +00:00
Pascal Quantin 0d9dfe4b26 Fixed two wrong encoding parameters found by fix-encoding-args.pl and a typo error
svn path=/trunk/; revision=48041
2013-03-03 19:32:22 +00:00
Pascal Quantin b7e55ff079 ENC_BIG_ENDIAN -> ENC_NA (as found by fix-encoding-args.pl)
svn path=/trunk/; revision=48040
2013-03-03 18:59:20 +00:00
Pascal Quantin 4d63de1b41 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from profinet plugin

svn path=/trunk/; revision=48039
2013-03-03 18:45:23 +00:00
Anders Broman 85973068cc From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48038
2013-03-03 17:14:19 +00:00
Gerald Combs 7176e06a63 [Automatic manuf, services and enterprise-numbers update for 2013-03-03]
svn path=/trunk/; revision=48035
2013-03-03 15:03:27 +00:00
Evan Huus 1b4cffc527 Add modelines.
Fix issues caught by cppcheck:
- Remove unused variable.
- Make sure to fclose output file.

svn path=/trunk/; revision=48034
2013-03-03 14:03:00 +00:00
Jakub Zawadzki e0d19cb73a Publish initial version of mine npl (Network Parsing Language) generator sources.
Parser pass almost all npl files from Network Monitor Parsers 3.4.2774 package, 
but but not all data is stored in AST.
Work on wireshark code enerator has been started, but it need much more work.

Beware! It's ugly, putting it to wireshark repo, just to not lose sources :)
(feel free to improve/review it).

svn path=/trunk/; revision=48033
2013-03-03 11:59:14 +00:00
Michael Mann 78fe8ac7e9 Replace proto_tree_add_text "error messages" with expert_add_info_format
svn path=/trunk/; revision=48032
2013-03-03 07:29:28 +00:00
Evan Huus 14ab37223b Fix case where we were leaking frame_data if, during 2-pass analysis,
a frame did not pass the filter.

svn path=/trunk/; revision=48031
2013-03-03 03:29:40 +00:00
Evan Huus efaa8d71a5 Rewrite free_frame_data_sequence to use recursion instead of manually nested
loops.

This allows us to do the calculations to actually free all the frame data
instances correctly - the previous version was missing many of them,
leading to large memory leaks when given lots of frames that made use of
p_add_proto_data.

Fixes the rest of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7885

svn path=/trunk/; revision=48030
2013-03-03 03:26:09 +00:00
Guy Harris 607bb97056 The general convention for "interpreted" fields, where we display a more
human-friendly version of the value followed by the raw value, is to put
the human-friendly name first, with the raw value after it in
parentheses.  Follow that convention for the command code.

svn path=/trunk/; revision=48029
2013-03-03 01:31:49 +00:00
Guy Harris 4d978fd997 proto_tree_add_uint_format_value() puts the field name into the textual
representation for you; the format string should not include the field
name.

Add protocol items to the SliMP3 tree, not to the top-level tree.

If we're fetching a 16-bit value from the protocol tree and multiplying
it by 2, it won't necessarily fit in a guint16; make the variables used
for that guints.

The sequence field of the MP3 data ack packet isn't being fetched from
the packet, so just use proto_tree_add_item() for it (rather than using
a value fetched for a previous field).

Use %u to format unsigned values.

svn path=/trunk/; revision=48028
2013-03-03 01:17:26 +00:00
Pascal Quantin eb9e18a8be Fix copy-paste error introduced in r48021
svn path=/trunk/; revision=48027
2013-03-02 23:30:21 +00:00
Pascal Quantin 2eb92f7b86 Revert file committed by mistake in r48023
svn path=/trunk/; revision=48026
2013-03-02 23:22:19 +00:00
Pascal Quantin 95938370bd From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from tvbparse and tvbuff

svn path=/trunk/; revision=48025
2013-03-02 23:05:27 +00:00
Pascal Quantin 5a37615eeb Remove a useless pointer
svn path=/trunk/; revision=48024
2013-03-02 22:59:50 +00:00
Pascal Quantin 0a17799d61 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code

svn path=/trunk/; revision=48023
2013-03-02 22:54:39 +00:00
Balint Reczey 1eb5e1d739 Revert "Make Solaris Studio hide internal shared library symbols by default"
This reverts commit r48020.

svn path=/trunk/; revision=48022
2013-03-02 22:27:40 +00:00
Pascal Quantin fc9156a8a0 Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
2013-03-02 22:19:33 +00:00
Balint Reczey 73aafe2bc4 Make Solaris Studio hide internal shared library symbols by default
svn path=/trunk/; revision=48020
2013-03-02 22:11:26 +00:00
Evan Huus 5c05c9e0e1 Export some wmem functions using the new scheme.
svn path=/trunk/; revision=48019
2013-03-02 21:29:05 +00:00