diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-12-15 19:48:15 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-12-15 19:48:15 +0000 |
| commit | 59dddc25ec39be11e00cfe1ff0a839f63d75a26f (patch) | |
| tree | 7a1ef525f1870a36f2d362ae3cce76ba2d30c1d9 /epan/dissectors/packet-dcerpc-nspi.c | |
| parent | afc0d8af03dd33dbc1e7a538cae5aa79c08b157c (diff) | |
In dissect_ndr_byte_array(), use the field index from the dcerpc_info
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
Diffstat (limited to 'epan/dissectors/packet-dcerpc-nspi.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-nspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index 7befde13fe..f300974272 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -10613,7 +10613,7 @@ void proto_register_dcerpc_nspi(void) { &hf_nspi_SPropValue_CTR_MVszW, { "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_LPSTR_lppszA, - { "Lppsza", "nspi.LPSTR.lppszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Lppsza", "nspi.LPSTR.lppszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_SPropValue_CTR_MVszA, { "Mvsza", "nspi.SPropValue_CTR.MVszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nspi_property_type, |