/* packet-bootparams.c
* Routines for bootparams dissection
*
- * $Id: packet-bootparams.c,v 1.15 2001/01/18 09:55:09 guy Exp $
+ * $Id: packet-bootparams.c,v 1.19 2001/06/18 02:17:45 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
static int hf_bootparams_filepath = -1;
static int hf_bootparams_hostaddr = -1;
static int hf_bootparams_routeraddr = -1;
+static int hf_bootparams_addresstype = -1;
static gint ett_bootparams = -1;
-int dissect_bp_address(const u_char *pd, int offset, frame_data *fd,
- proto_tree *tree, int hfindex)
+
+static const value_string addr_type[] =
+{
+ { 1, "IPv4-ADDR" },
+ { 0, NULL }
+};
+
+static int
+dissect_bp_address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hfindex)
{
guint32 type;
guint32 ipaddr;
- /* get the address type */
- if ( !BYTES_ARE_IN_FRAME(offset, 1)) return offset;
- type = pntohl(&pd[offset]); /* type of address */
-/*
-ZZZZZZZZZZZZZZZZZZZ Check type:
- proto_tree_add_item(tree, hf_bootparams_addresstype, NullTVB,
- offset, 4, type);
-*/
- offset += 4;
-
- if ( type != 1 ) /* only know how to handle this type of address */
- {
- return offset;
- }
- /* get the address itself - weird ass format */
- if ( ! BYTES_ARE_IN_FRAME(offset, 16)) return offset;
- ipaddr = (pd[offset+3]<<24) + (pd[offset+7]<<16) +
- (pd[offset+11]<<8) + (pd[offset+15]);
- proto_tree_add_ipv4(tree, hfindex, NullTVB,
- offset, 16, ntohl(ipaddr));
- offset += 16;
+ type = tvb_get_ntohl(tvb, offset);
+
+ offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_bootparams_addresstype, offset);
+
+ switch(type){
+ case 1:
+ ipaddr = ((tvb_get_guint8(tvb, offset+3 )&0xff)<<24)
+ |((tvb_get_guint8(tvb, offset+7 )&0xff)<<16)
+ |((tvb_get_guint8(tvb, offset+11)&0xff)<<8 )
+ |((tvb_get_guint8(tvb, offset+15)&0xff) );
+ proto_tree_add_ipv4(tree, hfindex, tvb,
+ offset, 16, ntohl(ipaddr));
+ offset += 16;
+ break;
+
+ default:
+ break;
+ }
return offset;
}
-/* Dissect a getfile call */
-int dissect_getfile_call(const u_char *pd, int offset, frame_data *fd,
- proto_tree *tree)
+static int
+dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
if ( tree )
{
- offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_host,NULL);
- offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_fileid,NULL);
+ offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
+ offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_fileid, offset, NULL);
}
return offset;
}
-/* Dissect a getfile reply */
-int dissect_getfile_reply(const u_char *pd, int offset, frame_data *fd,
- proto_tree *tree)
+static int
+dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
if ( tree )
{
- offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_host,NULL);
- offset = dissect_bp_address(pd,offset,fd,tree,hf_bootparams_hostaddr);
- offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_filepath,NULL);
+ 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);
}
return offset;
}
-/* Dissect a whoami call */
-int dissect_whoami_call(const u_char *pd, int offset, frame_data *fd,
- proto_tree *tree)
+static int
+dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
if ( tree )
{
- offset = dissect_bp_address(pd,offset,fd,tree,hf_bootparams_hostaddr);
+ offset = dissect_bp_address(tvb, offset, pinfo, tree, hf_bootparams_hostaddr);
}
return offset;
}
-/* Dissect a whoami reply */
-int dissect_whoami_reply(const u_char *pd, int offset, frame_data *fd,
- proto_tree *tree)
+static int
+dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
if ( tree )
{
- offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_host,NULL);
- offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_domain,NULL);
- offset = dissect_bp_address(pd,offset,fd,tree,hf_bootparams_routeraddr);
+ 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);
}
return offset;
static hf_register_info hf[] = {
{ &hf_bootparams_host, {
"Client Host", "bootparams.host", FT_STRING, BASE_DEC,
- NULL, 0, "Client Host" }},
+ NULL, 0, "Client Host", HFILL }},
{ &hf_bootparams_domain, {
"Client Domain", "bootparams.domain", FT_STRING, BASE_DEC,
- NULL, 0, "Client Domain" }},
+ NULL, 0, "Client Domain", HFILL }},
{ &hf_bootparams_fileid, {
"File ID", "bootparams.fileid", FT_STRING, BASE_DEC,
- NULL, 0, "File ID" }},
+ NULL, 0, "File ID", HFILL }},
{ &hf_bootparams_filepath, {
"File Path", "bootparams.filepath", FT_STRING, BASE_DEC,
- NULL, 0, "File Path" }},
+ NULL, 0, "File Path", HFILL }},
{ &hf_bootparams_hostaddr, {
"Client Address", "bootparams.hostaddr", FT_IPv4, BASE_DEC,
- NULL, 0, "Address" }},
+ NULL, 0, "Address", HFILL }},
{ &hf_bootparams_routeraddr, {
"Router Address", "bootparams.routeraddr", FT_IPv4, BASE_DEC,
- NULL, 0, "Router Address" }},
+ NULL, 0, "Router Address", HFILL }},
+ { &hf_bootparams_addresstype, {
+ "Address Type", "bootparams.type", FT_UINT32, BASE_DEC,
+ VALS(addr_type), 0, "Address Type", HFILL }},
};
static gint *ett[] = {
&ett_bootparams,
git.samba.org / obnox / wireshark / wip.git / blobdiff