diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-10-05 21:34:19 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-10-06 01:42:32 +0000 |
| commit | 0111e461938d47efd1eb8dc17f135b93b253ab52 (patch) | |
| tree | 9409d7bf28086b3fd230993210264df1e884ec5b | |
| parent | 9e776a1ed114bb3982c061b41389143cb67b94de (diff) | |
| download | wireshark-0111e461938d47efd1eb8dc17f135b93b253ab52.tar.gz | |
plugins: Add editor modelines; Adjust whitespace as needed.
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088
Reviewed-on: https://code.wireshark.org/review/4488
Reviewed-by: Bill Meier <wmeier@newsguy.com>
70 files changed, 4623 insertions, 3745 deletions
diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c index fd7259816d..a2ab6d10b8 100644 --- a/plugins/easy_codec/codec-g722.c +++ b/plugins/easy_codec/codec-g722.c @@ -88,3 +88,15 @@ int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void return decodedBytes; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c index 79f8a30702..0a90218f9c 100644 --- a/plugins/easy_codec/codec-g7231.c +++ b/plugins/easy_codec/codec-g7231.c @@ -61,13 +61,13 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi if (!ctx) return 0; if ( ctx->handle == -1) { - if ( bitstream[0] & 0x03 ) { - ctx->handle=EasyG7231_init_decoder(FALSE); - ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_53; - } else { - ctx->handle=EasyG7231_init_decoder(TRUE); - ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_63; - } + if ( bitstream[0] & 0x03 ) { + ctx->handle=EasyG7231_init_decoder(FALSE); + ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_53; + } else { + ctx->handle=EasyG7231_init_decoder(TRUE); + ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_63; + } } if ((inputSizeBytes % ctx->l_g7231_frame_compressed) != 0) @@ -93,3 +93,15 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi return decodedBytes; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c index 48be1dfccc..2a5efac2c7 100644 --- a/plugins/easy_codec/codec-g729a.c +++ b/plugins/easy_codec/codec-g729a.c @@ -79,3 +79,15 @@ int codec_g729a_decode(void *context, const void *input, int inputSizeBytes, voi return decodedBytes; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 890328815f..bf5d8a8aef 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -413,434 +413,434 @@ static gint dissect_ams_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if( ams_length < AmsHead_Len ) return offset; - if (tree) - { - ti = proto_tree_add_item(tree, proto_ams, tvb, 0, -1, ENC_NA); - ams_tree = proto_item_add_subtree(ti, ett_ams); - - NetIdFormater(tvb, offset, szText, nMax); - proto_tree_add_string(ams_tree, hf_ams_targetnetid, tvb, offset, AmsNetId_Len, szText); - offset += AmsNetId_Len; - - proto_tree_add_item(ams_tree, hf_ams_targetport, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - offset += (int)sizeof(guint16); - - NetIdFormater(tvb, offset, szText, nMax); - proto_tree_add_string(ams_tree, hf_ams_sendernetid, tvb, offset, AmsNetId_Len, szText); - offset += AmsNetId_Len; - - proto_tree_add_item(ams_tree, hf_ams_senderport, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - offset += (int)sizeof(guint16); - - proto_tree_add_item(ams_tree, hf_ams_cmdid, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - cmdId = tvb_get_letohs(tvb, offset); - offset+=(int)sizeof(guint16); - - anItem = proto_tree_add_item(ams_tree, hf_ams_stateflags, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - ams_statetree = proto_item_add_subtree(anItem, ett_ams_stateflags); - proto_tree_add_item(ams_statetree, hf_ams_stateresponse,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_statenoreturn,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_stateadscmd,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_statesyscmd,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_statehighprio,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_statetimestampadded,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_stateudp,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_stateinitcmd,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_statetree, hf_ams_statebroadcast,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - stateflags = tvb_get_letohs(tvb, offset); - offset+=(int)sizeof(guint16); - - proto_tree_add_item(ams_tree, hf_ams_cbdata, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - cbdata = tvb_get_letohl(tvb,offset); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_tree, hf_ams_errorcode, tvb, offset, (int)sizeof(guint32),ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_tree, hf_ams_invokeid, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - } - else - { - offset+=AmsHead_Len; - } - - if ( (stateflags & AMSCMDSF_ADSCMD) != 0 ) - { - /* ADS */ - if ( (stateflags & AMSCMDSF_RESPONSE) == 0 ) - { - /* Request */ - switch ( cmdId ) - { - case ADSSRVID_READ: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Request"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadrequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadReq_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - } - } - } - break; - case ADSSRVID_WRITE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Request"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adswriterequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsWriteReq_Len - (int)sizeof(guint16) ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriterequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); - } - } - } - break; - case ADSSRVID_READWRITE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Request"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriterequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadWriteReq_Len - (int)sizeof(guint16)) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriterequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscbreadlength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscbwritelength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); - } - } - } - break; - case ADSSRVID_READSTATE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Request"); - - if( tree && cbdata !=0 ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstaterequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadStateReq_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstaterequest); - proto_tree_add_item(ams_adstree, hf_ams_adsinvokeid, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_WRITECTRL: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Request"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlrequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsWriteControlReq_Len - (int)sizeof(guint16) ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint16); - - proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint16); - - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); - } - } - } - break; - case ADSSRVID_READDEVICEINFO: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Request"); - - if( tree && cbdata !=0 ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadDeviceInfoReq_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforequest); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_ADDDEVICENOTE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Add Device Notification Request"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnrequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsAddDeviceNotificationReq_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adstransmode, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsmaxdelay, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscycletime, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - } - } - } - break; - case ADSSRVID_DELDEVICENOTE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Request"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnrequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsDelDeviceNotificationReq_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_DEVICENOTE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Request"); - - if( tree ) - { - /*guint32 cbLength; + if (tree) + { + ti = proto_tree_add_item(tree, proto_ams, tvb, 0, -1, ENC_NA); + ams_tree = proto_item_add_subtree(ti, ett_ams); + + NetIdFormater(tvb, offset, szText, nMax); + proto_tree_add_string(ams_tree, hf_ams_targetnetid, tvb, offset, AmsNetId_Len, szText); + offset += AmsNetId_Len; + + proto_tree_add_item(ams_tree, hf_ams_targetport, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + offset += (int)sizeof(guint16); + + NetIdFormater(tvb, offset, szText, nMax); + proto_tree_add_string(ams_tree, hf_ams_sendernetid, tvb, offset, AmsNetId_Len, szText); + offset += AmsNetId_Len; + + proto_tree_add_item(ams_tree, hf_ams_senderport, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + offset += (int)sizeof(guint16); + + proto_tree_add_item(ams_tree, hf_ams_cmdid, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + cmdId = tvb_get_letohs(tvb, offset); + offset+=(int)sizeof(guint16); + + anItem = proto_tree_add_item(ams_tree, hf_ams_stateflags, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + ams_statetree = proto_item_add_subtree(anItem, ett_ams_stateflags); + proto_tree_add_item(ams_statetree, hf_ams_stateresponse,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_statenoreturn,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_stateadscmd,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_statesyscmd,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_statehighprio,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_statetimestampadded,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_stateudp,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_stateinitcmd,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_statetree, hf_ams_statebroadcast,tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + stateflags = tvb_get_letohs(tvb, offset); + offset+=(int)sizeof(guint16); + + proto_tree_add_item(ams_tree, hf_ams_cbdata, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + cbdata = tvb_get_letohl(tvb,offset); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_tree, hf_ams_errorcode, tvb, offset, (int)sizeof(guint32),ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_tree, hf_ams_invokeid, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + } + else + { + offset+=AmsHead_Len; + } + + if ( (stateflags & AMSCMDSF_ADSCMD) != 0 ) + { + /* ADS */ + if ( (stateflags & AMSCMDSF_RESPONSE) == 0 ) + { + /* Request */ + switch ( cmdId ) + { + case ADSSRVID_READ: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Request"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadrequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadReq_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadrequest); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + } + } + } + break; + case ADSSRVID_WRITE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Request"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adswriterequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsWriteReq_Len - (int)sizeof(guint16) ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriterequest); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, 4, ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, 4, ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, 4, ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); + } + } + } + break; + case ADSSRVID_READWRITE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Request"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriterequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadWriteReq_Len - (int)sizeof(guint16)) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriterequest); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscbreadlength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscbwritelength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); + } + } + } + break; + case ADSSRVID_READSTATE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Request"); + + if( tree && cbdata !=0 ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstaterequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadStateReq_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstaterequest); + proto_tree_add_item(ams_adstree, hf_ams_adsinvokeid, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_WRITECTRL: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Request"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlrequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsWriteControlReq_Len - (int)sizeof(guint16) ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlrequest); + proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint16); + + proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint16); + + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); + } + } + } + break; + case ADSSRVID_READDEVICEINFO: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Request"); + + if( tree && cbdata !=0 ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadDeviceInfoReq_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforequest); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_ADDDEVICENOTE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Add Device Notification Request"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnrequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsAddDeviceNotificationReq_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnrequest); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adstransmode, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsmaxdelay, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscycletime, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + } + } + } + break; + case ADSSRVID_DELDEVICENOTE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Request"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnrequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsDelDeviceNotificationReq_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnrequest); + proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_DEVICENOTE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Request"); + + if( tree ) + { + /*guint32 cbLength; guint32 nStamps;*/ - anItem = proto_tree_add_item(ams_tree, hf_ams_adsdnrequest, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsDeviceNotificationReq_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdnrequest); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - /*cbLength = tvb_get_letohs(tvb, offset);*/ - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsnoteblocksstamps, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - /*nStamps = tvb_get_letohs(tvb, offset);*/ - offset+=(int)sizeof(guint32); - - /*ToDo: dissect noteblocks*/ - } - } - } - break; - } - } - else - { - /* Response */ - switch ( cmdId ) - { - case ADSSRVID_READ: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadRes_Len - (int)sizeof(guint16) ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); - } - } - } - break; - case ADSSRVID_WRITE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adswriteresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsWriteRes_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriteresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_READWRITE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriteresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadWriteRes_Len - (int)sizeof(guint16) ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriteresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); - } - } - } - break; - case ADSSRVID_READSTATE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstateresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadStateRes_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstateresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_WRITECTRL: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsWriteControlRes_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_READDEVICEINFO: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforesponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsReadDeviceInfoRes_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforesponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsversionversion, tvb, offset++, (int)sizeof(guint8), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_adstree, hf_ams_adsversionrevision, tvb, offset++, (int)sizeof(guint8), ENC_LITTLE_ENDIAN); - proto_tree_add_item(ams_adstree, hf_ams_adsversionbuild, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint16); - - proto_tree_add_item(ams_adstree, hf_ams_adsdevicename, tvb, offset, ams_length-offset, ENC_ASCII|ENC_NA); - } - } - } - break; - case ADSSRVID_ADDDEVICENOTE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsAddDeviceNotificationRes_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - offset+=(int)sizeof(guint32); - - proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - case ADSSRVID_DELDEVICENOTE: - { - col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Response"); - - if( tree ) - { - anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnresponse, tvb, offset, ams_length-offset, ENC_NA); - if( ams_length-offset >= TAdsDelDeviceNotificationRes_Len ) - { - ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); - } - } - } - break; - } - } - } - else - { - if ( (stateflags & AMSCMDSF_RESPONSE) == 0 ) - col_append_str(pinfo->cinfo, COL_INFO, "AMS Request"); - else - col_append_str(pinfo->cinfo, COL_INFO, "AMS Response"); - if( tree && ams_length-offset > 0 ) - proto_tree_add_item(ams_tree, hf_ams_data, tvb, offset, ams_length-offset, ENC_NA); - } -return offset; + anItem = proto_tree_add_item(ams_tree, hf_ams_adsdnrequest, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsDeviceNotificationReq_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdnrequest); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + /*cbLength = tvb_get_letohs(tvb, offset);*/ + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsnoteblocksstamps, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + /*nStamps = tvb_get_letohs(tvb, offset);*/ + offset+=(int)sizeof(guint32); + + /*ToDo: dissect noteblocks*/ + } + } + } + break; + } + } + else + { + /* Response */ + switch ( cmdId ) + { + case ADSSRVID_READ: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadRes_Len - (int)sizeof(guint16) ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); + } + } + } + break; + case ADSSRVID_WRITE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adswriteresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsWriteRes_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriteresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_READWRITE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriteresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadWriteRes_Len - (int)sizeof(guint16) ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriteresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); + } + } + } + break; + case ADSSRVID_READSTATE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstateresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadStateRes_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstateresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_WRITECTRL: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsWriteControlRes_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_READDEVICEINFO: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforesponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsReadDeviceInfoRes_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforesponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsversionversion, tvb, offset++, (int)sizeof(guint8), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_adstree, hf_ams_adsversionrevision, tvb, offset++, (int)sizeof(guint8), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_adstree, hf_ams_adsversionbuild, tvb, offset, (int)sizeof(guint16), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint16); + + proto_tree_add_item(ams_adstree, hf_ams_adsdevicename, tvb, offset, ams_length-offset, ENC_ASCII|ENC_NA); + } + } + } + break; + case ADSSRVID_ADDDEVICENOTE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsAddDeviceNotificationRes_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + offset+=(int)sizeof(guint32); + + proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + case ADSSRVID_DELDEVICENOTE: + { + col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Response"); + + if( tree ) + { + anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnresponse, tvb, offset, ams_length-offset, ENC_NA); + if( ams_length-offset >= TAdsDelDeviceNotificationRes_Len ) + { + ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnresponse); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, (int)sizeof(guint32), ENC_LITTLE_ENDIAN); + } + } + } + break; + } + } + } + else + { + if ( (stateflags & AMSCMDSF_RESPONSE) == 0 ) + col_append_str(pinfo->cinfo, COL_INFO, "AMS Request"); + else + col_append_str(pinfo->cinfo, COL_INFO, "AMS Response"); + if( tree && ams_length-offset > 0 ) + proto_tree_add_item(ams_tree, hf_ams_data, tvb, offset, ams_length-offset, ENC_NA); + } + return offset; } /*ams*/ @@ -860,368 +860,368 @@ static gint dissect_amstcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_register_ams(void) { static const true_false_string flags_set_truth = - { - "Set", - "Not set" - }; + { + "Set", + "Not set" + }; static hf_register_info hf[] = - { - { &hf_ams_sendernetid, - { "AMS Sender Net Id", "ams.sendernetid", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_senderport, - { "AMS Sender port", "ams.senderport", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_targetnetid, - { "AMS Target Net Id", "ams.targetnetid", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_targetport, - { "AMS Target port", "ams.targetport", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_cmdid, - { "CmdId", "ams.cmdid", - FT_UINT16, BASE_DEC, VALS(AMS_CommandId_vals), 0x0, - NULL, HFILL } - }, - { &hf_ams_stateflags, - { "StateFlags", "ams.stateflags", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_stateresponse, - { "RESPONSE", "ams.state_response", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_RESPONSE, - NULL, HFILL } - }, - { &hf_ams_statenoreturn, - { "NO RETURN", "ams.state_noreturn", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_NORETURN, - NULL, HFILL } - }, - { &hf_ams_stateadscmd, - { "ADS COMMAND", "ams.state_adscmd", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_ADSCMD, - NULL, HFILL } - }, - { &hf_ams_statesyscmd, - { "SYSTEM COMMAND", "ams.state_syscmd", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_SYSCMD, - NULL, HFILL } - }, - { &hf_ams_statehighprio, - { "HIGH PRIORITY COMMAND", "ams.state_highprio", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_HIGHPRIO, - NULL, HFILL } - }, - { &hf_ams_statetimestampadded, - { "TIMESTAMP ADDED", "ams.state_timestampadded", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_TIMESTAMPADDED, - NULL, HFILL } - }, - { &hf_ams_stateudp, - { "UDP COMMAND", "ams.state_udp", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_UDP, - NULL, HFILL } - }, - { &hf_ams_stateinitcmd, - { "INIT COMMAND", "ams.state_initcmd", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_INITCMD, - NULL, HFILL } - }, - { &hf_ams_statebroadcast, - { "BROADCAST", "ams.state_broadcast", - FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_BROADCAST, - NULL, HFILL } - }, - { &hf_ams_cbdata, - { "cbData", "ams.cbdata", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_errorcode, - { "ErrorCode", "ams.errorcode", - FT_UINT32, BASE_HEX, VALS(ErrorCode), 0x0, - NULL, HFILL } - }, - { &hf_ams_invokeid, - { "InvokeId", "ams.invokeid", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsdata, - { "Data", "ams.ads_data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_data, - { "Data", "ams.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsindexgroup, - { "IndexGroup", "ams.ads_indexgroup", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsindexoffset, - { "IndexOffset", "ams.ads_indexoffset", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adscblength, - { "CbLength", "ams.ads_cblength", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreadrequest, - { "ADS Read Request", "ams.ads_read_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreadresponse, - { "ADS Read Response", "ams.ads_read_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsinvokeid, - { "InvokeId", "ams.ads_invokeid", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsresult, - { "Result", "ams.adsresult", - FT_UINT32, BASE_HEX, VALS(AdsErrorMode), 0x0, - NULL, HFILL } - }, - { &hf_ams_adswriterequest, - { "ADS Write Request", "ams.ads_write_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adswriteresponse, - { "ADS Write Response", "ams.ads_write_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreadwriterequest, - { "ADS ReadWrite Request", "ams.ads_readwrite_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreadwriteresponse, - { "ADS ReadWrite Response", "ams.ads_readwrite_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adscbreadlength, - { "CBReadLength", "ams.ads_cbreadlength", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adscbwritelength, - { "CBWriteLength", "ams.ads_cbwritelength", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsstate, - { "AdsState", "ams.ads_state", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsdevicestate, - { "DeviceState", "ams.ads_devicestate", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsnotificationhandle, - { "NotificationHandle", "ams.ads_notificationhandle", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreadstaterequest, - { "ADS Read State Request", "ams.ads_readstate_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreadstateresponse, - { "ADS Read State Response", "ams.ads_readstate_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adswritectrlrequest, - { "ADS Write Ctrl Request", "ams.ads_writectrl_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adswritectrlresponse, - { "ADS Write Ctrl Response", "ams.ads_writectrl_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreaddinforequest, - { "ADS Read Device Info Request", "ams.ads_readdinfo_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsreaddinforesponse, - { "ADS Read Device Info Response", "ams.ads_readdinfo_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsadddnrequest, - { "ADS Add Device Notification Request", "ams.ads_adddn_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsadddnresponse, - { "ADS Add Device Notification Response", "ams.ads_adddn_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsdeldnrequest, - { "ADS Delete Device Notification Request", "ams.ads_deldn_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsdeldnresponse, - { "ADS Delete Device Notification Response", "ams.ads_deldn_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsdnrequest, - { "ADS Device Notification Request", "ams.ads_dn_req", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, + { + { &hf_ams_sendernetid, + { "AMS Sender Net Id", "ams.sendernetid", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_senderport, + { "AMS Sender port", "ams.senderport", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_targetnetid, + { "AMS Target Net Id", "ams.targetnetid", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_targetport, + { "AMS Target port", "ams.targetport", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_cmdid, + { "CmdId", "ams.cmdid", + FT_UINT16, BASE_DEC, VALS(AMS_CommandId_vals), 0x0, + NULL, HFILL } + }, + { &hf_ams_stateflags, + { "StateFlags", "ams.stateflags", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_stateresponse, + { "RESPONSE", "ams.state_response", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_RESPONSE, + NULL, HFILL } + }, + { &hf_ams_statenoreturn, + { "NO RETURN", "ams.state_noreturn", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_NORETURN, + NULL, HFILL } + }, + { &hf_ams_stateadscmd, + { "ADS COMMAND", "ams.state_adscmd", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_ADSCMD, + NULL, HFILL } + }, + { &hf_ams_statesyscmd, + { "SYSTEM COMMAND", "ams.state_syscmd", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_SYSCMD, + NULL, HFILL } + }, + { &hf_ams_statehighprio, + { "HIGH PRIORITY COMMAND", "ams.state_highprio", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_HIGHPRIO, + NULL, HFILL } + }, + { &hf_ams_statetimestampadded, + { "TIMESTAMP ADDED", "ams.state_timestampadded", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_TIMESTAMPADDED, + NULL, HFILL } + }, + { &hf_ams_stateudp, + { "UDP COMMAND", "ams.state_udp", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_UDP, + NULL, HFILL } + }, + { &hf_ams_stateinitcmd, + { "INIT COMMAND", "ams.state_initcmd", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_INITCMD, + NULL, HFILL } + }, + { &hf_ams_statebroadcast, + { "BROADCAST", "ams.state_broadcast", + FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_BROADCAST, + NULL, HFILL } + }, + { &hf_ams_cbdata, + { "cbData", "ams.cbdata", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_errorcode, + { "ErrorCode", "ams.errorcode", + FT_UINT32, BASE_HEX, VALS(ErrorCode), 0x0, + NULL, HFILL } + }, + { &hf_ams_invokeid, + { "InvokeId", "ams.invokeid", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsdata, + { "Data", "ams.ads_data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_data, + { "Data", "ams.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsindexgroup, + { "IndexGroup", "ams.ads_indexgroup", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsindexoffset, + { "IndexOffset", "ams.ads_indexoffset", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adscblength, + { "CbLength", "ams.ads_cblength", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreadrequest, + { "ADS Read Request", "ams.ads_read_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreadresponse, + { "ADS Read Response", "ams.ads_read_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsinvokeid, + { "InvokeId", "ams.ads_invokeid", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsresult, + { "Result", "ams.adsresult", + FT_UINT32, BASE_HEX, VALS(AdsErrorMode), 0x0, + NULL, HFILL } + }, + { &hf_ams_adswriterequest, + { "ADS Write Request", "ams.ads_write_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adswriteresponse, + { "ADS Write Response", "ams.ads_write_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreadwriterequest, + { "ADS ReadWrite Request", "ams.ads_readwrite_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreadwriteresponse, + { "ADS ReadWrite Response", "ams.ads_readwrite_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adscbreadlength, + { "CBReadLength", "ams.ads_cbreadlength", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adscbwritelength, + { "CBWriteLength", "ams.ads_cbwritelength", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsstate, + { "AdsState", "ams.ads_state", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsdevicestate, + { "DeviceState", "ams.ads_devicestate", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsnotificationhandle, + { "NotificationHandle", "ams.ads_notificationhandle", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreadstaterequest, + { "ADS Read State Request", "ams.ads_readstate_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreadstateresponse, + { "ADS Read State Response", "ams.ads_readstate_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adswritectrlrequest, + { "ADS Write Ctrl Request", "ams.ads_writectrl_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adswritectrlresponse, + { "ADS Write Ctrl Response", "ams.ads_writectrl_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreaddinforequest, + { "ADS Read Device Info Request", "ams.ads_readdinfo_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsreaddinforesponse, + { "ADS Read Device Info Response", "ams.ads_readdinfo_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsadddnrequest, + { "ADS Add Device Notification Request", "ams.ads_adddn_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsadddnresponse, + { "ADS Add Device Notification Response", "ams.ads_adddn_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsdeldnrequest, + { "ADS Delete Device Notification Request", "ams.ads_deldn_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsdeldnresponse, + { "ADS Delete Device Notification Response", "ams.ads_deldn_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsdnrequest, + { "ADS Device Notification Request", "ams.ads_dn_req", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, #if 0 - { &hf_ams_adsdnresponse, - { "ADS Device Notification Response", "ams.ads_dn_res", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsnoteattrib, - { "InvokeId", "ams.ads_noteattrib", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsnoteblocks, - { "InvokeId", "ams.ads_noteblocks", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsversion, - { "ADS Version", "ams.ads_version", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ams_adsdnresponse, + { "ADS Device Notification Response", "ams.ads_dn_res", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsnoteattrib, + { "InvokeId", "ams.ads_noteattrib", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsnoteblocks, + { "InvokeId", "ams.ads_noteblocks", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsversion, + { "ADS Version", "ams.ads_version", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, #endif - { &hf_ams_adsdevicename, - { "Device Name","ams.ads_devicename", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsversionversion, - { "ADS Major Version", "ams.ads_versionversion", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsversionrevision, - { "ADS Minor Version", "ams.ads_versionrevision", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsversionbuild, - { "ADS Version Build", "ams.ads_versionbuild", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsnoteblocksstamps, - { "Count of Stamps", "ams.ads_noteblocksstamps", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ams_adsdevicename, + { "Device Name","ams.ads_devicename", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsversionversion, + { "ADS Major Version", "ams.ads_versionversion", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsversionrevision, + { "ADS Minor Version", "ams.ads_versionrevision", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsversionbuild, + { "ADS Version Build", "ams.ads_versionbuild", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsnoteblocksstamps, + { "Count of Stamps", "ams.ads_noteblocksstamps", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, #if 0 - { &hf_ams_adsnoteblocksstamp, - { "Notification Stamp", "ams.ads_noteblocksstamp", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adstimestamp, - { "Time Stamp", "ams.ads_timestamp", - FT_UINT64, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adssamplecnt, - { "Count of Stamps", "ams.ads_samplecnt", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adsnoteblockssample, - { "Notification Sample", "ams.ads_noteblockssample", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ams_adsnoteblocksstamp, + { "Notification Stamp", "ams.ads_noteblocksstamp", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adstimestamp, + { "Time Stamp", "ams.ads_timestamp", + FT_UINT64, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adssamplecnt, + { "Count of Stamps", "ams.ads_samplecnt", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adsnoteblockssample, + { "Notification Sample", "ams.ads_noteblockssample", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, #endif - { &hf_ams_adstransmode, - { "Trans Mode", "ams.ads_transmode", - FT_UINT32, BASE_DEC, VALS(TransMode), 0x0, - NULL, HFILL } - }, - { &hf_ams_adsmaxdelay, - { "Max Delay", "ams.ads_maxdelay", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adscycletime, - { "Cycle Time", "ams.ads_cycletime", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ams_adstransmode, + { "Trans Mode", "ams.ads_transmode", + FT_UINT32, BASE_DEC, VALS(TransMode), 0x0, + NULL, HFILL } + }, + { &hf_ams_adsmaxdelay, + { "Max Delay", "ams.ads_maxdelay", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adscycletime, + { "Cycle Time", "ams.ads_cycletime", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, #if 0 - { &hf_ams_adscmpmax, - { "Cmp Mad", "ams.ads_cmpmax", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ams_adscmpmin, - { "Cmp Min", "ams.ads_cmpmin", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - } + { &hf_ams_adscmpmax, + { "Cmp Mad", "ams.ads_cmpmax", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ams_adscmpmin, + { "Cmp Min", "ams.ads_cmpmin", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + } #endif - }; + }; static gint *ett[] = - { - &ett_ams, - &ett_ams_stateflags, - &ett_ams_adsreadrequest, - &ett_ams_adsreadresponse, - &ett_ams_adswriterequest, - &ett_ams_adswriteresponse, - &ett_ams_adsreadwriterequest, - &ett_ams_adsreadwriteresponse, - &ett_ams_adsreadstaterequest, - &ett_ams_adsreadstateresponse, - &ett_ams_adswritectrlrequest, - &ett_ams_adswritectrlresponse, - &ett_ams_adsreaddinforequest, - &ett_ams_adsreaddinforesponse, - &ett_ams_adsadddnrequest, - &ett_ams_adsadddnresponse, - &ett_ams_adsdeldnrequest, - &ett_ams_adsdeldnresponse, - &ett_ams_adsdnrequest - }; + { + &ett_ams, + &ett_ams_stateflags, + &ett_ams_adsreadrequest, + &ett_ams_adsreadresponse, + &ett_ams_adswriterequest, + &ett_ams_adswriteresponse, + &ett_ams_adsreadwriterequest, + &ett_ams_adsreadwriteresponse, + &ett_ams_adsreadstaterequest, + &ett_ams_adsreadstateresponse, + &ett_ams_adswritectrlrequest, + &ett_ams_adswritectrlresponse, + &ett_ams_adsreaddinforequest, + &ett_ams_adsreaddinforesponse, + &ett_ams_adsadddnrequest, + &ett_ams_adsadddnresponse, + &ett_ams_adsdeldnrequest, + &ett_ams_adsdeldnresponse, + &ett_ams_adsdnrequest + }; proto_ams = proto_register_protocol("AMS", "AMS", "ams"); proto_register_field_array(proto_ams, hf, array_length(hf)); @@ -1241,3 +1241,16 @@ void proto_reg_handoff_ams(void) dissector_add_uint("tcp.port", 0xbf02, amstcp_handle); dissector_add_uint("ecatf.type", 2, ams_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 2e123dbe40..5497d50ddf 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -2061,3 +2061,16 @@ void proto_reg_handoff_ecat_mailbox(void) eth_handle = find_dissector("eth_withoutfcs"); ams_handle = find_dissector("ams"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index c8754818b3..74bebd4c04 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -47,8 +47,8 @@ typedef union _EslFlagsUnion guint16 port1 : 1; guint16 port0 : 1; guint16 extended : 1; - guint16 port11 : 1; - guint16 port10 : 1; + guint16 port11 : 1; + guint16 port10 : 1; guint16 crcError : 1; guint16 alignError : 1; guint16 timeStampEna : 1; @@ -372,3 +372,16 @@ proto_reg_handoff_esl(void) { } proto_set_decoding(proto_esl, esl_enable_dissector); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index c201c68ec3..529fbffea0 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -57,12 +57,12 @@ static int ett_ecat_datagram_subtree = -1; static int hf_ecat_sub; static int hf_ecat_sub_data[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_sub_cmd[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_sub_idx[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_sub_cnt[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_sub_ado[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_sub_adp[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_sub_lad[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; +static int hf_ecat_sub_cmd[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; +static int hf_ecat_sub_idx[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; +static int hf_ecat_sub_cnt[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; +static int hf_ecat_sub_ado[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; +static int hf_ecat_sub_adp[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; +static int hf_ecat_sub_lad[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; /* static int hf_ecat_header = -1; */ static int hf_ecat_data = -1; @@ -126,42 +126,42 @@ static int hf_ecat_padding = -1; static const value_string EcCmdShort[] = { - { 0, "NOP" }, - { 1, "APRD" }, - { 2, "APWR" }, - { 3, "APRW" }, - { 4, "FPRD" }, - { 5, "FPWR" }, - { 6, "FPRW" }, - { 7, "BRD" }, - { 8, "BWR" }, - { 9, "BRW" }, - { 10, "LRD" }, - { 11, "LWR" }, - { 12, "LRW" }, - { 13, "ARMW" }, - { 14, "FRMW" }, + { 0, "NOP" }, + { 1, "APRD" }, + { 2, "APWR" }, + { 3, "APRW" }, + { 4, "FPRD" }, + { 5, "FPWR" }, + { 6, "FPRW" }, + { 7, "BRD" }, + { 8, "BWR" }, + { 9, "BRW" }, + { 10, "LRD" }, + { 11, "LWR" }, + { 12, "LRW" }, + { 13, "ARMW" }, + { 14, "FRMW" }, { 255, "EXT" }, { 0, NULL } }; static const value_string EcCmdLong[] = { - { 0, "No operation" }, - { 1, "Auto Increment Physical Read" }, - { 2, "Auto Increment Physical Write" }, - { 3, "Auto Increment Physical ReadWrite" }, - { 4, "Configured address Physical Read" }, - { 5, "Configured address Physical Write" }, - { 6, "Configured address Physical ReadWrite" }, - { 7, "Broadcast Read" }, - { 8, "Broadcast Write" }, - { 9, "Broadcast ReadWrite" }, - { 10, "Logical Read" }, - { 11, "Logical Write" }, - { 12, "Logical ReadWrite" }, - { 13, "Auto Increment Physical Read Multiple Write" }, - { 14, "Configured Address Physical Read Multiple Write" }, + { 0, "No operation" }, + { 1, "Auto Increment Physical Read" }, + { 2, "Auto Increment Physical Write" }, + { 3, "Auto Increment Physical ReadWrite" }, + { 4, "Configured address Physical Read" }, + { 5, "Configured address Physical Write" }, + { 6, "Configured address Physical ReadWrite" }, + { 7, "Broadcast Read" }, + { 8, "Broadcast Write" }, + { 9, "Broadcast ReadWrite" }, + { 10, "Logical Read" }, + { 11, "Logical Write" }, + { 12, "Logical ReadWrite" }, + { 13, "Auto Increment Physical Read Multiple Write" }, + { 14, "Configured Address Physical Read Multiple Write" }, { 255, "EXT" }, { 0, NULL } }; @@ -270,21 +270,21 @@ static const char* convertEcCmdToText(int cmd, const value_string ec_cmd[]) typedef enum { - EC_CMD_TYPE_NOP = 0, - EC_CMD_TYPE_APRD = 1, - EC_CMD_TYPE_APWR = 2, - EC_CMD_TYPE_APRW = 3, - EC_CMD_TYPE_FPRD = 4, - EC_CMD_TYPE_FPWR = 5, - EC_CMD_TYPE_FPRW = 6, - EC_CMD_TYPE_BRD = 7, - EC_CMD_TYPE_BWR = 8, - EC_CMD_TYPE_BRW = 9, - EC_CMD_TYPE_LRD = 10, - EC_CMD_TYPE_LWR = 11, - EC_CMD_TYPE_LRW = 12, - EC_CMD_TYPE_ARMW = 13, - EC_CMD_TYPE_FRMW = 14, + EC_CMD_TYPE_NOP = 0, + EC_CMD_TYPE_APRD = 1, + EC_CMD_TYPE_APWR = 2, + EC_CMD_TYPE_APRW = 3, + EC_CMD_TYPE_FPRD = 4, + EC_CMD_TYPE_FPWR = 5, + EC_CMD_TYPE_FPRW = 6, + EC_CMD_TYPE_BRD = 7, + EC_CMD_TYPE_BWR = 8, + EC_CMD_TYPE_BRW = 9, + EC_CMD_TYPE_LRD = 10, + EC_CMD_TYPE_LWR = 11, + EC_CMD_TYPE_LRW = 12, + EC_CMD_TYPE_ARMW = 13, + EC_CMD_TYPE_FRMW = 14, EC_CMD_TYPE_EXT = 255 } EC_CMD_TYPE; @@ -870,835 +870,835 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree void proto_register_ecat(void) { static hf_register_info hf[] = - { - { &hf_ecat_sub, - { "EtherCAT Frame", "ecat.sub", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, + { + { &hf_ecat_sub, + { "EtherCAT Frame", "ecat.sub", FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, #if 0 - { &hf_ecat_header, - { "eader", "ecat.header", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, + { &hf_ecat_header, + { "eader", "ecat.header", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, #endif - { &hf_ecat_sub_data[0], - { "Data", "ecat.sub1.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[1], - { "Data", "ecat.sub2.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[2], - { "Data", "ecat.sub3.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[3], - { "Data", "ecat.sub4.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[4], - { "Data", "ecat.sub5.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[5], - { "Data", "ecat.sub6.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[6], - { "Data", "ecat.sub7.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[7], - { "Data", "ecat.sub8.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[8], - { "Data", "ecat.sub9.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_data[9], - { "Data", "ecat.sub10.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_data, - { "Data", "ecat.data", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_cnt, - { "Working Cnt", "ecat.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "The working counter is increased once for each addressed device if at least one byte/bit of the data was successfully read and/or written by that device, it is increased once for every operation made by that device - read/write/read and write", HFILL } - }, - { &hf_ecat_sub_cnt[0], - { "Working Cnt", "ecat.sub1.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[1], - { "Working Cnt", "ecat.sub2.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[2], - { "Working Cnt", "ecat.sub3.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[3], - { "Working Cnt", "ecat.sub4.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[4], - { "Working Cnt", "ecat.sub5.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[5], - { "Working Cnt", "ecat.sub6.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[6], - { "Working Cnt", "ecat.sub7.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[7], - { "Working Cnt", "ecat.sub8.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[8], - { "Working Cnt", "ecat.sub9.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cnt[9], - { "Working Cnt", "ecat.sub10.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_cmd, - { "Command", "ecat.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[0], - { "Command", "ecat.sub1.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[1], - { "Command", "ecat.sub2.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[2], - { "Command", "ecat.sub3.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[3], - { "Command", "ecat.sub4.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[4], - { "Command", "ecat.sub5.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[5], - { "Command", "ecat.sub6.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[6], - { "Command", "ecat.sub7.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[7], - { "Command", "ecat.sub8.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[8], - { "Command", "ecat.sub9.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_cmd[9], - { "Command", "ecat.sub10.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } - }, - { &hf_ecat_idx, - { "Index", "ecat.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[0], - { "Index", "ecat.sub1.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[1], - { "Index", "ecat.sub2.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[2], - { "Index", "ecat.sub3.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[3], - { "Index", "ecat.sub4.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[4], - { "Index", "ecat.sub5.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[5], - { "Index", "ecat.sub6.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[6], - { "Index", "ecat.sub7.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[7], - { "Index", "ecat.sub8.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[8], - { "Index", "ecat.sub9.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_idx[9], - { "Index", "ecat.sub10.idx", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_adp, - { "Slave Addr", "ecat.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[0], - { "Slave Addr", "ecat.sub1.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[1], - { "Slave Addr", "ecat.sub2.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[2], - { "Slave Addr", "ecat.sub3.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[3], - { "Slave Addr", "ecat.sub4.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[4], - { "Slave Addr", "ecat.sub5.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[5], - { "Slave Addr", "ecat.sub6.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[6], - { "Slave Addr", "ecat.sub7.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[7], - { "Slave Addr", "ecat.sub8.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[8], - { "Slave Addr", "ecat.sub9.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_adp[9], - { "Slave Addr", "ecat.sub10.adp", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_ado, - { "Offset Addr", "ecat.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[0], - { "Offset Addr", "ecat.sub1.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[1], - { "Offset Addr", "ecat.sub2.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[2], - { "Offset Addr", "ecat.sub3.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[3], - { "Offset Addr", "ecat.sub4.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[4], - { "Offset Addr", "ecat.sub5.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[5], - { "Offset Addr", "ecat.sub6.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[6], - { "Offset Addr", "ecat.sub7.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[7], - { "Offset Addr", "ecat.sub8.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[8], - { "Offset Addr", "ecat.sub9.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_ado[9], - { "Offset Addr", "ecat.sub10.ado", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_lad, - { "Log Addr", "ecat.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[0], - { "Log Addr", "ecat.sub1.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[1], - { "Log Addr", "ecat.sub2.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[2], - { "Log Addr", "ecat.sub3.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[3], - { "Log Addr", "ecat.sub4.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[4], - { "Log Addr", "ecat.sub5.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[5], - { "Log Addr", "ecat.sub6.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[6], - { "Log Addr", "ecat.sub7.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[7], - { "Log Addr", "ecat.sub8.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[8], - { "Log Addr", "ecat.sub9.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_lad[9], - { "Log Addr", "ecat.sub10.lad", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ecat_sub_data[0], + { "Data", "ecat.sub1.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[1], + { "Data", "ecat.sub2.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[2], + { "Data", "ecat.sub3.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[3], + { "Data", "ecat.sub4.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[4], + { "Data", "ecat.sub5.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[5], + { "Data", "ecat.sub6.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[6], + { "Data", "ecat.sub7.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[7], + { "Data", "ecat.sub8.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[8], + { "Data", "ecat.sub9.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_data[9], + { "Data", "ecat.sub10.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_data, + { "Data", "ecat.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_cnt, + { "Working Cnt", "ecat.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, "The working counter is increased once for each addressed device if at least one byte/bit of the data was successfully read and/or written by that device, it is increased once for every operation made by that device - read/write/read and write", HFILL } + }, + { &hf_ecat_sub_cnt[0], + { "Working Cnt", "ecat.sub1.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[1], + { "Working Cnt", "ecat.sub2.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[2], + { "Working Cnt", "ecat.sub3.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[3], + { "Working Cnt", "ecat.sub4.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[4], + { "Working Cnt", "ecat.sub5.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[5], + { "Working Cnt", "ecat.sub6.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[6], + { "Working Cnt", "ecat.sub7.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[7], + { "Working Cnt", "ecat.sub8.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[8], + { "Working Cnt", "ecat.sub9.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cnt[9], + { "Working Cnt", "ecat.sub10.cnt", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_cmd, + { "Command", "ecat.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[0], + { "Command", "ecat.sub1.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[1], + { "Command", "ecat.sub2.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[2], + { "Command", "ecat.sub3.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[3], + { "Command", "ecat.sub4.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[4], + { "Command", "ecat.sub5.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[5], + { "Command", "ecat.sub6.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[6], + { "Command", "ecat.sub7.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[7], + { "Command", "ecat.sub8.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[8], + { "Command", "ecat.sub9.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_cmd[9], + { "Command", "ecat.sub10.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdShort), 0x0, NULL, HFILL } + }, + { &hf_ecat_idx, + { "Index", "ecat.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[0], + { "Index", "ecat.sub1.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[1], + { "Index", "ecat.sub2.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[2], + { "Index", "ecat.sub3.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[3], + { "Index", "ecat.sub4.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[4], + { "Index", "ecat.sub5.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[5], + { "Index", "ecat.sub6.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[6], + { "Index", "ecat.sub7.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[7], + { "Index", "ecat.sub8.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[8], + { "Index", "ecat.sub9.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_idx[9], + { "Index", "ecat.sub10.idx", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_adp, + { "Slave Addr", "ecat.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[0], + { "Slave Addr", "ecat.sub1.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[1], + { "Slave Addr", "ecat.sub2.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[2], + { "Slave Addr", "ecat.sub3.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[3], + { "Slave Addr", "ecat.sub4.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[4], + { "Slave Addr", "ecat.sub5.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[5], + { "Slave Addr", "ecat.sub6.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[6], + { "Slave Addr", "ecat.sub7.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[7], + { "Slave Addr", "ecat.sub8.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[8], + { "Slave Addr", "ecat.sub9.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_adp[9], + { "Slave Addr", "ecat.sub10.adp", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_ado, + { "Offset Addr", "ecat.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[0], + { "Offset Addr", "ecat.sub1.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[1], + { "Offset Addr", "ecat.sub2.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[2], + { "Offset Addr", "ecat.sub3.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[3], + { "Offset Addr", "ecat.sub4.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[4], + { "Offset Addr", "ecat.sub5.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[5], + { "Offset Addr", "ecat.sub6.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[6], + { "Offset Addr", "ecat.sub7.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[7], + { "Offset Addr", "ecat.sub8.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[8], + { "Offset Addr", "ecat.sub9.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_ado[9], + { "Offset Addr", "ecat.sub10.ado", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_lad, + { "Log Addr", "ecat.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[0], + { "Log Addr", "ecat.sub1.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[1], + { "Log Addr", "ecat.sub2.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[2], + { "Log Addr", "ecat.sub3.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[3], + { "Log Addr", "ecat.sub4.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[4], + { "Log Addr", "ecat.sub5.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[5], + { "Log Addr", "ecat.sub6.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[6], + { "Log Addr", "ecat.sub7.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[7], + { "Log Addr", "ecat.sub8.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[8], + { "Log Addr", "ecat.sub9.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_lad[9], + { "Log Addr", "ecat.sub10.lad", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, #if 0 - { &hf_ecat_len, - { "Length", "ecat.len", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ecat_len, + { "Length", "ecat.len", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, #endif - { &hf_ecat_int, - { "Interrupt", "ecat.int", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_syncman, - { "SyncManager", "ecat.syncman", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_syncman_start, - { "Start Addr", "ecat.syncman.start", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_syncman_len, - { "SM Length", "ecat.syncman.len", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_syncman_flags, - { "SM Flags", "ecat.syncman.flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag0, - { "SM Flag0", "ecat.syncman_flag0", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag0), 0x00000001, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag1, - { "SM Flag1", "ecat.syncman_flag1", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag1), 0x00000002, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag2, - { "SM Flag2", "ecat.syncman_flag2", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag2), 0x00000004, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag4, - { "SM Flag4", "ecat.syncman_flag4", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag4), 0x00000010, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag5, - { "SM Flag5", "ecat.syncman_flag5", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag5), 0x00000020, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag8, - { "SM Flag8", "ecat.syncman_flag8", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag8), 0x00000100, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag9, - { "SM Flag9", "ecat.syncman_flag9", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag9), 0x00000200, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag10, - { "SM Flag10", "ecat.syncman_flag10", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag10), 0x00000400, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag11, - { "SM Flag11", "ecat.syncman_flag11", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag11), 0x00000800, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag12, - { "SM Flag12", "ecat.syncman_flag12", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag12), 0x00001000, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag13, - { "SM Flag13", "ecat.syncman_flag13", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag13), 0x00002000, - NULL, HFILL } - }, - { &hf_ecat_syncman_flag16, - { "SM Flag16", "ecat.syncman_flag16", - FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag16), 0x00010000, - NULL, HFILL } - }, - { &hf_ecat_fmmu, - { "FMMU", "ecat.fmmu", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_lstart, - { "Log Start", "ecat.fmmu.lstart", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_llen, - { "Log Length", "ecat.fmmu.llen", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_lstartbit, - { "Log StartBit", "ecat.fmmu.lstartbit", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_lendbit, - { "Log EndBit", "ecat.fmmu.lendbit", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_pstart, - { "Phys Start", "ecat.fmmu.pstart", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_pstartbit, - { "Phys StartBit", "ecat.fmmu.pstartbit", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_type, - { "FMMU Type", "ecat.fmmu.type", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_typeread, - { "Type", "ecat.fmmu.typeread", - FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_typeread), 0x01, - NULL, HFILL } - }, - { &hf_ecat_fmmu_typewrite, - { "Type", "ecat.fmmu.typewrite", - FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_typewrite), 0x02, - NULL, HFILL } - }, - { &hf_ecat_fmmu_active, - { "FMMU Active", "ecat.fmmu.active", - FT_UINT8, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_fmmu_active0, - { "Active", "ecat.fmmu.active0", - FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_active), 0x01, - NULL, HFILL } - }, - { &hf_ecat_dc_diff_da, - { "DC D-A", "ecat.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_dc_diff_bd, - { "DC B-D", "ecat.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_dc_diff_cb, - { "DC C-B", "ecat.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_dc_diff_cd, - { "DC C-D", "ecat.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_dc_diff_ba, - { "DC B-A", "ecat.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_dc_diff_ca, - { "DC C-A", "ecat.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[0], - { "DC D-A", "ecat.sub1.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[1], - { "DC D-A", "ecat.sub2.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[2], - { "DC D-A", "ecat.sub3.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[3], - { "DC D-A", "ecat.sub4.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[4], - { "DC D-A", "ecat.sub5.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[5], - { "DC D-A", "ecat.sub6.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[6], - { "DC D-A", "ecat.sub7.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[7], - { "DC D-A", "ecat.sub8.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[8], - { "DC D-A", "ecat.sub9.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_da[9], - { "DC D-A", "ecat.sub10.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_ecat_sub_dc_diff_bd[0], - { "DC B-C", "ecat.sub1.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[1], - { "DC B-C", "ecat.sub2.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[2], - { "DC B-C", "ecat.sub3.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[3], - { "DC B-C", "ecat.sub4.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[4], - { "DC B-C", "ecat.sub5.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[5], - { "DC B-C", "ecat.sub6.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[6], - { "DC B-C", "ecat.sub7.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[7], - { "DC B-C", "ecat.sub8.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[8], - { "DC B-C", "ecat.sub9.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_bd[9], - { "DC B-D", "ecat.sub10.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_ecat_sub_dc_diff_cb[0], - { "DC C-B", "ecat.sub1.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[1], - { "DC C-B", "ecat.sub2.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[2], - { "DC C-B", "ecat.sub3.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[3], - { "DC C-B", "ecat.sub4.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[4], - { "DC C-B", "ecat.sub5.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[5], - { "DC C-B", "ecat.sub6.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[6], - { "DC C-B", "ecat.sub7.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[7], - { "DC C-B", "ecat.sub8.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[8], - { "DC C-B", "ecat.sub9.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cb[9], - { "DC C-B", "ecat.sub10.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_ecat_sub_dc_diff_cd[0], - { "DC C-D", "ecat.sub1.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[1], - { "DC C-D", "ecat.sub2.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[2], - { "DC C-D", "ecat.sub3.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[3], - { "DC C-D", "ecat.sub4.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[4], - { "DC C-D", "ecat.sub5.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[5], - { "DC C-D", "ecat.sub6.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[6], - { "DC C-D", "ecat.sub7.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[7], - { "DC C-D", "ecat.sub8.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[8], - { "DC C-D", "ecat.sub9.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_cd[9], - { "DC C-D", "ecat.sub10.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_ecat_sub_dc_diff_ba[0], - { "DC B-A", "ecat.sub1.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[1], - { "DC B-A", "ecat.sub2.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[2], - { "DC B-A", "ecat.sub3.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[3], - { "DC B-A", "ecat.sub4.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[4], - { "DC B-A", "ecat.sub5.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[5], - { "DC B-A", "ecat.sub6.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[6], - { "DC B-A", "ecat.sub7.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[7], - { "DC B-A", "ecat.sub8.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[8], - { "DC B-A", "ecat.sub9.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ba[9], - { "DC B-A", "ecat.sub10.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_ecat_sub_dc_diff_ca[0], - { "DC C-A", "ecat.sub1.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[1], - { "DC C-A", "ecat.sub2.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[2], - { "DC C-A", "ecat.sub3.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[3], - { "DC C-A", "ecat.sub4.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[4], - { "DC C-A", "ecat.sub5.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[5], - { "DC C-A", "ecat.sub6.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[6], - { "DC C-A", "ecat.sub7.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[7], - { "DC C-A", "ecat.sub8.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[8], - { "DC C-A", "ecat.sub9.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_sub_dc_diff_ca[9], - { "DC C-A", "ecat.sub10.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_ecat_length_len, - { "Length", "ecat.subframe.length", - FT_UINT16, BASE_DEC, NULL, 0x07ff, NULL, HFILL} - }, - { &hf_ecat_length_r, - { "Reserved", "ecat.subframe.reserved", - FT_UINT16, BASE_DEC, VALS(ecat_subframe_reserved_vals), 0x3800, NULL, HFILL} - }, - { &hf_ecat_length_c, - { "Round trip", "ecat.subframe.circulating", - FT_UINT16, BASE_DEC, VALS(ecat_subframe_circulating_vals), 0x4000, NULL, HFILL} - }, - { &hf_ecat_length_m, - { "Last indicator", "ecat.subframe.more", - FT_UINT16, BASE_DEC, VALS(ecat_subframe_more_vals), 0x8000, NULL, HFILL} - }, - { &hf_ecat_padding, - { "Pad bytes", "ecat.subframe.pad_bytes", - FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} - } - }; + { &hf_ecat_int, + { "Interrupt", "ecat.int", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_syncman, + { "SyncManager", "ecat.syncman", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_syncman_start, + { "Start Addr", "ecat.syncman.start", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_syncman_len, + { "SM Length", "ecat.syncman.len", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_syncman_flags, + { "SM Flags", "ecat.syncman.flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag0, + { "SM Flag0", "ecat.syncman_flag0", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag0), 0x00000001, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag1, + { "SM Flag1", "ecat.syncman_flag1", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag1), 0x00000002, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag2, + { "SM Flag2", "ecat.syncman_flag2", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag2), 0x00000004, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag4, + { "SM Flag4", "ecat.syncman_flag4", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag4), 0x00000010, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag5, + { "SM Flag5", "ecat.syncman_flag5", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag5), 0x00000020, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag8, + { "SM Flag8", "ecat.syncman_flag8", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag8), 0x00000100, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag9, + { "SM Flag9", "ecat.syncman_flag9", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag9), 0x00000200, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag10, + { "SM Flag10", "ecat.syncman_flag10", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag10), 0x00000400, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag11, + { "SM Flag11", "ecat.syncman_flag11", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag11), 0x00000800, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag12, + { "SM Flag12", "ecat.syncman_flag12", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag12), 0x00001000, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag13, + { "SM Flag13", "ecat.syncman_flag13", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag13), 0x00002000, + NULL, HFILL } + }, + { &hf_ecat_syncman_flag16, + { "SM Flag16", "ecat.syncman_flag16", + FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag16), 0x00010000, + NULL, HFILL } + }, + { &hf_ecat_fmmu, + { "FMMU", "ecat.fmmu", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_lstart, + { "Log Start", "ecat.fmmu.lstart", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_llen, + { "Log Length", "ecat.fmmu.llen", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_lstartbit, + { "Log StartBit", "ecat.fmmu.lstartbit", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_lendbit, + { "Log EndBit", "ecat.fmmu.lendbit", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_pstart, + { "Phys Start", "ecat.fmmu.pstart", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_pstartbit, + { "Phys StartBit", "ecat.fmmu.pstartbit", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_type, + { "FMMU Type", "ecat.fmmu.type", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_typeread, + { "Type", "ecat.fmmu.typeread", + FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_typeread), 0x01, + NULL, HFILL } + }, + { &hf_ecat_fmmu_typewrite, + { "Type", "ecat.fmmu.typewrite", + FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_typewrite), 0x02, + NULL, HFILL } + }, + { &hf_ecat_fmmu_active, + { "FMMU Active", "ecat.fmmu.active", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_fmmu_active0, + { "Active", "ecat.fmmu.active0", + FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_active), 0x01, + NULL, HFILL } + }, + { &hf_ecat_dc_diff_da, + { "DC D-A", "ecat.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_dc_diff_bd, + { "DC B-D", "ecat.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_dc_diff_cb, + { "DC C-B", "ecat.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_dc_diff_cd, + { "DC C-D", "ecat.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_dc_diff_ba, + { "DC B-A", "ecat.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_dc_diff_ca, + { "DC C-A", "ecat.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[0], + { "DC D-A", "ecat.sub1.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[1], + { "DC D-A", "ecat.sub2.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[2], + { "DC D-A", "ecat.sub3.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[3], + { "DC D-A", "ecat.sub4.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[4], + { "DC D-A", "ecat.sub5.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[5], + { "DC D-A", "ecat.sub6.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[6], + { "DC D-A", "ecat.sub7.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[7], + { "DC D-A", "ecat.sub8.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[8], + { "DC D-A", "ecat.sub9.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_da[9], + { "DC D-A", "ecat.sub10.dc.dif.da", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_ecat_sub_dc_diff_bd[0], + { "DC B-C", "ecat.sub1.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[1], + { "DC B-C", "ecat.sub2.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[2], + { "DC B-C", "ecat.sub3.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[3], + { "DC B-C", "ecat.sub4.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[4], + { "DC B-C", "ecat.sub5.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[5], + { "DC B-C", "ecat.sub6.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[6], + { "DC B-C", "ecat.sub7.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[7], + { "DC B-C", "ecat.sub8.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[8], + { "DC B-C", "ecat.sub9.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_bd[9], + { "DC B-D", "ecat.sub10.dc.dif.bd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_ecat_sub_dc_diff_cb[0], + { "DC C-B", "ecat.sub1.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[1], + { "DC C-B", "ecat.sub2.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[2], + { "DC C-B", "ecat.sub3.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[3], + { "DC C-B", "ecat.sub4.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[4], + { "DC C-B", "ecat.sub5.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[5], + { "DC C-B", "ecat.sub6.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[6], + { "DC C-B", "ecat.sub7.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[7], + { "DC C-B", "ecat.sub8.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[8], + { "DC C-B", "ecat.sub9.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cb[9], + { "DC C-B", "ecat.sub10.dc.dif.cb", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_ecat_sub_dc_diff_cd[0], + { "DC C-D", "ecat.sub1.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[1], + { "DC C-D", "ecat.sub2.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[2], + { "DC C-D", "ecat.sub3.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[3], + { "DC C-D", "ecat.sub4.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[4], + { "DC C-D", "ecat.sub5.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[5], + { "DC C-D", "ecat.sub6.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[6], + { "DC C-D", "ecat.sub7.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[7], + { "DC C-D", "ecat.sub8.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[8], + { "DC C-D", "ecat.sub9.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_cd[9], + { "DC C-D", "ecat.sub10.dc.dif.cd", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_ecat_sub_dc_diff_ba[0], + { "DC B-A", "ecat.sub1.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[1], + { "DC B-A", "ecat.sub2.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[2], + { "DC B-A", "ecat.sub3.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[3], + { "DC B-A", "ecat.sub4.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[4], + { "DC B-A", "ecat.sub5.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[5], + { "DC B-A", "ecat.sub6.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[6], + { "DC B-A", "ecat.sub7.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[7], + { "DC B-A", "ecat.sub8.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[8], + { "DC B-A", "ecat.sub9.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ba[9], + { "DC B-A", "ecat.sub10.dc.dif.ba", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_ecat_sub_dc_diff_ca[0], + { "DC C-A", "ecat.sub1.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[1], + { "DC C-A", "ecat.sub2.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[2], + { "DC C-A", "ecat.sub3.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[3], + { "DC C-A", "ecat.sub4.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[4], + { "DC C-A", "ecat.sub5.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[5], + { "DC C-A", "ecat.sub6.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[6], + { "DC C-A", "ecat.sub7.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[7], + { "DC C-A", "ecat.sub8.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[8], + { "DC C-A", "ecat.sub9.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_sub_dc_diff_ca[9], + { "DC C-A", "ecat.sub10.dc.dif.ca", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_ecat_length_len, + { "Length", "ecat.subframe.length", + FT_UINT16, BASE_DEC, NULL, 0x07ff, NULL, HFILL} + }, + { &hf_ecat_length_r, + { "Reserved", "ecat.subframe.reserved", + FT_UINT16, BASE_DEC, VALS(ecat_subframe_reserved_vals), 0x3800, NULL, HFILL} + }, + { &hf_ecat_length_c, + { "Round trip", "ecat.subframe.circulating", + FT_UINT16, BASE_DEC, VALS(ecat_subframe_circulating_vals), 0x4000, NULL, HFILL} + }, + { &hf_ecat_length_m, + { "Last indicator", "ecat.subframe.more", + FT_UINT16, BASE_DEC, VALS(ecat_subframe_more_vals), 0x8000, NULL, HFILL} + }, + { &hf_ecat_padding, + { "Pad bytes", "ecat.subframe.pad_bytes", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} + } + }; static gint *ett[] = - { - &ett_ecat, - &ett_ecat_header, - &ett_ecat_syncman, - &ett_ecat_syncflag, - &ett_ecat_fmmu, - &ett_ecat_fmmu_type, - &ett_ecat_fmmu_active, - &ett_ecat_dc, - &ett_ecat_length, - &ett_ecat_padding, - &ett_ecat_datagram_subtree - }; + { + &ett_ecat, + &ett_ecat_header, + &ett_ecat_syncman, + &ett_ecat_syncflag, + &ett_ecat_fmmu, + &ett_ecat_fmmu_type, + &ett_ecat_fmmu_active, + &ett_ecat_dc, + &ett_ecat_length, + &ett_ecat_padding, + &ett_ecat_datagram_subtree + }; proto_ecat_datagram = proto_register_protocol("EtherCAT datagram(s)", - "ECAT", "ecat"); + "ECAT", "ecat"); proto_register_field_array(proto_ecat_datagram, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -1718,3 +1718,16 @@ void proto_reg_handoff_ecat(void) ecat_mailbox_handle = find_dissector("ecat_mailbox"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index 7452f7e929..c3a20fe4ce 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -106,33 +106,33 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree void proto_register_ethercat_frame(void) { static hf_register_info hf[] = - { - { &hf_ethercat_frame_length, - { "Length", "ecatf.length", - FT_UINT16, BASE_HEX, NULL, 0x07FF, - NULL, HFILL } - }, - - { &hf_ethercat_frame_reserved, - { "Reserved", "ecatf.reserved", - FT_UINT16, BASE_HEX, VALS(ethercat_frame_reserved_vals), 0x0800, - NULL, HFILL} - }, - - { &hf_ethercat_frame_type, - { "Type", "ecatf.type", - FT_UINT16, BASE_HEX, VALS(EthercatFrameTypes), 0xF000, - "E88A4 Types", HFILL } - } - }; + { + { &hf_ethercat_frame_length, + { "Length", "ecatf.length", + FT_UINT16, BASE_HEX, NULL, 0x07FF, + NULL, HFILL } + }, + + { &hf_ethercat_frame_reserved, + { "Reserved", "ecatf.reserved", + FT_UINT16, BASE_HEX, VALS(ethercat_frame_reserved_vals), 0x0800, + NULL, HFILL} + }, + + { &hf_ethercat_frame_type, + { "Type", "ecatf.type", + FT_UINT16, BASE_HEX, VALS(EthercatFrameTypes), 0xF000, + "E88A4 Types", HFILL } + } + }; static gint *ett[] = - { - &ett_ethercat_frame - }; + { + &ett_ethercat_frame + }; proto_ethercat_frame = proto_register_protocol("EtherCAT frame header", - "ETHERCAT","ethercat"); + "ETHERCAT","ethercat"); proto_register_field_array(proto_ethercat_frame,hf,array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -141,7 +141,7 @@ void proto_register_ethercat_frame(void) /* Define a handle (ecatf.type) for sub dissectors that want to dissect the Ethercat frame ether type (E88A4) payload. */ ethercat_frame_dissector_table = register_dissector_table("ecatf.type", - "EtherCAT frame type", FT_UINT8, BASE_DEC); + "EtherCAT frame type", FT_UINT8, BASE_DEC); } void proto_reg_handoff_ethercat_frame(void) @@ -154,3 +154,16 @@ void proto_reg_handoff_ethercat_frame(void) dissector_add_uint("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle); ethercat_frame_data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index 83610336e5..5bc07d78d2 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -81,31 +81,31 @@ static void dissect_ioraw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_ioraw(void) { static hf_register_info hf[] = - { + { #if 0 - { &hf_ioraw_summary, - { "Summary of the IoRaw Packet", "ioraw.summary", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, + { &hf_ioraw_summary, + { "Summary of the IoRaw Packet", "ioraw.summary", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, #endif - { &hf_ioraw_header, { "Header", "ioraw.header", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_ioraw_data, { "VarData", "ioraw.data", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - } - }; + { &hf_ioraw_header, { "Header", "ioraw.header", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_ioraw_data, { "VarData", "ioraw.data", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + } + }; static gint *ett[] = - { - &ett_ioraw - }; + { + &ett_ioraw + }; proto_ioraw = proto_register_protocol("TwinCAT IO-RAW", - "IO-RAW","ioraw"); + "IO-RAW","ioraw"); proto_register_field_array(proto_ioraw,hf,array_length(hf)); proto_register_subtree_array(ett,array_length(ett)); } @@ -115,5 +115,18 @@ void proto_reg_handoff_ioraw(void) dissector_handle_t ioraw_handle; ioraw_handle = create_dissector_handle(dissect_ioraw, proto_ioraw); + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ dissector_add_uint("ecatf.type", 3, ioraw_handle); } diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index 660a44af7b..c2903d7714 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -165,70 +165,69 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_nv(void) { static hf_register_info hf[] = - { + { #if 0 - { &hf_nv_summary, - { "Summary of the Nv Packet", "tc_nv.summary", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, + { &hf_nv_summary, { "Summary of the Nv Packet", "tc_nv.summary", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, #endif - { &hf_nv_header, { "Header", "tc_nv.header", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_publisher, { "Publisher", "tc_nv.publisher", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_count, { "Count", "tc_nv.count", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_cycleindex, { "CycleIndex", "tc_nv.cycleindex", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_variable, { "Variable", "tc_nv.variable", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_varheader, { "VarHeader", "tc_nv.varheader", - FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_id, { "Id", "tc_nv.id", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_hash, { "Hash", "tc_nv.hash", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_length, { "Length", "tc_nv.length", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_quality, { "Quality", "tc_nv.quality", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_nv_data, { "Data", "tc_nv.data", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - }; + { &hf_nv_header, { "Header", "tc_nv.header", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_publisher, { "Publisher", "tc_nv.publisher", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_count, { "Count", "tc_nv.count", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_cycleindex, { "CycleIndex", "tc_nv.cycleindex", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_variable, { "Variable", "tc_nv.variable", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_varheader, { "VarHeader", "tc_nv.varheader", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_id, { "Id", "tc_nv.id", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_hash, { "Hash", "tc_nv.hash", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_length, { "Length", "tc_nv.length", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_quality, { "Quality", "tc_nv.quality", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_nv_data, { "Data", "tc_nv.data", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + }; static gint *ett[] = - { - &ett_nv, - &ett_nv_header, - &ett_nv_var, - &ett_nv_varheader - }; + { + &ett_nv, + &ett_nv_header, + &ett_nv_var, + &ett_nv_varheader + }; proto_nv = proto_register_protocol("TwinCAT NV", - "TC-NV","tc_nv"); + "TC-NV","tc_nv"); proto_register_field_array(proto_nv,hf,array_length(hf)); proto_register_subtree_array(ett,array_length(ett)); } @@ -240,3 +239,16 @@ void proto_reg_handoff_nv(void) nv_handle = create_dissector_handle(dissect_nv, proto_nv); dissector_add_uint("ecatf.type", 4, nv_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 23dc177580..ad3be8cd38 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -1122,7 +1122,7 @@ eventnum(tvbuff_t *tvb, int offset, proto_tree *pt) proto_tree_add_item(pt, hf_gryphon_eventnum, tvb, offset, 1, ENC_BIG_ENDIAN); else proto_tree_add_uint_format_value(pt, hf_gryphon_eventnum, tvb, offset, 1, - 0, "All"); + 0, "All"); proto_tree_add_item(pt, hf_gryphon_reserved3, tvb, offset+1, 3, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1228,7 +1228,7 @@ cmd_modfilt(tvbuff_t *tvb, int offset, proto_tree *pt) proto_tree_add_item(pt, hf_gryphon_modfilt, tvb, offset, 1, ENC_BIG_ENDIAN); else proto_tree_add_uint_format_value(pt, hf_gryphon_modfilt, tvb, offset, 1, - 0, "Filter handles: all"); + 0, "Filter handles: all"); proto_tree_add_item(pt, hf_gryphon_modfilt_action, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(pt, hf_gryphon_reserved2, tvb, offset+2, 2, ENC_BIG_ENDIAN); @@ -1329,7 +1329,7 @@ resp_getspeeds(tvbuff_t *tvb, int offset, proto_tree *pt) for (indx = 1; indx <= number; indx++) { proto_tree_add_bytes_format(pt, hf_gryphon_getspeeds_data, tvb, offset, size, - tvb_get_ptr(tvb, offset, size), "Data for preset %d", indx); + tvb_get_ptr(tvb, offset, size), "Data for preset %d", indx); offset += size; } return offset; @@ -1441,7 +1441,7 @@ cmd_sched(tvbuff_t *tvb, int offset, proto_tree *pt) if (tvb_get_ntohl(tvb, offset) == 0xFFFFFFFF) proto_tree_add_uint_format_value(pt, hf_gryphon_sched_num_iterations, tvb, offset, 4, - 0, "Number of iterations: \"infinite\""); + 0, "Number of iterations: \"infinite\""); else proto_tree_add_item(pt, hf_gryphon_sched_num_iterations, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1508,7 +1508,7 @@ cmd_sched_rep(tvbuff_t *tvb, int offset, proto_tree *pt) else type = "Normal"; proto_tree_add_uint_format_value(pt, hf_gryphon_sched_rep_id, tvb, - offset, 4, x, "%s schedule ID: %u", type, x); + offset, 4, x, "%s schedule ID: %u", type, x); offset += 4; proto_tree_add_item(pt, hf_gryphon_sched_rep_message_index, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1532,19 +1532,19 @@ resp_blm_data(tvbuff_t *tvb, int offset, proto_tree *pt) x = tvb_get_ntohs(tvb, offset); proto_tree_add_uint_format_value(pt, hf_gryphon_blm_data_bus_load, tvb, - offset, 2, x, "%d.%02d%%", x / 100, x % 100); + offset, 2, x, "%d.%02d%%", x / 100, x % 100); offset += 2; x = tvb_get_ntohs(tvb, offset); proto_tree_add_uint_format_value(pt, hf_gryphon_blm_data_current_bus_load, tvb, - offset, 2, x, "%d.%02d%%", x / 100, x % 100); + offset, 2, x, "%d.%02d%%", x / 100, x % 100); offset += 2; x = tvb_get_ntohs(tvb, offset); proto_tree_add_uint_format_value(pt, hf_gryphon_blm_data_peak_bus_load, tvb, - offset, 2, x, "%d.%02d%%", x / 100, x % 100); + offset, 2, x, "%d.%02d%%", x / 100, x % 100); offset += 2; x = tvb_get_ntohs(tvb, offset); proto_tree_add_uint_format_value(pt, hf_gryphon_blm_data_historic_peak_bus_load, tvb, - offset, 2, x, "%d.%02d%%", x / 100, x % 100); + offset, 2, x, "%d.%02d%%", x / 100, x % 100); offset += 2; return offset; @@ -1619,10 +1619,10 @@ cmd_addresp(tvbuff_t *tvb, int offset, proto_tree *pt) if (actionValue) { if (actionType == 1) { proto_tree_add_uint_format_value(tree, hf_gryphon_addresp_action_period_type, tvb, - offset, 2, actionValue, "Period: %d messages", actionValue); + offset, 2, actionValue, "Period: %d messages", actionValue); } else { proto_tree_add_uint_format_value(tree, hf_gryphon_addresp_action_period_type, tvb, - offset, 2, actionValue, "Period: %d.%02d seconds", actionValue/100, actionValue%100); + offset, 2, actionValue, "Period: %d.%02d seconds", actionValue/100, actionValue%100); } } offset += 2; @@ -1663,10 +1663,10 @@ cmd_modresp(tvbuff_t *tvb, int offset, proto_tree *pt) proto_tree_add_item(pt, hf_gryphon_modresp_handle, tvb, offset, 1, ENC_BIG_ENDIAN); else if (dest) proto_tree_add_uint_format_value(pt, hf_gryphon_modresp_handle, tvb, - offset, 1, dest, "Response handles: all on channel %c", dest); + offset, 1, dest, "Response handles: all on channel %c", dest); else proto_tree_add_uint_format_value(pt, hf_gryphon_modresp_handle, tvb, offset, 1, - 0, "Response handles: all"); + 0, "Response handles: all"); proto_tree_add_item(pt, hf_gryphon_modresp_action, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(pt, hf_gryphon_reserved2, tvb, offset+2, 2, ENC_BIG_ENDIAN); @@ -2014,7 +2014,7 @@ cmd_usdt(tvbuff_t *tvb, int offset, proto_tree *pt) } } else { proto_tree_add_uint_format_value(pt, hf_gryphon_usdt_ext_address, tvb, offset+3, 1, - 0, "Using extended addressing for the single, internally defined, ID"); + 0, "Using extended addressing for the single, internally defined, ID"); offset += 4; } for (i = 0; i < 2; i++) { @@ -2121,10 +2121,10 @@ cmd_init_strat (tvbuff_t *tvb, int offset, proto_tree *pt) value = tvb_get_guint8(tvb, offset); if (value) proto_tree_add_float_format_value(pt, hf_gryphon_init_strat_delay, tvb, offset, 1, - value/4, "Delay %d = %.2f seconds", indx, value/4); + value/4, "Delay %d = %.2f seconds", indx, value/4); else proto_tree_add_float_format_value(pt, hf_gryphon_init_strat_delay, tvb, offset, 1, - 0, "Delay %d = infinite", indx); + 0, "Delay %d = infinite", indx); } return offset; @@ -2866,3 +2866,16 @@ proto_reg_handoff_gryphon(void) gryphon_handle = new_create_dissector_handle(dissect_gryphon, proto_gryphon); dissector_add_uint("tcp.port", 7000, gryphon_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index b89e9b2cab..76b9174606 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -30,7 +30,7 @@ /* * See * - * http://www.irda.org/standards/specifications.asp + * http://www.irda.org/standards/specifications.asp * * for various IrDA specifications. */ @@ -175,7 +175,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrCOMM"); clen = tvb_get_guint8(tvb, offset); - len = tvb_length(tvb) - 1 - clen; + len = tvb_length(tvb) - 1 - clen; @@ -216,7 +216,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* static void dissect_raw_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) { guint len = tvb_length(tvb); - char buf[128]; + char buf[128]; if (len == 0) return; @@ -430,3 +430,16 @@ void proto_reg_handoff_ircomm(void) { data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index add449589c..9e0bd25104 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -43,7 +43,7 @@ * This plugin dissects infrared data transmissions as defined by the IrDA * specification (www.irda.org). See * - * http://www.irda.org/standards/specifications.asp + * http://www.irda.org/standards/specifications.asp * * for various IrDA specifications. * @@ -242,15 +242,15 @@ static gint ett_param[MAX_PARAMETERS]; static gint ett_iap_entry[MAX_IAP_ENTRIES]; static const xdlc_cf_items irlap_cf_items = { - &hf_lap_c_nr, - &hf_lap_c_ns, - &hf_lap_c_p, - &hf_lap_c_f, - &hf_lap_c_s, - &hf_lap_c_u_cmd, - &hf_lap_c_u_rsp, - &hf_lap_c_i, - &hf_lap_c_s_u + &hf_lap_c_nr, + &hf_lap_c_ns, + &hf_lap_c_p, + &hf_lap_c_f, + &hf_lap_c_s, + &hf_lap_c_u_cmd, + &hf_lap_c_u_rsp, + &hf_lap_c_i, + &hf_lap_c_s_u }; /* IAP conversation type */ @@ -457,9 +457,9 @@ guint dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, guint offset) */ static guint dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, gboolean data) { - guint offset = 0; - guint8 head; - char buf[128]; + guint offset = 0; + guint8 head; + char buf[128]; if (tvb_length(tvb) == 0) return 0; @@ -504,7 +504,7 @@ static guint dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, gb */ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) { - guint offset = 0; + guint offset = 0; guint8 op; guint8 clen = 0; guint8 alen = 0; @@ -513,7 +513,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r address destaddr; conversation_t* conv; iap_conversation_t* iap_conv; - char buf[128]; + char buf[128]; if (tvb_length(tvb) == 0) return; @@ -656,10 +656,10 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r */ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) { - guint offset = 0; - guint len = tvb_length(tvb); - guint n = 0; - guint list_len; + guint offset = 0; + guint len = tvb_length(tvb); + guint n = 0; + guint list_len; guint8 op; guint8 retcode; guint8 type; @@ -886,7 +886,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro if (iap_conv && iap_conv->pattr_dissector) iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, 0, n, type); - break; + break; default: attr_len = 0; @@ -959,7 +959,7 @@ guint8 check_iap_lsap_result(tvbuff_t* tvb, proto_tree* tree, guint offset, */ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pdu_type_t pdu_type) { - guint offset = 0; + guint offset = 0; guint8 src; address srcaddr; address destaddr; @@ -1029,7 +1029,7 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro */ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) { - guint offset = 0; + guint offset = 0; guint8 dlsap; guint8 slsap; guint8 cbit; @@ -1254,7 +1254,7 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec */ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) { - guint n = 0; + guint n = 0; proto_item* ti; proto_tree* p_tree; char buf[256]; @@ -1538,7 +1538,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro { ti = proto_tree_add_item(root, proto_irlmp, tvb, offset, -1, ENC_NA); lmp_tree = proto_item_add_subtree(ti, ett_irlmp); - } + } for (hints_len = 0;;) { @@ -1750,8 +1750,8 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) /* process the control field */ c = dissect_xdlc_control(tvb, 1, pinfo, tree, hf_lap_c, - ett_lap_c, &irlap_cf_items, NULL, lap_c_u_cmd_abbr_vals, - lap_c_u_rsp_abbr_vals, is_response, FALSE, FALSE); + ett_lap_c, &irlap_cf_items, NULL, lap_c_u_cmd_abbr_vals, + lap_c_u_rsp_abbr_vals, is_response, FALSE, FALSE); offset++; if ((c & XDLC_I_MASK) == XDLC_I) { @@ -1763,7 +1763,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) } if ((c & 0x03) == XDLC_U) { - /* U frame */ + /* U frame */ switch (c & XDLC_U_MODIFIER_MASK) { case XDLC_SNRM: @@ -2234,8 +2234,8 @@ void proto_register_irda(void) /* If this dissector uses sub-dissector registration add a registration routine. - This format is required because a script is used to find these routines and - create the code that calls these routines. + This format is required because a script is used to find these routines and + create the code that calls these routines. */ void proto_reg_handoff_irda(void) diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index e91a288867..6296cd77ef 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -233,3 +233,16 @@ proto_register_irsir(void) proto_register_field_array( proto_sir, hf_sir, array_length(hf_sir)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index ec90e789e8..503721023b 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -66,14 +66,14 @@ static gint ett_m2m_cdma = -1; static gint ett_m2m_ffb = -1; /* TLV types (rev:0.2) */ -#define TLV_PROTO_VER 1 -#define TLV_FRAME_NUM 2 -#define TLV_BURST_NUM 3 -#define TLV_FRAG_TYPE 4 -#define TLV_FRAG_NUM 5 -#define TLV_CDMA_CODE 7 -#define TLV_FCH_BURST 8 -#define TLV_PDU_BURST 9 +#define TLV_PROTO_VER 1 +#define TLV_FRAME_NUM 2 +#define TLV_BURST_NUM 3 +#define TLV_FRAG_TYPE 4 +#define TLV_FRAG_NUM 5 +#define TLV_CDMA_CODE 7 +#define TLV_FCH_BURST 8 +#define TLV_PDU_BURST 9 #define TLV_FAST_FB 10 #define TLV_CRC16_STATUS 11 #define TLV_BURST_POWER 12 @@ -86,22 +86,22 @@ static gint ett_m2m_ffb = -1; /* TLV names */ static const value_string tlv_name[] = { - { TLV_PROTO_VER, "Protocol Version" }, - { TLV_FRAME_NUM, "Frame Number" }, - { TLV_BURST_NUM, "Burst Number" }, - { TLV_FRAG_TYPE, "Fragment Type" }, - { TLV_FRAG_NUM, "Fragment Number" }, - { TLV_CDMA_CODE, "CDMA Attribute" }, - { TLV_FCH_BURST, "FCH Burst" }, - { TLV_PDU_BURST, "PDU Burst" }, - { TLV_FAST_FB, "Fast Feedback Burst" }, - { TLV_CRC16_STATUS, "CRC16 Status" }, - { TLV_BURST_POWER, " Burst Power" }, - { TLV_BURST_CINR, "Burst CINR" }, - { TLV_PREAMBLE, "Preamble" }, + { TLV_PROTO_VER, "Protocol Version" }, + { TLV_FRAME_NUM, "Frame Number" }, + { TLV_BURST_NUM, "Burst Number" }, + { TLV_FRAG_TYPE, "Fragment Type" }, + { TLV_FRAG_NUM, "Fragment Number" }, + { TLV_CDMA_CODE, "CDMA Attribute" }, + { TLV_FCH_BURST, "FCH Burst" }, + { TLV_PDU_BURST, "PDU Burst" }, + { TLV_FAST_FB, "Fast Feedback Burst" }, + { TLV_CRC16_STATUS, "CRC16 Status" }, + { TLV_BURST_POWER, " Burst Power" }, + { TLV_BURST_CINR, "Burst CINR" }, + { TLV_PREAMBLE, "Preamble" }, { TLV_HARQ_ACK_BURST, "HARQ ACK Bursts" }, { TLV_PHY_ATTRIBUTES, "PDU Burst Physical Attributes" }, - { TLV_EXTENDED_TLV, "Extended TLV" }, + { TLV_EXTENDED_TLV, "Extended TLV" }, { 0, NULL } }; @@ -114,10 +114,10 @@ static const value_string tlv_name[] = /* TLV Fragment Type names */ static const value_string tlv_frag_type_name[] = { - { TLV_NO_FRAG, "No TLV Fragment" }, - { TLV_FIRST_FRAG, "First TLV Fragment" }, + { TLV_NO_FRAG, "No TLV Fragment" }, + { TLV_FIRST_FRAG, "First TLV Fragment" }, { TLV_MIDDLE_FRAG, "Middle TLV Fragment" }, - { TLV_LAST_FRAG, "Last TLV Fragment" }, + { TLV_LAST_FRAG, "Last TLV Fragment" }, { 0, NULL } }; @@ -197,9 +197,9 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* get the tvb reported length */ length = tvb_reported_length(tvb); /* add the size info */ - /* + /* proto_item_append_text(m2m_item, " (%u bytes) - Packet Sequence Number,Number of TLVs", length); - */ + */ proto_item_append_text(m2m_item, " (%u bytes)", length); /* display the sequence number */ proto_tree_add_item(m2m_tree, hf_m2m_sequence_number, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -781,7 +781,7 @@ void proto_register_m2m(void) expert_module_t* expert_m2m; - proto_m2m = proto_register_protocol ( + proto_m2m = proto_register_protocol ( "WiMax Mac to Mac Packet", /* name */ "M2M (m2m)", /* short name */ "m2m" /* abbrev */ @@ -813,3 +813,16 @@ void proto_reg_handoff_m2m(void) wimax_pdu_burst_handle = find_dissector("wimax_pdu_burst_handler"); wimax_phy_attributes_burst_handle = find_dissector("wimax_phy_attributes_burst_handler"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/m2m/wimax_tlv.c b/plugins/m2m/wimax_tlv.c index 6a4696455e..1191ed7555 100644 --- a/plugins/m2m/wimax_tlv.c +++ b/plugins/m2m/wimax_tlv.c @@ -182,3 +182,16 @@ gint get_tlv_length_type(tlv_info_t *info) return (gint)info->length_type; return -1; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/mate/mate_runtime.c b/plugins/mate/mate_runtime.c index 7951d2bec4..eede6ede67 100644 --- a/plugins/mate/mate_runtime.c +++ b/plugins/mate/mate_runtime.c @@ -922,5 +922,15 @@ extern mate_pdu* mate_get_pdus(guint32 framenum) { } } - - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c index 667b885725..46e2ff1f6b 100644 --- a/plugins/mate/mate_setup.c +++ b/plugins/mate/mate_setup.c @@ -654,3 +654,15 @@ extern mate_config* mate_make_config(const gchar* filename, int mate_hfid) { return matecfg; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c index a95642e8d6..edd3f42c82 100644 --- a/plugins/mate/mate_util.c +++ b/plugins/mate/mate_util.c @@ -96,7 +96,7 @@ struct _scs_collection { * scs_collection to be destroyed. */ static void destroy_scs_collection(SCS_collection* c) { - if (c->hash) g_hash_table_destroy(c->hash); + if (c->hash) g_hash_table_destroy(c->hash); } static SCS_collection* scs_init(void) { @@ -148,7 +148,7 @@ gchar* scs_subscribe(SCS_collection* c, const gchar* s) { g_warning("mate SCS: string truncated due to huge size"); } - orig = (gchar *)g_slice_alloc(len); + orig = (gchar *)g_slice_alloc(len); g_strlcpy(orig,s,len); g_hash_table_insert(c->hash,orig,ip); @@ -1749,3 +1749,16 @@ extern LoAL* loal_from_file(gchar* filename) { return load_loal_error(NULL,loal,NULL,0,"Cannot Open file '%s'",filename); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c index ddefb85874..4ea1399634 100644 --- a/plugins/mate/packet-mate.c +++ b/plugins/mate/packet-mate.c @@ -366,3 +366,15 @@ proto_register_mate(void) register_postdissector(mate_handle); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c index 43a6d945c2..a61623b031 100644 --- a/plugins/opcua/opcua.c +++ b/plugins/opcua/opcua.c @@ -362,20 +362,20 @@ static int dissect_opcua_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static int dissect_opcua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { tcp_dissect_pdus(tvb, pinfo, tree, TRUE, FRAME_HEADER_LEN, - get_opcua_message_len, dissect_opcua_message, data); - return tvb_reported_length(tvb); + get_opcua_message_len, dissect_opcua_message, data); + return tvb_reported_length(tvb); } static void register_tcp_port(guint32 port) { - if (port != 0) - dissector_add_uint("tcp.port", port, opcua_handle); + if (port != 0) + dissector_add_uint("tcp.port", port, opcua_handle); } static void unregister_tcp_port(guint32 port) { - if (port != 0) - dissector_delete_uint("tcp.port", port, opcua_handle); + if (port != 0) + dissector_delete_uint("tcp.port", port, opcua_handle); } static void @@ -393,29 +393,29 @@ void proto_register_opcua(void) char *tmp; static hf_register_info hf[] = - { - /* id full name abbreviation type display strings bitmask blurb HFILL */ - {&hf_opcua_fragments, {"Message fragments", "opcua.fragments", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment, {"Message fragment", "opcua.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment_overlap, {"Message fragment overlap", "opcua.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment_overlap_conflicts, {"Message fragment overlapping with conflicting data", "opcua.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment_multiple_tails, {"Message has multiple tail fragments", "opcua.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment_too_long_fragment, {"Message fragment too long", "opcua.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment_error, {"Message defragmentation error", "opcua.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_fragment_count, {"Message fragment count", "opcua.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_reassembled_in, {"Reassembled in", "opcua.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - {&hf_opcua_reassembled_length, {"Reassembled length", "opcua.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}} - }; + { + /* id full name abbreviation type display strings bitmask blurb HFILL */ + {&hf_opcua_fragments, {"Message fragments", "opcua.fragments", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment, {"Message fragment", "opcua.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment_overlap, {"Message fragment overlap", "opcua.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment_overlap_conflicts, {"Message fragment overlapping with conflicting data", "opcua.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment_multiple_tails, {"Message has multiple tail fragments", "opcua.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment_too_long_fragment, {"Message fragment too long", "opcua.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment_error, {"Message defragmentation error", "opcua.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_fragment_count, {"Message fragment count", "opcua.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_reassembled_in, {"Reassembled in", "opcua.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + {&hf_opcua_reassembled_length, {"Reassembled length", "opcua.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}} + }; /** Setup protocol subtree array */ static gint *ett[] = - { - &ett_opcua_extensionobject, - &ett_opcua_nodeid, - &ett_opcua_transport, - &ett_opcua_fragment, - &ett_opcua_fragments - }; + { + &ett_opcua_extensionobject, + &ett_opcua_nodeid, + &ett_opcua_transport, + &ett_opcua_fragment, + &ett_opcua_fragments + }; module_t *opcua_module; @@ -447,35 +447,46 @@ void proto_register_opcua(void) /* register user preferences */ opcua_module = prefs_register_protocol(proto_opcua, proto_reg_handoff_opcua); prefs_register_range_preference(opcua_module, "tcp_ports", - "OPC UA TCP Ports", - "The TCP ports for the OPC UA TCP Binary Protocol (comma separated list)", - &global_tcp_ports_opcua, 65535); + "OPC UA TCP Ports", + "The TCP ports for the OPC UA TCP Binary Protocol (comma separated list)", + &global_tcp_ports_opcua, 65535); } void proto_reg_handoff_opcua(void) { - static gboolean opcua_initialized = FALSE; - static range_t *tcp_ports_opcua = NULL; - - if(!opcua_initialized) - { - opcua_handle = new_create_dissector_handle(dissect_opcua, proto_opcua); - opcua_initialized = TRUE; - } - else - { - /* clean up ports and their lists */ - if (tcp_ports_opcua != NULL) + static gboolean opcua_initialized = FALSE; + static range_t *tcp_ports_opcua = NULL; + + if(!opcua_initialized) { - range_foreach(tcp_ports_opcua, unregister_tcp_port); - g_free(tcp_ports_opcua); + opcua_handle = new_create_dissector_handle(dissect_opcua, proto_opcua); + opcua_initialized = TRUE; + } + else + { + /* clean up ports and their lists */ + if (tcp_ports_opcua != NULL) + { + range_foreach(tcp_ports_opcua, unregister_tcp_port); + g_free(tcp_ports_opcua); + } } - } - /* If we now have a PDU tree, register for the port or ports we have */ - tcp_ports_opcua = range_copy(global_tcp_ports_opcua); - range_foreach(tcp_ports_opcua, register_tcp_port); + /* If we now have a PDU tree, register for the port or ports we have */ + tcp_ports_opcua = range_copy(global_tcp_ports_opcua); + range_foreach(tcp_ports_opcua, register_tcp_port); } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c index 6de2765e59..3ec3e16e3c 100644 --- a/plugins/opcua/opcua_application_layer.c +++ b/plugins/opcua/opcua_application_layer.c @@ -105,4 +105,15 @@ int parseServiceNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) return Numeric; } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/opcua/opcua_security_layer.c index 5eb7bf6016..a49125980c 100644 --- a/plugins/opcua/opcua_security_layer.c +++ b/plugins/opcua/opcua_security_layer.c @@ -54,4 +54,15 @@ void parseSecurityLayer(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) proto_tree_add_item(tree, hf_opcua_security_rqid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c index 5d4097dcf8..c500722079 100644 --- a/plugins/opcua/opcua_simpletypes.c +++ b/plugins/opcua/opcua_simpletypes.c @@ -185,16 +185,16 @@ OpcUa_BuiltInType; /** Variant encoding mask table */ static const value_string g_VariantTypes[] = { - { 0, "Null" }, - { 1, "Boolean" }, - { 2, "SByte" }, - { 3, "Byte" }, - { 4, "Int16" }, - { 5, "UInt16" }, - { 6, "Int32" }, - { 7, "UInt32" }, - { 8, "Int64" }, - { 9, "UInt64" }, + { 0, "Null" }, + { 1, "Boolean" }, + { 2, "SByte" }, + { 3, "Byte" }, + { 4, "Int16" }, + { 5, "UInt16" }, + { 6, "Int32" }, + { 7, "UInt32" }, + { 8, "Int64" }, + { 9, "UInt64" }, { 10, "Float" }, { 11, "Double" }, { 12, "String" }, @@ -311,46 +311,46 @@ gint ett_opcua_array_DataValue = -1; gint ett_opcua_array_Variant = -1; static gint *ett[] = { - &ett_opcua_diagnosticinfo, - &ett_opcua_diagnosticinfo_encodingmask, - &ett_opcua_nodeid, - &ett_opcua_expandednodeid, - &ett_opcua_localizedtext, - &ett_opcua_localizedtext_encodingmask, - &ett_opcua_qualifiedname, - &ett_opcua_datavalue, - &ett_opcua_datavalue_encodingmask, - &ett_opcua_variant, - &ett_opcua_variant_arraydims, - &ett_opcua_extensionobject, - &ett_opcua_extensionobject_encodingmask, - &ett_opcua_statuscode, - &ett_opcua_statuscode_info, - &ett_opcua_array_Boolean, - &ett_opcua_array_SByte, - &ett_opcua_array_Byte, - &ett_opcua_array_Int16, - &ett_opcua_array_UInt16, - &ett_opcua_array_Int32, - &ett_opcua_array_UInt32, - &ett_opcua_array_Int64, - &ett_opcua_array_UInt64, - &ett_opcua_array_Float, - &ett_opcua_array_Double, - &ett_opcua_array_String, - &ett_opcua_array_DateTime, - &ett_opcua_array_Guid, - &ett_opcua_array_ByteString, - &ett_opcua_array_XmlElement, - &ett_opcua_array_NodeId, - &ett_opcua_array_ExpandedNodeId, - &ett_opcua_array_StatusCode, - &ett_opcua_array_DiagnosticInfo, - &ett_opcua_array_QualifiedName, - &ett_opcua_array_LocalizedText, - &ett_opcua_array_ExtensionObject, - &ett_opcua_array_DataValue, - &ett_opcua_array_Variant + &ett_opcua_diagnosticinfo, + &ett_opcua_diagnosticinfo_encodingmask, + &ett_opcua_nodeid, + &ett_opcua_expandednodeid, + &ett_opcua_localizedtext, + &ett_opcua_localizedtext_encodingmask, + &ett_opcua_qualifiedname, + &ett_opcua_datavalue, + &ett_opcua_datavalue_encodingmask, + &ett_opcua_variant, + &ett_opcua_variant_arraydims, + &ett_opcua_extensionobject, + &ett_opcua_extensionobject_encodingmask, + &ett_opcua_statuscode, + &ett_opcua_statuscode_info, + &ett_opcua_array_Boolean, + &ett_opcua_array_SByte, + &ett_opcua_array_Byte, + &ett_opcua_array_Int16, + &ett_opcua_array_UInt16, + &ett_opcua_array_Int32, + &ett_opcua_array_UInt32, + &ett_opcua_array_Int64, + &ett_opcua_array_UInt64, + &ett_opcua_array_Float, + &ett_opcua_array_Double, + &ett_opcua_array_String, + &ett_opcua_array_DateTime, + &ett_opcua_array_Guid, + &ett_opcua_array_ByteString, + &ett_opcua_array_XmlElement, + &ett_opcua_array_NodeId, + &ett_opcua_array_ExpandedNodeId, + &ett_opcua_array_StatusCode, + &ett_opcua_array_DiagnosticInfo, + &ett_opcua_array_QualifiedName, + &ett_opcua_array_LocalizedText, + &ett_opcua_array_ExtensionObject, + &ett_opcua_array_DataValue, + &ett_opcua_array_Variant }; void registerSimpleTypes(int proto) @@ -1176,3 +1176,16 @@ guint32 getExtensionObjectType(tvbuff_t *tvb, gint *pOffset) return Numeric; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c index 00f754e0b5..a9ae9905fd 100644 --- a/plugins/opcua/opcua_transport_layer.c +++ b/plugins/opcua/opcua_transport_layer.c @@ -217,3 +217,15 @@ int parseCloseSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) return ServiceId; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 5faa64da1d..57cb135daf 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -5097,3 +5097,16 @@ proto_reg_handoff_dcom_cba_acco (void) heur_dissector_add("pn_rt", dissect_CBA_Connection_Data_heur, proto_ICBAAccoServer); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c index 0f1658a404..6f91d98433 100644 --- a/plugins/profinet/packet-dcom-cba.c +++ b/plugins/profinet/packet-dcom-cba.c @@ -1728,3 +1728,16 @@ proto_reg_handoff_dcom_cba (void) &uuid_ICBASystemProperties, ver_ICBASystemProperties, ICBASystemProperties_dissectors, hf_cba_opnum); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index 0bdf11c47b..01e05f6169 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -1263,3 +1263,16 @@ proto_reg_handoff_pn_dcp (void) /* register ourself as an heuristic pn-rt payload dissector */ heur_dissector_add("pn_rt", dissect_PNDCP_Data_heur, proto_pn_dcp); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index b1b72bd179..f03ce1413c 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -530,3 +530,16 @@ proto_reg_handoff_pn_mrp (void) dissector_add_uint("ethertype", ETHERTYPE_MRP, mrp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c index 5819ba887f..6649ecbd3f 100644 --- a/plugins/profinet/packet-pn-mrrt.c +++ b/plugins/profinet/packet-pn-mrrt.c @@ -249,3 +249,16 @@ proto_reg_handoff_pn_mrrt (void) /* register ourself as an heuristic pn-rt payload dissector */ heur_dissector_add("pn_rt", dissect_PNMRRT_Data_heur, proto_pn_mrrt); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index 5a1fe57661..dfe155ebcf 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -1085,3 +1085,16 @@ proto_reg_handoff_pn_ptcp (void) /* register ourself as an heuristic pn-rt payload dissector */ heur_dissector_add("pn_rt", dissect_PNPTCP_Data_heur, proto_pn_ptcp); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index e5189fdba5..86ff4e1333 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -1022,3 +1022,16 @@ proto_reg_handoff_pn_rt(void) ethertype_subdissector_table = find_dissector_table("ethertype"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c index 9640b363cc..7f15bb6044 100644 --- a/plugins/profinet/packet-pn.c +++ b/plugins/profinet/packet-pn.c @@ -355,3 +355,15 @@ init_pn (int proto) expert_register_field_array(expert_pn, ei, array_length(ei)); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index f52be1d91a..40bf5962f4 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -1,26 +1,26 @@ /* pinfo_stats_tree.c -* Stats tree for ethernet frames -* -* (c) 2005, Luis E. G. Ontanon <luis@ontanon.org> -* -* Wireshark - Network traffic analyzer -* By Gerald Combs <gerald@wireshark.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + * Stats tree for ethernet frames + * + * (c) 2005, Luis E. G. Ontanon <luis@ontanon.org> + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" @@ -37,7 +37,7 @@ *------------------------------------- */ typedef struct { - range_t *packet_range; + range_t *packet_range; } uat_plen_record_t; static range_t default_range[10] = { @@ -53,10 +53,10 @@ static range_t default_range[10] = { {1, {{5120, 0xFFFFFFFF}}} }; static uat_plen_record_t *uat_plen_records = NULL; -static uat_t * plen_uat = NULL; +static uat_t *plen_uat = NULL; static guint num_plen_uat = 0; -static void* uat_plen_record_copy_cb(void* n, const void* o, size_t siz _U_) { +static void *uat_plen_record_copy_cb(void *n, const void *o, size_t siz _U_) { const uat_plen_record_t *r = (const uat_plen_record_t *)o; uat_plen_record_t *rn = (uat_plen_record_t *)n; @@ -79,7 +79,7 @@ uat_plen_record_update_cb(void *r, const char **err) } static void uat_plen_record_free_cb(void*r) { - uat_plen_record_t* record = (uat_plen_record_t*)r; + uat_plen_record_t *record = (uat_plen_record_t*)r; if (record->packet_range) g_free(record->packet_range); @@ -106,9 +106,9 @@ UAT_RANGE_CB_DEF(uat_plen_records, packet_range, uat_plen_record_t) /* ip host stats_tree -- basic test */ static int st_node_ip = -1; -static const gchar* st_str_ip = "IP Statistics/IP Addresses"; +static const gchar *st_str_ip = "IP Statistics/IP Addresses"; -static void ip_hosts_stats_tree_init(stats_tree* st) { +static void ip_hosts_stats_tree_init(stats_tree *st) { st_node_ip = stats_tree_create_node(st, st_str_ip, 0, TRUE); } @@ -123,11 +123,11 @@ static int ip_hosts_stats_tree_packet(stats_tree *st , packet_info *pinfo, epan /* ip host stats_tree -- separate source and dest, test stats_tree flags */ static int st_node_ip_src = -1; static int st_node_ip_dst = -1; -static const gchar* st_str_ip_srcdst = "IP Statistics/Source and Dest IP Addresses"; -static const gchar* st_str_ip_src = "Source IP Addresses"; -static const gchar* st_str_ip_dst = "Destination IP Addresses"; +static const gchar *st_str_ip_srcdst = "IP Statistics/Source and Dest IP Addresses"; +static const gchar *st_str_ip_src = "Source IP Addresses"; +static const gchar *st_str_ip_dst = "Destination IP Addresses"; -static void ip_srcdst_stats_tree_init(stats_tree* st) { +static void ip_srcdst_stats_tree_init(stats_tree *st) { /* create one tree branch for source */ st_node_ip_src = stats_tree_create_node(st, st_str_ip_src, 0, TRUE); /* set flag so this branch will always be sorted to top of tree */ @@ -151,14 +151,14 @@ static int ip_srcdst_stats_tree_packet(stats_tree *st , packet_info *pinfo, epa /* packet type stats_tree -- test pivot node */ static int st_node_ptype = -1; -static const gchar* st_str_ptype = "IP Statistics/IP Protocol Types"; +static const gchar *st_str_ptype = "IP Statistics/IP Protocol Types"; -static void ptype_stats_tree_init(stats_tree* st) { +static void ptype_stats_tree_init(stats_tree *st) { st_node_ptype = stats_tree_create_pivot(st, st_str_ptype, 0); } -static int ptype_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) { - const gchar* ptype; +static int ptype_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { + const gchar *ptype; ptype = port_type_to_str(pinfo->ptype); @@ -169,9 +169,9 @@ static int ptype_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_diss /* packet length stats_tree -- test range node */ static int st_node_plen = -1; -static const gchar* st_str_plen = "Packet Lengths"; +static const gchar *st_str_plen = "Packet Lengths"; -static void plen_stats_tree_init(stats_tree* st) { +static void plen_stats_tree_init(stats_tree *st) { guint i; char **str_range_array = (char **)ep_alloc(num_plen_uat*sizeof(char*)); @@ -183,7 +183,7 @@ static void plen_stats_tree_init(stats_tree* st) { st_node_plen = stats_tree_create_range_node_string(st, st_str_plen, 0, num_plen_uat, str_range_array); } -static int plen_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static int plen_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { tick_stat_node(st, st_str_plen, 0, FALSE); /* also add value for averages calculation. we call the notick version of */ /* avg_stat_node_add_value and call tick_stat_node separately. this allows */ @@ -202,13 +202,13 @@ static int plen_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_disse */ static int st_node_dsts = -1; -static const gchar* st_str_dsts = "IP Statistics/IP Destinations"; +static const gchar *st_str_dsts = "IP Statistics/IP Destinations"; -static void dsts_stats_tree_init(stats_tree* st) { +static void dsts_stats_tree_init(stats_tree *st) { st_node_dsts = stats_tree_create_node(st, st_str_dsts, 0, TRUE); } -static int dsts_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static int dsts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { static gchar str[128]; int ip_dst_node; int protocol_node; @@ -234,8 +234,8 @@ void register_pinfo_stat_trees(void) { UAT_END_FIELDS }; - stats_tree_register_plugin("ip","ip_hosts",st_str_ip, 0, ip_hosts_stats_tree_packet, ip_hosts_stats_tree_init, NULL ); - stats_tree_register_plugin("ip","ip_srcdst",st_str_ip_srcdst, 0, ip_srcdst_stats_tree_packet, ip_srcdst_stats_tree_init, NULL ); + stats_tree_register_plugin("ip","ip_hosts",st_str_ip, 0, ip_hosts_stats_tree_packet, ip_hosts_stats_tree_init, NULL ); + stats_tree_register_plugin("ip","ip_srcdst",st_str_ip_srcdst, 0, ip_srcdst_stats_tree_packet, ip_srcdst_stats_tree_init, NULL ); stats_tree_register_plugin("ip","ptype",st_str_ptype, 0, ptype_stats_tree_packet, ptype_stats_tree_init, NULL ); stats_tree_register_with_group("frame","plen",st_str_plen, 0, plen_stats_tree_packet, plen_stats_tree_init, NULL, REGISTER_STAT_GROUP_GENERIC ); stats_tree_register_plugin("ip","dests",st_str_dsts, 0, dsts_stats_tree_packet, dsts_stats_tree_init, NULL ); @@ -259,3 +259,16 @@ void register_pinfo_stat_trees(void) { prefs_register_uat_preference(stat_module, "packet_lengths", "Packet Lengths", "Delineated packet sizes to count", plen_uat); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c index 5e72a6ea8c..4f688c6c58 100644 --- a/plugins/tpg/packet-http.c +++ b/plugins/tpg/packet-http.c @@ -140,3 +140,16 @@ plugin_reg_handoff(void){ #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index a40723cb49..50daf0b5e0 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -2687,8 +2687,8 @@ dissect_audio_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! - For the moment, this code only remove Clang Warnings about not used msg_len... */ + /* TODO: add Expert info to indicate there is unknown data ! + For the moment, this code only remove Clang Warnings about not used msg_len... */ } return offset; @@ -2706,1336 +2706,1336 @@ proto_register_unistim(void){ module_t* unistim_module; static hf_register_info hf[] = { - { &hf_unistim_seq_nu, - { "RUDP Seq Num","unistim.num",FT_UINT32, - BASE_HEX|BASE_RANGE_STRING, RVALS(sequence_numbers), 0x0, NULL, HFILL} - }, - { &hf_unistim_cmd_add, - { "UNISTIM CMD Address","unistim.add",FT_UINT8, - BASE_HEX,VALS(command_address),0x0,NULL,HFILL} - }, - { &hf_uftp_command, - { "UFTP CMD","uftp.cmd",FT_UINT8, - BASE_HEX,VALS(uftp_commands),0x0,NULL,HFILL} - }, - { &hf_uftp_datablock_size, - { "UFTP Datablock Size","uftp.blocksize",FT_UINT32, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_uftp_datablock_limit, - { "UFTP Datablock Limit","uftp.limit",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_uftp_filename, - { "UFTP Filename","uftp.filename",FT_STRINGZ, - BASE_NONE,NULL,0x0,NULL,HFILL} - }, - { &hf_uftp_datablock, - { "UFTP Data Block","uftp.datablock",FT_BYTES, - BASE_NONE,NULL,0x0,NULL,HFILL} - }, - { &hf_unistim_packet_type, - { "RUDP Pkt type","unistim.type",FT_UINT8, - BASE_DEC, VALS(packet_names),0x0,NULL,HFILL} - }, - { &hf_unistim_payload, - { "UNISTIM Payload","unistim.pay",FT_UINT8, - BASE_HEX, VALS(payload_names),0x0,NULL,HFILL} - }, - { &hf_unistim_len , - { "UNISTIM CMD Length","unistim.len",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_basic_bit_field, - {"FLAGS","unistim.bit.fields",FT_BOOLEAN, - 8,TFS(&basic_bit_yn),0xff,NULL,HFILL} - }, - { &hf_basic_switch_cmd , - {"Basic Cmd (switch)","unistim.basic.switch",FT_UINT8, - BASE_HEX,VALS(basic_switch_msgs),0x0,NULL,HFILL} - }, - { &hf_basic_phone_cmd , - {"Basic Cmd (phone)","unistim.basic.phone",FT_UINT8, - BASE_HEX,VALS(basic_phone_msgs),0x0,NULL,HFILL} - }, - { &hf_broadcast_switch_cmd , - {"Broadcast Cmd (switch)","unistim.broadcast.switch",FT_UINT8, - BASE_HEX,VALS(broadcast_switch_msgs),0x0,NULL,HFILL} - }, + { &hf_unistim_seq_nu, + { "RUDP Seq Num","unistim.num",FT_UINT32, + BASE_HEX|BASE_RANGE_STRING, RVALS(sequence_numbers), 0x0, NULL, HFILL} + }, + { &hf_unistim_cmd_add, + { "UNISTIM CMD Address","unistim.add",FT_UINT8, + BASE_HEX,VALS(command_address),0x0,NULL,HFILL} + }, + { &hf_uftp_command, + { "UFTP CMD","uftp.cmd",FT_UINT8, + BASE_HEX,VALS(uftp_commands),0x0,NULL,HFILL} + }, + { &hf_uftp_datablock_size, + { "UFTP Datablock Size","uftp.blocksize",FT_UINT32, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_uftp_datablock_limit, + { "UFTP Datablock Limit","uftp.limit",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_uftp_filename, + { "UFTP Filename","uftp.filename",FT_STRINGZ, + BASE_NONE,NULL,0x0,NULL,HFILL} + }, + { &hf_uftp_datablock, + { "UFTP Data Block","uftp.datablock",FT_BYTES, + BASE_NONE,NULL,0x0,NULL,HFILL} + }, + { &hf_unistim_packet_type, + { "RUDP Pkt type","unistim.type",FT_UINT8, + BASE_DEC, VALS(packet_names),0x0,NULL,HFILL} + }, + { &hf_unistim_payload, + { "UNISTIM Payload","unistim.pay",FT_UINT8, + BASE_HEX, VALS(payload_names),0x0,NULL,HFILL} + }, + { &hf_unistim_len , + { "UNISTIM CMD Length","unistim.len",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_basic_bit_field, + {"FLAGS","unistim.bit.fields",FT_BOOLEAN, + 8,TFS(&basic_bit_yn),0xff,NULL,HFILL} + }, + { &hf_basic_switch_cmd , + {"Basic Cmd (switch)","unistim.basic.switch",FT_UINT8, + BASE_HEX,VALS(basic_switch_msgs),0x0,NULL,HFILL} + }, + { &hf_basic_phone_cmd , + {"Basic Cmd (phone)","unistim.basic.phone",FT_UINT8, + BASE_HEX,VALS(basic_phone_msgs),0x0,NULL,HFILL} + }, + { &hf_broadcast_switch_cmd , + {"Broadcast Cmd (switch)","unistim.broadcast.switch",FT_UINT8, + BASE_HEX,VALS(broadcast_switch_msgs),0x0,NULL,HFILL} + }, #if 0 - { &hf_broadcast_phone_cmd , - {"Broadcast Cmd (phone)","unistim.broadcast.phone",FT_UINT8, - BASE_HEX,VALS(broadcast_phone_msgs),0x0,NULL,HFILL} - }, + { &hf_broadcast_phone_cmd , + {"Broadcast Cmd (phone)","unistim.broadcast.phone",FT_UINT8, + BASE_HEX,VALS(broadcast_phone_msgs),0x0,NULL,HFILL} + }, #endif - { &hf_audio_switch_cmd , - {"Audio Cmd (switch)","unistim.audio.switch",FT_UINT8, - BASE_HEX,VALS(audio_switch_msgs),0x0,NULL,HFILL} - }, - { &hf_audio_phone_cmd , - {"Audio Cmd (phone)","unistim.audio.phone",FT_UINT8, - BASE_HEX,VALS(audio_phone_msgs),0x0,NULL,HFILL} - }, - { &hf_display_switch_cmd , - {"Display Cmd (switch)","unistim.display.switch",FT_UINT8, - BASE_HEX,VALS(display_switch_msgs),0x0,NULL,HFILL} - }, - { &hf_display_phone_cmd , - {"Display Cmd (phone)","unistim.display.phone",FT_UINT8, - BASE_HEX,VALS(display_phone_msgs),0x0,NULL,HFILL} - }, - { &hf_key_switch_cmd , - {"Key Cmd (switch)","unistim.key.switch",FT_UINT8, - BASE_HEX,VALS(key_switch_msgs),0x0,NULL,HFILL} - }, - { &hf_key_phone_cmd , - {"Key Cmd (phone)","unistim.key.phone",FT_UINT8, - BASE_HEX,VALS(key_phone_msgs),0x0,NULL,HFILL} - }, - { &hf_network_switch_cmd , - {"Network Cmd (switch)","unistim.network.switch",FT_UINT8, - BASE_HEX,VALS(network_switch_msgs),0x0,NULL,HFILL} - }, - { &hf_network_phone_cmd , - {"Network Cmd (phone)","unistim.network.phone",FT_UINT8, - BASE_HEX,VALS(network_phone_msgs),0x0,NULL,HFILL} - }, - { &hf_terminal_id, - {"Terminal ID","unistim.terminal.id",FT_IPv4, - BASE_NONE,NULL,0x0,NULL,HFILL} - }, - { &hf_broadcast_year, - {"Year","unistim.broadcast.year",FT_UINT8, - BASE_DEC,NULL,0x7f,NULL,HFILL} - }, - { &hf_broadcast_month, - {"Month","unistim.broadcast.month",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_broadcast_day, - {"Day","unistim.broadcast.day",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_broadcast_hour, - {"Hour","unistim.broadcast.hour",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_broadcast_minute, - {"Minute","unistim.broadcast.minute",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_broadcast_second, - {"Second","unistim.broadcast.second",FT_UINT8, - BASE_DEC,NULL,0x0,NULL,HFILL} - }, - { &hf_net_diag_flag, - {"Query Network Manager Diagnostic","unistim.query.diagnostic", - FT_BOOLEAN,8, NULL, - QUERY_NETWORK_MANAGER_DIAGNOSTIC, NULL,HFILL} - }, - { &hf_net_managers_flag, - {"Query Network Manager Managers","unistim.query.managers", - FT_BOOLEAN,8, NULL, - QUERY_NETWORK_MANAGER_MANAGERS, NULL,HFILL} - }, - { &hf_net_attributes_flag, - {"Query Network Manager Attributes","unistim.query.attributes", - FT_BOOLEAN, 8,NULL, - QUERY_NETWORK_MANAGER_ATTRIBUTES,NULL,HFILL} - }, - { &hf_net_serv_info_flag, - {"Query Network Manager Server Info","unistim.query.serverInfo", - FT_BOOLEAN, 8,NULL, - QUERY_NETWORK_MANAGER_SERVER_INFO,NULL,HFILL} - }, - { &hf_net_options_flag, - {"Query Network Manager Options","unistim.query.options", - FT_BOOLEAN, 8,NULL, - QUERY_NETWORK_MANAGER_OPTIONS,NULL,HFILL} - }, - { &hf_net_sanity_flag, - {"Query Network Manager Sanity","unistim.query.sanity", - FT_BOOLEAN, 8,NULL, - QUERY_NETWORK_MANAGER_SANITY,NULL,HFILL} - }, - { &hf_net_enable_diag, - {"Network Manager Enable DIAG","unistim.enable.diag", - FT_BOOLEAN, 8,NULL, - NETWORK_MANAGER_ENABLE_DIAG,NULL,HFILL} - }, - { &hf_net_enable_rudp, - {"Network Manager Enable RUDP","unistim.enable.network.rel.udp", - FT_BOOLEAN, 8,NULL, - NETWORK_MANAGER_ENABLE_RUDP,NULL,HFILL} - }, - { &hf_net_server_id, - {"Download Server ID","unistim.download.id",FT_UINT8, - BASE_HEX, VALS(network_server_id),0x00,NULL,HFILL} - }, - { &hf_net_server_port, - {"Download Server Port","unistim.download.port",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} - }, - { &hf_net_server_action, - {"Download Server Action","unistim.download.action",FT_UINT8, - BASE_HEX, VALS(server_action),0x00,NULL,HFILL} - }, - { &hf_net_server_retry_count, - {"Download Retry Count","unistim.download.retry",FT_UINT8, - BASE_DEC, NULL,0x00,NULL,HFILL} - }, - { &hf_net_server_failover_id, - {"Download Failover Server ID","unistim.download.failover",FT_UINT8, - BASE_HEX, VALS(network_server_id),0x00,NULL,HFILL} - }, - { &hf_net_server_ip_address, - {"Download Server Address","unistim.download.address",FT_UINT32, - BASE_HEX, NULL,0x00,NULL,HFILL} - }, - { &hf_net_server_time_out, - {"Watchdog Timeout","unistim.watchdog.timeout",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} - }, - { &hf_net_server_config_element, - {"Configure Network Element","unistim.config.element",FT_UINT8, - BASE_HEX, VALS(network_elements),0x00,NULL,HFILL} - }, - { &hf_net_server_recovery_time_low, - {"Recovery Procedure Idle Low Boundary","unistim.recovery.low",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} - }, - { &hf_net_server_recovery_time_high, - {"Recovery Procedure Idle High Boundary","unistim.recovery.high",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} - }, - { &hf_net_phone_rx_ovr_flag, - {"Receive Buffer Overflow","unistim.receive.overflow", - FT_BOOLEAN, 8,NULL, - RX_BUFFER_OVERFLOW,NULL,HFILL} - }, - { &hf_net_phone_tx_ovr_flag, - {"Transmit Buffer Overflow","unistim.trans.overflow", - FT_BOOLEAN, 8,NULL, - TX_BUFFER_OVERFLOW,NULL,HFILL} - }, - { &hf_net_phone_rx_empty_flag, - {"Receive Buffer Unexpectedly Empty","unistim.receive.empty", - FT_BOOLEAN, 8,NULL, - RX_UNEXPECT_EMPTY,NULL,HFILL} - }, - { &hf_net_phone_invalid_msg_flag, - {"Received Invalid MSG","unistim.invalid.msg", - FT_BOOLEAN, 8,NULL, - INVALID_MSG,NULL,HFILL} - }, - { &hf_net_phone_eeprom_insane_flag, - {"EEProm Insane","unistim.eeprom.insane", - FT_BOOLEAN, 8,NULL, - EEPROM_INSANE,NULL,HFILL} - }, - { &hf_net_phone_eeprom_unsafe_flag, - {"EEProm Unsafe","unistim.eeprom.unsafe", - FT_BOOLEAN, 8,NULL, - EEPROM_UNSAFE,NULL,HFILL} - }, - { &hf_net_phone_diag, - {"Diagnostic Command Enabled","unistim.diag.enabled",FT_BOOLEAN, - 8,NULL,NETWORK_MGR_REPORT_DIAG,NULL,HFILL} - }, - { &hf_net_phone_rudp, - {"Reliable UDP Active","unistim.rudp.active",FT_BOOLEAN, - 8,NULL,NETWORK_MGR_REPORT_RUDP,NULL,HFILL} - }, - { &hf_basic_switch_query_flags, - {"Query Basic Manager","unistim.basic.query",FT_UINT8, - BASE_HEX, NULL,0x00,"INITIAL PHONE QUERY",HFILL} - }, - { &hf_basic_switch_query_attr, - {"Query Basic Manager Attributes","unistim.basic.attrs",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_ATTRIBUTES,"Basic Query Attributes",HFILL} - }, - { &hf_basic_switch_query_opts, - {"Query Basic Manager Options","unistim.basic.opts",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_OPTIONS,"Basic Query Options",HFILL} - }, - { &hf_basic_switch_query_fw, - {"Query Basic Switch Firmware","unistim.basic.fw",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_FW,"Basic Query Firmware",HFILL} - }, - { &hf_basic_switch_query_hw_id, - {"Query Basic Manager Hardware ID","unistim.basic.hwid",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_HW_ID,"Basic Query Hardware ID",HFILL} - }, - { &hf_basic_switch_query_it_type, - {"Query Basic Manager Phone Type","unistim.basic.type",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_IT_TYPE,"Basic Query Phone Type",HFILL} - }, - { &hf_basic_switch_query_prod_eng_code, - {"Query Basic Manager Prod Eng Code","unistim.basic.code",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_PROD_ENG_CODE,"Basic Query Production Engineering Code",HFILL} - }, - { &hf_basic_switch_query_gray_mkt_info, - {"Query Basic Manager Gray Mkt Info","unistim.basic.gray",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_GRAY_MKT_INFO,"Basic Query Gray Market Info",HFILL} - }, - { &hf_basic_switch_options_secure, - {"Basic Switch Options Secure Code","unistim.basic.secure",FT_BOOLEAN, - 8,NULL,BASIC_OPTION_SECURE,NULL,HFILL} - }, - { &hf_basic_switch_element_id, - {"Basic Element ID","unistim.basic.element.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_basic_switch_eeprom_data, - {"EEProm Data","unistim.basic.eeprom.data",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_basic_phone_eeprom_stat_cksum, - {"Basic Phone EEProm Static Checksum","unistim.static.cksum",FT_UINT8, - BASE_HEX,NULL,0x0,NULL,HFILL} - }, - { &hf_basic_phone_eeprom_dynam, - {"Basic Phone EEProm Dynamic Checksum","unistim.dynam.cksum",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_basic_phone_eeprom_net_config_cksum, - {"Basic Phone EEProm Net Config Checksum","unistim.netconfig.cksum",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_basic_phone_hw_id, - {"Basic Phone Hardware ID","unistim.basic.hw.id",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_basic_phone_fw_ver, - {"Basic Phone Firmware Version","unistim.basic.fw.ver",FT_STRING, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_key_code, - {"Key Name","unistim.key.name",FT_UINT8, - BASE_HEX,VALS(key_names),0x3f,NULL,HFILL} - }, - { &hf_key_command, - {"Key Action","unistim.key.action",FT_UINT8, - BASE_HEX,VALS(key_cmds),0xc0,NULL,HFILL} - }, - { &hf_icon_id, - {"Icon ID","unistim.icon.id",FT_UINT8, - BASE_HEX,NULL, DISPLAY_ICON_ID,NULL,HFILL} - }, - { &hf_broadcast_icon_state, - {"Icon State","unistim.icon.state",FT_UINT8, - BASE_HEX,VALS(bcast_icon_states),0x1f,NULL,HFILL} - }, - { &hf_broadcast_icon_cadence, - {"Icon Cadence","unistim.icon.cadence",FT_UINT8, - BASE_HEX,VALS(bcast_icon_cadence),0xe0,NULL,HFILL} - }, - { &hf_audio_mgr_attr, - {"Query Audio Manager Attributes","unistim.audio.attr",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_ATTRIBUTES,NULL,HFILL} - }, - { &hf_audio_mgr_opts, - {"Query Audio Manager Options","unistim.audio.options",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_OPTIONS,NULL,HFILL} - }, - { &hf_audio_mgr_alert, - {"Query Audio Manager Alerting","unistim.audio.alerting",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_ALERTING ,NULL,HFILL} - }, - { &hf_audio_mgr_adj_rx_vol, - {"Query Audio Manager Adjustable Receive Volume","unistim.audio.adj.volume",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_ADJ_RX_VOL,NULL,HFILL} - }, - { &hf_audio_mgr_def_rx_vol, - {"Query Audio Manager Default Receive Volume","unistim.audio.def.volume",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_DEF_RX_VOL,NULL,HFILL} - }, - { &hf_audio_mgr_handset, - {"Query Audio Manager Handset","unistim.audio.handset",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_HANDSET,NULL,HFILL} - }, - { &hf_audio_mgr_headset, - {"Query Audio Manager Headset","unistim.audio.headset",FT_BOOLEAN, - 8,NULL,QUERY_AUDIO_MGR_HEADSET,NULL,HFILL} - }, - { &hf_audio_default_rx_vol_id, - {"Audio Manager Default Receive Volume ID","unistim.audio.volume.id",FT_UINT8, - BASE_HEX,VALS(default_rx_vol_id),0x00,NULL,HFILL} - }, - { &hf_audio_mgr_opt_max_vol, - {"Audio Manager Enable Max Tone Volume","unistim.audio.max.tone",FT_BOOLEAN, - 8,TFS(&audio_opts_enable_max_tone_vol),AUDIO_MGR_OPTS_MAX_VOL,NULL,HFILL} - }, - { &hf_audio_mgr_opt_adj_vol, - {"Audio Manager Adjust Volume","unistim.audio.opts.adj.vol",FT_BOOLEAN, - 8,TFS(&audio_opts_adjust_volume),AUDIO_MGR_ADJ_VOL,NULL,HFILL} - }, - { &hf_audio_mgr_opt_aa_rx_vol_rpt, - {"Audio Manager Auto Adjust Volume RPT","unistim.audio.aa.vol.rpt",FT_BOOLEAN, - 8,TFS(&audio_opts_automatic_adjustable),AUDIO_MGR_AUTO_RX_VOL_RPT,NULL,HFILL} - }, - { &hf_audio_mgr_opt_hs_on_air, - {"Audio Manager Handset","unistim.audio.handset",FT_BOOLEAN, - 8,TFS(&audio_opts_hs_on_air_feature),AUDIO_MGR_HS_ON_AIR,NULL,HFILL} - }, - { &hf_audio_mgr_opt_hd_on_air, - {"Audio Manager Headset","unistim.audio.headset",FT_BOOLEAN, - 8,TFS(&audio_opts_hd_on_air_feature),AUDIO_MGR_HD_ON_AIR,NULL,HFILL} - }, - { &hf_audio_mgr_opt_noise_squelch, - {"Audio Manager Noise Squelch","unistim.audio.squelch",FT_BOOLEAN, - 8,TFS(&noise_sqlch_disable), AUDIO_MGR_NOISE_SQUELCH,NULL,HFILL} - }, - { &hf_audio_mgr_mute, - {"Audio Manager Mute","unistim.audio.mute",FT_BOOLEAN, - 8,TFS(&audio_mgr_mute_val),AUDIO_MGR_MUTE,NULL,HFILL} - }, - { &hf_audio_mgr_tx_rx, - {"Audio Manager RX or TX","unistim.audio.rx.tx",FT_BOOLEAN, - 8,TFS(&audio_mgr_tx_rx_val),AUDIO_MGR_TX_RX,NULL,HFILL} - }, - { &hf_audio_mgr_stream_id, - {"Audio Manager Stream ID","unistim.audio.stream.id",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_mgr_transducer_based_tone_id, - {"Audio Manager Transducer Based Tone On","unistim.audio.transducer.on",FT_UINT8, - BASE_HEX,VALS(trans_base_tone_ids),0x07,NULL,HFILL} - }, - { &hf_audio_mgr_attenuated, - {"Audio Manager Transducer Tone Attenuated","unistim.audio.attenuated.on",FT_BOOLEAN, - 8,NULL,AUDIO_MGR_ATTENUATED,NULL,HFILL} - }, - { &hf_audio_mgr_warbler_select, - {"Warbler Select","unistim.warbler.select",FT_UINT8, - BASE_HEX,NULL,0x07,NULL,HFILL} - }, - { &hf_audio_mgr_transducer_routing, - {"Transducer Routing","unistim.transducer.routing",FT_UINT8, - BASE_HEX,VALS(transducer_routing_vals),0xf8,NULL,HFILL} - }, - { &hf_audio_mgr_tone_vol_range, - {"Tone Volume Range in Steps","unistim.tone.volume.range",FT_UINT8, - BASE_HEX,NULL,0x0f,NULL,HFILL} - }, - { &hf_audio_mgr_cadence_select, - {"Cadence Select","unistim.cadence.select",FT_UINT8, - BASE_HEX,VALS(cadence_select_vals),0xf0,NULL,HFILL} - }, - { &hf_audio_special_tone, - {"Special Tone Select","unistim.special.tone.select",FT_UINT8, - BASE_HEX,VALS(special_tones_vals),0x00,NULL,HFILL} - }, - { &hf_audio_tone_level, - {"Tone Level","unistim.audio.tone.level",FT_UINT8, - BASE_DEC,NULL,0xf0,NULL,HFILL} - }, - { &hf_audio_visual_tones, - {"Enable Visual Tones","unistim.visual.tones",FT_BOOLEAN, - 8,NULL,AUDIO_MGR_VISUAL_TONE,NULL,HFILL} - }, - { &hf_audio_stream_based_tone_id, - {"Stream Based Tone ID","unistim.stream.tone.id",FT_UINT8, - BASE_HEX,VALS(stream_based_tone_vals),0x1f,NULL,HFILL} - }, - { &hf_audio_stream_based_tone_rx_tx, - {"Stream Based Tone RX or TX","unistim.stream.based.tone.rx.tx",FT_BOOLEAN, - 8,TFS(&stream_based_tone_rx_tx_yn),AUDIO_STREAM_BASED_TONE_RX_TX,NULL,HFILL} - }, - { &hf_audio_stream_based_tone_mute, - {"Stream Based Tone Mute","unistim.stream.tone.mute",FT_BOOLEAN, - 8,TFS(&stream_based_tone_mute_yn),AUDIO_STREAM_BASED_TONE_MUTE,NULL,HFILL} - }, - { &hf_audio_stream_id, - {"Stream ID","unistim.audio.stream.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_stream_based_volume, - {"Stream Based Volume ID","unistim.stream.volume.id",FT_UINT8, - BASE_HEX,VALS(stream_base_vol_level),0x00,NULL,HFILL} - }, - { &hf_basic_switch_terminal_id, - {"Terminal ID assigned by Switch","unistim.switch.terminal.id",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_basic_it_type, - {"IT (Phone) Type","unistim.it.type",FT_UINT8, - BASE_HEX,VALS(it_types),0x00,NULL,HFILL} - }, - { &hf_basic_prod_eng_code, - {"Product Engineering Code for phone","unistim.basic.eng.code",FT_STRING, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_net_phone_primary_server_id, - {"Phone Primary Server ID","unistim.net.phone.primary.id",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_phone_server_port, - {"Port Number","unistim.server.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_phone_server_action, - {"Action","unistim.server.action.byte",FT_UINT8, - BASE_HEX,VALS(action_bytes),0x00,NULL,HFILL} - }, - { &hf_net_phone_server_retry_count, - {"Number of times to Retry","unistim.server.retry.count",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_phone_server_failover_id, - {"Failover Server ID","unistim.server.failover.id",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_phone_server_ip, - {"IP address","unistim.server.ip.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_apb_number, - {"APB Number","unistim.audio.apb.number",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { & hf_audio_apb_op_code, - {"APB Operation Code","unistim.audio.apb.op.code",FT_UINT8, - BASE_HEX,VALS(apb_op_codes),0x00,NULL,HFILL} - }, - { &hf_audio_apb_param_len, - {"APB Operation Parameter Length","unistim.apb.param.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_apb_data, - {"APB Operation Data","unistim.apb.operation.data",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_display_write_address_numeric, - {"Is Address Numeric","unistim.write.address.numeric",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_ADDRESS_NUMERIC_FLAG,NULL,HFILL} - }, - { &hf_display_write_address_context, - {"Context Field in the Info Bar","unistim.write.address.context",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_ADDRESS_CONTEXT_FLAG,NULL,HFILL} - }, - { &hf_display_write_address_line, - {"Write A Line","unistim.write.address.line",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_ADDRESS_LINE_FLAG ,NULL,HFILL} - }, - { &hf_display_write_address_soft_key, - {"Write a SoftKey","unistim.write.address.softkey",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG,NULL,HFILL} - }, - { &hf_display_write_address_soft_label, - {"Write A Softkey Label","unistim.write.address.softkey.label",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG,NULL,HFILL} - }, - { &hf_display_write_address_softkey_id, - {"Soft Key ID","unistim.write.addres.softkey.id",FT_UINT8, - BASE_HEX,NULL,DISPLAY_WRITE_ADDRESS_SOFT_KEY_ID,NULL,HFILL} - }, - { &hf_display_write_address_char_pos, - {"Character Position or Soft-Label Key ID","unistim.display.write.address.char.pos",FT_UINT8, - BASE_HEX,NULL,DISPLAY_WRITE_ADDRESS_CHAR_POS,NULL,HFILL} - }, - { &hf_display_write_address_line_number, - {"Line Number","unistim.write.address.line.number",FT_UINT8, - BASE_DEC,NULL,DISPLAY_WRITE_ADDRESS_LINE_NUM,NULL,HFILL} - }, - { &hf_display_write_cursor_move, - {"Cursor Move","unistim.display.cursor.move",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_CURSOR_MOVE,NULL,HFILL} - }, - { &hf_display_write_clear_left, - {"Clear Left","unistim.display.clear.left",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_CLEAR_LEFT,NULL,HFILL} - }, - { &hf_display_write_clear_right, - {"Clear Right","unistim.display.clear.right",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_CLEAR_RIGHT,NULL,HFILL} - }, - { &hf_display_write_shift_left, - {"Shift Left","unistim.display.shift.left",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_SHIFT_LEFT,NULL,HFILL} - }, - { &hf_display_write_shift_right, - {"Shift Right","unistim.display.shift.right",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_SHIFT_RIGHT,NULL,HFILL} - }, - { &hf_display_write_highlight, - {"Highlight","unistim.display.highlight",FT_BOOLEAN, - 8,NULL,DISPLAY_WRITE_HIGHLIGHT,NULL,HFILL} - }, - { &hf_display_write_tag, - {"Tag for text","unistim.display.text.tag",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_display_cursor_move_cmd, - {"Cursor Movement Command","unistim.cursor.move.cmd",FT_UINT8, - BASE_HEX,VALS(cursor_move_cmds),DISPLAY_CURSOR_MOVE_CMD,NULL,HFILL} - }, - { &hf_display_cursor_blink, - {"Should Cursor Blink","unistim.cursor.blink",FT_BOOLEAN, - 8,NULL,DISPLAY_CURSOR_BLINK,NULL,HFILL} - }, - { &hf_audio_vocoder_id, - {"Vocoder Protocol","unistim.vocoder.id",FT_UINT8, - BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} - }, - { &hf_audio_vocoder_param, - {"Vocoder Config Param","unistim.vocoder.config.param",FT_UINT8, - BASE_HEX,VALS(vocoder_config_params),AUDIO_VOCODER_CONFIG_PARAM,NULL,HFILL} - }, - { &hf_audio_vocoder_entity, - {"Vocoder Entity","unistim.vocoder.entity",FT_UINT8, - BASE_HEX,VALS(config_param_entities),AUDIO_VOCODER_CONFIG_ENTITY,NULL,HFILL} - }, - { &hf_audio_vocoder_annexa, - {"Enable Annex A","unistim.enable.annexa",FT_BOOLEAN, - 8,NULL,AUDIO_VOCODER_ANNEXA,NULL,HFILL} - }, - { &hf_audio_vocoder_annexb, - {"Enable Annex B","unistim.enable.annexb",FT_BOOLEAN, - 8,NULL,AUDIO_VOCODER_ANNEXB,NULL,HFILL} - }, - { &hf_audio_sample_rate, - {"Sample Rate","unistim.audio.sample.rate",FT_UINT8, - BASE_HEX,VALS(sample_rates),0x00,NULL,HFILL} - }, - { &hf_audio_rtp_type, - {"RTP Type","unistim.audio.rtp.type",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_bytes_per_frame, - {"Bytes Per Frame","unistim.audio.bytes.per.frame",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_rx_stream_id, - {"Receive Stream Id","unistim.rx.stream.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_tx_stream_id, - {"Transmit Stream Id","unistim.rx.stream.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_rx_vocoder_type, - {"Receive Vocoder Protocol","unistim.vocoder.id",FT_UINT8, - BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} - }, - { &hf_tx_vocoder_type, - {"Transmit Vocoder Protocol","unistim.vocoder.id",FT_UINT8, - BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} - }, - { &hf_frames_per_packet, - {"Frames Per Packet","unistim.vocoder.frames.per.packet",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_tos, - {"Type of Service","unistim.audio.type.service",FT_UINT8, - BASE_HEX,VALS(types_of_service),AUDIO_TYPE_OF_SERVICE,NULL,HFILL} - }, - { &hf_audio_precedence, - {"Precedence","unistim.audio.precedence",FT_UINT8, - BASE_HEX,VALS(precedences),AUDIO_PRECENDENCE,NULL,HFILL} - }, - { &hf_audio_frf_11, - {"FRF.11 Enable","unistim.audio.frf.11",FT_BOOLEAN, - 8,NULL,AUDIO_FRF_11,NULL,HFILL} - }, - { &hf_audio_lcl_rtp_port, - {"Phone RTP Port","unistim.local.rtp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_lcl_rtcp_port, - {"Phone RTCP Port","unistim.local.rtcp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_far_rtp_port, - {"Distant RTP Port","unistim.far.rtp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_far_rtcp_port, - {"Distant RTCP Port","unistim.far.rtcp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_far_ip_add, - {"Distant IP Address for RT[C]P","unistim.far.ip.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_rtcp_bucket_id, - {"RTCP Bucket ID","unistim.rtcp.bucket.id",FT_UINT16, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_key_icon_id, - {"Icon ID","unistim.key.icon.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_display_clear_numeric, - {"Numeric Index Field in InfoBar","unistim.display.clear.numeric",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_NUMERIC,NULL,HFILL} - }, - { &hf_display_clear_context , - {"Context Field in InfoBar","unistim.display.clear.context",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_CONTEXT,NULL,HFILL} - }, - { &hf_display_clear_date , - {"Date Field","unistim.display.clear.date",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_DATE,NULL,HFILL} - }, - { &hf_display_clear_time, - {"Time Field","unistim.display.clear.time",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_TIME,NULL,HFILL} - }, - { &hf_display_clear_line, - {"Line Data","unistim.display.clear.line",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon, - {"Status Bar Icon","unistim.display.statusbar.icon",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_STATUS_BAR_ICON,NULL,HFILL} - }, - { &hf_display_clear_softkey, - {"Soft Key","unistim.display.clear.softkey",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_SOFTKEY,NULL,HFILL} - }, - { &hf_display_clear_softkey_label , - {"Soft Key Label","unistim.display.clear.softkey.label",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_SOFTKEY_LABEL,NULL,HFILL} - }, - { &hf_display_clear_line_1 , - {"Line 1","unistim.display.clear.line1",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_1,NULL,HFILL} - }, - { &hf_display_clear_line_2 , - {"Line 2","unistim.display.clear.line2",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_2,NULL,HFILL} - }, - { &hf_display_clear_line_3 , - {"Line 3","unistim.display.clear.line3",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_3,NULL,HFILL} - }, - { &hf_display_clear_line_4 , - {"Line 4","unistim.display.clear.line4",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_4,NULL,HFILL} - }, - { &hf_display_clear_line_5 , - {"Line 5","unistim.display.clear.line5",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_5,NULL,HFILL} - }, - { &hf_display_clear_line_6 , - {"Line 6","unistim.display.clear.line6",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_6,NULL,HFILL} - }, - { &hf_display_clear_line_7 , - {"Line 7","unistim.display.clear.line7",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_7,NULL,HFILL} - }, - { &hf_display_clear_line_8 , - {"Line 8","unistim.display.clear.line8",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_LINE_8,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_1 , - {"Status Bar Icon 1","unistim.display.clear.sbar.icon1",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_1,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_2 , - {"Status Bar Icon 2","unistim.display.clear.sbar.icon2",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_2,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_3 , - {"Status Bar Icon 3","unistim.display.clear.sbar.icon3",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_3,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_4 , - {"Status Bar Icon 4","unistim.display.clear.sbar.icon4",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_4,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_5 , - {"Status Bar Icon 5","unistim.display.clear.sbar.icon5",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_5,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_6 , - {"Status Bar Icon 6","unistim.display.clear.sbar.icon6",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_6,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_7 , - {"Status Bar Icon 7","unistim.display.clear.sbar.icon7",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_7,NULL,HFILL} - }, - { &hf_display_clear_status_bar_icon_8 , - {"Status Bar Icon 8","unistim.display.clear.sbar.icon8",FT_BOOLEAN, - 8,NULL,DISPLAY_STATUS_BAR_ICON_8,NULL,HFILL} - }, - { &hf_display_clear_soft_key_1 , - {"Soft Key 1","unistim.display.clear.soft.key1",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_1,NULL,HFILL} - }, - { &hf_display_clear_soft_key_2 , - {"Soft Key 2","unistim.display.clear.soft.key2",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_2,NULL,HFILL} - }, - { &hf_display_clear_soft_key_3 , - {"Soft Key 3","unistim.display.clear.soft.key3",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_3,NULL,HFILL} - }, - { &hf_display_clear_soft_key_4 , - {"Soft Key 4","unistim.display.clear.soft.key4",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_4,NULL,HFILL} - }, - { &hf_display_clear_soft_key_5 , - {"Soft Key 5","unistim.display.clear.soft.key5",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_5,NULL,HFILL} - }, - { &hf_display_clear_soft_key_6 , - {"Soft Key 6","unistim.display.clear.soft.key6",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_6,NULL,HFILL} - }, - { &hf_display_clear_soft_key_7 , - {"Soft Key 7","unistim.display.clear.soft.key7",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_7,NULL,HFILL} - }, - { &hf_display_clear_soft_key_8 , - {"Soft Key 8","unistim.display.clear.soft.key8",FT_BOOLEAN, - 8,NULL,DISPLAY_SOFT_KEY_8,NULL,HFILL} - }, - { &hf_display_clear_sk_label_key_id, - {"Soft Key Label ID","unistim.display.clear.sk.label.id",FT_UINT8, - BASE_HEX,NULL, DISPLAY_CLEAR_SK_LABEL_KEY_ID,NULL,HFILL} - }, - { &hf_display_clear_all_slks, - {"Clear All Soft Key Labels","unistim.display.clear.all.sks",FT_BOOLEAN, - 8,NULL,DISPLAY_CLEAR_ALL_SLKS,NULL,HFILL} - }, - { &hf_key_led_cadence, - {"LED Cadence","unistim.key.led.cadence",FT_UINT8, - BASE_HEX,VALS(led_cadences),KEY_LED_CADENCE,NULL,HFILL} - }, - { &hf_key_led_id, - {"LED ID","unistim.key.led.id",FT_UINT8, - BASE_HEX,VALS(led_ids),KEY_LED_ID,NULL,HFILL} - }, - { &hf_basic_ether_address, - {"Phone Ethernet Address","unistim.phone.ether",FT_ETHER, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_rtcp_bucket_id, - {"RTCP Bucket ID","unistim.audio.rtcp.bucket.id",FT_UINT8, - BASE_HEX,NULL,AUDIO_RTCP_BUCKET_ID,NULL,HFILL} - }, - { &hf_audio_clear_bucket, - {"Clear Bucket Counter","unistim.clear.bucket",FT_BOOLEAN, - 8,NULL,AUDIO_CLEAR_BUCKET,NULL,HFILL} - }, - { &hf_display_arrow, - {"Arrow Display Direction","unistim.arrow.direction",FT_UINT8, - BASE_HEX,VALS(arrow_dirs),0x00,NULL,HFILL} - }, - { &hf_audio_transducer_pair, - {"Audio Transducer Pair","unistim.transducer.pairs",FT_UINT8, - BASE_HEX,VALS(transducer_pairs),AUDIO_TRANSDUCER_PAIR_ID,NULL,HFILL} - }, - { &hf_audio_rx_enable, - {"RX Enable","unistim.receive.enable",FT_BOOLEAN, - 8,NULL,AUDIO_RX_ENABLE,NULL,HFILL} - }, - { &hf_audio_tx_enable, - {"TX Enable","unistim.transmit.enable",FT_BOOLEAN, - 8,NULL,AUDIO_TX_ENABLE,NULL,HFILL} - }, - { &hf_audio_sidetone_disable, - {"Disable Sidetone","unistim.audio.sidetone.disable",FT_BOOLEAN, - 8,NULL,AUDIO_SIDETONE_DISABLE,NULL,HFILL} - }, - { &hf_audio_destruct_additive, - {"Destructive/Additive","unistim.destructive.active",FT_BOOLEAN, - 8,TFS(&destruct_additive),AUDIO_DESTRUCT_ADD,NULL,HFILL} - }, - { &hf_audio_dont_force_active, - {"Don't Force Active","unistim.dont.force.active",FT_BOOLEAN, - 8,TFS(&dont_force_active),AUDIO_DONT_FORCE_ACTIVE,NULL,HFILL} - }, - { &hf_display_line_width, - {"Phone Line Width","unistim.line.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_LINE_WIDTH,NULL,HFILL} - }, - { &hf_display_lines, - {"Number Of Lines","unistim.number.lines",FT_UINT8, - BASE_DEC,NULL,DISPLAY_LINES,NULL,HFILL} - }, - { &hf_display_softkey_width, - {"Phone Softkey Width","unistim.softkey.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_SKEY_WIDTH,NULL,HFILL} - }, - { &hf_display_softkeys, - {"Phone Softkeys","unistim.phone.softkeys",FT_UINT8, - BASE_DEC,NULL,DISPLAY_SKEYS,NULL,HFILL} - }, - { &hf_display_icon, - {"Phone Icon Type","unistim.phone.icon.type",FT_UINT8, - BASE_HEX,VALS(icon_types),DISPLAY_ICON,NULL,HFILL} - }, - { &hf_display_softlabel_key_width, - {"Soft-Label Key width","unistim.softlabel.key.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_SOFTLABEL_WIDTH,NULL,HFILL} - }, - { &hf_display_context_width, - {"Phone Context Width","unistim.context.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_CONTEXT_WIDTH,NULL,HFILL} - }, - { &hf_display_numeric_width, - {"Phone Numeric Width","unistim.numeric.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_NUMERIC_WIDTH,NULL,HFILL} - }, - { &hf_display_time_width, - {"Phone Time Width","unistim.time.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_TIME_WIDTH,NULL,HFILL} - }, - { &hf_display_date_width, - {"Phone Date Width","unistim.date.width",FT_UINT8, - BASE_DEC,NULL,DISPLAY_DATE_WIDTH,NULL,HFILL} - }, - { &hf_display_char_dload, - {"Number of Downloadable Chars","unistim.number.dload.chars",FT_UINT8, - BASE_DEC,NULL,DISPLAY_CHAR_DLOAD,NULL,HFILL} - }, - { &hf_display_freeform_icon_dload, - {"Number of Freeform Icon Downloads","unistim.number.dload.icons",FT_UINT8, - BASE_DEC,NULL,DISPLAY_FFORM_ICON_DLOAD,NULL,HFILL} - }, - { &hf_display_icon_type, - {"Icon Types","unistim.icon.types",FT_UINT8, - BASE_HEX,NULL,DISPLAY_ICON_TYPE,NULL,HFILL} - }, - { &hf_display_charsets, - {"Character Sets","unistim.phone.charsets",FT_UINT8, - BASE_HEX,NULL,DISPLAY_CHARSET,NULL,HFILL} - }, - { &hf_display_contrast, - {"Phone Contrast Level","unistim.phone.contrast.level",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_display_cursor_numeric, - {"Numeric Index Field","unistim.field.numeric",FT_BOOLEAN, - 8,NULL,DISPLAY_CURSOR_NUMERIC,NULL,HFILL} - }, - { &hf_display_cursor_context, - {"Context Field","unistim.field.context",FT_BOOLEAN, - 8,NULL,DISPLAY_CURSOR_CONTEXT,NULL,HFILL} - }, - { &hf_display_cursor_line, - {"Text Line","unistim.field.text.line",FT_BOOLEAN, - 8,NULL,DISPLAY_CURSOR_LINE,NULL,HFILL} - }, - { &hf_display_cursor_softkey, - {"Softkey Position","unistim.position.skey",FT_BOOLEAN, - 8,NULL,DISPLAY_CURSOR_SKEY,NULL,HFILL} - }, - { &hf_display_cursor_softkey_id, - {"Soft Key Id","unistim.cursor.skey.id",FT_UINT8, - BASE_DEC,NULL,DISPLAY_CURSOR_SKEY_ID,NULL,HFILL} - }, - { &hf_display_cursor_char_pos, - {"Character Position","unistim.phone.char.pos",FT_UINT8, - BASE_DEC,NULL,DISPLAY_CURSOR_CHAR_POS,NULL,HFILL} - }, - { &hf_display_cursor_line_number, - {"Display Line Number","unistim.display.line.number",FT_UINT8, - BASE_DEC,NULL,DISPLAY_CURSOR_LINE_NUM,NULL,HFILL} - }, - { &hf_display_hlight_start, - {"Display Highlight Start Position","unistim.hilite.start.pos",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_display_hlight_end, - {"Display Highlight End Position","unistim.hilite.end.pos",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_display_date_format, - {"Date Format","unistim.display.date.format",FT_UINT8, - BASE_HEX,VALS(date_formats),DISPLAY_DATE_FORMAT,NULL,HFILL} - }, - { &hf_display_time_format, - {"Time Format","unistim.display.time.format",FT_UINT8, - BASE_HEX,VALS(time_formats),DISPLAY_TIME_FORMAT,NULL,HFILL} - }, - { &hf_display_use_time_format, - {"Use Time Format","unistim.display.use.time.format",FT_BOOLEAN, - 8,NULL,DISPLAY_USE_TIME_FORMAT,NULL,HFILL} - }, - { &hf_display_use_date_format, - {"Use Date Format","unistim.display.use.date.format",FT_BOOLEAN, - 8,NULL,DISPLAY_USE_DATE_FORMAT,NULL,HFILL} - }, - { &hf_display_context_format, - {"Context Info Bar Format","unistim.display.context.format",FT_UINT8, - BASE_HEX,VALS(display_formats),DISPLAY_CTX_FORMAT,NULL,HFILL} - }, - { &hf_display_context_field, - {"Context Info Bar Field","unistim.display.context.field",FT_UINT8, - BASE_HEX,VALS(display_format_fields),DISPLAY_CTX_FIELD,NULL,HFILL} - }, - { &hf_display_char_address, - {"Display Character Address","unistim.display.char.address",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_display_layer_number, - {"Softkey Layer Number","unistim.softkey.layer.num",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_display_layer_skey_id, - {"Softkey ID","unistim.layer.softkey.id",FT_UINT8, - BASE_DEC,NULL,DISPLAY_LAYER_SKEY_ID,NULL,HFILL} - }, - { &hf_display_layer_all_skeys, - {"All Softkeys","unistim.layer.all.skeys",FT_BOOLEAN, - 8,NULL,DISPLAY_LAYER_ALL_SKEYS,NULL,HFILL} - }, - { &hf_display_once_or_cyclic, - {"Layer Softkey Once/Cyclic","unistim.layer.once.cyclic",FT_BOOLEAN, - 8,TFS(&once_or_cyclic),DISPLAY_ONE_OR_CYCLIC,NULL,HFILL} - }, - { &hf_display_layer_duration, - {"Display Duration (20ms steps)","unistim.layer.display.duration",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_key_programmable_keys, - {"Number of Programmable Keys","unistim.num.prog.keys",FT_UINT8, - BASE_DEC,NULL,KEY_NUM_PROG_KEYS,NULL,HFILL} - }, - { &hf_keys_soft_keys, - {"Number of Soft Keys","unistim.num.soft.keys",FT_UINT8, - BASE_DEC,NULL,KEY_NUM_SOFT_KEYS,NULL,HFILL} - }, - { &hf_keys_hd_key, - {"Headset Key Exists","unistim.exist.hd.key",FT_BOOLEAN, - 8,NULL,KEY_HD_KEY_EXISTS,NULL,HFILL} - }, - { &hf_keys_mute_key, - {"Mute Key Exists","unistim.exist.mute.key",FT_BOOLEAN, - 8,NULL,KEY_MUTE_KEY_EXISTS,NULL,HFILL} - }, - { &hf_keys_quit_key, - {"Quit Key Exists","unistim.exist.quit.key",FT_BOOLEAN, - 8,NULL,KEY_QUIT_KEY_EXISTS,NULL,HFILL} - }, - { &hf_keys_copy_key, - {"Copy Key Exists","unistim.exist.copy.key",FT_BOOLEAN, - 8,NULL,KEY_COPY_KEY_EXISTS,NULL,HFILL} - }, - { &hf_keys_mwi_key, - {"Message Waiting Indicator Exists","unistim.exist.mwi.key",FT_BOOLEAN, - 8,NULL,KEY_MWI_EXISTS,NULL,HFILL} - }, - { &hf_keys_num_nav_keys, - {"Number of Navigation Keys","unistim.num.nav.keys",FT_UINT8, - BASE_DEC,VALS(number_nav_keys),KEY_NUM_NAV_KEYS,NULL,HFILL} - }, - { &hf_keys_num_conspic_keys, - {"Number Of Conspicuous Keys","unistim.num.conspic.keys",FT_UINT8, - BASE_DEC,NULL,KEY_NUM_CONSPIC_KEYS,NULL,HFILL} - }, - { &hf_keys_send_key_rel, - {"Send Key Release","unistim.key.send.release",FT_BOOLEAN, - 8,TFS(&key_release),KEY_SEND_KEY_RELEASE,NULL,HFILL} - }, - { &hf_keys_enable_vol, - {"Enable Volume Control","unistim.key.enable.vol",FT_BOOLEAN, - 8,TFS(&enable_vol),KEY_ENABLE_VOL_KEY,NULL,HFILL} - }, - { &hf_keys_conspic_prog_key, - {"Conspicuous and Programmable Keys Same","unistim.conspic.prog.keys",FT_BOOLEAN, - 8,TFS(&conspic_prog),KEY_CONSPIC_PROG_KEY0,NULL,HFILL} - }, - { &hf_keys_acd_super_control, - {"ACD Supervisor Control","unistim.acd.super.control",FT_BOOLEAN, - 8,TFS(&acd_supervisor),KEY_ACD_SUP_CONTROL,NULL,HFILL} - }, - { &hf_keys_local_dial_feedback, - {"Local Keypad Feedback","unistim.key.feedback",FT_UINT8, - BASE_HEX,VALS(local_dialpad_feedback),KEY_LOCAL_DIAL_PAD_FEED,NULL,HFILL} - }, - { &hf_audio_source_descr, - {"Source Description Item","unistim.source.desc.item",FT_UINT8, - BASE_HEX,VALS(source_descriptions),AUDIO_SOURCE_DESCRIPTION,NULL,HFILL} - }, - { &hf_audio_sdes_rtcp_bucket, - {"RTCP Bucket Id","unistim.sdes.rtcp.bucket",FT_UINT8, - BASE_HEX,NULL,AUDIO_SDES_RTCP_BUCKET,NULL,HFILL} - }, - { &hf_audio_desired_jitter, - {"Desired Jitter","unistim.audio.desired.jitter",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_high_water_mark, - {"Threshold of audio frames where jitter buffer removes frames","unistim.high.water.mark",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_early_packet_resync_thresh, - {"Threshold in x/8000 sec where packets are too early","unistim.early.packet.thresh",FT_UINT32, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_late_packet_resync_thresh, - {"Threshold in x/8000 sec where packets are too late","unistim.late.packet.thresh",FT_UINT32, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_resolve_phone_port, - {"Resolve Phone Port","unistim.resolve.phone.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_far_end_echo_port, - {"Resolve Far End Port","unistim.resolve.far.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_far_end_ip_address, - {"Resolve Far End IP","unistim.resolve.far.ip",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_nat_port, - {"NAT Port","unistim.audio.nat.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_nat_ip_address, - {"NAT IP Address","unistim.audio.nat.ip",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_direction_code, - {"Stream Direction Code","unistim.audio.direction.codes",FT_UINT8, - BASE_HEX,VALS(direction_codes),AUDIO_DIRECTION_CODE,NULL,HFILL} - }, - { &hf_audio_hf_support, - {"Handsfree supported","unistim.handsfree.support",FT_BOOLEAN, - 8,NULL,AUDIO_HF_SUPPORT,NULL,HFILL} - }, - { &hf_audio_opt_rpt_max, - {"Max Volume","unistim.max.vol",FT_BOOLEAN, - 8,TFS(&opt_rpt_enable_max_tone_vol),AUDIO_ENABLED_MAX_TONE,NULL,HFILL} - }, - { &hf_audio_opt_rpt_adj_vol, - {"Volume Adjustments","unistim.audio.volume.adj",FT_BOOLEAN, - 8,TFS(&opt_rpt_adjust_volume),AUDIO_ENABLED_ADJ_VOL,NULL,HFILL} - }, - { &hf_audio_opt_rpt_auto_adj_vol, - {"Auto Adjust RX Volume","unistim.auto.adj.rx.vol",FT_BOOLEAN, - 8,TFS(&opt_rpt_automatic_adjustable_rx_volume_report), - AUDIO_AUTO_ADJ_RX_REP,NULL,HFILL} - }, - { &hf_audio_opt_rpt_hs_on_air, - {"HS On Air","unistim.audio.hs.on.air",FT_BOOLEAN, - 8,TFS(&opt_rpths_on_air_feature),AUDIO_HS_ON_AIR_FEATURE,NULL,HFILL} - }, - { &hf_audio_opt_rpt_hd_on_air, - {"HD On Air","unistim.audio.hd.on.air",FT_BOOLEAN, - 8,TFS(&opt_rpt_hd_on_air_feature),AUDIO_HD_ON_AIR_FEATURE,NULL,HFILL} - }, - { &hf_audio_opt_rpt_noise_squelch, - {"Automatic Squelch","unistim.auto.noise.squelch",FT_BOOLEAN, - 8,TFS(&opt_rpt_noise_sqlch_disable),AUDIO_NOISE_SQUELCH_DIS,NULL,HFILL} - }, - { &hf_audio_rx_vol_apb_rpt, - {"APB Volume Report","unistim.apb.volume.rpt",FT_UINT8, - BASE_HEX,VALS(volume_rpt_apbs),AUDIO_APB_VOL_RPT,NULL,HFILL} - }, - { &hf_audio_rx_vol_vol_up, - {"Volume Up","unistim.audio.volume.up",FT_BOOLEAN, - 8,NULL,AUDIO_VOL_UP_RPT,NULL,HFILL} - }, - { &hf_audio_rx_vol_vol_floor, - {"RX Volume at Floor","unistim.audio.rx.vol.floor",FT_BOOLEAN, - 8,NULL,AUDIO_VOL_FLR_RPT,NULL,HFILL} - }, - { &hf_audio_rx_vol_vol_ceiling, - {"RX Volume at Ceiling","unistim.audio.rx.vol.ceiling",FT_BOOLEAN, - 8,NULL,AUDIO_VOL_CEIL_RPT,NULL,HFILL} - }, - { &hf_audio_current_adj_vol_id, - {"Current APB Volume Report","unistim.current.volume.rpt",FT_UINT8, - BASE_HEX,VALS(volume_rpt_apbs),AUDIO_APB_VOL_RPT,NULL,HFILL} - }, - { &hf_audio_current_rx_level, - {"Current RX Volume Level","unistim.current.rx.vol.level",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_current_rx_range, - {"Current RX Volume Range","unistim.current.rx.vol.range",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_cadence_select, - {"Alerting Cadence Select","unistim.alert.cad.sel",FT_UINT8, - BASE_HEX,NULL,AUDIO_ALERT_CADENCE_SEL,NULL,HFILL} - }, - { &hf_audio_warbler_select, - {"Alerting Warbler Select","unistim.alert.warb.select",FT_UINT8, - BASE_HEX,NULL,AUDIO_ALERT_WARBLER_SEL,NULL,HFILL} - }, - { &hf_audio_open_stream_rpt, - {"Open Stream Report","unistim.open.audio.stream.rpt",FT_UINT8, - BASE_HEX,VALS(stream_result),0x00,NULL,HFILL} - }, - { &hf_audio_sdes_rpt_source_desc, - {"Report Source Description","unistim.rpt.src.desc",FT_UINT8, - BASE_HEX,VALS(source_descipts),AUDIO_SDES_INFO_RPT_DESC,NULL,HFILL} - }, - { &hf_audio_sdes_rpt_buk_id, - {"Report RTCP Bucket ID","unistim.rpt.rtcp.buk.id",FT_UINT8, - BASE_HEX,NULL,AUDIO_SDES_INFO_RPT_BUK,NULL,HFILL} - }, - { &hf_audio_phone_port, - {"Phone Listen Port","unistim.phone.listen.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_phone_ip, - {"Phone Listen Address","unistim.phone.listen.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_phone_add_len, - {"Phone Address Length","unistim.phone.address.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_nat_listen_port, - {"NAT Listen Port","unistim.nat.listen.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_nat_ip, - {"NAT Listen Address","unistim.nat.listen.address",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_nat_add_len, - {"NAT Address Length","unistim.nat.address.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_audio_stream_direction_code, - {"Audio Stream Direction","unistim.audio.stream.direction",FT_UINT8, - BASE_HEX,VALS(stream_direction_codes),AUDIO_STREAM_DIRECTION,NULL,HFILL} - }, - { &hf_audio_stream_state, - {"Audio Stream State","unistim.audio.stream.state",FT_BOOLEAN, - 8,TFS(&stream_states),AUDIO_STREAM_STATE,NULL,HFILL} - }, - { &hf_audio_transducer_list_length, - {"Transducer List Length","unistim.trans.list.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_file_xfer_mode, - {"File Transfer Mode","unistim.net.file.xfer.mode",FT_UINT8, - BASE_HEX,VALS(file_xfer_modes),NETWORK_FILE_XFER_MODE,NULL,HFILL} - }, - { &hf_net_force_download , - {"Force Download","unistim.net.force.download",FT_BOOLEAN, - 8,NULL,NETWORK_FORCE_DLOAD,NULL,HFILL} - }, - { &hf_net_use_file_server_port, - {"Use Custom Server Port","unistim.net.use.server.port",FT_BOOLEAN, - 8,NULL,NETWORK_USE_FSERV_PORT,NULL,HFILL} - }, - { &hf_net_use_local_port, - {"Use Custom Local Port","unistim.net.use.local.port",FT_BOOLEAN, - 8,NULL,NETWORK_USE_LOCAL_PORT,NULL,HFILL} - }, - { &hf_net_file_server_port, - {"File Server Port","unistim.net.file.server.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_full_pathname, - {"Full Pathname","unistim.net.full_pathname",FT_STRINGZ, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_net_file_identifier, - {"File Identifier","unistim.net.file_identifier",FT_STRINGZ, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_net_local_port, - {"Local XFer Port","unistim.net.local.xfer.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_net_file_server_address, - {"File Server IP Address","unistim.net.file.server.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_admin_command, - {"Admin Command","unistim.key.icon.admin.cmd",FT_UINT8, - BASE_HEX,VALS(admin_commands),KEY_ADMIN_CMD,NULL,HFILL} - }, - { &hf_keys_logical_icon_id, - {"Logical Icon ID","unistim.keys.logical.icon.id",FT_UINT16, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_repeat_timer_one, - {"Key Repeat Timer 1 Value","unistim.keys.repeat.time.one",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_repeat_timer_two, - {"Key Repeat Timer 2 Value","unistim.keys.repeat.time.two",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_led_id, - {"Led ID","unistim.keys.led.id",FT_UINT8, - BASE_HEX,VALS(keys_led_ids),0x00,NULL,HFILL} - }, - { &hf_keys_phone_icon_id, - {"Phone Icon ID","unistim.keys.phone.icon.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_cadence_on_time, - {"Indicator Cadence On Time","unistim.keys.cadence.on.time",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_cadence_off_time, - {"Indicator Cadence Off Time","unistim.keys.cadence.off.time",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_keys_user_activity_timeout, - {"User Activity Timeout Value","unistim.keys.user.timeout.value",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - { &hf_display_call_timer_mode, - {"Call Timer Mode","unistim.display.call.timer.mode",FT_BOOLEAN, - 8,TFS(&call_duration_timer_mode),DISPLAY_CALL_TIMER_MODE,NULL,HFILL} - }, - { &hf_display_call_timer_reset, - {"Call Timer Reset","unistim.display.call.timer.reset",FT_BOOLEAN, - 8,TFS(&call_duration_timer_reset),DISPLAY_CALL_TIMER_RESET,NULL,HFILL} - }, - { &hf_display_call_timer_display, - {"Call Timer Display","unistim.display.call.timer.display",FT_BOOLEAN, - 8,TFS(&call_duration_display_timer),DISPLAY_CALL_TIMER_DISPLAY,NULL,HFILL} - }, - { &hf_display_call_timer_delay, - {"Call Timer Delay","unistim.display.call.timer.delay",FT_BOOLEAN, - 8,TFS(&call_duration_timer_delay),DISPLAY_CALL_TIMER_DELAY,NULL,HFILL} - }, - { &hf_display_call_timer_id, - {"Call Timer ID","unistim.display.call.timer.id",FT_UINT8, - BASE_DEC,NULL,DISPLAY_CALL_TIMER_ID,NULL,HFILL} - }, - { &hf_expansion_switch_cmd, - {"Expansion CMD (switch)","unistim.expansion.switch",FT_UINT8, - BASE_HEX,VALS(expansion_switch_msgs),0x0,NULL,HFILL} - }, - { &hf_expansion_phone_cmd, - {"Expansion CMD (phone)","unistim.expansion.phone",FT_UINT8, - BASE_HEX,VALS(expansion_phone_msgs),0x0,NULL,HFILL} - }, - { &hf_expansion_softlabel_number, - {"Module Soft Label Number","unistim.expansion.label.number",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} - }, - - - /****LAST****/ - { &hf_generic_string, - {"DATA","unistim.generic.data",FT_STRING, - BASE_NONE,NULL,0x00,NULL,HFILL} - }, - { &hf_generic_data, - {"DATA","unistim.generic.data",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} - } + { &hf_audio_switch_cmd , + {"Audio Cmd (switch)","unistim.audio.switch",FT_UINT8, + BASE_HEX,VALS(audio_switch_msgs),0x0,NULL,HFILL} + }, + { &hf_audio_phone_cmd , + {"Audio Cmd (phone)","unistim.audio.phone",FT_UINT8, + BASE_HEX,VALS(audio_phone_msgs),0x0,NULL,HFILL} + }, + { &hf_display_switch_cmd , + {"Display Cmd (switch)","unistim.display.switch",FT_UINT8, + BASE_HEX,VALS(display_switch_msgs),0x0,NULL,HFILL} + }, + { &hf_display_phone_cmd , + {"Display Cmd (phone)","unistim.display.phone",FT_UINT8, + BASE_HEX,VALS(display_phone_msgs),0x0,NULL,HFILL} + }, + { &hf_key_switch_cmd , + {"Key Cmd (switch)","unistim.key.switch",FT_UINT8, + BASE_HEX,VALS(key_switch_msgs),0x0,NULL,HFILL} + }, + { &hf_key_phone_cmd , + {"Key Cmd (phone)","unistim.key.phone",FT_UINT8, + BASE_HEX,VALS(key_phone_msgs),0x0,NULL,HFILL} + }, + { &hf_network_switch_cmd , + {"Network Cmd (switch)","unistim.network.switch",FT_UINT8, + BASE_HEX,VALS(network_switch_msgs),0x0,NULL,HFILL} + }, + { &hf_network_phone_cmd , + {"Network Cmd (phone)","unistim.network.phone",FT_UINT8, + BASE_HEX,VALS(network_phone_msgs),0x0,NULL,HFILL} + }, + { &hf_terminal_id, + {"Terminal ID","unistim.terminal.id",FT_IPv4, + BASE_NONE,NULL,0x0,NULL,HFILL} + }, + { &hf_broadcast_year, + {"Year","unistim.broadcast.year",FT_UINT8, + BASE_DEC,NULL,0x7f,NULL,HFILL} + }, + { &hf_broadcast_month, + {"Month","unistim.broadcast.month",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_broadcast_day, + {"Day","unistim.broadcast.day",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_broadcast_hour, + {"Hour","unistim.broadcast.hour",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_broadcast_minute, + {"Minute","unistim.broadcast.minute",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_broadcast_second, + {"Second","unistim.broadcast.second",FT_UINT8, + BASE_DEC,NULL,0x0,NULL,HFILL} + }, + { &hf_net_diag_flag, + {"Query Network Manager Diagnostic","unistim.query.diagnostic", + FT_BOOLEAN,8, NULL, + QUERY_NETWORK_MANAGER_DIAGNOSTIC, NULL,HFILL} + }, + { &hf_net_managers_flag, + {"Query Network Manager Managers","unistim.query.managers", + FT_BOOLEAN,8, NULL, + QUERY_NETWORK_MANAGER_MANAGERS, NULL,HFILL} + }, + { &hf_net_attributes_flag, + {"Query Network Manager Attributes","unistim.query.attributes", + FT_BOOLEAN, 8,NULL, + QUERY_NETWORK_MANAGER_ATTRIBUTES,NULL,HFILL} + }, + { &hf_net_serv_info_flag, + {"Query Network Manager Server Info","unistim.query.serverInfo", + FT_BOOLEAN, 8,NULL, + QUERY_NETWORK_MANAGER_SERVER_INFO,NULL,HFILL} + }, + { &hf_net_options_flag, + {"Query Network Manager Options","unistim.query.options", + FT_BOOLEAN, 8,NULL, + QUERY_NETWORK_MANAGER_OPTIONS,NULL,HFILL} + }, + { &hf_net_sanity_flag, + {"Query Network Manager Sanity","unistim.query.sanity", + FT_BOOLEAN, 8,NULL, + QUERY_NETWORK_MANAGER_SANITY,NULL,HFILL} + }, + { &hf_net_enable_diag, + {"Network Manager Enable DIAG","unistim.enable.diag", + FT_BOOLEAN, 8,NULL, + NETWORK_MANAGER_ENABLE_DIAG,NULL,HFILL} + }, + { &hf_net_enable_rudp, + {"Network Manager Enable RUDP","unistim.enable.network.rel.udp", + FT_BOOLEAN, 8,NULL, + NETWORK_MANAGER_ENABLE_RUDP,NULL,HFILL} + }, + { &hf_net_server_id, + {"Download Server ID","unistim.download.id",FT_UINT8, + BASE_HEX, VALS(network_server_id),0x00,NULL,HFILL} + }, + { &hf_net_server_port, + {"Download Server Port","unistim.download.port",FT_UINT16, + BASE_DEC, NULL,0x00,NULL,HFILL} + }, + { &hf_net_server_action, + {"Download Server Action","unistim.download.action",FT_UINT8, + BASE_HEX, VALS(server_action),0x00,NULL,HFILL} + }, + { &hf_net_server_retry_count, + {"Download Retry Count","unistim.download.retry",FT_UINT8, + BASE_DEC, NULL,0x00,NULL,HFILL} + }, + { &hf_net_server_failover_id, + {"Download Failover Server ID","unistim.download.failover",FT_UINT8, + BASE_HEX, VALS(network_server_id),0x00,NULL,HFILL} + }, + { &hf_net_server_ip_address, + {"Download Server Address","unistim.download.address",FT_UINT32, + BASE_HEX, NULL,0x00,NULL,HFILL} + }, + { &hf_net_server_time_out, + {"Watchdog Timeout","unistim.watchdog.timeout",FT_UINT16, + BASE_DEC, NULL,0x00,NULL,HFILL} + }, + { &hf_net_server_config_element, + {"Configure Network Element","unistim.config.element",FT_UINT8, + BASE_HEX, VALS(network_elements),0x00,NULL,HFILL} + }, + { &hf_net_server_recovery_time_low, + {"Recovery Procedure Idle Low Boundary","unistim.recovery.low",FT_UINT16, + BASE_DEC, NULL,0x00,NULL,HFILL} + }, + { &hf_net_server_recovery_time_high, + {"Recovery Procedure Idle High Boundary","unistim.recovery.high",FT_UINT16, + BASE_DEC, NULL,0x00,NULL,HFILL} + }, + { &hf_net_phone_rx_ovr_flag, + {"Receive Buffer Overflow","unistim.receive.overflow", + FT_BOOLEAN, 8,NULL, + RX_BUFFER_OVERFLOW,NULL,HFILL} + }, + { &hf_net_phone_tx_ovr_flag, + {"Transmit Buffer Overflow","unistim.trans.overflow", + FT_BOOLEAN, 8,NULL, + TX_BUFFER_OVERFLOW,NULL,HFILL} + }, + { &hf_net_phone_rx_empty_flag, + {"Receive Buffer Unexpectedly Empty","unistim.receive.empty", + FT_BOOLEAN, 8,NULL, + RX_UNEXPECT_EMPTY,NULL,HFILL} + }, + { &hf_net_phone_invalid_msg_flag, + {"Received Invalid MSG","unistim.invalid.msg", + FT_BOOLEAN, 8,NULL, + INVALID_MSG,NULL,HFILL} + }, + { &hf_net_phone_eeprom_insane_flag, + {"EEProm Insane","unistim.eeprom.insane", + FT_BOOLEAN, 8,NULL, + EEPROM_INSANE,NULL,HFILL} + }, + { &hf_net_phone_eeprom_unsafe_flag, + {"EEProm Unsafe","unistim.eeprom.unsafe", + FT_BOOLEAN, 8,NULL, + EEPROM_UNSAFE,NULL,HFILL} + }, + { &hf_net_phone_diag, + {"Diagnostic Command Enabled","unistim.diag.enabled",FT_BOOLEAN, + 8,NULL,NETWORK_MGR_REPORT_DIAG,NULL,HFILL} + }, + { &hf_net_phone_rudp, + {"Reliable UDP Active","unistim.rudp.active",FT_BOOLEAN, + 8,NULL,NETWORK_MGR_REPORT_RUDP,NULL,HFILL} + }, + { &hf_basic_switch_query_flags, + {"Query Basic Manager","unistim.basic.query",FT_UINT8, + BASE_HEX, NULL,0x00,"INITIAL PHONE QUERY",HFILL} + }, + { &hf_basic_switch_query_attr, + {"Query Basic Manager Attributes","unistim.basic.attrs",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_ATTRIBUTES,"Basic Query Attributes",HFILL} + }, + { &hf_basic_switch_query_opts, + {"Query Basic Manager Options","unistim.basic.opts",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_OPTIONS,"Basic Query Options",HFILL} + }, + { &hf_basic_switch_query_fw, + {"Query Basic Switch Firmware","unistim.basic.fw",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_FW,"Basic Query Firmware",HFILL} + }, + { &hf_basic_switch_query_hw_id, + {"Query Basic Manager Hardware ID","unistim.basic.hwid",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_HW_ID,"Basic Query Hardware ID",HFILL} + }, + { &hf_basic_switch_query_it_type, + {"Query Basic Manager Phone Type","unistim.basic.type",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_IT_TYPE,"Basic Query Phone Type",HFILL} + }, + { &hf_basic_switch_query_prod_eng_code, + {"Query Basic Manager Prod Eng Code","unistim.basic.code",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_PROD_ENG_CODE,"Basic Query Production Engineering Code",HFILL} + }, + { &hf_basic_switch_query_gray_mkt_info, + {"Query Basic Manager Gray Mkt Info","unistim.basic.gray",FT_BOOLEAN, + 8,NULL,BASIC_QUERY_GRAY_MKT_INFO,"Basic Query Gray Market Info",HFILL} + }, + { &hf_basic_switch_options_secure, + {"Basic Switch Options Secure Code","unistim.basic.secure",FT_BOOLEAN, + 8,NULL,BASIC_OPTION_SECURE,NULL,HFILL} + }, + { &hf_basic_switch_element_id, + {"Basic Element ID","unistim.basic.element.id",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_basic_switch_eeprom_data, + {"EEProm Data","unistim.basic.eeprom.data",FT_BYTES, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_basic_phone_eeprom_stat_cksum, + {"Basic Phone EEProm Static Checksum","unistim.static.cksum",FT_UINT8, + BASE_HEX,NULL,0x0,NULL,HFILL} + }, + { &hf_basic_phone_eeprom_dynam, + {"Basic Phone EEProm Dynamic Checksum","unistim.dynam.cksum",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_basic_phone_eeprom_net_config_cksum, + {"Basic Phone EEProm Net Config Checksum","unistim.netconfig.cksum",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_basic_phone_hw_id, + {"Basic Phone Hardware ID","unistim.basic.hw.id",FT_BYTES, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_basic_phone_fw_ver, + {"Basic Phone Firmware Version","unistim.basic.fw.ver",FT_STRING, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_key_code, + {"Key Name","unistim.key.name",FT_UINT8, + BASE_HEX,VALS(key_names),0x3f,NULL,HFILL} + }, + { &hf_key_command, + {"Key Action","unistim.key.action",FT_UINT8, + BASE_HEX,VALS(key_cmds),0xc0,NULL,HFILL} + }, + { &hf_icon_id, + {"Icon ID","unistim.icon.id",FT_UINT8, + BASE_HEX,NULL, DISPLAY_ICON_ID,NULL,HFILL} + }, + { &hf_broadcast_icon_state, + {"Icon State","unistim.icon.state",FT_UINT8, + BASE_HEX,VALS(bcast_icon_states),0x1f,NULL,HFILL} + }, + { &hf_broadcast_icon_cadence, + {"Icon Cadence","unistim.icon.cadence",FT_UINT8, + BASE_HEX,VALS(bcast_icon_cadence),0xe0,NULL,HFILL} + }, + { &hf_audio_mgr_attr, + {"Query Audio Manager Attributes","unistim.audio.attr",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_ATTRIBUTES,NULL,HFILL} + }, + { &hf_audio_mgr_opts, + {"Query Audio Manager Options","unistim.audio.options",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_OPTIONS,NULL,HFILL} + }, + { &hf_audio_mgr_alert, + {"Query Audio Manager Alerting","unistim.audio.alerting",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_ALERTING ,NULL,HFILL} + }, + { &hf_audio_mgr_adj_rx_vol, + {"Query Audio Manager Adjustable Receive Volume","unistim.audio.adj.volume",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_ADJ_RX_VOL,NULL,HFILL} + }, + { &hf_audio_mgr_def_rx_vol, + {"Query Audio Manager Default Receive Volume","unistim.audio.def.volume",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_DEF_RX_VOL,NULL,HFILL} + }, + { &hf_audio_mgr_handset, + {"Query Audio Manager Handset","unistim.audio.handset",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_HANDSET,NULL,HFILL} + }, + { &hf_audio_mgr_headset, + {"Query Audio Manager Headset","unistim.audio.headset",FT_BOOLEAN, + 8,NULL,QUERY_AUDIO_MGR_HEADSET,NULL,HFILL} + }, + { &hf_audio_default_rx_vol_id, + {"Audio Manager Default Receive Volume ID","unistim.audio.volume.id",FT_UINT8, + BASE_HEX,VALS(default_rx_vol_id),0x00,NULL,HFILL} + }, + { &hf_audio_mgr_opt_max_vol, + {"Audio Manager Enable Max Tone Volume","unistim.audio.max.tone",FT_BOOLEAN, + 8,TFS(&audio_opts_enable_max_tone_vol),AUDIO_MGR_OPTS_MAX_VOL,NULL,HFILL} + }, + { &hf_audio_mgr_opt_adj_vol, + {"Audio Manager Adjust Volume","unistim.audio.opts.adj.vol",FT_BOOLEAN, + 8,TFS(&audio_opts_adjust_volume),AUDIO_MGR_ADJ_VOL,NULL,HFILL} + }, + { &hf_audio_mgr_opt_aa_rx_vol_rpt, + {"Audio Manager Auto Adjust Volume RPT","unistim.audio.aa.vol.rpt",FT_BOOLEAN, + 8,TFS(&audio_opts_automatic_adjustable),AUDIO_MGR_AUTO_RX_VOL_RPT,NULL,HFILL} + }, + { &hf_audio_mgr_opt_hs_on_air, + {"Audio Manager Handset","unistim.audio.handset",FT_BOOLEAN, + 8,TFS(&audio_opts_hs_on_air_feature),AUDIO_MGR_HS_ON_AIR,NULL,HFILL} + }, + { &hf_audio_mgr_opt_hd_on_air, + {"Audio Manager Headset","unistim.audio.headset",FT_BOOLEAN, + 8,TFS(&audio_opts_hd_on_air_feature),AUDIO_MGR_HD_ON_AIR,NULL,HFILL} + }, + { &hf_audio_mgr_opt_noise_squelch, + {"Audio Manager Noise Squelch","unistim.audio.squelch",FT_BOOLEAN, + 8,TFS(&noise_sqlch_disable), AUDIO_MGR_NOISE_SQUELCH,NULL,HFILL} + }, + { &hf_audio_mgr_mute, + {"Audio Manager Mute","unistim.audio.mute",FT_BOOLEAN, + 8,TFS(&audio_mgr_mute_val),AUDIO_MGR_MUTE,NULL,HFILL} + }, + { &hf_audio_mgr_tx_rx, + {"Audio Manager RX or TX","unistim.audio.rx.tx",FT_BOOLEAN, + 8,TFS(&audio_mgr_tx_rx_val),AUDIO_MGR_TX_RX,NULL,HFILL} + }, + { &hf_audio_mgr_stream_id, + {"Audio Manager Stream ID","unistim.audio.stream.id",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_mgr_transducer_based_tone_id, + {"Audio Manager Transducer Based Tone On","unistim.audio.transducer.on",FT_UINT8, + BASE_HEX,VALS(trans_base_tone_ids),0x07,NULL,HFILL} + }, + { &hf_audio_mgr_attenuated, + {"Audio Manager Transducer Tone Attenuated","unistim.audio.attenuated.on",FT_BOOLEAN, + 8,NULL,AUDIO_MGR_ATTENUATED,NULL,HFILL} + }, + { &hf_audio_mgr_warbler_select, + {"Warbler Select","unistim.warbler.select",FT_UINT8, + BASE_HEX,NULL,0x07,NULL,HFILL} + }, + { &hf_audio_mgr_transducer_routing, + {"Transducer Routing","unistim.transducer.routing",FT_UINT8, + BASE_HEX,VALS(transducer_routing_vals),0xf8,NULL,HFILL} + }, + { &hf_audio_mgr_tone_vol_range, + {"Tone Volume Range in Steps","unistim.tone.volume.range",FT_UINT8, + BASE_HEX,NULL,0x0f,NULL,HFILL} + }, + { &hf_audio_mgr_cadence_select, + {"Cadence Select","unistim.cadence.select",FT_UINT8, + BASE_HEX,VALS(cadence_select_vals),0xf0,NULL,HFILL} + }, + { &hf_audio_special_tone, + {"Special Tone Select","unistim.special.tone.select",FT_UINT8, + BASE_HEX,VALS(special_tones_vals),0x00,NULL,HFILL} + }, + { &hf_audio_tone_level, + {"Tone Level","unistim.audio.tone.level",FT_UINT8, + BASE_DEC,NULL,0xf0,NULL,HFILL} + }, + { &hf_audio_visual_tones, + {"Enable Visual Tones","unistim.visual.tones",FT_BOOLEAN, + 8,NULL,AUDIO_MGR_VISUAL_TONE,NULL,HFILL} + }, + { &hf_audio_stream_based_tone_id, + {"Stream Based Tone ID","unistim.stream.tone.id",FT_UINT8, + BASE_HEX,VALS(stream_based_tone_vals),0x1f,NULL,HFILL} + }, + { &hf_audio_stream_based_tone_rx_tx, + {"Stream Based Tone RX or TX","unistim.stream.based.tone.rx.tx",FT_BOOLEAN, + 8,TFS(&stream_based_tone_rx_tx_yn),AUDIO_STREAM_BASED_TONE_RX_TX,NULL,HFILL} + }, + { &hf_audio_stream_based_tone_mute, + {"Stream Based Tone Mute","unistim.stream.tone.mute",FT_BOOLEAN, + 8,TFS(&stream_based_tone_mute_yn),AUDIO_STREAM_BASED_TONE_MUTE,NULL,HFILL} + }, + { &hf_audio_stream_id, + {"Stream ID","unistim.audio.stream.id",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_stream_based_volume, + {"Stream Based Volume ID","unistim.stream.volume.id",FT_UINT8, + BASE_HEX,VALS(stream_base_vol_level),0x00,NULL,HFILL} + }, + { &hf_basic_switch_terminal_id, + {"Terminal ID assigned by Switch","unistim.switch.terminal.id",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_basic_it_type, + {"IT (Phone) Type","unistim.it.type",FT_UINT8, + BASE_HEX,VALS(it_types),0x00,NULL,HFILL} + }, + { &hf_basic_prod_eng_code, + {"Product Engineering Code for phone","unistim.basic.eng.code",FT_STRING, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_net_phone_primary_server_id, + {"Phone Primary Server ID","unistim.net.phone.primary.id",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_phone_server_port, + {"Port Number","unistim.server.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_phone_server_action, + {"Action","unistim.server.action.byte",FT_UINT8, + BASE_HEX,VALS(action_bytes),0x00,NULL,HFILL} + }, + { &hf_net_phone_server_retry_count, + {"Number of times to Retry","unistim.server.retry.count",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_phone_server_failover_id, + {"Failover Server ID","unistim.server.failover.id",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_phone_server_ip, + {"IP address","unistim.server.ip.address",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_apb_number, + {"APB Number","unistim.audio.apb.number",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { & hf_audio_apb_op_code, + {"APB Operation Code","unistim.audio.apb.op.code",FT_UINT8, + BASE_HEX,VALS(apb_op_codes),0x00,NULL,HFILL} + }, + { &hf_audio_apb_param_len, + {"APB Operation Parameter Length","unistim.apb.param.len",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_apb_data, + {"APB Operation Data","unistim.apb.operation.data",FT_BYTES, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_display_write_address_numeric, + {"Is Address Numeric","unistim.write.address.numeric",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_ADDRESS_NUMERIC_FLAG,NULL,HFILL} + }, + { &hf_display_write_address_context, + {"Context Field in the Info Bar","unistim.write.address.context",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_ADDRESS_CONTEXT_FLAG,NULL,HFILL} + }, + { &hf_display_write_address_line, + {"Write A Line","unistim.write.address.line",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_ADDRESS_LINE_FLAG ,NULL,HFILL} + }, + { &hf_display_write_address_soft_key, + {"Write a SoftKey","unistim.write.address.softkey",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG,NULL,HFILL} + }, + { &hf_display_write_address_soft_label, + {"Write A Softkey Label","unistim.write.address.softkey.label",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG,NULL,HFILL} + }, + { &hf_display_write_address_softkey_id, + {"Soft Key ID","unistim.write.addres.softkey.id",FT_UINT8, + BASE_HEX,NULL,DISPLAY_WRITE_ADDRESS_SOFT_KEY_ID,NULL,HFILL} + }, + { &hf_display_write_address_char_pos, + {"Character Position or Soft-Label Key ID","unistim.display.write.address.char.pos",FT_UINT8, + BASE_HEX,NULL,DISPLAY_WRITE_ADDRESS_CHAR_POS,NULL,HFILL} + }, + { &hf_display_write_address_line_number, + {"Line Number","unistim.write.address.line.number",FT_UINT8, + BASE_DEC,NULL,DISPLAY_WRITE_ADDRESS_LINE_NUM,NULL,HFILL} + }, + { &hf_display_write_cursor_move, + {"Cursor Move","unistim.display.cursor.move",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_CURSOR_MOVE,NULL,HFILL} + }, + { &hf_display_write_clear_left, + {"Clear Left","unistim.display.clear.left",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_CLEAR_LEFT,NULL,HFILL} + }, + { &hf_display_write_clear_right, + {"Clear Right","unistim.display.clear.right",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_CLEAR_RIGHT,NULL,HFILL} + }, + { &hf_display_write_shift_left, + {"Shift Left","unistim.display.shift.left",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_SHIFT_LEFT,NULL,HFILL} + }, + { &hf_display_write_shift_right, + {"Shift Right","unistim.display.shift.right",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_SHIFT_RIGHT,NULL,HFILL} + }, + { &hf_display_write_highlight, + {"Highlight","unistim.display.highlight",FT_BOOLEAN, + 8,NULL,DISPLAY_WRITE_HIGHLIGHT,NULL,HFILL} + }, + { &hf_display_write_tag, + {"Tag for text","unistim.display.text.tag",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_display_cursor_move_cmd, + {"Cursor Movement Command","unistim.cursor.move.cmd",FT_UINT8, + BASE_HEX,VALS(cursor_move_cmds),DISPLAY_CURSOR_MOVE_CMD,NULL,HFILL} + }, + { &hf_display_cursor_blink, + {"Should Cursor Blink","unistim.cursor.blink",FT_BOOLEAN, + 8,NULL,DISPLAY_CURSOR_BLINK,NULL,HFILL} + }, + { &hf_audio_vocoder_id, + {"Vocoder Protocol","unistim.vocoder.id",FT_UINT8, + BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} + }, + { &hf_audio_vocoder_param, + {"Vocoder Config Param","unistim.vocoder.config.param",FT_UINT8, + BASE_HEX,VALS(vocoder_config_params),AUDIO_VOCODER_CONFIG_PARAM,NULL,HFILL} + }, + { &hf_audio_vocoder_entity, + {"Vocoder Entity","unistim.vocoder.entity",FT_UINT8, + BASE_HEX,VALS(config_param_entities),AUDIO_VOCODER_CONFIG_ENTITY,NULL,HFILL} + }, + { &hf_audio_vocoder_annexa, + {"Enable Annex A","unistim.enable.annexa",FT_BOOLEAN, + 8,NULL,AUDIO_VOCODER_ANNEXA,NULL,HFILL} + }, + { &hf_audio_vocoder_annexb, + {"Enable Annex B","unistim.enable.annexb",FT_BOOLEAN, + 8,NULL,AUDIO_VOCODER_ANNEXB,NULL,HFILL} + }, + { &hf_audio_sample_rate, + {"Sample Rate","unistim.audio.sample.rate",FT_UINT8, + BASE_HEX,VALS(sample_rates),0x00,NULL,HFILL} + }, + { &hf_audio_rtp_type, + {"RTP Type","unistim.audio.rtp.type",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_bytes_per_frame, + {"Bytes Per Frame","unistim.audio.bytes.per.frame",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_rx_stream_id, + {"Receive Stream Id","unistim.rx.stream.id",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_tx_stream_id, + {"Transmit Stream Id","unistim.rx.stream.id",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_rx_vocoder_type, + {"Receive Vocoder Protocol","unistim.vocoder.id",FT_UINT8, + BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} + }, + { &hf_tx_vocoder_type, + {"Transmit Vocoder Protocol","unistim.vocoder.id",FT_UINT8, + BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} + }, + { &hf_frames_per_packet, + {"Frames Per Packet","unistim.vocoder.frames.per.packet",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_tos, + {"Type of Service","unistim.audio.type.service",FT_UINT8, + BASE_HEX,VALS(types_of_service),AUDIO_TYPE_OF_SERVICE,NULL,HFILL} + }, + { &hf_audio_precedence, + {"Precedence","unistim.audio.precedence",FT_UINT8, + BASE_HEX,VALS(precedences),AUDIO_PRECENDENCE,NULL,HFILL} + }, + { &hf_audio_frf_11, + {"FRF.11 Enable","unistim.audio.frf.11",FT_BOOLEAN, + 8,NULL,AUDIO_FRF_11,NULL,HFILL} + }, + { &hf_audio_lcl_rtp_port, + {"Phone RTP Port","unistim.local.rtp.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_lcl_rtcp_port, + {"Phone RTCP Port","unistim.local.rtcp.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_far_rtp_port, + {"Distant RTP Port","unistim.far.rtp.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_far_rtcp_port, + {"Distant RTCP Port","unistim.far.rtcp.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_far_ip_add, + {"Distant IP Address for RT[C]P","unistim.far.ip.address",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_rtcp_bucket_id, + {"RTCP Bucket ID","unistim.rtcp.bucket.id",FT_UINT16, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_key_icon_id, + {"Icon ID","unistim.key.icon.id",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_display_clear_numeric, + {"Numeric Index Field in InfoBar","unistim.display.clear.numeric",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_NUMERIC,NULL,HFILL} + }, + { &hf_display_clear_context , + {"Context Field in InfoBar","unistim.display.clear.context",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_CONTEXT,NULL,HFILL} + }, + { &hf_display_clear_date , + {"Date Field","unistim.display.clear.date",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_DATE,NULL,HFILL} + }, + { &hf_display_clear_time, + {"Time Field","unistim.display.clear.time",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_TIME,NULL,HFILL} + }, + { &hf_display_clear_line, + {"Line Data","unistim.display.clear.line",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon, + {"Status Bar Icon","unistim.display.statusbar.icon",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_STATUS_BAR_ICON,NULL,HFILL} + }, + { &hf_display_clear_softkey, + {"Soft Key","unistim.display.clear.softkey",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_SOFTKEY,NULL,HFILL} + }, + { &hf_display_clear_softkey_label , + {"Soft Key Label","unistim.display.clear.softkey.label",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_SOFTKEY_LABEL,NULL,HFILL} + }, + { &hf_display_clear_line_1 , + {"Line 1","unistim.display.clear.line1",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_1,NULL,HFILL} + }, + { &hf_display_clear_line_2 , + {"Line 2","unistim.display.clear.line2",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_2,NULL,HFILL} + }, + { &hf_display_clear_line_3 , + {"Line 3","unistim.display.clear.line3",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_3,NULL,HFILL} + }, + { &hf_display_clear_line_4 , + {"Line 4","unistim.display.clear.line4",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_4,NULL,HFILL} + }, + { &hf_display_clear_line_5 , + {"Line 5","unistim.display.clear.line5",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_5,NULL,HFILL} + }, + { &hf_display_clear_line_6 , + {"Line 6","unistim.display.clear.line6",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_6,NULL,HFILL} + }, + { &hf_display_clear_line_7 , + {"Line 7","unistim.display.clear.line7",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_7,NULL,HFILL} + }, + { &hf_display_clear_line_8 , + {"Line 8","unistim.display.clear.line8",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_LINE_8,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_1 , + {"Status Bar Icon 1","unistim.display.clear.sbar.icon1",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_1,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_2 , + {"Status Bar Icon 2","unistim.display.clear.sbar.icon2",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_2,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_3 , + {"Status Bar Icon 3","unistim.display.clear.sbar.icon3",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_3,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_4 , + {"Status Bar Icon 4","unistim.display.clear.sbar.icon4",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_4,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_5 , + {"Status Bar Icon 5","unistim.display.clear.sbar.icon5",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_5,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_6 , + {"Status Bar Icon 6","unistim.display.clear.sbar.icon6",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_6,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_7 , + {"Status Bar Icon 7","unistim.display.clear.sbar.icon7",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_7,NULL,HFILL} + }, + { &hf_display_clear_status_bar_icon_8 , + {"Status Bar Icon 8","unistim.display.clear.sbar.icon8",FT_BOOLEAN, + 8,NULL,DISPLAY_STATUS_BAR_ICON_8,NULL,HFILL} + }, + { &hf_display_clear_soft_key_1 , + {"Soft Key 1","unistim.display.clear.soft.key1",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_1,NULL,HFILL} + }, + { &hf_display_clear_soft_key_2 , + {"Soft Key 2","unistim.display.clear.soft.key2",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_2,NULL,HFILL} + }, + { &hf_display_clear_soft_key_3 , + {"Soft Key 3","unistim.display.clear.soft.key3",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_3,NULL,HFILL} + }, + { &hf_display_clear_soft_key_4 , + {"Soft Key 4","unistim.display.clear.soft.key4",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_4,NULL,HFILL} + }, + { &hf_display_clear_soft_key_5 , + {"Soft Key 5","unistim.display.clear.soft.key5",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_5,NULL,HFILL} + }, + { &hf_display_clear_soft_key_6 , + {"Soft Key 6","unistim.display.clear.soft.key6",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_6,NULL,HFILL} + }, + { &hf_display_clear_soft_key_7 , + {"Soft Key 7","unistim.display.clear.soft.key7",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_7,NULL,HFILL} + }, + { &hf_display_clear_soft_key_8 , + {"Soft Key 8","unistim.display.clear.soft.key8",FT_BOOLEAN, + 8,NULL,DISPLAY_SOFT_KEY_8,NULL,HFILL} + }, + { &hf_display_clear_sk_label_key_id, + {"Soft Key Label ID","unistim.display.clear.sk.label.id",FT_UINT8, + BASE_HEX,NULL, DISPLAY_CLEAR_SK_LABEL_KEY_ID,NULL,HFILL} + }, + { &hf_display_clear_all_slks, + {"Clear All Soft Key Labels","unistim.display.clear.all.sks",FT_BOOLEAN, + 8,NULL,DISPLAY_CLEAR_ALL_SLKS,NULL,HFILL} + }, + { &hf_key_led_cadence, + {"LED Cadence","unistim.key.led.cadence",FT_UINT8, + BASE_HEX,VALS(led_cadences),KEY_LED_CADENCE,NULL,HFILL} + }, + { &hf_key_led_id, + {"LED ID","unistim.key.led.id",FT_UINT8, + BASE_HEX,VALS(led_ids),KEY_LED_ID,NULL,HFILL} + }, + { &hf_basic_ether_address, + {"Phone Ethernet Address","unistim.phone.ether",FT_ETHER, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_rtcp_bucket_id, + {"RTCP Bucket ID","unistim.audio.rtcp.bucket.id",FT_UINT8, + BASE_HEX,NULL,AUDIO_RTCP_BUCKET_ID,NULL,HFILL} + }, + { &hf_audio_clear_bucket, + {"Clear Bucket Counter","unistim.clear.bucket",FT_BOOLEAN, + 8,NULL,AUDIO_CLEAR_BUCKET,NULL,HFILL} + }, + { &hf_display_arrow, + {"Arrow Display Direction","unistim.arrow.direction",FT_UINT8, + BASE_HEX,VALS(arrow_dirs),0x00,NULL,HFILL} + }, + { &hf_audio_transducer_pair, + {"Audio Transducer Pair","unistim.transducer.pairs",FT_UINT8, + BASE_HEX,VALS(transducer_pairs),AUDIO_TRANSDUCER_PAIR_ID,NULL,HFILL} + }, + { &hf_audio_rx_enable, + {"RX Enable","unistim.receive.enable",FT_BOOLEAN, + 8,NULL,AUDIO_RX_ENABLE,NULL,HFILL} + }, + { &hf_audio_tx_enable, + {"TX Enable","unistim.transmit.enable",FT_BOOLEAN, + 8,NULL,AUDIO_TX_ENABLE,NULL,HFILL} + }, + { &hf_audio_sidetone_disable, + {"Disable Sidetone","unistim.audio.sidetone.disable",FT_BOOLEAN, + 8,NULL,AUDIO_SIDETONE_DISABLE,NULL,HFILL} + }, + { &hf_audio_destruct_additive, + {"Destructive/Additive","unistim.destructive.active",FT_BOOLEAN, + 8,TFS(&destruct_additive),AUDIO_DESTRUCT_ADD,NULL,HFILL} + }, + { &hf_audio_dont_force_active, + {"Don't Force Active","unistim.dont.force.active",FT_BOOLEAN, + 8,TFS(&dont_force_active),AUDIO_DONT_FORCE_ACTIVE,NULL,HFILL} + }, + { &hf_display_line_width, + {"Phone Line Width","unistim.line.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_LINE_WIDTH,NULL,HFILL} + }, + { &hf_display_lines, + {"Number Of Lines","unistim.number.lines",FT_UINT8, + BASE_DEC,NULL,DISPLAY_LINES,NULL,HFILL} + }, + { &hf_display_softkey_width, + {"Phone Softkey Width","unistim.softkey.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_SKEY_WIDTH,NULL,HFILL} + }, + { &hf_display_softkeys, + {"Phone Softkeys","unistim.phone.softkeys",FT_UINT8, + BASE_DEC,NULL,DISPLAY_SKEYS,NULL,HFILL} + }, + { &hf_display_icon, + {"Phone Icon Type","unistim.phone.icon.type",FT_UINT8, + BASE_HEX,VALS(icon_types),DISPLAY_ICON,NULL,HFILL} + }, + { &hf_display_softlabel_key_width, + {"Soft-Label Key width","unistim.softlabel.key.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_SOFTLABEL_WIDTH,NULL,HFILL} + }, + { &hf_display_context_width, + {"Phone Context Width","unistim.context.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_CONTEXT_WIDTH,NULL,HFILL} + }, + { &hf_display_numeric_width, + {"Phone Numeric Width","unistim.numeric.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_NUMERIC_WIDTH,NULL,HFILL} + }, + { &hf_display_time_width, + {"Phone Time Width","unistim.time.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_TIME_WIDTH,NULL,HFILL} + }, + { &hf_display_date_width, + {"Phone Date Width","unistim.date.width",FT_UINT8, + BASE_DEC,NULL,DISPLAY_DATE_WIDTH,NULL,HFILL} + }, + { &hf_display_char_dload, + {"Number of Downloadable Chars","unistim.number.dload.chars",FT_UINT8, + BASE_DEC,NULL,DISPLAY_CHAR_DLOAD,NULL,HFILL} + }, + { &hf_display_freeform_icon_dload, + {"Number of Freeform Icon Downloads","unistim.number.dload.icons",FT_UINT8, + BASE_DEC,NULL,DISPLAY_FFORM_ICON_DLOAD,NULL,HFILL} + }, + { &hf_display_icon_type, + {"Icon Types","unistim.icon.types",FT_UINT8, + BASE_HEX,NULL,DISPLAY_ICON_TYPE,NULL,HFILL} + }, + { &hf_display_charsets, + {"Character Sets","unistim.phone.charsets",FT_UINT8, + BASE_HEX,NULL,DISPLAY_CHARSET,NULL,HFILL} + }, + { &hf_display_contrast, + {"Phone Contrast Level","unistim.phone.contrast.level",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_display_cursor_numeric, + {"Numeric Index Field","unistim.field.numeric",FT_BOOLEAN, + 8,NULL,DISPLAY_CURSOR_NUMERIC,NULL,HFILL} + }, + { &hf_display_cursor_context, + {"Context Field","unistim.field.context",FT_BOOLEAN, + 8,NULL,DISPLAY_CURSOR_CONTEXT,NULL,HFILL} + }, + { &hf_display_cursor_line, + {"Text Line","unistim.field.text.line",FT_BOOLEAN, + 8,NULL,DISPLAY_CURSOR_LINE,NULL,HFILL} + }, + { &hf_display_cursor_softkey, + {"Softkey Position","unistim.position.skey",FT_BOOLEAN, + 8,NULL,DISPLAY_CURSOR_SKEY,NULL,HFILL} + }, + { &hf_display_cursor_softkey_id, + {"Soft Key Id","unistim.cursor.skey.id",FT_UINT8, + BASE_DEC,NULL,DISPLAY_CURSOR_SKEY_ID,NULL,HFILL} + }, + { &hf_display_cursor_char_pos, + {"Character Position","unistim.phone.char.pos",FT_UINT8, + BASE_DEC,NULL,DISPLAY_CURSOR_CHAR_POS,NULL,HFILL} + }, + { &hf_display_cursor_line_number, + {"Display Line Number","unistim.display.line.number",FT_UINT8, + BASE_DEC,NULL,DISPLAY_CURSOR_LINE_NUM,NULL,HFILL} + }, + { &hf_display_hlight_start, + {"Display Highlight Start Position","unistim.hilite.start.pos",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_display_hlight_end, + {"Display Highlight End Position","unistim.hilite.end.pos",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_display_date_format, + {"Date Format","unistim.display.date.format",FT_UINT8, + BASE_HEX,VALS(date_formats),DISPLAY_DATE_FORMAT,NULL,HFILL} + }, + { &hf_display_time_format, + {"Time Format","unistim.display.time.format",FT_UINT8, + BASE_HEX,VALS(time_formats),DISPLAY_TIME_FORMAT,NULL,HFILL} + }, + { &hf_display_use_time_format, + {"Use Time Format","unistim.display.use.time.format",FT_BOOLEAN, + 8,NULL,DISPLAY_USE_TIME_FORMAT,NULL,HFILL} + }, + { &hf_display_use_date_format, + {"Use Date Format","unistim.display.use.date.format",FT_BOOLEAN, + 8,NULL,DISPLAY_USE_DATE_FORMAT,NULL,HFILL} + }, + { &hf_display_context_format, + {"Context Info Bar Format","unistim.display.context.format",FT_UINT8, + BASE_HEX,VALS(display_formats),DISPLAY_CTX_FORMAT,NULL,HFILL} + }, + { &hf_display_context_field, + {"Context Info Bar Field","unistim.display.context.field",FT_UINT8, + BASE_HEX,VALS(display_format_fields),DISPLAY_CTX_FIELD,NULL,HFILL} + }, + { &hf_display_char_address, + {"Display Character Address","unistim.display.char.address",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_display_layer_number, + {"Softkey Layer Number","unistim.softkey.layer.num",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_display_layer_skey_id, + {"Softkey ID","unistim.layer.softkey.id",FT_UINT8, + BASE_DEC,NULL,DISPLAY_LAYER_SKEY_ID,NULL,HFILL} + }, + { &hf_display_layer_all_skeys, + {"All Softkeys","unistim.layer.all.skeys",FT_BOOLEAN, + 8,NULL,DISPLAY_LAYER_ALL_SKEYS,NULL,HFILL} + }, + { &hf_display_once_or_cyclic, + {"Layer Softkey Once/Cyclic","unistim.layer.once.cyclic",FT_BOOLEAN, + 8,TFS(&once_or_cyclic),DISPLAY_ONE_OR_CYCLIC,NULL,HFILL} + }, + { &hf_display_layer_duration, + {"Display Duration (20ms steps)","unistim.layer.display.duration",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_key_programmable_keys, + {"Number of Programmable Keys","unistim.num.prog.keys",FT_UINT8, + BASE_DEC,NULL,KEY_NUM_PROG_KEYS,NULL,HFILL} + }, + { &hf_keys_soft_keys, + {"Number of Soft Keys","unistim.num.soft.keys",FT_UINT8, + BASE_DEC,NULL,KEY_NUM_SOFT_KEYS,NULL,HFILL} + }, + { &hf_keys_hd_key, + {"Headset Key Exists","unistim.exist.hd.key",FT_BOOLEAN, + 8,NULL,KEY_HD_KEY_EXISTS,NULL,HFILL} + }, + { &hf_keys_mute_key, + {"Mute Key Exists","unistim.exist.mute.key",FT_BOOLEAN, + 8,NULL,KEY_MUTE_KEY_EXISTS,NULL,HFILL} + }, + { &hf_keys_quit_key, + {"Quit Key Exists","unistim.exist.quit.key",FT_BOOLEAN, + 8,NULL,KEY_QUIT_KEY_EXISTS,NULL,HFILL} + }, + { &hf_keys_copy_key, + {"Copy Key Exists","unistim.exist.copy.key",FT_BOOLEAN, + 8,NULL,KEY_COPY_KEY_EXISTS,NULL,HFILL} + }, + { &hf_keys_mwi_key, + {"Message Waiting Indicator Exists","unistim.exist.mwi.key",FT_BOOLEAN, + 8,NULL,KEY_MWI_EXISTS,NULL,HFILL} + }, + { &hf_keys_num_nav_keys, + {"Number of Navigation Keys","unistim.num.nav.keys",FT_UINT8, + BASE_DEC,VALS(number_nav_keys),KEY_NUM_NAV_KEYS,NULL,HFILL} + }, + { &hf_keys_num_conspic_keys, + {"Number Of Conspicuous Keys","unistim.num.conspic.keys",FT_UINT8, + BASE_DEC,NULL,KEY_NUM_CONSPIC_KEYS,NULL,HFILL} + }, + { &hf_keys_send_key_rel, + {"Send Key Release","unistim.key.send.release",FT_BOOLEAN, + 8,TFS(&key_release),KEY_SEND_KEY_RELEASE,NULL,HFILL} + }, + { &hf_keys_enable_vol, + {"Enable Volume Control","unistim.key.enable.vol",FT_BOOLEAN, + 8,TFS(&enable_vol),KEY_ENABLE_VOL_KEY,NULL,HFILL} + }, + { &hf_keys_conspic_prog_key, + {"Conspicuous and Programmable Keys Same","unistim.conspic.prog.keys",FT_BOOLEAN, + 8,TFS(&conspic_prog),KEY_CONSPIC_PROG_KEY0,NULL,HFILL} + }, + { &hf_keys_acd_super_control, + {"ACD Supervisor Control","unistim.acd.super.control",FT_BOOLEAN, + 8,TFS(&acd_supervisor),KEY_ACD_SUP_CONTROL,NULL,HFILL} + }, + { &hf_keys_local_dial_feedback, + {"Local Keypad Feedback","unistim.key.feedback",FT_UINT8, + BASE_HEX,VALS(local_dialpad_feedback),KEY_LOCAL_DIAL_PAD_FEED,NULL,HFILL} + }, + { &hf_audio_source_descr, + {"Source Description Item","unistim.source.desc.item",FT_UINT8, + BASE_HEX,VALS(source_descriptions),AUDIO_SOURCE_DESCRIPTION,NULL,HFILL} + }, + { &hf_audio_sdes_rtcp_bucket, + {"RTCP Bucket Id","unistim.sdes.rtcp.bucket",FT_UINT8, + BASE_HEX,NULL,AUDIO_SDES_RTCP_BUCKET,NULL,HFILL} + }, + { &hf_audio_desired_jitter, + {"Desired Jitter","unistim.audio.desired.jitter",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_high_water_mark, + {"Threshold of audio frames where jitter buffer removes frames","unistim.high.water.mark",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_early_packet_resync_thresh, + {"Threshold in x/8000 sec where packets are too early","unistim.early.packet.thresh",FT_UINT32, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_late_packet_resync_thresh, + {"Threshold in x/8000 sec where packets are too late","unistim.late.packet.thresh",FT_UINT32, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_resolve_phone_port, + {"Resolve Phone Port","unistim.resolve.phone.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_far_end_echo_port, + {"Resolve Far End Port","unistim.resolve.far.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_far_end_ip_address, + {"Resolve Far End IP","unistim.resolve.far.ip",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_nat_port, + {"NAT Port","unistim.audio.nat.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_nat_ip_address, + {"NAT IP Address","unistim.audio.nat.ip",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_direction_code, + {"Stream Direction Code","unistim.audio.direction.codes",FT_UINT8, + BASE_HEX,VALS(direction_codes),AUDIO_DIRECTION_CODE,NULL,HFILL} + }, + { &hf_audio_hf_support, + {"Handsfree supported","unistim.handsfree.support",FT_BOOLEAN, + 8,NULL,AUDIO_HF_SUPPORT,NULL,HFILL} + }, + { &hf_audio_opt_rpt_max, + {"Max Volume","unistim.max.vol",FT_BOOLEAN, + 8,TFS(&opt_rpt_enable_max_tone_vol),AUDIO_ENABLED_MAX_TONE,NULL,HFILL} + }, + { &hf_audio_opt_rpt_adj_vol, + {"Volume Adjustments","unistim.audio.volume.adj",FT_BOOLEAN, + 8,TFS(&opt_rpt_adjust_volume),AUDIO_ENABLED_ADJ_VOL,NULL,HFILL} + }, + { &hf_audio_opt_rpt_auto_adj_vol, + {"Auto Adjust RX Volume","unistim.auto.adj.rx.vol",FT_BOOLEAN, + 8,TFS(&opt_rpt_automatic_adjustable_rx_volume_report), + AUDIO_AUTO_ADJ_RX_REP,NULL,HFILL} + }, + { &hf_audio_opt_rpt_hs_on_air, + {"HS On Air","unistim.audio.hs.on.air",FT_BOOLEAN, + 8,TFS(&opt_rpths_on_air_feature),AUDIO_HS_ON_AIR_FEATURE,NULL,HFILL} + }, + { &hf_audio_opt_rpt_hd_on_air, + {"HD On Air","unistim.audio.hd.on.air",FT_BOOLEAN, + 8,TFS(&opt_rpt_hd_on_air_feature),AUDIO_HD_ON_AIR_FEATURE,NULL,HFILL} + }, + { &hf_audio_opt_rpt_noise_squelch, + {"Automatic Squelch","unistim.auto.noise.squelch",FT_BOOLEAN, + 8,TFS(&opt_rpt_noise_sqlch_disable),AUDIO_NOISE_SQUELCH_DIS,NULL,HFILL} + }, + { &hf_audio_rx_vol_apb_rpt, + {"APB Volume Report","unistim.apb.volume.rpt",FT_UINT8, + BASE_HEX,VALS(volume_rpt_apbs),AUDIO_APB_VOL_RPT,NULL,HFILL} + }, + { &hf_audio_rx_vol_vol_up, + {"Volume Up","unistim.audio.volume.up",FT_BOOLEAN, + 8,NULL,AUDIO_VOL_UP_RPT,NULL,HFILL} + }, + { &hf_audio_rx_vol_vol_floor, + {"RX Volume at Floor","unistim.audio.rx.vol.floor",FT_BOOLEAN, + 8,NULL,AUDIO_VOL_FLR_RPT,NULL,HFILL} + }, + { &hf_audio_rx_vol_vol_ceiling, + {"RX Volume at Ceiling","unistim.audio.rx.vol.ceiling",FT_BOOLEAN, + 8,NULL,AUDIO_VOL_CEIL_RPT,NULL,HFILL} + }, + { &hf_audio_current_adj_vol_id, + {"Current APB Volume Report","unistim.current.volume.rpt",FT_UINT8, + BASE_HEX,VALS(volume_rpt_apbs),AUDIO_APB_VOL_RPT,NULL,HFILL} + }, + { &hf_audio_current_rx_level, + {"Current RX Volume Level","unistim.current.rx.vol.level",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_current_rx_range, + {"Current RX Volume Range","unistim.current.rx.vol.range",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_cadence_select, + {"Alerting Cadence Select","unistim.alert.cad.sel",FT_UINT8, + BASE_HEX,NULL,AUDIO_ALERT_CADENCE_SEL,NULL,HFILL} + }, + { &hf_audio_warbler_select, + {"Alerting Warbler Select","unistim.alert.warb.select",FT_UINT8, + BASE_HEX,NULL,AUDIO_ALERT_WARBLER_SEL,NULL,HFILL} + }, + { &hf_audio_open_stream_rpt, + {"Open Stream Report","unistim.open.audio.stream.rpt",FT_UINT8, + BASE_HEX,VALS(stream_result),0x00,NULL,HFILL} + }, + { &hf_audio_sdes_rpt_source_desc, + {"Report Source Description","unistim.rpt.src.desc",FT_UINT8, + BASE_HEX,VALS(source_descipts),AUDIO_SDES_INFO_RPT_DESC,NULL,HFILL} + }, + { &hf_audio_sdes_rpt_buk_id, + {"Report RTCP Bucket ID","unistim.rpt.rtcp.buk.id",FT_UINT8, + BASE_HEX,NULL,AUDIO_SDES_INFO_RPT_BUK,NULL,HFILL} + }, + { &hf_audio_phone_port, + {"Phone Listen Port","unistim.phone.listen.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_phone_ip, + {"Phone Listen Address","unistim.phone.listen.address",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_phone_add_len, + {"Phone Address Length","unistim.phone.address.len",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_nat_listen_port, + {"NAT Listen Port","unistim.nat.listen.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_nat_ip, + {"NAT Listen Address","unistim.nat.listen.address",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_nat_add_len, + {"NAT Address Length","unistim.nat.address.len",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_audio_stream_direction_code, + {"Audio Stream Direction","unistim.audio.stream.direction",FT_UINT8, + BASE_HEX,VALS(stream_direction_codes),AUDIO_STREAM_DIRECTION,NULL,HFILL} + }, + { &hf_audio_stream_state, + {"Audio Stream State","unistim.audio.stream.state",FT_BOOLEAN, + 8,TFS(&stream_states),AUDIO_STREAM_STATE,NULL,HFILL} + }, + { &hf_audio_transducer_list_length, + {"Transducer List Length","unistim.trans.list.len",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_file_xfer_mode, + {"File Transfer Mode","unistim.net.file.xfer.mode",FT_UINT8, + BASE_HEX,VALS(file_xfer_modes),NETWORK_FILE_XFER_MODE,NULL,HFILL} + }, + { &hf_net_force_download , + {"Force Download","unistim.net.force.download",FT_BOOLEAN, + 8,NULL,NETWORK_FORCE_DLOAD,NULL,HFILL} + }, + { &hf_net_use_file_server_port, + {"Use Custom Server Port","unistim.net.use.server.port",FT_BOOLEAN, + 8,NULL,NETWORK_USE_FSERV_PORT,NULL,HFILL} + }, + { &hf_net_use_local_port, + {"Use Custom Local Port","unistim.net.use.local.port",FT_BOOLEAN, + 8,NULL,NETWORK_USE_LOCAL_PORT,NULL,HFILL} + }, + { &hf_net_file_server_port, + {"File Server Port","unistim.net.file.server.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_full_pathname, + {"Full Pathname","unistim.net.full_pathname",FT_STRINGZ, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_net_file_identifier, + {"File Identifier","unistim.net.file_identifier",FT_STRINGZ, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_net_local_port, + {"Local XFer Port","unistim.net.local.xfer.port",FT_UINT16, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_net_file_server_address, + {"File Server IP Address","unistim.net.file.server.address",FT_IPv4, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_admin_command, + {"Admin Command","unistim.key.icon.admin.cmd",FT_UINT8, + BASE_HEX,VALS(admin_commands),KEY_ADMIN_CMD,NULL,HFILL} + }, + { &hf_keys_logical_icon_id, + {"Logical Icon ID","unistim.keys.logical.icon.id",FT_UINT16, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_repeat_timer_one, + {"Key Repeat Timer 1 Value","unistim.keys.repeat.time.one",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_repeat_timer_two, + {"Key Repeat Timer 2 Value","unistim.keys.repeat.time.two",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_led_id, + {"Led ID","unistim.keys.led.id",FT_UINT8, + BASE_HEX,VALS(keys_led_ids),0x00,NULL,HFILL} + }, + { &hf_keys_phone_icon_id, + {"Phone Icon ID","unistim.keys.phone.icon.id",FT_UINT8, + BASE_HEX,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_cadence_on_time, + {"Indicator Cadence On Time","unistim.keys.cadence.on.time",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_cadence_off_time, + {"Indicator Cadence Off Time","unistim.keys.cadence.off.time",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_keys_user_activity_timeout, + {"User Activity Timeout Value","unistim.keys.user.timeout.value",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + { &hf_display_call_timer_mode, + {"Call Timer Mode","unistim.display.call.timer.mode",FT_BOOLEAN, + 8,TFS(&call_duration_timer_mode),DISPLAY_CALL_TIMER_MODE,NULL,HFILL} + }, + { &hf_display_call_timer_reset, + {"Call Timer Reset","unistim.display.call.timer.reset",FT_BOOLEAN, + 8,TFS(&call_duration_timer_reset),DISPLAY_CALL_TIMER_RESET,NULL,HFILL} + }, + { &hf_display_call_timer_display, + {"Call Timer Display","unistim.display.call.timer.display",FT_BOOLEAN, + 8,TFS(&call_duration_display_timer),DISPLAY_CALL_TIMER_DISPLAY,NULL,HFILL} + }, + { &hf_display_call_timer_delay, + {"Call Timer Delay","unistim.display.call.timer.delay",FT_BOOLEAN, + 8,TFS(&call_duration_timer_delay),DISPLAY_CALL_TIMER_DELAY,NULL,HFILL} + }, + { &hf_display_call_timer_id, + {"Call Timer ID","unistim.display.call.timer.id",FT_UINT8, + BASE_DEC,NULL,DISPLAY_CALL_TIMER_ID,NULL,HFILL} + }, + { &hf_expansion_switch_cmd, + {"Expansion CMD (switch)","unistim.expansion.switch",FT_UINT8, + BASE_HEX,VALS(expansion_switch_msgs),0x0,NULL,HFILL} + }, + { &hf_expansion_phone_cmd, + {"Expansion CMD (phone)","unistim.expansion.phone",FT_UINT8, + BASE_HEX,VALS(expansion_phone_msgs),0x0,NULL,HFILL} + }, + { &hf_expansion_softlabel_number, + {"Module Soft Label Number","unistim.expansion.label.number",FT_UINT8, + BASE_DEC,NULL,0x00,NULL,HFILL} + }, + + + /****LAST****/ + { &hf_generic_string, + {"DATA","unistim.generic.data",FT_STRING, + BASE_NONE,NULL,0x00,NULL,HFILL} + }, + { &hf_generic_data, + {"DATA","unistim.generic.data",FT_BYTES, + BASE_NONE,NULL,0x00,NULL,HFILL} + } }; /* Setup protocol subtree array */ static gint *ett[] = { - &ett_unistim + &ett_unistim }; static ei_register_info ei[] = { - { &ei_unistim_len, { "unistim.len.bad", PI_MALFORMED, PI_ERROR, "Length too short", EXPFILL }}, + { &ei_unistim_len, { "unistim.len.bad", PI_MALFORMED, PI_ERROR, "Length too short", EXPFILL }}, }; expert_module_t* expert_unistim; @@ -4077,3 +4077,15 @@ proto_reg_handoff_unistim(void) { unistim_port = global_unistim_port; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/plugins/wimax/crc.c b/plugins/wimax/crc.c index 0d65a69438..b2c9b53e45 100644 --- a/plugins/wimax/crc.c +++ b/plugins/wimax/crc.c @@ -28,7 +28,7 @@ #define WMAX_MAC_CRC32_POLYNOMIAL 0x04c11db7U /* polynomial used in calculating the CRC-32 checksum */ #define CCITT_X25_CRC16_POLYNOMIAL 0x1021 /* polynomial used in calculating the CRC-16 checksum */ -#define WMAX_MAC_CRC8_POLYNOMIAL 0x07 /* polynomial used in calculating the CRC-8 checksum */ +#define WMAX_MAC_CRC8_POLYNOMIAL 0x07 /* polynomial used in calculating the CRC-8 checksum */ #define CRC32_INITIAL_VALUE 0xFFFFFFFF #define CRC16_INITIAL_VALUE 0xFFFF @@ -163,7 +163,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) crc ^= data[j] << 8; crc = (crc << 8) ^ crc16_table[(crc & 0xff00) >> 8]; } - crc ^= 0xFFFF; /* Invert the output. */ + crc ^= 0xFFFF; /* Invert the output. */ crc &= 0xFFFF; return crc; } @@ -195,3 +195,16 @@ guint8 wimax_mac_calc_crc8(const guint8 *data, guint data_len) } return crc; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/plugins/wimax/crc_data.c b/plugins/wimax/crc_data.c index 41ee481cb8..3bcf8ceb1e 100644 --- a/plugins/wimax/crc_data.c +++ b/plugins/wimax/crc_data.c @@ -169,3 +169,15 @@ guint16 crc16_table[256] = { 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, }; +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c index 6a141f5350..3613dd357c 100644 --- a/plugins/wimax/mac_hd_type1_decoder.c +++ b/plugins/wimax/mac_hd_type1_decoder.c @@ -117,8 +117,8 @@ static const char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] = #define WIMAX_MAC_HEADER_TYPE_1_RSV_7 0x000FFF /* 4th to 6th bytes */ /*#define WIMAX_MAC_HEADER_TYPE_1_CID 0xFFFF -*#define WIMAX_MAC_HEADER_TYPE_1_HCS 0xFF -*/ + *#define WIMAX_MAC_HEADER_TYPE_1_HCS 0xFF + */ /* Common Fields */ static int hf_mac_header_type_1_ht = -1; static int hf_mac_header_type_1_ec = -1; @@ -158,14 +158,14 @@ static int hf_mac_header_type_1_hcs = -1; /* MAC Header Type I Sub-Types */ static const value_string sub_types[] = { - { BR_INCREMENTAL, "Bandwidth Request Incremental" }, - { BR_AGGREGATE, "Bandwidth Request Aggregate" }, - { PHY_CHANNEL_REPORT, "PHY Channel Report" }, + { BR_INCREMENTAL, "Bandwidth Request Incremental" }, + { BR_AGGREGATE, "Bandwidth Request Aggregate" }, + { PHY_CHANNEL_REPORT, "PHY Channel Report" }, { BR_WITH_UL_TX_POWER_REPORT, "Bandwidth Request with UL TX Power Report" }, - { BR_AND_CINR_REPORT, "Bandwidth Request and CINR Report" }, - { BR_WITH_UL_SLEEP_CONTROL, "Bandwidth Request with Sleep Control" }, - { SN_REPORT, "SN Report" }, - { CQICH_ALLOCATION_REQUEST, "CQICH Allocation Request" }, + { BR_AND_CINR_REPORT, "Bandwidth Request and CINR Report" }, + { BR_WITH_UL_SLEEP_CONTROL, "Bandwidth Request with Sleep Control" }, + { SN_REPORT, "SN Report" }, + { CQICH_ALLOCATION_REQUEST, "CQICH Allocation Request" }, { 0, NULL} }; @@ -558,3 +558,16 @@ void proto_register_mac_header_type_1(void) register_dissector("mac_header_type_1_handler", dissect_mac_header_type_1_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c index e69732422a..4d8fe93a41 100644 --- a/plugins/wimax/mac_hd_type2_decoder.c +++ b/plugins/wimax/mac_hd_type2_decoder.c @@ -1369,3 +1369,16 @@ void proto_register_mac_header_type_2(void) register_dissector("mac_header_type_2_handler", dissect_mac_header_type_2_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 2b9fa33ffd..c093927cc5 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -48,75 +48,75 @@ static dissector_table_t subdissector_message_table; /* WIMAX MAC Management message type info */ static const value_string mgt_msg_abbrv_vals[] = { - { MAC_MGMT_MSG_UCD, "UCD" }, - { MAC_MGMT_MSG_DCD, "DCD" }, - { MAC_MGMT_MSG_DL_MAP, "DL-MAP" }, - { MAC_MGMT_MSG_UL_MAP, "UL-MAP" }, - { MAC_MGMT_MSG_RNG_REQ, "RNG-REQ" }, - { MAC_MGMT_MSG_RNG_RSP, "RNG-RSP" }, - { MAC_MGMT_MSG_REG_REQ, "REG-REQ" }, - { MAC_MGMT_MSG_REG_RSP, "REG-RSP" }, - { 8, "Reserved8" }, - { MAC_MGMT_MSG_PKM_REQ, "PKM-REQ" }, - { MAC_MGMT_MSG_PKM_RSP, "PKM-RSP" }, - { MAC_MGMT_MSG_DSA_REQ, "DSA-REQ" }, - { MAC_MGMT_MSG_DSA_RSP, "DSA-RSP" }, - { MAC_MGMT_MSG_DSA_ACK, "DSA-ACK" }, - { MAC_MGMT_MSG_DSC_REQ, "DSC-REQ" }, - { MAC_MGMT_MSG_DSC_RSP, "DSC-RSP" }, - { MAC_MGMT_MSG_DSC_ACK, "DSC-ACK" }, - { MAC_MGMT_MSG_DSD_REQ, "DSD-REQ" }, - { MAC_MGMT_MSG_DSD_RSP, "DSD-RSP" }, - { 19, "Reserved19" }, - { 20, "Reserved20" }, - { MAC_MGMT_MSG_MCA_REQ, "MCA-REQ" }, - { MAC_MGMT_MSG_MCA_RSP, "MCA-RSP" }, - { MAC_MGMT_MSG_DBPC_REQ, "DBPC-REQ" }, - { MAC_MGMT_MSG_DBPC_RSP, "DBPC-RSP" }, - { MAC_MGMT_MSG_RES_CMD, "RES-CMD" }, - { MAC_MGMT_MSG_SBC_REQ, "SBC-REQ" }, - { MAC_MGMT_MSG_SBC_RSP, "SBC-RSP" }, - { MAC_MGMT_MSG_CLK_CMP, "CLK-CMP" }, - { MAC_MGMT_MSG_DREG_CMD, "DREG-CMD" }, - { MAC_MGMT_MSG_DSX_RVD, "DSX-RVD" }, - { MAC_MGMT_MSG_TFTP_CPLT, "TFTP-CPLT" }, - { MAC_MGMT_MSG_TFTP_RSP, "TFTP-RSP" }, - { MAC_MGMT_MSG_ARQ_FEEDBACK, "ARQ-FEEDBACK" }, - { MAC_MGMT_MSG_ARQ_DISCARD, "ARQ-DISCARD" }, - { MAC_MGMT_MSG_ARQ_RESET, "ARQ-RESET" }, - { MAC_MGMT_MSG_REP_REQ, "REP-REQ" }, - { MAC_MGMT_MSG_REP_RSP, "REP-RSP" }, - { MAC_MGMT_MSG_FPC, "FPC" }, - { MAC_MGMT_MSG_MSH_NCFG, "MSH-NCFG" }, - { MAC_MGMT_MSG_MSH_NENT, "MSH-NENT" }, - { MAC_MGMT_MSG_MSH_DSCH, "MSH-DSCH" }, - { MAC_MGMT_MSG_MSH_CSCH, "MSH-CSCH" }, - { MAC_MGMT_MSG_MSH_CSCF, "MSH-CSCF" }, - { MAC_MGMT_MSG_AAS_FBCK_REQ, "AAS-FBCK_REQ" }, - { MAC_MGMT_MSG_AAS_FBCK_RSP, "AAS-FBCK_RSP" }, - { MAC_MGMT_MSG_AAS_BEAM_SELECT, "AAS-BEAM_SELECT" }, - { MAC_MGMT_MSG_AAS_BEAM_REQ, "AAS-BEAM_REQ" }, - { MAC_MGMT_MSG_AAS_BEAM_RSP, "AAS-BEAM_RSP" }, - { MAC_MGMT_MSG_DREG_REQ, "DREG-REQ" }, - { MAC_MGMT_MSG_MOB_SLP_REQ, "MOB-SLP-REQ" }, - { MAC_MGMT_MSG_MOB_SLP_RSP, "MOB-SLP-RSP" }, - { MAC_MGMT_MSG_MOB_TRF_IND, "MOB-TRF-IND" }, - { MAC_MGMT_MSG_MOB_NBR_ADV, "MOB-NBR-ADV" }, - { MAC_MGMT_MSG_MOB_SCN_REQ, "MOB-SCN-REQ" }, - { MAC_MGMT_MSG_MOB_SCN_RSP, "MOB-SCN-RSP" }, - { MAC_MGMT_MSG_MOB_BSHO_REQ, "MOB-BSHO-REQ" }, - { MAC_MGMT_MSG_MOB_MSHO_REQ, "MOB-MSHO-REQ" }, - { MAC_MGMT_MSG_MOB_BSHO_RSP, "MOB-BSHO-RSP" }, - { MAC_MGMT_MSG_MOB_HO_IND, "MOB-HO-IND" }, - { MAC_MGMT_MSG_MOB_SCN_REP, "MOB-SCN-REP" }, - { MAC_MGMT_MSG_MOB_PAG_ADV, "MOB-PAG-ADV" }, - { MAC_MGMT_MSG_MBS_MAP, "MBS-MAP" }, - { MAC_MGMT_MSG_PMC_REQ, "PMC-REQ" }, - { MAC_MGMT_MSG_PMC_RSP, "PMC-RSP" }, - { MAC_MGMT_MSG_PRC_LT_CTRL, "PRC-LT-CTRL" }, - { MAC_MGMT_MSG_MOB_ASC_REP, "MOB-ASC-REP" }, - - { 0, NULL } + { MAC_MGMT_MSG_UCD, "UCD" }, + { MAC_MGMT_MSG_DCD, "DCD" }, + { MAC_MGMT_MSG_DL_MAP, "DL-MAP" }, + { MAC_MGMT_MSG_UL_MAP, "UL-MAP" }, + { MAC_MGMT_MSG_RNG_REQ, "RNG-REQ" }, + { MAC_MGMT_MSG_RNG_RSP, "RNG-RSP" }, + { MAC_MGMT_MSG_REG_REQ, "REG-REQ" }, + { MAC_MGMT_MSG_REG_RSP, "REG-RSP" }, + { 8, "Reserved8" }, + { MAC_MGMT_MSG_PKM_REQ, "PKM-REQ" }, + { MAC_MGMT_MSG_PKM_RSP, "PKM-RSP" }, + { MAC_MGMT_MSG_DSA_REQ, "DSA-REQ" }, + { MAC_MGMT_MSG_DSA_RSP, "DSA-RSP" }, + { MAC_MGMT_MSG_DSA_ACK, "DSA-ACK" }, + { MAC_MGMT_MSG_DSC_REQ, "DSC-REQ" }, + { MAC_MGMT_MSG_DSC_RSP, "DSC-RSP" }, + { MAC_MGMT_MSG_DSC_ACK, "DSC-ACK" }, + { MAC_MGMT_MSG_DSD_REQ, "DSD-REQ" }, + { MAC_MGMT_MSG_DSD_RSP, "DSD-RSP" }, + { 19, "Reserved19" }, + { 20, "Reserved20" }, + { MAC_MGMT_MSG_MCA_REQ, "MCA-REQ" }, + { MAC_MGMT_MSG_MCA_RSP, "MCA-RSP" }, + { MAC_MGMT_MSG_DBPC_REQ, "DBPC-REQ" }, + { MAC_MGMT_MSG_DBPC_RSP, "DBPC-RSP" }, + { MAC_MGMT_MSG_RES_CMD, "RES-CMD" }, + { MAC_MGMT_MSG_SBC_REQ, "SBC-REQ" }, + { MAC_MGMT_MSG_SBC_RSP, "SBC-RSP" }, + { MAC_MGMT_MSG_CLK_CMP, "CLK-CMP" }, + { MAC_MGMT_MSG_DREG_CMD, "DREG-CMD" }, + { MAC_MGMT_MSG_DSX_RVD, "DSX-RVD" }, + { MAC_MGMT_MSG_TFTP_CPLT, "TFTP-CPLT" }, + { MAC_MGMT_MSG_TFTP_RSP, "TFTP-RSP" }, + { MAC_MGMT_MSG_ARQ_FEEDBACK, "ARQ-FEEDBACK" }, + { MAC_MGMT_MSG_ARQ_DISCARD, "ARQ-DISCARD" }, + { MAC_MGMT_MSG_ARQ_RESET, "ARQ-RESET" }, + { MAC_MGMT_MSG_REP_REQ, "REP-REQ" }, + { MAC_MGMT_MSG_REP_RSP, "REP-RSP" }, + { MAC_MGMT_MSG_FPC, "FPC" }, + { MAC_MGMT_MSG_MSH_NCFG, "MSH-NCFG" }, + { MAC_MGMT_MSG_MSH_NENT, "MSH-NENT" }, + { MAC_MGMT_MSG_MSH_DSCH, "MSH-DSCH" }, + { MAC_MGMT_MSG_MSH_CSCH, "MSH-CSCH" }, + { MAC_MGMT_MSG_MSH_CSCF, "MSH-CSCF" }, + { MAC_MGMT_MSG_AAS_FBCK_REQ, "AAS-FBCK_REQ" }, + { MAC_MGMT_MSG_AAS_FBCK_RSP, "AAS-FBCK_RSP" }, + { MAC_MGMT_MSG_AAS_BEAM_SELECT, "AAS-BEAM_SELECT" }, + { MAC_MGMT_MSG_AAS_BEAM_REQ, "AAS-BEAM_REQ" }, + { MAC_MGMT_MSG_AAS_BEAM_RSP, "AAS-BEAM_RSP" }, + { MAC_MGMT_MSG_DREG_REQ, "DREG-REQ" }, + { MAC_MGMT_MSG_MOB_SLP_REQ, "MOB-SLP-REQ" }, + { MAC_MGMT_MSG_MOB_SLP_RSP, "MOB-SLP-RSP" }, + { MAC_MGMT_MSG_MOB_TRF_IND, "MOB-TRF-IND" }, + { MAC_MGMT_MSG_MOB_NBR_ADV, "MOB-NBR-ADV" }, + { MAC_MGMT_MSG_MOB_SCN_REQ, "MOB-SCN-REQ" }, + { MAC_MGMT_MSG_MOB_SCN_RSP, "MOB-SCN-RSP" }, + { MAC_MGMT_MSG_MOB_BSHO_REQ, "MOB-BSHO-REQ" }, + { MAC_MGMT_MSG_MOB_MSHO_REQ, "MOB-MSHO-REQ" }, + { MAC_MGMT_MSG_MOB_BSHO_RSP, "MOB-BSHO-RSP" }, + { MAC_MGMT_MSG_MOB_HO_IND, "MOB-HO-IND" }, + { MAC_MGMT_MSG_MOB_SCN_REP, "MOB-SCN-REP" }, + { MAC_MGMT_MSG_MOB_PAG_ADV, "MOB-PAG-ADV" }, + { MAC_MGMT_MSG_MBS_MAP, "MBS-MAP" }, + { MAC_MGMT_MSG_PMC_REQ, "PMC-REQ" }, + { MAC_MGMT_MSG_PMC_RSP, "PMC-RSP" }, + { MAC_MGMT_MSG_PRC_LT_CTRL, "PRC-LT-CTRL" }, + { MAC_MGMT_MSG_MOB_ASC_REP, "MOB-ASC-REP" }, + + { 0, NULL } }; static value_string_ext mgt_msg_abbrv_vals_ext = VALUE_STRING_EXT_INIT(mgt_msg_abbrv_vals); @@ -364,3 +364,16 @@ void proto_reg_handoff_mac_mgmt_msg(void) if (mgt_msg_handle) dissector_add_uint( "wmx.mgmtmsg", MAC_MGMT_MSG_MOB_ASC_REP, mgt_msg_handle ); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index f430300a92..2dd68c71d9 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -56,18 +56,18 @@ static gint ett_mac_mgmt_msg_aas_beam_rsp_decoder = -1; #ifdef OFDM static const value_string vals_report_types[] = { - {0, "BEAM_REP_IE"}, - {0, NULL} + {0, "BEAM_REP_IE"}, + {0, NULL} }; static const value_string vals_resolution_parameter[] = { - {0, "report every 4th subcarrier"}, - {1, "report every 8th subcarrier"}, - {2, "report every 16th subcarrier"}, - {3, "report every 32nd subcarrier"}, - {4, "report every 64th subcarrier"}, - {0, NULL} + {0, "report every 4th subcarrier"}, + {1, "report every 8th subcarrier"}, + {2, "report every 16th subcarrier"}, + {3, "report every 32nd subcarrier"}, + {4, "report every 64th subcarrier"}, + {0, NULL} }; #endif @@ -336,3 +336,16 @@ proto_reg_handoff_mac_mgmt_msg_aas_beam(void) aas_handle = create_dissector_handle(dissect_mac_mgmt_msg_aas_beam_select_decoder, proto_mac_mgmt_msg_aas_beam_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_AAS_BEAM_SELECT, aas_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c index 31661f29a3..459654cdfd 100644 --- a/plugins/wimax/msg_clk_cmp.c +++ b/plugins/wimax/msg_clk_cmp.c @@ -147,3 +147,16 @@ proto_reg_handoff_mac_mgmt_msg_clk_cmp(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_clk_cmp_decoder, proto_mac_mgmt_msg_clk_cmp_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_CLK_CMP, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index b2e2ab34f5..31af9959a9 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -129,23 +129,23 @@ static gint hf_dcd_invalid_tlv = -1; /* DCD DIUC messages (table 143) */ static const value_string diuc_msgs[] = { - {0, "Downlink Burst Profile 1"}, - {1, "Downlink Burst Profile 2"}, - {2, "Downlink Burst Profile 3"}, - {3, "Downlink Burst Profile 4"}, - {4, "Downlink Burst Profile 5"}, - {5, "Downlink Burst Profile 6"}, - {6, "Downlink Burst Profile 7"}, - {7, "Downlink Burst Profile 8"}, - {8, "Downlink Burst Profile 9"}, - {9, "Downlink Burst Profile 10"}, - {10, "Downlink Burst Profile 11"}, - {11, "Downlink Burst Profile 12"}, - {12, "Downlink Burst Profile 13"}, - {13, "Reserved"}, - {14, "Gap"}, - {15, "End of DL-MAP"}, - {0, NULL} + { 0, "Downlink Burst Profile 1"}, + { 1, "Downlink Burst Profile 2"}, + { 2, "Downlink Burst Profile 3"}, + { 3, "Downlink Burst Profile 4"}, + { 4, "Downlink Burst Profile 5"}, + { 5, "Downlink Burst Profile 6"}, + { 6, "Downlink Burst Profile 7"}, + { 7, "Downlink Burst Profile 8"}, + { 8, "Downlink Burst Profile 9"}, + { 9, "Downlink Burst Profile 10"}, + {10, "Downlink Burst Profile 11"}, + {11, "Downlink Burst Profile 12"}, + {12, "Downlink Burst Profile 13"}, + {13, "Reserved"}, + {14, "Gap"}, + {15, "End of DL-MAP"}, + {0, NULL} }; static const value_string vals_dcd_type[] = @@ -248,15 +248,15 @@ static const value_string vals_dcd_size_of_cqich_id[] = static const value_string vals_dcd_mac_version[] = { - {1, "Conformance with IEEE Std 802.16-2001"}, - {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, - {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, - {4, "Conformance with IEEE Std 802.16-2004"}, - {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, - {6, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005 and IEEE Std 802.16f-2005"}, - {7, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005, IEEE Std 802.16f-2005 and IEEE Std 802.16g-2007"}, - {8, "Conformance with IEEE Std 802.16-2009"}, - {9, "Conformance with IEEE Std 802.16-2009 and IEEE Std 802.16j-2009"}, + { 1, "Conformance with IEEE Std 802.16-2001"}, + { 2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, + { 3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, + { 4, "Conformance with IEEE Std 802.16-2004"}, + { 5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, + { 6, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005 and IEEE Std 802.16f-2005"}, + { 7, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005, IEEE Std 802.16f-2005 and IEEE Std 802.16g-2007"}, + { 8, "Conformance with IEEE Std 802.16-2009"}, + { 9, "Conformance with IEEE Std 802.16-2009 and IEEE Std 802.16j-2009"}, {10, "Reserved"}, {0, NULL} }; @@ -264,16 +264,16 @@ static const value_string vals_dcd_mac_version[] = /* table 363 */ static const value_string vals_dcd_burst_fec_ofdma[] = { - {0, "QPSK (CC) 1/2"}, - {1, "QPSK (CC) 3/4"}, - {2, "16-QAM (CC) 1/2"}, - {3, "16-QAM (CC) 3/4"}, - {4, "64-QAM (CC) 1/2"}, - {5, "64-QAM (CC) 2/3"}, - {6, "64-QAM (CC) 3/4"}, - {7, "QPSK (BTC) 1/2"}, - {8, "QPSK (BTC) 3/4 or 2/3"}, - {9, "16-QAM (BTC) 3/5"}, + { 0, "QPSK (CC) 1/2"}, + { 1, "QPSK (CC) 3/4"}, + { 2, "16-QAM (CC) 1/2"}, + { 3, "16-QAM (CC) 3/4"}, + { 4, "64-QAM (CC) 1/2"}, + { 5, "64-QAM (CC) 2/3"}, + { 6, "64-QAM (CC) 3/4"}, + { 7, "QPSK (BTC) 1/2"}, + { 8, "QPSK (BTC) 3/4 or 2/3"}, + { 9, "16-QAM (BTC) 3/5"}, {10, "16-QAM (BTC) 4/5"}, {11, "64-QAM (BTC) 2/3 or 5/8"}, {12, "64-QAM (BTC) 5/6 or 4/5"}, @@ -1261,3 +1261,16 @@ void proto_reg_handoff_mac_mgmt_msg_dcd(void) dcd_handle = create_dissector_handle(dissect_mac_mgmt_msg_dcd_decoder, proto_mac_mgmt_msg_dcd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DCD, dcd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index 16a7fb0832..1610e262b3 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -131,50 +131,50 @@ static gint ett_305 = -1; /* static gint ett_305_dl = -1; */ static gint ett_308a = -1; -#define DCD_DOWNLINK_BURST_PROFILE 1 -#define DCD_BS_EIRP 2 -#define DCD_FRAME_DURATION 3 -#define DCD_PHY_TYPE 4 -#define DCD_POWER_ADJUSTMENT 5 -#define DCD_CHANNEL_NR 6 -#define DCD_TTG 7 -#define DCD_RTG 8 -#define DCD_RSS 9 -#define DCD_CHANNEL_SWITCH_FRAME_NR 10 -#define DCD_FREQUENCY 12 -#define DCD_BS_ID 13 -#define DCD_FRAME_DURATION_CODE 14 -#define DCD_FRAME_NR 15 -#define DCD_SIZE_CQICH_ID 16 -#define DCD_H_ARQ_ACK_DELAY 17 +#define DCD_DOWNLINK_BURST_PROFILE 1 +#define DCD_BS_EIRP 2 +#define DCD_FRAME_DURATION 3 +#define DCD_PHY_TYPE 4 +#define DCD_POWER_ADJUSTMENT 5 +#define DCD_CHANNEL_NR 6 +#define DCD_TTG 7 +#define DCD_RTG 8 +#define DCD_RSS 9 +#define DCD_CHANNEL_SWITCH_FRAME_NR 10 +#define DCD_FREQUENCY 12 +#define DCD_BS_ID 13 +#define DCD_FRAME_DURATION_CODE 14 +#define DCD_FRAME_NR 15 +#define DCD_SIZE_CQICH_ID 16 +#define DCD_H_ARQ_ACK_DELAY 17 #define DCD_MAC_VERSION 148 #define DCD_RESTART_COUNT 154 -#define DCD_BURST_FREQUENCY 1 +#define DCD_BURST_FREQUENCY 1 #define DCD_BURST_FEC_CODE_TYPE 150 #define DCD_BURST_DIUC_EXIT_THRESHOLD 151 #define DCD_BURST_DIUC_ENTRY_THRESHOLD 152 #define DCD_BURST_TCS_ENABLE 153 -#define DCD_TLV_T_541_TYPE_FUNCTION_ACTION 1 -#define DCD_TLV_T542_TRIGGER_VALUE 2 -#define DCD_TLV_T_543_TRIGGER_AVERAGING_DURATION 3 -#define DCD_TLV_T_19_PERMUTATION_TYPE_FOR_BROADCAST_REGION_IN_HARQ_ZONE 19 -#define DCD_TLV_T_20_MAXIMUM_RETRANSMISSION 20 -#define DCD_TLV_T_21_DEFAULT_RSSI_AND_CINR_AVERAGING_PARAMETER 21 -#define DCD_TLV_T_22_DL_AMC_ALLOCATED_PHYSICAL_BANDS_BITMAP 22 -#define DCD_TLV_T_31_H_ADD_THRESHOLD 31 -#define DCD_TLV_T_32_H_DELETE_THRESHOLD 32 -#define DCD_TLV_T_33_ASR 33 -#define DCD_TLV_T_34_DL_REGION_DEFINITION 34 -#define DCD_TLV_T_35_PAGING_GROUP_ID 35 -#define DCD_TLV_T_36_TUSC1_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 36 -#define DCD_TLV_T_37_TUSC2_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 37 -#define DCD_TLV_T_45_PAGING_INTERVAL_LENGTH 45 -#define DCD_TLV_T_50_HO_TYPE_SUPPORT 50 -#define DCD_TLV_T_51_HYSTERSIS_MARGIN 51 -#define DCD_TLV_T_52_TIME_TO_TRIGGER_DURATION 52 -#define DCD_TLV_T_54_TRIGGER 54 +#define DCD_TLV_T_541_TYPE_FUNCTION_ACTION 1 +#define DCD_TLV_T542_TRIGGER_VALUE 2 +#define DCD_TLV_T_543_TRIGGER_AVERAGING_DURATION 3 +#define DCD_TLV_T_19_PERMUTATION_TYPE_FOR_BROADCAST_REGION_IN_HARQ_ZONE 19 +#define DCD_TLV_T_20_MAXIMUM_RETRANSMISSION 20 +#define DCD_TLV_T_21_DEFAULT_RSSI_AND_CINR_AVERAGING_PARAMETER 21 +#define DCD_TLV_T_22_DL_AMC_ALLOCATED_PHYSICAL_BANDS_BITMAP 22 +#define DCD_TLV_T_31_H_ADD_THRESHOLD 31 +#define DCD_TLV_T_32_H_DELETE_THRESHOLD 32 +#define DCD_TLV_T_33_ASR 33 +#define DCD_TLV_T_34_DL_REGION_DEFINITION 34 +#define DCD_TLV_T_35_PAGING_GROUP_ID 35 +#define DCD_TLV_T_36_TUSC1_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 36 +#define DCD_TLV_T_37_TUSC2_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 37 +#define DCD_TLV_T_45_PAGING_INTERVAL_LENGTH 45 +#define DCD_TLV_T_50_HO_TYPE_SUPPORT 50 +#define DCD_TLV_T_51_HYSTERSIS_MARGIN 51 +#define DCD_TLV_T_52_TIME_TO_TRIGGER_DURATION 52 +#define DCD_TLV_T_54_TRIGGER 54 #define DCD_TLV_T_153_DOWNLINK_BURST_PROFILE_FOR_MULTIPLE_FEC_TYPES 153 #define DL_MAP_NCT_PMP 0 @@ -2885,3 +2885,16 @@ void proto_reg_handoff_mac_mgmt_msg_dlmap(void) dlmap_handle = create_dissector_handle(dissect_mac_mgmt_msg_dlmap_decoder, proto_mac_mgmt_msg_dlmap_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DL_MAP, dlmap_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index 16e7956c41..d4b2f265bf 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -525,3 +525,16 @@ proto_reg_handoff_mac_mgmt_msg_dreg(void) dreg_handle = create_dissector_handle(dissect_mac_mgmt_msg_dreg_cmd_decoder, proto_mac_mgmt_msg_dreg_cmd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DREG_CMD, dreg_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index a92f983eea..4f7dc54272 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -179,3 +179,16 @@ proto_reg_handoff_mac_mgmt_msg_dsa (void) dsa_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsa_ack_decoder, proto_mac_mgmt_msg_dsa_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSA_ACK, dsa_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 5024ab88bf..45cb220507 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -274,3 +274,16 @@ proto_reg_handoff_mac_mgmt_msg_dsd(void) dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSD_RSP, dsd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/wimax/msg_dsx_rvd.c index 72543b5252..7f6ac7baaf 100644 --- a/plugins/wimax/msg_dsx_rvd.c +++ b/plugins/wimax/msg_dsx_rvd.c @@ -104,3 +104,16 @@ proto_reg_handoff_mac_mgmt_msg_dsx_rvd(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_dsx_rvd_decoder, proto_mac_mgmt_msg_dsx_rvd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSX_RVD, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c index 6db5de32a5..a47c15edb6 100644 --- a/plugins/wimax/msg_fpc.c +++ b/plugins/wimax/msg_fpc.c @@ -165,3 +165,16 @@ proto_reg_handoff_mac_mgmt_msg_fpc(void) fpc_handle = create_dissector_handle(dissect_mac_mgmt_msg_fpc_decoder, proto_mac_mgmt_msg_fpc_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_FPC, fpc_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_pkm.c b/plugins/wimax/msg_pkm.c index 8924fb5f4d..140fee2b01 100644 --- a/plugins/wimax/msg_pkm.c +++ b/plugins/wimax/msg_pkm.c @@ -47,13 +47,13 @@ static gint ett_mac_mgmt_msg_pkm_rsp_decoder = -1; static const value_string vals_pkm_msg_code[] = { - {3, "SA ADD"}, - {4, "Auth Request"}, - {5, "Auth Reply"}, - {6, "Auth Reject"}, - {7, "Key Request"}, - {8, "Key Reply"}, - {9, "Key Reject"}, + { 3, "SA ADD"}, + { 4, "Auth Request"}, + { 5, "Auth Reply"}, + { 6, "Auth Reject"}, + { 7, "Key Request"}, + { 8, "Key Reply"}, + { 9, "Key Reject"}, {10, "Auth Invalid"}, {11, "TEK Invalid"}, {12, "Auth Info"}, @@ -173,3 +173,16 @@ void proto_reg_handoff_mac_mgmt_msg_pkm(void) mac_mgmt_msg_pkm_rsp_handle = create_dissector_handle(dissect_mac_mgmt_msg_pkm_rsp_decoder, proto_mac_mgmt_msg_pkm_decoder); dissector_add_uint( "wmx.mgmtmsg", MAC_MGMT_MSG_PKM_RSP, mac_mgmt_msg_pkm_rsp_handle ); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 37d5fd25a3..824f4afc4d 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -48,9 +48,9 @@ static gint hf_prc_lt_ctrl_precoding_delay = -1; /* static gint hf_prc_lt_ctrl_invalid_tlv = -1; */ static const value_string vals_turn_on[] = { - {0, "Turn off"}, - {1, "Turn on"}, - {0, NULL} + {0, "Turn off"}, + {1, "Turn on"}, + {0, NULL} }; @@ -135,3 +135,16 @@ proto_reg_handoff_mac_mgmt_msg_prc_lt_ctrl(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_prc_lt_ctrl_decoder, proto_mac_mgmt_msg_prc_lt_ctrl_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_PRC_LT_CTRL, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index 079327f951..e2ac0667a2 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -62,14 +62,14 @@ static gint hf_reg_invalid_tlv = -1; static gint hf_reg_rsp_new_cid_after_ho = -1; static gint hf_reg_rsp_service_flow_id = -1; static gint hf_reg_rsp_system_resource_retain_time = -1; -static gint hf_reg_total_provisioned_sf = -1; +static gint hf_reg_total_provisioned_sf = -1; /* STRING RESOURCES */ static const value_string vals_reg_rsp_status [] = { - {0, "OK"}, - {1, "Message authentication failure"}, - {0, NULL} + {0, "OK"}, + {1, "Message authentication failure"}, + {0, NULL} }; @@ -366,3 +366,16 @@ void proto_reg_handoff_mac_mgmt_msg_reg_rsp(void) reg_rsp_handle = create_dissector_handle(dissect_mac_mgmt_msg_reg_rsp_decoder, proto_mac_mgmt_msg_reg_rsp_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_REG_RSP, reg_rsp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c index 780f68f973..98f3b6b58b 100644 --- a/plugins/wimax/msg_rep.c +++ b/plugins/wimax/msg_rep.c @@ -1559,3 +1559,16 @@ proto_reg_handoff_mac_mgmt_msg_rep(void) rep_handle = create_dissector_handle(dissect_mac_mgmt_msg_rep_rsp_decoder, proto_mac_mgmt_msg_rep_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_REP_RSP, rep_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c index 5bd49a1fd1..653ee96100 100644 --- a/plugins/wimax/msg_res_cmd.c +++ b/plugins/wimax/msg_res_cmd.c @@ -151,3 +151,16 @@ proto_reg_handoff_mac_mgmt_msg_res_cmd(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_res_cmd_decoder, proto_mac_mgmt_msg_res_cmd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_RES_CMD, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index eef0839fe3..a04c3e205e 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -113,8 +113,8 @@ static gint hf_rng_invalid_tlv = -1; /* STRING RESOURCES */ static const true_false_string tfs_rng_rsp_aas_broadcast = { - "SS shall not issue contention-based Bandwidth Request", - "SS may issue contention-based Bandwidth Request" + "SS shall not issue contention-based Bandwidth Request", + "SS may issue contention-based Bandwidth Request" }; static const true_false_string tfs_rng_rsp_resource_retain_flag = { @@ -123,11 +123,11 @@ static const true_false_string tfs_rng_rsp_resource_retain_flag = { }; static const value_string vals_rng_rsp_ranging_status[] = { - {1, "continue"}, - {2, "abort"}, - {3, "success"}, - {4, "rerange"}, - {0, NULL} + {1, "continue"}, + {2, "abort"}, + {3, "success"}, + {4, "rerange"}, + {0, NULL} }; static const value_string vals_rng_rsp_level_of_service[] = { @@ -963,3 +963,16 @@ void proto_reg_handoff_mac_mgmt_msg_rng_rsp(void) reg_rsp_handle = find_dissector("mac_mgmt_msg_reg_rsp_handler"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index 632ce64afd..b26f89793f 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -294,24 +294,24 @@ static gint hf_sbc_invalid_tlv = -1; static const true_false_string tfs_sbc_bw_alloc_support_duplex = { - "Full-Duplex", - "Half-Duplex" + "Full-Duplex", + "Half-Duplex" }; #if 0 static const value_string vals_sbc_mac_pdu_fsn[] = { - {0, "Only 11-bit FSN values are supported"}, - {1, "Only 3-bit FSN values are supported"}, - {0, NULL} + {0, "Only 11-bit FSN values are supported"}, + {1, "Only 3-bit FSN values are supported"}, + {0, NULL} }; #endif #if 0 static const true_false_string tfs_sbc_mac_pdu_fsn = { - "Only 3-bit FSN values are supported", - "Only 11-bit FSN values are supported" + "Only 3-bit FSN values are supported", + "Only 11-bit FSN values are supported" }; #endif @@ -319,248 +319,248 @@ static const true_false_string tfs_sbc_mac_pdu_fsn = /* DCD DIUC messages (table 143) */ static const value_string diuc_msgs[] = { - { 0, "Downlink Burst Profile 1" }, - { 1, "Downlink Burst Profile 2" }, - { 2, "Downlink Burst Profile 3" }, - { 3, "Downlink Burst Profile 4" }, - { 4, "Downlink Burst Profile 5" }, - { 5, "Downlink Burst Profile 6" }, - { 6, "Downlink Burst Profile 7" }, - { 7, "Downlink Burst Profile 8" }, - { 8, "Downlink Burst Profile 9" }, - { 9, "Downlink Burst Profile 10" }, - { 10, "Downlink Burst Profile 11" }, - { 11, "Downlink Burst Profile 12" }, - { 12, "Downlink Burst Profile 13" }, - { 13, "Reserved" }, - { 14, "Gap" }, - { 15, "End of DL-MAP" }, - {0, NULL} + { 0, "Downlink Burst Profile 1" }, + { 1, "Downlink Burst Profile 2" }, + { 2, "Downlink Burst Profile 3" }, + { 3, "Downlink Burst Profile 4" }, + { 4, "Downlink Burst Profile 5" }, + { 5, "Downlink Burst Profile 6" }, + { 6, "Downlink Burst Profile 7" }, + { 7, "Downlink Burst Profile 8" }, + { 8, "Downlink Burst Profile 9" }, + { 9, "Downlink Burst Profile 10" }, + { 10, "Downlink Burst Profile 11" }, + { 11, "Downlink Burst Profile 12" }, + { 12, "Downlink Burst Profile 13" }, + { 13, "Reserved" }, + { 14, "Gap" }, + { 15, "End of DL-MAP" }, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_type[] = { - {0, "CINR metric"}, - {1, "RSSI metric"}, - {2, "RTD metric"}, - {3, "Reserved"}, - {0, NULL} + {0, "CINR metric"}, + {1, "RSSI metric"}, + {2, "RTD metric"}, + {3, "Reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_function[] = { - {0, "Reserved"}, - {1, "Metric of neighbor BS is greater than absolute value"}, - {2, "Metric of neighbor BS is less than absolute value"}, - {3, "Metric of neighbor BS is greater than serving BS metric by relative value"}, - {4, "Metric of neighbor BS is less than serving BS metric by relative value"}, - {5, "Metric of serving BS greater than absolute value"}, - {6, "Metric of serving BS less than absolute value"}, - {7, "Reserved"}, - {0, NULL} + {0, "Reserved"}, + {1, "Metric of neighbor BS is greater than absolute value"}, + {2, "Metric of neighbor BS is less than absolute value"}, + {3, "Metric of neighbor BS is greater than serving BS metric by relative value"}, + {4, "Metric of neighbor BS is less than serving BS metric by relative value"}, + {5, "Metric of serving BS greater than absolute value"}, + {6, "Metric of serving BS less than absolute value"}, + {7, "Reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_action[] = { - {0, "Reserved"}, - {1, "Respond on trigger with MOB_SCN-REP after the end of each scanning interval"}, - {2, "Respond on trigger with MOB_MSH-REQ"}, - {3, "On trigger, MS starts neighbor BS scanning process by sending MOB_SCN-REQ"}, - {4, "Reserved"}, - {0, NULL} + {0, "Reserved"}, + {1, "Respond on trigger with MOB_SCN-REP after the end of each scanning interval"}, + {2, "Respond on trigger with MOB_MSH-REQ"}, + {3, "On trigger, MS starts neighbor BS scanning process by sending MOB_SCN-REQ"}, + {4, "Reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_power_adjustmnt[] = { - {0, "Preserve Peak Power"}, - {1, "Preserve Mean Power"}, - {0, NULL} + {0, "Preserve Peak Power"}, + {1, "Preserve Mean Power"}, + {0, NULL} }; #endif #if 0 static const true_false_string tfs_sbc_power_adjustment = { - "Preserve Mean Power", - "Preserve Peak Power" + "Preserve Mean Power", + "Preserve Peak Power" }; #endif #if 0 static const value_string vals_reg_rsp_status[] = { - {0, "OK"}, - {1, "Message authentication failure"}, - {0, NULL} + {0, "OK"}, + {1, "Message authentication failure"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_burst_tcs[] = { - {0, "TCS disabled"}, - {1, "TCS enabled"}, - {0, NULL} + {0, "TCS disabled"}, + {1, "TCS enabled"}, + {0, NULL} }; #endif #if 0 static const true_false_string tfs_sbc_burst_tcs = { - "TCS enabled", - "TCS disabled" + "TCS enabled", + "TCS disabled" }; #endif #if 0 static const value_string vals_sbc_frame_duration[] = { - {0, "2.5"}, - {1, "4"}, - {2, "5"}, - {3, "8"}, - {4, "10"}, - {5, "12.5"}, - {6, "20"}, - {0, NULL} + {0, "2.5"}, + {1, "4"}, + {2, "5"}, + {3, "8"}, + {4, "10"}, + {5, "12.5"}, + {6, "20"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_mac_version[] = { - {1, "Conformance with IEEE Std 802.16-2001"}, - {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, - {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, - {4, "Conformance with IEEE Std 802.16-2004"}, - {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, - {6, "reserved"}, - {0, NULL} + {1, "Conformance with IEEE Std 802.16-2001"}, + {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, + {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, + {4, "Conformance with IEEE Std 802.16-2004"}, + {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, + {6, "reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_burst_fec[] = { - {0, "QPSK (CC) 1/2"}, - {1, "QPSK (CC) 3/4"}, - {2, "16-QAM (CC) 1/2"}, - {3, "16-QAM (CC) 3/4"}, - {4, "64-QAM (CC) 1/2"}, - {5, "64-QAM (CC) 2/3"}, - {6, "64-QAM (CC) 3/4"}, - {7, "QPSK (BTC) 1/2"}, - {8, "QPSK (BTC) 3/4 or 2/3"}, - {9, "16-QAM (BTC) 3/5"}, - {10, "16-QAM (BTC) 4/5"}, - {11, "64-QAM (BTC) 2/3 or 5/8"}, - {12, "64-QAM (BTC) 5/6 or 4/5"}, - {13, "QPSK (CTC) 1/2"}, - {14, "Reserved"}, - {15, "QPSK (CTC) 3/4"}, - {16, "16-QAM (CTC) 1/2"}, - {17, "16-QAM (CTC) 3/4"}, - {18, "64-QAM (CTC) 1/2"}, - {19, "64-QAM (CTC) 2/3"}, - {20, "64-QAM (CTC) 3/4"}, - {21, "64-QAM (CTC) 5/6"}, - {22, "QPSK (ZT CC) 1/2"}, - {23, "QPSK (ZT CC) 3/4"}, - {24, "16-QAM (ZT CC) 1/2"}, - {25, "16-QAM (ZT CC) 3/4"}, - {26, "64-QAM (ZT CC) 1/2"}, - {27, "64-QAM (ZT CC) 2/3"}, - {28, "64-QAM (ZT CC) 3/4"}, - {29, "QPSK (LDPC) 1/2"}, - {30, "QPSK (LDPC) 2/3 A code"}, - {31, "16-QAM (LDPC) 3/4 A code"}, - {32, "16-QAM (LDPC) 1/2"}, - {33, "16-QAM (LDPC) 2/3 A code"}, - {34, "16-QAM (LDPC) 3/4 A code"}, - {35, "64-QAM (LDPC) 1/2"}, - {36, "64-QAM (LDPC) 2/3 A code"}, - {37, "64-QAM (LDPC) 3/4 A code"}, - {38, "QPSK (LDPC) 2/3 B code"}, - {39, "QPSK (LDPC) 3/4 B code"}, - {40, "16-QAM (LDPC) 2/3 B code"}, - {41, "16-QAM (LDPC) 3/4 B code"}, - {42, "64-QAM (LDPC) 2/3 B code"}, - {43, "64-QAM (LDPC) 3/4 B code"}, - {44, "QPSK (CC with optional interleaver) 1/2"}, - {45, "QPSK (CC with optional interleaver) 3/4"}, - {46, "16-QAM (CC with optional interleaver) 1/2"}, - {47, "16-QAM (CC optional interleaver) 0%00"}, - {48, "64-QAM (CC with optional interleaver) 2/3"}, - {49, "64-QAM (CC with optional interleaver) 3/4"}, - {50, "QPSK (LDPC) 5/6"}, - {51, "16-QAM (LDPC) 5/6"}, - {52, "64-QAM (LDPC) 5/6"}, - {0, NULL} + { 0, "QPSK (CC) 1/2"}, + { 1, "QPSK (CC) 3/4"}, + { 2, "16-QAM (CC) 1/2"}, + { 3, "16-QAM (CC) 3/4"}, + { 4, "64-QAM (CC) 1/2"}, + { 5, "64-QAM (CC) 2/3"}, + { 6, "64-QAM (CC) 3/4"}, + { 7, "QPSK (BTC) 1/2"}, + { 8, "QPSK (BTC) 3/4 or 2/3"}, + { 9, "16-QAM (BTC) 3/5"}, + {10, "16-QAM (BTC) 4/5"}, + {11, "64-QAM (BTC) 2/3 or 5/8"}, + {12, "64-QAM (BTC) 5/6 or 4/5"}, + {13, "QPSK (CTC) 1/2"}, + {14, "Reserved"}, + {15, "QPSK (CTC) 3/4"}, + {16, "16-QAM (CTC) 1/2"}, + {17, "16-QAM (CTC) 3/4"}, + {18, "64-QAM (CTC) 1/2"}, + {19, "64-QAM (CTC) 2/3"}, + {20, "64-QAM (CTC) 3/4"}, + {21, "64-QAM (CTC) 5/6"}, + {22, "QPSK (ZT CC) 1/2"}, + {23, "QPSK (ZT CC) 3/4"}, + {24, "16-QAM (ZT CC) 1/2"}, + {25, "16-QAM (ZT CC) 3/4"}, + {26, "64-QAM (ZT CC) 1/2"}, + {27, "64-QAM (ZT CC) 2/3"}, + {28, "64-QAM (ZT CC) 3/4"}, + {29, "QPSK (LDPC) 1/2"}, + {30, "QPSK (LDPC) 2/3 A code"}, + {31, "16-QAM (LDPC) 3/4 A code"}, + {32, "16-QAM (LDPC) 1/2"}, + {33, "16-QAM (LDPC) 2/3 A code"}, + {34, "16-QAM (LDPC) 3/4 A code"}, + {35, "64-QAM (LDPC) 1/2"}, + {36, "64-QAM (LDPC) 2/3 A code"}, + {37, "64-QAM (LDPC) 3/4 A code"}, + {38, "QPSK (LDPC) 2/3 B code"}, + {39, "QPSK (LDPC) 3/4 B code"}, + {40, "16-QAM (LDPC) 2/3 B code"}, + {41, "16-QAM (LDPC) 3/4 B code"}, + {42, "64-QAM (LDPC) 2/3 B code"}, + {43, "64-QAM (LDPC) 3/4 B code"}, + {44, "QPSK (CC with optional interleaver) 1/2"}, + {45, "QPSK (CC with optional interleaver) 3/4"}, + {46, "16-QAM (CC with optional interleaver) 1/2"}, + {47, "16-QAM (CC optional interleaver) 0%00"}, + {48, "64-QAM (CC with optional interleaver) 2/3"}, + {49, "64-QAM (CC with optional interleaver) 3/4"}, + {50, "QPSK (LDPC) 5/6"}, + {51, "16-QAM (LDPC) 5/6"}, + {52, "64-QAM (LDPC) 5/6"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_permutation_type[] = { - {0, "PUSC" }, - {1, "FUSC" }, - {2, "optional FUSC"}, - {3, "AMC"}, - {0, NULL} + {0, "PUSC" }, + {1, "FUSC" }, + {2, "optional FUSC"}, + {3, "AMC"}, + {0, NULL} }; #endif static const value_string vals_sbc_harq_parameters_set[] = { - {0, "HARQ set 1"}, - {1, "HARQ set 2"}, - {2, "HARQ set 3"}, - {3, "HARQ set 4"}, - {4, "HARQ set 5"}, - {5, "Reserved"}, - {0, NULL} + {0, "HARQ set 1"}, + {1, "HARQ set 2"}, + {2, "HARQ set 3"}, + {3, "HARQ set 4"}, + {4, "HARQ set 5"}, + {5, "Reserved"}, + {0, NULL} }; static const true_false_string tfs_supported = { - "supported", - "not supported" + "supported", + "not supported" }; static const true_false_string tfs_yes_no_sbc = { - "yes", - "no" + "yes", + "no" }; static const value_string vals_sounding_rsp_time_cap_codings[] = { - {0, "0.5ms" }, - {1, "0.75ms" }, - {2, "1ms"}, - {3, "1.25ms"}, - {4, "1.5ms"}, - {5, "min(2, Next Frame)"}, - {6, "min(5, Next Frame)"}, - {7, "Next Frame"}, - {0, NULL} + {0, "0.5ms" }, + {1, "0.75ms" }, + {2, "1ms"}, + {3, "1.25ms"}, + {4, "1.5ms"}, + {5, "min(2, Next Frame)"}, + {6, "min(5, Next Frame)"}, + {7, "Next Frame"}, + {0, NULL} }; static const value_string vals_sbc_sdma_str[ ] = { - {0, "no support"}, - {1, "support SDMA pilot patterns #A and #B"}, - {2, "support all SDMA pilot patterns"}, - {3, "reserved"}, - {0, NULL} + {0, "no support"}, + {1, "support SDMA pilot patterns #A and #B"}, + {2, "support all SDMA pilot patterns"}, + {3, "reserved"}, + {0, NULL} }; @@ -2791,3 +2791,16 @@ proto_reg_handoff_mac_mgmt_msg_sbc(void) dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_SBC_RSP, sbc_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index 38c7b903e3..1d4d7ccfa8 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -135,16 +135,16 @@ static const value_string vals_dcd_burst_tcs[] = static const value_string vals_dcd_burst_fec[] = { - {0, "QPSK (CC) 1/2"}, - {1, "QPSK (CC) 3/4"}, - {2, "16-QAM (CC) 1/2"}, - {3, "16-QAM (CC) 3/4"}, - {4, "64-QAM (CC) 1/2"}, - {5, "64-QAM (CC) 2/3"}, - {6, "64-QAM (CC) 3/4"}, - {7, "QPSK (BTC) 1/2"}, - {8, "QPSK (BTC) 3/4 or 2/3"}, - {9, "16-QAM (BTC) 3/5"}, + { 0, "QPSK (CC) 1/2"}, + { 1, "QPSK (CC) 3/4"}, + { 2, "16-QAM (CC) 1/2"}, + { 3, "16-QAM (CC) 3/4"}, + { 4, "64-QAM (CC) 1/2"}, + { 5, "64-QAM (CC) 2/3"}, + { 6, "64-QAM (CC) 3/4"}, + { 7, "QPSK (BTC) 1/2"}, + { 8, "QPSK (BTC) 3/4 or 2/3"}, + { 9, "16-QAM (BTC) 3/5"}, {10, "16-QAM (BTC) 4/5"}, {11, "64-QAM (BTC) 2/3 or 5/8"}, {12, "64-QAM (BTC) 5/6 or 4/5"}, @@ -1221,3 +1221,16 @@ void proto_reg_handoff_mac_mgmt_msg_ucd(void) ucd_handle = create_dissector_handle(dissect_mac_mgmt_msg_ucd_decoder, proto_mac_mgmt_msg_ucd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_UCD, ucd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c index f6a6beb4ad..f99dddb88f 100644 --- a/plugins/wimax/wimax_cdma_code_decoder.c +++ b/plugins/wimax/wimax_cdma_code_decoder.c @@ -95,7 +95,7 @@ void proto_register_wimax_cdma(void) } }; - /* Setup protocol subtree array */ + /* Setup protocol subtree array */ static gint *ett[] = { &ett_wimax_cdma_code_decoder, @@ -114,3 +114,16 @@ void proto_register_wimax_cdma(void) register_dissector("wimax_cdma_code_burst_handler", dissect_wimax_cdma_code_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c index 625fe8110f..c248fd58f4 100644 --- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c @@ -80,72 +80,72 @@ static gint ett_wimax_extension_type_ie_decoder = -1; /* New Format Indications */ static const true_false_string tfs_indication = { - "New format", - "No new format" + "New format", + "No new format" }; /* Prefixes */ static const true_false_string tfs_prefix = { - "Enable HARQ", - "Temporary Disable HARQ" + "Enable HARQ", + "Temporary Disable HARQ" }; /* CQICH Indicator */ static const true_false_string tfs_cqich_ind = { - "With CQICH Control IE", - "No CQICH Control IE" + "With CQICH Control IE", + "No CQICH Control IE" }; /* CID types */ static const value_string vals_cid_types[] = { - { 0, "Normal CID" }, - { 1, "RCID11 (default)" }, - { 2, "RCID7" }, - { 3, "RCID3" }, - { 0, NULL } + { 0, "Normal CID" }, + { 1, "RCID11 (default)" }, + { 2, "RCID7" }, + { 3, "RCID3" }, + { 0, NULL } }; /* Subchannel Types */ static const value_string vals_subchannel_types[] = { - { 0, "Default Type" }, - { 1, "1 bin x 6 symbols Type" }, - { 2, "2 bin x 3 symbols Type" }, - { 3, "3 bin x 2 symbols Type" }, - { 0, NULL } + { 0, "Default Type" }, + { 1, "1 bin x 6 symbols Type" }, + { 2, "2 bin x 3 symbols Type" }, + { 3, "3 bin x 2 symbols Type" }, + { 0, NULL } }; /* Max Logical Bands */ static const value_string vals_max_logical_bands[] = { - { 0, "3 Bands" }, - { 1, "6 Bands" }, - { 2, "12 Bands (default)" }, - { 3, "24 Bands" }, - { 0, NULL } + { 0, "3 Bands" }, + { 1, "6 Bands" }, + { 2, "12 Bands (default)" }, + { 3, "24 Bands" }, + { 0, NULL } }; /* Repetition Coding Indications */ static const value_string rep_msgs[] = { - { 0, "No Repetition Coding" }, - { 1, "Repetition Coding of 2 Used" }, - { 2, "Repetition Coding of 4 Used" }, - { 3, "Repetition Coding of 6 Used" }, - { 0, NULL } + { 0, "No Repetition Coding" }, + { 1, "Repetition Coding of 2 Used" }, + { 2, "Repetition Coding of 4 Used" }, + { 3, "Repetition Coding of 6 Used" }, + { 0, NULL } }; /* Repetition Coding Indications */ static const value_string vals_allocation_modes[] = { - { 0, "Same Number Of Subchannels For The Selected Bands" }, - { 1, "Different Same Number Of Subchannels For The Selected Bands" }, - { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, - { 3, "Reserved" }, - { 0, NULL } + { 0, "Same Number Of Subchannels For The Selected Bands" }, + { 1, "Different Same Number Of Subchannels For The Selected Bands" }, + { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, + { 3, "Reserved" }, + { 0, NULL } }; /* Masks */ @@ -969,7 +969,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf #define MAX_LOGICAL_BANDS_SHIFT 21 #define NUM_BROADCAST_SYMBOLS_SHIFT 16 #define NUM_DL_AMC_SYMBOLS_SHIFT 10 -#define NUM_UL_AMC_SYMBOLS_SHIFT 4 +#define NUM_UL_AMC_SYMBOLS_SHIFT 4 #define CID_TYPE_SHIFT_1 (CID_TYPE_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT) #define SAFETY_PATTERN_SHIFT_1 (SAFETY_PATTERN_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT) #define BAND_AMC_SUBCHANNEL_TYPE_SHIFT_1 (BAND_AMC_SUBCHANNEL_TYPE_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT) @@ -2112,3 +2112,16 @@ void proto_register_wimax_compact_dlmap_ie(void) proto_register_field_array(proto_wimax_compact_dlmap_ie_decoder, hf_extension_type, array_length(hf_extension_type)); proto_register_field_array(proto_wimax_compact_dlmap_ie_decoder, hf_extended_diuc, array_length(hf_extended_diuc)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c index 22c987a65b..bef32f457a 100644 --- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c @@ -74,52 +74,52 @@ static gint ett_wimax_extension_type_ie_decoder = -1; /* Prefixes */ static const true_false_string tfs_prefix = { - "Enable HARQ", - "Temporary Disable HARQ" + "Enable HARQ", + "Temporary Disable HARQ" }; /* Region Changes */ static const true_false_string tfs_region_change = { - "Region Changed", - "No Region Change" + "Region Changed", + "No Region Change" }; /* Region Changes */ static const true_false_string tfs_yes_no_ie = { - "Yes", - "No" + "Yes", + "No" }; /* Repetition Coding Indications */ static const value_string vals_repetitions[] = { - { 0, "No Repetition Coding" }, - { 1, "Repetition Coding of 2 Used" }, - { 2, "Repetition Coding of 4 Used" }, - { 3, "Repetition Coding of 6 Used" }, - { 0, NULL } + { 0, "No Repetition Coding" }, + { 1, "Repetition Coding of 2 Used" }, + { 2, "Repetition Coding of 4 Used" }, + { 3, "Repetition Coding of 6 Used" }, + { 0, NULL } }; /* Allocation Modes */ static const value_string vals_allocation_modes[] = { - { 0, "Same Number Of Subchannels For The Selected Bands" }, - { 1, "Different Same Number Of Subchannels For The Selected Bands" }, - { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, - { 3, "Reserved" }, - { 0, NULL } + { 0, "Same Number Of Subchannels For The Selected Bands" }, + { 1, "Different Same Number Of Subchannels For The Selected Bands" }, + { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, + { 3, "Reserved" }, + { 0, NULL } }; /* CTypes */ static const value_string vals_ctypes[] = { - { 0, "2 Mini-subchannels (defines M=2)" }, - { 1, "2 Mini-subchannels (defines M=2)" }, - { 2, "3 Mini-subchannels (defines M=3)" }, - { 3, "6 Mini-subchannels (defines M=6)" }, - { 0, NULL } + { 0, "2 Mini-subchannels (defines M=2)" }, + { 1, "2 Mini-subchannels (defines M=2)" }, + { 2, "3 Mini-subchannels (defines M=3)" }, + { 3, "6 Mini-subchannels (defines M=6)" }, + { 0, NULL } }; /* Masks */ @@ -2125,3 +2125,16 @@ void proto_register_wimax_compact_ulmap_ie(void) proto_register_field_array(proto_wimax_compact_ulmap_ie_decoder, hf_cdma_allocation, array_length(hf_cdma_allocation)); proto_register_field_array(proto_wimax_compact_ulmap_ie_decoder, hf_extended_uiuc, array_length(hf_extended_uiuc)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c index 5cc8fd5d1c..0617272964 100644 --- a/plugins/wimax/wimax_fch_decoder.c +++ b/plugins/wimax/wimax_fch_decoder.c @@ -243,3 +243,16 @@ void proto_register_wimax_fch(void) register_dissector("wimax_fch_burst_handler", dissect_wimax_fch_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c index 8b50926c47..da5c328d04 100644 --- a/plugins/wimax/wimax_ffb_decoder.c +++ b/plugins/wimax/wimax_ffb_decoder.c @@ -127,3 +127,16 @@ void proto_register_wimax_ffb(void) register_dissector("wimax_ffb_burst_handler", dissect_wimax_ffb_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c index f9ff3d2f63..11723ebcee 100644 --- a/plugins/wimax/wimax_hack_decoder.c +++ b/plugins/wimax/wimax_hack_decoder.c @@ -40,16 +40,16 @@ static gint ett_wimax_hack_decoder = -1; static const value_string vals_flags[] = { - {0, "Even Half-Slot (tiles 0,2,4)"}, - {1, "Odd Half-Slot (tiles 1,3,5)"}, - {0, NULL} + {0, "Even Half-Slot (tiles 0,2,4)"}, + {1, "Odd Half-Slot (tiles 1,3,5)"}, + {0, NULL} }; static const value_string vals_values[] = { - {0, "ACK"}, - {1, "NACK"}, - {0, NULL} + {0, "ACK"}, + {1, "NACK"}, + {0, NULL} }; /* static gint hf_hack_burst = -1; */ @@ -139,3 +139,16 @@ void proto_register_wimax_hack(void) proto_register_subtree_array(ett, array_length(ett)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c index 8c0dd4b8b3..e28b243fee 100644 --- a/plugins/wimax/wimax_harq_map_decoder.c +++ b/plugins/wimax/wimax_harq_map_decoder.c @@ -210,3 +210,16 @@ void proto_register_wimax_harq_map(void) register_dissector("wimax_harq_map_handler", dissector_wimax_harq_map_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c index 9e5946de3a..7c0f7afe03 100644 --- a/plugins/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/wimax/wimax_phy_attributes_decoder.c @@ -40,8 +40,8 @@ static gint ett_wimax_phy_attributes_decoder = -1; static const value_string vals_subchannel_types[] = { - {0, "DL PUSC"}, - {1, "DL FUSC"}, + { 0, "DL PUSC"}, + { 1, "DL FUSC"}, {16, "UL PUSC"}, {0, NULL} }; @@ -176,3 +176,16 @@ void proto_register_wimax_phy_attributes(void) proto_register_field_array(proto_wimax_phy_attributes_decoder, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_tlv.c b/plugins/wimax/wimax_tlv.c index 6041d34052..8c66b868bc 100644 --- a/plugins/wimax/wimax_tlv.c +++ b/plugins/wimax/wimax_tlv.c @@ -182,3 +182,16 @@ gint get_tlv_length_type(tlv_info_t *info) return (gint)info->length_type; return -1; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index 51f0ab15d5..20e0a36870 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -187,16 +187,16 @@ static const value_string vals_harq[] = static const value_string vals_cs_specification[] = { - {0, "Reserved"}, - {1, "Packet, IPv4"}, - {2, "Packet, IPv6"}, - {3, "Packet, IEEE 802.3/Ethernet"}, - {4, "Packet, IEEE 802.1Q VLAN"}, - {5, "Packet, IPv4 over IEEE 802.3/Ethernet"}, - {6, "Packet, IPv6 over IEEE 802.3/Ethernet"}, - {7, "Packet, IPv4 over IEEE 802.1Q VLAN"}, - {8, "Packet, IPv6 over IEEE 802.1Q VLAN"}, - {9, "ATM"}, + { 0, "Reserved"}, + { 1, "Packet, IPv4"}, + { 2, "Packet, IPv6"}, + { 3, "Packet, IEEE 802.3/Ethernet"}, + { 4, "Packet, IEEE 802.1Q VLAN"}, + { 5, "Packet, IPv4 over IEEE 802.3/Ethernet"}, + { 6, "Packet, IPv6 over IEEE 802.3/Ethernet"}, + { 7, "Packet, IPv4 over IEEE 802.1Q VLAN"}, + { 8, "Packet, IPv6 over IEEE 802.1Q VLAN"}, + { 9, "ATM"}, {10, "Packet, IEEE 802.3/Ethernet with ROCH header compression"}, {11, "Packet, IEEE 802.3/Ethernet with ECRTP header compression"}, {12, "Packet, IP2 with ROCH header compression"}, @@ -262,16 +262,16 @@ static const value_string vals_atm_switching_encodings[] = static const value_string vals_cc[] = { - {0, "OK/success"}, - {1, "Reject-other"}, - {2, "Reject-unrecognized-configuration-setting"}, - {3, "Reject-temporary / reject-resource"}, - {4, "Reject-permanent / reject-admin"}, - {5, "Reject-not-owner"}, - {6, "Reject-service-flow-not-found"}, - {7, "Reject-service-flow-exists"}, - {8, "Reject-required-parameter-not-present"}, - {9, "Reject-header-suppression"}, + { 0, "OK/success"}, + { 1, "Reject-other"}, + { 2, "Reject-unrecognized-configuration-setting"}, + { 3, "Reject-temporary / reject-resource"}, + { 4, "Reject-permanent / reject-admin"}, + { 5, "Reject-not-owner"}, + { 6, "Reject-service-flow-not-found"}, + { 7, "Reject-service-flow-exists"}, + { 8, "Reject-required-parameter-not-present"}, + { 9, "Reject-header-suppression"}, {10, "Reject-unknown-transaction-id"}, {11, "Reject-authentication-failure"}, {12, "Reject-add-aborted"}, @@ -292,8 +292,8 @@ static const value_string vals_classification_action_rule[] = static const true_false_string tfs_supported = { - "supported", - "not supported" + "supported", + "not supported" }; #if 0 @@ -392,13 +392,13 @@ static const value_string vals_tek_encryption_ids[] = static const value_string vals_dcd_mac_version[] = { - {1, "Conformance with IEEE Std 802.16-2001"}, - {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, - {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, - {4, "Conformance with IEEE Std 802.16-2004"}, - {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, - {6, "reserved"}, - {0, NULL} + {1, "Conformance with IEEE Std 802.16-2001"}, + {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, + {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, + {4, "Conformance with IEEE Std 802.16-2004"}, + {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, + {6, "reserved"}, + {0, NULL} }; /* fix fields */ @@ -2424,7 +2424,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; } /* end of switch */ offset += tlv_len; - } /* end of while loop */ + } /* end of while loop */ } /**************************************************************/ @@ -3381,3 +3381,16 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto } /* end of while loop */ return offset; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index dc48a905d3..12f7aa5c56 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -3515,3 +3515,16 @@ proto_reg_handoff_wimaxasncp(void) dissector_add_uint("udp.port", currentPort, wimaxasncp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/wimaxmacphy/packet-wimaxmacphy.c index e5225be735..a669a9a490 100644 --- a/plugins/wimaxmacphy/packet-wimaxmacphy.c +++ b/plugins/wimaxmacphy/packet-wimaxmacphy.c @@ -5481,3 +5481,16 @@ proto_reg_handoff_wimaxmacphy(void) dissector_add_uint("udp.port", wimaxmacphy_udp_port, wimaxmacphy_handle); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |