Commit Graph

13369 Commits

Author SHA1 Message Date
Bill Meier 2910c9949a (Trivial) add a few comments about date/time formats.
svn path=/trunk/; revision=33600
2010-07-21 01:38:11 +00:00
Gerald Combs 46bd1dac98 Initialize a variable. Fixes bug 5026.
svn path=/trunk/; revision=33596
2010-07-20 17:16:42 +00:00
Stig Bjørlykke f3dab52b93 From Mat Ford via bug 5031:
Minor update to packet-ipv6.h to reference the correct RFC, and more accurately
describe the ip6_un1_flow data structure.

svn path=/trunk/; revision=33595
2010-07-20 16:18:18 +00:00
Bill Meier 4c14b405a1 (Minor) use NULL instead of "" for hf[] blurbs.
svn path=/trunk/; revision=33593
2010-07-20 15:41:42 +00:00
Martin Mathieson 5a2ca22658 Minor formatting change.
svn path=/trunk/; revision=33590
2010-07-20 13:27:20 +00:00
Jörg Mayer 0e4e77fe2e Add dissectors/packet-netmon-802_11.c
svn path=/trunk/; revision=33588
2010-07-20 08:28:49 +00:00
Jörg Mayer 8c03a4472a Updading opensuse 11.2 -> 11.3 updated gcc to 4.5.0, which created
a few warnings that needed fixing when compiling with -Werror.

svn path=/trunk/; revision=33587
2010-07-20 08:27:34 +00:00
Gerald Combs 844e3e122a Use sscanf() to parse clientaddr4 instead of trying to parse it
ourselves. Add support for IPv6 addresses. Fixes bug 5019.

svn path=/trunk/; revision=33585
2010-07-19 21:47:51 +00:00
Guy Harris d1751061c8 Initial support for Network Monitor 802.11 radio header.
svn path=/trunk/; revision=33583
2010-07-19 18:00:20 +00:00
Martin Mathieson 703635b979 Give up dissecting a MAC PDU if we see control LCIDs after data ones.
This saves us getting into a mess trying to keep track of PDU sizes in an array...

svn path=/trunk/; revision=33582
2010-07-19 14:14:47 +00:00
Stig Bjørlykke 22fed2a3c6 Removed call to check_col().
svn path=/trunk/; revision=33581
2010-07-19 13:55:12 +00:00
Stig Bjørlykke f790332923 Added SharedResourceID.
svn path=/trunk/; revision=33580
2010-07-19 13:31:02 +00:00
Stig Bjørlykke 6722384a7d Added some bootp option strings from IANA.
svn path=/trunk/; revision=33571
2010-07-18 16:20:29 +00:00
Stig Bjørlykke 461934238f Added "LISP Canonical Address Format (LCAF)".
svn path=/trunk/; revision=33570
2010-07-18 16:05:48 +00:00
Stig Bjørlykke 31c67f8a03 Added some ARP options from RFC 5494.
svn path=/trunk/; revision=33568
2010-07-18 16:01:11 +00:00
Stig Bjørlykke 28006dfb4f Use correct length for the IPv6 item.
svn path=/trunk/; revision=33565
2010-07-18 15:06:13 +00:00
Gerald Combs f1cf8c0ff0 [Automatic manuf and enterprise-numbers update for 2010-07-18]
svn path=/trunk/; revision=33564
2010-07-18 15:03:32 +00:00
Stig Bjørlykke 35073fe5a7 Added some values from IANA's icmpv6-parameters.
Note: option 29 and 30 still not dissected according to RFC 5271.

svn path=/trunk/; revision=33563
2010-07-18 12:09:14 +00:00
Stig Bjørlykke becb46a421 Added some updates from RFC 4443.
svn path=/trunk/; revision=33562
2010-07-18 11:47:43 +00:00
Stig Bjørlykke 039c0ccac0 Show the reserved values in type 135, 137 and 143 in the packet tree.
This fixes the issues in bug 5018.

svn path=/trunk/; revision=33561
2010-07-18 11:07:04 +00:00
Jaap Keuter 2e98191ed3 From KATAOKA Toshihiro:
Additional patch reparing proto.avvrb.

svn path=/trunk/; revision=33560
2010-07-17 21:43:25 +00:00
Jaap Keuter eabe057c1a From KATAOKA Toshihiro:
I've made some update for MIPv6 Mobility Options according to the IETF RFCs.
See also: http://www.iana.org/assignments/mobility-parameters/mobility-parameters.xhtml#mobility-parameters-2

svn path=/trunk/; revision=33558
2010-07-17 07:55:28 +00:00
Jaap Keuter 09b3f1eef0 From Robert Ancell:
XDMCP Query contains authentication names, not authorization names.

svn path=/trunk/; revision=33557
2010-07-16 20:57:08 +00:00
Martin Mathieson e88b2f1fc9 Make frames containing Malformed expert items match with "malformed" display filter.
svn path=/trunk/; revision=33551
2010-07-16 11:17:32 +00:00
Jörg Mayer db6a3e655e Fix for bug 5008:
- Interval is now a 12 bit value in 1/100 s.
- The address type of the virtual address is the address type
  of the network protocol.

Bugs: Currently the mbz and the interval don't look nice.
      The checksum is incorrect (but it was incorrect with the
      old code as well, so it isn't a regression).

svn path=/trunk/; revision=33550
2010-07-16 09:52:43 +00:00
Jörg Mayer 55352783c3 Make whitespace consistent (in preparation for bug 5008)
svn path=/trunk/; revision=33549
2010-07-16 07:48:50 +00:00
Guy Harris 4b6f53894a There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.

However, libwireshark *does* require the Lua flags, so use them.

svn path=/trunk/; revision=33534
2010-07-15 03:31:51 +00:00
Guy Harris 9b7176f7b4 If we have neither libgnutls nor libgcrypt,
epan_get_runtime_version_info() does nothing, and thus doesn't use its
argument.

svn path=/trunk/; revision=33532
2010-07-15 03:22:49 +00:00
Guy Harris cc3540b0fb Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Stig Bjørlykke 30f105640f Don't pass tvb data to col_set_str(), as it will not stay around.
Added support for Note (dumping as text).
Renamed Info to Power (as used in PacketLogger).

svn path=/trunk/; revision=33526
2010-07-14 20:24:38 +00:00
Anders Broman b5753ef3fc Add a field for "Revision Level Indicator" in the "MS Radio Access Capability IE".
svn path=/trunk/; revision=33518
2010-07-14 12:01:05 +00:00
Gerald Combs 3a5ba15b4d Rename a variable. "tmp_len" was too similar to "tmp_length".
svn path=/trunk/; revision=33506
2010-07-13 22:49:17 +00:00
Gerald Combs 041cd31c9e Revert get_ber_length() back to r32530, which removes all of the changes
back to and including my attempt to make it iterative. Move its guts
back into try_get_ber_length() and add a recursion level check.

This should fix CVE-2010-2284 and preserve existing behavior without
introducing any new regressions (such as bug 5000).

svn path=/trunk/; revision=33505
2010-07-13 22:41:34 +00:00
Martin Mathieson db478debbd Allocate tap structs rather than using one static struct.
svn path=/trunk/; revision=33503
2010-07-13 16:25:34 +00:00
Stig Bjørlykke a0022b31f2 From Mellanox Technologies Ltd. via bug 5004:
Added missing variable assignment for dst_qp.

svn path=/trunk/; revision=33501
2010-07-13 14:38:23 +00:00
Gerald Combs cfe9b05691 Add length checks.
svn path=/trunk/; revision=33488
2010-07-12 17:30:14 +00:00
Gerald Combs 55d68ba4bc [Automatic manuf and enterprise-numbers update for 2010-07-11]
svn path=/trunk/; revision=33484
2010-07-11 15:03:33 +00:00
Jaap Keuter f33d886525 Fix for bug 4993:
Mac support flags are little endian too.

svn path=/trunk/; revision=33483
2010-07-10 09:47:20 +00:00
Gerald Combs b4a8226906 Check our field lengths. Should fix the recent randpkt errors.
svn path=/trunk/; revision=33481
2010-07-09 20:27:02 +00:00
Gerald Combs edb7f000dc Assume that if we have more than 500 levels of nested indefinite lengths
we have a malformed packet.

svn path=/trunk/; revision=33480
2010-07-09 17:07:34 +00:00
Bill Meier 05b7c16830 Implement a separate pref for enabling tracking of tcp window scaling
(instead of including this pref as part of enabling tcp relative sequence numbers).

svn path=/trunk/; revision=33479
2010-07-09 01:46:11 +00:00
Bill Meier 40c1c5b28b From Ian Schorr: "NFSv4 COMMIT Calls not decoding"
NFSv4 COMMIT Requests are not decoded.  NFS "malformed packet" logic is
tripped.

This was a bug introduced with the changes in bug 4975.  The dissector
erroneously tries to decode 4 bytes past the end of the packet.

A patch is attached that fixes that, as well as adds "Offset" info in the Info
column for COMMIT calls.

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

svn path=/trunk/; revision=33478
2010-07-09 00:23:27 +00:00
Stig Bjørlykke e64762a0d8 From Thomas Dreibholz via bug 4989:
Extend the SSP dissector to support the SSP Environment message type.

svn path=/trunk/; revision=33476
2010-07-08 14:14:11 +00:00
Anders Broman 7f90713b6e from Tarjei Knapstad.
Minor cleanups in packet-xml dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4987

svn path=/trunk/; revision=33475
2010-07-08 12:55:03 +00:00
Jeff Morriss b0cf38c06c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4854 (crash when adding
2nd info column):

Duplicate col_do_append_sep_va_fstr()'s code into col_append_fstr() and
col_append_sep_fstr() (and remove col_do_append_sep_va_fstr()) because we need
to call va_start() and va_end() after each call to g_vsnprintf().  (This is a
followon to rev 32961.)

svn path=/trunk/; revision=33472
2010-07-08 02:54:26 +00:00
Jeff Morriss 4e76ef92cb For: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984#c4 : In try_get_ber_length() don't let a negative length make us go backwards. This should eliminate a possible infinite loop and appears to /help/ limit the depth of recursion.
svn path=/trunk/; revision=33471
2010-07-07 22:00:44 +00:00
Gerald Combs 820be405e2 Fix a buffer overflow found by recent randpkt testing. Replace raw data
pointer access with tvb_memcpy() and tvb_get_ntohs().

svn path=/trunk/; revision=33470
2010-07-07 21:27:13 +00:00
Martin Mathieson 28681e2200 From Pascal Quantin: Add offset of 1 to FMS.
svn path=/trunk/; revision=33467
2010-07-07 17:13:53 +00:00
Jeff Morriss c24f16ad44 Fix infinite recursion reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984 : In try_get_ber_length() make sure we move forward before recursing.
svn path=/trunk/; revision=33464
2010-07-07 15:52:09 +00:00
Jörg Mayer 359bd13cc9 Some dissectors are added in dissectors/dcerpc/CMakeLists.txt
Remove them here.

svn path=/trunk/; revision=33463
2010-07-07 13:46:08 +00:00
Jörg Mayer eb686a2146 Synchronize dissector lists between CMakeLists.txt and
dissectors/Makefile.common:

The following dissectors were missing from CM:
  dissectors/packet-dcerpc-budb.c
  dissectors/packet-dcerpc-butc.c
  dissectors/packet-dcerpc-drsuapi.c
  dissectors/packet-gsmtap.c

Both: Whitespace fixes and reordering.

svn path=/trunk/; revision=33462
2010-07-07 13:25:36 +00:00
Jaap Keuter 0494e951b8 Fix for bug 4982:
Handle concatenated Status and other message.

svn path=/trunk/; revision=33457
2010-07-06 17:22:12 +00:00
Jeff Morriss 4522f9b0a4 Limit the number of operations to 128 (arbitrary number) to keep us from attempting to mallocate way too much memory. This fixes the fuzz failure reported in bug 4976.
svn path=/trunk/; revision=33456
2010-07-06 14:57:54 +00:00
Anders Broman c5ddd5a253 Add miising else handling a zero msg_auth_code.
svn path=/trunk/; revision=33455
2010-07-06 13:21:34 +00:00
Guy Harris 80c8a18da7 Use G_GINT64_CONSTANT() to make a 64-bit all-bits-set constant.
svn path=/trunk/; revision=33454
2010-07-06 09:51:28 +00:00
Guy Harris 39f85d188c No need to add a fake field with the opcode as a string - you can just
compare the real opcode field against a string.

svn path=/trunk/; revision=33452
2010-07-06 08:43:07 +00:00
Stig Bjørlykke 8f686e8af0 Try checking for G_MAXUINT64 instead of 0xffffffffffffffff.
svn path=/trunk/; revision=33451
2010-07-06 07:45:38 +00:00
Stig Bjørlykke c7f2634f52 Removed non-ASCII characters.
svn path=/trunk/; revision=33450
2010-07-06 06:54:51 +00:00
Stig Bjørlykke 22056542a8 Fix the build on OSX.
svn path=/trunk/; revision=33449
2010-07-06 06:40:34 +00:00
Anders Broman 4a16e04cc0 Fix:
packet-nfs.c:699: warning: type defaults to 'int' in declaration of 'nfsv4_operation_tiers'

packet-nfs.c:9583: warning: unused variable 'saved_fh_hash'
packet-nfs.c:9580: warning: unused variable 'name'

svn path=/trunk/; revision=33448
2010-07-06 05:53:18 +00:00
Anders Broman 7bded303a4 Fix "checked api failed"
svn path=/trunk/; revision=33447
2010-07-06 05:46:52 +00:00
Anders Broman 0b0db7e0d7 From Brett Kuskie:
Enhancement of the dcerpc-svcctl dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4858

svn path=/trunk/; revision=33446
2010-07-06 04:43:45 +00:00
Anders Broman 36f5046490 From Frank Schorr:
The packet-nbns.c dissector picks random data as the NBSS PDU length in certain situations.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4914

svn path=/trunk/; revision=33445
2010-07-06 04:32:21 +00:00
Anders Broman 85a9a2cd21 From Sven Eckelmann:
Dissector/packet-batadv: Add support for icmp rr.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4922

svn path=/trunk/; revision=33444
2010-07-06 04:27:01 +00:00
Anders Broman 8d917e7bca From Andrew Feren:
Several small fixes to NetFlow decoding.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4962

svn path=/trunk/; revision=33443
2010-07-06 04:20:27 +00:00
Anders Broman a13bf525a8 From Ian Schorr:
NFSv4 usability enhancements (Info column summaries, filterable fields).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4975

svn path=/trunk/; revision=33442
2010-07-06 04:13:54 +00:00
Jörg Mayer 3bef8584a4 So many people who love to use easy to remember ports.
Improve heuristics to exclude cases where the traffic
definitely isn't Cisco's IPSEC inside TCP.

Does this obsolete the NDMP protocol check?

svn path=/trunk/; revision=33441
2010-07-05 23:21:58 +00:00
Anders Broman 7e2f42090d From Jouni Malinen:
Add dissecting for IEEE 802.11u GAS frames.

svn path=/trunk/; revision=33439
2010-07-05 20:04:46 +00:00
Martin Mathieson 8bf9b7a3b3 Change type back to 16-bit to fix buildbot.
Will change subframe numbers to 8-bit later.

svn path=/trunk/; revision=33438
2010-07-05 17:28:28 +00:00
Martin Mathieson b2a872cd9f Show grant-subframe from context info.
svn path=/trunk/; revision=33437
2010-07-05 16:45:36 +00:00
Anders Broman 419dd3e945 From Jouni Malinen:
Add dissecting for SA Query Action frames (IEEE 802.11w)

svn path=/trunk/; revision=33436
2010-07-05 16:05:21 +00:00
Anders Broman 1962892ac0 From Jouni Malinen:
Add a proto tree item for Current Channel in DS Parameter Set element.

svn path=/trunk/; revision=33435
2010-07-05 15:59:11 +00:00
Martin Mathieson b7f136ae41 Check range of supplied subframe number. If out, set back to max (9) and
add expert info error.  Should fix bug 4970.

svn path=/trunk/; revision=33432
2010-07-05 10:50:27 +00:00
Martin Mathieson 735ec2d6d2 For DL HARQ retx, support knowing result or not.
svn path=/trunk/; revision=33431
2010-07-05 10:35:17 +00:00
Stig Bjørlykke 7b64be6a80 Revert COL_DSCP_VALUE back to value set in packet-ip.c.
Right justify COL_DSCP_VALUE (and COL_DCE_CALL as in the old packet list).

svn path=/trunk/; revision=33430
2010-07-05 09:05:27 +00:00
Gerald Combs 2f1e6127aa [Automatic manuf and enterprise-numbers update for 2010-07-04]
svn path=/trunk/; revision=33426
2010-07-04 15:03:32 +00:00
Stig Bjørlykke ab215a67d5 Code cleanup:
- Use ep_strdup_printf instead of ep_alloc + g_snprintf
- Untabify

svn path=/trunk/; revision=33414
2010-07-02 13:15:44 +00:00
Guy Harris 63a0810874 oid_encoded2string() returns a const char *; don't assign it to a char
*.

Don't declare variables in the middle of a block; not all the compilers
we use support that.

svn path=/trunk/; revision=33409
2010-07-02 03:50:30 +00:00
Bill Meier 89015cb584 From Sven Eckelmann: Fix size of seqno in icmp packets
See Bug #4921: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4921

svn path=/trunk/; revision=33405
2010-07-01 19:19:03 +00:00
Bill Meier b88b612f02 From Sven Eckelmann: Add support for v11 packet format
"Please add support for v11 ogm packets used in linux 2.6.36"
See: Bug #4920: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4920

svn path=/trunk/; revision=33404
2010-07-01 18:42:41 +00:00
Gerald Combs ad7b7cc679 Don't add raw bytes to the tree.
svn path=/trunk/; revision=33403
2010-07-01 17:57:53 +00:00
Gerald Combs a7df969fb1 Have get_ber_length() set the length to 0 by default. This restores behavior
that was lost recently.

svn path=/trunk/; revision=33402
2010-07-01 16:35:37 +00:00
Bill Meier f1c540a54c Rework ethernet address resolution: step 3 of 3:
- Primarily: ethernet name lookup returns either
   unresolved or resolved ethernet name depending upon whether 
   MAC Name resolution is disabled or enabled.
   Previously: Unresolved or resolved name cached at first reference
   and then always returned for future references no matter whether
   MAC Name Resolution was enabled or disabled. 
- Also: Refactor ethernet, manuf & well-known-addr related code;

ToDo: (separately): Redisplay when 'MAC name resolution' enabled/disabled. 

svn path=/trunk/; revision=33401
2010-07-01 15:11:02 +00:00
Gerald Combs 622f07b95e Initialize MechType_oid in the right place.
svn path=/trunk/; revision=33396
2010-07-01 00:44:21 +00:00
Gerald Combs 6aaa5874c6 Initialize more variables.
svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
Gerald Combs caff9b5513 Initialize a variable.
svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
Gerald Combs a629fe9c3f Initialize some variables.
svn path=/trunk/; revision=33389
2010-06-30 23:40:05 +00:00
Gerald Combs 47c6bf912f Initialize a variable.
svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00
Gerald Combs bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00
Gerald Combs 27fcf779ae Use the right array bounds.
svn path=/trunk/; revision=33385
2010-06-30 23:07:58 +00:00
Graeme Lunt 852d60ca7e When determining a BER length, make sure the BER identifier was marked as constructed if an indefinite length is encountered.
This helps prevent a stack overflow problem reported in Bug 4951.


svn path=/trunk/; revision=33383
2010-06-30 10:06:21 +00:00
Stig Bjørlykke e777398d4f Added expert info for illegal bitstring padding and when bits are set
in the padded area.

svn path=/trunk/; revision=33382
2010-06-30 09:09:18 +00:00
Gerald Combs 83c5be18c7 Add End Marker back in.
svn path=/trunk/; revision=33380
2010-06-29 23:50:51 +00:00
Gerald Combs bce5424063 Completely revert r33367 so that we don't duplicate content in
packet-gtp.h.

svn path=/trunk/; revision=33379
2010-06-29 23:48:24 +00:00
Guy Harris 2d4033611c Include packet-gtp.h in the release tarball.
svn path=/trunk/; revision=33378
2010-06-29 23:37:10 +00:00
Graeme Lunt 6fc0e7cb8c Interpret single-ASN1-type as ASN.1 and not as an OCTET STRING.
svn path=/trunk/; revision=33375
2010-06-29 18:09:03 +00:00
Graeme Lunt 4095079e1c Decode parameters as ASN.1 directly and avoid interpreting as an OCTET STRING.
svn path=/trunk/; revision=33374
2010-06-29 18:07:33 +00:00
Gerald Combs 8906791528 Shorten "Number of bytes in flight" to "Bytes in flight", otherwise we
end up with a really wide column.

svn path=/trunk/; revision=33373
2010-06-29 15:58:00 +00:00
Anders Broman 2903a17305 Dissect one F-container
svn path=/trunk/; revision=33372
2010-06-29 14:56:39 +00:00
Anders Broman 929e1c1d98 Allow dissection if not ciphered.
svn path=/trunk/; revision=33371
2010-06-29 14:50:40 +00:00