forked from osmocom/wireshark
KLM support, from Ronnie Sahlberg.
svn path=/trunk/; revision=3345
This commit is contained in:
Guy Harris
parent
4ead3692a3
commit
5827d2e45b
1
AUTHORS
1
AUTHORS
|
|
@ -501,6 +501,7 @@ Ronnie Sahlberg <rsahlber@bigpond.net.au> {
|
|||
HCLNFSD dissector enhancements
|
||||
IP fragment reassembly
|
||||
YPPASSWD support
|
||||
KLM support
|
||||
}
|
||||
|
||||
Borosa Tomislav <tomislav.borosa@SIEMENS.HR> {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.am
|
||||
# Automake file for Ethereal
|
||||
#
|
||||
# $Id: Makefile.am,v 1.310 2001/04/20 04:16:18 guy Exp $
|
||||
# $Id: Makefile.am,v 1.311 2001/04/20 18:37:53 guy Exp $
|
||||
#
|
||||
# Ethereal - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -138,6 +138,7 @@ DISSECTOR_SOURCES = \
|
|||
packet-isl.c \
|
||||
packet-iua.c \
|
||||
packet-kerberos.c \
|
||||
packet-klm.c \
|
||||
packet-l2tp.c \
|
||||
packet-lapb.c \
|
||||
packet-lapbether.c \
|
||||
|
|
@ -278,6 +279,7 @@ noinst_HEADERS = \
|
|||
packet-isis-lsp.h \
|
||||
packet-isis-snp.h \
|
||||
packet-isl.h \
|
||||
packet-klm.h \
|
||||
packet-ldap.h \
|
||||
packet-llc.h \
|
||||
packet-mount.h \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||
#
|
||||
# $Id: Makefile.nmake,v 1.99 2001/04/20 04:16:18 guy Exp $
|
||||
# $Id: Makefile.nmake,v 1.100 2001/04/20 18:37:53 guy Exp $
|
||||
|
||||
include config.nmake
|
||||
include <win32.mak>
|
||||
|
|
@ -91,6 +91,7 @@ DISSECTOR_SOURCES = \
|
|||
packet-isl.c \
|
||||
packet-iua.c \
|
||||
packet-kerberos.c \
|
||||
packet-klm.c \
|
||||
packet-l2tp.c \
|
||||
packet-lapb.c \
|
||||
packet-lapbether.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,258 @@
|
|||
/* packet-klm.c 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au>
|
||||
* Routines for klm dissection
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
|
||||
#include "packet-rpc.h"
|
||||
#include "packet-nfs.h"
|
||||
#include "packet-klm.h"
|
||||
|
||||
static int proto_klm = -1;
|
||||
static int hf_klm_exclusive = -1;
|
||||
static int hf_klm_lock = -1;
|
||||
static int hf_klm_servername = -1;
|
||||
static int hf_klm_pid = -1;
|
||||
static int hf_klm_offset = -1;
|
||||
static int hf_klm_len = -1;
|
||||
static int hf_klm_stats = -1;
|
||||
static int hf_klm_holder = -1;
|
||||
static int hf_klm_block = -1;
|
||||
|
||||
static gint ett_klm = -1;
|
||||
static gint ett_klm_lock = -1;
|
||||
static gint ett_klm_holder = -1;
|
||||
|
||||
const value_string names_klm_stats[] =
|
||||
{
|
||||
#define KLM_GRANTED 0
|
||||
{ KLM_GRANTED, "KLM_GRANTED" },
|
||||
#define KLM_DENIED 1
|
||||
{ KLM_DENIED, "KLM_DENIED" },
|
||||
#define KLM_DENIED_NOLOCKS 2
|
||||
{ KLM_DENIED_NOLOCKS, "KLM_DENIED_NOLOCKS" },
|
||||
#define KLM_WORKING 3
|
||||
{ KLM_WORKING, "KLM_WORKING" },
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_holder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
|
||||
{
|
||||
proto_item* lock_item = NULL;
|
||||
proto_tree* lock_tree = NULL;
|
||||
|
||||
lock_item = proto_tree_add_item(tree, hf_klm_holder, tvb,
|
||||
offset, tvb_length_remaining(tvb, offset), FALSE);
|
||||
|
||||
lock_tree = proto_item_add_subtree(lock_item, ett_klm_holder);
|
||||
|
||||
offset = dissect_rpc_bool_tvb( tvb, pinfo, lock_tree,
|
||||
hf_klm_exclusive, offset);
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_pid, offset);
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_offset, offset);
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_len, offset);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
|
||||
{
|
||||
proto_item* lock_item = NULL;
|
||||
proto_tree* lock_tree = NULL;
|
||||
|
||||
lock_item = proto_tree_add_item(tree, hf_klm_lock, tvb,
|
||||
offset, tvb_length_remaining(tvb, offset), FALSE);
|
||||
|
||||
lock_tree = proto_item_add_subtree(lock_item, ett_klm_lock);
|
||||
|
||||
offset = dissect_rpc_string_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_servername, offset, NULL);
|
||||
|
||||
offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh");
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_pid, offset);
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_offset, offset);
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree,
|
||||
hf_klm_len, offset);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_klm_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
offset = dissect_lock(tvb, pinfo, tree, offset);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree,
|
||||
hf_klm_stats, offset);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
offset = dissect_rpc_bool_tvb( tvb, pinfo, tree,
|
||||
hf_klm_block, offset);
|
||||
|
||||
offset = dissect_rpc_bool_tvb( tvb, pinfo, tree,
|
||||
hf_klm_exclusive, offset);
|
||||
|
||||
offset = dissect_lock(tvb, pinfo, tree, offset);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
gint32 stats;
|
||||
|
||||
stats = tvb_get_ntohl(tvb, offset);
|
||||
|
||||
offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree,
|
||||
hf_klm_stats, offset);
|
||||
|
||||
if (stats == KLM_DENIED) {
|
||||
offset = dissect_holder(tvb, pinfo, tree, offset);
|
||||
}
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_klm_test_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
offset = dissect_rpc_bool_tvb( tvb, pinfo, tree,
|
||||
hf_klm_exclusive, offset);
|
||||
|
||||
offset = dissect_lock(tvb, pinfo, tree, offset);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
/* proc number, "proc name", dissect_request, dissect_reply */
|
||||
/* NULL as function pointer means: type of arguments is "void". */
|
||||
static const vsff klm1_proc[] = {
|
||||
{ KLMPROC_TEST, "TEST",
|
||||
dissect_klm_test_call, dissect_klm_test_reply },
|
||||
{ KLMPROC_LOCK, "LOCK",
|
||||
dissect_klm_lock_call, dissect_klm_stat_reply },
|
||||
{ KLMPROC_CANCEL, "CANCEL",
|
||||
dissect_klm_lock_call, dissect_klm_stat_reply },
|
||||
{ KLMPROC_UNLOCK, "UNLOCK",
|
||||
dissect_klm_unlock_call, dissect_klm_stat_reply },
|
||||
{ 0, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
void
|
||||
proto_register_klm(void)
|
||||
{
|
||||
static struct true_false_string tfs_exclusive = { "Exclusive", "Not exclusive" };
|
||||
static struct true_false_string tfs_block = { "Block", "Do not block" };
|
||||
|
||||
static hf_register_info hf[] = {
|
||||
{ &hf_klm_exclusive, {
|
||||
"exclusive", "klm.exclusive", FT_BOOLEAN, BASE_NONE,
|
||||
&tfs_exclusive, 0, "Exclusive lock" }},
|
||||
|
||||
{ &hf_klm_lock, {
|
||||
"lock", "klm.lock", FT_NONE, BASE_NONE,
|
||||
NULL, 0, "KLM lock structure" }},
|
||||
|
||||
{ &hf_klm_servername, {
|
||||
"server name", "klm.servername", FT_STRING, BASE_NONE,
|
||||
NULL, 0, "Server name" }},
|
||||
|
||||
{ &hf_klm_pid, {
|
||||
"pid", "klm.pid", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, "ProcessID" }},
|
||||
|
||||
{ &hf_klm_offset, {
|
||||
"offset", "klm.offset", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, "File offset" }},
|
||||
|
||||
{ &hf_klm_len, {
|
||||
"length", "klm.len", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, "Length of lock region" }},
|
||||
|
||||
{ &hf_klm_stats, {
|
||||
"stats", "klm.stats", FT_UINT32, BASE_DEC,
|
||||
VALS(names_klm_stats), 0, "stats" }},
|
||||
|
||||
{ &hf_klm_holder, {
|
||||
"holder", "klm.holder", FT_NONE, BASE_NONE,
|
||||
NULL, 0, "KLM lock holder" }},
|
||||
|
||||
{ &hf_klm_block, {
|
||||
"block", "klm.block", FT_BOOLEAN, BASE_NONE,
|
||||
&tfs_block, 0, "Block" }},
|
||||
|
||||
};
|
||||
|
||||
static gint *ett[] = {
|
||||
&ett_klm,
|
||||
&ett_klm_lock,
|
||||
&ett_klm_holder,
|
||||
};
|
||||
|
||||
proto_klm = proto_register_protocol("Kernel Lock Manager",
|
||||
"KLM", "klm");
|
||||
proto_register_field_array(proto_klm, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_klm(void)
|
||||
{
|
||||
/* Register the protocol as RPC */
|
||||
rpc_init_prog(proto_klm, KLM_PROGRAM, ett_klm);
|
||||
/* Register the procedure tables */
|
||||
rpc_init_proc_table(KLM_PROGRAM, 1, klm1_proc);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
/* packet-klm.h 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au>
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef PACKET_KLM_H
|
||||
#define PACKET_KLM_H
|
||||
|
||||
#define KLMPROC_TEST 1
|
||||
#define KLMPROC_LOCK 2
|
||||
#define KLMPROC_CANCEL 3
|
||||
#define KLMPROC_UNLOCK 4
|
||||
|
||||
#define KLM_PROGRAM 100020
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue