Commit graph

13046 commits

Author SHA1 Message Date
Anders Broman
f6f12af894 Restore dissection of contact parameters.
svn path=/trunk/; revision=39861
2011-11-15 19:03:39 +00:00
Bill Meier
36be9da221 Remove unneeded #includes;
Move proto_reg_handoff...() to the end of the file as per convention.

svn path=/trunk/; revision=39860
2011-11-15 19:00:08 +00:00
Bill Meier
199850a52b Move proto_reg_handoff...() to the end of the file as per convention;
Do other minor reformatting and cleanup.

svn path=/trunk/; revision=39859
2011-11-15 18:31:11 +00:00
Martin Mathieson
ed5ac34224 Append important details from LI and SURI trees to root item.
Show some SNs in the info column.

svn path=/trunk/; revision=39852
2011-11-15 15:36:39 +00:00
Bill Meier
49a47e9745 Fix some svn properties
svn path=/trunk/; revision=39850
2011-11-15 15:16:37 +00:00
Martin Mathieson
62d16f0fbb UMTS RLC:
- add lookup for "unknown" channel type dissector (mode is known)
- set length extent for SUFI root item
- show data frames in the info column (at least for AM...)

DCT:
- call RLCDCH with "unknown" channel type (as don't know whether IP or RRC)
- support R9

svn path=/trunk/; revision=39846
2011-11-15 12:03:52 +00:00
Alexis La Goutte
9edf24f1ef Enhance CPHA dissector
* Remove struct and sizeof
* Replace proto_tree_add_* by proto_tree_add_item
* Replace CPHA function (report2str, opcode2str...) by standard Wireshark functions
* and minor bug fix

svn path=/trunk/; revision=39844
2011-11-15 07:56:06 +00:00
Anders Broman
47bc2af5fd From Michael Mann:
Bugfixes for both Buildbot issues:
1. seg-fault with multiple_service_packet
2. infinite loop

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

svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
Guy Harris
c8283d1291 Rewrite some odd code. Clang Cat does not want:
packet-reload.c:2875:13: warning: Although the value stored to
	'local_offset' is used in the enclosing expression, the value is
	never actually read from 'local_offset'

although as I read the C90 spec the code is doing pretty much what it
should be doing and the rewritten code does the same thing.  However,
it's also a bit more complicated and harder to read than the rewritten
code.

svn path=/trunk/; revision=39840
2011-11-15 05:25:17 +00:00
Guy Harris
0c530d222a At least as I read the code, there can be up to 3 receive channels (the
number of channels is XXX & 0x03, hence in the range 0-3.

Thanks and a tip of the hat to Clang Cat for catching this.

svn path=/trunk/; revision=39839
2011-11-15 05:10:56 +00:00
Chris Maynard
91398db56b Append each op name to the operations sub-tree so you don't necessarily have to expand the tree to see which ops are present. I think it makes more sense to append the names here rather than at the top level which was done to resolve bug 6078, but for now, I leave them appended in both places.
svn path=/trunk/; revision=39837
2011-11-14 20:38:05 +00:00
Bill Meier
47c4f27e0e Remove uneeded #includes, forward refs & check_col();
tvb_reported_length_remaining() can return -1;
Localize a variable.

svn path=/trunk/; revision=39836
2011-11-14 20:04:04 +00:00
Bill Meier
5f73d64e50 'guint8=tvb_get_guint8() + 2' can wrap. Use 'gint=...' instead. ditto for 'gint16=...'
Also:
 - remove unneeded #include;
 - Remove unneeded check_col();
 - use val_to_str_const() in several cases.

svn path=/trunk/; revision=39835
2011-11-14 19:58:12 +00:00
Chris Maynard
5facddf760 The Originator protocol identifier is not present in the "provisioning actions operation -61", only the "session management operatin -60". Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570.
svn path=/trunk/; revision=39834
2011-11-14 19:57:45 +00:00
Anders Broman
f5ca06136a From Martin Kaiser:
DVB-CI / CI+ dissect X.509 certificates.

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

svn path=/trunk/; revision=39832
2011-11-14 19:16:47 +00:00
Guy Harris
bbed650915 Do some more length checking to avoid a dissector bug error. Should fix
bug 6564.

svn path=/trunk/; revision=39831
2011-11-14 18:42:11 +00:00
Bill Meier
eed8e49aff Very minor cleanup: remove some unneeded #includes & some trailing whitespace
svn path=/trunk/; revision=39830
2011-11-14 18:19:14 +00:00
Anders Broman
34ea886454 [-Wunused-but-set-variable]
svn path=/trunk/; revision=39829
2011-11-14 17:35:04 +00:00
Anders Broman
fa5c7f85aa packet-sip.c:1412: warning: 'uri_param_end_offset' may be used uninitialized in this function
svn path=/trunk/; revision=39828
2011-11-14 17:27:18 +00:00
Anders Broman
c46bda538d From Johan Wåhl:
- dissect Route and Via header.
- Dissect URI parameters.

svn path=/trunk/; revision=39827
2011-11-14 17:10:49 +00:00
Martin Mathieson
8df10bb4b5 Add remaining UMTS RLC primitive parameters preceding RLC payload.
svn path=/trunk/; revision=39826
2011-11-14 12:22:54 +00:00
Anders Broman
75afa0bd3f Fix Id tag.
svn path=/trunk/; revision=39824
2011-11-14 08:24:47 +00:00
Bill Meier
a42a82ed1d Don't use generic shared function/typedef/struct names;
Remove unneeded #includes;
Cleanup trailing whitespace.

svn path=/trunk/; revision=39823
2011-11-13 23:33:47 +00:00
Guy Harris
c32a5e7d8b As we're no longer checking whether we're constructing the Info column,
we can't bail out early on dissection merely because we're not
constructing the protocol tree, as that would mean we wouldn't construct
the Info column unless we're constructing a protocol tree.

Clean up indentation.

svn path=/trunk/; revision=39821
2011-11-13 22:44:51 +00:00
Guy Harris
833908d49b The sum of a guint16 and 2 does not necessarily fit in a guint16. Put
it into a gint, instead.  This should fix bug 6572, by preventing an
infinite loop if the sum in question is 0 modulo 2^16.

svn path=/trunk/; revision=39817
2011-11-13 01:38:46 +00:00
Bill Meier
9b715d6a99 Various additional fixes ....
svn path=/trunk/; revision=39815
2011-11-12 23:25:29 +00:00
Bill Meier
d9e9f429da Fix a formatting error.
svn path=/trunk/; revision=39814
2011-11-12 23:03:30 +00:00
Bill Meier
29986f07ed Fix some compile errors and rework some code.
svn path=/trunk/; revision=39813
2011-11-12 22:26:06 +00:00
Michael Tüxen
0f1ddc857b Fix compilation if HAVE_LIBGCRYPT is not defined.
svn path=/trunk/; revision=39812
2011-11-12 22:03:55 +00:00
Guy Harris
5692f59337 Update URL.
svn path=/trunk/; revision=39811
2011-11-12 21:16:43 +00:00
Bill Meier
d38970f73f Remove some unneeded 'if(pinfo)' tests;
Remove some unneeded forward refs.

svn path=/trunk/; revision=39809
2011-11-12 20:17:43 +00:00
Bill Meier
f5d913ac84 Fix 2 typos.
svn path=/trunk/; revision=39808
2011-11-12 20:14:26 +00:00
Bill Meier
ba8f3f4195 Remove unneeded code.
svn path=/trunk/; revision=39807
2011-11-12 19:45:21 +00:00
Bill Meier
cbb32e6b00 Fix 2 typos
svn path=/trunk/; revision=39806
2011-11-12 19:27:07 +00:00
Anders Broman
af25c3e77b From Holger Pfrommer:
Enhancement of Hilscher Analyzer Dissector.

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

svn path=/trunk/; revision=39804
2011-11-12 18:01:38 +00:00
Anders Broman
fa7ea2ea34 fix [-Wunused-but-set-variable]
svn path=/trunk/; revision=39803
2011-11-12 12:37:38 +00:00
Anders Broman
264975e29c Add a cast.
svn path=/trunk/; revision=39801
2011-11-12 11:27:41 +00:00
Alexis La Goutte
292a5b6f93 From Mariusz Okrój and Sebastien Vincent via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6225
Enhance XMPP Dissector

XMPP is communication protocol that is based on XML.

Existing Jabber dissector has only few filtering possibilities and displays packets in inconvenient way.

This dissector is a result of cooperation with Jitsi community as Google Summer of Code project (http://www.jitsi.org/index.php/GSOC2011/XmppWireshark).

From me :
Add Mariusz Okrój in AUTHORS File
Add Modelines information

svn path=/trunk/; revision=39799
2011-11-12 10:51:01 +00:00
Guy Harris
ac507aa5e7 Add some checks for "character not found"; this should fix some
fuzz-testing failures we're seeing.

svn path=/trunk/; revision=39795
2011-11-11 19:07:11 +00:00
Stig Bjørlykke
a0cbfab6bf Fixed abbrev for "Channel rate and type".
Bug reported by damker.

svn path=/trunk/; revision=39794
2011-11-11 13:25:48 +00:00
Guy Harris
c356d4f2c1 Get rid of an unused function (dissect_hnbap_AccessResult()).
svn path=/trunk/; revision=39789
2011-11-10 23:28:28 +00:00
Anders Broman
ec8806bc8e Set info col for new messages.
svn path=/trunk/; revision=39787
2011-11-10 21:44:46 +00:00
Anders Broman
06419848af Update HNBAP to V10.1.0 (2011-06)
svn path=/trunk/; revision=39786
2011-11-10 21:38:15 +00:00
Anders Broman
1f9b1347d6 From Martin Kaiser:
RSASSA-PSS support for X.509 certificates.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6541

svn path=/trunk/; revision=39785
2011-11-10 20:52:44 +00:00
Anders Broman
e5de258768 packet-sip.c:1442: warning: 'c' may be used uninitialized in this function
svn path=/trunk/; revision=39783
2011-11-10 20:38:07 +00:00
Anders Broman
5d97a01889 -Improve dissection of auth items
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6553)
- Add parameter items to the tree for some  often trunkated lines.

svn path=/trunk/; revision=39782
2011-11-10 20:16:17 +00:00
Anders Broman
4c379bc979 From Dirk:
CAPWAP dissector tries to allocate -1 bytes of memory during reassembly.
- changed to return offset.

svn path=/trunk/; revision=39779
2011-11-10 06:07:16 +00:00
Bill Meier
30cee99009 Fix a number of proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39774
2011-11-09 17:33:18 +00:00
Bill Meier
a25e421a10 Fix some [-Wunused-but-set-variable] warnings
(in some cases by changing proto_tree_add_item() to use
  what appears to be the correct 'tree' arg);
Do whitespace cleanup.

svn path=/trunk/; revision=39772
2011-11-09 02:48:51 +00:00
Bill Meier
9799f94861 Fix some [-Wunused-but-set-variable] warnings;
Trailing whitespace cleanup.

svn path=/trunk/; revision=39771
2011-11-09 01:35:26 +00:00
Chris Maynard
23193d4747 In the unlikely case that there are no ops, don't append anything. Also, comma-separate them.
svn path=/trunk/; revision=39770
2011-11-08 23:08:12 +00:00
Anders Broman
8d28d1d8cb Try to fix defined but not used warnings.
svn path=/trunk/; revision=39766
2011-11-08 19:30:51 +00:00
Chris Maynard
647c5c0b27 packet_info's in_error_pkt is now a bitfield like in_gre_pkt.
svn path=/trunk/; revision=39764
2011-11-08 18:39:11 +00:00
Stephen Fisher
6de2561c69 Fix message_type defined but unused compiler warning/error. There are 3
more problems that I'll mail to -dev.


svn path=/trunk/; revision=39763
2011-11-08 18:15:39 +00:00
Anders Broman
999b8451cb packet-sbc-ap-template.c:138: warning: unused variable 'offset'
svn path=/trunk/; revision=39762
2011-11-08 18:06:18 +00:00
Anders Broman
0e57cff4dc Get rid of set-but-not-used warnings.
svn path=/trunk/; revision=39761
2011-11-08 17:39:01 +00:00
Anders Broman
a45b165df6 Add a dissector for http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-00
svn path=/trunk/; revision=39760
2011-11-08 17:36:12 +00:00
Anders Broman
35ac513981 Use the correct length for the NAS message container.
svn path=/trunk/; revision=39759
2011-11-08 17:31:23 +00:00
Anders Broman
de5f417b99 Add SBc Application Part (SBc-AP) to build.
svn path=/trunk/; revision=39758
2011-11-08 17:28:55 +00:00
Chris Maynard
d55d8781b8 Improve ICMP conversation tracking, especially when capturing on multiple interfaces and one of them is a GRE tunnel. Resolves bug 5770, which was reopened.
svn path=/trunk/; revision=39757
2011-11-08 17:25:22 +00:00
Gerald Combs
f019a92c28 Remove a duplicate "TID" found by checkAPIs.pl.
svn path=/trunk/; revision=39755
2011-11-08 16:49:49 +00:00
Alexis La Goutte
40d6131f1b From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
80211 QoS Control: Add Raw TID

svn path=/trunk/; revision=39754
2011-11-08 14:45:35 +00:00
Alexis La Goutte
5fe097a8c3 From Iain Arnell via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6546
packet-ajp13 fails to detect end of request body

AJP13 may use two different packets to signify end of request body;
either zero length packet, or packet with zero length content. The ajp13
dissector already recognizes the former; this patch adds support for the
latter.

svn path=/trunk/; revision=39752
2011-11-08 12:50:13 +00:00
Alexis La Goutte
60247a582b From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6155
Dissector for the USB Integrated Circuit Card Interface Device Class (CCID)

I've implemented a reasonable subset of a dissector for the USB CCID specification (as described at http://www.usb.org/developers/devclass_docs/DWG_Smart-Card_CCID_Rev110.pdf), during the course of experimenting with an ACS ACR122U ISO 14443 card reader and MiFare tokens.

It currently identifies all of the message types listed in that specification,ng.

From me:
* Fix Clang Warning
* Remove trailing whitespace from lines
* Fix Checkhf (Remove a unused entry)
* Added packet-rfid-mifare to Makefile.common and CMakeLists.txt

svn path=/trunk/; revision=39750
2011-11-07 16:56:16 +00:00
Guy Harris
3f6175ac2f Attempt to fix the RCS ID.
NULL out blurbs that just give the field name.

This is C code, so it shouldn't be executable; get rid of
svn:executable.

svn path=/trunk/; revision=39747
2011-11-06 20:20:14 +00:00
Alexis La Goutte
b7e21381ae From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6161
Dissector for the NXP MiFare Protocol

I've just finished writing a dissector for the NXP-proprietary MiFare Protocol, as used alongside ISO 14443-A by a popular range of contactless (not-so-smart) cards, and various emulations, variants and clones thereof.

It currently supports all of the commands listed in http://www.nxp.com/documents/data_sheet/MF1S703x.pdf that also happen to be supported by LibNFC (http://code.google.com/p/libnfc/) - modulo the "NAK" and CRC bytes, since I haven't found examples of their usage in my USB traces, and I didn't want to hand-craft (probably incorrect) examples for testing.

From me:
* Fix Clang Warning
* Remove trailing whitespace from lines;
* Added packet-rfid-mifare to Makefile.common and CMakeLists.txt
* Add Modelines information

svn path=/trunk/; revision=39746
2011-11-06 19:19:07 +00:00
Alexis La Goutte
0ec187967e From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6545
DVB-CI / CI+ fix clang warning about unused variable

svn path=/trunk/; revision=39745
2011-11-06 19:02:36 +00:00
Anders Broman
28f7d63c58 Dissect RIM related IEs
svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
Guy Harris
d0fa4d6df7 Add a preference to select whether to use LAPD or DPNSS as the protocol
on the D channel.

svn path=/trunk/; revision=39739
2011-11-05 20:47:11 +00:00
Guy Harris
74ad858e3a Fix what I think is a typo in the introductory comment.
Set the protocol column (perhaps there should be separate names for the
DPNSS layer 2 and layer 3 protocols).

The DPNSS layer 2 protocol appears to be Yet Another HDLC Derivative;
put in a comment noting that we might want to use the xDLC control field
dissector code.

svn path=/trunk/; revision=39738
2011-11-05 20:45:39 +00:00
Guy Harris
8abad18913 Fix what I assume is a typo in the introductory comment.
svn path=/trunk/; revision=39737
2011-11-05 20:43:56 +00:00
Guy Harris
30811d83fd Get rid of non-ASCII characters in comments.
Convert "4-space tabs" to spaces.

svn path=/trunk/; revision=39735
2011-11-04 18:43:23 +00:00
Anders Broman
f960294c68 Dissect RIM Routing Address Discriminator and RAN Transparent Container.
svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
Anders Broman
42a3c77a9f Dissect RIMInformation.
svn path=/trunk/; revision=39733
2011-11-04 17:37:38 +00:00
Jeff Morriss
7e24821c3d Terminate a value_string.
svn path=/trunk/; revision=39731
2011-11-04 13:41:12 +00:00
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
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
Gerald Combs
18cbe2f0e0 Fix spelling.
svn path=/trunk/; revision=39721
2011-11-02 20:43:10 +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
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
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
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
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
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
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
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
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
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
Stig Bjørlykke
be353072dc Added support for big integer64 values.
This fixes bug 6295.

svn path=/trunk/; revision=39666
2011-10-29 18:26:57 +00:00
Martin Mathieson
338cb689a6 Fix the width of a type (and hopefully please the buildbots).
svn path=/trunk/; revision=39657
2011-10-28 18:59:30 +00:00
Martin Mathieson
ec748afa3a First go at calling UMTS RLC dissector from IxCatapult logs.
Had to change some #defines in the header file (for UDP-framed/heuristic
dissector) - will need to update example sending program later on tonight.

svn path=/trunk/; revision=39656
2011-10-28 18:36:20 +00:00
Alexis La Goutte
5fb574c69e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39655
2011-10-28 17:44:01 +00:00
Alexis La Goutte
654f213aae Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39654
2011-10-28 17:39:31 +00:00
Alexis La Goutte
2fb7b4fc4c From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
BitTorrent DHT dissector for wireshark

From me :
* Fix encoding attribut for proto_tree_add_item (with fix-encodings-args script)

svn path=/trunk/; revision=39653
2011-10-28 14:50:13 +00:00
Alexis La Goutte
f0f3d8d13c From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
Make bt-utp as heuristic dissectors

svn path=/trunk/; revision=39652
2011-10-28 14:49:31 +00:00
Alexis La Goutte
ece3e6d974 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39651
2011-10-28 11:20:19 +00:00
Alexis La Goutte
971e3ff730 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39650
2011-10-28 10:24:57 +00:00
Anders Broman
fb1736120f From Adam Mitz:
The RTPS2 dissector doesn't handle octetsToNextHeader properly in INFO_RELY submessages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6506

svn path=/trunk/; revision=39646
2011-10-28 06:06:20 +00:00
Bill Meier
c4b63360dc Fix proto_tree_add_item( encoding args;
Do whitespace cleanup (for a few files).

svn path=/trunk/; revision=39640
2011-10-27 20:30:38 +00:00
Anders Broman
1b75d2a3f3 ..Filter is not used any more.
svn path=/trunk/; revision=39639
2011-10-27 19:20:39 +00:00
Anders Broman
e595aec776 Fix comparison with UAT keys.
svn path=/trunk/; revision=39637
2011-10-27 16:49:53 +00:00
Bill Meier
20e3e0b5b5 Fix some proto_tree_add_item() encoding args;
In some files:
 Remove a few unneeded #includes;
 Do some whitespace/indentation cleanup

svn path=/trunk/; revision=39635
2011-10-27 15:59:12 +00:00
Anders Broman
2c2fb429f7 Fix indentation.
svn path=/trunk/; revision=39634
2011-10-27 15:38:32 +00:00
Anders Broman
4d0e343dbf The comparison with the UAT keys are broken, this is
a fix for fetching the IP address.

svn path=/trunk/; revision=39633
2011-10-27 15:35:48 +00:00
Bill Meier
75c64294fa Fix a typo.
svn path=/trunk/; revision=39632
2011-10-27 14:50:20 +00:00
Jeff Morriss
7b6f829483 Correct an off-by-one error introduced in r39626.
svn path=/trunk/; revision=39631
2011-10-27 14:39:12 +00:00
Jeff Morriss
01de3aea36 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6498 :
Initialize cip_req_info_t.ciaData, too.

svn path=/trunk/; revision=39630
2011-10-27 14:30:57 +00:00
Jeff Morriss
8d25051a28 Followup to r39626: It is also necessary to initialize the number of services
to 0 (in case we throw an exception decoding the first service).

svn path=/trunk/; revision=39629
2011-10-27 13:30:32 +00:00
Jeff Morriss
3c622f7b80 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6491 :
Don't set mr_mult_req_info->num_services until we're sure we've
initialized the full structure for that service.  Otherwise if we
happen to throw an exception before initializing the whole
structure, we'll core someplace (like dissect_cip_generic_service_rsp())
which expects all num_services entries to be fully initialized.


svn path=/trunk/; revision=39626
2011-10-27 01:48:39 +00:00
Bill Meier
269cc1920f Fix a [-Wunused-but-set-variable] compiler warning;
Also: Remove trailing whitespace from lines.

svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
Anders Broman
095c62b66e The comparison with the UAT keys are broken, this is
a fix for the SPI the src and dst IP address strings needs fixing too.
I'll look into that tomorrow if no one beats me too it.

svn path=/trunk/; revision=39621
2011-10-26 21:42:45 +00:00
Michael Tüxen
406678d63b Declare unused parameters as such. Don't assign them to themselves.
svn path=/trunk/; revision=39620
2011-10-26 20:58:05 +00:00
Bill Meier
0a1ded8725 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39618
2011-10-26 20:43:58 +00:00
Bill Meier
1fff1e1b09 Fix a proto_tree_add_item() encoding areg;
Use gboolean instead of int in certain cases.

svn path=/trunk/; revision=39617
2011-10-26 20:25:00 +00:00
Bill Meier
e400a0c8cb Fix proto_tree_add_item() encoding args;
Use gboolean instead of int in certain cases.

svn path=/trunk/; revision=39616
2011-10-26 20:06:48 +00:00
Bill Meier
f7a3494571 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39615
2011-10-26 19:24:58 +00:00
Bill Meier
d6ac27ad42 Fix proto_tree_add_item() encoding args;
Also: remove unneeded #include.

svn path=/trunk/; revision=39614
2011-10-26 18:57:02 +00:00
Bill Meier
6905e631dc Fix some proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39613
2011-10-26 18:38:09 +00:00
Bill Meier
379f083acd Fix some proto_tree_add_item() encoding args;
Remove some unneeded #includes.

svn path=/trunk/; revision=39612
2011-10-26 18:11:24 +00:00
Alexis La Goutte
542bf6f9b7 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39611
2011-10-26 18:02:17 +00:00
Alexis La Goutte
4c2317f44d Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39610
2011-10-26 18:02:01 +00:00
Alexis La Goutte
d7c13d0e2d Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39609
2011-10-26 18:01:42 +00:00
Alexis La Goutte
bcefa6c2c3 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39608
2011-10-26 18:01:25 +00:00
Alexis La Goutte
52ba0a20db Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39607
2011-10-26 18:01:12 +00:00
Alexis La Goutte
d9623925e8 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39606
2011-10-26 18:00:54 +00:00
Bill Meier
4b79db3e55 Add missing hf[] entries (and fix proto_tree_add_item() encoding args).
svn path=/trunk/; revision=39605
2011-10-26 17:04:26 +00:00
Alexis La Goutte
8a00b9a315 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39604
2011-10-26 15:53:25 +00:00
Stig Bjørlykke
60bb13e25f Removed duplicate enip.connection_transport_data entry.
This fixes bug 6490.

svn path=/trunk/; revision=39603
2011-10-26 12:15:07 +00:00
Martin Mathieson
c3c789da98 Add a newline at the end of this file.
svn path=/trunk/; revision=39602
2011-10-26 10:09:20 +00:00
Anders Broman
32713e84c0 Try to get rid of defined but not used warnings.
svn path=/trunk/; revision=39600
2011-10-26 06:24:05 +00:00
Anders Broman
2d9d7449b2 Try to fix
cc1: warnings being treated as errors
packet-cip.c: In function 'dissect_cip_generic_service_req':
packet-cip.c:3281: warning: format not a string literal and no format arguments
packet-cip.c: In function 'dissect_cip_generic_service_rsp':
packet-cip.c:3631: warning: format not a string literal and no format arguments
packet-cip.c: In function 'dissect_cip_data':
packet-cip.c:4881: warning: comparison between signed and unsigned

svn path=/trunk/; revision=39599
2011-10-26 06:14:53 +00:00
Anders Broman
4cfaa22784 From Michael Mann:
Improved CIP and ENIP dissectors

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

svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00