diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-05-30 06:01:02 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-05-30 06:01:02 +0000 |
| commit | abd9fc125fdde3f1f49925bd3b6aa3cf2ee98307 (patch) | |
| tree | 7f231a2dd06425261851ed6ebafe2f46333fc5ee /packet-portmap.c | |
| parent | e38a3ef330eb84cd6cd1c892f7f2413eef705b2c (diff) | |
| download | wireshark-abd9fc125fdde3f1f49925bd3b6aa3cf2ee98307.tar.gz wireshark-abd9fc125fdde3f1f49925bd3b6aa3cf2ee98307.tar.bz2 wireshark-abd9fc125fdde3f1f49925bd3b6aa3cf2ee98307.zip | |
There are no more old-style (non-tvbuffified) ONC RPC dissectors, so get
rid of support for them, and remove the "_tvb" from the end of the names
of RPC type dissection routines.
Update Gerald's e-mail address.
svn path=/trunk/; revision=3477
Diffstat (limited to 'packet-portmap.c')
| -rw-r--r-- | packet-portmap.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/packet-portmap.c b/packet-portmap.c index 2aa5f45fb3..57e8c4ebd1 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,10 +1,10 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.29 2001/04/17 06:29:12 guy Exp $ + * $Id: packet-portmap.c,v 1.30 2001/05/30 06:01:02 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 @@ -97,7 +97,7 @@ int dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, hf_portmap_port, + offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_portmap_port, offset); return offset; } @@ -159,7 +159,7 @@ int dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_set_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_portmap_answer, + offset = dissect_rpc_bool(tvb, pinfo, tree, hf_portmap_answer, offset); return offset; } @@ -200,7 +200,7 @@ dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_list_tvb(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_dump_entry); return offset; } @@ -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(tvb, pinfo, rpcb_tree, + offset = dissect_rpc_uint32(tvb, pinfo, rpcb_tree, hf_portmap_rpcb_version, offset); - offset = dissect_rpc_string_tvb(tvb, pinfo, rpcb_tree, + offset = dissect_rpc_string(tvb, pinfo, rpcb_tree, hf_portmap_rpcb_netid, offset, NULL); - offset = dissect_rpc_string_tvb(tvb, pinfo, rpcb_tree, + offset = dissect_rpc_string(tvb, pinfo, rpcb_tree, hf_portmap_rpcb_addr, offset, NULL); - offset = dissect_rpc_string_tvb(tvb, pinfo, rpcb_tree, + offset = dissect_rpc_string(tvb, pinfo, rpcb_tree, hf_portmap_rpcb_owner, offset, NULL); /* now we know, that rpcb is shorter */ @@ -355,7 +355,7 @@ int dissect_rpcb3_getaddr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_rpcb3_getaddr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string_tvb(tvb, pinfo, tree, + offset = dissect_rpc_string(tvb, pinfo, tree, hf_portmap_uaddr, offset, NULL); return offset; @@ -366,7 +366,7 @@ int dissect_rpcb3_getaddr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_rpcb3_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_list_tvb(tvb, pinfo, tree, offset, dissect_rpcb); + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_rpcb); return offset; } @@ -375,7 +375,7 @@ int dissect_rpcb_rmtcallres(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { /* Dissect the remote universal address. */ - offset = dissect_rpc_string_tvb(tvb, pinfo, tree, + offset = dissect_rpc_string(tvb, pinfo, tree, hf_portmap_rpcb_addr, offset, NULL); /* Dissect the result of this procedure. |