adding it with proto_tree_add_string(). Use tvb_get_string_enc() rather
than tvb_get_unicode_string() to fetch strings.
We assume a UTF-16 encoding for all "Unicode" strings.
Use tvb_strsize() and tvb_unicode_strsize() to get the lengths of
null-terminated strings.
Get rid of unused ett_nt_unicode_string variable.
svn path=/trunk/; revision=54158
From Michael Lum:
1. Allow mobile ID and service option to be shown in the INFO line for various messages.
2. proto_tree_add_text -> proto_tree_add_item conversions.
From me:
1. Even more proto_tree_add_text -> proto_tree_add_item conversions.
svn path=/trunk/; revision=54157
"This patch removes misleading dereferencing operator from the
array's name. E.g. consider the following declaration:
guint32 ipaddr[4];
ipaddr points to the address of an array of guint32's, while &ipaddr
points to the first' guint32 object. E.g. &ipaddr == &ipaddr[0]. The
value is the same, but has different type which is necessary
sometimes. However inet_pton treats latest argument as void*, and
this information is left anyway. So no need to bother with types and
let's just pass pointer to the array."
https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12304
From me: Remove dereferencing operator from 'ipaddr' in two calls to
wmem_memdup().
svn path=/trunk/; revision=54156
structure, rather than a fixed field. Get rid of that fixed field, as
it's no longer needed.
Use dissect_ndr_byte_array() rather than dissect_ndr_char_cvstring() in
a case where we have an opaque byte array.
Have dissect_ndr_cvstring() and dissect_ndr_vstring() - and, therefore,
routines that call them, such as dissect_ndr_cstring(),
dissect_ndr_char_cvstring(), dissect_ndr_char_vstring(), and
dissect_ndr_wchar_vstring() - require that the field being used by an
FT_STRING field. Manually fix a case where the PIDL generator makes
such a field FT_NONE rather than FT_STRING. Also handle EBCDIC, just in
case we happen to see a packet with EBCDIC strings.
Use tvb_get_string_enc(), rather than tvb_get_unicode_string() or
tvb_get_string(), in dissect_ndr_cvstring() and dissect_ndr_vstring().
svn path=/trunk/; revision=54134
new function dvb_add_chartbl() adds a tree entry for an encoding
use FT_BTYES as type for encoding hfs
string hfs for DVB-SI strings must have STR_UNICODE, not BASE_NONE
make dvb_string_encoding_vals[] internal to dvb_chartbl.c
svn path=/trunk/; revision=54128
Enhancements for SEL Fast Message Dissector
Additional functionality for SEL Fast Message dissector:
- Optional CRC16 validation for Fast SER messages that use those footers. Use built-in Wireshark functions to complete this
- Handle Fast Meter messages with scale factors present in the configuration message. Required some additions to the fm_conversation struct
- Some small cleanups for margins and comment locations.
From me :
- Fix some encoding field
- unused variable...
svn path=/trunk/; revision=54127
Error: hf_zbee_beacon_router_capacity: FT_BOOLEAN with a bitmask must specify a 'parent field width' for 'display' in packet-zbee-nwk.c
Error: hf_zbee_beacon_end_device_capacity: FT_BOOLEAN with a bitmask must specify a 'parent field width' for 'display' in packet-zbee-nwk.c
svn path=/trunk/; revision=54124
Mark generated fields as generated in RTPproxy dissector
This patch is cosmetic. It just marks generated fields as generated (to avoid confusion)
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
svn path=/trunk/; revision=54123
PSK stream does not get decrypted with other TLS streams
Fix PSK decryption with keylog file
Session IDs may be empty (length zero). Currently, these sessions are
still stored in the session cache which is quite useless as is is very
likely that multiple TLS streams have no Session ID in their Hello
messages. This causes the wrong premaster secret to be restored when the
ClientHello is dissected (via dissect_ssl3_hnd_hello_common).
In the PSK case, this will prevent the SSL keylog file from being
consulted. When processing the ClientKeyExchange, the
ssl_generate_pre_master_secret function is called to set the pre-master
key... but this does not happen when ssl.psk is not available. In this
case, the PMK that was restored in ClientHello is used. This results in
faulty dissection.
RSA does not have this problem because it always tries to use the
private server key (and falls back to the keylog file).
This fix prevents empty session IDs from being stored with a PMK,
making the dissector use the keylog file for PSK.
svn path=/trunk/; revision=54122
Add support for dissecting Gluster/NFS file handles
The nfs dissector has support for dissecting several types (depending on the NFS-server) of file-handles. GlusterFS/NFS can not be dissected yet
svn path=/trunk/; revision=54121
C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value.
Results might not be an expected value
svn path=/trunk/; revision=54104
Martin Mathieson