From 2ed327a7a6ad3979b54a3e8d1bc620fd4a7243c9 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Fri, 8 Apr 2011 12:06:04 +0200 Subject: [PATCH] add a dissector for the radiosettings resource Signed-off-by: Klaus Kurzmann --- Makefile | 3 +- src/isi-radiosettings.c | 80 +++++++++++++++++++++++++++++++++++++++++ src/isi-radiosettings.h | 9 +++++ src/packet-isi.c | 2 ++ 4 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 src/isi-radiosettings.c create mode 100644 src/isi-radiosettings.h diff --git a/Makefile b/Makefile index 54b3c34..a3ecea6 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,8 @@ OBJECTS:=src/packet-isi.o \ src/isi-gss.o \ src/isi-sms.o \ src/isi-mtc.o \ - src/isi-nameservice.o + src/isi-nameservice.o \ + src/isi-radiosettings.o all: isi.so diff --git a/src/isi-radiosettings.c b/src/isi-radiosettings.c new file mode 100644 index 0000000..c87dfda --- /dev/null +++ b/src/isi-radiosettings.c @@ -0,0 +1,80 @@ +/* isi-nameservice.c + * Dissector for ISI's Radio Settings resource + * Copyright 2011, Klaus Kurzmann + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + + +#include +#include +#include + +#include "packet-isi.h" +#include "isi-radiosettings.h" + +static const value_string isi_radiosettings_id[] = { + {0x00, NULL} +}; + +static dissector_handle_t isi_radiosettings_handle; +static void dissect_isi_radiosettings(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree); + +static guint32 hf_isi_radiosettings_cmd = -1; + + +void proto_reg_handoff_isi_radiosettings(void) { + static gboolean initialized=FALSE; + + if(!initialized) { + isi_radiosettings_handle = create_dissector_handle(dissect_isi_radiosettings, proto_isi); + dissector_add("isi.resource", 0xB4, isi_radiosettings_handle); + } +} + +void proto_register_isi_radiosettings(void) { + static hf_register_info hf[] = { + { &hf_isi_radiosettings_cmd, + { "Command", "isi.radiosettings.cmd", FT_UINT8, BASE_HEX, isi_radiosettings_id, 0x0, "Command", HFILL }} + }; + + proto_register_field_array(proto_isi, hf, array_length(hf)); + register_dissector("isi.radiosettings", dissect_isi_radiosettings, proto_isi); +} + + +static void dissect_isi_radiosettings(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) { + proto_item *item = NULL; + proto_tree *tree = NULL; + guint8 cmd, code; + + if(isitree) { + item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload"); + tree = proto_item_add_subtree(item, ett_isi_msg); + + proto_tree_add_item(tree, hf_isi_radiosettings_cmd, tvb, 0, 1, FALSE); + cmd = tvb_get_guint8(tvb, 0); + + switch (cmd) { + default: + col_set_str(pinfo->cinfo, COL_INFO, "unknown Radio Settings packet"); + expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported packet"); + break; + } + } +} + diff --git a/src/isi-radiosettings.h b/src/isi-radiosettings.h new file mode 100644 index 0000000..9730e02 --- /dev/null +++ b/src/isi-radiosettings.h @@ -0,0 +1,9 @@ + +#ifndef _ISI_RADIOSETTINGS_H +#define _ISI_RADIOSETTINGS_H + +void proto_reg_handoff_isi_radiosettings(void); +void proto_register_isi_radiosettings(void); + +#endif + diff --git a/src/packet-isi.c b/src/packet-isi.c index 6a5e47c..e30c22c 100644 --- a/src/packet-isi.c +++ b/src/packet-isi.c @@ -336,6 +336,7 @@ void proto_reg_handoff_isi(void) { proto_reg_handoff_isi_sms(); proto_reg_handoff_isi_mtc(); proto_reg_handoff_isi_nameservice(); + proto_reg_handoff_isi_radiosettings(); #ifdef ISI_USB heur_dissector_add("usb.bulk", dissect_usb_isi, proto_isi); @@ -399,6 +400,7 @@ void proto_register_isi(void) { proto_register_isi_sms(); proto_register_isi_mtc(); proto_register_isi_nameservice(); + proto_register_isi_radiosettings(); } /* The dissector itself */