diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-06-02 06:37:21 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-06-02 06:37:21 +0000 |
| commit | 38638f9fb154d5eb4d00435bee9ec0ab726f83cb (patch) | |
| tree | cf9ec7d214ebb3d77aca28b1d810ba26d4bd8294 /epan/dissectors/packet-dis-fields.h | |
| parent | ab57f8da5db6f18a69a87b69c84433bc911e3b3a (diff) | |
From Matt Deckard:
Add support for the DIS protocol dissector to more fully interpret the PDU
types "Data Query", "Data", and "Set Data". It should interpret the
originating and receiving entity IDs, request ID, number of fixed and variable
datum fields, and the ID and values of each datum field in the PDU.
svn path=/trunk/; revision=28583
Diffstat (limited to 'epan/dissectors/packet-dis-fields.h')
| -rw-r--r-- | epan/dissectors/packet-dis-fields.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dis-fields.h b/epan/dissectors/packet-dis-fields.h index 998d32bfe2..85cb4b2efb 100644 --- a/epan/dissectors/packet-dis-fields.h +++ b/epan/dissectors/packet-dis-fields.h @@ -77,6 +77,14 @@ typedef enum DIS_FIELDTYPE_SUBCATEGORY, DIS_FIELDTYPE_TIMESTAMP, DIS_FIELDTYPE_WARHEAD, + DIS_FIELDTYPE_NUM_FIXED_DATA, + DIS_FIELDTYPE_NUM_VARIABLE_DATA, + DIS_FIELDTYPE_DATUM_ID, + DIS_FIELDTYPE_DATUM_LENGTH, + DIS_FIELDTYPE_FIXED_DATUM_VALUE, + DIS_FIELDTYPE_VARIABLE_DATUM_VALUE, + DIS_FIELDTYPE_REQUEST_ID, + DIS_FIELDTYPE_TIME_INTERVAL, /* composite types */ DIS_FIELDTYPE_ARTICULATION_PARAMETERS, @@ -86,7 +94,10 @@ typedef enum DIS_FIELDTYPE_EVENT_ID, DIS_FIELDTYPE_LINEAR_VELOCITY, DIS_FIELDTYPE_LOCATION_WORLD, - DIS_FIELDTYPE_LOCATION_ENTITY + DIS_FIELDTYPE_LOCATION_ENTITY, + DIS_FIELDTYPE_FIXED_DATUM, + DIS_FIELDTYPE_VARIABLE_DATUM + } DIS_FieldType; /* Struct which contains the data needed to parse a single DIS field. @@ -141,6 +152,10 @@ extern DIS_ParserNode DIS_FIELDS_ORIENTATION[]; extern DIS_ParserNode DIS_FIELDS_NONE[]; +extern DIS_ParserNode DIS_FIELDS_FIXED_DATUM[]; + +extern DIS_ParserNode DIS_FIELDS_VARIABLE_DATUM[]; + extern DIS_BitMask DIS_APPEARANCE_LANDPLATFORM[]; extern DIS_BitMask DIS_APPEARANCE_LIFEFORM[]; @@ -166,5 +181,6 @@ gint parseField_Timestamp(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_Pars extern guint32 pduType; extern guint32 entityKind; extern guint32 entityDomain; +extern guint32 variableDatumLength; #endif /* packet-dis-fieldparsers.h */ |