osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

[docsis] Remove unused exceptions.h 

* Add static const to IUC vals
* I defined the IUC values local to packet-map.c packet because it
needs to be revised, not all IUC apply to all packets. It works for now
but some of the IUC might be gone.

Change-Id: Ib4da9ae8e29afca065153c3934336565371da9a9
Reviewed-on: https://code.wireshark.org/review/11993
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AdrianSimionov 2015-11-20 16:50:02 +01:00 committed by Anders Broman
parent 59ffbc3eee
commit 782be9a50f
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/docsis/packet-map.c
View File

@ -31,9 +31,9 @@
#define IUC_LONG_DATA_GRANT 6
#define IUC_NULL_IE 7
#define IUC_DATA_ACK 8
#define IUC_RESERVED9 9
#define IUC_RESERVED10 10
#define IUC_RESERVED11 11
#define IUC_ADV_PHY_SHORT_DATA_GRANT 9
#define IUC_ADV_PHY_LONG_DATA_GRANT 10
#define IUC_ADV_PHY_UGS 11
#define IUC_RESERVED12 12
#define IUC_RESERVED13 13
#define IUC_RESERVED14 14
@ -63,8 +63,24 @@ static int hf_docsis_map_offset = -1;
/* Initialize the subtree pointers */
static gint ett_docsis_map = -1;
/* Defined in packet-ucd.c */
extern value_string iuc_vals[];
static const value_string iuc_vals[] = {
{IUC_REQUEST, "Request"},
{IUC_REQ_DATA, "REQ/Data"},
{IUC_INIT_MAINT, "Initial Maintenance"},
{IUC_STATION_MAINT, "Station Maintenance"},
{IUC_SHORT_DATA_GRANT, "Short Data Grant"},
{IUC_LONG_DATA_GRANT, "Long Data Grant"},
{IUC_NULL_IE, "NULL IE"},
{IUC_DATA_ACK, "Data Ack"},
{IUC_ADV_PHY_SHORT_DATA_GRANT, "Advanced Phy Short Data Grant"},
{IUC_ADV_PHY_LONG_DATA_GRANT, "Advanced Phy Long Data Grant"},
{IUC_ADV_PHY_UGS, "Advanced Phy UGS"},
{IUC_RESERVED12, "Reserved"},
{IUC_RESERVED13, "Reserved"},
{IUC_RESERVED14, "Reserved"},
{IUC_EXPANSION, "Expanded IUC"},
{0, NULL}
};
/* Code to actually dissect the packets */
static int

3
plugins/docsis/packet-type29ucd.c
View File

@ -26,7 +26,6 @@
#include "config.h"
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/expert.h>
#define type29ucd_SYMBOL_RATE 1
@ -225,7 +224,7 @@ static const value_string mod_vals2[] = {
{0, NULL}
};
value_string iuc_vals2[] = {
static const value_string iuc_vals2[] = {
{IUC_REQUEST, "Request"},
{IUC_REQ_DATA, "REQ/Data"},
{IUC_INIT_MAINT, "Initial Maintenance"},

4
plugins/docsis/packet-ucd.c
View File

@ -25,7 +25,6 @@
#include "config.h"
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/expert.h>
#define UCD_SYMBOL_RATE 1
@ -190,7 +189,7 @@ static const value_string mod_vals[] = {
{0, NULL}
};
value_string iuc_vals[] = {
static const value_string iuc_vals[] = {
{IUC_REQUEST, "Request"},
{IUC_REQ_DATA, "REQ/Data"},
{IUC_INIT_MAINT, "Initial Maintenance"},
@ -207,7 +206,6 @@ value_string iuc_vals[] = {
{IUC_RESERVED14, "Reserved"},
{IUC_EXPANSION, "Expanded IUC"},
{0, NULL}
};
static const value_string last_cw_len_vals[] = {