Commit Graph

37968 Commits

Author SHA1 Message Date
Stig Bjørlykke d4e7b76316 From Roland Knall via bug 6538:
Use CRC routines from wsutil + some Code-Clang Analysis fixes.

svn path=/trunk/; revision=39730
2011-11-04 08:15:29 +00:00
Anders Broman ed8927d316 Fix GRE Key entry
svn path=/trunk/; revision=39729
2011-11-03 22:01:05 +00:00
Stig Bjørlykke db6f524164 From Roland Knall via bug 6539:
Implementing generic CRC8 and CRC16 functions for openSAFETY in wsutil.

svn path=/trunk/; revision=39726
2011-11-03 20:58:29 +00:00
Stig Bjørlykke 91eab9d737 From Roland Knall via bug 6538:
Remove stringToBytes and use hex_str_to_bytes instead.

svn path=/trunk/; revision=39725
2011-11-03 20:38:04 +00:00
Martin Mathieson fd521521f4 Add (most) primitive header items to the tree before calling UMTS RLC dissector.
svn path=/trunk/; revision=39724
2011-11-03 16:52:37 +00:00
Stephen Fisher 3a2674599f Remove apparent debug code that causes these console messages on launch:
looking for dissectors in /usr/local/src/wireshark/epan/wspython/wspy_dissectors
looking for dissectors in /home/sfisher/.wireshark/plugins
registered protocols []


svn path=/trunk/; revision=39723
2011-11-03 15:38:29 +00:00
Gerald Combs 13c64c2524 Update the list of new features.
svn path=/trunk/; revision=39722
2011-11-02 20:44:05 +00:00
Gerald Combs 18cbe2f0e0 Fix spelling.
svn path=/trunk/; revision=39721
2011-11-02 20:43:10 +00:00
Guy Harris 21688e4e46 We have to remove svnversion.h with "make distclean".
svn path=/trunk/; revision=39720
2011-11-02 20:21:11 +00:00
Stig Bjørlykke 66b220330a Revert revision 39665 (for bug 6472) which introduced bug 6537.
svn path=/trunk/; revision=39719
2011-11-02 20:06:40 +00:00
Anders Broman b0ceb1cc77 From Roland Knall:
Avoiding the fuzz-test crash, but still allowing for large parts of CIP to be dissected.

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

svn path=/trunk/; revision=39718
2011-11-02 19:36:33 +00:00
Anders Broman 083dbff6f9 From Roland Knall:
Remove the warnings for the Clang-Code-Analysis.

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

svn path=/trunk/; revision=39717
2011-11-02 19:28:38 +00:00
Guy Harris 68e4d887d2 The answer to
XXX - "svnversion.h" is distributed in the release tarball; should
	we be deleting it with "make clean", or should we only do that with
	"make maintainer-clean"?

is probably "we should only do that with "make maintainer-clean""; see

	http://www.wireshark.org/lists/wireshark-dev/201111/msg00027.html

and followups.

svn path=/trunk/; revision=39716
2011-11-02 18:16:26 +00:00
Anders Broman d1c256002f Handle differences in Camel V2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3911
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6474

svn path=/trunk/; revision=39715
2011-11-02 18:10:34 +00:00
Guy Harris 475b93f975 Requiescat in pace, osx-build.sh.
svn path=/trunk/; revision=39714
2011-11-02 18:01:27 +00:00
Gerald Combs 376c998cff Remove osx-build.sh. It was never fully ported to the Wireshark build
environment and has been unused for 3 years.

svn path=/trunk/; revision=39713
2011-11-02 17:36:20 +00:00
Stig Bjørlykke 293695e82c From Andrew Kampjes via bug 6536:
Improved the Ethernet checksum field, modelled on the TCP checksum field.

svn path=/trunk/; revision=39712
2011-11-02 11:01:57 +00:00
Anders Broman 7669c6affd Export NAEA-CIC to be used by Camel.
svn path=/trunk/; revision=39711
2011-11-02 06:38:46 +00:00
Anders Broman e1bdf00529 From Yaniv Kaul:
Many enhancements, and some fixes, to the Spice dissector:
- SASL authentication support
- indention, tab fixes
- LZ image dissection (fixing at least one TODO item)
- dissect Spice client agent data
- fix some proto_tree_add_item() offsets
- probably some more that I forgot.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6535#attach_7355

svn path=/trunk/; revision=39710
2011-11-02 06:30:25 +00:00
Guy Harris 4e2c6d9986 Use "%g" for float as well as double.
svn path=/trunk/; revision=39709
2011-11-02 03:45:18 +00:00
Guy Harris d332082386 Amazingly, there *are* apparently protocols with IPv4 addresses in
byte-swapped form - i.e., not network byte order, but the reverse of
network byte order - as, a long time ago, somebody asked to have the
"little_endian" flag affect the way proto_tree_add_item() fetched IPv4
addresses from the packet.

Use ENC_BIG_ENDIAN for IPv4 addresses (ENC_NA and ENC_BIG_ENDIAN have
the same value, but this makes it clearer that we, sadly, need to care).

svn path=/trunk/; revision=39708
2011-11-02 01:53:37 +00:00
Anders Broman 228b478691 From Roland Knall:
- Renaming opensafety.msg.type to opensafety.msg.direction
- Introducing real opensafety.msg.type as opensafety.msg.category and generated
field
- Adding openSAFETY Sender and Receiver field, for all types of messages
- Adding openSAFETY Domain number and Node number as generated fields, which
allows filtering for them
- Rework PACKET_RECEIVED_BY and PACKET_SEND_FROM_TO_ALL to PACKET_RECEIVER and
PACKET_SENDER
- Replaced PACKET_SEND_FROM_TO with calls to PACKET_RECEIVER and PACKET_SENDER
- Added functions, so that the new sender and receiver fields as well as
network information are added as sub-trees
- Removed DISSECTOR_ASSERT in opensafety_get_scm_udid as it is not needed here
anymore
- Added the connection valid bit to the dissection tree ( has been there as
message type, but was never validated )
- Added calculations for Domain Network Addr, depending if a valid UDID for the
SCM is present in SSDO and SPDO
- Corrected error, where sub-tree for spdo dissection used global ssdo_tree
instead of spdo_tree
- Added "Message Type unknown" which leads to PI_MALFORMED marked entry in
dissect_opensafety_message
- Added check for ( length - frameOffset ) is below or equal zero, to avoid
using dissector asserts
- Added check for freak frame start detection, where both frame starts would be
equal (could happen during fuzztest)
- Removed DISSECTOR_ASSERT for both frame starts being different
- Added check, that if the frame address is above 1024, the package get's
marked as PI_MALFORMED (fuzztest)
- Fixed CID 1215, CID 1224 and CID 1246/1247
- Corrected naming issue with openSAFETY/SercosIII dissection using UDP
transport

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

svn path=/trunk/; revision=39701
2011-11-01 06:12:33 +00:00
Jeff Morriss f5e838b602 Remove comma at the end of several enumerator lists.
svn path=/trunk/; revision=39700
2011-11-01 01:23:10 +00:00
Jeff Morriss e3f8def24f When checking for GTK+2, indicate that we will *not* accept GTK 3 and later.
svn path=/trunk/; revision=39699
2011-11-01 01:08:59 +00:00
Jeff Morriss cea1d2c231 Disable the CIP dissector until we can solve the fuzz failures.
svn path=/trunk/; revision=39698
2011-11-01 00:58:21 +00:00
Stephen Fisher 677331f529 Fix compilation error:
In file included from packet-uaudp.c:39:
    packet-ua.h:32:38: error: no newline at end of file


svn path=/trunk/; revision=39697
2011-10-31 21:14:12 +00:00
Guy Harris 2c63dc2272 One "packet-" suffices.
svn path=/trunk/; revision=39696
2011-10-31 20:44:31 +00:00
Guy Harris 69649d4014 Give Iain Arnell specific credit for various ajp13 enhancements.
svn path=/trunk/; revision=39695
2011-10-31 20:43:31 +00:00
Alexis La Goutte b17be73489 From Martin Renold via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5730
Dissector for HSR and PRP-1

Here is a patch that adds a dissector for HSR and for PRP-1. Both protocols are defined in IEC62439 Part 3. (High-availability Seamless Redundancy / Parallel Redundancy Protocol)

The existing PRP dissector has been refactored to support both the old PRP (now called PRP-0) and the new PRP-1.

There are three distinct dissectors:
- HSR (ethertype 892F)
- HSR/PRP supervision (ethertype 88FB)
- PRP-0 and PRP-1 (trailer dissector; disabled by default)

From me :
* Fix Clang Warning
* Add modification for CMakeLists.txt

svn path=/trunk/; revision=39692
2011-10-31 18:37:58 +00:00
Alexis La Goutte 4ea690d66e From Marek Tews via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6060
Enhance Universal Alcatel Protocol

Several fixes and heuristic version. You can also specify the ports (as in the previous version), if the heuristic version is not working properly.

svn path=/trunk/; revision=39691
2011-10-31 17:26:02 +00:00
Anders Broman 201d4f3cab Try to fix warnings.
svn path=/trunk/; revision=39690
2011-10-31 17:04:58 +00:00
Alexis La Goutte 695249537e From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6462 & 6505
Wireshark unable to parse ERSPAN from HP Comware platforms
Huawei GRE ERSPAN is not decoded properly 

Add a pref to FORCE to decode directly Ethernet frame in GRE (with no ERSPAN Header)

svn path=/trunk/; revision=39687
2011-10-31 13:45:21 +00:00
Alexis La Goutte 353182e7a1 From Thomas Dreibholz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6524
Enhancement for the Component Status Protocol dissector

The attached patch adds a dissection of the message flags field to the Component Status Protocol dissector.

svn path=/trunk/; revision=39686
2011-10-31 13:30:29 +00:00
Alexis La Goutte 45a8133bb6 Add BT-DHT to the Author Xiao Xiangquan
svn path=/trunk/; revision=39685
2011-10-31 12:51:25 +00:00
Stig Bjørlykke e48b5f02e0 No need to ep_strdup a string to lua_pushstring.
svn path=/trunk/; revision=39684
2011-10-31 08:38:49 +00:00
Anders Broman 11d6d8a777 Set the ENC_ on the remaining proto_add_item().
svn path=/trunk/; revision=39683
2011-10-31 07:05:52 +00:00
Balint Reczey f387f7240c Compare current ABI to last (git) tagged version's ABI
svn path=/trunk/; revision=39682
2011-10-30 22:46:52 +00:00
Stig Bjørlykke 5a466a5246 Don't ep_strdup the protocol name when register a dissector, because
this name will be collected when loading a capture file and the name
will be gone.

svn path=/trunk/; revision=39681
2011-10-30 21:32:27 +00:00
Stig Bjørlykke f5c9ccd0c4 Fixed some coding errors:
packet-bacapp.c:6154: error: stray '\250' in program
packet-bacapp.c:7137: warning: cast to pointer from integer of different size

svn path=/trunk/; revision=39680
2011-10-30 17:03:24 +00:00
Anders Broman cd6fa1f722 Fix unused variable warnings.
svn path=/trunk/; revision=39679
2011-10-30 16:44:02 +00:00
Anders Broman 5e7bccb9c2 From Thomas Dreibholz:
Update the NetPerfMeter protocol dissector to the latest
version of NetPerfMeter (http://www.iem.uni-due.de/~dreibh/netperfmeter/).

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

svn path=/trunk/; revision=39678
2011-10-30 16:23:36 +00:00
Anders Broman 0b41604bad From Kevin Hildebrand:
Typo in acinclude.m4 breaks Heimdal kerberos builds

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

svn path=/trunk/; revision=39677
2011-10-30 16:19:05 +00:00
Anders Broman 798fabed72 From Lori Tribble:
I found many new properties in BACnet that were not decoded correctly in
Wireshark.  I have attached a patch that adds decoding to the following
properties:

Fixed the following properties to decode:

In the Accumulator Object:
scale (187)
prescale (185)
logging-record (184)

In Access Door Object:
door-members (228)
masked-alarm-values (234)

In the Pulse Converter Object:
input-reference (181)

In the Group Object:
list-of-group-members (53)

In the Event Enrollment Object:
object-property-reference (78)

In the Command Object:
action (2)

In the Trend Log Multiple object:
log-buffer (131)

In the Event Log Object:
log-buffer (131)

In the Structured View object:
subordinate-list (211)

Added decoding for the following enumeration type properties:
  Logging-type (197)
  event-state (36)
  reliability (103)
  notify-type (208)
  door-status (231)
  lock-status (233)
  secured-status (235)
  maintenance-required (158)
  program-state (92)
  program-change (90)
  reason-for-halt (100)
  mode (160)
  silenced (163)
  operation-expected (161)
  tracking-value (164)
  file-access-method (41)

The above fixes also fixed the log-buffer decoding of the old trend log 
recorded as Wireshark bug: #6458

I believe this patch also fixes bug: #6235.  But the original bug did not
contain a capture file so I am not positive my capture represents the
originators issue.

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

svn path=/trunk/; revision=39676
2011-10-30 16:06:14 +00:00
Anders Broman 773f294db6 From Martin Kaiser:
DVB-CI / CI+ Operator Profile Resource

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

svn path=/trunk/; revision=39675
2011-10-30 16:02:20 +00:00
Anders Broman c7fb9d9fe3 From Pascal Quantin:
Fix dissection of PLMN List IE.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6513

svn path=/trunk/; revision=39674
2011-10-30 15:57:30 +00:00
Stig Bjørlykke 89880b5b59 Increase the size of a unknown INTEGER to FT_INT64 to be able to show
negative integers and integers up to MAXINT64.  We still don't support
integers between MAXINT64 and MAXUINT64, which would be 9 bytes long.

svn path=/trunk/; revision=39673
2011-10-30 15:55:18 +00:00
Balint Reczey 6efb9bdf91 pass file to wireshark in wireshark.desktop
svn path=/trunk/; revision=39670
2011-10-30 14:24:29 +00:00
Gerald Combs c34e5d4357 [Automatic manuf, services and enterprise-numbers update for 2011-10-30]
svn path=/trunk/; revision=39669
2011-10-30 14:03:25 +00:00
Guy Harris 7aa8340533 Clang Cat is watching you fail to check for a null pointer.
svn path=/trunk/; revision=39668
2011-10-30 06:47:27 +00:00
Guy Harris f15386dd93 Don't set mr_mult_req_info->num_services *unless we're sure
mr_mult_req_info is non-null*!  This should fix bug 6514, and possibly a
bunch of other buildbot crashes.

svn path=/trunk/; revision=39667
2011-10-29 20:41:30 +00:00