diff options
author | tpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-02-03 02:14:01 +0000 |
---|---|---|
committer | tpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-02-03 02:14:01 +0000 |
commit | 06ca5c27bde7aa78ac081c670be004155643b54f (patch) | |
tree | 660160bc2b3b8747b35bbff282352792fec86c1a /packet-dcerpc-netlogon.c | |
parent | f3e7788102dd8d3ff7cd5bbabd95b6f2c7902e3a (diff) |
Convert to new DCERPC string handling functions. There are still some
cosmetic bugs to work out though.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7069 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-dcerpc-netlogon.c')
-rw-r--r-- | packet-dcerpc-netlogon.c | 210 |
1 files changed, 105 insertions, 105 deletions
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c index e3015f0246..a353229a58 100644 --- a/packet-dcerpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -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.70 2003/01/31 07:37:12 guy Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.71 2003/02/03 02:14:00 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -489,7 +489,7 @@ netlogon_dissect_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_IDENTITY_INFO); } - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -498,10 +498,10 @@ netlogon_dissect_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_id, NULL); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_acct_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_workstation, 0); #ifdef REMOVED @@ -654,11 +654,11 @@ netlogon_dissect_NETWORK_INFO(tvbuff_t *tvb, int offset, offset = netlogon_dissect_CHALLENGE(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_STRING(tvb, offset, pinfo, tree, drep, - hf_netlogon_nt_chal_resp); + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, + hf_netlogon_nt_chal_resp, 0); - offset = dissect_ndr_nt_STRING(tvb, offset, pinfo, tree, drep, - hf_netlogon_lm_chal_resp); + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, + hf_netlogon_lm_chal_resp, 0); return offset; } @@ -910,22 +910,22 @@ netlogon_dissect_VALIDATION_SAM_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_netlogon_pwd_must_change_time); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_acct_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_full_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_script, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_profile_path, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_home_dir, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dir_drive, 0); offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, @@ -953,10 +953,10 @@ netlogon_dissect_VALIDATION_SAM_INFO(tvbuff_t *tvb, int offset, offset = netlogon_dissect_USER_SESSION_KEY(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_srv, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); offset = dissect_ndr_nt_PSID(tvb, offset, @@ -1027,22 +1027,22 @@ netlogon_dissect_VALIDATION_SAM_INFO2(tvbuff_t *tvb, int offset, offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_netlogon_pwd_must_change_time); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_acct_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_full_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_script, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_profile_path, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_home_dir, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dir_drive, 0); offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, @@ -1070,10 +1070,10 @@ netlogon_dissect_VALIDATION_SAM_INFO2(tvbuff_t *tvb, int offset, offset = netlogon_dissect_USER_SESSION_KEY(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_srv, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); offset = dissect_ndr_nt_PSID(tvb, offset, @@ -1175,13 +1175,13 @@ netlogon_dissect_VALIDATION_PAC_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_PAC, NDR_POINTER_UNIQUE, "PAC:", -1); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_srv, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_principal, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1198,16 +1198,16 @@ netlogon_dissect_VALIDATION_PAC_INFO(tvbuff_t *tvb, int offset, hf_netlogon_unknown_long, NULL); } - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); return offset; @@ -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_nt_UNICODE_STRING_str, NDR_POINTER_REF, + dissect_ndr_wchar_array, NDR_POINTER_REF, "Computer Name", hf_netlogon_computer_name, cb_str_postprocess, GINT_TO_POINTER(CB_STR_COL_INFO | 1)); @@ -1582,16 +1582,16 @@ netlogon_dissect_DELTA_DELETE_USER(tvbuff_t *tvb, int offset, offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Account Name", hf_netlogon_acct_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1704,10 +1704,10 @@ netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_acct_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_full_name, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1716,19 +1716,19 @@ netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_group_rid, NULL); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_home_dir, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dir_drive, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_script, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_acct_desc, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_workstations, 0); offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, @@ -1768,10 +1768,10 @@ netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_pwd_expired, NULL); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_comment, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_parameters, 0); offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, @@ -1789,16 +1789,16 @@ netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1845,10 +1845,10 @@ netlogon_dissect_DELTA_DOMAIN(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_domain_name, 1); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_oem_info, 0); offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, @@ -1878,16 +1878,16 @@ netlogon_dissect_DELTA_DOMAIN(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1928,13 +1928,13 @@ netlogon_dissect_DELTA_GROUP(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_group_name, 0); offset = netlogon_dissect_GROUP_MEMBERSHIP(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_group_desc, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1943,16 +1943,16 @@ netlogon_dissect_DELTA_GROUP(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1994,22 +1994,22 @@ netlogon_dissect_DELTA_RENAME(tvbuff_t *tvb, int offset, di=pinfo->private_data; - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, di->hf_index, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, di->hf_index, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2136,7 +2136,7 @@ netlogon_dissect_DELTA_ALIAS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_alias_name, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2148,16 +2148,16 @@ netlogon_dissect_DELTA_ALIAS(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2324,7 +2324,7 @@ netlogon_dissect_DELTA_POLICY(tvbuff_t *tvb, int offset, netlogon_dissect_EVENT_AUDIT_OPTIONS_ARRAY, NDR_POINTER_UNIQUE, "Event Audit Options:", -1); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_domain_name, 0); offset = dissect_ndr_nt_PSID(tvb, offset, @@ -2345,16 +2345,16 @@ netlogon_dissect_DELTA_POLICY(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2378,7 +2378,7 @@ netlogon_dissect_CONTROLLER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dc_name, 0); return offset; @@ -2418,7 +2418,7 @@ netlogon_dissect_DELTA_TRUSTED_DOMAINS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_domain_name, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2434,16 +2434,16 @@ netlogon_dissect_DELTA_TRUSTED_DOMAINS(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2489,7 +2489,7 @@ netlogon_dissect_PRIV_NAME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_privilege_name, 1); return offset; @@ -2558,16 +2558,16 @@ netlogon_dissect_DELTA_ACCOUNTS(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2695,16 +2695,16 @@ netlogon_dissect_DELTA_SECRET(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dummy, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -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_nt_UNICODE_STRING_str, type, + dissect_ndr_wchar_array, type, name, hf_index, callback, NULL); proto_item_set_len(item, offset-old_offset); @@ -4603,16 +4603,16 @@ netlogon_dissect_DOMAIN_TRUST_INFO(tvbuff_t *tvb, int offset, offset = lsa_dissect_POLICY_DNS_DOMAIN_INFO(tvb, offset, pinfo, tree, drep); /* Guesses at best. */ - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -4670,16 +4670,16 @@ netlogon_dissect_DOMAIN_QUERY_1(tvbuff_t *tvb, int offset, offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown", hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_workstation_os, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -4718,16 +4718,16 @@ netlogon_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, netlogon_dissect_DOMAIN_TRUST_INFO_ARRAY, NDR_POINTER_UNIQUE, "DOMAIN_TRUST_ARRAY:", -1); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dns_domain_name, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_string, 0); /* These four integers appear to mirror the last four in the query. */ |