forked from osmocom/wireshark
Rename "dissect_ndr_char_array" and "disect_ndr_wchar_array" to
"dissect_ndr_char_string" and "dissect_ndr_wchar_string", to make it clearer what it does. svn path=/trunk/; revision=7095
This commit is contained in:
parent
6be6afeb1c
commit
9a348d5736
|
@ -3,7 +3,7 @@
|
|||
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
|
||||
* 2002 Added LSA command dissectors Ronnie Sahlberg
|
||||
*
|
||||
* $Id: packet-dcerpc-lsa.c,v 1.69 2003/02/07 08:33:07 guy Exp $
|
||||
* $Id: packet-dcerpc-lsa.c,v 1.70 2003/02/07 22:31:30 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -596,7 +596,7 @@ lsa_dissect_lsaopenpolicy2_rqst(tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree, char *drep)
|
||||
{
|
||||
offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE, "Server",
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE, "Server",
|
||||
hf_lsa_server, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
|
||||
* 2002 structure and command dissectors by Ronnie Sahlberg
|
||||
*
|
||||
* $Id: packet-dcerpc-netlogon.c,v 1.71 2003/02/03 02:14:00 tpot Exp $
|
||||
* $Id: packet-dcerpc-netlogon.c,v 1.72 2003/02/07 22:31:30 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -1398,7 +1398,7 @@ netlogon_dissect_netserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
|
|||
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_REF,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_REF,
|
||||
"Computer Name", hf_netlogon_computer_name,
|
||||
cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
|
@ -4424,7 +4424,7 @@ netlogon_dissect_UNICODE_STRING(tvbuff_t *tvb, int offset,
|
|||
}
|
||||
|
||||
offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, type,
|
||||
dissect_ndr_wchar_string, type,
|
||||
name, hf_index, callback, NULL);
|
||||
|
||||
proto_item_set_len(item, offset-old_offset);
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for DCERPC over SMB packet disassembly
|
||||
* Copyright 2001-2003, Tim Potter <tpot@samba.org>
|
||||
*
|
||||
* $Id: packet-dcerpc-nt.c,v 1.64 2003/02/07 08:56:11 guy Exp $
|
||||
* $Id: packet-dcerpc-nt.c,v 1.65 2003/02/07 22:31:30 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -81,7 +81,7 @@ dissect_ndr_counted_string_cb(tvbuff_t *tvb, int offset,
|
|||
hf_nt_cs_size, &size);
|
||||
|
||||
offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
|
||||
"Character Array", hf_index, callback, callback_args);
|
||||
|
||||
return offset;
|
||||
|
@ -676,7 +676,7 @@ int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset,
|
|||
{
|
||||
return dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, type, text, hf_index,
|
||||
dissect_ndr_wchar_string, type, text, hf_index,
|
||||
cb_str_postprocess, GINT_TO_POINTER(levels + 1));
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
|
||||
* 2002 Added all command dissectors Ronnie Sahlberg
|
||||
*
|
||||
* $Id: packet-dcerpc-samr.c,v 1.73 2003/02/07 08:37:13 guy Exp $
|
||||
* $Id: packet-dcerpc-samr.c,v 1.74 2003/02/07 22:31:30 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -1135,7 +1135,7 @@ samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
|
||||
"Server", hf_samr_server, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
|
||||
|
||||
|
@ -1153,7 +1153,7 @@ samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
|
||||
"Server", hf_samr_server, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for SMB \PIPE\spoolss packet disassembly
|
||||
* Copyright 2001-2003, Tim Potter <tpot@samba.org>
|
||||
*
|
||||
* $Id: packet-dcerpc-spoolss.c,v 1.83 2003/02/07 08:56:11 guy Exp $
|
||||
* $Id: packet-dcerpc-spoolss.c,v 1.84 2003/02/07 22:31:31 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -2703,7 +2703,7 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
|
|||
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
|
||||
"Printer name", hf_spoolss_printername, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
* 2002, some share information levels implemented based on samba
|
||||
* sources.
|
||||
*
|
||||
* $Id: packet-dcerpc-srvsvc.c,v 1.50 2003/02/03 02:14:01 tpot Exp $
|
||||
* $Id: packet-dcerpc-srvsvc.c,v 1.51 2003/02/07 22:31:31 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -2947,13 +2947,13 @@ srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
|
||||
"Server", hf_srvsvc_server, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_REF,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_REF,
|
||||
"Share", hf_srvsvc_share, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
|
||||
|
@ -5294,7 +5294,7 @@ srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
|
||||
dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
|
||||
"Server", hf_srvsvc_server, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for DCERPC packet disassembly
|
||||
* Copyright 2001, Todd Sabin <tas@webspan.net>
|
||||
*
|
||||
* $Id: packet-dcerpc.c,v 1.102 2003/02/07 19:45:56 guy Exp $
|
||||
* $Id: packet-dcerpc.c,v 1.103 2003/02/07 22:31:31 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -912,13 +912,21 @@ dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
return offset;
|
||||
}
|
||||
|
||||
/* Dissect an array of bytes. This corresponds to
|
||||
IDL of the form '[string] char *foo'. Used when the bytes
|
||||
should be shown as a big blob, rather than showing each one
|
||||
as an individual element.
|
||||
/* Dissect an string of bytes. This corresponds to
|
||||
IDL of the form '[string] byte *foo'.
|
||||
|
||||
It can also be used for a conformant varying array of bytes if
|
||||
the contents of the array should be shown as a big blob, rather
|
||||
than showing each byte as an individual element.
|
||||
|
||||
XXX - which of those is really the IDL type for, for example,
|
||||
the encrypted data in some MAPI packets? (Microsoft haven't
|
||||
released that IDL.)
|
||||
|
||||
XXX - does this need to do all the conformant array stuff that
|
||||
"dissect_ndr_ucvarray()" does? */
|
||||
"dissect_ndr_ucvarray()" does? These are presumably for strings
|
||||
that are conformant and varying - they're stored like conformant
|
||||
varying arrays of bytes. */
|
||||
int
|
||||
dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, char *drep)
|
||||
|
@ -1055,11 +1063,11 @@ dissect_ndr_character_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
return offset;
|
||||
}
|
||||
|
||||
/* Dissect an array of chars. This corresponds to
|
||||
/* Dissect an string of chars. This corresponds to
|
||||
IDL of the form '[string] char *foo' */
|
||||
|
||||
int
|
||||
dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
dissect_ndr_char_string(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, char *drep)
|
||||
{
|
||||
return dissect_ndr_character_array(tvb, offset, pinfo, tree, drep,
|
||||
|
@ -1067,11 +1075,11 @@ dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
FALSE);
|
||||
}
|
||||
|
||||
/* Dissect an array of wchars (wide characters). This corresponds to
|
||||
/* Dissect an string of wchars (wide characters). This corresponds to
|
||||
IDL of the form '[string] wchar *foo' */
|
||||
|
||||
int
|
||||
dissect_ndr_wchar_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
dissect_ndr_wchar_string(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, char *drep)
|
||||
{
|
||||
return dissect_ndr_character_array(tvb, offset, pinfo, tree, drep,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-dcerpc.h
|
||||
* Copyright 2001, Todd Sabin <tas@webspan.net>
|
||||
*
|
||||
* $Id: packet-dcerpc.h,v 1.27 2003/02/07 08:56:12 guy Exp $
|
||||
* $Id: packet-dcerpc.h,v 1.28 2003/02/07 22:31:32 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -196,9 +196,9 @@ char *fake_unicode(tvbuff_t *tvb, int offset, int len);
|
|||
int dissect_ndr_character_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, char *drep, int size_is,
|
||||
int hfinfo, gboolean add_subtree);
|
||||
int dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
int dissect_ndr_char_string(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, char *drep);
|
||||
int dissect_ndr_wchar_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
int dissect_ndr_wchar_string(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, char *drep);
|
||||
|
||||
typedef struct _dcerpc_sub_dissector {
|
||||
|
|
Loading…
Reference in New Issue