osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Removed many senseless pinfo parameters in RPC dissection and the layers above. 

svn path=/trunk/; revision=5090
This commit is contained in:
Uwe Girlich 2002-04-03 13:24:13 +00:00
parent 78216336d8
commit 2ca7ff7848
20 changed files with 1114 additions and 1110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packet-bootparams.c
View File

@ -1,7 +1,7 @@
/* packet-bootparams.c
* Routines for bootparams dissection
*
* $Id: packet-bootparams.c,v 1.19 2001/06/18 02:17:45 guy Exp $
* $Id: packet-bootparams.c,v 1.20 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -61,7 +61,7 @@ static const value_string addr_type[] =
};
static int
dissect_bp_address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hfindex)
dissect_bp_address(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex)
{
guint32 type;
guint32 ipaddr;
@ -69,7 +69,7 @@ dissect_bp_address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
type = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_bootparams_addresstype, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_bootparams_addresstype, offset);
switch(type){
case 1:
@ -91,49 +91,49 @@ dissect_bp_address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
static int
dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_fileid, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_bootparams_fileid, offset, NULL);
}
return offset;
}
static int
dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
offset = dissect_bp_address(tvb, offset, pinfo, tree, hf_bootparams_hostaddr);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_filepath, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL);
offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr);
offset = dissect_rpc_string(tvb, tree, hf_bootparams_filepath, offset, NULL);
}
return offset;
}
static int
dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_bp_address(tvb, offset, pinfo, tree, hf_bootparams_hostaddr);
offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr);
}
return offset;
}
static int
dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_domain, offset, NULL);
offset = dissect_bp_address(tvb, offset, pinfo, tree, hf_bootparams_routeraddr);
offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_bootparams_domain, offset, NULL);
offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_routeraddr);
}
return offset;

151
packet-hclnfsd.c
View File

@ -2,7 +2,7 @@
* Routines for hclnfsd (Hummingbird NFS Daemon) dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
* $Id: packet-hclnfsd.c,v 1.11 2002/04/01 22:40:20 guy Exp $
* $Id: packet-hclnfsd.c,v 1.12 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -87,7 +87,7 @@ static gint ett_hclnfsd_printjob = -1;
static gint ett_hclnfsd_auth_ident = -1;
static int
dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 ngids, ngids_i, gid;
proto_tree *gidtree = NULL;
@ -121,7 +121,7 @@ dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
static int
dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset);
offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "spool filehandle");
@ -130,13 +130,13 @@ dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo
static int
dissect_hclnfsd_spool_file_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_spool_file_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_printername, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_printername, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_filename, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_filename, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_fileext, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_fileext, offset);
return offset;
}
@ -166,7 +166,7 @@ hclnfsd_decode_obscure(char *ident, int ident_len)
static int
dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 request_type;
char *ident = NULL;
@ -174,7 +174,6 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
char *password = NULL;
int ident_len = 0;
int newoffset;
char *p;
proto_item *ident_item = NULL;
proto_tree *ident_tree = NULL;
@ -187,7 +186,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
4, request_type);
offset += 4;
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_device, offset,
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_device, offset,
NULL);
if (tree)
@ -202,7 +201,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
if (ident_tree)
{
newoffset = dissect_rpc_string(tvb, pinfo, ident_tree,
newoffset = dissect_rpc_string(tvb, ident_tree,
hf_hclnfsd_auth_ident_obscure, offset, &ident);
proto_item_set_len(ident_item, newoffset - offset);
@ -236,7 +235,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
static int
dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 status;
@ -250,9 +249,9 @@ dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, p
proto_tree_add_uint(tree, hf_hclnfsd_status, tvb, offset, 4, status);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_uid, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_uid, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_gid, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_gid, offset);
offset = dissect_hclnfsd_gids(tvb, offset, pinfo, tree);
@ -260,17 +259,17 @@ dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, p
}
static int
dissect_hclnfsd_grp_name_to_numb_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_grp_name_to_numb_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_grpname, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_grpname, offset, NULL);
return offset;
}
static int
dissect_hclnfsd_grp_name_to_numb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_grp_name_to_numb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_gid, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_gid, offset);
return offset;
}
@ -287,15 +286,15 @@ dissect_hclnfsd_grp_to_number_call(tvbuff_t *tvb, int offset, packet_info *pinfo
static int
dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
return dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_grpname, offset,
return dissect_rpc_string(tvb, tree, hf_hclnfsd_grpname, offset,
NULL);
}
static int
dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_tree_add_item(tree, hf_hclnfsd_host_ip, tvb, offset, 4, FALSE);
offset += 4;
@ -305,16 +304,16 @@ dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int
dissect_hclnfsd_return_host_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_return_host_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_hostname, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_hostname, offset, NULL);
return offset;
}
static int
dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 nuids, nuids_i;
proto_tree *uidtree = NULL;
@ -335,14 +334,14 @@ dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
return offset;
for (nuids_i = 0; nuids_i < nuids; nuids_i++)
offset = dissect_rpc_uint32(tvb, pinfo, uidtree, hf_hclnfsd_uid, offset);
offset = dissect_rpc_uint32(tvb, uidtree, hf_hclnfsd_uid, offset);
return offset;
}
static int
dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 nusers, nusers_i;
proto_tree *usertree = NULL;
@ -363,7 +362,7 @@ dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
return offset;
for (nusers_i = 0; nusers_i < nusers; nusers_i++)
offset = dissect_rpc_string(tvb, pinfo, usertree,
offset = dissect_rpc_string(tvb, usertree,
hf_hclnfsd_username, offset, NULL);
return offset;
@ -371,18 +370,18 @@ dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int
dissect_hclnfsd_name_to_uid_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_name_to_uid_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_username, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_username, offset, NULL);
return offset;
}
static int
dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_uid, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_uid, offset);
return offset;
}
@ -399,17 +398,17 @@ dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
4, request_type);
offset += 4;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "Filehandle");
offset = dissect_rpc_data(tvb, pinfo, tree, hf_hclnfsd_unknown_data, offset);
offset = dissect_rpc_data(tvb, tree, hf_hclnfsd_unknown_data, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_mode, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_mode, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_access, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_access, offset);
offset += 4; /* skip last 4 UNUSED bytes */
@ -418,7 +417,7 @@ dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
static int
dissect_hclnfsd_share_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_share_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 request_type;
@ -428,9 +427,9 @@ dissect_hclnfsd_share_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
4, request_type);
offset += 4;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_sequence, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_sequence, offset);
return offset;
}
@ -453,30 +452,30 @@ dissect_hclnfsd_unshare_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
static int
dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset);
offset += 4; /* skip unused uint */
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_exclusive, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_exclusive, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "Filehandle");
offset = dissect_rpc_data(tvb, pinfo, tree, hf_hclnfsd_lockowner, offset);
offset = dissect_rpc_data(tvb, tree, hf_hclnfsd_lockowner, offset);
offset += 4; /* unused, skip */
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_offset, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_offset, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_length, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_length, offset);
return offset;
}
static int
dissect_hclnfsd_lock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_lock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint request_type;
@ -486,17 +485,17 @@ dissect_hclnfsd_lock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
4, request_type);
offset += 4;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset);
return offset;
}
static int
dissect_hclnfsd_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL);
offset += 4; /* skip unused */
@ -509,18 +508,18 @@ dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
{
offset += 4; /* skip unused */
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL);
offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "Filehandle");
offset = dissect_rpc_data(tvb, pinfo, tree, hf_hclnfsd_unknown_data, offset);
offset = dissect_rpc_data(tvb, tree, hf_hclnfsd_unknown_data, offset);
offset += 4; /* skip unused */
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_offset, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_length, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_offset, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_length, offset);
return offset;
}
@ -534,7 +533,7 @@ dissect_hclnfsd_unlock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
static int
dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint nqueues, nqueues_i;
proto_item *queuesitem = NULL;
@ -558,11 +557,11 @@ dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo
for (nqueues_i = 0; nqueues_i < nqueues; nqueues_i++)
{
/* create new item for print queue */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_hclnfsd_queuename, offset, NULL);
/* create subtree on new item with print queue comment */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_hclnfsd_queuecomment, offset, NULL);
}
@ -571,18 +570,18 @@ dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo
static int
dissect_hclnfsd_get_printq_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_get_printq_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_queuename, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_queuename, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_username, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_username, offset, NULL);
return offset;
}
static int
dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint datafollows, jobid;
proto_item *queueitem = NULL;
@ -590,13 +589,13 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_item *jobitem;
proto_tree *jobtree;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_printqueuenumber, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_printqueuenumber, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_hclnfsd_queuecomment, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_queuecomment, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_queuestatus, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_queuestatus, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_numphysicalprinters, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_numphysicalprinters, offset);
datafollows = tvb_get_ntohl(tvb, offset);
if (tree)
@ -620,19 +619,19 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
jobtree = proto_item_add_subtree(jobitem, ett_hclnfsd_printjob);
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_hclnfsd_username, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_hclnfsd_printparams, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_queuestatus, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_queuestatus, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_jobstatus, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_timesubmitted, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_size, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_hclnfsd_copies, offset);
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_jobstatus, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_timesubmitted, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_size, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_copies, offset);
offset = dissect_rpc_string(tvb, tree,
hf_hclnfsd_queuecomment, offset, NULL);
datafollows = tvb_get_ntohl(tvb, offset);

38
packet-klm.c
View File

@ -1,7 +1,7 @@
/* packet-klm.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for klm dissection
*
* $Id: packet-klm.c,v 1.7 2002/01/24 09:20:49 guy Exp $
* $Id: packet-klm.c,v 1.8 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -65,7 +65,7 @@ static const value_string names_klm_stats[] =
};
static int
dissect_holder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
dissect_holder(tvbuff_t *tvb, proto_tree *tree, int offset)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -75,23 +75,23 @@ dissect_holder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
lock_tree = proto_item_add_subtree(lock_item, ett_klm_holder);
offset = dissect_rpc_bool( tvb, pinfo, lock_tree,
offset = dissect_rpc_bool( tvb, lock_tree,
hf_klm_exclusive, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_klm_pid, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_klm_offset, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_klm_len, offset);
return offset;
}
static int
dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
dissect_lock(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -101,18 +101,18 @@ dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
lock_tree = proto_item_add_subtree(lock_item, ett_klm_lock);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_klm_servername, offset, NULL);
offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh");
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_klm_pid, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_klm_offset, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_klm_len, offset);
return offset;
@ -127,10 +127,10 @@ dissect_klm_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
}
static int
dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_klm_stats, offset);
return offset;
@ -139,10 +139,10 @@ dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
static int
dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_bool( tvb, pinfo, tree,
offset = dissect_rpc_bool( tvb, tree,
hf_klm_block, offset);
offset = dissect_rpc_bool( tvb, pinfo, tree,
offset = dissect_rpc_bool( tvb, tree,
hf_klm_exclusive, offset);
offset = dissect_lock(tvb, pinfo, tree, offset);
@ -151,17 +151,17 @@ dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
static int
dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
gint32 stats;
stats = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_klm_stats, offset);
if (stats == KLM_DENIED) {
offset = dissect_holder(tvb, pinfo, tree, offset);
offset = dissect_holder(tvb, tree, offset);
}
return offset;
@ -170,7 +170,7 @@ dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
static int
dissect_klm_test_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_bool( tvb, pinfo, tree,
offset = dissect_rpc_bool( tvb, tree,
hf_klm_exclusive, offset);
offset = dissect_lock(tvb, pinfo, tree, offset);

30
packet-mount.c
View File

@ -1,7 +1,7 @@
/* packet-mount.c
* Routines for mount dissection
*
* $Id: packet-mount.c,v 1.29 2002/01/20 22:12:26 guy Exp $
* $Id: packet-mount.c,v 1.30 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -95,7 +95,7 @@ dissect_fhstatus(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
gint32 status;
status=tvb_get_ntohl(tvb,offset);
offset = dissect_rpc_uint32(tvb,pinfo,tree,hf_mount3_status,offset);
offset = dissect_rpc_uint32(tvb,tree,hf_mount3_status,offset);
switch (status) {
case 0:
@ -111,7 +111,7 @@ dissect_fhstatus(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
static int
dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if((!pinfo->fd->flags.visited) && nfs_file_name_snooping){
rpc_call_info_value *civ=pinfo->private_data;
@ -133,7 +133,7 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
if ( tree )
{
offset = dissect_rpc_string(tvb,pinfo,tree,hf_mount_path,offset,NULL);
offset = dissect_rpc_string(tvb,tree,hf_mount_path,offset,NULL);
}
return offset;
@ -154,7 +154,7 @@ dissect_mount1_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
/* RFC 1094, Page 26 */
/* RFC 1813, Page 110 */
static int
dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -169,9 +169,9 @@ dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
lock_tree = proto_item_add_subtree(lock_item, ett_mount_mountlist);
}
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_mount_mountlist_hostname, offset, &hostname);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_mount_mountlist_directory, offset, &directory);
if (lock_item) {
@ -202,7 +202,7 @@ dissect_mount_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
/* RFC 1094, Page 26 */
/* RFC 1813, Page 110 */
static int
dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
int len,str_len;
len=tvb_get_ntohl(tvb,offset);
@ -218,7 +218,7 @@ dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
}
group_name_list[group_names_len]=0;
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_mount_groups_group, offset, NULL);
return offset;
@ -247,7 +247,7 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
exportlist_tree = proto_item_add_subtree(exportlist_item, ett_mount_exportlist);
}
offset = dissect_rpc_string(tvb, pinfo, exportlist_tree,
offset = dissect_rpc_string(tvb, exportlist_tree,
hf_mount_exportlist_directory, offset, &directory);
groups_offset = offset;
@ -357,7 +357,7 @@ static const true_false_string tos_error_vdisable = {
static int
dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
int saved_offset;
guint32 pc_mask;
@ -372,7 +372,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
pc_mask = tvb_get_ntohl(tvb, offset+OFFS_MASK) & 0xffff;
if (!(pc_mask & (PC_ERROR_LINK_MAX|PC_ERROR_ALL))) {
if (tree) {
dissect_rpc_uint32(tvb,pinfo,tree,hf_mount_pathconf_link_max,offset);
dissect_rpc_uint32(tvb,tree,hf_mount_pathconf_link_max,offset);
}
}
offset += 4;
@ -485,13 +485,13 @@ static const value_string mount3_mountstat3[] =
/* RFC 1813, Page 107 */
static int
dissect_mountstat3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int hfindex, guint32 *status)
dissect_mountstat3(tvbuff_t *tvb, proto_tree *tree, int offset, int hfindex, guint32 *status)
{
guint32 mountstat3;
mountstat3 = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb,pinfo,tree,hfindex,offset);
offset = dissect_rpc_uint32(tvb,tree,hfindex,offset);
*status = mountstat3;
return offset;
}
@ -505,7 +505,7 @@ dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
guint32 auth_flavor;
guint32 auth_flavor_i;
offset = dissect_mountstat3(tvb,pinfo,tree,offset,hf_mount3_status,&status);
offset = dissect_mountstat3(tvb,tree,offset,hf_mount3_status,&status);
switch (status) {
case 0:

110
packet-ndmp.c
View File

@ -2,7 +2,7 @@
* Routines for NDMP dissection
* 2001 Ronnie Sahlberg (see AUTHORS for email)
*
* $Id: packet-ndmp.c,v 1.16 2002/02/18 23:51:55 guy Exp $
* $Id: packet-ndmp.c,v 1.17 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -457,19 +457,19 @@ dissect_ndmp_get_host_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/* hostname */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_hostname, offset, NULL);
/* os type */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_os_type, offset, NULL);
/* os version */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_os_vers, offset, NULL);
/* hostid */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_hostid, offset, NULL);
return offset;
@ -575,11 +575,11 @@ static int
dissect_default_env(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/* name */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_butype_env_name, offset, NULL);
/* value */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_butype_env_value, offset, NULL);
return offset;
@ -663,7 +663,7 @@ static int
dissect_butype_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/*butype name*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_butype_name, offset, NULL);
/* default env */
@ -744,11 +744,11 @@ static int
dissect_fs_env(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/* name */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_fs_env_name, offset, NULL);
/* value */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_fs_env_value, offset, NULL);
return offset;
@ -761,35 +761,35 @@ dissect_fs_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
offset=dissect_fs_invalid(tvb, offset, pinfo, tree);
/* fs type */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_fs_fs_type, offset, NULL);
/* fs logical device */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_fs_logical_device, offset, NULL);
/* fs physical device */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_fs_physical_device, offset, NULL);
/*total_size*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_fs_total_size,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_fs_total_size,
offset);
/*used_size*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_fs_used_size,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_fs_used_size,
offset);
/*avail_size*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_fs_avail_size,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_fs_avail_size,
offset);
/*total_inodes*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_fs_total_inodes,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_fs_total_inodes,
offset);
/*used_inodes*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_fs_used_inodes,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_fs_used_inodes,
offset);
/* env */
@ -797,7 +797,7 @@ dissect_fs_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_fs_env, hf_ndmp_fs_env);
/* status */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_fs_status, offset, NULL);
return offset;
@ -853,11 +853,11 @@ static int
dissect_tape_capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/* name */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_tape_capability_name, offset, NULL);
/* value */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_tape_capability_value, offset, NULL);
return offset;
@ -867,7 +867,7 @@ static int
dissect_tape_dev_cap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/* device */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_tape_device, offset, NULL);
/* tape attributes */
@ -884,7 +884,7 @@ static int
dissect_tape_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/* model */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_tape_model, offset, NULL);
/* device capabilites */
@ -913,7 +913,7 @@ static int
dissect_scsi_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/* model */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_scsi_model, offset, NULL);
/* device capabilites */
@ -947,15 +947,15 @@ dissect_get_server_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/* vendor */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_server_vendor, offset, NULL);
/* product */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_server_product, offset, NULL);
/* revision */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_server_revision, offset, NULL);
@ -971,7 +971,7 @@ dissect_scsi_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 seq)
{
/* device */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_scsi_device, offset, NULL);
return offset;
@ -1005,7 +1005,7 @@ dissect_scsi_set_state_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 seq)
{
/* device */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_scsi_device, offset, NULL);
/* controller */
@ -1238,7 +1238,7 @@ dissect_tape_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 seq)
{
/* device */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_tape_device, offset, NULL);
/* open mode */
@ -1385,11 +1385,11 @@ dissect_tape_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/* total_space */
offset = dissect_rpc_uint64(tvb, pinfo, tree,hf_ndmp_tape_total_space,
offset = dissect_rpc_uint64(tvb, tree,hf_ndmp_tape_total_space,
offset);
/* space_remain */
offset = dissect_rpc_uint64(tvb, pinfo, tree,hf_ndmp_tape_space_remain,
offset = dissect_rpc_uint64(tvb, tree,hf_ndmp_tape_space_remain,
offset);
/* partition */
@ -1531,7 +1531,7 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *par
break;
case NDMP_ADDR_IPC:
/* IPC address */
offset = dissect_rpc_data(tvb, pinfo, tree, hf_ndmp_addr_ipc, offset);
offset = dissect_rpc_data(tvb, tree, hf_ndmp_addr_ipc, offset);
break;
}
@ -1674,7 +1674,7 @@ dissect_log_file_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 seq)
{
/* file */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_file_name, offset, NULL);
/* error */
@ -1709,7 +1709,7 @@ dissect_log_message_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/* message */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_log_message, offset, NULL);
return offset;
@ -1724,7 +1724,7 @@ dissect_notify_data_halted_request(tvbuff_t *tvb, int offset,
offset += 4;
/* reason */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_halt_reason, offset, NULL);
return offset;
@ -1753,7 +1753,7 @@ dissect_notify_connected_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/* reason */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_connected_reason, offset, NULL);
return offset;
@ -1791,18 +1791,18 @@ dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
break;
case NDMP_AUTH_TEXT:
/* auth id */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_auth_id, offset, NULL);
/* auth password */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_auth_password, offset, NULL);
break;
case NDMP_AUTH_MD5:
/* auth id */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_auth_id, offset, NULL);
/* digest */
@ -1840,7 +1840,7 @@ dissect_tape_write_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 seq)
{
/* data */
offset = dissect_rpc_data(tvb, pinfo, tree, hf_ndmp_data, offset);
offset = dissect_rpc_data(tvb, tree, hf_ndmp_data, offset);
return offset;
}
@ -1880,7 +1880,7 @@ dissect_tape_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/* data */
offset = dissect_rpc_data(tvb, pinfo, tree, hf_ndmp_data, offset);
offset = dissect_rpc_data(tvb, tree, hf_ndmp_data, offset);
return offset;
}
@ -1918,7 +1918,7 @@ dissect_file_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *par
switch(type){
case NDMP_FS_UNIX:
/* file */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_file_name, offset, &name);
if (check_col(pinfo->cinfo, COL_INFO)){
col_append_fstr(pinfo->cinfo, COL_INFO, " %s ", name);
@ -1926,19 +1926,19 @@ dissect_file_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *par
break;
case NDMP_FS_NT:
/* nt file */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_nt_file_name, offset, &name);
if (check_col(pinfo->cinfo, COL_INFO)){
col_append_fstr(pinfo->cinfo, COL_INFO, " %s ", name);
}
/* dos file */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_dos_file_name, offset, NULL);
break;
default:
/* file */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_file_name, offset, &name);
if (check_col(pinfo->cinfo, COL_INFO)){
col_append_fstr(pinfo->cinfo, COL_INFO, " %s ", name);
@ -2072,7 +2072,7 @@ dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa
offset += 4;
/*file size*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_file_size,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_file_size,
offset);
/* links */
@ -2192,7 +2192,7 @@ dissect_data_start_backup_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 seq)
{
/*butype name*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_butype_name, offset, NULL);
/* default env */
@ -2206,19 +2206,19 @@ static int
dissect_nlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
/*original path*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_bu_original_path, offset, NULL);
/*destination dir*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_bu_destination_dir, offset, NULL);
/*new name*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_bu_new_name, offset, NULL);
/*other name*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_bu_other_name, offset, NULL);
/* node */
@ -2246,7 +2246,7 @@ dissect_data_start_recover_request(tvbuff_t *tvb, int offset,
dissect_nlist, hf_ndmp_nlist);
/*butype name*/
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ndmp_butype_name, offset, NULL);
return offset;
@ -2363,11 +2363,11 @@ dissect_data_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset += 4;
/*bytes processed*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_data_bytes_processed,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_data_bytes_processed,
offset);
/*est bytes remain*/
offset = dissect_rpc_uint64(tvb, pinfo, tree, hf_ndmp_data_est_bytes_remain,
offset = dissect_rpc_uint64(tvb, tree, hf_ndmp_data_est_bytes_remain,
offset);
/* est time remain */

1152
packet-nfs.c
View File

File diff suppressed because it is too large Load Diff

188
packet-nisplus.c
View File

@ -1,7 +1,7 @@
/* packet-nisplus.c
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
* $Id: packet-nisplus.c,v 1.10 2002/01/20 22:12:27 guy Exp $
* $Id: packet-nisplus.c,v 1.11 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -265,7 +265,7 @@ static const value_string ns_type[] = {
static int
dissect_nisplus_time(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hfindex)
dissect_nisplus_time(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex)
{
nstime_t ts;
@ -279,9 +279,9 @@ dissect_nisplus_time(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
}
static int
dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_group_name, offset, NULL);
return offset;
@ -300,7 +300,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_group);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_group_flags, offset);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@ -312,7 +312,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
static int
dissect_access_rights(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_access_rights(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_item* mask_item = NULL;
proto_tree* mask_tree = NULL;
@ -345,7 +345,7 @@ dissect_access_rights(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
static int
dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -359,7 +359,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table_col);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_table_col_name, offset, NULL);
@ -384,7 +384,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
tvb, offset, 4, mask);
offset += 4;
offset = dissect_access_rights(tvb, offset, pinfo, lock_tree);
offset = dissect_access_rights(tvb, offset, lock_tree);
proto_item_set_len(lock_item, offset-old_offset);
return offset;
@ -403,19 +403,19 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_table_type, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_table_maxcol, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_table_sep, offset);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
dissect_table, hf_nisplus_table_cols);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_table_path, offset, NULL);
proto_item_set_len(lock_item, offset-old_offset);
@ -423,7 +423,7 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
}
static int
dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -450,7 +450,7 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
proto_tree_add_boolean(mask_tree, hf_nisplus_entry_mask_asn, tvb, offset, 4, mask);
offset += 4;
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_entry_val, offset, NULL);
proto_item_set_len(lock_item, offset-old_offset);
@ -469,7 +469,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_entry_type, offset, NULL);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@ -480,7 +480,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
}
static int
dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -491,10 +491,10 @@ dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_attr);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_attr_name, offset, NULL);
offset = dissect_rpc_data(tvb, pinfo, lock_tree,
offset = dissect_rpc_data(tvb, lock_tree,
hf_nisplus_attr_val, offset);
proto_item_set_len(lock_item, offset-old_offset);
@ -513,13 +513,13 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_link);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_object_type, offset);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
dissect_attr, hf_nisplus_attrs_array);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_object_name, offset, NULL);
proto_item_set_len(lock_item, offset-old_offset);
@ -528,7 +528,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
static int
dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -539,13 +539,13 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_endpoint);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_endpoint_uaddr, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_endpoint_family, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_endpoint_proto, offset, NULL);
proto_item_set_len(lock_item, offset-old_offset);
@ -565,16 +565,16 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_server);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_server_name, offset, NULL);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
dissect_endpoint, hf_nisplus_endpoints);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_key_type, offset);
offset = dissect_rpc_data(tvb, pinfo, lock_tree,
offset = dissect_rpc_data(tvb, lock_tree,
hf_nisplus_key_data, offset);
proto_item_set_len(lock_item, offset-old_offset);
@ -583,7 +583,7 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
static int
dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -594,9 +594,9 @@ dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory_mask);
offset = dissect_access_rights(tvb, offset, pinfo, lock_tree);
offset = dissect_access_rights(tvb, offset, lock_tree);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_object_type, offset);
proto_item_set_len(lock_item, offset-old_offset);
@ -615,16 +615,16 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_directory_name, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_directory_type, offset);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
dissect_directory_server, hf_nisplus_servers);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_directory_ttl, offset);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@ -635,7 +635,7 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
static int
dissect_nisplus_oid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -646,10 +646,10 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_oid);
offset = dissect_nisplus_time(tvb, offset, pinfo, lock_tree,
offset = dissect_nisplus_time(tvb, offset, lock_tree,
hf_nisplus_object_ctime);
offset = dissect_nisplus_time(tvb, offset, pinfo, lock_tree,
offset = dissect_nisplus_time(tvb, offset, lock_tree,
hf_nisplus_object_mtime);
proto_item_set_len(lock_item, offset-old_offset);
@ -669,27 +669,27 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_object);
offset = dissect_nisplus_oid(tvb, offset, pinfo, lock_tree);
offset = dissect_nisplus_oid(tvb, offset, lock_tree);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_object_name, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_object_owner, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_object_group, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_object_domain, offset, NULL);
offset = dissect_access_rights(tvb, offset, pinfo, lock_tree);
offset = dissect_access_rights(tvb, offset, lock_tree);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_object_ttl, offset);
type = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_object_type, offset);
switch (type) {
case NIS_DIRECTORY_OBJ:
@ -708,7 +708,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
offset = dissect_link_obj(tvb, offset, pinfo, lock_tree);
break;
case NIS_PRIVATE_OBJ:
offset = dissect_rpc_data(tvb, pinfo, lock_tree,
offset = dissect_rpc_data(tvb, lock_tree,
hf_nisplus_object_private, offset);
break;
case NIS_NO_OBJ:
@ -732,7 +732,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
static int
dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_object_name, offset, NULL);
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@ -744,13 +744,13 @@ dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
static int
dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_object_name, offset, NULL);
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
dissect_attr, hf_nisplus_attrs_array);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_ib_flags, offset);
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@ -759,29 +759,29 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
dissect_directory_server, hf_nisplus_cbservers);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_ib_bufsize, offset);
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_nisplus_cookie, offset);
return offset;
}
static int
dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_fd_dirname, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_fd_requester, offset, NULL);
return offset;
}
static int
dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
@ -792,10 +792,10 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_tag);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_tag_type, offset);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_tag_val, offset, NULL);
proto_item_set_len(lock_item, offset-old_offset);
@ -814,10 +814,10 @@ dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
static int
dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_dump_dir, offset, NULL);
offset = dissect_nisplus_time(tvb, offset, pinfo, tree,
offset = dissect_nisplus_time(tvb, offset, tree,
hf_nisplus_dump_time);
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@ -827,30 +827,30 @@ dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
}
static int
dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_nisplus_dummy, offset);
return offset;
}
static int
dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_object_name, offset, NULL);
return offset;
}
static int
dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_ping_dir, offset, NULL);
offset = dissect_nisplus_time(tvb, offset, pinfo, tree,
offset = dissect_nisplus_time(tvb, offset, tree,
hf_nisplus_ping_time);
return offset;
@ -960,43 +960,43 @@ static const value_string nis_error[] = {
static int
dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_error, offset);
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
dissect_nisplus_object, hf_nisplus_object);
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_nisplus_cookie, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_zticks, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_dticks, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_aticks, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_cticks, offset);
return offset;
}
static int
dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_error, offset);
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_nisplus_fd_dirname, offset, NULL);
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_nisplus_dir_data, offset);
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_nisplus_signature, offset);
return offset;
@ -1035,16 +1035,16 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_log_entry);
offset = dissect_nisplus_time(tvb, offset, pinfo, lock_tree,
offset = dissect_nisplus_time(tvb, offset, lock_tree,
hf_nisplus_log_time);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nisplus_log_type, offset);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_log_principal, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_nisplus_directory_name, offset, NULL);
offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@ -1059,10 +1059,10 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
static int
dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_error, offset);
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_nisplus_cookie, offset);
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@ -1072,42 +1072,42 @@ dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
}
static int
dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nisplus_callback_status,
offset = dissect_rpc_bool(tvb, tree, hf_nisplus_callback_status,
offset);
return offset;
}
static int
dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_nisplus_time(tvb, offset, pinfo, tree,
offset = dissect_nisplus_time(tvb, offset, tree,
hf_nisplus_log_time);
return offset;
}
static int
dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_cp_status, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_cp_zticks, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_cp_dticks, offset);
return offset;
}
static int
dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_nisplus_error, offset);
return offset;
@ -1847,7 +1847,7 @@ static gint ett_nispluscb = -1;
static gint ett_nispluscb_entry = -1;
static int
dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;

100
packet-nlm.c
View File

@ -1,7 +1,7 @@
/* packet-nlm.c
* Routines for nlm dissection
*
* $Id: packet-nlm.c,v 1.23 2002/01/24 09:20:50 guy Exp $
* $Id: packet-nlm.c,v 1.24 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -165,21 +165,21 @@ dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int version, i
lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock);
}
offset = dissect_rpc_string(tvb,pinfo,lock_tree,
offset = dissect_rpc_string(tvb,lock_tree,
hf_nlm_lock_caller_name, offset, NULL);
offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh");
offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_svid, offset);
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_svid, offset);
if (version == 4) {
offset = dissect_rpc_uint64(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset64, offset);
offset = dissect_rpc_uint64(tvb, pinfo, lock_tree, hf_nlm_lock_l_len64, offset);
offset = dissect_rpc_uint64(tvb, lock_tree, hf_nlm_lock_l_offset64, offset);
offset = dissect_rpc_uint64(tvb, lock_tree, hf_nlm_lock_l_len64, offset);
}
else {
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_l_len, offset);
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_l_offset, offset);
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_l_len, offset);
}
return offset;
@ -190,8 +190,8 @@ static int
dissect_nlm_test(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, int version)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
offset += 4;
offset = dissect_lock(tvb, pinfo, tree, version, offset);
return offset;
@ -201,12 +201,12 @@ static int
dissect_nlm_lock(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree,int version)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_block, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_block, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
offset = dissect_lock(tvb, pinfo, tree, version, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_reclaim, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_state, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_reclaim, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_nlm_state, offset);
return offset;
}
@ -214,9 +214,9 @@ static int
dissect_nlm_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree,int version)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_block, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_block, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
offset = dissect_lock(tvb, pinfo, tree, version, offset);
return offset;
}
@ -225,7 +225,7 @@ static int
dissect_nlm_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree,int version)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
offset = dissect_lock(tvb, pinfo, tree, version, offset);
return offset;
}
@ -234,21 +234,21 @@ static int
dissect_nlm_granted(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree,int version)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
offset = dissect_lock(tvb, pinfo, tree, version, offset);
return offset;
}
static int
dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree,int version)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
if (tree) {
lock_item = proto_tree_add_item(tree, hf_nlm_test_stat, tvb,
@ -258,7 +258,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
ett_nlm_lock);
}
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_test_stat_stat,
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_test_stat_stat,
offset);
/* last structure is optional, only supplied for stat==1 (LOCKED) */
@ -274,23 +274,23 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
ett_nlm_lock);
}
offset = dissect_rpc_bool(tvb, pinfo, lock_tree, hf_nlm_exclusive,
offset = dissect_rpc_bool(tvb, lock_tree, hf_nlm_exclusive,
offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_svid,
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_svid,
offset);
offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner,
offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner,
offset);
if (version == 4) {
offset = dissect_rpc_uint64(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint64(tvb, lock_tree,
hf_nlm_lock_l_offset64, offset);
offset = dissect_rpc_uint64(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint64(tvb, lock_tree,
hf_nlm_lock_l_len64, offset);
}
else {
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nlm_lock_l_offset, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_nlm_lock_l_len, offset);
}
@ -300,12 +300,12 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int
dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree,int version)
proto_tree *tree,int version _U_)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
if (tree) {
lock_item = proto_tree_add_item(tree, hf_nlm_share, tvb,
@ -315,39 +315,39 @@ dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
ett_nlm_lock);
}
offset = dissect_rpc_string(tvb,pinfo,lock_tree,
offset = dissect_rpc_string(tvb,lock_tree,
hf_nlm_lock_caller_name, offset, NULL);
offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree, "fh");
offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_share_mode, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_share_access, offset);
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_share_mode, offset);
offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_share_access, offset);
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_reclaim, offset);
offset = dissect_rpc_bool(tvb, tree, hf_nlm_reclaim, offset);
return offset;
}
static int
dissect_nlm_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, int version)
dissect_nlm_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, int version _U_)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_sequence, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_nlm_stat, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_nlm_sequence, offset);
return offset;
}
static int
dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree,int version)
dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree,int version _U_)
{
offset = dissect_rpc_string(tvb,pinfo,tree,
offset = dissect_rpc_string(tvb,tree,
hf_nlm_share_name, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_nlm_stat, offset);
return offset;
}
@ -358,11 +358,11 @@ dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* This function is identical for all NLM protocol versions (1-4)*/
static int
dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_nlm_stat, offset);
return offset;
}

28
packet-pcnfsd.c
View File

@ -1,7 +1,7 @@
/* packet-pcnfsd.c
* Routines for PCNFSD dissection
*
* $Id: packet-pcnfsd.c,v 1.5 2002/01/30 23:08:26 guy Exp $
* $Id: packet-pcnfsd.c,v 1.6 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -77,7 +77,7 @@ pcnfsd_decode_obscure(char* data, int len)
/* "NFS Illustrated" 14.7.13 */
int
dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
int newoffset;
@ -88,7 +88,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_item *password_item = NULL;
proto_tree *password_tree = NULL;
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_pcnfsd_auth_client, offset, NULL);
if (tree) {
@ -98,7 +98,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
ident_tree = proto_item_add_subtree(
ident_item, ett_pcnfsd_auth_ident);
}
newoffset = dissect_rpc_string(tvb, pinfo, ident_tree,
newoffset = dissect_rpc_string(tvb, ident_tree,
hf_pcnfsd_auth_ident_obscure, offset, &ident);
if (ident_item) {
proto_item_set_len(ident_item, newoffset-offset);
@ -129,7 +129,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
password_tree = proto_item_add_subtree(
password_item, ett_pcnfsd_auth_password);
}
newoffset = dissect_rpc_string(tvb, pinfo, password_tree,
newoffset = dissect_rpc_string(tvb, password_tree,
hf_pcnfsd_auth_password_obscure, offset, &password);
if (password_item) {
proto_item_set_len(password_item, newoffset-offset);
@ -153,7 +153,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset = newoffset;
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_pcnfsd_comment, offset, NULL);
return offset;
@ -162,7 +162,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* "NFS Illustrated" 14.7.13 */
int
dissect_pcnfsd2_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
dissect_pcnfsd2_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
int gids_count;
@ -170,9 +170,9 @@ dissect_pcnfsd2_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *gtree = NULL;
int gids_i;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_pcnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_pcnfsd_uid, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_pcnfsd_gid, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_pcnfsd_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_pcnfsd_uid, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_pcnfsd_gid, offset);
gids_count = tvb_get_ntohl(tvb,offset+0);
if (tree) {
gitem = proto_tree_add_text(tree, tvb,
@ -184,14 +184,14 @@ dissect_pcnfsd2_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
offset += 4;
for (gids_i = 0 ; gids_i < gids_count ; gids_i++) {
offset = dissect_rpc_uint32(tvb, pinfo, gtree,
offset = dissect_rpc_uint32(tvb, gtree,
hf_pcnfsd_gid, offset);
}
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_pcnfsd_homedir, offset, NULL);
/* should be signed int32 */
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_pcnfsd_def_umask, offset);
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree, hf_pcnfsd_def_umask, offset);
offset = dissect_rpc_string(tvb, tree,
hf_pcnfsd_comment, offset, NULL);
return offset;

36
packet-portmap.c
View File

@ -1,7 +1,7 @@
/* packet-portmap.c
* Routines for portmap dissection
*
* $Id: packet-portmap.c,v 1.33 2002/01/20 22:12:27 guy Exp $
* $Id: packet-portmap.c,v 1.34 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -68,7 +68,7 @@ static gint ett_portmap_entry = -1;
/* Dissect a getport call */
int dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 proto;
@ -94,16 +94,16 @@ int dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
return offset+16;
}
int dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_portmap_port,
offset = dissect_rpc_uint32(tvb, tree, hf_portmap_port,
offset);
return offset;
}
/* Dissect a 'set' call */
int dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 proto;
@ -130,7 +130,7 @@ int dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
/* Dissect a 'unset' call */
int dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 proto;
@ -156,16 +156,16 @@ int dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
return offset+16;
}
int dissect_set_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_set_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
offset = dissect_rpc_bool(tvb, pinfo, tree, hf_portmap_answer,
offset = dissect_rpc_bool(tvb, tree, hf_portmap_answer,
offset);
return offset;
}
static int
dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo,
dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
int prog, version, proto, port;
@ -301,7 +301,7 @@ static const vsff portmap2_proc[] = {
/* RFC 1833, Page 3 */
static int
dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* rpcb_item = NULL;
proto_tree* rpcb_tree = NULL;
@ -322,13 +322,13 @@ dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
"Program: %s (%u)", rpc_prog_name(prog), prog);
offset += 4;
offset = dissect_rpc_uint32(tvb, pinfo, rpcb_tree,
offset = dissect_rpc_uint32(tvb, rpcb_tree,
hf_portmap_rpcb_version, offset);
offset = dissect_rpc_string(tvb, pinfo, rpcb_tree,
offset = dissect_rpc_string(tvb, rpcb_tree,
hf_portmap_rpcb_netid, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, rpcb_tree,
offset = dissect_rpc_string(tvb, rpcb_tree,
hf_portmap_rpcb_addr, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, rpcb_tree,
offset = dissect_rpc_string(tvb, rpcb_tree,
hf_portmap_rpcb_owner, offset, NULL);
/* now we know, that rpcb is shorter */
@ -352,10 +352,10 @@ int dissect_rpcb3_getaddr_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* RFC 1833, Page 7 */
int dissect_rpcb3_getaddr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_rpcb3_getaddr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_portmap_uaddr, offset, NULL);
return offset;
@ -371,11 +371,11 @@ int dissect_rpcb3_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
/* RFC 1833, page 4 */
int dissect_rpcb_rmtcallres(tvbuff_t *tvb, int offset, packet_info *pinfo,
int dissect_rpcb_rmtcallres(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
/* Dissect the remote universal address. */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_portmap_rpcb_addr, offset, NULL);
/* Dissect the result of this procedure.

91
packet-rpc.c
View File

@ -2,7 +2,7 @@
* Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
* $Id: packet-rpc.c,v 1.89 2002/04/01 23:56:41 guy Exp $
* $Id: packet-rpc.c,v 1.90 2002/04/03 13:24:12 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -426,7 +426,7 @@ rpc_roundup(unsigned int a)
int
dissect_rpc_bool(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dissect_rpc_bool(tvbuff_t *tvb, proto_tree *tree,
int hfindex, int offset)
{
if (tree)
@ -436,7 +436,7 @@ int hfindex, int offset)
int
dissect_rpc_uint32(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dissect_rpc_uint32(tvbuff_t *tvb, proto_tree *tree,
int hfindex, int offset)
{
if (tree)
@ -446,7 +446,7 @@ int hfindex, int offset)
int
dissect_rpc_uint64(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dissect_rpc_uint64(tvbuff_t *tvb, proto_tree *tree,
int hfindex, int offset)
{
header_field_info *hfinfo;
@ -461,7 +461,7 @@ int hfindex, int offset)
static int
dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
dissect_rpc_opaque_data(tvbuff_t *tvb, int offset,
proto_tree *tree, int hfindex, gboolean string_data,
char **string_buffer_ret)
{
@ -636,20 +636,20 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
int
dissect_rpc_string(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dissect_rpc_string(tvbuff_t *tvb, proto_tree *tree,
int hfindex, int offset, char **string_buffer_ret)
{
offset = dissect_rpc_opaque_data(tvb, offset, pinfo, tree,
offset = dissect_rpc_opaque_data(tvb, offset, tree,
hfindex, TRUE, string_buffer_ret);
return offset;
}
int
dissect_rpc_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dissect_rpc_data(tvbuff_t *tvb, proto_tree *tree,
int hfindex, int offset)
{
offset = dissect_rpc_opaque_data(tvb, offset, pinfo, tree, hfindex,
offset = dissect_rpc_opaque_data(tvb, offset, tree, hfindex,
FALSE, NULL);
return offset;
@ -702,7 +702,7 @@ dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
lock_tree = proto_item_add_subtree(lock_item, ett_rpc_array);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rpc_array_len, offset);
while (num--) {
@ -714,7 +714,7 @@ dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
static int
dissect_rpc_authunix_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset)
dissect_rpc_authunix_cred(tvbuff_t* tvb, proto_tree* tree, int offset)
{
guint stamp;
guint uid;
@ -731,7 +731,7 @@ dissect_rpc_authunix_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, i
offset+0, 4, stamp);
offset += 4;
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_rpc_auth_machinename, offset, NULL);
uid = tvb_get_ntohl(tvb,offset+0);
@ -768,7 +768,7 @@ dissect_rpc_authunix_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, i
}
static int
dissect_rpc_authgss_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset)
dissect_rpc_authgss_cred(tvbuff_t* tvb, proto_tree* tree, int offset)
{
guint agc_v;
guint agc_proc;
@ -799,14 +799,14 @@ dissect_rpc_authgss_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, in
tvb, offset+0, 4, agc_svc);
offset += 4;
offset = dissect_rpc_data(tvb, pinfo, tree, hf_rpc_authgss_ctx,
offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_ctx,
offset);
return offset;
}
static int
dissect_rpc_authdes_desblock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dissect_rpc_authdes_desblock(tvbuff_t *tvb, proto_tree *tree,
int hfindex, int offset)
{
guint32 value_low;
@ -825,7 +825,7 @@ int hfindex, int offset)
}
static int
dissect_rpc_authdes_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset)
dissect_rpc_authdes_cred(tvbuff_t* tvb, proto_tree* tree, int offset)
{
guint adc_namekind;
guint window = 0;
@ -840,9 +840,9 @@ dissect_rpc_authdes_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, in
switch(adc_namekind)
{
case AUTHDES_NAMEKIND_FULLNAME:
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_rpc_authdes_netname, offset, NULL);
offset = dissect_rpc_authdes_desblock(tvb, pinfo, tree,
offset = dissect_rpc_authdes_desblock(tvb, tree,
hf_rpc_authdes_convkey, offset);
window = tvb_get_ntohl(tvb, offset+0);
proto_tree_add_uint(tree, hf_rpc_authdes_window, tvb, offset+0, 4,
@ -862,7 +862,7 @@ dissect_rpc_authdes_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, in
}
static int
dissect_rpc_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset)
dissect_rpc_cred(tvbuff_t* tvb, proto_tree* tree, int offset)
{
guint flavor;
guint length;
@ -885,7 +885,7 @@ dissect_rpc_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
switch (flavor) {
case AUTH_UNIX:
dissect_rpc_authunix_cred(tvb, pinfo, ctree, offset+8);
dissect_rpc_authunix_cred(tvb, ctree, offset+8);
break;
/*
case AUTH_SHORT:
@ -893,11 +893,11 @@ dissect_rpc_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
break;
*/
case AUTH_DES:
dissect_rpc_authdes_cred(tvb, pinfo, ctree, offset+8);
dissect_rpc_authdes_cred(tvb, ctree, offset+8);
break;
case RPCSEC_GSS:
dissect_rpc_authgss_cred(tvb, pinfo, ctree, offset+8);
dissect_rpc_authgss_cred(tvb, ctree, offset+8);
break;
default:
if (length)
@ -915,7 +915,7 @@ dissect_rpc_cred(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
* verifier we're decoding (CALL or REPLY).
*/
static int
dissect_rpc_verf(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset, int msg_type)
dissect_rpc_verf(tvbuff_t* tvb, proto_tree* tree, int offset, int msg_type)
{
guint flavor;
guint length;
@ -938,7 +938,7 @@ dissect_rpc_verf(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
case AUTH_UNIX:
proto_tree_add_uint(vtree, hf_rpc_auth_length, tvb,
offset+4, 4, length);
dissect_rpc_authunix_cred(tvb, pinfo, vtree, offset+8);
dissect_rpc_authunix_cred(tvb, vtree, offset+8);
break;
case AUTH_DES:
proto_tree_add_uint(vtree, hf_rpc_auth_length, tvb,
@ -948,7 +948,7 @@ dissect_rpc_verf(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
{
guint window;
dissect_rpc_authdes_desblock(tvb, pinfo, vtree,
dissect_rpc_authdes_desblock(tvb, vtree,
hf_rpc_authdes_timestamp, offset+8);
window = tvb_get_ntohl(tvb, offset+16);
proto_tree_add_uint(vtree, hf_rpc_authdes_windowverf, tvb,
@ -959,7 +959,7 @@ dissect_rpc_verf(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
/* must be an RPC_REPLY */
guint nickname;
dissect_rpc_authdes_desblock(tvb, pinfo, vtree,
dissect_rpc_authdes_desblock(tvb, vtree,
hf_rpc_authdes_timeverf, offset+8);
nickname = tvb_get_ntohl(tvb, offset+16);
proto_tree_add_uint(vtree, hf_rpc_authdes_nickname, tvb,
@ -967,7 +967,7 @@ dissect_rpc_verf(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
}
break;
case RPCSEC_GSS:
dissect_rpc_data(tvb, pinfo, vtree,
dissect_rpc_data(tvb, vtree,
hf_rpc_authgss_checksum, offset+4);
break;
default:
@ -985,19 +985,19 @@ dissect_rpc_verf(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset
}
static int
dissect_rpc_authgss_initarg(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset)
dissect_rpc_authgss_initarg(tvbuff_t* tvb, proto_tree* tree, int offset)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_rpc_authgss_token,
offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_token,
offset);
return offset;
}
static int
dissect_rpc_authgss_initres(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, int offset)
dissect_rpc_authgss_initres(tvbuff_t* tvb, proto_tree* tree, int offset)
{
int major, minor, window;
offset = dissect_rpc_data(tvb, pinfo, tree, hf_rpc_authgss_ctx,
offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_ctx,
offset);
major = tvb_get_ntohl(tvb,offset+0);
@ -1018,7 +1018,7 @@ dissect_rpc_authgss_initres(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree,
offset+0, 4, window);
offset += 4;
offset = dissect_rpc_data(tvb, pinfo, tree, hf_rpc_authgss_token,
offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_token,
offset);
return offset;
@ -1080,16 +1080,16 @@ dissect_rpc_authgss_integ_data(tvbuff_t *tvb, packet_info *pinfo,
dissect_function, progname);
}
offset += length - 4;
offset = dissect_rpc_data(tvb, pinfo, tree, hf_rpc_authgss_checksum,
offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_checksum,
offset);
return offset;
}
static int
dissect_rpc_authgss_priv_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
dissect_rpc_authgss_priv_data(tvbuff_t *tvb, proto_tree *tree, int offset)
{
offset = dissect_rpc_data(tvb, pinfo, tree, hf_rpc_authgss_data,
offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_data,
offset);
return offset;
}
@ -1217,7 +1217,7 @@ dissect_rpc_indir_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
Happens only with strange program versions or
non-existing dissectors.
Just show the arguments as opaque data. */
offset = dissect_rpc_data(tvb, pinfo, tree, args_id,
offset = dissect_rpc_data(tvb, tree, args_id,
offset);
return offset;
}
@ -1287,7 +1287,7 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* We haven't seen an RPC call for that conversation,
so we can't check for a reply to that call.
Just show the reply stuff as opaque data. */
offset = dissect_rpc_data(tvb, pinfo, tree, result_id,
offset = dissect_rpc_data(tvb, tree, result_id,
offset);
return offset;
}
@ -1300,7 +1300,7 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* The XID doesn't match a call from that
conversation, so it's probably not an RPC reply.
Just show the reply stuff as opaque data. */
offset = dissect_rpc_data(tvb, pinfo, tree, result_id,
offset = dissect_rpc_data(tvb, tree, result_id,
offset);
return offset;
}
@ -1338,7 +1338,7 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (dissect_function == NULL) {
/* We don't know how to dissect the reply procedure.
Just show the reply stuff as opaque data. */
offset = dissect_rpc_data(tvb, pinfo, tree, result_id,
offset = dissect_rpc_data(tvb, tree, result_id,
offset);
return offset;
}
@ -1782,8 +1782,8 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset += 16;
offset = dissect_rpc_cred(tvb, pinfo, rpc_tree, offset);
offset = dissect_rpc_verf(tvb, pinfo, rpc_tree, offset, msg_type);
offset = dissect_rpc_cred(tvb, rpc_tree, offset);
offset = dissect_rpc_verf(tvb, rpc_tree, offset, msg_type);
/* pass rpc_info to subdissectors */
rpc_call->request=TRUE;
@ -1905,7 +1905,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset += 4;
if (reply_state == MSG_ACCEPTED) {
offset = dissect_rpc_verf(tvb, pinfo, rpc_tree, offset, msg_type);
offset = dissect_rpc_verf(tvb, rpc_tree, offset, msg_type);
accept_state = tvb_get_ntohl(tvb,offset+0);
if (rpc_tree) {
proto_tree_add_uint(rpc_tree, hf_rpc_state_accept, tvb,
@ -2047,11 +2047,11 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case RPCSEC_GSS_CONTINUE_INIT:
if (msg_type == RPC_CALL) {
offset = dissect_rpc_authgss_initarg(tvb,
pinfo, ptree, offset);
ptree, offset);
}
else {
offset = dissect_rpc_authgss_initres(tvb,
pinfo, ptree, offset);
ptree, offset);
}
break;
@ -2070,7 +2070,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
else if (gss_svc == RPCSEC_GSS_SVC_PRIVACY) {
offset = dissect_rpc_authgss_priv_data(tvb,
pinfo, ptree, offset);
ptree, offset);
}
break;
@ -2287,7 +2287,6 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
conversation_t *conversation;
fragment_data *ipfd_head;
tvbuff_t *rec_tvb;
fragment_data *ipfd;
/*
* Get the record mark.

12
packet-rpc.h
View File

@ -1,6 +1,6 @@
/* packet-rpc.h
*
* $Id: packet-rpc.h,v 1.34 2002/04/02 00:18:53 guy Exp $
* $Id: packet-rpc.h,v 1.35 2002/04/03 13:24:13 girlich Exp $
*
* (c) 1999 Uwe Girlich
*
@ -113,20 +113,20 @@ extern char *rpc_prog_name(guint32 prog);
extern char *rpc_proc_name(guint32 prog, guint32 vers, guint32 proc);
extern unsigned int rpc_roundup(unsigned int a);
extern int dissect_rpc_bool(tvbuff_t *tvb, packet_info *pinfo,
extern int dissect_rpc_bool(tvbuff_t *tvb,
proto_tree *tree, int hfindex, int offset);
extern int dissect_rpc_string(tvbuff_t *tvb, packet_info *pinfo,
extern int dissect_rpc_string(tvbuff_t *tvb,
proto_tree *tree, int hfindex, int offset, char **string_buffer_ret);
extern int dissect_rpc_data(tvbuff_t *tvb, packet_info *pinfo,
extern int dissect_rpc_data(tvbuff_t *tvb,
proto_tree *tree, int hfindex, int offset);
extern int dissect_rpc_list(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, int offset, dissect_function_t *rpc_list_dissector);
extern int dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, int offset, dissect_function_t *rpc_array_dissector,
int hfindex);
extern int dissect_rpc_uint32(tvbuff_t *tvb, packet_info *pinfo,
extern int dissect_rpc_uint32(tvbuff_t *tvb,
proto_tree *tree, int hfindex, int offset);
extern int dissect_rpc_uint64(tvbuff_t *tvb, packet_info *pinfo,
extern int dissect_rpc_uint64(tvbuff_t *tvb,
proto_tree *tree, int hfindex, int offset);
extern int dissect_rpc_indir_call(tvbuff_t *tvb, packet_info *pinfo,

36
packet-rquota.c
View File

@ -2,7 +2,7 @@
* Routines for rquota dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
* $Id: packet-rquota.c,v 1.6 2002/01/24 09:20:51 guy Exp $
* $Id: packet-rquota.c,v 1.7 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -70,7 +70,7 @@ static const value_string names_rquota_status[] =
static int
dissect_rquota(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_rquota(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_item *lock_item = NULL;
@ -81,63 +81,63 @@ dissect_rquota(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
lock_tree = proto_item_add_subtree(lock_item, ett_rquota_rquota);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_bsize, offset);
offset = dissect_rpc_bool(tvb, pinfo, lock_tree,
offset = dissect_rpc_bool(tvb, lock_tree,
hf_rquota_active, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_bhardlimit, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_bsoftlimit, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_curblocks, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_fhardlimit, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_fsoftlimit, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_curfiles, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_btimeleft, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_rquota_ftimeleft, offset);
return offset;
}
static int
dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
gint32 status;
status = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_rquota_status, offset);
if (status==Q_OK) {
offset = dissect_rquota(tvb, offset, pinfo, tree);
offset = dissect_rquota(tvb, offset, tree);
}
return offset;
}
static int
dissect_getquota_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_getquota_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_rquota_pathp, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_rquota_uid, offset);
return offset;

6
packet-rwall.c
View File

@ -1,6 +1,6 @@
/* packet-rwall.c
*
* $Id: packet-rwall.c,v 1.4 2001/06/18 02:17:52 guy Exp $
* $Id: packet-rwall.c,v 1.5 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -40,9 +40,9 @@ static int hf_rwall_message = -1;
static gint ett_rwall = -1;
static int
dissect_rwall_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_rwall_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_rwall_message, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_rwall_message, offset, NULL);
return offset;
}

14
packet-spray.c
View File

@ -1,7 +1,7 @@
/* packet-spray.c
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
* $Id: packet-spray.c,v 1.7 2002/01/24 09:20:51 guy Exp $
* $Id: packet-spray.c,v 1.8 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -47,12 +47,12 @@ static gint ett_spray_clock = -1;
static int
dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_spray_counter, offset);
lock_item = proto_tree_add_item(tree, hf_spray_clock, tvb,
@ -60,19 +60,19 @@ dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
lock_tree = proto_item_add_subtree(lock_item, ett_spray_clock);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_spray_sec, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_spray_usec, offset);
return offset;
}
static int
dissect_spray_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_spray_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_data(tvb, pinfo, tree,
offset = dissect_rpc_data(tvb, tree,
hf_spray_sprayarr, offset);
return offset;

8
packet-stat-notify.c
View File

@ -2,7 +2,7 @@
* Routines for async NSM stat callback dissection
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
* $Id: packet-stat-notify.c,v 1.8 2001/12/23 21:36:57 guy Exp $
* $Id: packet-stat-notify.c,v 1.9 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -44,12 +44,12 @@ static gint ett_statnotify = -1;
static int
dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb,pinfo,tree,hf_statnotify_name,offset,NULL);
offset = dissect_rpc_string(tvb,tree,hf_statnotify_name,offset,NULL);
offset = dissect_rpc_uint32(tvb,pinfo,tree,hf_statnotify_state,offset);
offset = dissect_rpc_uint32(tvb,tree,hf_statnotify_state,offset);
proto_tree_add_item(tree,hf_statnotify_priv,tvb,offset,16,FALSE);
offset += 16;

46
packet-stat.c
View File

@ -1,7 +1,7 @@
/* packet-stat.c
* Routines for stat dissection
*
* $Id: packet-stat.c,v 1.14 2002/03/05 11:04:15 guy Exp $
* $Id: packet-stat.c,v 1.15 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -109,18 +109,18 @@ mon_id_len(tvbuff_t *tvb, int offset)
}
static int
dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if (tree)
{
offset = dissect_rpc_string(tvb,pinfo,tree,hf_stat_mon_name,offset,NULL);
offset = dissect_rpc_string(tvb,tree,hf_stat_mon_name,offset,NULL);
}
return offset;
}
static int
dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* sub_item = NULL;
proto_tree* sub_tree = NULL;
@ -135,11 +135,11 @@ dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
res = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb,pinfo,sub_tree,hf_stat_stat_res_res,offset);
offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_stat_res_res,offset);
if (res==STAT_SUCC) {
state = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb,pinfo,sub_tree,hf_stat_stat_res_state,offset);
offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_stat_res_state,offset);
} else {
offset += 4;
}
@ -148,7 +148,7 @@ dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
static int
dissect_stat_my_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_item* sub_item = NULL;
proto_tree* sub_tree = NULL;
@ -160,16 +160,16 @@ dissect_stat_my_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
sub_tree = proto_item_add_subtree(sub_item, ett_stat_my_id);
}
offset = dissect_rpc_string(tvb,pinfo,sub_tree,hf_stat_my_id_hostname,offset,NULL);
offset = dissect_rpc_uint32(tvb,pinfo,sub_tree,hf_stat_my_id_prog,offset);
offset = dissect_rpc_uint32(tvb,pinfo,sub_tree,hf_stat_my_id_vers,offset);
offset = dissect_rpc_uint32(tvb,pinfo,sub_tree,hf_stat_my_id_proc,offset);
offset = dissect_rpc_string(tvb,sub_tree,hf_stat_my_id_hostname,offset,NULL);
offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_my_id_prog,offset);
offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_my_id_vers,offset);
offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_my_id_proc,offset);
return offset;
}
static int
dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* sub_item = NULL;
proto_tree* sub_tree = NULL;
@ -182,15 +182,15 @@ dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
}
offset = dissect_rpc_string(tvb,pinfo,sub_tree,hf_stat_mon_id_name,offset,NULL);
offset = dissect_rpc_string(tvb,sub_tree,hf_stat_mon_id_name,offset,NULL);
offset = dissect_stat_my_id(tvb,offset,pinfo,sub_tree);
offset = dissect_stat_my_id(tvb,offset,sub_tree);
return offset;
}
static int
dissect_stat_priv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_priv(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_tree_add_item(tree, hf_stat_priv, tvb, offset, 16, FALSE);
offset += 16;
@ -204,20 +204,20 @@ dissect_stat_mon(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
offset = dissect_stat_mon_id(tvb,offset,pinfo,tree);
offset = dissect_stat_priv(tvb,offset,pinfo,tree);
offset = dissect_stat_priv(tvb,offset,tree);
return offset;
}
static int
dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb,pinfo,tree,hf_stat_state,offset);
offset = dissect_rpc_uint32(tvb,tree,hf_stat_state,offset);
return offset;
}
static int
dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item* sub_item = NULL;
proto_tree* sub_tree = NULL;
@ -230,9 +230,9 @@ dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_chge);
}
offset = dissect_rpc_string(tvb,pinfo,sub_tree,hf_stat_mon_id_name,offset,NULL);
offset = dissect_rpc_string(tvb,sub_tree,hf_stat_mon_id_name,offset,NULL);
offset = dissect_rpc_uint32(tvb,pinfo,tree,hf_stat_state,offset);
offset = dissect_rpc_uint32(tvb,tree,hf_stat_state,offset);
if(sub_item)
proto_item_set_len(sub_item, offset - start_offset);
@ -241,9 +241,9 @@ dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
}
static int
dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_stat_my_id(tvb,offset,pinfo,tree);
offset = dissect_stat_my_id(tvb,offset,tree);
return offset;
}

22
packet-ypbind.c
View File

@ -1,7 +1,7 @@
/* packet-ypbind.c
* Routines for ypbind dissection
*
* $Id: packet-ypbind.c,v 1.10 2002/04/02 01:32:46 guy Exp $
* $Id: packet-ypbind.c,v 1.11 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -51,10 +51,10 @@ static gint ett_ypbind = -1;
static int
dissect_ypbind_domain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypbind_domain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
/* domain */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ypbind_domain, offset, NULL);
return offset;
@ -79,13 +79,13 @@ static const value_string error_vals[] = {
};
static int
dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 type;
/* response type */
type=tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypbind_resp_type, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypbind_resp_type, offset);
switch(type){
case YPBIND_RESP_TYPE_SUCC_VAL:
@ -95,13 +95,13 @@ dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
offset += 4;
/* port */
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_ypbind_port, offset);
break;
case YPBIND_RESP_TYPE_FAIL_VAL:
/* error */
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_ypbind_resp_type, offset);
break;
}
@ -110,10 +110,10 @@ dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
}
static int
dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
/* domain */
offset = dissect_rpc_string(tvb, pinfo, tree,
offset = dissect_rpc_string(tvb, tree,
hf_ypbind_domain, offset, NULL);
/* ip address */
@ -122,11 +122,11 @@ dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinf
offset += 4;
/* port */
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_ypbind_port, offset);
/* version */
offset = dissect_rpc_uint32(tvb, pinfo, tree,
offset = dissect_rpc_uint32(tvb, tree,
hf_ypbind_setdom_version, offset);
return offset;

24
packet-yppasswd.c
View File

@ -1,7 +1,7 @@
/* packet-yppasswd.c
* Routines for yppasswd dissection
*
* $Id: packet-yppasswd.c,v 1.5 2002/01/24 09:20:54 guy Exp $
* $Id: packet-yppasswd.c,v 1.6 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -51,12 +51,12 @@ static gint ett_yppasswd = -1;
static gint ett_yppasswd_newpw = -1;
static int
dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item *lock_item = NULL;
proto_tree *lock_tree = NULL;
offset = dissect_rpc_string(tvb, pinfo, tree, hf_yppasswd_oldpass,
offset = dissect_rpc_string(tvb, tree, hf_yppasswd_oldpass,
offset, NULL);
lock_item = proto_tree_add_item(tree, hf_yppasswd_newpw, tvb,
@ -64,28 +64,28 @@ dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
lock_tree = proto_item_add_subtree(lock_item, ett_yppasswd_newpw);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_yppasswd_newpw_name, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_yppasswd_newpw_passwd, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_yppasswd_newpw_uid, offset);
offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
offset = dissect_rpc_uint32(tvb, lock_tree,
hf_yppasswd_newpw_gid, offset);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_yppasswd_newpw_gecos, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_yppasswd_newpw_dir, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, lock_tree,
offset = dissect_rpc_string(tvb, lock_tree,
hf_yppasswd_newpw_shell, offset, NULL);
return offset;
}
static int
dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_yppasswd_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_yppasswd_status, offset);
return offset;
}

100
packet-ypserv.c
View File

@ -1,7 +1,7 @@
/* packet-ypserv.c
* Routines for ypserv dissection
*
* $Id: packet-ypserv.c,v 1.21 2002/04/02 01:32:46 guy Exp $
* $Id: packet-ypserv.c,v 1.22 2002/04/03 13:24:13 girlich Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -97,18 +97,18 @@ static const value_string xfrstat[] =
};
static int
dissect_domain_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_domain_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_string(tvb,pinfo,tree,hf_ypserv_domain,offset,NULL);
offset = dissect_rpc_string(tvb,tree,hf_ypserv_domain,offset,NULL);
}
return offset;
}
static int
dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
@ -121,26 +121,26 @@ dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
}
static int
dissect_match_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_match_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_key, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL);
}
return offset;
}
static int
dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_status, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_value,offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_value,offset, NULL);
}
return offset;
@ -148,7 +148,7 @@ dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
static int
dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
/*
* XXX - does Sun's "yp.x" lie, and claim that the argument to a
@ -170,8 +170,8 @@ dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
if ( tree )
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL);
}
return offset;
@ -179,14 +179,14 @@ dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
static int
dissect_firstnext_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_firstnext_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_status, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_value, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_key, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_value, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL);
}
return offset;
@ -194,20 +194,20 @@ dissect_firstnext_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
static int
dissect_next_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_next_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if ( tree )
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_key, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL);
}
return offset;
}
static int
dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_item *sub_item=NULL;
proto_tree *sub_tree=NULL;
@ -220,19 +220,19 @@ dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
sub_tree = proto_item_add_subtree(sub_item, ett_ypserv_map_parms);
}
offset = dissect_rpc_string(tvb, pinfo, sub_tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, sub_tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, sub_tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, sub_tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_uint32(tvb, pinfo, sub_tree, hf_ypserv_ordernum, offset);
offset = dissect_rpc_uint32(tvb, sub_tree, hf_ypserv_ordernum, offset);
offset = dissect_rpc_string(tvb, pinfo, sub_tree, hf_ypserv_peer, offset, NULL);
offset = dissect_rpc_string(tvb, sub_tree, hf_ypserv_peer, offset, NULL);
proto_tree_add_item(tree, hf_ypserv_transid, tvb, offset, 4, FALSE);
offset += 4;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_prog, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_port, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_prog, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_port, offset);
if(sub_item)
proto_item_set_len(sub_item, offset - start_offset);
@ -241,80 +241,80 @@ dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
}
static int
dissect_xfr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_xfr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_tree_add_item(tree, hf_ypserv_transid, tvb, offset, 4, FALSE);
offset += 4;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_xfrstat, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_xfrstat, offset);
return offset;
}
static int
dissect_ypreq_nokey(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypreq_nokey(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_domain, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL);
return offset;
}
static int
dissect_ypresp_all(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypresp_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
guint32 more;
for (;;) {
more = tvb_get_ntohl(tvb, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_more, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_more, offset);
if (!more)
break;
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_status, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_value, offset, NULL);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_key, offset, NULL);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_status, offset);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_value, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL);
}
return offset;
}
static int
dissect_ypresp_master(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypresp_master(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_status, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_peer, offset, NULL);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_peer, offset, NULL);
return offset;
}
static int
dissect_ypresp_order(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypresp_order(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_status, offset);
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_ordernum, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_ordernum, offset);
return offset;
}
static int
dissect_ypresp_maplist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
dissect_ypresp_maplist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_status, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_status, offset);
while(tvb_get_ntohl(tvb,offset)){
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_more, offset);
offset = dissect_rpc_string(tvb, pinfo, tree, hf_ypserv_map, offset, NULL);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_more, offset);
offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL);
}
offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_ypserv_more, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_ypserv_more, offset);
return offset;
}