- put back return NULL in line 947 that got removed in r44384: it is mandatory to avoid accessing non initialized variables. Change rlc_channel_assign a bit to fix what was the root cause of this removal (I guess)
- put back add_channel_info in dissect_rlc_am (removed by error?)
- fix some typo errors
- fix indentation a bit
svn path=/trunk/; revision=44393
- remove 'if (tree)' around calls to col_...() fcns and to sub-dissectors;
- call proto_get_id_by_filter_name() in proto_reg-handoff...() (not init routine);
- do some whitespace and formatting changes.
svn path=/trunk/; revision=44385
Add dissection of sub-options in DNS OPT RRs (RFC 2671)
From me
* use/prefer proto_tree_add_item
* Remove dns_optcode_description function (Use value_string...)
svn path=/trunk/; revision=44383
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
Previous patch solved the reported problem. This patch should cover input
validation for the VC Id and Link Rate fields properly.
Note link_rate==0 (unknown) is supported, as some hardware/firmware may not set
this field, but vc_size==0 is defined invalid.
From me: also initialize m_sdh_line_rate when the input is garbage.
svn path=/trunk/; revision=44377
FP: fixed exotic bug where fakes counter was sometimes not reset, RRC: fixed bug where num_chans_per_flow was not properly cleared
svn path=/trunk/; revision=44375
- add a missing test on null pointer
- always initialize rrc_nas_sys_info_gsm_map_type with a value from its associated enum
- fix some typo errors
- remove some useless directives from conformance file
- detabify files (ASN.1 generated dissectors are indented with spaces)
svn path=/trunk/; revision=44358
- FP: added header CRC validation, added crc11.c and crc11.h in wsutil/ for EDCH 11 bit CRC, fixed bug in RRC,
And also smaller bugfixes in umts_fp and rrc.
svn path=/trunk/; revision=44349
* Reorder code ! Match with Wireshark "Rules" (put in top value_string and static hf_..., in bottom proto_register_radiotap...)
svn path=/trunk/; revision=44336
The idl2wrs generated dissectors don't follow the convention of using the
filter name registered with the protocol as the start of any display filter
name. This patch fixes that.
svn path=/trunk/; revision=44325
and overflowing a buffer. Fixes a crash in bug 7568 discovered by
Laurent Butti.
We do the Dance Of The String Offset Pointers in several other
places. They should probably be changed to ep_strbufs as well.
svn path=/trunk/; revision=44320
- in UM mode, LI size boundary is at 125 bytes (regression introduced in r44292)
- define RLC_LI_UPPERLAYER outside of rlc_li_size enum as it is confusing: when set in preferences it means that the dissector will use the variable, 7 bits or 15 bits LI as indicated in the rlc_info struct (so using one of the rlc_li_size enum value); it is not a new LI value
- add value_string array for direction
- add BCCH channel to UDP framing format
- initialize p2p_dir when using UDP framing format
svn path=/trunk/; revision=44318
Don't overflow in_fmt->m_vc_index_array: verify that speed is less than or
equal to DECHAN_MAX_AUG_INDEX before using it.
Also add a comment: there are comments here that indicate that this array
should have 5 entries but there are only 4.
svn path=/trunk/; revision=44306
- umts_fp: fixed so CS content is not malformed content
- RLC: added channel tree so you can filter on rbid etc
- umts_fp,rlc,mac: added some hdsch-common code
svn path=/trunk/; revision=44292
Schmidt.
Just use proto_tree_add_item() instead of allocating a
big-ol-honkin'-block of guint64s and adding their values to the tree via
proto_tree_add_uint64().
Dissection *should* still work correctly but I can't find any XTP
captures for testing.
svn path=/trunk/; revision=44289
register it by name so that other protocols can call it more easily
highlight only the bytes that actually belong to the pmt
(the same changes as already applied to dvb-nit)
svn path=/trunk/; revision=44274
Don't try to reassemble a message of length 0 (fixes a later divide-by-zero
error but I don't see why we'd want to do any work for message whose length
we think is 0).
svn path=/trunk/; revision=44247
Don't assume that we stored off the SPRT conversation port. This was code
comes from r43887/bug 3507 so no need to backport.
svn path=/trunk/; revision=44243
packet-ax25.c and packet-arp.c.
Add an "ax25.pid" dissector table for those protocol IDs, use it in the
AX.25 dissector, and have dissectors register in that table with their
protocol IDs.
Get rid of some unneeded includes.
Clean up some "AX25"s in user-visible strings - say "AX.25" instead.
Clean up some indentation.
svn path=/trunk/; revision=44235
use that table for setting the column as well.
dissect_xdlc_control() sets the Info column; don't set it ourselves
(dissect_xdlc_control() will overwrite it if called).
That means we should always call dissect_xdlc_control(), regardless of
whether we're building a protocol tree or not. Just get rid of the test
for that.
Append the protocol ID, if present, to the column.
svn path=/trunk/; revision=44234
link-layer protocol) support.
Rename rose_handle to x25_handle, as it's not a handle for a protocol
named "Rose" or "ROSE", it's a handle for X.25's Packet Layer Protocol
(which we just call "x.25").
svn path=/trunk/; revision=44226
Get rid of capture_XXX routines that just bump ld->other.
*Do* bump ld->arp for AX.25 ARP packets.
Note that, as there's IP-over-NetROM, capture_netrom() should check for
it.
svn path=/trunk/; revision=44225
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c: In function ‘dissect_netrom_proto’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:211:9: error: variable ‘dst_ssid’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:210:9: error: variable ‘src_ssid’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c: In function ‘capture_netrom’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:684:16: error: variable ‘l_pd’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=44224
- restore test on ciphered and deciphered variables removed in r44035: they are used by dct2000 and fp_hint dissectors
- rename channel information lchid to rbid: the corresponding variable is supposed to contain a Radio Bearer Identity and not a Logical Channel Identity and was already used like this in dct2000 and fp_hint dissectors or with UDP framing protocol. Please add a new variable in rlc_info structure if the lchid is really useful
- do not display channel information when the direction is unknown (useful for UDP framing protocol for ex)
- add channel information to UM dissection also
As a rule of thumb, please check that the changes do not break existing dissectors: UMTS RLC dissection can be configured in packet-catapult-dct2000.c, packet-fp_hint.c, through the UDP framing protocol explained in packet-rlc.h and not only in packet-umts_fp.c and packet-umts-mac.c
svn path=/trunk/; revision=44223
Also, get rid of check_col() calls and unused preferences, and use
col_add_fstr() where appropriate.
Fix up some indentation.
svn path=/trunk/; revision=44222
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c:164:7: error: variable ‘v2cmdresp’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c: In function ‘proto_register_ax25’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c:398:12: error: variable ‘ax25_module’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=44214
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-arp.c:1239:42: error: variable ‘tha_val’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-arp.c:1239:22: error: variable ‘sha_val’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=44213
The BACnet GetEnrollmentSummary-ACK has an optional parameter Notification
Class. The Wireshark decoding does not correctly decode when this parameter is
missing.
The fix is to verify the context exists before attempting to decode this
parameter.
From me: replace the few remaining tabs in the file with spaces.
svn path=/trunk/; revision=44207
NBAP: fixed segfault, FP: aesthetic fix, RLC: added channel info to GUI, MAC-is: fixed case with reassembly when a middle segment arrives
MAC, RLC, added preferences for LI-size and TSN-size
svn path=/trunk/; revision=44205
Decode Provider Bridge GVRP Address
Packets with destination MAC address to be that of, provider bridge GVRP address
or 01:80:c2:00:00:0d, the packets are decoded as STP packets
with "Unknown BPDU type".
svn path=/trunk/; revision=44184
HomeplugAV dissector: decode device id
adds proper device id decoding the in the Homeplug AV "Get Device/SW Version
Confirm (A001)" response.
svn path=/trunk/; revision=44163
Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name.
svn path=/trunk/; revision=44162
Add draft-irtf-rrg-ilnp-icmpv6-06: ICMP Locator Update message for ILNPv6 ID (Conflit with draft-ietf-6lowpan-nd-18...)
svn path=/trunk/; revision=44160
Crash due to a g_snprintf() incorrect (too large) "max number of bytes" parameter.
Note that g_snprintf() apparently writes to (initializes ?) bytes beyond the
actual string written.
Fixes Bug #7948: (To be confirmed by the user)
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7498
svn path=/trunk/; revision=44111
Add new dissector for DVB-S2 Baseband Frame and GSE dissection
There is a standard for satellite receiving equipment to output all the received
data over an ethernet interface. This dissector is able to show these packets
according to the ETSI standards.
By default the dissector is disabled, it can be enabled in the protocol
settings dialogue
With the dissector...
svn path=/trunk/; revision=44110
Add new dissector for DVB-S2 Baseband Frame and GSE dissection
There is a standard for satellite receiving equipment to output all the received
data over an ethernet interface. This dissector is able to show these packets
according to the ETSI standards.
By default the dissector is disabled, it can be enabled in the protocol
settings dialogue
svn path=/trunk/; revision=44109
masking the m.s.b. of the command code does mean that several of them
won't ever get detected. I couldn't readily see from the spec what the
right think to do is.
svn path=/trunk/; revision=44098
The two remaining Clang warnings (function call argument is an uninitialized value, result of operation is garbage or undefined) seem to be false positives
svn path=/trunk/; revision=44079
Remove misleading U-RNTI display: it is useless for RLC dissection and the variable is a placeholder used for re-assembly that can contain other identifiers than the real U-RNTI (see packet-umts_fp.c)
svn path=/trunk/; revision=44070
Create/use extended value strings to access certain value string arrays;
Remove some unneeded initializers;
Reformat hf[] entries.
svn path=/trunk/; revision=44069
TURN and STUN channel data is negotiated by STUN, so its heuristics should only be based on a STUN negotiation, not raw UDP/TCP packets. "Decode As" is still available for TURN and STUN channel data if the STUN negotiation isn't captured.
svn path=/trunk/; revision=44068
Valgrind log:
= 2,656 (640 direct, 2,016 indirect) bytes in 40 blocks are definitely lost in loss record 41,241 of 41,608
= at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
= by 0xC5B0574: g_malloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
= by 0xC5C94DF: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
= by 0xC5CA5ED: g_slist_insert_sorted (in /usr/lib64/libglib-2.0.so.0.2800.8)
= by 0x697E8B8: dissect_smb_fid (packet-smb.c:3499)
svn path=/trunk/; revision=44067
Valgrind log:
= 308 (264 direct, 44 indirect) bytes in 11 blocks are definitely lost in loss record 39,914 of 41,651
= at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
= by 0xC5B0574: g_malloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
= by 0xC5C94DF: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
= by 0xC5CEC52: g_string_sized_new (in /usr/lib64/libglib-2.0.so.0.2800.8)
= by 0x6A723C5: proto_register_xml (packet-xml.c:1249)
svn path=/trunk/; revision=44064
- Added basic support for tracking flows over reconfigured transport channels + mindor bugfixes
- small fix in rrc, and some small cleanups
svn path=/trunk/; revision=44062
Dont implement the complex "extended logical unit addressing format" just
yet. That one is hairy so wait until we actually see it in the wild first.
Add decoding of LUNs using
single level lun structure and flat addressing space modes
svn path=/trunk/; revision=44058
- Create/use an extended value string to access a value string array;
- Reformat to match editor modelines (convert tabs to spaces).
svn path=/trunk/; revision=44050
- RRC now configures logical channels in HS-DSCH hs, and some HSDSCH common support added
- RLC: modifed memory management, MAC: dch would set the incorrect logical channel for RLC
svn path=/trunk/; revision=44027
- Create/use extended value string to access value string array;
- col_clear() not needed;
- Remove some unneeded initializers.
svn path=/trunk/; revision=44012
- Use col_...() fcns in the proper manner and order;
- proto_reg_handoff...() not needed (does nothing useful);
- remove some unneeded initializers;
- reformat hf[] entries.
svn path=/trunk/; revision=44000
I don't understand the relationship between the "frame data" and the "conversation" (to me they seem independent, but the code seems to put them together), but at least this fixes the crash
svn path=/trunk/; revision=43985
- FP: added payload CRC validation, RLC: some more error reporting
- RLC: fixed an exotic LI bug, some cosmetic fixes.
svn path=/trunk/; revision=43983
- prevent potential array overflow: do some bounds checking;
- use emem_strbuf instead of buffers on the stack;
- check_col() not required;
- simplify code in several places;
- remove some boilerplate comments;
- ...
svn path=/trunk/; revision=43970
don't simply assume the PAT continues until the end of the input tvb
this is similar to packet_dvb_ait.c
I'll change this for other tables shortly
svn path=/trunk/; revision=43969
- Added support for EDCH type 2 MAC-is reassembly and slightly improved RLC error reporting
- RLC: fixed bug where complete sequences in the end of a trace where not reassembled
svn path=/trunk/; revision=43954
printable. If binary, just show the number of bytes in summary.
Not that there are no items inside it, don't create ftp-data as a tree.
Also, fix the type of the variable 'ti'.
svn path=/trunk/; revision=43929
freeing them. This was slow and leaked gobs of memory.
Be like XML: allocate one parser during set-up and share it around.
svn path=/trunk/; revision=43920
*very* slow (in a profiled run where FTP data is carried over LTE
MAC/RLC/PDCP/IP/TCP, this one function call was 20% of overall runtime).
Have limited to call to ITEM_LABEL_LENGTH, as that is all that
will be displayed anyway. As per comment, I'm not convinced that doing
this for binary FTP data segments is worthwhile at all. It doesn't
even display as hex.
svn path=/trunk/; revision=43908
packet-sdp.c:
Init 'proto_sprt' in proto_reg_handof..()
[instead of using a registered init fcn];
packet-sprt.c:
Fix some typos;
Comment out dissect_sprt_heur() since it doesn't
really do any dissection. Add an XXX comment re same.
packet-v150fw.c:
Remove unused 'v150fw_handle' and thus unneeded proto_reg_handoff...();
Add an XXX comment re the (commented out) dissect_v150fw() not actually
doing any dissection.
svn path=/trunk/; revision=43902
We have to divide the 'length' field to work with guint32 pointer arithmetic,
but we still want to allocate and memcpy the original length value, since
both of those operate in raw bytes, not blocks of sizeof(guint32).
svn path=/trunk/; revision=43901
trying to track sessions for iq, jabber, et al. Just return, so we can
dissect whatever attributes we can find. An expert info already gets added
later on.
The other part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7509
svn path=/trunk/; revision=43899
Convert "4 space tabs" to spaces;
Remove trailing whitespace;
Change hf[] entry blurbs from "" to NULL;
Add svn:id and svn:eol-style properties.
svn path=/trunk/; revision=43892
I'm not exactly sure what's up with the v150fw dissector, since
it defines a heuristic which is never used and registers in no tables.
The comments indicate it's carried over rtp, but rtp doesn't have a
heuristic table. Revision 43887 caused rtp to load a handle to v150fw,
but I've done a quick scan and I don't think it ever actually does anything
with the handle.
For now, #if 0 out the heuristic function to avoid compile errors. A better
fix is needed though.
svn path=/trunk/; revision=43890
to a pointer to a guint32 and dereferenced. On some platforms, such as
SPARC, this requires that the pointer be aligned on a 4-byte boundary;
there is no guarantee that the data field of an address structure is
aligned on a 4-byte boundary, so allocate a buffer for a copy of that
data and copy the data into it, and free it when we're done with it.
Should fix bug 7501.
svn path=/trunk/; revision=43880
Attached is a patch which corrects the string construction issue in the
PropertyStates method. This patch also corrects a spelling error for
'utcTimeSyncronization' and adds decode support for this property.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6475#c8
svn path=/trunk/; revision=43868
it as appropriate in the code to read Network Instruments Observer
captures (rather than tweaking the "protected" flag in the packet data),
and use that flag in the 802.11 dissector.
Fix indentation while we're at it (tabs are not *ipso facto* 4 spaces).
svn path=/trunk/; revision=43795
Make sure that there is enough space allocated for PPP encapsulated CRTP
packet's header.
The bug can be triggered on an x86_64 system using the cpature file attached to
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056
svn path=/trunk/; revision=43784
