Commit Graph

34561 Commits

Author SHA1 Message Date
Bill Meier 39c2e1f71d From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698

(Note from me: Before the fix "File ! Save As" in Lanalyzer format
                crashed quite consistently on my Windows 7)

svn path=/trunk/; revision=36061
2011-02-25 00:40:22 +00:00
Bill Meier 3dc7697930 Revert SVN #36059; patch from Bug #5698 to be used instead
svn path=/trunk/; revision=36060
2011-02-25 00:26:37 +00:00
Bill Meier 60817fb9a1 Fix Bug #5698: "Potential access violation when writing to LANalyzer files"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698

Note: before fix
 File ! SaveAs  in Lanalyzer format crashed quite consistently on Windows.

svn path=/trunk/; revision=36059
2011-02-25 00:15:34 +00:00
Stephen Fisher a62a37fbbe From Roland Knall via bug #5726: Adding a dissector registration, so the
dissector may be called by other dissectors.


svn path=/trunk/; revision=36055
2011-02-24 21:47:37 +00:00
Bill Meier 80b7f99b1c Fix Bug #5716: "dumpcap: -q option behavior doesn't match documentation"
Rework code slightly to print "Packets captured: " at 'dumpcap -q ...' exit.
Also: SigInfo now prints: "Packets captured:  n" iso "n Packets captured".

svn path=/trunk/; revision=36052
2011-02-24 19:26:38 +00:00
Anders Broman 527942b05a Add exports.
svn path=/trunk/; revision=36049
2011-02-24 15:06:16 +00:00
Jeff Morriss f91b39b686 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5724 :
Fix a possible bug/crash with rev 36045.

svn path=/trunk/; revision=36048
2011-02-24 14:49:10 +00:00
Jeff Morriss f2cd4937bc Initialize option_len to avoid a (false positive) unitialized variable warning.
svn path=/trunk/; revision=36047
2011-02-24 14:40:01 +00:00
Jaap Keuter f75eaab39f From Wade Hennessey:
Add support for new header options in the KDP protocol.

svn path=/trunk/; revision=36045
2011-02-24 06:46:47 +00:00
Jaap Keuter 39d38636d1 From Håkon Nessjøen
Additions:
  More correct way of checking direction of packets
  Support for two new packet types: ping, pingreply

svn path=/trunk/; revision=36042
2011-02-24 06:22:52 +00:00
Bill Meier 74bc83a85a Fix Bug #5624: "Unknown MMS multipart media is shown in the wrong subtree"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5624

Do ti = proto_tree_add_text(...,...); yyy=proto_item_add_subtree(ti,...) in the usual manner.

svn path=/trunk/; revision=36039
2011-02-24 03:46:30 +00:00
Gerald Combs 3de62b03c6 Forward port r36036 from trunk-1.4: Make sure we ep_allocate enough
memory.

svn path=/trunk/; revision=36037
2011-02-23 22:49:59 +00:00
Jeff Morriss 2f82a2ee2c From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5708 :
The ERF record format defines several error flags.

This patch exposes ERF error flags using 'Expert Infos' for highlighting and
counting.

svn path=/trunk/; revision=36035
2011-02-23 17:54:00 +00:00
Jeff Morriss cd99f0aef8 From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5709 :
When Wireshark receives an AgentX Ping-PDU that contains a zero length
'context' identifier it emits the following warning:

14:30:20          Warn Dissector bug, protocol AgentX, in packet 1066:
tvbuff.c:2571: failed assertion "bufsize != 0"


The attached patch prevents the warning message from appearing under that
circumstance.  Note:  This patch will also prevent the warning under all other
conditions where a zero length string is specified anywhere in the protocol
dissector.

svn path=/trunk/; revision=36034
2011-02-23 17:45:03 +00:00
Jeff Morriss d8a2cf3c4d From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
Enhance RIPng
* Replace tvb_memcpy/proto_tree_add_text by proto_tree_add_item
* Remove dependency to packet-ipv6.h
* Remove packet-ripng.h (not needed)

Also update AUTHORS file

From me:
Put a check_col() back and reword (shorten) a couple of the new blurbs.

svn path=/trunk/; revision=36033
2011-02-23 17:31:03 +00:00
Jeff Morriss 02d491eed9 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
Enhance PIM 
* Replace struct ip6_hdr/tvb_m by tvb_ip6_to_str
* Remove dependency to packet-ipv6.h

svn path=/trunk/; revision=36032
2011-02-23 17:00:20 +00:00
Anders Broman ed66081a4d From Alexis La Goutte:
Cleanup packet-ipv6.h and dependency.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713

svn path=/trunk/; revision=36031
2011-02-23 13:51:49 +00:00
Gerald Combs 4783795690 Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.

svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
Jaap Keuter 740c1c4aeb Fix for bug 5702:
In RFC 5102 (for IPFIX), id=128 is defined as "bgpNextAdjacentAsNumber" which
is DST_AS_PEER and id=129 as "bgpPrevAdjacentAsNumber" which is SRC_AS_PEER.

svn path=/trunk/; revision=36028
2011-02-22 21:19:13 +00:00
Anders Broman a469849210 From Pascal Quantin:
[3GPP protocols] Prettify the display of Mandatory Value information elements

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

svn path=/trunk/; revision=36026
2011-02-22 11:56:10 +00:00
Stig Bjørlykke d9ef8f9ad1 Ensure we always have a valid top_tree for p1.content. This fixes a problem
with other dissectors using p1.content, such as p7.

Reset global content_type_id so this will be correct in more cases.
This is still not a good solution, because ContentType and Content are
generic objects which may occur individual in P7.

Indicate when to report invalid content-type.

svn path=/trunk/; revision=36025
2011-02-22 10:23:44 +00:00
Jaap Keuter 4dd920a9aa From Roland Knall:
WS_MSVC_NORETURN is undeclared under a non-Windows operating system, which
breaks compilation in the files epan/except.c and dumpcap.c as well as any
file including epan/except.h

svn path=/trunk/; revision=36023
2011-02-21 21:33:54 +00:00
Jaap Keuter af7e7f1004 From Yaniv Kaul:
This one parses the extended desktop size pseudo-encoding, as specified in
http://www.tigervnc.com/cgi-bin/rfbproto#extendeddesktopsize-pseudo-encoding

svn path=/trunk/; revision=36022
2011-02-21 21:12:21 +00:00
Gerald Combs 6095647db2 Fix a typo.
svn path=/trunk/; revision=36021
2011-02-21 18:42:19 +00:00
Martin Mathieson 1660ed63ab Previous UL frame may be 8 OR 16 subframes ago.
svn path=/trunk/; revision=36020
2011-02-21 14:43:16 +00:00
Stig Bjørlykke 4428535e56 Added enclosure_item_flags assignment cast.
svn path=/trunk/; revision=36019
2011-02-21 11:36:50 +00:00
Stig Bjørlykke 0803f27f23 Added reassembly of segmented SES packages.
X.225 7.37.1 states that an end SSDU may or may not contain User Data.

This is a fix for bug 5678.

svn path=/trunk/; revision=36018
2011-02-21 11:00:19 +00:00
Anders Broman c51faaa9c6 From: Holger Hans Peter Freyther
The protocol has a simple addition to provide the InService and
OutOfService notification for a MTPL2 link inside the protocol. This
patch adds these types to the type field, stops handing empty packages
to the MTPL3 dissector and fills out the COL_INFO with the type of
the packet.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5706

svn path=/trunk/; revision=36017
2011-02-20 18:56:52 +00:00
Anders Broman 84a712d07a From Alexis La Goutte:
Patch 3 : 

Enhance "Header" Tag Element (replace value_string tag_num_vals[] by
range_string tag_num_vals[]...)
Enhance TIM, IBSS, Country Info, (Q)BSS Load, FH Hopping Parameter...



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

svn path=/trunk/; revision=36016
2011-02-20 18:51:59 +00:00
Stig Bjørlykke 5868c7d026 Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.

svn path=/trunk/; revision=36013
2011-02-20 17:03:29 +00:00
Gerald Combs ba1138eb93 [Automatic manuf, services and enterprise-numbers update for 2011-02-20]
svn path=/trunk/; revision=36012
2011-02-20 16:03:38 +00:00
Stig Bjørlykke 393a8d83fb Capitalize protocol name.
svn path=/trunk/; revision=36011
2011-02-20 16:02:59 +00:00
Stig Bjørlykke 2025f2e5f5 Add changes in r35546 to template and conformation file.
svn path=/trunk/; revision=36010
2011-02-20 15:05:21 +00:00
Stig Bjørlykke 632dcd0d77 Add changes in r35384 to template file.
svn path=/trunk/; revision=36009
2011-02-20 15:03:09 +00:00
Chris Maynard 7180a53aff Sort capture file types listed by "-F" like editcap does.
svn path=/trunk/; revision=36008
2011-02-19 22:01:14 +00:00
Gerald Combs 46865581e5 Fix Visual C++ code analysis warnings.
svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
Gerald Combs a6bbdaa849 Fix some dead code and zero division issues found by Clang scan-build.
In convert_string_case() use g_utf8_strup() instead of converting each
character by hand. Hopefully this won't cause any unexpected changes in
behavior.

svn path=/trunk/; revision=36006
2011-02-18 22:43:48 +00:00
Gerald Combs aaeca955a5 Try to fix more Clang scan-build warnings.
svn path=/trunk/; revision=36005
2011-02-18 21:44:06 +00:00
Stephen Fisher e1afac1b89 From Roberto Morro via bug #5701: Change the PCEP dissector's port
from 1010 to the IANA assigned value of 4189.  From me: Add RFC 5440
to the list of references.


svn path=/trunk/; revision=36004
2011-02-18 20:48:49 +00:00
Gerald Combs c514eaabf9 Try to fix some Clan scan-build warnings.
svn path=/trunk/; revision=36003
2011-02-18 19:57:18 +00:00
Gerald Combs 3e13ddbadc Fix a few errors found by Clang scan-build.
svn path=/trunk/; revision=36002
2011-02-18 19:46:05 +00:00
Anders Broman 0e6aa74d54 From Pascal Quantin:
NAS EPS] Fix display of Authentication (Failure) Parameter IEs

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

svn path=/trunk/; revision=36001
2011-02-18 18:40:29 +00:00
Jeff Morriss 34dc101fcb #if out some (currently) unused functions.
svn path=/trunk/; revision=36000
2011-02-18 17:38:46 +00:00
Jaap Keuter 133cbe7581 From Ivan Lawrow:
The Final CAP Slot field "wpan.cap" in the Superframe Specification for a
beacon is always displayed as zero.

svn path=/trunk/; revision=35999
2011-02-18 08:02:53 +00:00
Anders Broman 29ddaec6a6 Add more MSG dissection.
svn path=/trunk/; revision=35998
2011-02-18 07:00:03 +00:00
Guy Harris eef8820ab6 Nope, the __declspec(noreturn) didn't suffice - either abort() isn't
declared as a noreturn function or declaring except_throw() as a
noreturn function isn't good enough.

svn path=/trunk/; revision=35997
2011-02-18 02:49:46 +00:00
Guy Harris ed86bc8023 Just for fun, see whether using __declspec(noreturn) on the exception
routines is sufficient to convince the Visual Studio code analyzer that
REPORT_DISSECTOR_BUG() never returns.  (That would probably require that
abort() be tagged with __declspec(noreturn); let's hope Microsoft did
the right thing there.)

svn path=/trunk/; revision=35996
2011-02-18 01:28:18 +00:00
Gerald Combs c223ebe718 Fix more Visual C++ analysis errors.
svn path=/trunk/; revision=35995
2011-02-18 01:18:44 +00:00
Gerald Combs cb3aa2b633 Disable Code Analysis warning C6011 for now. Hopefully Clang can pick
up the slack.

svn path=/trunk/; revision=35994
2011-02-18 00:33:35 +00:00
Gerald Combs d60527b94f Put WS_MSVC_NORETURN back.
svn path=/trunk/; revision=35993
2011-02-18 00:08:03 +00:00