From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code svn path=/trunk/; revision=48023
This commit is contained in:
Pascal Quantin
parent
1eb5e1d739
commit
0a17799d61
|
|
@ -151,7 +151,7 @@ typedef struct _address {
|
|||
(to)->type = (from)->type; \
|
||||
(to)->len = (from)->len; \
|
||||
(to)->hf = (from)->hf; \
|
||||
COPY_ADDRESS_data = g_malloc((from)->len); \
|
||||
COPY_ADDRESS_data = (guint8 *)g_malloc((from)->len); \
|
||||
memcpy(COPY_ADDRESS_data, (from)->data, (from)->len); \
|
||||
(to)->data = COPY_ADDRESS_data; \
|
||||
}
|
||||
|
|
@ -181,7 +181,7 @@ typedef struct _address {
|
|||
#define ADD_ADDRESS_TO_HASH(hash_val, addr) { \
|
||||
const guint8 *ADD_ADDRESS_TO_HASH_data; \
|
||||
int ADD_ADDRESS_TO_HASH_index; \
|
||||
ADD_ADDRESS_TO_HASH_data = (addr)->data; \
|
||||
ADD_ADDRESS_TO_HASH_data = (const guint8 *)(addr)->data; \
|
||||
for (ADD_ADDRESS_TO_HASH_index = 0; \
|
||||
ADD_ADDRESS_TO_HASH_index < (addr)->len; \
|
||||
ADD_ADDRESS_TO_HASH_index++) \
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ dissect_browser_long_pointer(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, NULL);
|
||||
return offset;
|
||||
|
|
@ -94,7 +94,7 @@ dissect_browser_TYPE_4_data(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
int old_offset = offset;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* this call is to make wireshark eat the array header for the conformant run */
|
||||
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
|
||||
|
|
@ -143,7 +143,7 @@ dissect_browser_TYPE_3_data(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
int old_offset = offset;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* this call is to make wireshark eat the array header for the conformant run */
|
||||
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
|
||||
|
|
@ -749,7 +749,7 @@ dissect_browser_TYPE_9_data(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
int old_offset = offset;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* this call is to make wireshark eat the array header for the conformant run */
|
||||
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
|
||||
|
|
@ -941,7 +941,7 @@ dissect_browser_TYPE_12_data(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
int old_offset = offset;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* this call is to make wireshark eat the array header for the conformant run */
|
||||
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
|
||||
|
|
|
|||
|
|
@ -590,12 +590,11 @@ dnsserver_dissect_struct_DNS_RPC_NAME(tvbuff_t *tvb _U_, int offset _U_, packet_
|
|||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
int old_offset;
|
||||
dcerpc_info *di = NULL;
|
||||
guint8 len;
|
||||
const char *dn;
|
||||
int dn_len = 0;
|
||||
guint16 bc;
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -621,8 +620,7 @@ static guint16 node_record_count;
|
|||
static int
|
||||
dnsserver_dissect_element_DNS_RPC_NODE_RecordCount(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = NULL;
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -633,8 +631,7 @@ dnsserver_dissect_element_DNS_RPC_NODE_RecordCount(tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dnsserver_dissect_element_DNS_RPC_NODE_records(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = NULL;
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -3155,7 +3152,7 @@ dnsserver_dissect_element_DnssrvEnumRecords2_record_buffer_(tvbuff_t *tvb _U_, i
|
|||
guint32 size;
|
||||
int start_offset = offset;
|
||||
tvbuff_t *subtvb;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run)return offset;
|
||||
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_dnsserver_DnssrvEnumRecords2_record_buffer, &size);
|
||||
proto_tree_add_text(tree, tvb, start_offset, offset, "Subcontext size: %d", size);
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ epm_dissect_pointer_IF_ID(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, NULL);
|
||||
offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
|
||||
|
|
@ -117,7 +117,7 @@ epm_dissect_pointer_UUID(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, NULL);
|
||||
return offset;
|
||||
|
|
@ -163,7 +163,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
const char *str;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -325,7 +325,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset,
|
|||
const char *uuid_name;
|
||||
guint8 u8little_endian = DREP_LITTLE_ENDIAN;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -482,7 +482,7 @@ epm_dissect_tower (tvbuff_t *tvb, int offset,
|
|||
guint3264 len;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ dissect_afsFid (tvbuff_t * tvb, int offset,
|
|||
guint32 volume_low, unique, vnode, inode;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -406,7 +406,7 @@ dissect_afsConnParams (tvbuff_t * tvb, int offset,
|
|||
guint32 mask, Values[20];
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -565,7 +565,7 @@ typedef [string] byte NameString_t[AFS_NAMEMAX];
|
|||
const guint8 *namestring;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -624,7 +624,7 @@ dissect_afsNetAddr (tvbuff_t * tvb, int offset,
|
|||
int i;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -712,7 +712,7 @@ dissect_afsNetData (tvbuff_t * tvb, int offset,
|
|||
int old_offset = offset;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -755,7 +755,7 @@ dissect_afsTaggedPath (tvbuff_t * tvb, int offset,
|
|||
const guint8 *tp_chars;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -806,7 +806,7 @@ dissect_afsAcl (tvbuff_t * tvb, int offset,
|
|||
e_uuid_t uuid1, defaultcell;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -870,7 +870,7 @@ dissect_afsErrorStatus (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
const char *st_str;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -920,7 +920,7 @@ dissect_afsRecordLock (tvbuff_t * tvb, int offset,
|
|||
l_end_pos_ext;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1006,7 +1006,7 @@ dissect_afsstorestatus (tvbuff_t * tvb, int offset,
|
|||
e_uuid_t typeuuid;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1188,7 +1188,7 @@ dissect_afstoken (tvbuff_t * tvb, int offset,
|
|||
beginrange, endrange, beginrangeext, endrangeext, type;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1334,7 +1334,7 @@ dissect_afstaggedname (tvbuff_t * tvb, int offset,
|
|||
const guint8 *tn_string;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1389,7 +1389,7 @@ dissect_afsfidtaggedname (tvbuff_t * tvb, int offset,
|
|||
int old_offset = offset;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1425,7 +1425,7 @@ dissect_minvvp (tvbuff_t * tvb, int offset,
|
|||
guint32 minvvp_high, minvvp_low;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1470,7 +1470,7 @@ dissect_afsuuid (tvbuff_t * tvb, int offset,
|
|||
int old_offset = offset;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1508,7 +1508,7 @@ dissect_offsetp (tvbuff_t * tvb, int offset,
|
|||
guint32 offsetp_high, offsetp_low;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1552,7 +1552,7 @@ dissect_returntokenidp (tvbuff_t * tvb, int offset,
|
|||
guint32 returntokenidp_high, returntokenidp_low;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1603,7 +1603,7 @@ dissect_volsync (tvbuff_t * tvb, int offset,
|
|||
vvspare2;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1670,7 +1670,7 @@ dissect_afsFlags (tvbuff_t * tvb, int offset,
|
|||
guint32 flags;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1828,7 +1828,7 @@ dissect_fetchstatus (tvbuff_t * tvb, int offset,
|
|||
e_uuid_t typeuuid, objectuuid;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1991,7 +1991,7 @@ dissect_afsReturnDesc (tvbuff_t * tvb, int offset,
|
|||
guint32 tokenid_high, tokenid_low, type_high, type_low;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2047,7 +2047,7 @@ dissect_afsReturns (tvbuff_t * tvb, int offset,
|
|||
cheat and pretend it is */
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2073,7 +2073,7 @@ dissect_afsbundled_stat (tvbuff_t * tvb, int offset,
|
|||
int old_offset = offset;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2146,7 +2146,7 @@ fileexp_dissect_removefile_rqst (tvbuff_t * tvb, int offset,
|
|||
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2191,7 +2191,7 @@ fileexp_dissect_storedata_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 position_high, position_low, length;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2251,7 +2251,7 @@ fileexp_dissect_gettoken_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2291,7 +2291,7 @@ fileexp_dissect_gettoken_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
|
||||
dcerpc_info *di;
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2332,7 +2332,7 @@ fileexp_dissect_lookuproot_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2368,7 +2368,7 @@ fileexp_dissect_fetchdata_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 position_high, position_low, length;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2418,7 +2418,7 @@ fileexp_dissect_fetchacl_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 acltype;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2464,7 +2464,7 @@ fileexp_dissect_fetchstatus_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2497,7 +2497,7 @@ fileexp_dissect_storeacl_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 acltype;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2545,7 +2545,7 @@ fileexp_dissect_storestatus_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2584,7 +2584,7 @@ fileexp_dissect_createfile_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2627,7 +2627,7 @@ fileexp_dissect_rename_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2684,7 +2684,7 @@ fileexp_dissect_symlink_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2733,7 +2733,7 @@ fileexp_dissect_readdir_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 size;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2775,7 +2775,7 @@ fileexp_dissect_makedir_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2817,7 +2817,7 @@ fileexp_dissect_removedir_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 returntokenidp_high, returntokenidp_low;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2863,7 +2863,7 @@ fileexp_dissect_lookup_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2898,7 +2898,7 @@ fileexp_dissect_lookup_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -2943,7 +2943,7 @@ fileexp_dissect_makemountpoint_rqst (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint16 type;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3007,7 +3007,7 @@ fileexp_dissect_setcontext_rqst (tvbuff_t * tvb, int offset,
|
|||
|
||||
guint32 epochtime, clientsizesattrs, parm7;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3059,7 +3059,7 @@ fileexp_dissect_setcontext_resp (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3076,7 +3076,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3115,7 +3115,7 @@ static int
|
|||
dcerpc_info *di;
|
||||
guint32 pipe_t_size;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3144,7 +3144,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3177,7 +3177,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3210,7 +3210,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3239,7 +3239,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3268,7 +3268,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3297,7 +3297,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3333,7 +3333,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3376,7 +3376,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3426,7 +3426,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3467,7 +3467,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3500,7 +3500,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3544,7 +3544,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3585,7 +3585,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3625,7 +3625,7 @@ static int
|
|||
guint32 nextoffsetp_high, nextoffsetp_low;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3668,7 +3668,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3686,7 +3686,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3715,7 +3715,7 @@ static int
|
|||
guint32 secondsp, usecondsp, syncdistance, syncdispersion;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3756,7 +3756,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3774,7 +3774,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3806,7 +3806,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3839,7 +3839,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3859,7 +3859,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3881,7 +3881,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3906,7 +3906,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3931,7 +3931,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3968,7 +3968,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -3985,7 +3985,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -4007,7 +4007,7 @@ static int
|
|||
guint32 cellidp_high, cellidp_low, numvols, spare1, spare2;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -4054,7 +4054,7 @@ static int
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -4076,7 +4076,7 @@ static int
|
|||
guint32 spare4;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -4101,7 +4101,7 @@ static int
|
|||
guint32 numexecfids, spare1, spare2;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -4138,7 +4138,7 @@ static int
|
|||
guint32 offsetp_high, offsetp_low, size;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -4185,7 +4185,7 @@ static int
|
|||
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ typedef [string] byte NameString_t[AFS_NAMEMAX];
|
|||
const guint8 *namestring;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -981,7 +981,7 @@ fldb_dissect_getcellinfo_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1004,7 +1004,7 @@ fldb_dissect_getentrybyname_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1033,7 +1033,7 @@ fldb_dissect_getentrybyname_resp (tvbuff_t * tvb, int offset,
|
|||
*/
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1052,7 +1052,7 @@ fldb_dissect_getsiteinfo_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1090,7 +1090,7 @@ fldb_dissect_getsiteinfo_resp (tvbuff_t * tvb, int offset,
|
|||
guint32 creationquota, creationuses, deletedflag, spare2, spare3, spare4,
|
||||
spare5;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1186,7 +1186,7 @@ fldb_dissect_listentry_rqst (tvbuff_t * tvb, int offset,
|
|||
|
||||
guint32 var1, previous_index;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1226,7 +1226,7 @@ fldb_dissect_listentry_resp (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 count, next_index;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1258,7 +1258,7 @@ fldb_dissect_setlock_rqst (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 fsid_high, fsid_low, voltype, voloper;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1293,7 +1293,7 @@ fldb_dissect_setlock_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1312,7 +1312,7 @@ fldb_dissect_deleteentry_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1338,7 +1338,7 @@ fldb_dissect_deleteentry_rqst (tvbuff_t * tvb, int offset,
|
|||
|
||||
guint32 fsid_high, fsid_low, voltype, voloper;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1375,7 +1375,7 @@ fldb_dissect_createentry_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1393,7 +1393,7 @@ fldb_dissect_createentry_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1414,7 +1414,7 @@ fldb_dissect_getentrybyid_rqst (tvbuff_t * tvb, int offset,
|
|||
|
||||
guint32 volid_high, volid_low, voltype;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1457,7 +1457,7 @@ fldb_dissect_getnewvolumeids_rqst (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 numwanted;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1484,7 +1484,7 @@ fldb_dissect_getentrybyid_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1502,7 +1502,7 @@ fldb_dissect_releaselock_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1523,7 +1523,7 @@ fldb_dissect_releaselock_rqst (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 fsid_high, fsid_low, voltype, voloper;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1557,7 +1557,7 @@ fldb_dissect_replaceentry_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1578,7 +1578,7 @@ fldb_dissect_getnextserversbyid_resp (tvbuff_t * tvb, int offset,
|
|||
|
||||
guint32 nextstartp, flagsp;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1621,7 +1621,7 @@ fldb_dissect_replaceentry_rqst (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 fsid_high, fsid_low, voltype;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ static int frsrpc_dissect_element_FrsStartPromotionParent_parent_guid__(tvbuff_t
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChangeOrderCommand_file_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int conformant = di->conformant_run;
|
||||
if (!conformant) {
|
||||
guint32 soffset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_frsrpc_CommPktChangeOrderCommand_file_name, 0);
|
||||
|
|
@ -666,7 +666,7 @@ frsrpc_dissect_struct_CommPktChunk(tvbuff_t *tvb _U_, int offset _U_, packet_inf
|
|||
const char *s = NULL;
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
old_offset = offset;
|
||||
if (parent_tree) {
|
||||
|
|
@ -718,7 +718,7 @@ frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_i
|
|||
{
|
||||
guint32 nb_chunk = 0;
|
||||
guint32 remaining = tvb_length_remaining(tvb, offset);
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int align_status = di->no_align;
|
||||
if (remaining > 0) {
|
||||
proto_item *item = proto_tree_add_item(tree, hf_index, tvb, offset, -1, TRUE);
|
||||
|
|
@ -742,7 +742,7 @@ frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_i
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkGuidName_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -768,7 +768,7 @@ frsrpc_dissect_element_CommPktChunkGuidName_guid_(tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkGuidName_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -844,7 +844,7 @@ frsrpc_dissect_struct_CommPktGSVN(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -1723,7 +1723,7 @@ frsrpc_dissect_struct_CommPktChangeOrderCommand(tvbuff_t *tvb _U_, int offset _U
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -1895,7 +1895,7 @@ frsrpc_dissect_struct_CommPktDataExtensionChecksum(tvbuff_t *tvb _U_, int offset
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -1978,7 +1978,7 @@ frsrpc_dissect_struct_CommPktDataExtensionRetryTimeout(tvbuff_t *tvb _U_, int of
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -2094,7 +2094,7 @@ frsrpc_dissect_struct_CommPktCoRecordExtensionWin2k(tvbuff_t *tvb _U_, int offse
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -2219,7 +2219,7 @@ frsrpc_dissect_struct_CommPktChangeOrderRecordExtension(tvbuff_t *tvb _U_, int o
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -2404,7 +2404,7 @@ frsrpc_dissect_element_CommPktChunkData_connection(tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_join_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2438,7 +2438,7 @@ frsrpc_dissect_element_CommPktChunkData_last_join_time(tvbuff_t *tvb _U_, int of
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_vvector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2464,7 +2464,7 @@ frsrpc_dissect_element_CommPktChunkData_vvector_(tvbuff_t *tvb _U_, int offset _
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2490,7 +2490,7 @@ frsrpc_dissect_element_CommPktChunkData_join_time_(tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_replica_version_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2556,7 +2556,7 @@ frsrpc_dissect_element_CommPktChunkData_file_offset(tvbuff_t *tvb _U_, int offse
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_gvsn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2582,7 +2582,7 @@ frsrpc_dissect_element_CommPktChunkData_gvsn_(tvbuff_t *tvb _U_, int offset _U_,
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_co_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2616,7 +2616,7 @@ frsrpc_dissect_element_CommPktChunkData_co_sequnence_number(tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_remote_co(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2642,7 +2642,7 @@ frsrpc_dissect_element_CommPktChunkData_remote_co_(tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunkData_co_ext_win2k(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2814,7 +2814,7 @@ frsrpc_dissect_element_CommPktChunk_type(tvbuff_t *tvb _U_, int offset _U_, pack
|
|||
static int
|
||||
frsrpc_dissect_element_CommPktChunk_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -2962,7 +2962,7 @@ frsrpc_dissect_element_FrsSendCommPktReq_ctr(tvbuff_t *tvb _U_, int offset _U_,
|
|||
static int
|
||||
frsrpc_dissect_element_FrsSendCommPktReq_ctr_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -3006,7 +3006,7 @@ frsrpc_dissect_struct_FrsSendCommPktReq(tvbuff_t *tvb _U_, int offset _U_, packe
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -3396,7 +3396,7 @@ frsrpc_dissect_element_FrsStartPromotionParent_connection_guid(tvbuff_t *tvb _U_
|
|||
static int
|
||||
frsrpc_dissect_element_FrsStartPromotionParent_connection_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -3430,7 +3430,7 @@ frsrpc_dissect_element_FrsStartPromotionParent_partner_guid(tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
frsrpc_dissect_element_FrsStartPromotionParent_partner_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
@ -3464,7 +3464,7 @@ frsrpc_dissect_element_FrsStartPromotionParent_parent_guid(tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
frsrpc_dissect_element_FrsStartPromotionParent_parent_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int conformant = di->conformant_run;
|
||||
tvbuff_t *subtvb;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ dissect_ndr_uint8(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -64,7 +64,7 @@ PIDL_dissect_uint8(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
guint8 val;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -80,20 +80,20 @@ PIDL_dissect_uint8(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
|
||||
hf_info = proto_registrar_get_nth(hfindex);
|
||||
|
||||
valstr = ep_alloc(64);
|
||||
valstr = (char *)ep_alloc(64);
|
||||
valstr[0]=0;
|
||||
|
||||
switch (hf_info->display) {
|
||||
case BASE_DEC:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(%d)",val_to_str(val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(%d)",val_to_str(val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "%d", val);
|
||||
}
|
||||
break;
|
||||
case BASE_HEX:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(0x%02x)",val_to_str(val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(0x%02x)",val_to_str(val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "0x%02x", val);
|
||||
}
|
||||
|
|
@ -118,7 +118,7 @@ dissect_ndr_uint16(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -140,7 +140,7 @@ PIDL_dissect_uint16(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
guint16 val;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -159,20 +159,20 @@ PIDL_dissect_uint16(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
|
||||
hf_info = proto_registrar_get_nth(hfindex);
|
||||
|
||||
valstr = ep_alloc(64);
|
||||
valstr = (char *)ep_alloc(64);
|
||||
valstr[0]=0;
|
||||
|
||||
switch (hf_info->display) {
|
||||
case BASE_DEC:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(%d)",val_to_str(val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(%d)",val_to_str(val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "%d", val);
|
||||
}
|
||||
break;
|
||||
case BASE_HEX:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(0x%04x)",val_to_str(val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(0x%04x)",val_to_str(val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "0x%04x", val);
|
||||
}
|
||||
|
|
@ -196,7 +196,7 @@ dissect_ndr_uint32(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -220,7 +220,7 @@ dissect_ndr_uint3264(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->call_data->flags & DCERPC_IS_NDR64) {
|
||||
return dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hfindex, pdata);
|
||||
|
|
@ -244,7 +244,7 @@ dissect_ndr_uint1632(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->call_data->flags & DCERPC_IS_NDR64) {
|
||||
return dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, pdata);
|
||||
|
|
@ -266,7 +266,7 @@ PIDL_dissect_uint32(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
guint32 val;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -285,20 +285,20 @@ PIDL_dissect_uint32(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
|
||||
hf_info = proto_registrar_get_nth(hfindex);
|
||||
|
||||
valstr = ep_alloc(64);
|
||||
valstr = (char *)ep_alloc(64);
|
||||
valstr[0]=0;
|
||||
|
||||
switch (hf_info->display) {
|
||||
case BASE_DEC:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(%d)",val_to_str(val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(%d)",val_to_str(val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "%d", val);
|
||||
}
|
||||
break;
|
||||
case BASE_HEX:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(0x%08x)",val_to_str(val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(0x%08x)",val_to_str(val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "0x%08x", val);
|
||||
}
|
||||
|
|
@ -327,7 +327,7 @@ dissect_ndr_duint32(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -350,7 +350,7 @@ dissect_ndr_uint64(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -374,7 +374,7 @@ PIDL_dissect_uint64(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
guint64 val;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -392,20 +392,20 @@ PIDL_dissect_uint64(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
|
||||
hf_info = proto_registrar_get_nth(hfindex);
|
||||
|
||||
valstr = ep_alloc(64);
|
||||
valstr = (char *)ep_alloc(64);
|
||||
valstr[0]=0;
|
||||
|
||||
switch (hf_info->display) {
|
||||
case BASE_DEC:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(%" G_GINT64_MODIFIER "u)",val_to_str( (guint32) val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(%" G_GINT64_MODIFIER "u)",val_to_str( (guint32) val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "%" G_GINT64_MODIFIER "u", val);
|
||||
}
|
||||
break;
|
||||
case BASE_HEX:
|
||||
if (hf_info->strings) {
|
||||
g_snprintf(valstr, 64, "%s(0x%" G_GINT64_MODIFIER "x)",val_to_str( (guint32) val, hf_info->strings, "Unknown:%u"), val);
|
||||
g_snprintf(valstr, 64, "%s(0x%" G_GINT64_MODIFIER "x)",val_to_str( (guint32) val, (const value_string *)hf_info->strings, "Unknown:%u"), val);
|
||||
} else {
|
||||
g_snprintf(valstr, 64, "0x%" G_GINT64_MODIFIER "x", val);
|
||||
}
|
||||
|
|
@ -430,7 +430,7 @@ dissect_ndr_float(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -452,7 +452,7 @@ dissect_ndr_double(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -473,7 +473,7 @@ dissect_ndr_time_t(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -494,7 +494,7 @@ dissect_ndr_uuid_t(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -525,7 +525,7 @@ dissect_ndr_ctx_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
static e_ctx_hnd ctx_hnd;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -453,7 +453,7 @@ typedef struct _netlogon_auth_vars {
|
|||
guint64 confounder;
|
||||
guint8 private_type;
|
||||
gboolean can_decrypt;
|
||||
void* private;
|
||||
void* private_data;
|
||||
char* client_name;
|
||||
int start;
|
||||
int next_start;
|
||||
|
|
@ -617,7 +617,7 @@ netlogon_dissect_EXTRA_FLAGS(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -650,7 +650,7 @@ dissect_ndr_lm_nt_hash_cb(tvbuff_t *tvb, int offset,
|
|||
dcerpc_callback_fnct_t *callback,
|
||||
void *callback_args)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint16 len, size;
|
||||
|
||||
/* Structure starts with short, but is aligned for longs */
|
||||
|
|
@ -713,7 +713,7 @@ netlogon_dissect_USER_ACCOUNT_CONTROL(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -804,7 +804,7 @@ netlogon_dissect_VALIDATION_UAS_INFO(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -908,7 +908,7 @@ netlogon_dissect_LOGOFF_UAS_INFO(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -1058,7 +1058,7 @@ netlogon_dissect_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree=NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect.*/
|
||||
return offset;
|
||||
|
|
@ -1091,7 +1091,7 @@ netlogon_dissect_NT_OWF_PASSWORD(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree=NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect.*/
|
||||
return offset;
|
||||
|
|
@ -1147,7 +1147,7 @@ netlogon_dissect_CHALLENGE(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect.*/
|
||||
return offset;
|
||||
|
|
@ -1366,7 +1366,7 @@ netlogon_dissect_CREDENTIAL(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect.*/
|
||||
return offset;
|
||||
|
|
@ -1394,7 +1394,7 @@ netlogon_dissect_AUTHENTICATOR(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
nstime_t ts;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -1441,7 +1441,7 @@ netlogon_dissect_GROUP_MEMBERSHIP_ATTRIBUTES(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -1518,7 +1518,7 @@ netlogon_dissect_USER_SESSION_KEY(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect.*/
|
||||
return offset;
|
||||
|
|
@ -1550,7 +1550,7 @@ netlogon_dissect_USER_FLAGS(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -2086,7 +2086,7 @@ netlogon_dissect_PAC(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 pac_size;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -2109,7 +2109,7 @@ netlogon_dissect_AUTH(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 auth_size;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -2503,14 +2503,14 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
|
|||
/*int oldoffset = offset;*/
|
||||
netlogon_auth_vars *vars;
|
||||
netlogon_auth_vars *existing_vars;
|
||||
netlogon_auth_key *key = se_alloc(sizeof(netlogon_auth_key));
|
||||
netlogon_auth_key *key = (netlogon_auth_key *)se_alloc(sizeof(netlogon_auth_key));
|
||||
guint8 tab[8] = { 0,0,0,0,0,0,0,0};
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
|
||||
|
||||
/* As we are not always keeping this it could be more intelligent to g_malloc it
|
||||
and if we decide to keep it then transform it into se_alloc */
|
||||
vars = se_alloc(sizeof(netlogon_auth_vars));
|
||||
vars = (netlogon_auth_vars *)se_alloc(sizeof(netlogon_auth_vars));
|
||||
offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep);
|
||||
offset = dissect_ndr_pointer_cb(
|
||||
tvb, offset, pinfo, tree, drep,
|
||||
|
|
@ -2520,7 +2520,7 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
|
|||
GINT_TO_POINTER(CB_STR_COL_INFO |CB_STR_SAVE | 1));
|
||||
|
||||
debugprintf("1)Len %d offset %d txt %s\n",(int) strlen(dcv->private_data),offset,(char*)dcv->private_data);
|
||||
vars->client_name = se_strdup(dcv->private_data);
|
||||
vars->client_name = se_strdup((const guint8 *)dcv->private_data);
|
||||
debugprintf("2)Len %d offset %d txt %s\n",(int) strlen(dcv->private_data),offset,vars->client_name);
|
||||
|
||||
offset = dissect_dcerpc_8bytes(tvb, offset, pinfo, tree, drep,
|
||||
|
|
@ -2533,7 +2533,7 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
|
|||
|
||||
generate_hash_key(pinfo,0,key,NULL);
|
||||
existing_vars = NULL;
|
||||
existing_vars = g_hash_table_lookup(netlogon_auths, key);
|
||||
existing_vars = (netlogon_auth_vars *)g_hash_table_lookup(netlogon_auths, key);
|
||||
if (!existing_vars) {
|
||||
debugprintf("Adding initial vars with this start packet = %d\n",vars->start);
|
||||
g_hash_table_insert(netlogon_auths, key, vars);
|
||||
|
|
@ -2586,7 +2586,7 @@ netlogon_dissect_netrserverreqchallenge_reply(tvbuff_t *tvb, int offset,
|
|||
guint64 server_challenge;
|
||||
|
||||
generate_hash_key(pinfo,1,&key,NULL);
|
||||
vars = g_hash_table_lookup(netlogon_auths,(gconstpointer*) &key);
|
||||
vars = (netlogon_auth_vars *)g_hash_table_lookup(netlogon_auths,(gconstpointer*) &key);
|
||||
|
||||
offset = dissect_dcerpc_8bytes(tvb, offset, pinfo, tree, drep,
|
||||
hf_server_challenge, &server_challenge);
|
||||
|
|
@ -2693,7 +2693,7 @@ netlogon_dissect_ENCRYPTED_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect.*/
|
||||
return offset;
|
||||
|
|
@ -2822,7 +2822,7 @@ netlogon_dissect_SENSITIVE_DATA(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 data_len;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -3189,7 +3189,7 @@ netlogon_dissect_DELTA_RENAME(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
|
||||
offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, 0);
|
||||
|
|
@ -3792,7 +3792,7 @@ netlogon_dissect_CIPHER_VALUE_DATA(tvbuff_t *tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 data_len;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -4462,7 +4462,7 @@ netlogon_dissect_UAS_INFO_0(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -5212,7 +5212,7 @@ netlogon_dissect_DOMAIN_TRUST_FLAGS(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -5283,7 +5283,7 @@ netlogon_dissect_DOMAIN_TRUST_ATTRIBS(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -5413,7 +5413,7 @@ netlogon_dissect_GET_DCNAME_REQUEST_FLAGS(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -5543,7 +5543,7 @@ netlogon_dissect_DC_FLAGS(tvbuff_t *tvb, int offset,
|
|||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -5597,7 +5597,7 @@ netlogon_dissect_pointer_long(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, NULL);
|
||||
return offset;
|
||||
|
|
@ -5611,7 +5611,7 @@ netlogon_dissect_pointer_char(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, NULL);
|
||||
return offset;
|
||||
|
|
@ -5722,7 +5722,7 @@ dissect_ndr_trust_extension(tvbuff_t *tvb, int offset,
|
|||
guint32 len,max;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -5759,7 +5759,7 @@ netlogon_dissect_BLOB_array(tvbuff_t *tvb, int offset,
|
|||
guint32 len;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -5779,7 +5779,7 @@ dissect_ndr_ulongs_as_counted_string(tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree,
|
||||
guint8 *drep, int hf_index)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint16 len, size;
|
||||
gboolean add_subtree = TRUE; /* Manage room for evolution*/
|
||||
proto_item *item;
|
||||
|
|
@ -5931,7 +5931,7 @@ netlogon_dissect_LSA_POLICY_INFO(tvbuff_t *tvb _U_, int offset,
|
|||
guint32 len;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
return offset;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ dissect_ndr_counted_string_cb(tvbuff_t *tvb, int offset,
|
|||
dcerpc_callback_fnct_t *callback,
|
||||
void *callback_args)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint16 len, size;
|
||||
|
||||
/* Structure starts with short, but is aligned for pointer */
|
||||
|
|
@ -270,7 +270,7 @@ dissect_ndr_counted_string_ptr(tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree,
|
||||
guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
return dissect_ndr_counted_string_helper(
|
||||
tvb, offset, pinfo, tree, drep, di->hf_index, 0, FALSE);
|
||||
|
|
@ -289,7 +289,7 @@ dissect_ndr_counted_byte_array_cb(tvbuff_t *tvb, int offset,
|
|||
dcerpc_callback_fnct_t *callback,
|
||||
void *callback_args)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
guint16 len, size;
|
||||
|
|
@ -399,7 +399,7 @@ dissect_ndr_counted_ascii_string_cb(tvbuff_t *tvb, int offset,
|
|||
dcerpc_callback_fnct_t *callback,
|
||||
void *callback_args)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
guint16 len, size;
|
||||
|
|
@ -475,7 +475,7 @@ dissect_ndr_lsa_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
header_field_info *hf_info;
|
||||
|
||||
|
|
@ -517,9 +517,7 @@ dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree,
|
||||
guint8 *drep _U_, int hf_index)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -619,7 +617,7 @@ static pol_value *find_pol_handle(e_ctx_hnd *policy_hnd, guint32 frame,
|
|||
pol_value *pol;
|
||||
|
||||
memcpy(&key.policy_hnd, policy_hnd, sizeof(key.policy_hnd));
|
||||
if ((*valuep = g_hash_table_lookup(pol_hash, &key))) {
|
||||
if ((*valuep = (pol_hash_value *)g_hash_table_lookup(pol_hash, &key))) {
|
||||
/*
|
||||
* Look for the first value such that both:
|
||||
*
|
||||
|
|
@ -667,10 +665,10 @@ static void add_pol_handle(e_ctx_hnd *policy_hnd, guint32 frame,
|
|||
* and put the hash value in the policy handle hash
|
||||
* table.
|
||||
*/
|
||||
value = se_alloc(sizeof(pol_hash_value));
|
||||
value = (pol_hash_value *)se_alloc(sizeof(pol_hash_value));
|
||||
value->list = pol;
|
||||
pol->next = NULL;
|
||||
key = se_alloc(sizeof(pol_hash_key));
|
||||
key = (pol_hash_key *)se_alloc(sizeof(pol_hash_key));
|
||||
memcpy(&key->policy_hnd, policy_hnd, sizeof(key->policy_hnd));
|
||||
g_hash_table_insert(pol_hash, key, value);
|
||||
} else {
|
||||
|
|
@ -767,7 +765,7 @@ void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo,
|
|||
|
||||
/* Create a new value */
|
||||
|
||||
pol = se_alloc(sizeof(pol_value));
|
||||
pol = (pol_value *)se_alloc(sizeof(pol_value));
|
||||
|
||||
pol->open_frame = is_open ? pinfo->fd->num : 0;
|
||||
pol->close_frame = is_close ? pinfo->fd->num : 0;
|
||||
|
|
@ -849,7 +847,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
|
|||
|
||||
/* Create a new value */
|
||||
|
||||
pol = se_alloc(sizeof(pol_value));
|
||||
pol = (pol_value *)se_alloc(sizeof(pol_value));
|
||||
|
||||
pol->open_frame = 0;
|
||||
pol->close_frame = 0;
|
||||
|
|
@ -1005,9 +1003,7 @@ dissect_nt_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
guint32 open_frame = 0, close_frame = 0;
|
||||
char *name;
|
||||
int old_offset = offset;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*
|
||||
* just a run to handle conformant arrays, no scalars to
|
||||
|
|
@ -1124,9 +1120,7 @@ PIDL_dissect_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
guint32 param)
|
||||
{
|
||||
e_ctx_hnd policy_hnd;
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
|
||||
offset=dissect_nt_hnd(tvb, offset, pinfo,
|
||||
tree, drep, hfindex,
|
||||
|
|
@ -1147,7 +1141,7 @@ PIDL_dissect_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_call_value *dcv;
|
||||
|
||||
dcv = (dcerpc_call_value *)di->call_data;
|
||||
pol_name = dcv->private_data;
|
||||
pol_name = (const char *)dcv->private_data;
|
||||
if(!pol_name){
|
||||
pol_name="<...>";
|
||||
}
|
||||
|
|
@ -1163,7 +1157,7 @@ PIDL_dissect_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
|
||||
dcv = (dcerpc_call_value *)di->call_data;
|
||||
if(!dcv->pol){
|
||||
dcv->pol=se_memdup(&policy_hnd, sizeof(e_ctx_hnd));
|
||||
dcv->pol=(e_ctx_hnd *)se_memdup(&policy_hnd, sizeof(e_ctx_hnd));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1215,9 +1209,7 @@ dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
proto_tree *tree, guint8 *drep,
|
||||
int hfindex, int length, const guint8 **pdata)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -1250,9 +1242,7 @@ dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
proto_tree *tree, guint8 *drep,
|
||||
int hfindex, int length)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -1471,7 +1461,7 @@ dissect_ndr_nt_SID_with_options(tvbuff_t *tvb, int offset, packet_info *pinfo, p
|
|||
offset=dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
|
||||
|
||||
if(dcv && dcv->private_data){
|
||||
char *s=dcv->private_data;
|
||||
char *s=(char *)dcv->private_data;
|
||||
proto_item *item=(proto_item *)tree;
|
||||
|
||||
if ((options & CB_STR_COL_INFO)&&(!di->conformant_run)) {
|
||||
|
|
@ -1745,7 +1735,7 @@ dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset,
|
|||
guint32 count;
|
||||
proto_item *item=NULL;
|
||||
proto_tree *tree=NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset=offset;
|
||||
|
||||
if(parent_tree){
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ dissect_error_status_t (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
const char *st_str;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -179,7 +179,7 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In
|
|||
guint32 string_size;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -243,7 +243,7 @@ dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset,
|
|||
typedef bitset sec_rgy_pgo_flags_t;
|
||||
*/
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -344,7 +344,7 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset,
|
|||
e_uuid_t uuid1;
|
||||
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -400,7 +400,7 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset,
|
|||
guint32 string_size;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -462,7 +462,7 @@ dissect_sec_rgy_domain_t (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 domain_t;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -514,7 +514,7 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset,
|
|||
e_uuid_t id;
|
||||
guint32 unix_num, quota;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -579,7 +579,7 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset,
|
|||
e_uuid_t source;
|
||||
guint32 handle, valid;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -637,7 +637,7 @@ dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint8 query_t;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -703,7 +703,7 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
e_uuid_t id;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -754,7 +754,7 @@ dissect_rs_pgo_result_t (tvbuff_t * tvb, int offset,
|
|||
int old_offset = offset;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -800,7 +800,7 @@ r
|
|||
dcerpc_info *di;
|
||||
guint32 rs_pgo_unix_num_key_t;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -870,7 +870,7 @@ dissect_rs_pgo_query_key_t (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint16 query_t;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -946,7 +946,7 @@ dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset,
|
|||
} rs_pgo_query_result_t;
|
||||
*/
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -992,7 +992,7 @@ rs_pgo_dissect_add_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1022,7 +1022,7 @@ rs_pgo_dissect_add_resp (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
gint buff_remain;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1056,7 +1056,7 @@ rs_pgo_dissect_delete_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1080,7 +1080,7 @@ rs_pgo_dissect_delete_resp (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
gint buff_remain;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1116,7 +1116,7 @@ rs_pgo_dissect_replace_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1144,7 +1144,7 @@ rs_pgo_dissect_replace_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1177,7 +1177,7 @@ rs_pgo_dissect_add_member_rqst (tvbuff_t * tvb, int offset,
|
|||
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1206,7 +1206,7 @@ rs_pgo_dissect_rename_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1232,7 +1232,7 @@ rs_pgo_dissect_rename_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1263,7 +1263,7 @@ rs_pgo_dissect_add_member_resp (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
gint buff_remain;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1300,7 +1300,7 @@ rs_pgo_dissect_delete_member_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1332,7 +1332,7 @@ rs_pgo_dissect_get_members_rqst (tvbuff_t * tvb, int offset,
|
|||
guint32 max_members;
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1369,7 +1369,7 @@ rs_pgo_dissect_key_transfer_rqst (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1399,7 +1399,7 @@ rs_pgo_dissect_key_transfer_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1435,7 +1435,7 @@ rs_pgo_dissect_is_member_resp (tvbuff_t * tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1470,7 +1470,7 @@ rs_pgo_dissect_is_member_rqst (tvbuff_t * tvb, int offset,
|
|||
*/
|
||||
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1496,7 +1496,7 @@ rs_pgo_dissect_get_rqst (tvbuff_t * tvb, int offset,
|
|||
dcerpc_info *di;
|
||||
guint32 allow_aliases;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1541,7 +1541,7 @@ rs_pgo_dissect_get_resp (tvbuff_t * tvb, int offset,
|
|||
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
@ -1578,7 +1578,7 @@ rs_pgo_dissect_delete_member_resp (tvbuff_t * tvb, int offset,
|
|||
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run)
|
||||
{
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -2142,7 +2142,7 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
|
|||
dcerpc_call_value *dcv = NULL;
|
||||
guint32 type=0;
|
||||
struct access_mask_info *ami=NULL;
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -2183,7 +2183,7 @@ cnf_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
|
|||
{
|
||||
guint64 len;
|
||||
dcerpc_info *di;
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -2257,7 +2257,7 @@ samr_dissect_struct_lsa_Strings(tvbuff_t *tvb _U_, int offset _U_, packet_info *
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -2630,7 +2630,7 @@ samr_dissect_struct_SamEntry(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -2700,7 +2700,7 @@ samr_dissect_struct_SamArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -2939,7 +2939,7 @@ samr_dissect_struct_DomInfo1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -3080,7 +3080,7 @@ samr_dissect_struct_DomGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, pac
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -3143,7 +3143,7 @@ samr_dissect_struct_DomInfo3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -3186,7 +3186,7 @@ samr_dissect_struct_DomOEMInformation(tvbuff_t *tvb _U_, int offset _U_, packet_
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -3229,7 +3229,7 @@ samr_dissect_struct_DomInfo5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -3272,7 +3272,7 @@ samr_dissect_struct_DomInfo6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -3315,7 +3315,7 @@ samr_dissect_struct_DomInfo7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -3367,7 +3367,7 @@ samr_dissect_struct_DomInfo8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -3412,7 +3412,7 @@ samr_dissect_struct_DomInfo9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -3482,7 +3482,7 @@ samr_dissect_struct_DomGeneralInformation2(tvbuff_t *tvb _U_, int offset _U_, pa
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -3549,7 +3549,7 @@ samr_dissect_struct_DomInfo12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -3614,7 +3614,7 @@ samr_dissect_struct_DomInfo13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -3869,7 +3869,7 @@ samr_dissect_struct_Ids(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4035,7 +4035,7 @@ samr_dissect_struct_GroupInfoAll(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4084,7 +4084,7 @@ samr_dissect_struct_GroupInfoAttributes(tvbuff_t *tvb _U_, int offset _U_, packe
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -4127,7 +4127,7 @@ samr_dissect_struct_GroupInfoDescription(tvbuff_t *tvb _U_, int offset _U_, pack
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4335,7 +4335,7 @@ samr_dissect_struct_RidTypeArray(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4400,7 +4400,7 @@ samr_dissect_struct_AliasInfoAll(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4611,7 +4611,7 @@ samr_dissect_struct_UserInfo1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4689,7 +4689,7 @@ samr_dissect_struct_UserInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4763,7 +4763,7 @@ samr_dissect_struct_LogonHours(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -4961,7 +4961,7 @@ samr_dissect_struct_UserInfo3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5038,7 +5038,7 @@ samr_dissect_struct_UserInfo4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5234,7 +5234,7 @@ samr_dissect_struct_UserInfo5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5320,7 +5320,7 @@ samr_dissect_struct_UserInfo6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5365,7 +5365,7 @@ samr_dissect_struct_UserInfo7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5408,7 +5408,7 @@ samr_dissect_struct_UserInfo8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5451,7 +5451,7 @@ samr_dissect_struct_UserInfo9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -5503,7 +5503,7 @@ samr_dissect_struct_UserInfo10(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5548,7 +5548,7 @@ samr_dissect_struct_UserInfo11(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5591,7 +5591,7 @@ samr_dissect_struct_UserInfo12(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5634,7 +5634,7 @@ samr_dissect_struct_UserInfo13(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5677,7 +5677,7 @@ samr_dissect_struct_UserInfo14(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -5720,7 +5720,7 @@ samr_dissect_struct_UserInfo16(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -5763,7 +5763,7 @@ samr_dissect_struct_UserInfo17(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -5934,7 +5934,7 @@ samr_dissect_struct_UserInfo20(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -6591,7 +6591,7 @@ samr_dissect_struct_UserInfo21(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -6756,7 +6756,7 @@ samr_dissect_struct_UserInfo23(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -6905,7 +6905,7 @@ samr_dissect_struct_UserInfo25(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7333,7 +7333,7 @@ samr_dissect_struct_RidWithAttribute(tvbuff_t *tvb _U_, int offset _U_, packet_i
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -7403,7 +7403,7 @@ samr_dissect_struct_RidWithAttributeArray(tvbuff_t *tvb _U_, int offset _U_, pac
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7493,7 +7493,7 @@ samr_dissect_struct_DispEntryGeneral(tvbuff_t *tvb _U_, int offset _U_, packet_i
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7571,7 +7571,7 @@ samr_dissect_struct_DispInfoGeneral(tvbuff_t *tvb _U_, int offset _U_, packet_in
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7652,7 +7652,7 @@ samr_dissect_struct_DispEntryFull(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7728,7 +7728,7 @@ samr_dissect_struct_DispInfoFull(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7809,7 +7809,7 @@ samr_dissect_struct_DispEntryFullGroup(tvbuff_t *tvb _U_, int offset _U_, packet
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7885,7 +7885,7 @@ samr_dissect_struct_DispInfoFullGroups(tvbuff_t *tvb _U_, int offset _U_, packet
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -7939,7 +7939,7 @@ samr_dissect_struct_DispEntryAscii(tvbuff_t *tvb _U_, int offset _U_, packet_inf
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -8009,7 +8009,7 @@ samr_dissect_struct_DispInfoAscii(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -8178,7 +8178,7 @@ samr_dissect_struct_PwInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -8262,7 +8262,7 @@ samr_dissect_struct_ChangeReject(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -8318,7 +8318,7 @@ samr_dissect_struct_ConnectInfo1(tvbuff_t *tvb _U_, int offset _U_, packet_info
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_4_BYTES;
|
||||
|
|
@ -8563,7 +8563,7 @@ samr_dissect_struct_ValidationBlob(tvbuff_t *tvb _U_, int offset _U_, packet_inf
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_5_BYTES;
|
||||
|
|
@ -8678,7 +8678,7 @@ samr_dissect_struct_ValidatePasswordInfo(tvbuff_t *tvb _U_, int offset _U_, pack
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -8742,7 +8742,7 @@ samr_dissect_struct_ValidatePasswordRepCtr(tvbuff_t *tvb _U_, int offset _U_, pa
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -8898,7 +8898,7 @@ samr_dissect_struct_ValidatePasswordReq3(tvbuff_t *tvb _U_, int offset _U_, pack
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -8987,7 +8987,7 @@ samr_dissect_struct_ValidatePasswordReq2(tvbuff_t *tvb _U_, int offset _U_, pack
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
@ -9047,7 +9047,7 @@ samr_dissect_struct_ValidatePasswordReq1(tvbuff_t *tvb _U_, int offset _U_, pack
|
|||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
int old_offset;
|
||||
|
||||
ALIGN_TO_8_BYTES;
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ static int
|
|||
dissect_spoolss_buffer_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
BUFFER *b = (BUFFER *)di->private_data;
|
||||
proto_item *item;
|
||||
guint32 size;
|
||||
|
|
@ -470,7 +470,7 @@ static int
|
|||
dissect_spoolss_buffer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep, BUFFER *b)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (b)
|
||||
memset(b, 0, sizeof(BUFFER));
|
||||
|
|
@ -489,7 +489,7 @@ static int
|
|||
dissect_spoolss_string_parm_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 buffer_len, len;
|
||||
gchar *s;
|
||||
proto_item *item = NULL;
|
||||
|
|
@ -816,7 +816,7 @@ SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset,
|
|||
hf_printerdata_type, &type);
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
const char *data = dcv->se_data ? dcv->se_data : "????";
|
||||
const char *data = (const char *)(dcv->se_data ? dcv->se_data : "????");
|
||||
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", data);
|
||||
}
|
||||
|
|
@ -1538,7 +1538,7 @@ static int
|
|||
dissect_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
guint16 driver_extra;
|
||||
|
|
@ -2489,7 +2489,7 @@ dissect_PRINTER_DATATYPE(tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree,
|
||||
guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->conformant_run)
|
||||
return offset;
|
||||
|
|
@ -2567,7 +2567,7 @@ dissect_USER_LEVEL_CTR(tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree,
|
||||
guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
guint32 level;
|
||||
|
|
@ -2621,7 +2621,7 @@ SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
|
|||
dissect_ndr_wchar_cvstring, NDR_POINTER_UNIQUE,
|
||||
"Printer name", hf_printername, cb_wstr_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
|
||||
name = dcv->private_data;
|
||||
name = (char *)dcv->private_data;
|
||||
|
||||
/* OpenPrinterEx() stores the key/value in se_data */
|
||||
if(!pinfo->fd->flags.visited){
|
||||
|
|
@ -2638,7 +2638,7 @@ SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
|
|||
|
||||
offset = dissect_DEVMODE_CTR(tvb, offset, pinfo, tree, drep);
|
||||
|
||||
name=dcv->se_data;
|
||||
name=(char *)dcv->se_data;
|
||||
if (name) {
|
||||
if (name[0] == '\\' && name[1] == '\\')
|
||||
name += 2;
|
||||
|
|
@ -2808,7 +2808,7 @@ static int
|
|||
dissect_NOTIFY_OPTION_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
|
||||
guint32 count, i;
|
||||
guint16 type;
|
||||
|
|
@ -2943,7 +2943,7 @@ dissect_NOTIFY_OPTIONS_ARRAY_CTR(tvbuff_t *tvb, int offset,
|
|||
packet_info *pinfo, proto_tree *tree,
|
||||
guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->conformant_run)
|
||||
return offset;
|
||||
|
|
@ -5089,7 +5089,7 @@ static int
|
|||
dissect_spoolss_doc_info_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->conformant_run)
|
||||
return offset;
|
||||
|
|
@ -6363,7 +6363,7 @@ static int
|
|||
dissect_NOTIFY_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 count;
|
||||
|
||||
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
|
||||
|
|
@ -6606,7 +6606,7 @@ static int
|
|||
dissect_spoolss_keybuffer(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di = pinfo->private_data;
|
||||
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
|
||||
guint32 size;
|
||||
int end_offset;
|
||||
|
||||
|
|
|
|||
|
|
@ -2078,8 +2078,7 @@ static int
|
|||
srvsvc_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
guint32 len;
|
||||
dcerpc_info *di;
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -2119,8 +2118,7 @@ srvsvc_dissect_element_NetShareInfo502_sd_(tvbuff_t *tvb, int offset, packet_inf
|
|||
static int
|
||||
srvsvc_dissect_ServerType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
@ -2142,8 +2140,7 @@ srvsvc_dissect_element_NetSrvInfo102_server_type(tvbuff_t *tvb, int offset, pack
|
|||
static int
|
||||
srvsvc_dissect_secinfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep _U_)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
di=pinfo->private_data;
|
||||
dcerpc_info *di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/*just a run to handle conformant arrays, nothing to dissect */
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ svcctl_dissect_pointer_long(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
||||
di->hf_index, NULL);
|
||||
return offset;
|
||||
|
|
@ -261,7 +261,7 @@ svcctl_dissect_OpenSCManager_rqst(tvbuff_t *tvb, int offset,
|
|||
dissect_ndr_char_cvstring, NDR_POINTER_UNIQUE,
|
||||
"MachineName", hf_svcctl_machinename, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
|
||||
mn=dcv->private_data;
|
||||
mn=(const char *)dcv->private_data;
|
||||
if(!mn)
|
||||
mn="";
|
||||
|
||||
|
|
@ -272,7 +272,7 @@ svcctl_dissect_OpenSCManager_rqst(tvbuff_t *tvb, int offset,
|
|||
dissect_ndr_char_cvstring, NDR_POINTER_UNIQUE,
|
||||
"Database", hf_svcctl_database, cb_str_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
dn=dcv->private_data;
|
||||
dn=(const char *)dcv->private_data;
|
||||
if(!dn)
|
||||
dn="";
|
||||
|
||||
|
|
@ -347,7 +347,7 @@ svcctl_dissect_OpenSCManagerW_rqst(tvbuff_t *tvb, int offset,
|
|||
dissect_ndr_wchar_cvstring, NDR_POINTER_UNIQUE,
|
||||
"MachineName", hf_svcctl_machinename, cb_wstr_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
|
||||
mn=dcv->private_data;
|
||||
mn=(const char *)dcv->private_data;
|
||||
if(!mn)
|
||||
mn="";
|
||||
|
||||
|
|
@ -358,7 +358,7 @@ svcctl_dissect_OpenSCManagerW_rqst(tvbuff_t *tvb, int offset,
|
|||
dissect_ndr_wchar_cvstring, NDR_POINTER_UNIQUE,
|
||||
"Database", hf_svcctl_database, cb_wstr_postprocess,
|
||||
GINT_TO_POINTER(CB_STR_COL_INFO | 1));
|
||||
dn=dcv->private_data;
|
||||
dn=(const char *)dcv->private_data;
|
||||
if(!dn)
|
||||
dn="";
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset,
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di=pinfo->private_data;
|
||||
di=(dcerpc_info *)pinfo->private_data;
|
||||
if(di->conformant_run){
|
||||
/* this call is to make wireshark eat the array header for the conformant run */
|
||||
offset =dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, NULL);
|
||||
|
|
|
|||
|
|
@ -806,8 +806,8 @@ void
|
|||
dcerpc_init_uuid(int proto, int ett, e_uuid_t *uuid, guint16 ver,
|
||||
dcerpc_sub_dissector *procs, int opnum_hf)
|
||||
{
|
||||
dcerpc_uuid_key *key = g_malloc(sizeof (*key));
|
||||
dcerpc_uuid_value *value = g_malloc(sizeof (*value));
|
||||
dcerpc_uuid_key *key = (dcerpc_uuid_key *)g_malloc(sizeof (*key));
|
||||
dcerpc_uuid_value *value = (dcerpc_uuid_value *)g_malloc(sizeof (*value));
|
||||
header_field_info *hf_info;
|
||||
module_t *samr_module;
|
||||
const char *filter_name = proto_get_protocol_filter_name(proto);
|
||||
|
|
@ -849,7 +849,7 @@ dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver)
|
|||
|
||||
key.uuid = *uuid;
|
||||
key.ver = ver;
|
||||
if (!(sub_proto = g_hash_table_lookup(dcerpc_uuids, &key))) {
|
||||
if (!(sub_proto = (dcerpc_uuid_value *)g_hash_table_lookup(dcerpc_uuids, &key))) {
|
||||
return NULL;
|
||||
}
|
||||
return sub_proto->name;
|
||||
|
|
@ -866,7 +866,7 @@ dcerpc_get_proto_hf_opnum(e_uuid_t *uuid, guint16 ver)
|
|||
|
||||
key.uuid = *uuid;
|
||||
key.ver = ver;
|
||||
if (!(sub_proto = g_hash_table_lookup(dcerpc_uuids, &key))) {
|
||||
if (!(sub_proto = (dcerpc_uuid_value *)g_hash_table_lookup(dcerpc_uuids, &key))) {
|
||||
return -1;
|
||||
}
|
||||
return sub_proto->opnum_hf;
|
||||
|
|
@ -891,7 +891,7 @@ again:
|
|||
}
|
||||
|
||||
if (!vs) {
|
||||
vs = wmem_alloc(wmem_epan_scope(), (num_sd + 1) * sizeof(value_string));
|
||||
vs = (value_string *)wmem_alloc(wmem_epan_scope(), (num_sd + 1) * sizeof(value_string));
|
||||
goto again;
|
||||
}
|
||||
|
||||
|
|
@ -912,7 +912,7 @@ dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver)
|
|||
|
||||
key.uuid = *uuid;
|
||||
key.ver = ver;
|
||||
if (!(sub_proto = g_hash_table_lookup(dcerpc_uuids, &key))) {
|
||||
if (!(sub_proto = (dcerpc_uuid_value *)g_hash_table_lookup(dcerpc_uuids, &key))) {
|
||||
return NULL;
|
||||
}
|
||||
return sub_proto->procs;
|
||||
|
|
@ -1314,7 +1314,7 @@ dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
int old_offset;
|
||||
int conformance_size = 4;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->call_data->flags & DCERPC_IS_NDR64) {
|
||||
conformance_size = 8;
|
||||
|
|
@ -1355,7 +1355,7 @@ dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
int old_offset;
|
||||
int conformance_size = 4;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->call_data->flags & DCERPC_IS_NDR64) {
|
||||
conformance_size = 8;
|
||||
|
|
@ -1412,7 +1412,7 @@ dissect_ndr_uvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
int old_offset;
|
||||
int conformance_size = 4;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
if (di->call_data->flags & DCERPC_IS_NDR64) {
|
||||
conformance_size = 8;
|
||||
|
|
@ -1472,7 +1472,7 @@ dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
dcerpc_info *di;
|
||||
guint64 len;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -1522,7 +1522,7 @@ dissect_ndr_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
char *s;
|
||||
header_field_info *hfinfo;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -1621,7 +1621,7 @@ dissect_ndr_char_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
return dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
|
||||
sizeof(guint8), di->hf_index,
|
||||
|
|
@ -1642,7 +1642,7 @@ dissect_ndr_wchar_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
return dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
|
||||
sizeof(guint16), di->hf_index,
|
||||
|
|
@ -1659,7 +1659,7 @@ PIDL_dissect_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
|
|||
char *s = NULL;
|
||||
gint levels = CB_STR_ITEM_LEVELS(param);
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
|
||||
chsize, hfindex,
|
||||
|
|
@ -1715,7 +1715,7 @@ dissect_ndr_vstring(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
char *s;
|
||||
header_field_info *hfinfo;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* just a run to handle conformant arrays, no scalars to dissect */
|
||||
return offset;
|
||||
|
|
@ -1810,7 +1810,7 @@ dissect_ndr_char_vstring(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
return dissect_ndr_vstring(tvb, offset, pinfo, tree, drep,
|
||||
sizeof(guint8), di->hf_index,
|
||||
|
|
@ -1831,7 +1831,7 @@ dissect_ndr_wchar_vstring(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
proto_tree *tree, guint8 *drep)
|
||||
{
|
||||
dcerpc_info *di;
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
|
||||
return dissect_ndr_vstring(tvb, offset, pinfo, tree, drep,
|
||||
sizeof(guint16), di->hf_index,
|
||||
|
|
@ -1866,13 +1866,11 @@ init_ndr_pointer_list(packet_info *pinfo)
|
|||
{
|
||||
dcerpc_info *di;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
di->conformant_run = 0;
|
||||
|
||||
while (ndr_pointer_list) {
|
||||
ndr_pointer_data_t *npd;
|
||||
|
||||
npd = g_slist_nth_data(ndr_pointer_list, 0);
|
||||
ndr_pointer_data_t *npd = (ndr_pointer_data_t *)g_slist_nth_data(ndr_pointer_list, 0);
|
||||
ndr_pointer_list = g_slist_remove(ndr_pointer_list, npd);
|
||||
g_free(npd);
|
||||
}
|
||||
|
|
@ -1891,15 +1889,14 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, guint8
|
|||
int next_pointer;
|
||||
|
||||
next_pointer = 0;
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
do{
|
||||
int i, len;
|
||||
|
||||
found_new_pointer = 0;
|
||||
len = g_slist_length(ndr_pointer_list);
|
||||
for(i=next_pointer; i<len; i++) {
|
||||
ndr_pointer_data_t *tnpd;
|
||||
tnpd = g_slist_nth_data(ndr_pointer_list, i);
|
||||
ndr_pointer_data_t *tnpd = (ndr_pointer_data_t *)g_slist_nth_data(ndr_pointer_list, i);
|
||||
if (tnpd->fnct) {
|
||||
dcerpc_dissect_fnct_t *fnct;
|
||||
|
||||
|
|
@ -1953,7 +1950,7 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, guint8
|
|||
*
|
||||
* dcerpc_info *di;
|
||||
*
|
||||
* di = pinfo->private_data;
|
||||
* di = (dcerpc_info *)pinfo->private_data;
|
||||
* if (di->conformant_run) {
|
||||
* return offset;
|
||||
* }
|
||||
|
|
@ -1991,7 +1988,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, proto_item *item,
|
|||
dcerpc_info *di;
|
||||
dcerpc_call_value *value;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
value = di->call_data;
|
||||
|
||||
if (di->ptype == PDU_REQ) {
|
||||
|
|
@ -2016,7 +2013,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, proto_item *item,
|
|||
}
|
||||
}
|
||||
|
||||
npd = g_malloc(sizeof(ndr_pointer_data_t));
|
||||
npd = (ndr_pointer_data_t *)g_malloc(sizeof(ndr_pointer_data_t));
|
||||
npd->id = id;
|
||||
npd->tree = tree;
|
||||
npd->item = item;
|
||||
|
|
@ -2038,7 +2035,7 @@ find_pointer_index(guint32 id)
|
|||
|
||||
len = g_slist_length(ndr_pointer_list);
|
||||
for(i=0; i<len; i++) {
|
||||
npd = g_slist_nth_data(ndr_pointer_list, i);
|
||||
npd = (ndr_pointer_data_t *)g_slist_nth_data(ndr_pointer_list, i);
|
||||
if (npd) {
|
||||
if (npd->id == id) {
|
||||
return i;
|
||||
|
|
@ -2079,7 +2076,7 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
gint start_offset = offset;
|
||||
int pointer_size = 4;
|
||||
|
||||
di = pinfo->private_data;
|
||||
di = (dcerpc_info *)pinfo->private_data;
|
||||
if (di->conformant_run) {
|
||||
/* this call was only for dissecting the header for any
|
||||
embedded conformant array. we will not parse any
|
||||
|
|
@ -2416,7 +2413,7 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree,
|
|||
key.uuid = info->call_data->uuid;
|
||||
key.ver = info->call_data->ver;
|
||||
|
||||
if ((sub_proto = g_hash_table_lookup(dcerpc_uuids, &key)) == NULL
|
||||
if ((sub_proto = (dcerpc_uuid_value *)g_hash_table_lookup(dcerpc_uuids, &key)) == NULL
|
||||
|| !proto_is_protocol_enabled(sub_proto->proto)) {
|
||||
/*
|
||||
* We don't have a dissector for this UUID, or the protocol
|
||||
|
|
@ -2944,12 +2941,12 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
dcerpc_bind_key *key;
|
||||
dcerpc_bind_value *value;
|
||||
|
||||
key = se_alloc(sizeof (dcerpc_bind_key));
|
||||
key = (dcerpc_bind_key *)se_alloc(sizeof (dcerpc_bind_key));
|
||||
key->conv = conv;
|
||||
key->ctx_id = ctx_id;
|
||||
key->smb_fid = dcerpc_get_transport_salt(pinfo);
|
||||
|
||||
value = se_alloc(sizeof (dcerpc_bind_value));
|
||||
value = (dcerpc_bind_value *)se_alloc(sizeof (dcerpc_bind_value));
|
||||
value->uuid = if_id;
|
||||
value->ver = if_ver;
|
||||
value->transport = trans_id;
|
||||
|
|
@ -3401,7 +3398,7 @@ dcerpc_add_conv_to_bind_table(decode_dcerpc_bind_values_t *binding)
|
|||
0);
|
||||
}
|
||||
|
||||
bind_value = se_alloc(sizeof (dcerpc_bind_value));
|
||||
bind_value = (dcerpc_bind_value *)se_alloc(sizeof (dcerpc_bind_value));
|
||||
bind_value->uuid = binding->uuid;
|
||||
bind_value->ver = binding->ver;
|
||||
/* For now, assume all DCE/RPC we pick from "decode as" is using
|
||||
|
|
@ -3410,7 +3407,7 @@ dcerpc_add_conv_to_bind_table(decode_dcerpc_bind_values_t *binding)
|
|||
*/
|
||||
bind_value->transport = uuid_data_repr_proto;
|
||||
|
||||
key = se_alloc(sizeof (dcerpc_bind_key));
|
||||
key = (dcerpc_bind_key *)se_alloc(sizeof (dcerpc_bind_key));
|
||||
key->conv = conv;
|
||||
key->ctx_id = binding->ctx_id;
|
||||
key->smb_fid = binding->smb_fid;
|
||||
|
|
@ -3486,7 +3483,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
*/
|
||||
matched_key.frame = pinfo->fd->num;
|
||||
matched_key.call_id = hdr->call_id;
|
||||
value = g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
if (!value) {
|
||||
dcerpc_bind_key bind_key;
|
||||
dcerpc_bind_value *bind_value;
|
||||
|
|
@ -3495,7 +3492,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
bind_key.ctx_id = ctx_id;
|
||||
bind_key.smb_fid = dcerpc_get_transport_salt(pinfo);
|
||||
|
||||
if ((bind_value = g_hash_table_lookup(dcerpc_binds, &bind_key)) ) {
|
||||
if ((bind_value = (dcerpc_bind_value *)g_hash_table_lookup(dcerpc_binds, &bind_key)) ) {
|
||||
if (!(hdr->flags&PFC_FIRST_FRAG)) {
|
||||
dcerpc_cn_call_key call_key;
|
||||
dcerpc_call_value *call_value;
|
||||
|
|
@ -3503,8 +3500,8 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
call_key.conv = conv;
|
||||
call_key.call_id = hdr->call_id;
|
||||
call_key.smb_fid = dcerpc_get_transport_salt(pinfo);
|
||||
if ((call_value = g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
|
||||
new_matched_key = se_alloc(sizeof (dcerpc_matched_key));
|
||||
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
|
||||
new_matched_key = (dcerpc_matched_key *)se_alloc(sizeof (dcerpc_matched_key));
|
||||
*new_matched_key = matched_key;
|
||||
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
|
||||
value = call_value;
|
||||
|
|
@ -3518,7 +3515,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
the call to both the call table and the
|
||||
matched table
|
||||
*/
|
||||
call_key = se_alloc(sizeof (dcerpc_cn_call_key));
|
||||
call_key = (dcerpc_cn_call_key *)se_alloc(sizeof (dcerpc_cn_call_key));
|
||||
call_key->conv = conv;
|
||||
call_key->call_id = hdr->call_id;
|
||||
call_key->smb_fid = dcerpc_get_transport_salt(pinfo);
|
||||
|
|
@ -3529,7 +3526,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
g_hash_table_remove(dcerpc_cn_calls, call_key);
|
||||
}
|
||||
|
||||
call_value = se_alloc(sizeof (dcerpc_call_value));
|
||||
call_value = (dcerpc_call_value *)se_alloc(sizeof (dcerpc_call_value));
|
||||
call_value->uuid = bind_value->uuid;
|
||||
call_value->ver = bind_value->ver;
|
||||
call_value->object_uuid = obj_id;
|
||||
|
|
@ -3548,7 +3545,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
|
||||
g_hash_table_insert(dcerpc_cn_calls, call_key, call_value);
|
||||
|
||||
new_matched_key = se_alloc(sizeof (dcerpc_matched_key));
|
||||
new_matched_key = (dcerpc_matched_key *)se_alloc(sizeof (dcerpc_matched_key));
|
||||
*new_matched_key = matched_key;
|
||||
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
|
||||
value = call_value;
|
||||
|
|
@ -3651,7 +3648,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
*/
|
||||
matched_key.frame = pinfo->fd->num;
|
||||
matched_key.call_id = hdr->call_id;
|
||||
value = g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
if (!value) {
|
||||
dcerpc_cn_call_key call_key;
|
||||
dcerpc_call_value *call_value;
|
||||
|
|
@ -3660,11 +3657,11 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
call_key.call_id = hdr->call_id;
|
||||
call_key.smb_fid = dcerpc_get_transport_salt(pinfo);
|
||||
|
||||
if ((call_value = g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
|
||||
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
|
||||
/* extra sanity check, only match them if the reply
|
||||
came after the request */
|
||||
if (call_value->req_frame<pinfo->fd->num) {
|
||||
new_matched_key = se_alloc(sizeof (dcerpc_matched_key));
|
||||
new_matched_key = (dcerpc_matched_key *)se_alloc(sizeof (dcerpc_matched_key));
|
||||
*new_matched_key = matched_key;
|
||||
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
|
||||
value = call_value;
|
||||
|
|
@ -3802,7 +3799,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
*/
|
||||
matched_key.frame = pinfo->fd->num;
|
||||
matched_key.call_id = hdr->call_id;
|
||||
value = g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
if (!value) {
|
||||
dcerpc_cn_call_key call_key;
|
||||
dcerpc_call_value *call_value;
|
||||
|
|
@ -3811,8 +3808,8 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
call_key.call_id = hdr->call_id;
|
||||
call_key.smb_fid = dcerpc_get_transport_salt(pinfo);
|
||||
|
||||
if ((call_value = g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
|
||||
new_matched_key = se_alloc(sizeof (dcerpc_matched_key));
|
||||
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
|
||||
new_matched_key = (dcerpc_matched_key *)se_alloc(sizeof (dcerpc_matched_key));
|
||||
*new_matched_key = matched_key;
|
||||
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
|
||||
|
||||
|
|
@ -4019,7 +4016,7 @@ dissect_dcerpc_cn_rts(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
tf = proto_tree_add_text(dcerpc_tree, tvb, offset, tvb_length_remaining(tvb, offset), "RTS PDU: %u commands", commands_nb);
|
||||
cn_rts_pdu_tree = proto_item_add_subtree(tf, ett_dcerpc_cn_rts_pdu);
|
||||
|
||||
cmd = ep_alloc(sizeof (guint32) * (commands_nb + 1));
|
||||
cmd = (guint32 *)ep_alloc(sizeof (guint32) * (commands_nb + 1));
|
||||
|
||||
/* Dissect commands */
|
||||
for (i = 0; i < commands_nb; ++i) {
|
||||
|
|
@ -4060,7 +4057,7 @@ dissect_dcerpc_cn_rts(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
const guint32 conformance_count = dcerpc_tvb_get_ntohl(tvb, offset, hdr->drep);
|
||||
proto_tree_add_uint(cn_rts_command_tree, hf_dcerpc_cn_rts_command_conformancecount, tvb, offset, 4, conformance_count);
|
||||
offset += 4;
|
||||
padding = tvb_memdup(tvb, offset, conformance_count);
|
||||
padding = (guint8 *)tvb_memdup(tvb, offset, conformance_count);
|
||||
proto_tree_add_bytes(cn_rts_command_tree, hf_dcerpc_cn_rts_command_padding, tvb, offset, conformance_count, padding);
|
||||
offset += conformance_count;
|
||||
} break;
|
||||
|
|
@ -4086,7 +4083,7 @@ dissect_dcerpc_cn_rts(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
|||
offset += 16;
|
||||
} break;
|
||||
}
|
||||
padding = tvb_memdup(tvb, offset, 12);
|
||||
padding = (guint8 *)tvb_memdup(tvb, offset, 12);
|
||||
proto_tree_add_bytes(cn_rts_command_tree, hf_dcerpc_cn_rts_command_padding, tvb, offset, 12, padding);
|
||||
offset += 12;
|
||||
} break;
|
||||
|
|
@ -4979,12 +4976,12 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
dcerpc_call_value *call_value;
|
||||
dcerpc_dg_call_key *call_key;
|
||||
|
||||
call_key = se_alloc(sizeof (dcerpc_dg_call_key));
|
||||
call_key = (dcerpc_dg_call_key *)se_alloc(sizeof (dcerpc_dg_call_key));
|
||||
call_key->conv = conv;
|
||||
call_key->seqnum = hdr->seqnum;
|
||||
call_key->act_id = hdr->act_id;
|
||||
|
||||
call_value = se_alloc(sizeof (dcerpc_call_value));
|
||||
call_value = (dcerpc_call_value *)se_alloc(sizeof (dcerpc_call_value));
|
||||
call_value->uuid = hdr->if_id;
|
||||
call_value->ver = hdr->if_ver;
|
||||
call_value->object_uuid = hdr->obj_id;
|
||||
|
|
@ -5001,7 +4998,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
|
||||
g_hash_table_insert(dcerpc_dg_calls, call_key, call_value);
|
||||
|
||||
new_matched_key = se_alloc(sizeof(dcerpc_matched_key));
|
||||
new_matched_key = (dcerpc_matched_key *)se_alloc(sizeof(dcerpc_matched_key));
|
||||
new_matched_key->frame = pinfo->fd->num;
|
||||
new_matched_key->call_id = hdr->seqnum;
|
||||
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
|
||||
|
|
@ -5009,7 +5006,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
|
||||
matched_key.frame = pinfo->fd->num;
|
||||
matched_key.call_id = hdr->seqnum;
|
||||
value = g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
if (!value) {
|
||||
v.uuid = hdr->if_id;
|
||||
v.ver = hdr->if_ver;
|
||||
|
|
@ -5061,8 +5058,8 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
call_key.seqnum = hdr->seqnum;
|
||||
call_key.act_id = hdr->act_id;
|
||||
|
||||
if ((call_value = g_hash_table_lookup(dcerpc_dg_calls, &call_key))) {
|
||||
new_matched_key = se_alloc(sizeof (dcerpc_matched_key));
|
||||
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_dg_calls, &call_key))) {
|
||||
new_matched_key = (dcerpc_matched_key *)se_alloc(sizeof (dcerpc_matched_key));
|
||||
new_matched_key->frame = pinfo->fd->num;
|
||||
new_matched_key->call_id = hdr->seqnum;
|
||||
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
|
||||
|
|
@ -5074,7 +5071,7 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
|
||||
matched_key.frame = pinfo->fd->num;
|
||||
matched_key.call_id = hdr->seqnum;
|
||||
value = g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
|
||||
if (!value) {
|
||||
v.uuid = hdr->if_id;
|
||||
v.ver = hdr->if_ver;
|
||||
|
|
@ -5128,7 +5125,7 @@ dissect_dcerpc_dg_ping_ack(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
call_key.seqnum = hdr->seqnum;
|
||||
call_key.act_id = hdr->act_id;
|
||||
|
||||
if ((call_value = g_hash_table_lookup(dcerpc_dg_calls, &call_key))) {
|
||||
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_dg_calls, &call_key))) {
|
||||
proto_item *pi;
|
||||
nstime_t delta_ts;
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
#include <epan/asn1.h>
|
||||
#include <epan/expert.h>
|
||||
|
||||
#include "packet-ber.h"
|
||||
#include "packet-per.h"
|
||||
#include "packet-rrc.h"
|
||||
#include "packet-gsm_a_common.h"
|
||||
|
|
@ -158,7 +157,7 @@ typedef enum _RAT_Type_enum {
|
|||
} RAT_Type_enum;
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-val.h ---*/
|
||||
#line 63 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 62 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
/* Initialize the protocol and registered fields */
|
||||
static int proto_lte_rrc = -1;
|
||||
|
|
@ -1052,12 +1051,11 @@ static int hf_lte_rrc_sai_InterFreqList_r11 = -1; /* MBMS_SAI_InterFreqList_r11
|
|||
static int hf_lte_rrc_MBMS_SAI_List_r11_item = -1; /* MBMS_SAI_r11 */
|
||||
static int hf_lte_rrc_MBMS_SAI_InterFreqList_r11_item = -1; /* MBMS_SAI_InterFreq_r11 */
|
||||
static int hf_lte_rrc_sai_List_r11 = -1; /* MBMS_SAI_List_r11 */
|
||||
static int hf_lte_rrc_timeInfo = -1; /* T_timeInfo */
|
||||
static int hf_lte_rrc_timeInfoGPS = -1; /* T_timeInfoGPS */
|
||||
static int hf_lte_rrc_timeInfoUTC = -1; /* T_timeInfoUTC */
|
||||
static int hf_lte_rrc_dayLightSavingTime = -1; /* T_dayLightSavingTime */
|
||||
static int hf_lte_rrc_leapSeconds = -1; /* T_leapSeconds */
|
||||
static int hf_lte_rrc_localTimeOffset = -1; /* INTEGER_M63_64 */
|
||||
static int hf_lte_rrc_timeInfo_r11 = -1; /* T_timeInfo_r11 */
|
||||
static int hf_lte_rrc_timeInfoUTC_r11 = -1; /* T_timeInfoUTC_r11 */
|
||||
static int hf_lte_rrc_dayLightSavingTime_r11 = -1; /* T_dayLightSavingTime_r11 */
|
||||
static int hf_lte_rrc_leapSeconds_r11 = -1; /* T_leapSeconds_r11 */
|
||||
static int hf_lte_rrc_localTimeOffset_r11 = -1; /* INTEGER_M63_64 */
|
||||
static int hf_lte_rrc_antennaPortsCount = -1; /* T_antennaPortsCount */
|
||||
static int hf_lte_rrc_transmissionMode = -1; /* T_transmissionMode */
|
||||
static int hf_lte_rrc_codebookSubsetRestriction = -1; /* T_codebookSubsetRestriction */
|
||||
|
|
@ -2234,7 +2232,7 @@ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1; /* CandidateCellInfo
|
|||
static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-hf.c ---*/
|
||||
#line 68 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 67 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1;
|
||||
|
|
@ -2871,7 +2869,7 @@ static gint ett_lte_rrc_MBMS_SAI_List_r11 = -1;
|
|||
static gint ett_lte_rrc_MBMS_SAI_InterFreqList_r11 = -1;
|
||||
static gint ett_lte_rrc_MBMS_SAI_InterFreq_r11 = -1;
|
||||
static gint ett_lte_rrc_SystemInformationBlockType16_r11 = -1;
|
||||
static gint ett_lte_rrc_T_timeInfo = -1;
|
||||
static gint ett_lte_rrc_T_timeInfo_r11 = -1;
|
||||
static gint ett_lte_rrc_AntennaInfoCommon = -1;
|
||||
static gint ett_lte_rrc_AntennaInfoDedicated = -1;
|
||||
static gint ett_lte_rrc_T_codebookSubsetRestriction = -1;
|
||||
|
|
@ -3392,7 +3390,7 @@ static gint ett_lte_rrc_CandidateCellInfoList_r10 = -1;
|
|||
static gint ett_lte_rrc_CandidateCellInfo_r10 = -1;
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-ett.c ---*/
|
||||
#line 186 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 185 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
static gint ett_lte_rrc_featureGroupIndicators = -1;
|
||||
static gint ett_lte_rrc_featureGroupIndRel9Add = -1;
|
||||
|
|
@ -8019,7 +8017,7 @@ dissect_lte_rrc_T_synchronousSystemTime(tvbuff_t *tvb _U_, int offset _U_, asn1_
|
|||
proto_tree *subtree;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo);
|
||||
bits = tvb_get_bits64(sync_system_time_tvb, 0, 39, ENC_BIG_ENDIAN);
|
||||
ts.secs = (time_t)(bits/100) + 315964800; /* CDMA2000 epoch is 00:00 (midnight) UTC on 1980-01-06 */
|
||||
ts.secs = (time_t)(bits/100) + 315964800; /* CDMA2000 epoch is 00:00:00 (midnight) UTC on 1980-01-06 */
|
||||
ts.nsecs = (int)(bits%100)*10000000;
|
||||
proto_tree_add_text(subtree, sync_system_time_tvb, 0, -1, "CDMA time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, FALSE));
|
||||
proto_tree_add_text(subtree, sync_system_time_tvb, 0, -1, "Local time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_LOCAL, TRUE));
|
||||
|
|
@ -8044,7 +8042,7 @@ dissect_lte_rrc_T_asynchronousSystemTime(tvbuff_t *tvb _U_, int offset _U_, asn1
|
|||
proto_tree *subtree;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo);
|
||||
bits = tvb_get_bits64(async_system_time_tvb, 0, 49, ENC_BIG_ENDIAN);
|
||||
ts.secs = (time_t)((bits*8)/1228800) + 315964800; /* CDMA2000 epoch is 00:00 (midnight) UTC on 1980-01-06 */
|
||||
ts.secs = (time_t)((bits*8)/1228800) + 315964800; /* CDMA2000 epoch is 00:00:00 (midnight) UTC on 1980-01-06 */
|
||||
ts.nsecs = (int)(((bits%153600)*8*1000000000)/1228800);
|
||||
proto_tree_add_text(subtree, async_system_time_tvb, 0, -1, "CDMA time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, FALSE));
|
||||
proto_tree_add_text(subtree, async_system_time_tvb, 0, -1, "Local time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_LOCAL, TRUE));
|
||||
|
|
@ -9560,24 +9558,23 @@ dissect_lte_rrc_SystemInformationBlockType15_r11(tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_T_timeInfoGPS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
tvbuff_t *time_info_gps_tvb = NULL;
|
||||
offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
|
||||
39, 39, FALSE, &time_info_gps_tvb);
|
||||
dissect_lte_rrc_T_timeInfoUTC_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
guint64 timeInfo;
|
||||
proto_tree *subtree;
|
||||
nstime_t ts;
|
||||
guint32 old_offset = offset;
|
||||
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
|
||||
0U, G_GINT64_CONSTANT(549755813887U), &timeInfo, FALSE);
|
||||
|
||||
|
||||
|
||||
if (time_info_gps_tvb) {
|
||||
guint64 bits;
|
||||
nstime_t ts;
|
||||
proto_tree *subtree;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo);
|
||||
bits = tvb_get_bits64(time_info_gps_tvb, 0, 39, ENC_BIG_ENDIAN);
|
||||
ts.secs = (time_t)(bits/100) + 315964800; /* GPS epoch is 00:00 (midnight) UTC on 1980-01-06 */
|
||||
ts.nsecs = (int)(bits%100)*10000000;
|
||||
proto_tree_add_text(subtree, time_info_gps_tvb, 0, -1, "GPS time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, FALSE));
|
||||
proto_tree_add_text(subtree, time_info_gps_tvb, 0, -1, "Local time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_LOCAL, TRUE));
|
||||
}
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo);
|
||||
ts.secs = (time_t)(timeInfo/100)-2208988800; /* epoch is 00:00:00 (midnight) UTC on 1900-01-01 */
|
||||
ts.nsecs = (int)(timeInfo%100)*10000000;
|
||||
proto_tree_add_text(subtree, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5,
|
||||
"UTC time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, FALSE));
|
||||
proto_tree_add_text(subtree, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5,
|
||||
"Local time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_LOCAL, TRUE));
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -9585,54 +9582,7 @@ dissect_lte_rrc_T_timeInfoGPS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
|
|||
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_T_timeInfoUTC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
tvbuff_t *time_info_utc_tvb = NULL;
|
||||
offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
|
||||
39, 39, FALSE, &time_info_utc_tvb);
|
||||
|
||||
|
||||
|
||||
if (time_info_utc_tvb) {
|
||||
guint64 bits;
|
||||
nstime_t ts;
|
||||
proto_tree *subtree;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo);
|
||||
bits = tvb_get_bits64(time_info_utc_tvb, 0, 39, ENC_BIG_ENDIAN);
|
||||
ts.secs = (time_t)(bits/100);
|
||||
ts.nsecs = (int)(bits%100)*10000000;
|
||||
proto_tree_add_text(subtree, time_info_utc_tvb, 0, -1, "UTC time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, FALSE));
|
||||
proto_tree_add_text(subtree, time_info_utc_tvb, 0, -1, "Local time: %s", abs_time_to_str(&ts, ABSOLUTE_TIME_LOCAL, TRUE));
|
||||
}
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string lte_rrc_T_timeInfo_vals[] = {
|
||||
{ 0, "timeInfoGPS" },
|
||||
{ 1, "timeInfoUTC" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const per_choice_t T_timeInfo_choice[] = {
|
||||
{ 0, &hf_lte_rrc_timeInfoGPS , ASN1_NO_EXTENSIONS , dissect_lte_rrc_T_timeInfoGPS },
|
||||
{ 1, &hf_lte_rrc_timeInfoUTC , ASN1_NO_EXTENSIONS , dissect_lte_rrc_T_timeInfoUTC },
|
||||
{ 0, NULL, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_T_timeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
ett_lte_rrc_T_timeInfo, T_timeInfo_choice,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_T_dayLightSavingTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
dissect_lte_rrc_T_dayLightSavingTime_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
tvbuff_t *daylight_saving_time_tvb = NULL;
|
||||
offset = dissect_per_bit_string(tvb, offset, actx, tree, -1,
|
||||
2, 2, FALSE, &daylight_saving_time_tvb);
|
||||
|
|
@ -9649,7 +9599,7 @@ dissect_lte_rrc_T_dayLightSavingTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
|
|||
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_T_leapSeconds(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
dissect_lte_rrc_T_leapSeconds_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
-127, 128U, NULL, FALSE);
|
||||
|
||||
|
|
@ -9670,11 +9620,26 @@ dissect_lte_rrc_INTEGER_M63_64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
|
|||
}
|
||||
|
||||
|
||||
static const per_sequence_t T_timeInfo_r11_sequence[] = {
|
||||
{ &hf_lte_rrc_timeInfoUTC_r11, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_timeInfoUTC_r11 },
|
||||
{ &hf_lte_rrc_dayLightSavingTime_r11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_dayLightSavingTime_r11 },
|
||||
{ &hf_lte_rrc_leapSeconds_r11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_leapSeconds_r11 },
|
||||
{ &hf_lte_rrc_localTimeOffset_r11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_INTEGER_M63_64 },
|
||||
{ NULL, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_T_timeInfo_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
|
||||
ett_lte_rrc_T_timeInfo_r11, T_timeInfo_r11_sequence);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const per_sequence_t SystemInformationBlockType16_r11_sequence[] = {
|
||||
{ &hf_lte_rrc_timeInfo , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_timeInfo },
|
||||
{ &hf_lte_rrc_dayLightSavingTime, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_dayLightSavingTime },
|
||||
{ &hf_lte_rrc_leapSeconds , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_leapSeconds },
|
||||
{ &hf_lte_rrc_localTimeOffset, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_INTEGER_M63_64 },
|
||||
{ &hf_lte_rrc_timeInfo_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_timeInfo_r11 },
|
||||
{ &hf_lte_rrc_lateNonCriticalExtension, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING },
|
||||
{ NULL, 0, 0, NULL }
|
||||
};
|
||||
|
||||
|
|
@ -33049,7 +33014,7 @@ static int dissect_MBMSInterestIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info
|
|||
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-fn.c ---*/
|
||||
#line 1940 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 1939 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
static void
|
||||
dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
|
|
@ -36742,28 +36707,24 @@ void proto_register_lte_rrc(void) {
|
|||
{ "sai-List-r11", "lte-rrc.sai_List_r11",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
"MBMS_SAI_List_r11", HFILL }},
|
||||
{ &hf_lte_rrc_timeInfo,
|
||||
{ "timeInfo", "lte-rrc.timeInfo",
|
||||
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_timeInfo_vals), 0,
|
||||
{ &hf_lte_rrc_timeInfo_r11,
|
||||
{ "timeInfo-r11", "lte-rrc.timeInfo_r11",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_timeInfoGPS,
|
||||
{ "timeInfoGPS", "lte-rrc.timeInfoGPS",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
{ &hf_lte_rrc_timeInfoUTC_r11,
|
||||
{ "timeInfoUTC-r11", "lte-rrc.timeInfoUTC_r11",
|
||||
FT_UINT64, BASE_DEC, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_timeInfoUTC,
|
||||
{ "timeInfoUTC", "lte-rrc.timeInfoUTC",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_dayLightSavingTime,
|
||||
{ "dayLightSavingTime", "lte-rrc.dayLightSavingTime",
|
||||
{ &hf_lte_rrc_dayLightSavingTime_r11,
|
||||
{ "dayLightSavingTime-r11", "lte-rrc.dayLightSavingTime_r11",
|
||||
FT_UINT8, BASE_DEC, VALS(lte_rrc_daylightSavingTime_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_leapSeconds,
|
||||
{ "leapSeconds", "lte-rrc.leapSeconds",
|
||||
{ &hf_lte_rrc_leapSeconds_r11,
|
||||
{ "leapSeconds-r11", "lte-rrc.leapSeconds_r11",
|
||||
FT_INT32, BASE_DEC, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_localTimeOffset,
|
||||
{ "localTimeOffset", "lte-rrc.localTimeOffset",
|
||||
{ &hf_lte_rrc_localTimeOffset_r11,
|
||||
{ "localTimeOffset-r11", "lte-rrc.localTimeOffset_r11",
|
||||
FT_INT32, BASE_CUSTOM, <e_rrc_localTimeOffset_fmt, 0,
|
||||
"INTEGER_M63_64", HFILL }},
|
||||
{ &hf_lte_rrc_antennaPortsCount,
|
||||
|
|
@ -41460,7 +41421,7 @@ void proto_register_lte_rrc(void) {
|
|||
NULL, HFILL }},
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-hfarr.c ---*/
|
||||
#line 2086 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 2085 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_1,
|
||||
{ "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1",
|
||||
|
|
@ -42434,7 +42395,7 @@ void proto_register_lte_rrc(void) {
|
|||
&ett_lte_rrc_MBMS_SAI_InterFreqList_r11,
|
||||
&ett_lte_rrc_MBMS_SAI_InterFreq_r11,
|
||||
&ett_lte_rrc_SystemInformationBlockType16_r11,
|
||||
&ett_lte_rrc_T_timeInfo,
|
||||
&ett_lte_rrc_T_timeInfo_r11,
|
||||
&ett_lte_rrc_AntennaInfoCommon,
|
||||
&ett_lte_rrc_AntennaInfoDedicated,
|
||||
&ett_lte_rrc_T_codebookSubsetRestriction,
|
||||
|
|
@ -42955,7 +42916,7 @@ void proto_register_lte_rrc(void) {
|
|||
&ett_lte_rrc_CandidateCellInfo_r10,
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-ettarr.c ---*/
|
||||
#line 2541 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 2540 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
&ett_lte_rrc_featureGroupIndicators,
|
||||
&ett_lte_rrc_featureGroupIndRel9Add,
|
||||
|
|
@ -43008,7 +42969,7 @@ void proto_register_lte_rrc(void) {
|
|||
|
||||
|
||||
/*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
|
||||
#line 2578 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
#line 2577 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
|
||||
|
||||
register_init_routine(<e_rrc_init_protocol);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue