From 75926345c6e44f9565264242d5ddc8ec9a6b990b Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 22 Oct 2013 02:37:49 +0000 Subject: [PATCH] Latest WSMP protocol support. Bug 9244 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9244) Per bug, version 1 is no longer in use as its no longer specified in the standard. svn path=/trunk/; revision=52755 --- epan/dissectors/packet-wsmp.c | 219 ++++++++++++++++++++++++---------- 1 file changed, 155 insertions(+), 64 deletions(-) diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index e0fce3709c..d6125de236 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -1,6 +1,8 @@ /* packet-wsmp.c * Routines for WAVE Short Message dissection (WSMP) - * Copyright 2008, Arada Systems (http://www.aradasystems.com) (email: siva@aradasystems.com) + * Copyright 2013, Savari Networks (http://www.savarinetworks.com) (email: smooney@savarinetworks.com) + * Based on packet-wsmp.c implemented by + * Arada Systems (http://www.aradasystems.com) (email: siva@aradasystems.com) * * $Id$ * @@ -31,20 +33,59 @@ #include #include +#include +#include + +#define WSMP 0x80 +#define WSMP_S 0x81 +#define WSMP_I 0x82 +#define CHANNUM 0x0F +#define DATARATE 0x10 +#define TRANSMITPW 0x04 + +static const value_string wsmp_elemenid_names[] = { + { 0x80, "WSMP" }, + { 0x81, "WSMP-S" }, + { 0x82, "WSMP-I" }, + { 0, NULL } +}; + static dissector_handle_t data_handle; /* Initialize the protocol and registered fields */ static int proto_wsmp = -1; static int hf_wsmp_version = -1; -static int hf_wsmp_security = -1; +static int hf_wsmp_psid = -1; static int hf_wsmp_rate = -1; static int hf_wsmp_channel = -1; static int hf_wsmp_txpower = -1; -static int hf_wsmp_appclass = -1; -static int hf_wsmp_acmlength = -1; -static int hf_wsmp_acm = -1; +static int hf_wsmp_WAVEid = -1; static int hf_wsmp_wsmlength = -1; +static int hf_wsmp_WSMP_S_data = -1; +/* Savari function to get the length of a psid based on the number of + successive 1s in the most sig bits of the most sig octet. Taken + from libwme +*/ + +int wme_getpsidlen (guint8 *psid) +{ + int length = 0; + if ((psid[0] & 0xF0) == 0xF0) { + length = 255; + } else if ( (psid[0] & 0xE0) == 0xE0) { + length = 4; + } else if ( (psid[0] & 0xE0) == 0xC0) { + length = 3; + } else if ( (psid[0] & 0xC0) == 0x80) { + length = 2; + } else if ((psid[0] & 0x80) == 0x00) { + length = 1; + } + return length; +} + + /* Initialize the subtree pointers */ static gint ett_wsmp = -1; @@ -59,69 +100,122 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti, *wsmdata_item; proto_tree *wsmp_tree, *wsmdata_tree; tvbuff_t *wsmdata_tvb; - guint16 acmlength, wsmlength, offset; + guint16 wsmlength, offset; + guint32 psidLen, psid; + guint8 elemenId, elemenLen, msb, supLen; /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WSMP"); col_set_str(pinfo->cinfo, COL_INFO, "WAVE Short Message Protocol IEEE P1609.3"); + /* create display subtree for the protocol */ + ti = proto_tree_add_item(tree, proto_wsmp, tvb, 0, -1, ENC_NA); + + wsmp_tree = proto_item_add_subtree(ti, ett_wsmp); + + offset = 0; + proto_tree_add_item(wsmp_tree, + hf_wsmp_version, tvb, offset, 1, ENC_BIG_ENDIAN); + offset ++; + + psid = tvb_get_guint8(tvb, offset); + psidLen =(guint32)wme_getpsidlen((guint8*)&psid); + + + if(psidLen == 2) + psid = tvb_get_ntohs(tvb, offset); + else if(psidLen == 3) + { + psid = tvb_get_ntohl(tvb, offset); + psid = psid & 0x00FFFF; /* three bytes */ + + } + else if(psidLen ==4) + psid = tvb_get_ntohl(tvb, offset); + if (tree) { - - /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_wsmp, tvb, 0, -1, ENC_NA); - - wsmp_tree = proto_item_add_subtree(ti, ett_wsmp); - - offset = 0; proto_tree_add_item(wsmp_tree, - hf_wsmp_version, tvb, offset, 1, ENC_BIG_ENDIAN); - offset ++; + hf_wsmp_psid, tvb, offset, psidLen, ENC_BIG_ENDIAN); + offset += psidLen; + + + elemenId = tvb_get_guint8(tvb, offset); + while(elemenId != WSMP && elemenId != WSMP_S + && elemenId != WSMP_I) + { + offset++; + if(elemenId == CHANNUM) + { + /* channel number */ + elemenLen = tvb_get_guint8(tvb, offset); + offset++; + proto_tree_add_item(wsmp_tree, + hf_wsmp_channel, tvb, offset, elemenLen, ENC_BIG_ENDIAN); + offset += elemenLen; + } + else if(elemenId == DATARATE) + { + /* Data rate */ + elemenLen = tvb_get_guint8(tvb, offset); + offset++; + proto_tree_add_item(wsmp_tree, + hf_wsmp_rate, tvb, offset, elemenLen, ENC_BIG_ENDIAN); + offset += elemenLen; + + + } + else if(elemenId == TRANSMITPW) + { + /* Transmit power */ + elemenLen = tvb_get_guint8(tvb, offset); + offset++; + proto_tree_add_item(wsmp_tree, + hf_wsmp_txpower, tvb, offset, elemenLen, ENC_BIG_ENDIAN); + offset += elemenLen; + } + elemenId = tvb_get_guint8(tvb, offset); + elemenLen = 0; + } proto_tree_add_item(wsmp_tree, - hf_wsmp_security, tvb, offset, 1, ENC_BIG_ENDIAN); + hf_wsmp_WAVEid, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; - proto_tree_add_item(wsmp_tree, - hf_wsmp_channel, tvb, offset, 1, ENC_BIG_ENDIAN); - offset ++; - - proto_tree_add_item(wsmp_tree, - hf_wsmp_rate, tvb, offset, 1, ENC_BIG_ENDIAN); - offset ++; - - proto_tree_add_item(wsmp_tree, - hf_wsmp_txpower, tvb, offset, 1, ENC_BIG_ENDIAN); - offset ++; - - proto_tree_add_item(wsmp_tree, - hf_wsmp_appclass, tvb, offset, 1, ENC_BIG_ENDIAN); - offset ++; - - acmlength = tvb_get_guint8(tvb,offset); - proto_tree_add_item(wsmp_tree, - hf_wsmp_acmlength, tvb, offset, 1, ENC_BIG_ENDIAN); - offset ++; - - proto_tree_add_item(wsmp_tree, hf_wsmp_acm, tvb, offset, acmlength, ENC_ASCII|ENC_NA); - offset +=acmlength; - wsmlength = tvb_get_letohs( tvb, offset); proto_tree_add_item(wsmp_tree, - hf_wsmp_wsmlength, tvb, offset, 2, ENC_LITTLE_ENDIAN); + hf_wsmp_wsmlength, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - wsmdata_item = proto_tree_add_text (wsmp_tree, tvb, offset, wsmlength, - "Wave Short Message"); - wsmdata_tree = proto_item_add_subtree(wsmdata_item, ett_wsmdata); - - /* TODO: Branch on the application context and display accordingly - * Default call the data dissector - */ - wsmdata_tvb = tvb_new_subset(tvb, offset,wsmlength, wsmlength); - call_dissector(data_handle, wsmdata_tvb, pinfo, wsmdata_tree); + if(elemenId == WSMP_S) + { + msb = 1; + supLen = 0; + while(msb) + { + msb = tvb_get_guint8(tvb, offset + supLen); + msb = msb & 0x80; + supLen++; + } + proto_tree_add_item(wsmp_tree, + hf_wsmp_WSMP_S_data, tvb, offset, supLen, ENC_BIG_ENDIAN); + wsmlength -= supLen; + offset += supLen; + } } + wsmdata_item = proto_tree_add_text (wsmp_tree, tvb, offset, wsmlength, + "Wave Short Message"); + wsmdata_tree = proto_item_add_subtree(wsmdata_item, ett_wsmdata); + + wsmdata_tvb = tvb_new_subset(tvb, offset,-1, wsmlength); + /* TODO: Branch on the application context and display accordingly + * Default call the data dissector + */ + if(psid == 0xbff0) + { + call_dissector(data_handle, wsmdata_tvb, pinfo, wsmdata_tree); + } } @@ -140,8 +234,8 @@ proto_register_wsmp(void) { "Version", "wsmp.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_wsmp_security, - { "Security", "wsmp.security", FT_UINT8, BASE_DEC, NULL, 0x0, + { &hf_wsmp_psid, + { "PSID", "wsmp.psid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_channel, @@ -149,33 +243,30 @@ proto_register_wsmp(void) NULL, HFILL }}, { &hf_wsmp_rate, - { "Rate", "wsmp.rate", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Data Rate", "wsmp.rate", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_txpower, - { "Transmit power", "wsmp.txpower", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Transmit Power", "wsmp.txpower", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_wsmp_appclass, - { "App class", "wsmp.appclass", FT_UINT8, BASE_DEC, NULL, 0x0, + { &hf_wsmp_WAVEid, + { "WAVE element id", "wsmp.WAVEid", FT_UINT8, BASE_DEC, VALS(wsmp_elemenid_names), 0x0, NULL, HFILL }}, - { &hf_wsmp_acmlength, - { "Acm Length", "wsmp.acmlength", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, - - { &hf_wsmp_acm, - { "Application Context Data", "wsmp.acm", FT_STRING, - BASE_NONE, NULL, 0x0, "Acm", HFILL }}, { &hf_wsmp_wsmlength, { "WSM Length", "wsmp.wsmlength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + + { &hf_wsmp_WSMP_S_data, + { "WAVE Supplement Data", "wsmp.supplement", FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL }}, }; /* Setup protocol subtree array */ static gint *ett[] = { &ett_wsmp, - &ett_wsmdata, + &ett_wsmdata, }; /* Register the protocol name and description */