Commit Graph

16203 Commits

Author SHA1 Message Date
Anders Broman 84a8c1d83a From an.huang:
(1) support for optional attribute in Sample Value:
    datSet    (0x81), 
    refrTm    (0x84), 
    smpRate   (0x86),
    smpMod    (0x88). New attribute in 9-2 Ed2
(2) Data (0x87) decoded as PhsMeas in 9-2 LE(Lite Edition) recommemdation is removed, now the data is decoded as simply OctString, just as 9-2, further details should refer to the data set definition and Table 14 in Ed1 / Table 15 in Ed2  Encoding for the basic data types;

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

svn path=/trunk/; revision=47016
2013-01-10 12:13:16 +00:00
Anders Broman 2d44d2e05c From Alton MacDonald:
A TLV can be larger that the MIH payload. In this case the packet should be fragmented and controlled with the help of two fields in the MIH header. The attached patch checks these fields and dissects the TLVs if the MIH payload is not fragmented.

Additionally, if a TLV is detected larger than the payload size it is marked as a fragmented TLV and not dissected. This would be the case if the previously mentioned fields were not set correctly as their use under this scenario is not explicitly defined in the 802.21 standard.

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

svn path=/trunk/; revision=47014
2013-01-10 07:36:32 +00:00
Anders Broman 84a94842a8 From "schlephorst":
BACnet dissect new tags in NotificationParameters.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8181

svn path=/trunk/; revision=47011
2013-01-10 06:48:10 +00:00
Anders Broman c553ca5c5e From "schlephorst":
BACnet dissect new tags in EventParameters.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8181

svn path=/trunk/; revision=47010
2013-01-10 06:42:15 +00:00
Martin Kaiser 4e9a407c6f remove unnecessary NULL checks
svn path=/trunk/; revision=47006
2013-01-09 21:57:08 +00:00
Anders Broman 9cdf3803a9 From David Bergeron:Added unknown attributes for STUN from RFC3489 that are now deprecated but does'nt appear with classicstun. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8179
svn path=/trunk/; revision=47002
2013-01-09 05:13:20 +00:00
Pascal Quantin c872b1258c Dissect CDMA2000 system time
svn path=/trunk/; revision=47001
2013-01-08 22:29:38 +00:00
Martin Kaiser 30fdbd6da6 revert r46739
call fragment_add() before fragment_set_tot_len()
(the latter has no effect if no fragments are present, so we don't set
 the total length correctly when it's in the first fragment)

svn path=/trunk/; revision=47000
2013-01-08 22:24:42 +00:00
Martin Kaiser 697514cd35 2012->2013
svn path=/trunk/; revision=46998
2013-01-08 21:51:01 +00:00
Martin Kaiser 898dfde383 bring up a warning if an APDU's length field does not match the number
of payload bytes

svn path=/trunk/; revision=46997
2013-01-08 21:44:12 +00:00
Anders Broman 433d9c198d Only the private extension IE value part should go in the tvb.
svn path=/trunk/; revision=46996
2013-01-08 09:57:10 +00:00
Evan Huus ab9129add9 Small updates to the SEL Fast Message dissector.
From Chris Bontje via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8170

svn path=/trunk/; revision=46995
2013-01-07 23:53:56 +00:00
Pascal Quantin 794183609d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8164 :
Clarify content of StructureSize field

svn path=/trunk/; revision=46994
2013-01-07 23:08:25 +00:00
Evan Huus 74e5c710cb Re-fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8169 in a way that
is also (hopefully) valid for 32-bit platforms.

svn path=/trunk/; revision=46993
2013-01-07 22:12:38 +00:00
Pascal Quantin 952ccb4b83 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8168 :
Detect properly the EMM Service Request message

svn path=/trunk/; revision=46991
2013-01-07 21:37:55 +00:00
Evan Huus aa6929d0cd Fix potential (but very unlikely) overflow and infinite loop.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8169

svn path=/trunk/; revision=46989
2013-01-07 20:24:19 +00:00
Evan Huus 28808df71b Add mode-lines.
svn path=/trunk/; revision=46988
2013-01-07 20:00:38 +00:00
Alexis La Goutte ab7f4395d7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46967
2013-01-06 14:50:52 +00:00
Alexis La Goutte b3db35e7a6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46966
2013-01-06 14:50:44 +00:00
Alexis La Goutte 1cd2e3cd1b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46965
2013-01-06 14:50:35 +00:00
Alexis La Goutte 4d353242e8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46964
2013-01-06 14:50:27 +00:00
Alexis La Goutte 0c22e572c6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46963
2013-01-06 14:50:18 +00:00
Alexis La Goutte 3bf44b5a27 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46962
2013-01-06 14:50:06 +00:00
Alexis La Goutte 2e3564d69e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46961
2013-01-06 14:49:58 +00:00
Alexis La Goutte bfa7d1a3f1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46960
2013-01-06 14:49:48 +00:00
Pascal Quantin ca189246fe Upgrade LTE RRC dissector to v11.2.0
svn path=/trunk/; revision=46959
2013-01-06 09:56:24 +00:00
Evan Huus 33981700b5 From Guus Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148
Add some additional formatting to the mmhdr subtree (e.g. selecting 5
mmheaderbytes with mmver!=0, Added a subtree for the Fragmentation Info)

svn path=/trunk/; revision=46956
2013-01-05 23:14:50 +00:00
Evan Huus d131bc1077 From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8089
Dissector for the SEL (Schweitzer Engineering Labs) Fast Message protocol.

From me:
- use wmem instead of glib to not leak memory
- simplify port preference
- remove unneeded initializers
- modelines
- Id tag

svn path=/trunk/; revision=46949
2013-01-05 14:19:15 +00:00
Pascal Quantin b1143f60b3 Regenerate ANSI MAP dissector
svn path=/trunk/; revision=46948
2013-01-05 13:53:27 +00:00
Alexis La Goutte 5d6a6b4652 Fix regression from upgrade FIX 5.0 (Revision 46944)
../../../epan/dissectors/packet-fix.h:1450:10: error: multi-character character constant [-Werror=multichar]
../../../epan/dissectors/packet-fix.h:1451:10: error: multi-character character constant [-Werror=multichar]
[...]

When FIX field type is MULTIPLESTRINGVALUE use string_string (not value_string)

And regenerated packet-fix.h

svn path=/trunk/; revision=46947
2013-01-05 10:12:44 +00:00
Michael Mann bf8fce3a00 Upgrade to FIX 5.0 fields
Bug 7853 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7853)

FIX.xml is now based on FIX50SP2.xml with some fill in from 4x xml files (as determined by diff between "old" and "new" packet-fix.h)

Included all FIX 5.0 field files from http://sourceforge.net/projects/quickfix/files/ 

svn path=/trunk/; revision=46944
2013-01-05 04:06:31 +00:00
Pascal Quantin 7d8ab07431 Fix some errors found by fix-encoding-args.pl script
svn path=/trunk/; revision=46933
2013-01-04 17:35:46 +00:00
Michael Mann 86d690880f replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned int" instead.
bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825)

svn path=/trunk/; revision=46928
2013-01-04 05:22:43 +00:00
Jeff Morriss d36b4c8525 Fix a (false) could-be-used-uninitialized warning.
Fix up indentation (looks like "4 space tabs").

svn path=/trunk/; revision=46927
2013-01-04 02:28:46 +00:00
Anders Broman 6ea36c51c3 Add casts to make it build on win64
svn path=/trunk/; revision=46925
2013-01-03 23:24:47 +00:00
Jaap Keuter 6fd81d4994 From Zeljko Ancimer:
New dissector for Media Resource Control Protocol Version 2 (MRCPv2).

svn path=/trunk/; revision=46922
2013-01-03 21:42:59 +00:00
Michael Mann 46935dbab4 USBHUB: Add useful details to INFO column, bug 8161 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8161)
From Steve Magnani

svn path=/trunk/; revision=46919
2013-01-03 18:08:50 +00:00
Alexis La Goutte 69b38c579f From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8157 USBHUB: Add dissection of GetPortStatus responses
Most USBHUB responses are not dissected. Add support for GetPortStatus.

svn path=/trunk/; revision=46913
2013-01-03 11:37:05 +00:00
Michael Mann 0292371cf4 bitmask patch for MIH dissector that makes 64-bit bitmasks only use 32-bits since proto_tree_add_bitmask only supports 32 bits and there are no definitions in the MIH standard that require more than 32 bits. This addresses part of bug 8155 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8155)
**
ERROR:proto.c:7240:proto_item_add_bitmask_tree: code should not be reached



svn path=/trunk/; revision=46895
2013-01-02 16:14:30 +00:00
Michael Mann 37d19a1202 Add heuristic for USB MassStorage dissector to be dissected by USB. Bug 8131 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8131)
svn path=/trunk/; revision=46877
2012-12-31 20:12:45 +00:00
Pascal Quantin 58575f394f From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148 :
Fix dissection of HomePlug AV 1.1 frames with fragmentation information

From me: indentation fixes

svn path=/trunk/; revision=46871
2012-12-31 13:39:04 +00:00
Anders Broman 54cb9e70ab Use tvb_bcd_dig_to_ep_str
svn path=/trunk/; revision=46858
2012-12-30 11:10:35 +00:00
Anders Broman be1ff84f48 From Katrina Zhang:Pretify dissection if a dissector exists for the private extension
svn path=/trunk/; revision=46857
2012-12-30 09:35:27 +00:00
Bill Meier 8b7f8d4c08 Move 3 ASN1 dissectors to 'clean' group; move 1 PIDL dissector to 'dirty' group.
svn path=/trunk/; revision=46855
2012-12-30 00:53:47 +00:00
Evan Huus 45a77360ea Rename tcp.data -> tcp.segment_data and add a description field.
Should clear up the confusion from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8084

svn path=/trunk/; revision=46843
2012-12-29 18:08:11 +00:00
Pascal Quantin 0b20f855f0 Upgrade NAS disssectors to v11.5.0
svn path=/trunk/; revision=46842
2012-12-29 17:10:04 +00:00
Bill Meier 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
Alexis La Goutte fee2b8b2b9 Tab => Spaces
svn path=/trunk/; revision=46826
2012-12-28 14:38:19 +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
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
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 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
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
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 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 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 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 dd1505428c Another ILP32 Y2.038K warning.
svn path=/trunk/; revision=46758
2012-12-26 07:05:42 +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
Guy Harris 50102335a7 Eliminate multiple "const"s.
svn path=/trunk/; revision=46753
2012-12-26 06:16:39 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Guy Harris 8ede6b7dc0 bssmap_msg_fcn[] is a dense array, not a sparse array, so *every* entry
must be filled in - even if we don't happen to have dissectors for
particular message types.  Just put NULL in there, so we don't index
past the end of the array, grab a random location in memory's contents
as a function pointer, and crash when we call through that pointer.

svn path=/trunk/; revision=46747
2012-12-25 23:14:05 +00:00
Guy Harris 8432edcc72 More checks to make sure pinfo->private_data is not null.
svn path=/trunk/; revision=46746
2012-12-25 22:48:01 +00:00
Guy Harris ce5039c522 Add some additional sanity checks.
svn path=/trunk/; revision=46745
2012-12-25 22:39:11 +00:00
Guy Harris c8f3c1d9a3 In dissect_bthci_evt_command_complete():
Make a loop counter a full-width integer, just to be sure.

Do *NOT* assume that pinfo->private_data is non-null; I have at least
one capture where it is null when dissect_bthci_evt_command_complete()
is captured.

svn path=/trunk/; revision=46743
2012-12-25 22:35:54 +00:00
Martin Kaiser 13a5f0b5da set the dtls record length for reassembly _before_ adding a fragment
this is a workaround for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8111
it does not fully fix the underlying issue

svn path=/trunk/; revision=46739
2012-12-25 18:44:14 +00:00
Guy Harris b98d44d71f If there's no packet data, there's nothing to check to see whether this
is an MPEG-2 transport packet, so don't treat it as one.

svn path=/trunk/; revision=46733
2012-12-25 12:00:32 +00:00
Guy Harris ceb69f1413 Show the Vines Fragmentation Protocol control flags field as bitflags,
rather than as a single field.  If bits other than the two defined bits
are set in the first byte of the packet, don't dissect UDP packets as
Vines FRP, so that other dissectors get a chance to look at the packet.

svn path=/trunk/; revision=46732
2012-12-25 11:57:03 +00:00
Alexis La Goutte 87c1df5ead From report of Elavarasan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8099 Named field for each item in Selected Registrar Config methods is not available
The structure of both the Config Methods and Selected Registrar Config Methods are  the same.

Display filters such as "wps.config_methods.pushbutton", "wps.config_methods.display", etc are available for the different methods in the Config methods whereas the display filters for the elements in the Selected Registrar Config methods are found to be the same as the Config method Display filters.

From me :
add new filter for selected_registrar config method bitmask (and also permitted config method)

svn path=/trunk/; revision=46725
2012-12-23 19:17:54 +00:00
Alexis La Goutte 267e5baf55 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8128 Add TCP Fast Open
This patch provides
i) support for Shared Use of Experimental TCP Options (draft-ietf-tcpm-experimental-options-03)
ii) support for TCP Fast Open (draft-ietf-tcpm-fastopen-02).

A new 'TFO=R' string is appended at the column info in case a client sends a SYN packet with a Fast Open Cookie Request. Moreover, if the server responds with a SYN-ACK containing a Fast Open Cookie option a 'TFO=C' is shown (as well as in any subsequent client attempt to send SYN + DATA).

tcp.options.tfo display filter can be used in order to easily select the complete TFO three-way handshake.

Chrome (and I think also Firefox) has support for client-side TFO. Linux 3.7 got both client and server-side support.

svn path=/trunk/; revision=46723
2012-12-23 18:40:55 +00:00
Guy Harris 04a5398ab7 In nlsp_dissect_clvs(), count len down at the same time we increment the
offset, and do the bounds checking on the length before we count len
down.

svn path=/trunk/; revision=46718
2012-12-23 10:51:34 +00:00
Martin Kaiser 594b0bb11f revert r46678
now that tvb_get_ephemeral_unicode_string() throws an exception for
invalid length parameters, there's no point in doing an explicit check
beforehand

(when I added the check, there were many places that I missed)

svn path=/trunk/; revision=46707
2012-12-22 23:56:50 +00:00
Michael Tüxen d9cca759e5 Fox copy-and-paste error.
svn path=/trunk/; revision=46701
2012-12-22 20:56:58 +00:00
Michael Tüxen 1f2b8a904c Add support for displaying the Packet Block Flags Word of pcapng.
svn path=/trunk/; revision=46698
2012-12-22 19:48:17 +00:00
Jaap Keuter cd376e0ca8 From G.Gerrits:
Minor patch just adding the newer AR7400/INT7400 with dev_id==4 for decoding 
in the Homeplug AV "Get Device/SW Version Confirm (A001)" response.

svn path=/trunk/; revision=46695
2012-12-22 14:28:52 +00:00
Guy Harris e773e4ff08 Get rid of unnecessary initialization that causes "discards qualifiers"
warnings.

svn path=/trunk/; revision=46688
2012-12-21 22:00:40 +00:00
Pascal Quantin d66d8c44d2 Fix GSM 7-bit default alphabet decoding in ANSI IS-637-A
svn path=/trunk/; revision=46687
2012-12-21 21:03:31 +00:00
Pascal Quantin aae3c27307 Include packet-gsm_sms.h and remove extern declarations
svn path=/trunk/; revision=46686
2012-12-21 21:01:45 +00:00
Jeff Morriss 6406acc768 Use TVB_SET_ADDRESS_HF() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

Use proto_tree_add_item() instead of proto_tree_add_ether() called with a
pointer into the TVB.

Leave a comment for a place where a bunch of code in several case statements
could probably be collapsed into much less code.

svn path=/trunk/; revision=46682
2012-12-21 17:43:46 +00:00
Jeff Morriss 693a4d6483 Use TVB_SET_ADDRESS() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

svn path=/trunk/; revision=46681
2012-12-21 17:43:44 +00:00
Martin Kaiser 6a6bd89c54 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8112
by adding a range to the length that is passed to
tvb_get_ephemeral_unicode_string()

svn path=/trunk/; revision=46678
2012-12-21 15:52:42 +00:00
Guy Harris d7763299ae The KRB_RM_ #defines fit in 32 bits, so just make them unsigned, not
long.

dissect_krb5_Checksum() is declared in
epan/dissectors/packet-kerberos.h; don't declare it again here.

svn path=/trunk/; revision=46666
2012-12-21 11:37:54 +00:00
Guy Harris 8dbe2af621 Check whether something's too big before subtracting it from another
variable.

Adjust offset and len in parallel.

svn path=/trunk/; revision=46665
2012-12-21 11:12:23 +00:00
Guy Harris 954b90418a Squelch a qualifier-discard warning.
svn path=/trunk/; revision=46664
2012-12-21 11:04:10 +00:00
Guy Harris b1d5b64da6 Well, at least on my machine, packet-pres.c now compiles cleanly, with
the recent changes to pres.cnf to keep from generating some code.

svn path=/trunk/; revision=46663
2012-12-21 10:55:43 +00:00
Guy Harris 69270d1bea Get rid of unused routines for UDC-type.
svn path=/trunk/; revision=46662
2012-12-21 10:52:29 +00:00
Guy Harris 594e855738 Don't assume a pointer fits inside an unsigned long - it doesn't, in
LLP64 environments such as Windows.

Cast the result of a modulus op that causes the result to fit into an
int to int, to suppress implicit 64-bit-to-32-bit conversion warnings.

svn path=/trunk/; revision=46661
2012-12-21 10:26:52 +00:00
Guy Harris 81b8fd389e Get rid of duplicate declarations (so that -Wredundant-decls doesn't
complain).

svn path=/trunk/; revision=46660
2012-12-21 09:29:46 +00:00
Guy Harris 808c79a6b4 Everything else in the floating-point calculations is single-precision,
so make the constants single-precision, so we don't end up with warnings
about double-precision values being assigned to single-precision
variables.

svn path=/trunk/; revision=46658
2012-12-21 08:18:47 +00:00
Guy Harris be77dce42a Make some loop counters unsigned, so that we handle very large loop
counts by trying to iterate all over the items (and, presumably, failing
when we go past the end of the packet).

When assigning to the loop count, cast the value down, to avoid implicit
64-bit-to-32-bit conversion warnings.

Write those loops as for loops - it makes it a bit clearer what's going
on.

svn path=/trunk/; revision=46657
2012-12-21 08:16:12 +00:00
Guy Harris e2b61c828f Constify some character pointer variables to avoid warnings about
strings being assigned to them.

svn path=/trunk/; revision=46653
2012-12-21 05:34:38 +00:00
Pascal Quantin 79bde3d86a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Fix dissection of GPRS-NS over Frame Relay over MPLS

svn path=/trunk/; revision=46644
2012-12-20 21:18:26 +00:00
Pascal Quantin d6f2abcbfd Revert r46595
svn path=/trunk/; revision=46643
2012-12-20 21:17:23 +00:00
Anders Broman 8a508ee3d9 Try to determine wether it is MEAS REP, EXT MEAS REP or ENH MEAS REP.
svn path=/trunk/; revision=46630
2012-12-20 12:53:38 +00:00
Jeff Morriss 09221f45e4 When copying addresses, also copy the (new) hf field.
Use SET_ADDRESS in some dissectors that weren't using it (so that the hf field
is correctly initialized).

Introduce a COPY_ADDRESS_SHALLOW (which copies an address without copying the
contents of the data field).

svn path=/trunk/; revision=46602
2012-12-18 23:28:38 +00:00
Jeff Morriss 02a69849b7 Don't do proto_tree_add_ether(..., tvb_get_ptr(...)), just use proto_tree_add_item().
svn path=/trunk/; revision=46598
2012-12-18 22:29:11 +00:00
Pascal Quantin 4ffc5d699b From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8103 :
Add parsing of free_stateid, why_no_delegation, backchannel_ctl, secinfo_no_name and destroy_session fields to NFSv4.1 dissector

svn path=/trunk/; revision=46596
2012-12-18 20:58:01 +00:00
Pascal Quantin 8cbbff352e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Add dissection of GPRS-NS protocol inside MPLS

svn path=/trunk/; revision=46595
2012-12-18 20:36:21 +00:00
Ronnie Sahlberg 38289963da SCSI: PERSISTENT_RESERVE_IN add names for service action 2/3 report capabilities/read full status
svn path=/trunk/; revision=46584
2012-12-18 04:02:57 +00:00
Evan Huus 7577443c0f Use pinfo-scoped memory for 6LoWPAN addresses.
Fixes at least part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7885

svn path=/trunk/; revision=46582
2012-12-18 03:15:23 +00:00
Jeff Morriss c858bd1452 Get rid of another tvb_get_ptr() abuse (just like r46577 but in a different
function).

svn path=/trunk/; revision=46579
2012-12-18 02:20:38 +00:00
Jeff Morriss b66af9eea7 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7945
(or at least the complaints from Valgrind; I couldn't reproduce the crash).

What part of:

~~~
 * If you're thinking of using tvb_get_ptr, STOP WHAT YOU ARE DOING
 * IMMEDIATELY. Go take a break. Consider that tvb_get_ptr hands you
 * a raw, unprotected pointer that you can easily use to create a
 * security vulnerability or otherwise crash Wireshark. Then consider
 * that you can probably find a function elsewhere in this file that
 * does exactly what you want in a much more safe and robust manner.
~~~

did someone not read?

Use tvb_get_ephemeral_stringz() instead of adding (apparently not sufficiently
checked!) offsets to the result of tvb_get_ptr() and assuming that the result
is a) in bounds and b) a NULL-terminated string.

svn path=/trunk/; revision=46577
2012-12-18 02:02:28 +00:00
Martin Mathieson 9ab999a6f8 Fix a copy and paste error.
svn path=/trunk/; revision=46573
2012-12-17 14:39:59 +00:00
Pascal Quantin a7f5c35d1e From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8092 :
Add SSL segment data and SSL reassmebled data fields and improve readability of the hex/ASCII data blocks written to the SSL debug log

svn path=/trunk/; revision=46572
2012-12-16 20:30:42 +00:00
Jeff Morriss dcd8c7151f Followup to r46565 and r46568: don't even create the composite TVB if we're
not going to put anything into it.  And don't try to finalize the composite
if we didn't create it or put anything in it.

svn path=/trunk/; revision=46569
2012-12-16 19:22:00 +00:00
Jeff Morriss 72f5595125 Apply r46565 to another spot.
svn path=/trunk/; revision=46568
2012-12-16 18:32:50 +00:00
Jeff Morriss 142aaa9c5b Another part of the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 :
Don't try to add a zero-length TVB to a composite TVB.

svn path=/trunk/; revision=46565
2012-12-16 16:40:36 +00:00
Alexis La Goutte 0d40765d08 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8074 SMB2 file_info_0f is actually FileFullEaInformation
[MS-FSCC].pdf section 2.4.15 gives us the correct format of the structure currently know and file_info_0f.

The unknown byte is actually the second byte of the EA Value Len.

svn path=/trunk/; revision=46562
2012-12-16 15:34:33 +00:00
Alexis La Goutte 553f751e01 From Simon Barber via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8094 Add support for RA and TA to all 802.11 frame formats
svn path=/trunk/; revision=46561
2012-12-16 15:34:23 +00:00
Alexis La Goutte 4c58eabc9a Remove unused ett_nfs_security_label variable
svn path=/trunk/; revision=46560
2012-12-16 15:34:13 +00:00
Pascal Quantin 9a2fbb1978 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8098 :
Incorrect dissection of SAC and RAC in 3GPP ULI AVP

svn path=/trunk/; revision=46556
2012-12-16 08:58:46 +00:00
Jeff Morriss d206dacb95 Initialize a variable to avoid a (false) may-be-used-uninitialized warning turned error.
svn path=/trunk/; revision=46555
2012-12-16 02:37:06 +00:00
Jeff Morriss fde266096c File missed in r46553.
svn path=/trunk/; revision=46554
2012-12-16 02:13:30 +00:00
Jeff Morriss 01fd357171 Handle hop-by-hop-id collisions (when matching requests and answers) better:
instead of storing the requests in an se_tree (keyed by hop-by-hop-id),
store an se_tree which is itself keyed by frame number.  When looking for
a matching request, first find the tree of pdus (by hop-by-hop-id) and then
look for the largest frame number less than or equal to the answer's frame
number.  Also verify that the end-to-end-id matches.

Move the conversation structure out of packet-diameter.h: it's only used in
packet-diameter.c

svn path=/trunk/; revision=46553
2012-12-16 01:12:59 +00:00
Pascal Quantin 2dbf4f6fff Strengthen BT-uTP heuristic dissector and add a preference to enable it (disabled by default)
svn path=/trunk/; revision=46551
2012-12-16 00:28:38 +00:00
Martin Mathieson b7e64d6571 Fix some clang warnings.
svn path=/trunk/; revision=46549
2012-12-16 00:15:26 +00:00
Martin Mathieson 76966a2cec Check that system frame number is in range.
svn path=/trunk/; revision=46548
2012-12-16 00:02:50 +00:00
Pascal Quantin d5c14b47db Add a missing ENC_ASCII
svn path=/trunk/; revision=46547
2012-12-15 20:12:17 +00:00
Michael Mann bb7217ab4b From bug 6123, Fix further dissection of data in TCP packets with the Riverbed Transparency options (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6123)
Allow Raw Data dissector to dissect TCP packets with Riverbed Transparency options if sport dissector (found only in Riverbed) is not found.

#BACKPORT

svn path=/trunk/; revision=46544
2012-12-15 04:28:41 +00:00
Anders Broman 39c816931c Copy-paste error.
svn path=/trunk/; revision=46538
2012-12-14 11:54:35 +00:00
Anders Broman eba8fb9328 From Martin Isaksson:
- Initiiate GTP header to zero.
- Dont' load TEID unconditionaly, it might not be present.

svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
Martin Kaiser 387323569d fix
packet-h248_3gpp.c: In function ‘dissect_3gcsd_plmnbc’:
packet-h248_3gpp.c:168: error: cast to pointer from integer of different size
make[5]: *** [libdissectors_la-packet-h248_3gpp.lo] Error 1

I guess the last parameter of dissect_3gcsd_plmnbc() is a pointer to a
boolean variable. Call it implicit_param, not implicit, as there's
already a global variable 'implicit'.

Feel free to correct the fix if I got it wrong.

svn path=/trunk/; revision=46534
2012-12-14 02:27:05 +00:00
Anders Broman ca01731e86 Revert back to the original patch which actuallly worked.
svn path=/trunk/; revision=46533
2012-12-13 20:29:46 +00:00
Anders Broman 4f6998a6a5 From John Batty:- the h248_3GCSD_properties_vals array was missing entry 0 that defines the package name. - the h248_package_3GCSD structure was missing entries for the signal and event definitions (which were already been defined) For the plmnbc decoder, I found an existing decoder de_bearer_cap that could decode this field, so added a small function to call through to that The 3gtfo package definition was also missing the package name. https://bugs.wireshark.org/bugzilla/process_bug.cgi I fixed up the call to dissect_ber_octet_string() to use sub_tvb.
svn path=/trunk/; revision=46531
2012-12-13 20:17:17 +00:00
Pascal Quantin e5fc8a400e Fix what seems to be a typo error
svn path=/trunk/; revision=46528
2012-12-13 17:57:37 +00:00
Pascal Quantin 53edadd49b From John Batty via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8087 :
H.248 MEGACO PkgName property is poorly formatted

svn path=/trunk/; revision=46526
2012-12-13 14:24:44 +00:00
Pascal Quantin 548313e656 From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8082 :
cisco-sm dissector enhancement

svn path=/trunk/; revision=46525
2012-12-13 09:59:20 +00:00
Stig Bjørlykke f6f46de2ca Moved users table lookup to find_oid_by_pres_ctx_id() so other
dissectors (acse, ros, rtse) can benefit from the configured settings.

svn path=/trunk/; revision=46520
2012-12-12 15:17:36 +00:00
Anders Broman 5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Bill Meier 93fdffd70d General cleanup:
- Fix instance of offset changed under 'if (tree)' and used after 'if (tree)';
- Create/use some extended value strings;
- #if 0 an unused value_string array;
- Localize some variables & remove some uneeded initializers;
- Fix some whitespace & long lines.

svn path=/trunk/; revision=46516
2012-12-12 03:38:46 +00:00
Bill Meier 9bb7c0f6b9 From Adam Butcher: Add SAKKE support to MIKEY dissector
... adds support for ECCSI signature type, SAKKE payload,
MIKEY-TICKET ID Role types (required for MIKEY-SAKKE KMS
role identifiers) to the MIKEY dissector.

The related specifications are:
  http://tools.ietf.org/html/rfc6509    MIKEY-SAKKE
   (http://tools.ietf.org/html/rfc6507  ECCSI)
   (http://tools.ietf.org/html/rfc6508  SAKKE)
  http://tools.ietf.org/html/rfc6043    MIKEY-TICKET (ID Role types only)

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

svn path=/trunk/; revision=46511
2012-12-12 01:28:21 +00:00
Evan Huus 48c653481a Use the complete fragment length to reassembly SSL frames. The old method
of picking them up one at a time failed on jumbo frames.

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

svn path=/trunk/; revision=46510
2012-12-12 00:02:34 +00:00
Alexis La Goutte 2e8cb1c5cd Enhance BGP ORF (Make field filterable)
svn path=/trunk/; revision=46508
2012-12-11 23:24:02 +00:00
Alexis La Goutte cf6115367b Update IEEE Wireless Documentation links
IEEE Std 802.11(m)-2012 (pdf) is now available for free ! include with 10 amendements

* IEEE Std 802.11k™-2008: Radio Resource Measurement of Wireless LANs (Amendment 1)
* IEEE Std 802.11r™-2008: Fast Basic Service Set (BSS) Transition (Amendment 2)
* IEEE Std 802.11y™-2008: 3650–3700 MHz Operation in USA (Amendment 3)
* IEEE Std 802.11w™-2009: Protected Management Frames (Amendment 4)
* IEEE Std 802.11n™-2009: Enhancements for Higher Throughput (Amendment 5)
* IEEE Std 802.11p™-2010: Wireless Access in Vehicular Environments (Amendment 6)
* IEEE Std 802.11z™-2010: Extensions to Direct-Link Setup (DLS) (Amendment 7)
* IEEE Std 802.11v™-2011: IEEE 802.11 Wireless Network Management (Amendment 8)
* IEEE Std 802.11u™-2011: Interworking with External Networks (Amendment 9)
* IEEE Std 802.11s™-2011: Mesh Networking (Amendment 10)

svn path=/trunk/; revision=46507
2012-12-11 23:23:48 +00:00
Alexis La Goutte 293d44fca1 Enhance (minor) MPLS PW OAM Dissector Replace proto_tree_add_uint => proto_tree_add_item
svn path=/trunk/; revision=46506
2012-12-11 23:23:35 +00:00
Alexis La Goutte baf4a0ed5a From Steve Dickson via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8081
Added the Labled NFS protocol dissector for NFS v4.1

Signed-off-by: Steve Dickson <steved@redhat.com>

svn path=/trunk/; revision=46505
2012-12-11 23:23:20 +00:00
Pascal Quantin 70c283816b Dissect eMBMS MTCH LCIDs
svn path=/trunk/; revision=46504
2012-12-11 23:20:22 +00:00
Anders Broman 1ecfc445b8 From zhang lei:
Cause、RAB Context、PDU Numbers in packet-gtpv2.c are not dissected correctly. fixed in the patch.

The patch did not apply cleanly to trunk, applied by hand.

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

svn path=/trunk/; revision=46497
2012-12-11 09:39:15 +00:00
Anders Broman c5c24d2277 Only construct bit string if show internal per fields is set. Use tvb_get_bits
svn path=/trunk/; revision=46496
2012-12-11 07:01:43 +00:00
Jeff Morriss 70eecf2392 Move ett and hf arrays into proto_register routine.
Reindent some.

svn path=/trunk/; revision=46495
2012-12-11 02:26:44 +00:00
Bill Meier 4daca92053 Minor cleanup:
- Remove some uneeded initializers;
- Whitespace.

svn path=/trunk/; revision=46493
2012-12-10 23:23:01 +00:00
Bill Meier a98fa4f861 Minor cleanup:
- Localize some variables & remove some uneeded initializers;
- Fix a "set but unused" instance;
- Misc.

svn path=/trunk/; revision=46492
2012-12-10 23:20:05 +00:00
Bill Meier 6104b2f45e For the record: add comments about some duplicate values in a value_string array.
svn path=/trunk/; revision=46491
2012-12-10 20:10:30 +00:00
Bill Meier 3971e95140 Re-generate value_string array for MIBenum mapping char set names from latest IANA document;
Adds new values and fixes an incorrect value in the previous value_string array.

Note: names used as specified (with capitalization) in the document.
      (Previously all the names in the value_string array were lower case).

Also: rename the value_string array to have a less generic name.

svn path=/trunk/; revision=46490
2012-12-10 19:12:05 +00:00