Stop applying a specific treatment when receiving a SMS-DELIVER packet with an unknown direction (no such treatment is done for SMS-SUBMIT).
Store SMS fragment length in hash table to avoid mangling the output when displaying the reassembled SMS.
svn path=/trunk/; revision=42064
registered OUIs from manuf and allow custom dissectors for
Organizationally Specific TLVs. Fixes bug 7080.
Use uint_get_manuf_name() and uint_get_manuf_name_if_known(), rather
than tvb_get_manuf_name() and tvb_get_manuf_name_if_known(), in cases
where we've fetched the OUI.
Have the ECP/VDP dissector also display registered OUIs from manuf.
Get rid of the OUI_CISCO_2 OUI from tlv_oui_subtype_vals, as that can
come from the manuf file. Leave in comments explaining why, for now, we
aren't using the manuf file for *all* the OUIs.
svn path=/trunk/; revision=42055
which take an OUI, presumably fetched with a routine such as
tvb_get_ntoh24(), as an argument and attempt to look it up in the manuf
file.
Fix up the comments for all the get_manuf_name routines.
Get rid of "extern"s in definitions of functions (definitions, not
declarations).
svn path=/trunk/; revision=42054
This *might* fix bug 7070, but I can't reproduce that bug on my machine
- I'm guessing from the "out of CPU time" that there's an infinite loop
somewhere, but I'm not seeing it. In any case, these tests *are*
necessary.
svn path=/trunk/; revision=42040
trunk/epan/dissectors/packet-sctp.c: In function ‘dissect_add_outgoing_streams_parameter’:
trunk/epan/dissectors/packet-sctp.c:1175:9: error: variable ‘length’ set but not used [-Werror=unused-but-set-variable]
trunk/epan/dissectors/packet-sctp.c: In function ‘dissect_add_incoming_streams_parameter’:
trunk/epan/dissectors/packet-sctp.c:1195:9: error: variable ‘length’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=42025
set uses tvb_bcd_dig_to_ep_str()'s default digit set, which is the same.
Clean up white space (no 4-space tab characters).
svn path=/trunk/; revision=42019
Since backporting must be manually applied anyway, other changes include fixing the displaying of the EOOL and NOP options, as well as other options without a dissect routine associated with them.
svn path=/trunk/; revision=41994
Add a new WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR encapsulation type, for use
by the EyeSDN file reader; unlike the pcap-encapsulated MS/TP, it
includes a direction indicator. Don't treat WTAP_ENCAP_BACNET_MS_TP as
if it has a direction indicator, as it doesn't; instead, do that for
WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR.
Add some missing entries to encap_table_base for WTAP_ENCAP_ values that
didn't get entries added.
svn path=/trunk/; revision=41969
make it clearer that the payload isn't being dissected as uninterpreted
data.
Whether the checksum is checked should not depend n the presence of
per-frame protocol data; make it depend on the availability of the
checksum, instead. Then #if 0 out all that code, as, at least in the
V5.2 capture attached to bug 7027, there is no checksum in any of the
packets.
Clean up indentation a bit.
svn path=/trunk/; revision=41963
or other information; WTAP_ENCAP_MTP2_WITH_PHDR is for MTP2 *with* such
a pseudo-header. Use WTAP_ENCAP_MTP2_WITH_PHDR for the EyeSDN captures,
and don't assume there's a pseudo-header if you have WTAP_ENCAP_MTP2.
svn path=/trunk/; revision=41962
- Update eap header file to include MS-CHAP v2 definitions.
- Convert EAP-MS-CHAP-V2 to use proto_tree_add_item() and make a few, hopefully final, changes.
Fixed a couple of typos etc.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020
svn path=/trunk/; revision=41955
removes a potential buffer overflow and should fix a bunch of Coverity
errors mentioned in bug 6878.
We might want to do the same for no_of_bits.
svn path=/trunk/; revision=41945
from makefiles (and thus from the buildbot).
The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.
As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.
svn path=/trunk/; revision=41943
(so idx won't be negative when used in the else statement). To avoid
this false positive, add a check if idx is negative to the if(str) check.
Also remove some trailing commas.
svn path=/trunk/; revision=41925
packet-eap.c: At top level:
packet-eap.c:150: error: static declaration of ‘eap_sim_subtype_vals’ follows non-static declaration
../../epan/eap.h:62: note: previous declaration of ‘eap_sim_subtype_vals’ was here
packet-eap.c:159: error: static declaration of ‘eap_aka_subtype_vals’ follows non-static declaration
../../epan/eap.h:72: note: previous declaration of ‘eap_aka_subtype_vals’ was here
packet-eap.c: In function ‘dissect_eap’:
packet-eap.c:668: warning: request for implicit conversion from ‘void *’ to ‘struct conv_state_t *’ not permitted in C++
packet-eap.c:673: warning: request for implicit conversion from ‘void *’ to ‘struct conv_state_t *’ not permitted in C++
packet-eap.c:866: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
packet-eap.c:927: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
packet-eap.c:1048: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
packet-eap.c:1067: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
svn path=/trunk/; revision=41924
Here is a dissector for ActiveMQ OpenWire protocol.
A few words about the protocol :
OpenWire has two wire formats :
- "loose" : more verbose, less CPU-intensive, less network-intensive (1-pass)
- "tight" : more compact, more CPU-intensive, more network-intensive (2-pass)
This dissector only supports the "loose" syntax, which is not the default.
This dissector only supports version 6 of the protocol.
It can be changed on the broker in the activemq.xml file by specifying
"tightEncodingEnabled=false" :
svn path=/trunk/; revision=41919
Convert EAP-IDENTITY, EAP-NOTIFY and EAP-MD5 to use proto_tree_add_item().
From me consistently use "proto abbr"_"name".
svn path=/trunk/; revision=41918
First patch to start the conversion of the EAP dissector from its use of
proto_tree_add_text() to proto_tree_add_item().
svn path=/trunk/; revision=41913
For each message, the DVB-CI dissector checks the message size against the
buffer size negotiated at startup. If the buffer size negotation was not
captured, a warning is flagged up for each packet saying its size is too big.
Obviously, the check only makes sense if we know the negotiated buffer size...
svn path=/trunk/; revision=41901
Slightly improve code which tries to keep track of "screen size".
Add a comment as to what is really required to properly keep track
of the screen size "state".
svn path=/trunk/; revision=41891
so they are initialized only once rather than each time a
function using the array is executed.
Re-arrange the code slightly so much of the dissection can be
put under 'if (tree)'.
svn path=/trunk/; revision=41885
The following patch adds decoding capabilities for RFC 5886 for PCEP protocol:
9.1. New PCEP Message
Each PCEP message has a message type value.
Two new PCEP (specified in [RFC5440]) messages are defined in this
document:
Value Description Reference
8 Path Computation Monitoring Request (PCMonReq) This document
9 Path Computation Monitoring Reply (PCMonRep) This document
9.2. New PCEP Objects
Each PCEP object has an Object-Class and an Object-Type. The
following new PCEP objects are defined in this document:
Object-Class Value Name Object-Type Reference
19 MONITORING 1 This document
20 PCC-REQ-ID 1: IPv4 addresses This document
2: IPv6 addresses
25 PCE-ID 1: IPv4 addresses This document
2: IPv6 addresses This document
26 PROC-TIME 1 This document
27 OVERLOAD 1: overload This document
svn path=/trunk/; revision=41862
While developing SP4_MACH_CRED support for the linux nfs client, I noticed that
wireshark was displaying these bitmasks incorrectly (as fattrs instead of NFS
operations).
I also noticed that BACKCHANNEL_CTL (a required value in the mask for
SP4_MACH_CRED) wasn't in names_nfsv4_operation[], so I added it and verified
that we're not missing any other ops.
svn path=/trunk/; revision=41851
According to 3GPP R7//R8/R9/R10/R11, AVP 'MBMS-Session-Duration' has 3 octets.
First 17 bits indicate seconds, the rest of bits(7 bits) represents days.
However, in the source file packet-gtp.c, it parse the AVP reversely -- taking
first 7 bits as days, the rest of 17 bits as seconds. This patch fixes that.
svn path=/trunk/; revision=41849
This patch adds support for the DVB Bouquet Association Table (BAT) from ETSI
EN 300 468.
With this last patch, the support for the DVB SI table is quite complete.
svn path=/trunk/; revision=41836
Add support for 4addr unicast packets
Add support for 4addr unicast packets packets that will be supported in
linux 3.5.
svn path=/trunk/; revision=41826
openSAFETY - Cleanup SSDO dissection, add additional information, remove logic bug
- rename isRequest to isResponse, which is the right name for it
- clean-up elseif to a better readable stand-alone if-clause
- add sender for response package without valid scm
svn path=/trunk/; revision=41824
Stop decoding the packed immediately after the credentials so that we dont incorrectly flag these packets as malformed.
svn path=/trunk/; revision=41817
Add traking of when GSS authentication contexts are created and when they are destroyed
so that it is easy to "click on created in link" in a SecNFS packet to get to where the kerberos blob for authentication is
Add context created in/destroyed in to the decode so you can quickly jump to where the authantiation happened to check the decrypted krb5 credentials
svn path=/trunk/; revision=41813
Add MAC Address Acquisition Protocol Dissector
Add the dissector for MAAP - the MAC address acquisition protocol for 802.3
Ethernet defined in IEEE1722.
svn path=/trunk/; revision=41811
trying to register it in an hf; registering invalid characters in an hf will
lead to an assertion.
This was fixed for the http dissector in revision 41787.
svn path=/trunk/; revision=41791
ack number to the lookup key (which was previously just the frame number).
This helps with situations where multiple segments of the same TCP
conversation can be found in the same frame in a capture (e.g. with LTE
user-plane traffic carried in logged MAC or RLC frames).
svn path=/trunk/; revision=41788
Check the user-provided custom header string for invalid characters before
trying to register it in an hf; registering invalid characters in an hf will
lead to an assertion.
svn path=/trunk/; revision=41787
however, a dBm transmit *power* field.
Fix up the capitalization of "dB" and "dBm", and improve the blurb for
attenuation fields, while we're at it.
Should fix bug 7000:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7000
svn path=/trunk/; revision=41781
This patch adds support for the DVB Time Offset Table and the related
descriptor.
It also contains the Stuffing Descriptor as an added bonus.
svn path=/trunk/; revision=41766
Use a couple of hf_ entries that were supposed to be used (reported in
comment 3).
I've also fixed two other small bugs I've found :
- Invalid checking of mpeg1_only_flag in the video stream descriptor
- Avoid processing descriptor data if reported length is 0
svn path=/trunk/; revision=41758
This patch adds support for DVB Network Information Table as documented in
ETSI EN 300 468.
The patch also contains additional mpeg descriptors usually found in NIT plus
a few minor bugfix for other descriptors.
svn path=/trunk/; revision=41754
The Group Address (GADDR) TLV, IS-IS TLV type 142, is carried only in an LSP
PDU and carries sub-TLVs that in turn advertise multicast group listeners. It
also contains the Group MAC address Sub TLV. The Group MAC Address (GMAC-ADDR)
sub-TLV is sub-TLV type number 1 within the GADDR TLV. In TRILL, it is used to
advertise multicast listeners.
Reference --- http://tools.ietf.org/html/rfc6326#section-2.1
svn path=/trunk/; revision=41751
Address comments in the bug: fix up some hf issues and use
proto_item_set_len() when necessary.
Added status field dissection to AEM packets.
From me: hf_aem_frequency is an FT_FLOAT and appears to have a length of 4 so
use that length (instead of 5).
svn path=/trunk/; revision=41742
In the packet-slowprotocols dissector, there is a bug in the event notification
dissector. The code uses the incorrect value to skip past the data of a vendor
specific notification.
The attached patch file sets the offset to increment by raw_octet, which
corrects the issue.
svn path=/trunk/; revision=41741
Add support for ETV Data processing & simple MPEG DSM-CC handling.
Witha a change of the name of dissect() in packet-etv.c to dissect-etv_common().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6978
svn path=/trunk/; revision=41735
The attached (trivial) patch adds some missing breaks in switch-case blocks.
This fixes coverity defects #445, #446, #1316 and #1380.
svn path=/trunk/; revision=41727
Fix
Coverity has 3 complaints about this dissector, reported in CID's 1450-1451
CONSTANT_EXPRESSION_RESULT:
Event result_independent_of_operands: (crid & 3) >> 2 is 0 regardless of the
values of its operands [non-specific operand of assignment].
1385 crid_type = (crid &
MPEG_DESCR_CONTENT_IDENTIFIER_CRID_LOCATION_MASK) >> 2;
Event result_independent_of_operands: flags & 0x1000 is always 0 regardless of
the values of its operands (logical operand of if).
1512 if (flags & MPEG_DESCR_LOGON_INITIALIZE_CONNECTIVITY_MASK) {
Event result_independent_of_operands: flags & 0x1000 is always 0 regardless of
the values of its operands (logical second operand of '&&').
1544 if (offset < end && (flags &
MPEG_DESCR_LOGON_INITIALIZE_CONNECTIVITY_MASK)) {
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6960
svn path=/trunk/; revision=41722
are present. However, still only create the graph for the first/only
one.
LTE MAC or RLC frames often contain multiple SDUs that are segments of
the same TCP conversation - this avoids the need to find a frame with
only one SDU.
svn path=/trunk/; revision=41721
ISAKMP : VendorID CheckPoint : Malformed Packet
Wrong minimum length when there is not CheckPoint "Data" after VendorID
svn path=/trunk/; revision=41718
IKE: Life-Duration wrong displayed in LTV format
The Fix commit in Revision 38387 is wrong
Get the following error message : ISAKMP dissector bug: failed assertion proto.c:2957
use a HF by type (uint32, uint64, bytes...) for life duration
svn path=/trunk/; revision=41717
Guards the calledOnce boolean, against malformed traps, using register_frame_end_routine.
Fixes openSAFETY - Malformed packets disable the dissector for the WS session
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6950
svn path=/trunk/; revision=41674
prevents OutOfMemory exceptions from being thrown. This makes it easier
to debug such conditions.
Set this variable in test-fuzzed-cap.sh but not in fuzz-test.sh; it's nice
to see the friendly out-of-memory error message in the bug reports the
latter script generates.
svn path=/trunk/; revision=41656
I'm contributing a new dissector for the HART/IP protocol. This
protocol is specified by the HART Conformance Foundation (HCF). It is
a standard protocol used in the process control industry. It
essential wraps the multip-drop serial HART packets in TCP or UDP
packets. The standard has been approved by the HCF and has been
assigned UDP/TCP port 5094 by IANA.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6961
--This line, and those below,
will be ignored--
M AUTHORS
M epan/CMakeLists.txt
M epan/dissectors/Makefile.common
AM epan/dissectors/packet-hartip.c
M ui/gtk/main_menubar.c
svn path=/trunk/; revision=41644
Repeat r41359 in another location:
Don't try to display tone entries if there are none (but there is length for
them). Could/should be an expert_info.
Also fix a typo: Nomber->Number.
svn path=/trunk/; revision=41639
Don't use a proto_item as the tree in proto_tree_add_text(). (There's code
here to hang a subtree off the item but it's commented out.)
svn path=/trunk/; revision=41638
tidlist is registered as a FT_UINT16 so don't add an array of 16-bit entities
(tids) using it. Instead add each TID individually.
svn path=/trunk/; revision=41637
Conversation address generation during processing of endpoint descriptors
is not being done in a manner consistent with that of general USB
packet dissection. I am not aware of any observable manifestation of this
bug.
svn path=/trunk/; revision=41634
cover the entire MCS field, in the hopes of avoiding the need to ask
questions such as
http://ask.wireshark.org/questions/9461
svn path=/trunk/; revision=41633
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6949 :
Don't use a guint8 for() loop index when the end of the loop value is stored
in a guint: the loop index may never reach the end-of-loop value.
Also remove a shadow'd variable.
svn path=/trunk/; revision=41625
(Additional instances requiring feedback from the dissector author have
been marked with XXX).
For 'hf_om2k_aop' use a bitmask in the hf[] entry rather than shifting & etc
in the proto_tree_add_uint() call.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6792 Comment #8.
svn path=/trunk/; revision=41612
Martin Mathieson