diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | packet-spray.c | 138 | ||||
| -rw-r--r-- | packet-spray.h | 34 |
5 files changed, 178 insertions, 2 deletions
@@ -502,6 +502,7 @@ Ronnie Sahlberg <rsahlber@bigpond.net.au> { IP fragment reassembly YPPASSWD support KLM support + SPRAY support } Borosa Tomislav <tomislav.borosa@SIEMENS.HR> { diff --git a/Makefile.am b/Makefile.am index 19c58cdcc1..f7f0e0f503 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.312 2001/04/20 21:29:02 guy Exp $ +# $Id: Makefile.am,v 1.313 2001/04/21 07:56:58 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -205,6 +205,7 @@ DISSECTOR_SOURCES = \ packet-sna.c \ packet-snmp.c \ packet-socks.c \ + packet-spray.c \ packet-srvloc.c \ packet-sscop.c \ packet-stat.c \ @@ -312,6 +313,7 @@ noinst_HEADERS = \ packet-smb-pipe.h \ packet-sna.h \ packet-snmp.h \ + packet-spray.h \ packet-sscop.h \ packet-stat.h \ packet-stat-notify.h \ diff --git a/Makefile.nmake b/Makefile.nmake index e7c79fac82..8544a22285 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -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.100 2001/04/20 18:37:53 guy Exp $ +# $Id: Makefile.nmake,v 1.101 2001/04/21 07:56:58 guy Exp $ include config.nmake include <win32.mak> @@ -158,6 +158,7 @@ DISSECTOR_SOURCES = \ packet-sna.c \ packet-snmp.c \ packet-socks.c \ + packet-spray.c \ packet-srvloc.c \ packet-sscop.c \ packet-stat.c \ diff --git a/packet-spray.c b/packet-spray.c new file mode 100644 index 0000000000..f1b207a335 --- /dev/null +++ b/packet-spray.c @@ -0,0 +1,138 @@ +/* packet-spray.c + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + + +#include "packet-rpc.h" +#include "packet-spray.h" + +static int proto_spray = -1; +static int hf_spray_sprayarr = -1; +static int hf_spray_counter = -1; +static int hf_spray_clock = -1; +static int hf_spray_sec = -1; +static int hf_spray_usec = -1; + +static gint ett_spray = -1; +static gint ett_spray_clock = -1; + + +static int +dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +{ + proto_item* lock_item = NULL; + proto_tree* lock_tree = NULL; + + offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, + hf_spray_counter, offset); + + lock_item = proto_tree_add_item(tree, hf_spray_clock, tvb, + offset, tvb_length_remaining(tvb, offset), FALSE); + + lock_tree = proto_item_add_subtree(lock_item, ett_spray_clock); + + offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + hf_spray_sec, offset); + + offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + hf_spray_usec, offset); + + return offset; +} + +static int +dissect_spray_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +{ + offset = dissect_rpc_data_tvb(tvb, pinfo, tree, + hf_spray_sprayarr, offset); + + return offset; +} + +/* proc number, "proc name", dissect_request, dissect_reply */ +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff spray1_proc[] = { + { SPRAYPROC_NULL, "NULL", + NULL, NULL }, + { SPRAYPROC_SPRAY, "SPRAY", + dissect_spray_call, NULL }, + { SPRAYPROC_GET, "GET", + NULL, dissect_get_reply }, + { SPRAYPROC_CLEAR, "CLEAR", + NULL, NULL }, + { 0, NULL, NULL, NULL } +}; + +void +proto_register_spray(void) +{ + static hf_register_info hf[] = { + { &hf_spray_sprayarr, { + "Data", "spray.sprayarr", FT_STRING, BASE_DEC, + NULL, 0, "Sprayarr data" }}, + + { &hf_spray_counter, { + "counter", "spray.counter", FT_UINT32, BASE_DEC, + NULL, 0, "Counter" }}, + + { &hf_spray_clock, { + "clock", "spray.clock", FT_NONE, BASE_NONE, + NULL, 0, "Clock" }}, + + { &hf_spray_sec, { + "sec", "spray.sec", FT_UINT32, BASE_DEC, + NULL, 0, "Seconds" }}, + + { &hf_spray_usec, { + "usec", "spray.usec", FT_UINT32, BASE_DEC, + NULL, 0, "Microseconds" }}, + + }; + + static gint *ett[] = { + &ett_spray, + &ett_spray_clock, + }; + + proto_spray = proto_register_protocol("SPRAY", + "SPRAY", "spray"); + proto_register_field_array(proto_spray, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); +} + +void +proto_reg_handoff_spray(void) +{ + /* Register the protocol as RPC */ + rpc_init_prog(proto_spray, SPRAY_PROGRAM, ett_spray); + /* Register the procedure tables */ + rpc_init_proc_table(SPRAY_PROGRAM, 1, spray1_proc); +} + diff --git a/packet-spray.h b/packet-spray.h new file mode 100644 index 0000000000..785eeb619e --- /dev/null +++ b/packet-spray.h @@ -0,0 +1,34 @@ +/* packet-spray.h + * 2001 Ronnie Sahlberg <rsahelber@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_SPRAY_H +#define PACKET_SPRAY_H + +#define SPRAYPROC_NULL 0 +#define SPRAYPROC_SPRAY 1 +#define SPRAYPROC_GET 2 +#define SPRAYPROC_CLEAR 3 + +#define SPRAY_PROGRAM 100012 + +#endif |