diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-07-18 23:23:32 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-07-19 06:24:18 +0000 |
| commit | 7e817aeb3a3cee7c3eb3e7685ab0ccf98a00411b (patch) | |
| tree | f78ac4b87035ce2db1c46386be5955e26412bf75 /epan/dissectors/packet-ypserv.c | |
| parent | 75d4fa299da240d5598b963602fa3b0c1d133dcb (diff) | |
Require dissectors for all ONC RPC calls and replies.
Either there's a known body for the call or reply, in which case we
already have a dissector for it, or the body is empty, in which case we
now have dissect_rpc_void() to dissect it, or the body is unknown or
nobody's bothered writing it, in which case we use dissect_rpc_unknown()
for now.
This means that an attempt to look up the dissector for a known
procedure will always succeed, so we can label it with the name rather
than with "proc-N".
It also means that we distinguish between "it's void" and "it's
unknown", so that unknown values will get flagged as such.
Change-Id: I748580c1dca61d1f0972396db1a3b0885fc0a541
Reviewed-on: https://code.wireshark.org/review/9699
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ypserv.c')
| -rw-r--r-- | epan/dissectors/packet-ypserv.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index 8bbb7b573a..fe20621dfe 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -476,35 +476,34 @@ dissect_maplist_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: type of arguments is "void". */ /* someone please get me a version 1 trace */ static const vsff ypserv1_proc[] = { { 0, "NULL", - NULL, NULL }, + dissect_rpc_void, dissect_rpc_void }, { YPPROC_DOMAIN, "DOMAIN", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_DOMAIN_NONACK, "DOMAIN_NONACK", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_MATCH, "MATCH", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_FIRST, "FIRST", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_NEXT, "NEXT", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_XFR, "XFR", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_CLEAR, "CLEAR", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_ALL, "ALL", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_MASTER, "MASTER", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_ORDER, "ORDER", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { YPPROC_MAPLIST, "MAPLIST", - NULL, NULL }, + dissect_rpc_unknown, dissect_rpc_unknown }, { 0, NULL, NULL, NULL } }; @@ -526,11 +525,10 @@ static const value_string ypserv1_proc_vals[] = { /* end of YPServ version 1 */ /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: type of arguments is "void". */ static const vsff ypserv2_proc[] = { { 0, "NULL", - NULL, NULL }, + dissect_rpc_void, dissect_rpc_void }, { YPPROC_DOMAIN, "DOMAIN", dissect_domain_call, dissect_domain_reply }, { YPPROC_DOMAIN_NONACK, "DOMAIN_NONACK", |