aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2011-07-29 10:28:29 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2011-07-29 10:28:29 +0000
commit4cab49016c2a1fbef2ff80e24b5e731fd83106e9 (patch)
treebb53b93f19c48464793d9be2c1c98a1ec6290b1b /plugins
parentc1d3407117626057a1b9aacc4e5e74239e8c7acb (diff)
Get rid of non-ASCII characters.
Clean up white space. Clean up capitalization a bit. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38253 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
-rw-r--r--plugins/profinet/packet-dcerpc-pn-io.c3755
1 files changed, 1877 insertions, 1878 deletions
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 38bcfdf34e..075effea03 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -654,136 +654,136 @@ static guint16 ver_pn_io_parameterserver = 1;
static heur_dissector_list_t heur_pn_subdissector_list;
static const value_string pn_io_block_type[] = {
- { 0x0000, "Reserved" },
- { 0x0001, "Alarm Notification High"},
- { 0x0002, "Alarm Notification Low"},
- { 0x0008, "IODWriteReqHeader"},
- { 0x8008, "IODWriteResHeader"},
- { 0x0009, "IODReadReqHeader"},
- { 0x8009, "IODReadResHeader"},
- { 0x0010, "DiagnosisData"},
- { 0x0011, "Reserved"},
- { 0x0012, "ExpectedIdentificationData"},
- { 0x0013, "RealIdentificationData"},
- { 0x0014, "SubstituteValue"},
- { 0x0015, "RecordInputDataObjectElement"},
- { 0x0016, "RecordOutputDataObjectElement"},
- { 0x0017, "reserved"},
- { 0x0018, "ARData"},
- { 0x0019, "LogData"},
- { 0x001A, "APIData"},
- { 0x001b, "SRLData"},
- { 0x0020, "I&M0"},
- { 0x0021, "I&M1"},
- { 0x0022, "I&M2"},
- { 0x0023, "I&M3"},
- { 0x0024, "I&M4"},
- { 0x0025, "I&M5"},
- { 0x0026, "I&M6"},
- { 0x0027, "I&M7"},
- { 0x0028, "I&M8"},
- { 0x0029, "I&M9"},
- { 0x002A, "I&M10"},
- { 0x002B, "I&M11"},
- { 0x002C, "I&M12"},
- { 0x002D, "I&M13"},
- { 0x002E, "I&M14"},
- { 0x002F, "I&M15"},
- { 0x0030, "I&M0FilterDataSubmodul"},
- { 0x0031, "I&M0FilterDataModul"},
- { 0x0032, "I&M0FilterDataDevice"},
- { 0x8001, "Alarm Ack High"},
- { 0x8002, "Alarm Ack Low"},
- { 0x0101, "ARBlockReq"},
- { 0x8101, "ARBlockRes"},
- { 0x0102, "IOCRBlockReq"},
- { 0x8102, "IOCRBlockRes"},
- { 0x0103, "AlarmCRBlockReq"},
- { 0x8103, "AlarmCRBlockRes"},
- { 0x0104, "ExpectedSubmoduleBlockReq"},
- { 0x8104, "ModuleDiffBlock"},
- { 0x0105, "PrmServerBlockReq"},
- { 0x8105, "PrmServerBlockRes"},
- { 0x0106, "MCRBlockReq"},
+ { 0x0000, "Reserved" },
+ { 0x0001, "Alarm Notification High"},
+ { 0x0002, "Alarm Notification Low"},
+ { 0x0008, "IODWriteReqHeader"},
+ { 0x8008, "IODWriteResHeader"},
+ { 0x0009, "IODReadReqHeader"},
+ { 0x8009, "IODReadResHeader"},
+ { 0x0010, "DiagnosisData"},
+ { 0x0011, "Reserved"},
+ { 0x0012, "ExpectedIdentificationData"},
+ { 0x0013, "RealIdentificationData"},
+ { 0x0014, "SubstituteValue"},
+ { 0x0015, "RecordInputDataObjectElement"},
+ { 0x0016, "RecordOutputDataObjectElement"},
+ { 0x0017, "reserved"},
+ { 0x0018, "ARData"},
+ { 0x0019, "LogData"},
+ { 0x001A, "APIData"},
+ { 0x001b, "SRLData"},
+ { 0x0020, "I&M0"},
+ { 0x0021, "I&M1"},
+ { 0x0022, "I&M2"},
+ { 0x0023, "I&M3"},
+ { 0x0024, "I&M4"},
+ { 0x0025, "I&M5"},
+ { 0x0026, "I&M6"},
+ { 0x0027, "I&M7"},
+ { 0x0028, "I&M8"},
+ { 0x0029, "I&M9"},
+ { 0x002A, "I&M10"},
+ { 0x002B, "I&M11"},
+ { 0x002C, "I&M12"},
+ { 0x002D, "I&M13"},
+ { 0x002E, "I&M14"},
+ { 0x002F, "I&M15"},
+ { 0x0030, "I&M0FilterDataSubmodul"},
+ { 0x0031, "I&M0FilterDataModul"},
+ { 0x0032, "I&M0FilterDataDevice"},
+ { 0x8001, "Alarm Ack High"},
+ { 0x8002, "Alarm Ack Low"},
+ { 0x0101, "ARBlockReq"},
+ { 0x8101, "ARBlockRes"},
+ { 0x0102, "IOCRBlockReq"},
+ { 0x8102, "IOCRBlockRes"},
+ { 0x0103, "AlarmCRBlockReq"},
+ { 0x8103, "AlarmCRBlockRes"},
+ { 0x0104, "ExpectedSubmoduleBlockReq"},
+ { 0x8104, "ModuleDiffBlock"},
+ { 0x0105, "PrmServerBlockReq"},
+ { 0x8105, "PrmServerBlockRes"},
+ { 0x0106, "MCRBlockReq"},
{ 0x8106, "ARServerBlock"},
- { 0x0107, "SubFrameBlock"},
- { 0x0108, "ARVendorBlock"},
+ { 0x0107, "SubFrameBlock"},
+ { 0x0108, "ARVendorBlock"},
{ 0x0109, "IRInfoBlock"},
{ 0x010A, "SRInfoBlock"},
- { 0x010B, "ARFSUBlock"},
- { 0x0110, "IODBlockReq"},
- { 0x8110, "IODBlockRes"},
- { 0x0111, "IODBlockReq"},
- { 0x8111, "IODBlockRes"},
- { 0x0112, "IOXBlockReq"},
- { 0x8112, "IOXBlockRes"},
- { 0x0113, "IOXBlockReq"},
- { 0x8113, "IOXBlockRes"},
- { 0x0114, "ReleaseBlockReq"},
- { 0x8114, "ReleaseBlockRes"},
- { 0x0115, "ARRPCServerBlockReq"},
- { 0x8115, "ARRPCServerBlockRes"},
- { 0x0116, "IOXBlockReq"},
- { 0x8116, "IOXBlockRes"},
- { 0x0117, "IOXBlockReq"},
- { 0x8117, "IOXBlockRes"},
+ { 0x010B, "ARFSUBlock"},
+ { 0x0110, "IODBlockReq"},
+ { 0x8110, "IODBlockRes"},
+ { 0x0111, "IODBlockReq"},
+ { 0x8111, "IODBlockRes"},
+ { 0x0112, "IOXBlockReq"},
+ { 0x8112, "IOXBlockRes"},
+ { 0x0113, "IOXBlockReq"},
+ { 0x8113, "IOXBlockRes"},
+ { 0x0114, "ReleaseBlockReq"},
+ { 0x8114, "ReleaseBlockRes"},
+ { 0x0115, "ARRPCServerBlockReq"},
+ { 0x8115, "ARRPCServerBlockRes"},
+ { 0x0116, "IOXBlockReq"},
+ { 0x8116, "IOXBlockRes"},
+ { 0x0117, "IOXBlockReq"},
+ { 0x8117, "IOXBlockRes"},
{ 0x0118, "ControlBlockPrmBegin"},
{ 0x0119, "SubmoduleListBlock"},
- { 0x8118, "ControlBlockPrmBeginRes"},
-
- { 0x0200, "PDPortDataCheck"},
- { 0x0201, "PDevData"},
- { 0x0202, "PDPortDataAdjust"},
- { 0x0203, "PDSyncData"},
- { 0x0204, "IsochronousModeData"},
- { 0x0205, "PDIRData"},
- { 0x0206, "PDIRGlobalData"},
- { 0x0207, "PDIRFrameData"},
- { 0x0208, "PDIRBeginEndData"},
- { 0x0209, "AdjustDomainBoundary"},
- { 0x020A, "CheckPeers"},
- { 0x020B, "CheckLineDelay"},
- { 0x020C, "Checking MAUType"},
- { 0x020E, "Adjusting MAUType"},
- { 0x020F, "PDPortDataReal"},
- { 0x0210, "AdjustMulticastBoundary"},
- { 0x0211, "PDInterfaceMrpDataAdjust"},
- { 0x0212, "PDInterfaceMrpDataReal"},
- { 0x0213, "PDInterfaceMrpDataCheck"},
- { 0x0214, "PDPortMrpDataAdjust"},
- { 0x0215, "PDPortMrpDataReal"},
- { 0x0216, "Media redundancy manager parameters"},
- { 0x0217, "Media redundancy client parameters"},
- { 0x0218, "Media redundancy RT mode for manager"},
- { 0x0219, "Media redundancy ring state data"},
- { 0x021A, "Media redundancy RT ring state data"},
- { 0x021B, "Adjust LinkState"},
- { 0x021C, "Checking LinkState"},
- { 0x021D, "Media redundancy RT mode for clients"},
- { 0x021E, "CheckSyncDifference"},
- { 0x021F, "CheckMAUTypeDifference"},
- { 0x0220, "PDPortFODataReal"},
- { 0x0221, "Reading real fiber optic manufacturerspecific data"},
- { 0x0222, "PDPortFODataAdjust"},
- { 0x0223, "PDPortFODataCheck"},
- { 0x0224, "Adjust PeerToPeerBoundary"},
- { 0x0225, "Adjust DCPBoundary"},
+ { 0x8118, "ControlBlockPrmBeginRes"},
+
+ { 0x0200, "PDPortDataCheck"},
+ { 0x0201, "PDevData"},
+ { 0x0202, "PDPortDataAdjust"},
+ { 0x0203, "PDSyncData"},
+ { 0x0204, "IsochronousModeData"},
+ { 0x0205, "PDIRData"},
+ { 0x0206, "PDIRGlobalData"},
+ { 0x0207, "PDIRFrameData"},
+ { 0x0208, "PDIRBeginEndData"},
+ { 0x0209, "AdjustDomainBoundary"},
+ { 0x020A, "CheckPeers"},
+ { 0x020B, "CheckLineDelay"},
+ { 0x020C, "Checking MAUType"},
+ { 0x020E, "Adjusting MAUType"},
+ { 0x020F, "PDPortDataReal"},
+ { 0x0210, "AdjustMulticastBoundary"},
+ { 0x0211, "PDInterfaceMrpDataAdjust"},
+ { 0x0212, "PDInterfaceMrpDataReal"},
+ { 0x0213, "PDInterfaceMrpDataCheck"},
+ { 0x0214, "PDPortMrpDataAdjust"},
+ { 0x0215, "PDPortMrpDataReal"},
+ { 0x0216, "Media redundancy manager parameters"},
+ { 0x0217, "Media redundancy client parameters"},
+ { 0x0218, "Media redundancy RT mode for manager"},
+ { 0x0219, "Media redundancy ring state data"},
+ { 0x021A, "Media redundancy RT ring state data"},
+ { 0x021B, "Adjust LinkState"},
+ { 0x021C, "Checking LinkState"},
+ { 0x021D, "Media redundancy RT mode for clients"},
+ { 0x021E, "CheckSyncDifference"},
+ { 0x021F, "CheckMAUTypeDifference"},
+ { 0x0220, "PDPortFODataReal"},
+ { 0x0221, "Reading real fiber optic manufacturerspecific data"},
+ { 0x0222, "PDPortFODataAdjust"},
+ { 0x0223, "PDPortFODataCheck"},
+ { 0x0224, "Adjust PeerToPeerBoundary"},
+ { 0x0225, "Adjust DCPBoundary"},
{ 0x0226, "Adjust PreambleLength"},
- { 0x0227, "Adjust FastForwardingBoundary"},
+ { 0x0227, "Adjust FastForwardingBoundary"},
{ 0x022A, "PDIRSubframeData"},
{ 0x022B, "SubframeBlock"},
- { 0x0230, "PDNCDataCheck"},
- { 0x0240, "PDInterfaceDataReal"},
+ { 0x0230, "PDNCDataCheck"},
+ { 0x0240, "PDInterfaceDataReal"},
{ 0x0251, "PDPortStatistic"},
- { 0x0400, "MultipleBlockHeader"},
- { 0x0500, "RecordDataReadQuery"},
- { 0x0600, "FSHello"},
- { 0x0601, "FSParameterBlock"},
- { 0x0608, "PDInterfaceFSUDataAdjust"},
- { 0x0609, "ARFSUDataAdjust"},
- { 0x0700, "AutoConfiguration"},
- { 0x0701, "AutoConfiguration Communication"},
- { 0x0702, "AutoConfiguration Configuration"},
+ { 0x0400, "MultipleBlockHeader"},
+ { 0x0500, "RecordDataReadQuery"},
+ { 0x0600, "FSHello"},
+ { 0x0601, "FSParameterBlock"},
+ { 0x0608, "PDInterfaceFSUDataAdjust"},
+ { 0x0609, "ARFSUDataAdjust"},
+ { 0x0700, "AutoConfiguration"},
+ { 0x0701, "AutoConfiguration Communication"},
+ { 0x0702, "AutoConfiguration Configuration"},
{ 0xB050, "Ext-PLL Control / RTC+RTA SyncID 0 (EDD)" },
{ 0xB051, "Ext-PLL Control / RTA SyncID 1 (GSY)" },
@@ -792,37 +792,37 @@ static const value_string pn_io_block_type[] = {
{ 0xB070, "OHA Info (OHA)" },
- { 0x0F00, "MaintenanceItem"},
- { 0x0F01, "Upload selected Records within Upload&RetrievalItem"},
- { 0x0F02, "iParameterItem"},
- { 0x0F03, "Retrieve selected Records within Upload&RetrievalItem"},
- { 0x0F04, "Retrieve all Records within Upload&RetrievalItem"},
- { 0, NULL }
+ { 0x0F00, "MaintenanceItem"},
+ { 0x0F01, "Upload selected Records within Upload&RetrievalItem"},
+ { 0x0F02, "iParameterItem"},
+ { 0x0F03, "Retrieve selected Records within Upload&RetrievalItem"},
+ { 0x0F04, "Retrieve all Records within Upload&RetrievalItem"},
+ { 0, NULL }
};
static const value_string pn_io_alarm_type[] = {
- { 0x0000, "Reserved" },
- { 0x0001, "Diagnosis" },
- { 0x0002, "Process" },
- { 0x0003, "Pull" },
- { 0x0004, "Plug" },
- { 0x0005, "Status" },
- { 0x0006, "Update" },
- { 0x0007, "Redundancy" },
- { 0x0008, "Controlled by supervisor" },
- { 0x0009, "Released" },
- { 0x000A, "Plug wrong submodule" },
- { 0x000B, "Return of submodule" },
- { 0x000C, "Diagnosis disappears" },
- { 0x000D, "Multicast communication mismatch notification" },
- { 0x000E, "Port data change notification" },
- { 0x000F, "Sync data changed notification" },
- { 0x0010, "Isochronous mode problem notification" },
- { 0x0011, "Network component problem notification" },
- { 0x0012, "Time data changed notification" },
- { 0x0013, "Dynamic Frame Packing problem notification" },
+ { 0x0000, "Reserved" },
+ { 0x0001, "Diagnosis" },
+ { 0x0002, "Process" },
+ { 0x0003, "Pull" },
+ { 0x0004, "Plug" },
+ { 0x0005, "Status" },
+ { 0x0006, "Update" },
+ { 0x0007, "Redundancy" },
+ { 0x0008, "Controlled by supervisor" },
+ { 0x0009, "Released" },
+ { 0x000A, "Plug wrong submodule" },
+ { 0x000B, "Return of submodule" },
+ { 0x000C, "Diagnosis disappears" },
+ { 0x000D, "Multicast communication mismatch notification" },
+ { 0x000E, "Port data change notification" },
+ { 0x000F, "Sync data changed notification" },
+ { 0x0010, "Isochronous mode problem notification" },
+ { 0x0011, "Network component problem notification" },
+ { 0x0012, "Time data changed notification" },
+ { 0x0013, "Dynamic Frame Packing problem notification" },
/*0x0014 - 0x001D reserved */
- { 0x001E, "Upload and retrieval notification" },
+ { 0x001E, "Upload and retrieval notification" },
{ 0x001F, "Pull module" },
/*0x0020 - 0x007F manufacturer specific */
/*0x0080 - 0x00FF reserved for profiles */
@@ -831,10 +831,10 @@ static const value_string pn_io_alarm_type[] = {
};
static const value_string pn_io_pdu_type[] = {
- { 0x01, "Data-RTA-PDU" },
- { 0x02, "NACK-RTA-PDU" },
- { 0x03, "ACK-RTA-PDU" },
- { 0x04, "ERR-RTA-PDU" },
+ { 0x01, "Data-RTA-PDU" },
+ { 0x02, "NACK-RTA-PDU" },
+ { 0x03, "ACK-RTA-PDU" },
+ { 0x04, "ERR-RTA-PDU" },
{ 0, NULL }
};
@@ -869,34 +869,34 @@ static const value_string pn_io_txgroup_state[] = {
};
static const value_string pn_io_error_code[] = {
- { 0x00, "OK" },
- { 0x81, "PNIO" },
- { 0xCF, "RTA error" },
- { 0xDA, "AlarmAck" },
- { 0xDB, "IODConnectRes" },
- { 0xDC, "IODReleaseRes" },
- { 0xDD, "IODControlRes" },
- { 0xDE, "IODReadRes" },
- { 0xDF, "IODWriteRes" },
+ { 0x00, "OK" },
+ { 0x81, "PNIO" },
+ { 0xCF, "RTA error" },
+ { 0xDA, "AlarmAck" },
+ { 0xDB, "IODConnectRes" },
+ { 0xDC, "IODReleaseRes" },
+ { 0xDD, "IODControlRes" },
+ { 0xDE, "IODReadRes" },
+ { 0xDF, "IODWriteRes" },
{ 0, NULL }
};
static const value_string pn_io_error_decode[] = {
- { 0x00, "OK" },
- { 0x80, "PNIORW" },
- { 0x81, "PNIO" },
+ { 0x00, "OK" },
+ { 0x80, "PNIORW" },
+ { 0x81, "PNIO" },
{ 0, NULL }
};
/* dummy for unknown decode */
static const value_string pn_io_error_code1[] = {
- { 0x00, "OK" },
+ { 0x00, "OK" },
{ 0, NULL }
};
/* dummy for unknown decode/code1 combination */
static const value_string pn_io_error_code2[] = {
- { 0x00, "OK" },
+ { 0x00, "OK" },
{ 0, NULL }
};
@@ -960,22 +960,22 @@ static const value_string pn_io_error_code2_pniorw[] = {
};
static const value_string pn_io_error_code1_pnio[] = {
- { 0x00 /* 0*/, "Reserved" },
- { 0x01 /* 1*/, "Connect: Faulty ARBlockReq" },
- { 0x02 /* 2*/, "Connect: Faulty IOCRBlockReq" },
- { 0x03 /* 3*/, "Connect: Faulty ExpectedSubmoduleBlockReq" },
- { 0x04 /* 4*/, "Connect: Faulty AlarmCRBlockReq" },
- { 0x05 /* 5*/, "Connect: Faulty PrmServerBlockReq" },
- { 0x06 /* 6*/, "Connect: Faulty MCRBlockReq" },
- { 0x07 /* 7*/, "Connect: Faulty ARRPCBlockReq" },
- { 0x08 /* 8*/, "Read/Write Record: Faulty Record" },
- { 0x09 /* 9*/, "Connect: Faulty SubFrameBlock" },
- { 0x0A /* 10*/, "Connect: Faulty IRTFrameBlock" },
-
- { 0x14 /* 20*/, "IODControl: Faulty ControlBlockConnect" },
- { 0x15 /* 21*/, "IODControl: Faulty ControlBlockPlug" },
- { 0x16 /* 22*/, "IOXControl: Faulty ControlBlock after a connect est." },
- { 0x17 /* 23*/, "IOXControl: Faulty ControlBlock a plug alarm" },
+ { 0x00 /* 0*/, "Reserved" },
+ { 0x01 /* 1*/, "Connect: Faulty ARBlockReq" },
+ { 0x02 /* 2*/, "Connect: Faulty IOCRBlockReq" },
+ { 0x03 /* 3*/, "Connect: Faulty ExpectedSubmoduleBlockReq" },
+ { 0x04 /* 4*/, "Connect: Faulty AlarmCRBlockReq" },
+ { 0x05 /* 5*/, "Connect: Faulty PrmServerBlockReq" },
+ { 0x06 /* 6*/, "Connect: Faulty MCRBlockReq" },
+ { 0x07 /* 7*/, "Connect: Faulty ARRPCBlockReq" },
+ { 0x08 /* 8*/, "Read/Write Record: Faulty Record" },
+ { 0x09 /* 9*/, "Connect: Faulty SubFrameBlock" },
+ { 0x0A /* 10*/, "Connect: Faulty IRTFrameBlock" },
+
+ { 0x14 /* 20*/, "IODControl: Faulty ControlBlockConnect" },
+ { 0x15 /* 21*/, "IODControl: Faulty ControlBlockPlug" },
+ { 0x16 /* 22*/, "IOXControl: Faulty ControlBlock after a connect est." },
+ { 0x17 /* 23*/, "IOXControl: Faulty ControlBlock a plug alarm" },
{ 0x28 /* 40*/, "Release: Faulty ReleaseBlock" },
@@ -1004,7 +1004,7 @@ static const value_string pn_io_error_code1_pnio[] = {
{ 0x4c /* 76*/, "DCPMCS" },
{ 0x4d /* 77*/, "DCPMCR" },
{ 0x4e /* 78*/, "FSPM" },
- { 0xfd /*253*/, "RTA_ERR_CLS_PROTOCOL" },
+ { 0xfd /*253*/, "RTA_ERR_CLS_PROTOCOL" },
{ 0xff /*255*/, "User specific" },
{ 0, NULL }
};
@@ -1382,22 +1382,22 @@ static const value_string pn_io_error_code2_pnio_255[] = {
};
static const value_string pn_io_ioxs[] = {
- { 0x00 /* 0*/, "detected by subslot" },
- { 0x01 /* 1*/, "detected by slot" },
- { 0x02 /* 2*/, "detected by IO device" },
- { 0x03 /* 3*/, "detected by IO controller" },
+ { 0x00 /* 0*/, "detected by subslot" },
+ { 0x01 /* 1*/, "detected by slot" },
+ { 0x02 /* 2*/, "detected by IO device" },
+ { 0x03 /* 3*/, "detected by IO controller" },
{ 0, NULL }
};
static const value_string pn_io_ar_type[] = {
- { 0x0000, "reserved" },
- { 0x0001, "IOCARSingle" },
- { 0x0002, "reserved" },
- { 0x0003, "IOCARCIR" },
- { 0x0004, "IOCAR_IOControllerRedundant" },
- { 0x0005, "IOCAR_IODeviceRedundant" },
- { 0x0006, "IOSAR" },
+ { 0x0000, "reserved" },
+ { 0x0001, "IOCARSingle" },
+ { 0x0002, "reserved" },
+ { 0x0003, "IOCARCIR" },
+ { 0x0004, "IOCAR_IOControllerRedundant" },
+ { 0x0005, "IOCAR_IODeviceRedundant" },
+ { 0x0006, "IOSAR" },
/*0x0007 - 0x000F reserved */
{ 0x0010, "IOCARSingle using RT_CLASS_3"},
/*0x0011 - 0x001F reserved */
@@ -1407,21 +1407,21 @@ static const value_string pn_io_ar_type[] = {
};
static const value_string pn_io_iocr_type[] = {
- { 0x0000, "reserved" },
- { 0x0001, "Input CR" },
- { 0x0002, "Output CR" },
- { 0x0003, "Multicast Provider CR" },
- { 0x0004, "Multicast Consumer CR" },
+ { 0x0000, "reserved" },
+ { 0x0001, "Input CR" },
+ { 0x0002, "Output CR" },
+ { 0x0003, "Multicast Provider CR" },
+ { 0x0004, "Multicast Consumer CR" },
/*0x0005 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_data_description[] = {
- { 0x0000, "reserved" },
- { 0x0001, "Input" },
- { 0x0002, "Output" },
- { 0x0003, "reserved" },
+ { 0x0000, "reserved" },
+ { 0x0001, "Input" },
+ { 0x0002, "Output" },
+ { 0x0003, "reserved" },
/*0x0004 - 0xFFFF reserved */
{ 0, NULL }
};
@@ -1429,10 +1429,10 @@ static const value_string pn_io_data_description[] = {
static const value_string pn_io_module_state[] = {
- { 0x0000, "no module" },
- { 0x0001, "wrong module" },
- { 0x0002, "proper module" },
- { 0x0003, "substitute" },
+ { 0x0000, "no module" },
+ { 0x0001, "wrong module" },
+ { 0x0002, "proper module" },
+ { 0x0003, "substitute" },
/*0x0004 - 0xFFFF reserved */
{ 0, NULL }
};
@@ -1470,9 +1470,9 @@ static const value_string pn_io_arproperties_DeviceAccess[] = {
/* Bit 9 - 10 */
static const value_string pn_io_arproperties_companion_ar[] = {
{ 0x00000000, "Single AR" },
- { 0x00000001, "First AR of a companion pair and a companion AR shall follow" },
- { 0x00000002, "Companion AR" },
- { 0x00000003, "Reserved" },
+ { 0x00000001, "First AR of a companion pair and a companion AR shall follow" },
+ { 0x00000002, "Companion AR" },
+ { 0x00000003, "Reserved" },
{ 0, NULL }
};
/* REMOVED with 2.3
@@ -1501,25 +1501,25 @@ static const value_string pn_io_arpropertiesStartupMode[] = {
/* bit 31 */
static const value_string pn_io_arproperties_pull_module_alarm_allowed[] = {
- { 0x00000000, "AlarmType(=Pull) shall signal pulling of submodule and module" },
- { 0x00000001, "AlarmType(=Pull) shall signal pulling of submodule" },
+ { 0x00000000, "AlarmType(=Pull) shall signal pulling of submodule and module" },
+ { 0x00000001, "AlarmType(=Pull) shall signal pulling of submodule" },
{ 0, NULL }
};
static const value_string pn_io_RedundancyInfo[] = {
- { 0x00000000, "Reserved" },
- { 0x00000001, "The delivering node is the left or below one" },
- { 0x00000002, "The delivering node is the right or above one" },
- { 0x00000003, "Reserved" },
+ { 0x00000000, "Reserved" },
+ { 0x00000001, "The delivering node is the left or below one" },
+ { 0x00000002, "The delivering node is the right or above one" },
+ { 0x00000003, "Reserved" },
{ 0, NULL }
};
static const value_string pn_io_iocr_properties_rtclass[] = {
- { 0x00000000, "reserved" },
- { 0x00000001, "RT_CLASS_1" },
- { 0x00000002, "RT_CLASS_2" },
- { 0x00000003, "RT_CLASS_3" },
- { 0x00000004, "RT_CLASS_UDP" },
+ { 0x00000000, "reserved" },
+ { 0x00000001, "RT_CLASS_1" },
+ { 0x00000002, "RT_CLASS_2" },
+ { 0x00000003, "RT_CLASS_3" },
+ { 0x00000004, "RT_CLASS_UDP" },
/*0x00000005 - 0x00000007 reserved */
{ 0, NULL }
};
@@ -1537,122 +1537,122 @@ static const value_string pn_io_sr_properties_ActivateRedundancyAlarm[] = {
};
static const value_string pn_io_iocr_properties_media_redundancy[] = {
- { 0x00000000, "No media redundant frame transfer" },
- { 0x00000001, "Media redundant frame transfer" },
+ { 0x00000000, "No media redundant frame transfer" },
+ { 0x00000001, "Media redundant frame transfer" },
{ 0, NULL }
};
static const value_string pn_io_submodule_properties_type[] = {
- { 0x0000, "no input and no output data" },
- { 0x0001, "input data" },
- { 0x0002, "output data" },
- { 0x0003, "input and output data" },
+ { 0x0000, "no input and no output data" },
+ { 0x0001, "input data" },
+ { 0x0002, "output data" },
+ { 0x0003, "input and output data" },
{ 0, NULL }
};
static const value_string pn_io_submodule_properties_shared_input[] = {
- { 0x0000, "IO controller" },
- { 0x0001, "IO controller shared" },
+ { 0x0000, "IO controller" },
+ { 0x0001, "IO controller shared" },
{ 0, NULL }
};
static const value_string pn_io_submodule_properties_reduce_input_submodule_data_length[] = {
- { 0x0000, "Expected" },
- { 0x0001, "Zero" },
+ { 0x0000, "Expected" },
+ { 0x0001, "Zero" },
{ 0, NULL }
};
static const value_string pn_io_submodule_properties_reduce_output_submodule_data_length[] = {
- { 0x0000, "Expected" },
- { 0x0001, "Zero" },
+ { 0x0000, "Expected" },
+ { 0x0001, "Zero" },
{ 0, NULL }
};
static const value_string pn_io_submodule_properties_discard_ioxs[] = {
- { 0x0000, "Expected" },
- { 0x0001, "Zero" },
+ { 0x0000, "Expected" },
+ { 0x0001, "Zero" },
{ 0, NULL }
};
static const value_string pn_io_alarmcr_properties_priority[] = {
- { 0x0000, "user priority (default)" },
- { 0x0001, "use only low priority" },
+ { 0x0000, "user priority (default)" },
+ { 0x0001, "use only low priority" },
{ 0, NULL }
};
static const value_string pn_io_alarmcr_properties_transport[] = {
- { 0x0000, "RTA_CLASS_1" },
- { 0x0001, "RTA_CLASS_UDP" },
+ { 0x0000, "RTA_CLASS_1" },
+ { 0x0001, "RTA_CLASS_UDP" },
{ 0, NULL }
};
static const value_string pn_io_submodule_state_format_indicator[] = {
- { 0x0000, "Coding uses Detail" },
- { 0x0001, "Coding uses .IdentInfo, ..." },
+ { 0x0000, "Coding uses Detail" },
+ { 0x0001, "Coding uses .IdentInfo, ..." },
{ 0, NULL }
};
static const value_string pn_io_submodule_state_add_info[] = {
- { 0x0000, "None" },
- { 0x0001, "Takeover not allowed" },
+ { 0x0000, "None" },
+ { 0x0001, "Takeover not allowed" },
/*0x0002 - 0x0007 reserved */
{ 0, NULL }
};
static const value_string pn_io_submodule_state_qualified_info[] = {
- { 0x0000, "No QualifiedInfo available" },
- { 0x0001, "QualifiedInfo available" },
+ { 0x0000, "No QualifiedInfo available" },
+ { 0x0001, "QualifiedInfo available" },
{ 0, NULL }
};
static const value_string pn_io_submodule_state_maintenance_required[] = {
- { 0x0000, "No MaintenanceRequired available" },
- { 0x0001, "MaintenanceRequired available" },
+ { 0x0000, "No MaintenanceRequired available" },
+ { 0x0001, "MaintenanceRequired available" },
{ 0, NULL }
};
static const value_string pn_io_submodule_state_maintenance_demanded[] = {
- { 0x0000, "No MaintenanceDemanded available" },
- { 0x0001, "MaintenanceDemanded available" },
+ { 0x0000, "No MaintenanceDemanded available" },
+ { 0x0001, "MaintenanceDemanded available" },
{ 0, NULL }
};
static const value_string pn_io_submodule_state_diag_info[] = {
- { 0x0000, "No DiagnosisData available" },
- { 0x0001, "DiagnosisData available" },
+ { 0x0000, "No DiagnosisData available" },
+ { 0x0001, "DiagnosisData available" },
{ 0, NULL }
};
static const value_string pn_io_submodule_state_ar_info[] = {
- { 0x0000, "Own" },
- { 0x0001, "ApplicationReadyPending (ARP)" },
- { 0x0002, "Superordinated Locked (SO)" },
- { 0x0003, "Locked By IO Controller (IOC)" },
+ { 0x0000, "Own" },
+ { 0x0001, "ApplicationReadyPending (ARP)" },
+ { 0x0002, "Superordinated Locked (SO)" },
+ { 0x0003, "Locked By IO Controller (IOC)" },
{ 0x0004, "Locked By IO Supervisor (IOS)" },
/*0x0005 - 0x000F reserved */
{ 0, NULL }
};
static const value_string pn_io_submodule_state_ident_info[] = {
- { 0x0000, "OK" },
- { 0x0001, "Substitute (SU)" },
- { 0x0002, "Wrong (WR)" },
- { 0x0003, "NoSubmodule (NO)" },
+ { 0x0000, "OK" },
+ { 0x0001, "Substitute (SU)" },
+ { 0x0002, "Wrong (WR)" },
+ { 0x0003, "NoSubmodule (NO)" },
/*0x0004 - 0x000F reserved */
{ 0, NULL }
};
static const value_string pn_io_submodule_state_detail[] = {
- { 0x0000, "no submodule" },
- { 0x0001, "wrong submodule" },
- { 0x0002, "locked by IO controller" },
- { 0x0003, "reserved" },
- { 0x0004, "application ready pending" },
- { 0x0005, "reserved" },
- { 0x0006, "reserved" },
- { 0x0007, "Substitute" },
+ { 0x0000, "no submodule" },
+ { 0x0001, "wrong submodule" },
+ { 0x0002, "locked by IO controller" },
+ { 0x0003, "reserved" },
+ { 0x0004, "application ready pending" },
+ { 0x0005, "reserved" },
+ { 0x0006, "reserved" },
+ { 0x0007, "Substitute" },
/*0x0008 - 0x7FFF reserved */
{ 0, NULL }
};
@@ -1672,94 +1672,94 @@ static const value_string pn_io_index[] = {
{ 0x0100, "PROFISafe" },
/* subslot specific */
- { 0x8000, "ExpectedIdentificationData for one subslot" },
- { 0x8001, "RealIdentificationData for one subslot" },
+ { 0x8000, "ExpectedIdentificationData for one subslot" },
+ { 0x8001, "RealIdentificationData for one subslot" },
/*0x8002 - 0x8009 reserved */
- { 0x800A, "Diagnosis in channel coding for one subslot" },
- { 0x800B, "Diagnosis in all codings for one subslot" },
- { 0x800C, "Diagnosis, Maintenance, Qualified and Status for one subslot" },
+ { 0x800A, "Diagnosis in channel coding for one subslot" },
+ { 0x800B, "Diagnosis in all codings for one subslot" },
+ { 0x800C, "Diagnosis, Maintenance, Qualified and Status for one subslot" },
/*0x800D - 0x800F reserved */
- { 0x8010, "Maintenance required in channel coding for one subslot" },
- { 0x8011, "Maintenance demanded in channel coding for one subslot" },
- { 0x8012, "Maintenance required in all codings for one subslot" },
- { 0x8013, "Maintenance demanded in all codings for one subslot" },
+ { 0x8010, "Maintenance required in channel coding for one subslot" },
+ { 0x8011, "Maintenance demanded in channel coding for one subslot" },
+ { 0x8012, "Maintenance required in all codings for one subslot" },
+ { 0x8013, "Maintenance demanded in all codings for one subslot" },
/*0x8014 - 0x801D reserved */
- { 0x801E, "SubstituteValues for one subslot" },
+ { 0x801E, "SubstituteValues for one subslot" },
/*0x801F - 0x8027 reserved */
- { 0x8028, "RecordInputDataObjectElement for one subslot" },
- { 0x8029, "RecordOutputDataObjectElement for one subslot" },
- { 0x802A, "PDPortDataReal for one subslot" },
- { 0x802B, "PDPortDataCheck for one subslot" },
- { 0x802C, "PDIRData for one subslot" },
- { 0x802D, "Expected PDSyncData for one subslot with SyncID value 0" },
- /*0x802E reserved */
- { 0x802F, "PDPortDataAdjust for one subslot" },
- { 0x8030, "IsochronousModeData for one subslot" },
- { 0x8031, "Expected PDSyncData for one subslot with SyncID value 1" },
- { 0x8032, "Expected PDSyncData for one subslot with SyncID value 2" },
- { 0x8033, "Expected PDSyncData for one subslot with SyncID value 3" },
- { 0x8034, "Expected PDSyncData for one subslot with SyncID value 4" },
- { 0x8035, "Expected PDSyncData for one subslot with SyncID value 5" },
- { 0x8036, "Expected PDSyncData for one subslot with SyncID value 6" },
- { 0x8037, "Expected PDSyncData for one subslot with SyncID value 7" },
- { 0x8038, "Expected PDSyncData for one subslot with SyncID value 8" },
- { 0x8039, "Expected PDSyncData for one subslot with SyncID value 9" },
- { 0x803A, "Expected PDSyncData for one subslot with SyncID value 10" },
- { 0x803B, "Expected PDSyncData for one subslot with SyncID value 11" },
- { 0x803C, "Expected PDSyncData for one subslot with SyncID value 12" },
- { 0x803D, "Expected PDSyncData for one subslot with SyncID value 13" },
- { 0x803E, "Expected PDSyncData for one subslot with SyncID value 14" },
- { 0x803F, "Expected PDSyncData for one subslot with SyncID value 15" },
- { 0x8040, "Expected PDSyncData for one subslot with SyncID value 16" },
- { 0x8041, "Expected PDSyncData for one subslot with SyncID value 17" },
- { 0x8042, "Expected PDSyncData for one subslot with SyncID value 18" },
- { 0x8043, "Expected PDSyncData for one subslot with SyncID value 19" },
- { 0x8044, "Expected PDSyncData for one subslot with SyncID value 20" },
- { 0x8045, "Expected PDSyncData for one subslot with SyncID value 21" },
- { 0x8046, "Expected PDSyncData for one subslot with SyncID value 22" },
- { 0x8047, "Expected PDSyncData for one subslot with SyncID value 23" },
- { 0x8048, "Expected PDSyncData for one subslot with SyncID value 24" },
- { 0x8049, "Expected PDSyncData for one subslot with SyncID value 25" },
- { 0x804A, "Expected PDSyncData for one subslot with SyncID value 26" },
- { 0x804B, "Expected PDSyncData for one subslot with SyncID value 27" },
- { 0x804C, "Expected PDSyncData for one subslot with SyncID value 28" },
- { 0x804D, "Expected PDSyncData for one subslot with SyncID value 29" },
- { 0x804E, "Expected PDSyncData for one subslot with SyncID value 30" },
- { 0x804F, "Expected PDSyncData for one subslot with SyncID value 31" },
- { 0x8050, "PDInterfaceMrpDataReal for one subslot" },
- { 0x8051, "PDInterfaceMrpDataCheck for one subslot" },
- { 0x8052, "PDInterfaceMrpDataAdjust for one subslot" },
- { 0x8053, "PDPortMrpDataAdjust for one subslot" },
- { 0x8054, "PDPortMrpDataReal for one subslot" },
+ { 0x8028, "RecordInputDataObjectElement for one subslot" },
+ { 0x8029, "RecordOutputDataObjectElement for one subslot" },
+ { 0x802A, "PDPortDataReal for one subslot" },
+ { 0x802B, "PDPortDataCheck for one subslot" },
+ { 0x802C, "PDIRData for one subslot" },
+ { 0x802D, "Expected PDSyncData for one subslot with SyncID value 0" },
+ /*0x802E reserved */
+ { 0x802F, "PDPortDataAdjust for one subslot" },
+ { 0x8030, "IsochronousModeData for one subslot" },
+ { 0x8031, "Expected PDSyncData for one subslot with SyncID value 1" },
+ { 0x8032, "Expected PDSyncData for one subslot with SyncID value 2" },
+ { 0x8033, "Expected PDSyncData for one subslot with SyncID value 3" },
+ { 0x8034, "Expected PDSyncData for one subslot with SyncID value 4" },
+ { 0x8035, "Expected PDSyncData for one subslot with SyncID value 5" },
+ { 0x8036, "Expected PDSyncData for one subslot with SyncID value 6" },
+ { 0x8037, "Expected PDSyncData for one subslot with SyncID value 7" },
+ { 0x8038, "Expected PDSyncData for one subslot with SyncID value 8" },
+ { 0x8039, "Expected PDSyncData for one subslot with SyncID value 9" },
+ { 0x803A, "Expected PDSyncData for one subslot with SyncID value 10" },
+ { 0x803B, "Expected PDSyncData for one subslot with SyncID value 11" },
+ { 0x803C, "Expected PDSyncData for one subslot with SyncID value 12" },
+ { 0x803D, "Expected PDSyncData for one subslot with SyncID value 13" },
+ { 0x803E, "Expected PDSyncData for one subslot with SyncID value 14" },
+ { 0x803F, "Expected PDSyncData for one subslot with SyncID value 15" },
+ { 0x8040, "Expected PDSyncData for one subslot with SyncID value 16" },
+ { 0x8041, "Expected PDSyncData for one subslot with SyncID value 17" },
+ { 0x8042, "Expected PDSyncData for one subslot with SyncID value 18" },
+ { 0x8043, "Expected PDSyncData for one subslot with SyncID value 19" },
+ { 0x8044, "Expected PDSyncData for one subslot with SyncID value 20" },
+ { 0x8045, "Expected PDSyncData for one subslot with SyncID value 21" },
+ { 0x8046, "Expected PDSyncData for one subslot with SyncID value 22" },
+ { 0x8047, "Expected PDSyncData for one subslot with SyncID value 23" },
+ { 0x8048, "Expected PDSyncData for one subslot with SyncID value 24" },
+ { 0x8049, "Expected PDSyncData for one subslot with SyncID value 25" },
+ { 0x804A, "Expected PDSyncData for one subslot with SyncID value 26" },
+ { 0x804B, "Expected PDSyncData for one subslot with SyncID value 27" },
+ { 0x804C, "Expected PDSyncData for one subslot with SyncID value 28" },
+ { 0x804D, "Expected PDSyncData for one subslot with SyncID value 29" },
+ { 0x804E, "Expected PDSyncData for one subslot with SyncID value 30" },
+ { 0x804F, "Expected PDSyncData for one subslot with SyncID value 31" },
+ { 0x8050, "PDInterfaceMrpDataReal for one subslot" },
+ { 0x8051, "PDInterfaceMrpDataCheck for one subslot" },
+ { 0x8052, "PDInterfaceMrpDataAdjust for one subslot" },
+ { 0x8053, "PDPortMrpDataAdjust for one subslot" },
+ { 0x8054, "PDPortMrpDataReal for one subslot" },
/*0x8055 - 0x805F reserved */
- { 0x8060, "PDPortFODataReal for one subslot" },
- { 0x8061, "PDPortFODataCheck for one subslot" },
- { 0x8062, "PDPortFODataAdjust for one subslot" },
+ { 0x8060, "PDPortFODataReal for one subslot" },
+ { 0x8061, "PDPortFODataCheck for one subslot" },
+ { 0x8062, "PDPortFODataAdjust for one subslot" },
/*0x8063 - 0x806F reserved */
- { 0x8070, "PDNCDataCheck for one subslot" },
- { 0x8071, "PDInterfaceAdjust for one subslot" },
- { 0x8072, "PDPortStatistic for one subslot" },
+ { 0x8070, "PDNCDataCheck for one subslot" },
+ { 0x8071, "PDInterfaceAdjust for one subslot" },
+ { 0x8072, "PDPortStatistic for one subslot" },
/*0x8071 - 0x807F reserved */
- { 0x8080, "PDInterfaceDataReal" },
+ { 0x8080, "PDInterfaceDataReal" },
/*0x8081 - 0x808F reserved */
- { 0x8090, "Expected PDInterfaceFSUDataAdjust" },
+ { 0x8090, "Expected PDInterfaceFSUDataAdjust" },
/*0x8091 - 0xAFEF reserved */
- { 0xAFF0, "I&M0" },
- { 0xAFF1, "I&M1" },
- { 0xAFF2, "I&M2" },
- { 0xAFF3, "I&M3" },
- { 0xAFF4, "I&M4" },
- { 0xAFF5, "I&M5" },
- { 0xAFF6, "I&M6" },
- { 0xAFF7, "I&M7" },
- { 0xAFF8, "I&M8" },
- { 0xAFF9, "I&M9" },
- { 0xAFFA, "I&M10" },
- { 0xAFFB, "I&M11" },
- { 0xAFFC, "I&M12" },
- { 0xAFFD, "I&M13" },
- { 0xAFFE, "I&M14" },
- { 0xAFFF, "I&M15" },
+ { 0xAFF0, "I&M0" },
+ { 0xAFF1, "I&M1" },
+ { 0xAFF2, "I&M2" },
+ { 0xAFF3, "I&M3" },
+ { 0xAFF4, "I&M4" },
+ { 0xAFF5, "I&M5" },
+ { 0xAFF6, "I&M6" },
+ { 0xAFF7, "I&M7" },
+ { 0xAFF8, "I&M8" },
+ { 0xAFF9, "I&M9" },
+ { 0xAFFA, "I&M10" },
+ { 0xAFFB, "I&M11" },
+ { 0xAFFC, "I&M12" },
+ { 0xAFFD, "I&M13" },
+ { 0xAFFE, "I&M14" },
+ { 0xAFFF, "I&M15" },
/*0xB000 - 0xB02D reserved for profiles */
{ 0xB000, "Sync-Log / RTA SyncID 0 (GSY)" },
{ 0xB001, "Sync-Log / RTA SyncID 1 (GSY)" },
@@ -1822,71 +1822,71 @@ static const value_string pn_io_index[] = {
/* slot specific */
- { 0xC000, "ExpectedIdentificationData for one slot" },
- { 0xC001, "RealIdentificationData for one slot" },
+ { 0xC000, "ExpectedIdentificationData for one slot" },
+ { 0xC001, "RealIdentificationData for one slot" },
/*0xC002 - 0xC009 reserved */
- { 0xC00A, "Diagnosis in channel coding for one slot" },
- { 0xC00B, "Diagnosis in all codings for one slot" },
- { 0xC00C, "Diagnosis, Maintenance, Qualified and Status for one slot" },
+ { 0xC00A, "Diagnosis in channel coding for one slot" },
+ { 0xC00B, "Diagnosis in all codings for one slot" },
+ { 0xC00C, "Diagnosis, Maintenance, Qualified and Status for one slot" },
/*0xC00D - 0xC00F reserved */
- { 0xC010, "Maintenance required in channel coding for one slot" },
- { 0xC011, "Maintenance demanded in channel coding for one slot" },
- { 0xC012, "Maintenance required in all codings for one slot" },
- { 0xC013, "Maintenance demanded in all codings for one slot" },
+ { 0xC010, "Maintenance required in channel coding for one slot" },
+ { 0xC011, "Maintenance demanded in channel coding for one slot" },
+ { 0xC012, "Maintenance required in all codings for one slot" },
+ { 0xC013, "Maintenance demanded in all codings for one slot" },
/*0xC014 - 0xCFFF reserved */
/*0xD000 - 0xDFFF reserved for profiles */
/* AR specific */
- { 0xE000, "ExpectedIdentificationData for one AR" },
- { 0xE001, "RealIdentificationData for one AR" },
- { 0xE002, "ModuleDiffBlock for one AR" },
+ { 0xE000, "ExpectedIdentificationData for one AR" },
+ { 0xE001, "RealIdentificationData for one AR" },
+ { 0xE002, "ModuleDiffBlock for one AR" },
/*0xE003 - 0xE009 reserved */
- { 0xE00A, "Diagnosis in channel coding for one AR" },
- { 0xE00B, "Diagnosis in all codings for one AR" },
- { 0xE00C, "Diagnosis, Maintenance, Qualified and Status for one AR" },
+ { 0xE00A, "Diagnosis in channel coding for one AR" },
+ { 0xE00B, "Diagnosis in all codings for one AR" },
+ { 0xE00C, "Diagnosis, Maintenance, Qualified and Status for one AR" },
/*0xE00D - 0xE00F reserved */
- { 0xE010, "Maintenance required in channel coding for one AR" },
- { 0xE011, "Maintenance demanded in channel coding for one AR" },
- { 0xE012, "Maintenance required in all codings for one AR" },
- { 0xE013, "Maintenance demanded in all codings for one AR" },
+ { 0xE010, "Maintenance required in channel coding for one AR" },
+ { 0xE011, "Maintenance demanded in channel coding for one AR" },
+ { 0xE012, "Maintenance required in all codings for one AR" },
+ { 0xE013, "Maintenance demanded in all codings for one AR" },
/*0xE014 - 0xE02F reserved */
- { 0xE030, "IsochronousModeData for one AR" },
+ { 0xE030, "IsochronousModeData for one AR" },
/*0xE031 - 0xE03F reserved */
- { 0xE040, "MultipleWrite" },
+ { 0xE040, "MultipleWrite" },
/*0xE041 - 0xE04F reserved */
- { 0xE050, "ARFSUDataAdjust data for one AR" },
+ { 0xE050, "ARFSUDataAdjust data for one AR" },
/*0xE051 - 0xE05F reserved */
/*0xEC00 - 0xEFFF reserved */
/* API specific */
- { 0xF000, "RealIdentificationData for one API" },
+ { 0xF000, "RealIdentificationData for one API" },
/*0xF001 - 0xF009 reserved */
- { 0xF00A, "Diagnosis in channel coding for one API" },
- { 0xF00B, "Diagnosis in all codings for one API" },
- { 0xF00C, "Diagnosis, Maintenance, Qualified and Status for one API" },
+ { 0xF00A, "Diagnosis in channel coding for one API" },
+ { 0xF00B, "Diagnosis in all codings for one API" },
+ { 0xF00C, "Diagnosis, Maintenance, Qualified and Status for one API" },
/*0xF00D - 0xF00F reserved */
- { 0xF010, "Maintenance required in channel coding for one API" },
- { 0xF011, "Maintenance demanded in channel coding for one API" },
- { 0xF012, "Maintenance required in all codings for one API" },
- { 0xF013, "Maintenance demanded in all codings for one API" },
+ { 0xF010, "Maintenance required in channel coding for one API" },
+ { 0xF011, "Maintenance demanded in channel coding for one API" },
+ { 0xF012, "Maintenance required in all codings for one API" },
+ { 0xF013, "Maintenance demanded in all codings for one API" },
/*0xF014 - 0xF01F reserved */
- { 0xF020, "ARData for one API" },
+ { 0xF020, "ARData for one API" },
/*0xF021 - 0xF3FF reserved */
/*0xF400 - 0xF7FF reserved */
/* device specific */
/*0xF800 - 0xF80B reserved */
- { 0xF80C, "Diagnosis, Maintenance, Qualified and Status for one device" },
+ { 0xF80C, "Diagnosis, Maintenance, Qualified and Status for one device" },
/*0xF80D - 0xF81F reserved */
- { 0xF820, "ARData" },
- { 0xF821, "APIData" },
+ { 0xF820, "ARData" },
+ { 0xF821, "APIData" },
/*0xF822 - 0xF82F reserved */
- { 0xF830, "LogData" },
- { 0xF831, "PDevData" },
+ { 0xF830, "LogData" },
+ { 0xF831, "PDevData" },
/*0xF832 - 0xF83F reserved */
- { 0xF840, "I&M0FilterData" },
- { 0xF841, "PDRealData" },
- { 0xF842, "PDExpectedData" },
+ { 0xF840, "I&M0FilterData" },
+ { 0xF841, "PDRealData" },
+ { 0xF842, "PDExpectedData" },
/*0xF843 - 0xF84F reserved */
{ 0xF850, "AutoConfigurarion" },
/*0xF851 - 0xFBFF reserved */
@@ -1896,12 +1896,12 @@ static const value_string pn_io_index[] = {
static const value_string pn_io_user_structure_identifier[] = {
/*0x0000 - 0x7FFF manufacturer specific */
- { 0x8000, "ChannelDiagnosis" },
- { 0x8001, "Multiple" },
- { 0x8002, "ExtChannelDiagnosis" },
- { 0x8003, "QualifiedChannelDiagnosis" },
+ { 0x8000, "ChannelDiagnosis" },
+ { 0x8001, "Multiple" },
+ { 0x8002, "ExtChannelDiagnosis" },
+ { 0x8003, "QualifiedChannelDiagnosis" },
/*0x8004 - 0x80FF reserved */
- { 0x8100, "Maintenance" },
+ { 0x8100, "Maintenance" },
/*0x8101 - 0x8FFF reserved */
/*0x9000 - 0x9FFF reserved for profiles */
/*0xA000 - 0xFFFF reserved */
@@ -1910,47 +1910,47 @@ static const value_string pn_io_user_structure_identifier[] = {
static const value_string pn_io_channel_number[] = {
/*0x0000 - 0x7FFF manufacturer specific */
- { 0x8000, "Submodule" },
+ { 0x8000, "Submodule" },
/*0x8001 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_channel_error_type[] = {
- { 0x0000, "reserved" },
- { 0x0001, "short circuit" },
- { 0x0002, "Undervoltage" },
- { 0x0003, "Overvoltage" },
- { 0x0004, "Overload" },
- { 0x0005, "Overtemperature" },
- { 0x0006, "line break" },
- { 0x0007, "upper limit value exceeded" },
- { 0x0008, "lower limit value exceeded" },
- { 0x0009, "Error" },
+ { 0x0000, "reserved" },
+ { 0x0001, "short circuit" },
+ { 0x0002, "Undervoltage" },
+ { 0x0003, "Overvoltage" },
+ { 0x0004, "Overload" },
+ { 0x0005, "Overtemperature" },
+ { 0x0006, "line break" },
+ { 0x0007, "upper limit value exceeded" },
+ { 0x0008, "lower limit value exceeded" },
+ { 0x0009, "Error" },
/*0x000A - 0x000F reserved */
- { 0x0010, "parametrization fault" },
- { 0x0011, "power supply fault" },
- { 0x0012, "fuse blown / open" },
- { 0x0013, "Manufacturer specific" },
- { 0x0014, "ground fault" },
- { 0x0015, "reference point lost" },
- { 0x0016, "process event lost / sampling error" },
- { 0x0017, "threshold warning" },
- { 0x0018, "output disabled" },
- { 0x0019, "safety event" },
- { 0x001A, "external fault" },
+ { 0x0010, "parametrization fault" },
+ { 0x0011, "power supply fault" },
+ { 0x0012, "fuse blown / open" },
+ { 0x0013, "Manufacturer specific" },
+ { 0x0014, "ground fault" },
+ { 0x0015, "reference point lost" },
+ { 0x0016, "process event lost / sampling error" },
+ { 0x0017, "threshold warning" },
+ { 0x0018, "output disabled" },
+ { 0x0019, "safety event" },
+ { 0x001A, "external fault" },
/*0x001B - 0x001F manufacturer specific */
/*0x0020 - 0x00FF reserved for common profiles */
/*0x0100 - 0x7FFF manufacturer specific */
- { 0x8000, "Data transmission impossible" },
- { 0x8001, "Remote mismatch" },
- { 0x8002, "Media redundancy mismatch" },
- { 0x8003, "Sync mismatch" },
- { 0x8004, "IsochronousMode mismatch" },
- { 0x8005, "Multicast CR mismatch" },
- { 0x8006, "reserved" },
- { 0x8007, "Fiber optic mismatch" },
- { 0x8008, "Network component function mismatch" },
- { 0x8009, "Time mismatch" },
+ { 0x8000, "Data transmission impossible" },
+ { 0x8001, "Remote mismatch" },
+ { 0x8002, "Media redundancy mismatch" },
+ { 0x8003, "Sync mismatch" },
+ { 0x8004, "IsochronousMode mismatch" },
+ { 0x8005, "Multicast CR mismatch" },
+ { 0x8006, "reserved" },
+ { 0x8007, "Fiber optic mismatch" },
+ { 0x8008, "Network component function mismatch" },
+ { 0x8009, "Time mismatch" },
/* added values for IEC version 2.3: */
{ 0x800A, "Dynamic frame packing function mismatch" },
{ 0x800B, "Media redundancy with planned duplication mismatch"},
@@ -1964,171 +1964,171 @@ static const value_string pn_io_channel_error_type[] = {
/* ExtChannelErrorType for ChannelErrorType 0 - 0x7FFF */
static const value_string pn_io_ext_channel_error_type0[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Accumulative Info"},
- /* 0x8001 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Accumulative Info"},
+ /* 0x8001 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Data transmission impossible” */
+ /* ExtChannelErrorType for ChannelErrorType "Data transmission impossible" */
static const value_string pn_io_ext_channel_error_type0x8000[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Link State mismatch – Link down"},
- { 0x8001, "MAUType mismatch"},
- { 0x8002, "Line Delay mismatch"},
- /* 0x8003 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Link State mismatch - Link down"},
+ { 0x8001, "MAUType mismatch"},
+ { 0x8002, "Line Delay mismatch"},
+ /* 0x8003 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Remote mismatch” */
+ /* ExtChannelErrorType for ChannelErrorType "Remote mismatch" */
static const value_string pn_io_ext_channel_error_type0x8001[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Peer Chassis ID mismatch"},
- { 0x8001, "Peer Port ID mismatch"},
- { 0x8002, "Peer RT_CLASS_3 mismatch a"},
- { 0x8003, "Peer MAUType mismatch"},
- { 0x8004, "Peer MRP domain mismatch"},
- { 0x8005, "No peer detected"},
- { 0x8006, "Reserved"},
- { 0x8007, "Peer Line Delay mismatch"},
- { 0x8008, "Peer PTCP mismatch b"},
- { 0x8009, "Peer Preamble Length mismatch"},
- { 0x800A, "Peer Fragmentation mismatch"},
- /* 0x800B – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Peer Chassis ID mismatch"},
+ { 0x8001, "Peer Port ID mismatch"},
+ { 0x8002, "Peer RT_CLASS_3 mismatch a"},
+ { 0x8003, "Peer MAUType mismatch"},
+ { 0x8004, "Peer MRP domain mismatch"},
+ { 0x8005, "No peer detected"},
+ { 0x8006, "Reserved"},
+ { 0x8007, "Peer Line Delay mismatch"},
+ { 0x8008, "Peer PTCP mismatch b"},
+ { 0x8009, "Peer Preamble Length mismatch"},
+ { 0x800A, "Peer Fragmentation mismatch"},
+ /* 0x800B - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Media redundancy mismatch" 0x8002 */
+ /* ExtChannelErrorType for ChannelErrorType "Media redundancy mismatch" 0x8002 */
static const value_string pn_io_ext_channel_error_type0x8002[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Manager role fail"},
- { 0x8001, "MRP ring open"},
- { 0x8002, "Reserved"},
- { 0x8003, "Multiple mananger"},
- /* 0x8004 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Manager role fail"},
+ { 0x8001, "MRP ring open"},
+ { 0x8002, "Reserved"},
+ { 0x8003, "Multiple mananger"},
+ /* 0x8004 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Sync mismatch” and for ChannelErrorType “Time mismatch” 0x8003 and 0x8009*/
+ /* ExtChannelErrorType for ChannelErrorType "Sync mismatch" and for ChannelErrorType "Time mismatch" 0x8003 and 0x8009*/
static const value_string pn_io_ext_channel_error_type0x8003[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "No sync message received"},
- { 0x8001, "– 0x8002 Reserved"},
- { 0x8003, "Jitter out of boundary"},
- /* 0x8004 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "No sync message received"},
+ { 0x8001, "- 0x8002 Reserved"},
+ { 0x8003, "Jitter out of boundary"},
+ /* 0x8004 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /*ExtChannelErrorType for ChannelErrorType “Isochronous mode mismatch” 0x8004 */
+ /*ExtChannelErrorType for ChannelErrorType "Isochronous mode mismatch" 0x8004 */
static const value_string pn_io_ext_channel_error_type0x8004[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Output Time Failure – Output update missing or out of order"},
- { 0x8001, "Input Time Failure"},
- { 0x8002, "Master Life Sign Failure – Error in MLS update detected"},
- /* 0x8003 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Output Time Failure - Output update missing or out of order"},
+ { 0x8001, "Input Time Failure"},
+ { 0x8002, "Master Life Sign Failure - Error in MLS update detected"},
+ /* 0x8003 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Multicast CR mismatch” 0x8005 */
+ /* ExtChannelErrorType for ChannelErrorType "Multicast CR mismatch" 0x8005 */
static const value_string pn_io_ext_channel_error_type0x8005[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Multicast Consumer CR timed out"},
- { 0x8001, "Address resolution failed"},
- /* 0x8002 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Multicast Consumer CR timed out"},
+ { 0x8001, "Address resolution failed"},
+ /* 0x8002 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Fiber optic mismatch” 0x8007*/
+ /* ExtChannelErrorType for ChannelErrorType "Fiber optic mismatch" 0x8007*/
static const value_string pn_io_ext_channel_error_type0x8007[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Power Budget"},
- /* 0x8001 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Power Budget"},
+ /* 0x8001 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Network component function mismatch” 0x8008 */
+ /* ExtChannelErrorType for ChannelErrorType "Network component function mismatch" 0x8008 */
static const value_string pn_io_ext_channel_error_type0x8008[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "Frame dropped – no resource"},
- /* 0x8001 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "Frame dropped - no resource"},
+ /* 0x8001 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Dynamic Frame Packing function mismatch” 0x800A */
+ /* ExtChannelErrorType for ChannelErrorType "Dynamic Frame Packing function mismatch" 0x800A */
static const value_string pn_io_ext_channel_error_type0x800A[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- /* 0x8000 – 0x80FF Reserved */
- { 0x8100, "Frame late error for FrameID “0x0100”"},
- /* 0x8101 + 0x8FFE See Equation (56) */
- { 0x8FFF, "Frame late error for FrameID “0x0FFF”"},
- /* 0x8001 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ /* 0x8000 - 0x80FF Reserved */
+ { 0x8100, "Frame late error for FrameID "0x0100""},
+ /* 0x8101 + 0x8FFE See Equation (56) */
+ { 0x8FFF, "Frame late error for FrameID "0x0FFF""},
+ /* 0x8001 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “Media redundancy with planned duplication mismatch” 0x800B */
+ /* ExtChannelErrorType for ChannelErrorType "Media redundancy with planned duplication mismatch" 0x800B */
static const value_string pn_io_ext_channel_error_type0x800B[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- /* 0x8000 – 0x86FF Reserved */
- { 0x8700, "MRPD duplication void for FrameID “0x0700”"},
- /* 0x8701 + 0x8FFE See Equation (57) */
- { 0x8FFF, "MRPD duplication void for FrameID “0x0FFF”"},
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ /* 0x8000 - 0x86FF Reserved */
+ { 0x8700, "MRPD duplication void for FrameID "0x0700""},
+ /* 0x8701 + 0x8FFE See Equation (57) */
+ { 0x8FFF, "MRPD duplication void for FrameID "0x0FFF""},
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
- /* ExtChannelErrorType for ChannelErrorType “System redundancy mismatch” 0x800C */
+ /* ExtChannelErrorType for ChannelErrorType "System redundancy mismatch" 0x800C */
static const value_string pn_io_ext_channel_error_type0x800C[] = {
- /* 0x0000 Reserved */
- /* 0x0001 – 0x7FFF Manufacturer specific */
- { 0x8000, "System redundandancy event"},
- /* 0x8001 – 0x8FFF Reserved */
- /* 0x9000 – 0x9FFF Reserved for profiles */
- /* 0xA000 – 0xFFFF Reserved */
+ /* 0x0000 Reserved */
+ /* 0x0001 - 0x7FFF Manufacturer specific */
+ { 0x8000, "System redundancy event"},
+ /* 0x8001 - 0x8FFF Reserved */
+ /* 0x9000 - 0x9FFF Reserved for profiles */
+ /* 0xA000 - 0xFFFF Reserved */
{ 0, NULL }
};
static const value_string pn_io_channel_properties_type[] = {
- { 0x0000, "submodule or unspecified" },
- { 0x0001, "1 Bit" },
- { 0x0002, "2 Bit" },
- { 0x0003, "4 Bit" },
- { 0x0004, "8 Bit" },
- { 0x0005, "16 Bit" },
- { 0x0006, "32 Bit" },
- { 0x0007, "64 Bit" },
+ { 0x0000, "submodule or unspecified" },
+ { 0x0001, "1 Bit" },
+ { 0x0002, "2 Bit" },
+ { 0x0003, "4 Bit" },
+ { 0x0004, "8 Bit" },
+ { 0x0005, "16 Bit" },
+ { 0x0006, "32 Bit" },
+ { 0x0007, "64 Bit" },
/*0x0008 - 0x00FF reserved */
{ 0, NULL }
};
@@ -2142,56 +2142,56 @@ static const value_string pn_io_channel_properties_maintenance[] = {
};
static const value_string pn_io_channel_properties_specifier[] = {
- { 0x0000, "All subsequent disappears" },
- { 0x0001, "Appears" },
- { 0x0002, "Disappears" },
- { 0x0003, "disappears but other remain" },
+ { 0x0000, "All subsequent disappears" },
+ { 0x0001, "Appears" },
+ { 0x0002, "Disappears" },
+ { 0x0003, "Disappears but others remain" },
{ 0, NULL }
};
static const value_string pn_io_channel_properties_direction[] = {
- { 0x0000, "manufacturer specific" },
- { 0x0001, "Input" },
- { 0x0002, "Output" },
- { 0x0003, "Input/Output" },
+ { 0x0000, "Manufacturer-specific" },
+ { 0x0001, "Input" },
+ { 0x0002, "Output" },
+ { 0x0003, "Input/Output" },
/*0x0004 - 0x0007 reserved */
{ 0, NULL }
};
static const value_string pn_io_alarmcr_type[] = {
- { 0x0000, "reserved" },
- { 0x0001, "Alarm CR" },
+ { 0x0000, "reserved" },
+ { 0x0001, "Alarm CR" },
/*0x0002 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_mau_type[] = {
/*0x0000 - 0x0004 reserved */
- { 0x0005, "10BASET" },
+ { 0x0005, "10BASET" },
/*0x0006 - 0x0009 reserved */
- { 0x000A, "10BASETXHD" },
- { 0x000B, "10BASETXFD" },
- { 0x000C, "10BASEFLHD" },
- { 0x000D, "10BASEFLFD" },
- { 0x000F, "100BASETXHD" },
- { 0x0010, "100BASETXFD" },
- { 0x0011, "100BASEFXHD" },
- { 0x0012, "100BASEFXFD" },
+ { 0x000A, "10BASETXHD" },
+ { 0x000B, "10BASETXFD" },
+ { 0x000C, "10BASEFLHD" },
+ { 0x000D, "10BASEFLFD" },
+ { 0x000F, "100BASETXHD" },
+ { 0x0010, "100BASETXFD" },
+ { 0x0011, "100BASEFXHD" },
+ { 0x0012, "100BASEFXFD" },
/*0x0013 - 0x0014 reserved */
- { 0x0015, "1000BASEXHD" },
- { 0x0016, "1000BASEXFD" },
- { 0x0017, "1000BASELXHD" },
- { 0x0018, "1000BASELXFD" },
- { 0x0019, "1000BASESXHD" },
- { 0x001A, "1000BASESXFD" },
+ { 0x0015, "1000BASEXHD" },
+ { 0x0016, "1000BASEXFD" },
+ { 0x0017, "1000BASELXHD" },
+ { 0x0018, "1000BASELXFD" },
+ { 0x0019, "1000BASESXHD" },
+ { 0x001A, "1000BASESXFD" },
/*0x001B - 0x001C reserved */
- { 0x001D, "1000BASETHD" },
- { 0x001E, "1000BASETFD" },
- { 0x001F, "10GigBASEFX" },
+ { 0x001D, "1000BASETHD" },
+ { 0x001E, "1000BASETFD" },
+ { 0x001F, "10GigBASEFX" },
/*0x0020 - 0x002D reserved */
- { 0x002E, "100BASELX10" },
+ { 0x002E, "100BASELX10" },
/*0x002F - 0x0035 reserved */
- { 0x0036, "100BASEPXFD" },
+ { 0x0036, "100BASEPXFD" },
/*0x0037 - 0xFFFF reserved */
{ 0, NULL }
};
@@ -2205,61 +2205,61 @@ static const value_string pn_io_preamble_length[] = {
};
static const value_string pn_io_mau_type_mode[] = {
- { 0x0000, "OFF" },
- { 0x0001, "ON" },
+ { 0x0000, "OFF" },
+ { 0x0001, "ON" },
/*0x0002 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_port_state[] = {
- { 0x0000, "reserved" },
- { 0x0001, "up" },
- { 0x0002, "down" },
- { 0x0003, "testing" },
- { 0x0004, "unknown" },
+ { 0x0000, "reserved" },
+ { 0x0001, "up" },
+ { 0x0002, "down" },
+ { 0x0003, "testing" },
+ { 0x0004, "unknown" },
/*0x0005 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_media_type[] = {
- { 0x0000, "unknown" },
- { 0x0001, "Copper cable" },
- { 0x0002, "Fiber optic cable" },
- { 0x0003, "Radio communication" },
+ { 0x0000, "Unknown" },
+ { 0x0001, "Copper cable" },
+ { 0x0002, "Fiber optic cable" },
+ { 0x0003, "Radio communication" },
/*0x0004 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_fiber_optic_type[] = {
- { 0x0000, "No fiber type adjusted" },
- { 0x0001, "9 um single mode fiber" },
- { 0x0002, "50 um multi mode fiber" },
- { 0x0003, "62,5 um multi mode fiber" },
- { 0x0004, "SI-POF, NA=0.5" },
- { 0x0005, "SI-PCF, NA=0.36" },
- { 0x0006, "LowNA-POF, NA=0.3" },
- { 0x0007, "GI-POF" },
+ { 0x0000, "No fiber type adjusted" },
+ { 0x0001, "9 um single mode fiber" },
+ { 0x0002, "50 um multi mode fiber" },
+ { 0x0003, "62,5 um multi mode fiber" },
+ { 0x0004, "SI-POF, NA=0.5" },
+ { 0x0005, "SI-PCF, NA=0.36" },
+ { 0x0006, "LowNA-POF, NA=0.3" },
+ { 0x0007, "GI-POF" },
/*0x0008 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_fiber_optic_cable_type[] = {
- { 0x0000, "No cable specified" },
- { 0x0001, "inside/outside cable, fixed installation" },
- { 0x0002, "inside/outside cable, flexible installation" },
- { 0x0003, "outdoor cable, fixed installation" },
+ { 0x0000, "No cable specified" },
+ { 0x0001, "Inside/outside cable, fixed installation" },
+ { 0x0002, "Inside/outside cable, flexible installation" },
+ { 0x0003, "Outdoor cable, fixed installation" },
/*0x0004 - 0xFFFF reserved */
{ 0, NULL }
};
static const value_string pn_io_im_revision_prefix_vals[] = {
- { 'V', "V - officially released version" },
+ { 'V', "V - Officially released version" },
{ 'R', "R - Revision" },
- { 'P', "P - prototoype" },
+ { 'P', "P - Protoype" },
{ 'U', "U - Under Test (Field Test)" },
{ 'T', "T - Test Device" },
/*all others reserved */
@@ -2337,17 +2337,17 @@ static const value_string pn_io_fs_parameter_mode_vals[] = {
};
static const value_string pn_io_frame_details_sync_master_vals[] = {
- { 0x0000, "No Sync Frame" },
- { 0x0001, "Primary sync frame" },
- { 0x0002, "Secondary sync frame" },
- { 0x0003, "Reserved" },
+ { 0x0000, "No Sync Frame" },
+ { 0x0001, "Primary sync frame" },
+ { 0x0002, "Secondary sync frame" },
+ { 0x0003, "Reserved" },
{ 0, NULL }
};
static const value_string pn_io_frame_details_meaning_frame_send_offset_vals[] = {
- { 0x0000, "Field FrameSendOffset specifies the point of time for receiving or transmitting a frame " },
- { 0x0001, "Field FrameSendOffset specifies the beginning of the RT_CLASS_3 interval within a phase" },
- { 0x0002, "Field FrameSendOffset specifies the ending of the RT_CLASS_3 interval within a phase" },
- { 0x0003, "Reserved" },
+ { 0x0000, "Field FrameSendOffset specifies the point of time for receiving or transmitting a frame " },
+ { 0x0001, "Field FrameSendOffset specifies the beginning of the RT_CLASS_3 interval within a phase" },
+ { 0x0002, "Field FrameSendOffset specifies the ending of the RT_CLASS_3 interval within a phase" },
+ { 0x0003, "Reserved" },
{ 0, NULL }
};
@@ -2451,57 +2451,57 @@ typedef struct pnio_ar_s {
static void
pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar)
{
- proto_item *item;
- proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_item *item;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
pinfo->profinet_conv = ar;
pinfo->profinet_type = 10;
- if (tree) {
- sub_item = proto_tree_add_text(tree, tvb, 0, 0, "ARUUID:%s ContrMAC:%s ContrAlRef:0x%x DevMAC:%s DevAlRef:0x%x InCR:0x%x OutCR=0x%x",
+ if (tree) {
+ sub_item = proto_tree_add_text(tree, tvb, 0, 0, "ARUUID:%s ContrMAC:%s ContrAlRef:0x%x DevMAC:%s DevAlRef:0x%x InCR:0x%x OutCR=0x%x",
guid_to_str((const e_guid_t*) &ar->aruuid),
ether_to_str((const guint8 *)ar->controllermac), ar->controlleralarmref,
ether_to_str((const guint8 *)ar->devicemac), ar->devicealarmref,
ar->inputframeid, ar->outputframeid);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_ar_info);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_ar_info);
PROTO_ITEM_SET_GENERATED(sub_item);
- item = proto_tree_add_guid(sub_tree, hf_pn_io_ar_uuid, tvb, 0, 0, (e_guid_t *) &ar->aruuid);
+ item = proto_tree_add_guid(sub_tree, hf_pn_io_ar_uuid, tvb, 0, 0, (e_guid_t *) &ar->aruuid);
PROTO_ITEM_SET_GENERATED(item);
- item = proto_tree_add_ether(sub_tree, hf_pn_io_cminitiator_macadd, tvb, 0, 0, ar->controllermac);
+ item = proto_tree_add_ether(sub_tree, hf_pn_io_cminitiator_macadd, tvb, 0, 0, ar->controllermac);
PROTO_ITEM_SET_GENERATED(item);
- item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->controlleralarmref);
+ item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->controlleralarmref);
PROTO_ITEM_SET_GENERATED(item);
- item = proto_tree_add_ether(sub_tree, hf_pn_io_cmresponder_macadd, tvb, 0, 0, ar->devicemac);
+ item = proto_tree_add_ether(sub_tree, hf_pn_io_cmresponder_macadd, tvb, 0, 0, ar->devicemac);
PROTO_ITEM_SET_GENERATED(item);
- item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->devicealarmref);
+ item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->devicealarmref);
PROTO_ITEM_SET_GENERATED(item);
- item = proto_tree_add_uint(sub_tree, hf_pn_io_frame_id, tvb, 0, 0, ar->inputframeid);
+ item = proto_tree_add_uint(sub_tree, hf_pn_io_frame_id, tvb, 0, 0, ar->inputframeid);
PROTO_ITEM_SET_GENERATED(item);
- item = proto_tree_add_uint(sub_tree, hf_pn_io_frame_id, tvb, 0, 0, ar->outputframeid);
+ item = proto_tree_add_uint(sub_tree, hf_pn_io_frame_id, tvb, 0, 0, ar->outputframeid);
PROTO_ITEM_SET_GENERATED(item);
- }
+ }
}
static int dissect_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar);
+ packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar);
static int dissect_a_block(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, guint8 *drep);
static int dissect_blocks(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep);
+ packet_info *pinfo, proto_tree *tree, guint8 *drep);
static int dissect_PNIO_IOxS(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep, int hfindex);
+ packet_info *pinfo, proto_tree *tree, guint8 *drep, int hfindex);
@@ -2550,7 +2550,7 @@ pnio_ar_new(e_uuid_t *aruuid)
/* dissect the four status (error) fields */
static int
dissect_PNIO_status(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint8 u8ErrorCode;
guint8 u8ErrorDecode;
@@ -2558,8 +2558,8 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
guint8 u8ErrorCode2;
proto_item *sub_item;
- proto_tree *sub_tree;
- guint32 u32SubStart;
+ proto_tree *sub_tree;
+ guint32 u32SubStart;
int bytemask = (drep[0] & DREP_LITTLE_ENDIAN) ? 3 : 0;
const value_string *error_code1_vals;
const value_string *error_code2_vals = pn_io_error_code2; /* defaults */
@@ -2568,7 +2568,7 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
/* status */
sub_item = proto_tree_add_item(tree, hf_pn_io_status, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_status);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_status);
u32SubStart = offset;
/* the PNIOStatus field is existing in both the RPC and the application data,
@@ -2577,198 +2577,198 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
* in a somewhat different way than elsewhere. */
dissect_dcerpc_uint8(tvb, offset+(0^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code, &u8ErrorCode);
+ hf_pn_io_error_code, &u8ErrorCode);
dissect_dcerpc_uint8(tvb, offset+(1^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_decode, &u8ErrorDecode);
+ hf_pn_io_error_decode, &u8ErrorDecode);
switch(u8ErrorDecode) {
case(0x80): /* PNIORW */
dissect_dcerpc_uint8(tvb, offset+(2^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code1_pniorw, &u8ErrorCode1);
+ hf_pn_io_error_code1_pniorw, &u8ErrorCode1);
error_code1_vals = pn_io_error_code1_pniorw;
/* u8ErrorCode2 for PNIORW is always user specific */
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pniorw, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pniorw, &u8ErrorCode2);
- error_code2_vals = pn_io_error_code2_pniorw;
+ error_code2_vals = pn_io_error_code2_pniorw;
break;
case(0x81): /* PNIO */
dissect_dcerpc_uint8(tvb, offset+(2^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code1_pnio, &u8ErrorCode1);
+ hf_pn_io_error_code1_pnio, &u8ErrorCode1);
error_code1_vals = pn_io_error_code1_pnio;
switch(u8ErrorCode1) {
case(1):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_1, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_1, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_1;
break;
case(2):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_2, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_2, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_2;
break;
case(3):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_3, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_3, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_3;
break;
case(4):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_4, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_4, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_4;
break;
case(5):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_5, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_5, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_5;
break;
case(6):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_6, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_6, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_6;
break;
case(7):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_7, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_7, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_7;
break;
case(8):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_8, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_8, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_8;
break;
case(20):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_20, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_20, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_20;
break;
case(21):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_21, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_21, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_21;
break;
case(22):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_22, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_22, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_22;
break;
case(23):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_23, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_23, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_23;
break;
case(40):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_40, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_40, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_40;
break;
case(61):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_61, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_61, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_61;
break;
case(62):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_62, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_62, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_62;
break;
case(63):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_63, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_63, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_63;
break;
case(64):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_64, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_64, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_64;
break;
case(65):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_65, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_65, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_65;
break;
case(66):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_66, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_66, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_66;
break;
case(70):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_70, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_70, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_70;
break;
case(71):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_71, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_71, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_71;
break;
case(72):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_72, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_72, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_72;
break;
case(73):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_73, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_73, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_73;
break;
case(74):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_74, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_74, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_74;
break;
case(75):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_75, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_75, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_75;
break;
case(76):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_76, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_76, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_76;
break;
case(77):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_77, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_77, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_77;
break;
case(253):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_253, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_253, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_253;
break;
case(255):
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2_pnio_255, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2_pnio_255, &u8ErrorCode2);
error_code2_vals = pn_io_error_code2_pnio_255;
break;
default:
/* don't know this u8ErrorCode1 for PNIO, use defaults */
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2, &u8ErrorCode2);
expert_add_info_format(pinfo, sub_item, PI_UNDECODED, PI_WARN,
- "Unknown ErrorCode1 0x%x (for ErrorDecode==PNIO)", u8ErrorCode1);
+ "Unknown ErrorCode1 0x%x (for ErrorDecode==PNIO)", u8ErrorCode1);
break;
}
break;
default:
- dissect_dcerpc_uint8(tvb, offset+(2^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code1, &u8ErrorCode1);
+ dissect_dcerpc_uint8(tvb, offset+(2^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code1, &u8ErrorCode1);
if(u8ErrorDecode!=0) {
expert_add_info_format(pinfo, sub_item, PI_UNDECODED, PI_WARN,
- "Unknown ErrorDecode 0x%x", u8ErrorDecode);
+ "Unknown ErrorDecode 0x%x", u8ErrorDecode);
}
error_code1_vals = pn_io_error_code1;
/* don't know this u8ErrorDecode, use defaults */
- dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
- hf_pn_io_error_code2, &u8ErrorCode2);
+ dissect_dcerpc_uint8(tvb, offset+(3^bytemask), pinfo, sub_tree, drep,
+ hf_pn_io_error_code2, &u8ErrorCode2);
if(u8ErrorDecode != 0) {
expert_add_info_format(pinfo, sub_item, PI_UNDECODED, PI_WARN,
- "Unknown ErrorDecode 0x%x", u8ErrorDecode);
+ "Unknown ErrorDecode 0x%x", u8ErrorDecode);
}
}
@@ -2776,7 +2776,7 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
if(u8ErrorCode == 0 && u8ErrorDecode == 0 && u8ErrorCode1 == 0 && u8ErrorCode2 == 0) {
proto_item_append_text(sub_item, ": OK");
- col_append_str(pinfo->cinfo, COL_INFO, ", OK");
+ col_append_str(pinfo->cinfo, COL_INFO, ", OK");
} else {
proto_item_append_text(sub_item, ": Error: \"%s\", \"%s\", \"%s\", \"%s\"",
val_to_str(u8ErrorCode, pn_io_error_code, "(0x%x)"),
@@ -2798,7 +2798,7 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
/* dissect the alarm specifier */
static int
dissect_Alarm_specifier(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint16 u16AlarmSpecifierSequence;
guint16 u16AlarmSpecifierChannel;
@@ -2806,25 +2806,25 @@ dissect_Alarm_specifier(tvbuff_t *tvb, int offset,
guint16 u16AlarmSpecifierSubmodule;
guint16 u16AlarmSpecifierAR;
proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_tree *sub_tree;
/* alarm specifier */
- sub_item = proto_tree_add_item(tree, hf_pn_io_alarm_specifier, tvb, offset, 2, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_pdu_type);
+ sub_item = proto_tree_add_item(tree, hf_pn_io_alarm_specifier, tvb, offset, 2, ENC_BIG_ENDIAN);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_pdu_type);
- dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarm_specifier_sequence, &u16AlarmSpecifierSequence);
u16AlarmSpecifierSequence &= 0x07FF;
- dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarm_specifier_channel, &u16AlarmSpecifierChannel);
u16AlarmSpecifierChannel = (u16AlarmSpecifierChannel &0x0800) >> 11;
- dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarm_specifier_manufacturer, &u16AlarmSpecifierManufacturer);
u16AlarmSpecifierManufacturer = (u16AlarmSpecifierManufacturer &0x1000) >> 12;
- dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarm_specifier_submodule, &u16AlarmSpecifierSubmodule);
u16AlarmSpecifierSubmodule = (u16AlarmSpecifierSubmodule & 0x2000) >> 13;
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarm_specifier_ardiagnosis, &u16AlarmSpecifierAR);
u16AlarmSpecifierAR = (u16AlarmSpecifierAR & 0x8000) >> 15;
@@ -2840,20 +2840,20 @@ dissect_Alarm_specifier(tvbuff_t *tvb, int offset,
/* dissect the alarm header */
static int
dissect_Alarm_header(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
{
guint16 u16AlarmType;
guint32 u32Api;
guint16 u16SlotNr;
guint16 u16SubslotNr;
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_alarm_type, &u16AlarmType);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_api, &u32Api);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
proto_item_append_text(item, ", %s, API:%u, Slot:0x%x/0x%x",
@@ -2870,15 +2870,15 @@ dissect_Alarm_header(tvbuff_t *tvb, int offset,
static int
dissect_ChannelProperties(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep)
{
- proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
guint16 u16ChannelProperties;
sub_item = proto_tree_add_item(tree, hf_pn_io_channel_properties, tvb, offset, 2, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_channel_properties);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_channel_properties);
dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_channel_properties_direction, &u16ChannelProperties);
dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
@@ -2902,7 +2902,7 @@ dissect_ChannelProperties(tvbuff_t *tvb, int offset,
static int
dissect_AlarmUserStructure(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep,
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep,
guint16 *body_length, guint16 u16UserStructureIdentifier)
{
guint16 u16ChannelNumber;
@@ -3026,25 +3026,25 @@ dissect_AlarmUserStructure(tvbuff_t *tvb, int offset,
/* dissect the alarm notification block */
static int
dissect_AlarmNotification_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 body_length)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 body_length)
{
guint32 u32ModuleIdentNumber;
guint32 u32SubmoduleIdentNumber;
guint16 u16UserStructureIdentifier;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_Alarm_header(tvb, offset, pinfo, tree, item, drep);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_module_ident_number, &u32ModuleIdentNumber);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_submodule_ident_number, &u32SubmoduleIdentNumber);
offset = dissect_Alarm_specifier(tvb, offset, pinfo, tree, drep);
@@ -3070,7 +3070,7 @@ dissect_AlarmNotification_block(tvbuff_t *tvb, int offset,
static int
dissect_IandM0_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint8 u8VendorIDHigh;
guint8 u8VendorIDLow;
@@ -3089,11 +3089,11 @@ dissect_IandM0_block(tvbuff_t *tvb, int offset,
guint16 u16IMSupported;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* x8 VendorIDHigh */
offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
@@ -3155,16 +3155,16 @@ dissect_IandM0_block(tvbuff_t *tvb, int offset,
static int
dissect_IandM1_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
char *pTagFunction;
char *pTagLocation;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* IM_Tag_Function [32] */
pTagFunction = ep_alloc(32+1);
@@ -3188,15 +3188,15 @@ dissect_IandM1_block(tvbuff_t *tvb, int offset,
static int
dissect_IandM2_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
char *pDate;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* IM_Date [16] */
pDate = ep_alloc(16+1);
@@ -3213,15 +3213,15 @@ dissect_IandM2_block(tvbuff_t *tvb, int offset,
static int
dissect_IandM3_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
char *pDescriptor;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* IM_Descriptor [54] */
pDescriptor = ep_alloc(54+1);
@@ -3238,14 +3238,14 @@ dissect_IandM3_block(tvbuff_t *tvb, int offset,
static int
dissect_IandM4_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
dissect_pn_user_data(tvb, offset, pinfo, tree, 54, "IM Signature");
@@ -3255,7 +3255,7 @@ dissect_IandM4_block(tvbuff_t *tvb, int offset,
static int
dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16NumberOfAPIs;
guint32 u32Api;
@@ -3272,11 +3272,11 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
guint32 u32ModuleStart;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* NumberOfAPIs */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -3284,10 +3284,10 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
while(u16NumberOfAPIs--) {
/* API */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_api, &u32Api);
/* NumberOfModules */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_modules, &u16NumberOfModules);
while(u16NumberOfModules--) {
@@ -3297,13 +3297,13 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
u32ModuleStart = offset;
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* ModuleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_module_ident_number, &u32ModuleIdentNumber);
/* NumberOfSubmodules */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_number_of_submodules, &u16NumberOfSubmodules);
proto_item_append_text(module_item, ": Slot:%u, Ident:0x%x Submodules:%u",
@@ -3314,10 +3314,10 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
subslot_tree = proto_item_add_subtree(subslot_item, ett_pn_io_subslot);
/* SubslotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, subslot_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, subslot_tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* SubmoduleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, subslot_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, subslot_tree, drep,
hf_pn_io_submodule_ident_number, &u32SubmoduleIdentNumber);
proto_item_append_text(subslot_item, ": Number:0x%x, Ident:0x%x",
@@ -3335,7 +3335,7 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
/* dissect the IdentificationData block */
static int
dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16NumberOfAPIs = 1;
guint32 u32Api;
@@ -3352,15 +3352,15 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
proto_tree *subslot_tree;
- if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
+ if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
if(u8BlockVersionLow == 1) {
/* NumberOfAPIs */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_apis, &u16NumberOfAPIs);
}
@@ -3369,12 +3369,12 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
while(u16NumberOfAPIs--) {
if(u8BlockVersionLow == 1) {
/* API */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_api, &u32Api);
}
/* NumberOfSlots */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_slots, &u16NumberOfSlots);
proto_item_append_text(item, ", Slots:%u", u16NumberOfSlots);
@@ -3385,13 +3385,13 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
u32SlotStart = offset;
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, slot_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, slot_tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* ModuleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, slot_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, slot_tree, drep,
hf_pn_io_module_ident_number, &u32ModuleIdentNumber);
/* NumberOfSubslots */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, slot_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, slot_tree, drep,
hf_pn_io_number_of_subslots, &u16NumberOfSubslots);
proto_item_append_text(slot_item, ": SlotNr:%u Ident:0x%x Subslots:%u",
@@ -3399,13 +3399,13 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
while(u16NumberOfSubslots--) {
subslot_item = proto_tree_add_item(slot_tree, hf_pn_io_subslot, tvb, offset, 6, ENC_BIG_ENDIAN);
- subslot_tree = proto_item_add_subtree(subslot_item, ett_pn_io_subslot);
+ subslot_tree = proto_item_add_subtree(subslot_item, ett_pn_io_subslot);
/* SubslotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, subslot_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, subslot_tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* SubmoduleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, subslot_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, subslot_tree, drep,
hf_pn_io_submodule_ident_number, &u32SubmoduleIdentNumber);
proto_item_append_text(subslot_item, ": Number:0x%x, Ident:0x%x",
@@ -3423,16 +3423,16 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
/* dissect the substitute value block */
static int
dissect_SubstituteValue_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint16 u16SubstitutionMode;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* SubstitutionMode */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -3453,18 +3453,18 @@ dissect_SubstituteValue_block(tvbuff_t *tvb, int offset,
/* dissect the RecordInputDataObjectElement block */
static int
dissect_RecordInputDataObjectElement_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint8 u8LengthIOCS;
guint8 u8LengthIOPS;
guint16 u16LengthData;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* LengthIOCS */
offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
@@ -3489,7 +3489,7 @@ dissect_RecordInputDataObjectElement_block(tvbuff_t *tvb, int offset,
/* dissect the RecordOutputDataObjectElement block */
static int
dissect_RecordOutputDataObjectElement_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16SubstituteActiveFlag;
guint8 u8LengthIOCS;
@@ -3500,11 +3500,11 @@ dissect_RecordOutputDataObjectElement_block(tvbuff_t *tvb, int offset,
pnio_ar_t *ar = NULL;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* SubstituteActiveFlag */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -3536,15 +3536,15 @@ dissect_RecordOutputDataObjectElement_block(tvbuff_t *tvb, int offset,
/* dissect the alarm acknowledge block */
static int
dissect_Alarm_ack_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- col_append_str(pinfo->cinfo, COL_INFO, ", Alarm Ack");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Alarm Ack");
offset = dissect_Alarm_header(tvb, offset, pinfo, tree, item, drep);
@@ -3559,18 +3559,18 @@ dissect_Alarm_ack_block(tvbuff_t *tvb, int offset,
/* dissect the maintenance block */
static int
dissect_Maintenance_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
proto_item *sub_item;
proto_tree *sub_tree;
guint32 u32MaintenanceStatus;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -3599,28 +3599,28 @@ dissect_Maintenance_block(tvbuff_t *tvb, int offset,
/* dissect the read/write header */
static int
dissect_ReadWrite_header(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint16 *u16Index, e_uuid_t *aruuid)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint16 *u16Index, e_uuid_t *aruuid)
{
guint32 u32Api;
guint16 u16SlotNr;
guint16 u16SubslotNr;
guint16 u16SeqNr;
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_seq_number, &u16SeqNr);
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_uuid, aruuid);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_api, &u32Api);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* padding doesn't match offset required for align4 */
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_index, u16Index);
proto_item_append_text(item, ": Seq:%u, Api:0x%x, Slot:0x%x/0x%x",
@@ -3637,17 +3637,17 @@ dissect_ReadWrite_header(tvbuff_t *tvb, int offset,
/* dissect the write request block */
static int
dissect_IODWriteReqHeader_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t ** ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t ** ar)
{
e_uuid_t aruuid;
e_uuid_t null_uuid;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_ReadWrite_header(tvb, offset, pinfo, tree, item, drep, u16Index, &aruuid);
@@ -3656,7 +3656,7 @@ dissect_IODWriteReqHeader_block(tvbuff_t *tvb, int offset,
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_NOTE, "IODWriteReq: AR information not found!");
}
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_record_data_length, u32RecDataLen);
memset(&null_uuid, 0, sizeof(e_uuid_t));
@@ -3670,7 +3670,7 @@ dissect_IODWriteReqHeader_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ", Len:%u", *u32RecDataLen);
if (*u32RecDataLen != 0)
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
*u32RecDataLen);
return offset;
@@ -3680,17 +3680,17 @@ dissect_IODWriteReqHeader_block(tvbuff_t *tvb, int offset,
/* dissect the read request block */
static int
dissect_IODReadReqHeader_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
{
e_uuid_t aruuid;
e_uuid_t null_uuid;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_ReadWrite_header(tvb, offset, pinfo, tree, item, drep, u16Index, &aruuid);
@@ -3699,7 +3699,7 @@ dissect_IODReadReqHeader_block(tvbuff_t *tvb, int offset,
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_NOTE, "IODReadReq: AR information not found!");
}
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_record_data_length, u32RecDataLen);
memset(&null_uuid, 0, sizeof(e_uuid_t));
@@ -3714,7 +3714,7 @@ dissect_IODReadReqHeader_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ", Len:%u", *u32RecDataLen);
if (*u32RecDataLen != 0)
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
*u32RecDataLen);
return offset;
@@ -3724,8 +3724,8 @@ dissect_IODReadReqHeader_block(tvbuff_t *tvb, int offset,
/* dissect the write response block */
static int
dissect_IODWriteResHeader_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
{
e_uuid_t aruuid;
guint16 u16AddVal1;
@@ -3733,11 +3733,11 @@ dissect_IODWriteResHeader_block(tvbuff_t *tvb, int offset,
guint32 u32Status;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_ReadWrite_header(tvb, offset, pinfo, tree, item, drep, u16Index, &aruuid);
@@ -3746,28 +3746,28 @@ dissect_IODWriteResHeader_block(tvbuff_t *tvb, int offset,
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_NOTE, "IODWriteRes: AR information not found!");
}
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_record_data_length, u32RecDataLen);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_add_val1, &u16AddVal1);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_add_val2, &u16AddVal2);
u32Status = ((drep[0] & DREP_LITTLE_ENDIAN)
? tvb_get_letohl (tvb, offset)
: tvb_get_ntohl (tvb, offset));
- offset = dissect_PNIO_status(tvb, offset, pinfo, tree, drep);
+ offset = dissect_PNIO_status(tvb, offset, pinfo, tree, drep);
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 16);
- proto_item_append_text(item, ", Len:%u, Index:0x%x, Status:0x%x, Val1:%u, Val2:%u",
+ proto_item_append_text(item, ", Len:%u, Index:0x%x, Status:0x%x, Val1:%u, Val2:%u",
*u32RecDataLen, *u16Index, u32Status, u16AddVal1, u16AddVal2);
if (*u32RecDataLen != 0)
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
*u32RecDataLen);
return offset;
@@ -3777,19 +3777,19 @@ dissect_IODWriteResHeader_block(tvbuff_t *tvb, int offset,
/* dissect the read response block */
static int
dissect_IODReadResHeader_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
{
e_uuid_t aruuid;
guint16 u16AddVal1;
guint16 u16AddVal2;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_ReadWrite_header(tvb, offset, pinfo, tree, item, drep, u16Index, &aruuid);
@@ -3798,13 +3798,13 @@ dissect_IODReadResHeader_block(tvbuff_t *tvb, int offset,
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_NOTE, "IODReadRes: AR information not found!");
}
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_record_data_length, u32RecDataLen);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_add_val1, &u16AddVal1);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_add_val2, &u16AddVal2);
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 20);
@@ -3813,7 +3813,7 @@ dissect_IODReadResHeader_block(tvbuff_t *tvb, int offset,
*u32RecDataLen, u16AddVal1, u16AddVal2);
if (*u32RecDataLen != 0)
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %u bytes",
*u32RecDataLen);
return offset;
@@ -3823,22 +3823,22 @@ dissect_IODReadResHeader_block(tvbuff_t *tvb, int offset,
/* dissect the control/connect block */
static int
dissect_ControlConnect_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t **ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t **ar)
{
e_uuid_t ar_uuid;
guint16 u16SessionKey;
- proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
guint16 u16Command;
guint16 u16Properties;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_reserved16, NULL);
@@ -3858,7 +3858,7 @@ dissect_ControlConnect_block(tvbuff_t *tvb, int offset,
hf_pn_io_reserved16, NULL);
sub_item = proto_tree_add_item(tree, hf_pn_io_control_command, tvb, offset, 2, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_control_command);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_control_command);
dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_control_command_prmend, &u16Command);
@@ -3945,14 +3945,14 @@ dissect_ControlBlockPrmBegin(tvbuff_t *tvb, int offset,
/* SessionKey */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_sessionkey, &u16SessionKey);
- offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
+ offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
/* ControlCommand */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_control_command, &u16Command);
- if(u16Command == 0x40)
- {
- proto_item_append_text(item, " PrmBegin");
- }
+ if(u16Command == 0x40)
+ {
+ proto_item_append_text(item, " PrmBegin");
+ }
/* ControlBlockProperties.reserved */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_control_command_reserved, NULL);
@@ -3994,14 +3994,14 @@ dissect_SubmoduleListBlock(tvbuff_t *tvb, int offset,
/* dissect the PDevData block */
static int
dissect_PDevData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -4081,27 +4081,27 @@ dissect_PDPortData_Adjust_block(tvbuff_t *tvb, int offset,
/* dissect the PDPortDataCheck blocks */
static int
dissect_PDPortData_Check_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint16 u16SlotNr;
guint16 u16SubslotNr;
tvbuff_t *new_tvb;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
proto_item_append_text(item, ": Slot:0x%x/0x%x", u16SlotNr, u16SubslotNr);
@@ -4121,7 +4121,7 @@ dissect_PDPortData_Check_block(tvbuff_t *tvb, int offset,
/* dissect the PDPortDataReal blocks */
static int
dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16SlotNr;
guint16 u16SubslotNr;
@@ -4142,23 +4142,23 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
guint32 u32MediaType;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* LengthOwnPortID */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_length_own_port_id, &u8LengthOwnPortID);
/* OwnPortID */
pOwnPortID = ep_alloc(u8LengthOwnPortID+1);
@@ -4168,7 +4168,7 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
offset += u8LengthOwnPortID;
/* NumberOfPeers */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_peers, &u8NumberOfPeers);
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -4176,7 +4176,7 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
u8I = u8NumberOfPeers;
while(u8I--) {
/* LengthPeerPortID */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_length_peer_port_id, &u8LengthPeerPortID);
/* PeerPortID */
pPeerPortID = ep_alloc(u8LengthPeerPortID+1);
@@ -4186,7 +4186,7 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
offset += u8LengthPeerPortID;
/* LengthPeerChassisID */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_length_peer_chassis_id, &u8LengthPeerChassisID);
/* PeerChassisID */
pPeerChassisID = ep_alloc(u8LengthPeerChassisID+1);
@@ -4199,7 +4199,7 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* LineDelay */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_line_delay, &u32LineDelay);
/* PeerMACAddress */
@@ -4210,25 +4210,25 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
}
/* MAUType */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_mau_type, &u16MAUType);
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* DomainBoundary */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_domain_boundary, &u32DomainBoundary);
/* MulticastBoundary */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_multicast_boundary, &u32MulticastBoundary);
/* PortState */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_port_state, &u16PortState);
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* MediaType */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_media_type, &u32MediaType);
proto_item_append_text(item, ": Slot:0x%x/0x%x, OwnPortID:%s, Peers:%u PortState:%s MediaType:%s",
@@ -4251,13 +4251,13 @@ dissect_PDInterfaceMrpDataAdjust_block(tvbuff_t *tvb, int offset,
int iStartOffset = offset;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- /* Padding */
+ /* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* MRP_DomainUUID */
@@ -4303,11 +4303,11 @@ dissect_PDInterfaceMrpDataReal_block(tvbuff_t *tvb, int offset,
/* added blockversion 1 */
if(u8BlockVersionHigh != 1 || u8BlockVersionLow > 1) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- /* Padding */
+ /* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* MRP_DomainUUID */
@@ -4350,17 +4350,17 @@ dissect_PDInterfaceMrpDataReal_block(tvbuff_t *tvb, int offset,
static int
dissect_PDInterfaceMrpDataCheck_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
e_uuid_t uuid;
guint16 u16Check;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -4380,16 +4380,16 @@ dissect_PDInterfaceMrpDataCheck_block(tvbuff_t *tvb, int offset,
static int
dissect_PDPortMrpData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
e_uuid_t uuid;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -4402,7 +4402,7 @@ dissect_PDPortMrpData_block(tvbuff_t *tvb, int offset,
static int
dissect_MrpManagerParams_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16Prio;
guint16 u16TOPchgT;
@@ -4412,11 +4412,11 @@ dissect_MrpManagerParams_block(tvbuff_t *tvb, int offset,
guint16 u16TSTNRmax;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MRP_Prio */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -4445,7 +4445,7 @@ dissect_MrpManagerParams_block(tvbuff_t *tvb, int offset,
static int
dissect_MrpRTMode(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep)
{
proto_item *sub_item;
proto_tree *sub_tree;
@@ -4471,17 +4471,17 @@ dissect_MrpRTMode(tvbuff_t *tvb, int offset,
static int
dissect_MrpRTModeManagerData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16TSTNRmax;
guint16 u16TSTdefaultT;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MSP_TSTNRmax */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -4501,16 +4501,16 @@ dissect_MrpRTModeManagerData_block(tvbuff_t *tvb, int offset,
static int
dissect_MrpRingStateData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16RingState;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MRP_RingState */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -4522,16 +4522,16 @@ dissect_MrpRingStateData_block(tvbuff_t *tvb, int offset,
static int
dissect_MrpRTStateData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16RTState;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MRP_RTState */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -4543,18 +4543,18 @@ dissect_MrpRTStateData_block(tvbuff_t *tvb, int offset,
static int
dissect_MrpClientParams_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16MRP_LNKdownT;
guint16 u16MRP_LNKupT;
guint16 u16MRP_LNKNRmax;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MRP_LNKdownT */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -4572,15 +4572,15 @@ dissect_MrpClientParams_block(tvbuff_t *tvb, int offset,
static int
dissect_MrpRTModeClientData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MRP_RTMode */
offset = dissect_MrpRTMode(tvb, offset, pinfo, tree, item, drep);
@@ -4591,18 +4591,18 @@ dissect_MrpRTModeClientData_block(tvbuff_t *tvb, int offset,
static int
dissect_CheckSyncDifference_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
proto_item *sub_item;
proto_tree *sub_tree;
guint16 u16CheckSyncMode;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
sub_item = proto_tree_add_item(tree, hf_pn_io_check_sync_mode, tvb, offset, 2, ENC_BIG_ENDIAN);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_check_sync_mode);
@@ -4627,15 +4627,15 @@ dissect_CheckSyncDifference_block(tvbuff_t *tvb, int offset,
static int
dissect_CheckMAUTypeDifference_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16MAUTypeMode;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_mau_type_mode, &u16MAUTypeMode);
@@ -4650,7 +4650,7 @@ dissect_CheckMAUTypeDifference_block(tvbuff_t *tvb, int offset,
/* dissect the AdjustDomainBoundary blocks */
static int
dissect_AdjustDomainBoundary_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint32 u32DomainBoundary;
guint32 u32DomainBoundaryIngress;
@@ -4658,52 +4658,52 @@ dissect_AdjustDomainBoundary_block(tvbuff_t *tvb, int offset,
guint16 u16AdjustProperties;
- if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
+ if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- /* Padding */
+ /* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
- switch(u8BlockVersionLow) {
- case(0):
- /* DomainBoundary */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
- hf_pn_io_domain_boundary, &u32DomainBoundary);
- /* AdjustProperties */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
- hf_pn_io_adjust_properties, &u16AdjustProperties);
- /* Padding */
- offset = dissect_pn_align4(tvb, offset, pinfo, tree);
-
- proto_item_append_text(item, ": Boundary:0x%x, Properties:0x%x",
- u32DomainBoundary, u16AdjustProperties);
-
- break;
- case(1):
- /* DomainBoundaryIngress */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
- hf_pn_io_domain_boundary_ingress, &u32DomainBoundaryIngress);
- /* DomainBoundaryEgress */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
- hf_pn_io_domain_boundary_egress, &u32DomainBoundaryEgress);
- /* AdjustProperties */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
- hf_pn_io_adjust_properties, &u16AdjustProperties);
- /* Padding */
- offset = dissect_pn_align4(tvb, offset, pinfo, tree);
-
- proto_item_append_text(item, ": BoundaryIngress:0x%x, BoundaryEgress:0x%x, Properties:0x%x",
- u32DomainBoundaryIngress, u32DomainBoundaryEgress, u16AdjustProperties);
-
- break;
- default:
+ switch(u8BlockVersionLow) {
+ case(0):
+ /* DomainBoundary */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ hf_pn_io_domain_boundary, &u32DomainBoundary);
+ /* AdjustProperties */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ hf_pn_io_adjust_properties, &u16AdjustProperties);
+ /* Padding */
+ offset = dissect_pn_align4(tvb, offset, pinfo, tree);
+
+ proto_item_append_text(item, ": Boundary:0x%x, Properties:0x%x",
+ u32DomainBoundary, u16AdjustProperties);
+
+ break;
+ case(1):
+ /* DomainBoundaryIngress */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ hf_pn_io_domain_boundary_ingress, &u32DomainBoundaryIngress);
+ /* DomainBoundaryEgress */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ hf_pn_io_domain_boundary_egress, &u32DomainBoundaryEgress);
+ /* AdjustProperties */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ hf_pn_io_adjust_properties, &u16AdjustProperties);
+ /* Padding */
+ offset = dissect_pn_align4(tvb, offset, pinfo, tree);
+
+ proto_item_append_text(item, ": BoundaryIngress:0x%x, BoundaryEgress:0x%x, Properties:0x%x",
+ u32DomainBoundaryIngress, u32DomainBoundaryEgress, u16AdjustProperties);
+
+ break;
+ default:
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
return offset;
}
@@ -4712,25 +4712,25 @@ dissect_AdjustDomainBoundary_block(tvbuff_t *tvb, int offset,
/* dissect the AdjustMulticastBoundary blocks */
static int
dissect_AdjustMulticastBoundary_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint32 u32MulticastBoundary;
guint16 u16AdjustProperties;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* Boundary */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_multicast_boundary, &u32MulticastBoundary);
/* AdjustProperties */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_adjust_properties, &u16AdjustProperties);
proto_item_append_text(item, ": Boundary:0x%x, Properties:0x%x",
@@ -4743,25 +4743,25 @@ dissect_AdjustMulticastBoundary_block(tvbuff_t *tvb, int offset,
/* dissect the AdjustMAUType block */
static int
dissect_AdjustMAUType_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16MAUType;
guint16 u16AdjustProperties;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* MAUType */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_mau_type, &u16MAUType);
/* AdjustProperties */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_adjust_properties, &u16AdjustProperties);
proto_item_append_text(item, ": MAUType:%s, Properties:0x%x",
@@ -4775,19 +4775,19 @@ dissect_AdjustMAUType_block(tvbuff_t *tvb, int offset,
/* dissect the CheckMAUType block */
static int
dissect_CheckMAUType_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16MAUType;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* MAUType */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_mau_type, &u16MAUType);
proto_item_append_text(item, ": MAUType:%s",
@@ -4800,21 +4800,21 @@ dissect_CheckMAUType_block(tvbuff_t *tvb, int offset,
/* dissect the CheckLineDelay block */
static int
dissect_CheckLineDelay_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint32 u32LineDelay;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* LineDelay */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_line_delay, &u32LineDelay);
proto_item_append_text(item, ": LineDelay:%uns", u32LineDelay);
@@ -4826,7 +4826,7 @@ dissect_CheckLineDelay_block(tvbuff_t *tvb, int offset,
/* dissect the CheckPeers block */
static int
dissect_CheckPeers_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint8 u8NumberOfPeers;
guint8 u8I;
@@ -4836,20 +4836,20 @@ dissect_CheckPeers_block(tvbuff_t *tvb, int offset,
char *pPeerChassisID;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* NumberOfPeers */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_peers, &u8NumberOfPeers);
u8I = u8NumberOfPeers;
while(u8I--) {
/* LengthPeerPortID */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_length_peer_port_id, &u8LengthPeerPortID);
/* PeerPortID */
pPeerPortID = ep_alloc(u8LengthPeerPortID+1);
@@ -4859,7 +4859,7 @@ dissect_CheckPeers_block(tvbuff_t *tvb, int offset,
offset += u8LengthPeerPortID;
/* LengthPeerChassisID */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_length_peer_chassis_id, &u8LengthPeerChassisID);
/* PeerChassisID */
pPeerChassisID = ep_alloc(u8LengthPeerChassisID+1);
@@ -4878,25 +4878,25 @@ dissect_CheckPeers_block(tvbuff_t *tvb, int offset,
/* dissect the AdjustPortState block */
static int
dissect_AdjustPortState_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16PortState;
guint16 u16AdjustProperties;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* PortState */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_port_state, &u16PortState);
/* AdjustProperties */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_adjust_properties, &u16AdjustProperties);
proto_item_append_text(item, ": PortState:%s, Properties:0x%x",
@@ -4910,19 +4910,19 @@ dissect_AdjustPortState_block(tvbuff_t *tvb, int offset,
/* dissect the CheckPortState block */
static int
dissect_CheckPortState_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16PortState;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* PortState */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_port_state, &u16PortState);
proto_item_append_text(item, ": %s",
@@ -4934,8 +4934,8 @@ dissect_CheckPortState_block(tvbuff_t *tvb, int offset,
/* dissect the PDPortFODataReal block */
static int
dissect_PDPortFODataReal_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint32 u32FiberOpticType;
guint32 u32FiberOpticCableType;
@@ -4944,11 +4944,11 @@ dissect_PDPortFODataReal_block(tvbuff_t *tvb, int offset,
pnio_ar_t *ar = NULL;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -4973,19 +4973,19 @@ dissect_PDPortFODataReal_block(tvbuff_t *tvb, int offset,
/* dissect the FiberOpticManufacturerSpecific block */
static int
dissect_FiberOpticManufacturerSpecific_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint8 u8VendorIDHigh;
guint8 u8VendorIDLow;
guint16 u16VendorBlockType;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* x8 VendorIDHigh */
offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
@@ -5007,27 +5007,27 @@ dissect_FiberOpticManufacturerSpecific_block(tvbuff_t *tvb, int offset,
/* dissect the PDPortFODataAdjust block */
static int
dissect_PDPortFODataAdjust_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint32 u32FiberOpticType;
guint32 u32FiberOpticCableType;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* FiberOpticType */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fiber_optic_type, &u32FiberOpticType);
/* FiberOpticCableType */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fiber_optic_cable_type, &u32FiberOpticCableType);
/*
@@ -5041,31 +5041,31 @@ dissect_PDPortFODataAdjust_block(tvbuff_t *tvb, int offset,
/* dissect the PDPortFODataCheck block */
static int
dissect_PDPortFODataCheck_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint32 u32FiberOpticPowerBudget;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* MaintenanceRequiredPowerBudget */
/* XXX - decode the u32FiberOpticPowerBudget better */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_maintenance_required_power_budget, &u32FiberOpticPowerBudget);
/* MaintenanceDemandedPowerBudget */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_maintenance_demanded_power_budget, &u32FiberOpticPowerBudget);
/* ErrorPowerBudget */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_error_power_budget, &u32FiberOpticPowerBudget);
/*
@@ -5079,31 +5079,31 @@ dissect_PDPortFODataCheck_block(tvbuff_t *tvb, int offset,
/* dissect the PDNCDataCheck block */
static int
dissect_PDNCDataCheck_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint32 u32NCDropBudget;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* Padding */
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* MaintenanceRequiredDropBudget */
/* XXX - decode the u32NCDropBudget better */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_maintenance_required_drop_budget, &u32NCDropBudget);
/* MaintenanceDemandedDropBudget */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_maintenance_demanded_drop_budget, &u32NCDropBudget);
/* ErrorDropBudget */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_error_drop_budget, &u32NCDropBudget);
/*
@@ -5151,7 +5151,7 @@ dissect_PDPortStatistic_block(tvbuff_t *tvb, int offset,
/* dissect the PDInterfaceDataReal block */
static int
dissect_PDInterfaceDataReal_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint8 u8LengthOwnChassisID;
char *pOwnChassisID;
@@ -5159,11 +5159,11 @@ dissect_PDInterfaceDataReal_block(tvbuff_t *tvb, int offset,
guint32 ip;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* LengthOwnChassisID */
offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
@@ -5204,7 +5204,7 @@ dissect_PDInterfaceDataReal_block(tvbuff_t *tvb, int offset,
/* dissect the PDSyncData block */
static int
dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16SlotNr;
guint16 u16SubslotNr;
@@ -5218,28 +5218,28 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
guint16 u16SyncFrameAddress;
guint16 u16PTCPTimeoutFactor;
guint16 u16PTCPTakeoverTimeoutFactor;
- guint16 u16PTCPMasterStartupTime;
+ guint16 u16PTCPMasterStartupTime;
guint8 u8MasterPriority1;
guint8 u8MasterPriority2;
guint8 u8LengthSubdomainName;
char *pSubdomainName;
- if(u8BlockVersionHigh != 1) {
+ if(u8BlockVersionHigh != 1) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
- switch(u8BlockVersionLow) {
- case(0):
+ switch(u8BlockVersionLow) {
+ case(0):
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* PTCPSubdomainID */
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
@@ -5248,64 +5248,64 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_ir_data_id, &uuid);
/* ReservedIntervalBegin */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_reserved_interval_begin, &u32ReservedIntervalBegin);
/* ReservedIntervalEnd */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_reserved_interval_end, &u32ReservedIntervalEnd);
/* PLLWindow enum */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_pllwindow, &u32PLLWindow);
/* SyncSendFactor 32 enum */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_sync_send_factor, &u32SyncSendFactor);
/* SendClockFactor 16 */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_send_clock_factor, &u16SendClockFactor);
/* SyncProperties 16 bitfield */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_sync_properties, &u16SyncProperties);
/* SyncFrameAddress 16 bitfield */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_sync_frame_address, &u16SyncFrameAddress);
/* PTCPTimeoutFactor 16 enum */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ptcp_timeout_factor, &u16PTCPTimeoutFactor);
proto_item_append_text(item, ": Slot:0x%x/0x%x, Interval:%u-%u, PLLWin:%u, Send:%u, Clock:%u",
u16SlotNr, u16SubslotNr, u32ReservedIntervalBegin, u32ReservedIntervalEnd,
u32PLLWindow, u32SyncSendFactor, u16SendClockFactor);
- break;
- case(2):
+ break;
+ case(2):
/* PTCPSubdomainID */
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_ptcp_subdomain_id, &uuid);
/* ReservedIntervalBegin */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_reserved_interval_begin, &u32ReservedIntervalBegin);
/* ReservedIntervalEnd */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_reserved_interval_end, &u32ReservedIntervalEnd);
/* PLLWindow enum */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_pllwindow, &u32PLLWindow);
/* SyncSendFactor 32 enum */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_sync_send_factor, &u32SyncSendFactor);
/* SendClockFactor 16 */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_send_clock_factor, &u16SendClockFactor);
/* PTCPTimeoutFactor 16 enum */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ptcp_timeout_factor, &u16PTCPTimeoutFactor);
/* PTCPTakeoverTimeoutFactor 16 */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ptcp_takeover_timeout_factor, &u16PTCPTakeoverTimeoutFactor);
/* PTCPMasterStartupTime 16 */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ptcp_master_startup_time, &u16PTCPMasterStartupTime);
/* SyncProperties 16 bitfield */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_sync_properties, &u16SyncProperties);
/* PTCP_MasterPriority1 */
offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
@@ -5329,10 +5329,10 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ": Interval:%u-%u, PLLWin:%u, Send:%u, Clock:%u",
u32ReservedIntervalBegin, u32ReservedIntervalEnd,
u32PLLWindow, u32SyncSendFactor, u16SendClockFactor);
- break;
- default:
- expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ break;
+ default:
+ expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
}
return offset;
@@ -5342,7 +5342,7 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
/* dissect the PDIRData block */
static int
dissect_PDIRData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16SlotNr;
guint16 u16SubslotNr;
@@ -5353,17 +5353,17 @@ dissect_PDIRData_block(tvbuff_t *tvb, int offset,
/* versions decoded are High: 1 and LOW 0..2 */
if(u8BlockVersionHigh != 1 || (u8BlockVersionLow > 2 ) ) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
proto_item_append_text(item, ": Slot:0x%x/0x%x",
@@ -5372,13 +5372,13 @@ dissect_PDIRData_block(tvbuff_t *tvb, int offset,
/* PDIRGlobalData */
offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
if(u8BlockVersionLow == 0) {
- /* PDIRFrameData */
- offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
+ /* PDIRFrameData */
+ offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
} else if (u8BlockVersionLow == 1) {
- /* [PDIRFrameData] */
- offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
- /* PDIRBeginEndData */
- offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
+ /* [PDIRFrameData] */
+ offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
+ /* PDIRBeginEndData */
+ offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
}else if (u8BlockVersionLow == 2) {
/* [PDIRFrameData] */
offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
@@ -5392,23 +5392,23 @@ dissect_PDIRData_block(tvbuff_t *tvb, int offset,
/* dissect the PDIRGlobalData block */
static int
dissect_PDIRGlobalData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
e_uuid_t uuid;
- guint32 u32MaxBridgeDelay;
- guint32 u32NumberOfPorts;
- guint32 u32MaxPortTxDelay;
- guint32 u32MaxPortRxDelay;
+ guint32 u32MaxBridgeDelay;
+ guint32 u32NumberOfPorts;
+ guint32 u32MaxPortTxDelay;
+ guint32 u32MaxPortRxDelay;
guint32 u32MaxLineRxDelay;
guint32 u32YellowTime;
- guint32 u32Tmp;
+ guint32 u32Tmp;
/* added blockversion 2 */
if(u8BlockVersionHigh != 1 || (u8BlockVersionLow > 2)) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -5441,10 +5441,10 @@ dissect_PDIRGlobalData_block(tvbuff_t *tvb, int offset,
hf_pn_io_yellowtime, &u32YellowTime);
}
}
- proto_item_append_text(item, ": MaxBridgeDelay:%u, NumberOfPorts:%u",
- u32MaxBridgeDelay, u32NumberOfPorts);
+ proto_item_append_text(item, ": MaxBridgeDelay:%u, NumberOfPorts:%u",
+ u32MaxBridgeDelay, u32NumberOfPorts);
- }
+ }
return offset;
}
@@ -5452,8 +5452,8 @@ dissect_PDIRGlobalData_block(tvbuff_t *tvb, int offset,
/* dissect the PDIRFrameData block */
static int
dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint32 u32FrameSendOffset;
guint32 u32FrameDataProperties;
@@ -5470,16 +5470,16 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
guint16 u16EndOffset;
proto_tree *ir_frame_data_tree = NULL;
proto_item *ir_frame_data_sub_item = NULL;
- guint16 n=0;
- proto_item *sub_item;
- proto_tree *sub_tree;
+ guint16 n=0;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
/* added low version 1 */
if(u8BlockVersionHigh != 1 || u8BlockVersionLow > 1) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -5492,33 +5492,33 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
/* dissect all IR frame data */
while (offset < u16EndOffset)
{
- n++;
+ n++;
/* new subtree for each IR frame */
ir_frame_data_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_frame_data, tvb, offset, 17, ENC_BIG_ENDIAN);
ir_frame_data_tree = proto_item_add_subtree(ir_frame_data_sub_item, ett_pn_io_ir_frame_data);
/* FrameSendOffset */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_frame_send_offset, &u32FrameSendOffset);
/* DataLength */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_data_length, &u16DataLength);
/* ReductionRatio */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_reduction_ratio, &u16ReductionRatio);
/* Phase */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_phase, &u16Phase);
/* FrameID */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_frame_id, &u16FrameID);
/* Ethertype */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_ethertype, &u16Ethertype);
/* RxPort */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, ir_frame_data_tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, ir_frame_data_tree, drep,
hf_pn_io_rx_port, &u8RXPort);
/* FrameDetails */
sub_item = proto_tree_add_item(ir_frame_data_tree, hf_pn_io_frame_details, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -5563,7 +5563,7 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
}
- proto_item_append_text(item, ": Frames:%u", n);
+ proto_item_append_text(item, ": Frames:%u", n);
return offset;
}
@@ -5571,31 +5571,31 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
static int
dissect_PDIRBeginEndData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint16 u16StartOfRedFrameID;
guint16 u16EndOfRedFrameID;
- guint32 u32NumberOfPorts;
- guint32 u32NumberOfAssignments;
- guint32 u32NumberOfPhases;
- guint32 u32RedOrangePeriodBegin;
- guint32 u32OrangePeriodBegin;
- guint32 u32GreenPeriodBegin;
- guint16 u16TXPhaseAssignment;
- guint16 u16RXPhaseAssignment;
+ guint32 u32NumberOfPorts;
+ guint32 u32NumberOfAssignments;
+ guint32 u32NumberOfPhases;
+ guint32 u32RedOrangePeriodBegin;
+ guint32 u32OrangePeriodBegin;
+ guint32 u32GreenPeriodBegin;
+ guint16 u16TXPhaseAssignment;
+ guint16 u16RXPhaseAssignment;
proto_tree *ir_begin_end_port_tree = NULL;
proto_item *ir_begin_end_port_sub_item = NULL;
- guint32 u32SubStart;
- guint32 u32Tmp;
- guint32 u32Tmp2;
-
+ guint32 u32SubStart;
+ guint32 u32Tmp;
+ guint32 u32Tmp2;
+
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -5604,64 +5604,64 @@ dissect_PDIRBeginEndData_block(tvbuff_t *tvb, int offset,
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_end_of_red_frame_id, &u16EndOfRedFrameID);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_ports, &u32NumberOfPorts);
- u32Tmp2 = u32NumberOfPorts;
+ u32Tmp2 = u32NumberOfPorts;
while(u32Tmp2--) {
- /* new subtree for each Port */
- ir_begin_end_port_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_begin_end_port, tvb, offset, 0, ENC_BIG_ENDIAN);
- ir_begin_end_port_tree = proto_item_add_subtree(ir_begin_end_port_sub_item, ett_pn_io_ir_begin_end_port);
- u32SubStart = offset;
-
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_number_of_assignments, &u32NumberOfAssignments);
- u32Tmp = u32NumberOfAssignments;
- while(u32Tmp--) {
- /* TXBeginEndAssignment */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_red_orange_period_begin, &u32RedOrangePeriodBegin);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_orange_period_begin, &u32OrangePeriodBegin);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_green_period_begin, &u32GreenPeriodBegin);
-
- /* RXBeginEndAssignment */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_red_orange_period_begin, &u32RedOrangePeriodBegin);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_orange_period_begin, &u32OrangePeriodBegin);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_green_period_begin, &u32GreenPeriodBegin);
- }
-
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_number_of_phases, &u32NumberOfPhases);
- u32Tmp = u32NumberOfPhases;
- while(u32Tmp--) {
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_tx_phase_assignment, &u16TXPhaseAssignment);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
- hf_pn_io_rx_phase_assignment, &u16RXPhaseAssignment);
- }
-
- proto_item_append_text(ir_begin_end_port_sub_item, ": Assignments:%u, Phases:%u",
+ /* new subtree for each Port */
+ ir_begin_end_port_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_begin_end_port, tvb, offset, 0, ENC_BIG_ENDIAN);
+ ir_begin_end_port_tree = proto_item_add_subtree(ir_begin_end_port_sub_item, ett_pn_io_ir_begin_end_port);
+ u32SubStart = offset;
+
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_number_of_assignments, &u32NumberOfAssignments);
+ u32Tmp = u32NumberOfAssignments;
+ while(u32Tmp--) {
+ /* TXBeginEndAssignment */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_red_orange_period_begin, &u32RedOrangePeriodBegin);
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_orange_period_begin, &u32OrangePeriodBegin);
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_green_period_begin, &u32GreenPeriodBegin);
+
+ /* RXBeginEndAssignment */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_red_orange_period_begin, &u32RedOrangePeriodBegin);
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_orange_period_begin, &u32OrangePeriodBegin);
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_green_period_begin, &u32GreenPeriodBegin);
+ }
+
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_number_of_phases, &u32NumberOfPhases);
+ u32Tmp = u32NumberOfPhases;
+ while(u32Tmp--) {
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_tx_phase_assignment, &u16TXPhaseAssignment);
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_begin_end_port_tree, drep,
+ hf_pn_io_rx_phase_assignment, &u16RXPhaseAssignment);
+ }
+
+ proto_item_append_text(ir_begin_end_port_sub_item, ": Assignments:%u, Phases:%u",
u32NumberOfAssignments, u32NumberOfPhases);
proto_item_set_len(ir_begin_end_port_sub_item, offset - u32SubStart);
- }
+ }
- proto_item_append_text(item, ": StartOfRed: 0x%x, EndOfRed: 0x%x, Ports:%u",
+ proto_item_append_text(item, ": StartOfRed: 0x%x, EndOfRed: 0x%x, Ports:%u",
u16StartOfRedFrameID, u16EndOfRedFrameID, u32NumberOfPorts);
- return offset+u16BodyLength;
+ return offset+u16BodyLength;
}
/* dissect the DiagnosisData block */
static int
dissect_DiagnosisData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 body_length)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 body_length)
{
guint32 u32Api;
guint16 u16SlotNr;
@@ -5670,15 +5670,15 @@ dissect_DiagnosisData_block(tvbuff_t *tvb, int offset,
guint16 u16UserStructureIdentifier;
- if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
+ if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
if(u8BlockVersionLow == 1) {
/* API */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_api, &u32Api);
body_length-=4;
}
@@ -5714,36 +5714,36 @@ dissect_DiagnosisData_block(tvbuff_t *tvb, int offset,
static int
dissect_ARProperties(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_)
{
- proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
guint32 u32ARProperties;
- sub_item = proto_tree_add_item(tree, hf_pn_io_ar_properties, tvb, offset, 4, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_ar_properties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ sub_item = proto_tree_add_item(tree, hf_pn_io_ar_properties, tvb, offset, 4, ENC_BIG_ENDIAN);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_ar_properties);
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_pull_module_alarm_allowed, &u32ARProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_arproperties_StartupMode, &u32ARProperties);
dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_reserved, &u32ARProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_achnowledge_companion_ar, &u32ARProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_companion_ar, &u32ARProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_device_access, &u32ARProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_reserved_1, &u32ARProperties);
/* removed within 2.3
dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_data_rate, &u32ARProperties);
*/
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_parametrization_server, &u32ARProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_supervisor_takeover_allowed, &u32ARProperties);
offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_ar_properties_state, &u32ARProperties);
@@ -5755,7 +5755,7 @@ dissect_ARProperties(tvbuff_t *tvb, int offset,
/* dissect the IOCRProperties */
static int
dissect_IOCRProperties(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
proto_item *sub_item;
proto_tree *sub_tree;
@@ -5763,15 +5763,15 @@ dissect_IOCRProperties(tvbuff_t *tvb, int offset,
sub_item = proto_tree_add_item(tree, hf_pn_io_iocr_properties, tvb, offset, 4, ENC_BIG_ENDIAN);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_iocr_properties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocr_properties_full_subframe_structure, &u32IOCRProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocr_properties_distributed_subframe_watchdog, &u32IOCRProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocr_properties_fast_forwarding_mac_adr, &u32IOCRProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocr_properties_reserved_3, &u32IOCRProperties);
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocr_properties_reserved_2, &u32IOCRProperties);
dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocr_properties_media_redundancy, &u32IOCRProperties);
@@ -5787,10 +5787,10 @@ dissect_IOCRProperties(tvbuff_t *tvb, int offset,
/* dissect the ARData block */
static int
dissect_ARData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint16 u16BlockLength)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint16 u16BlockLength)
{
guint16 u16NumberOfARs;
- guint16 u16NumberofEntries;
+ guint16 u16NumberofEntries;
e_uuid_t aruuid;
e_uuid_t uuid;
guint16 u16ARType;
@@ -5813,28 +5813,28 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
proto_item *iocr_item;
proto_tree *iocr_tree;
guint32 u32IOCRStart;
- gint32 i32EndOffset;
+ gint32 i32EndOffset;
- /* added BlockversionLow == 1 */
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow > 1) {
+ /* added BlockversionLow == 1 */
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow > 1) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
- i32EndOffset = offset + u16BlockLength;
+ }
+ i32EndOffset = offset + u16BlockLength;
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_ars, &u16NumberOfARs);
- /* BlockversionLow: 0 */
- if(u8BlockVersionLow == 0){
+ /* BlockversionLow: 0 */
+ if(u8BlockVersionLow == 0){
while(u16NumberOfARs--) {
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_uuid, &aruuid);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_type, &u16ARType);
offset = dissect_ARProperties(tvb, offset, pinfo, tree, item, drep);
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_cminitiator_objectuuid, &uuid);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_station_name_length, &u16NameLength);
pStationName = ep_alloc(u16NameLength+1);
tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
@@ -5842,7 +5842,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
proto_tree_add_string (tree, hf_pn_io_cminitiator_station_name, tvb, offset, u16NameLength, pStationName);
offset += u16NameLength;
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_iocrs, &u16NumberOfIOCRs);
while(u16NumberOfIOCRs--) {
@@ -5850,10 +5850,10 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
u32IOCRStart = offset;
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
hf_pn_io_iocr_type, &u16IOCRType);
offset = dissect_IOCRProperties(tvb, offset, pinfo, iocr_tree, drep);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
hf_pn_io_frame_id, &u16FrameID);
proto_item_append_text(iocr_item, ": FrameID:0x%x", u16FrameID);
@@ -5862,8 +5862,8 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
hf_pn_io_cycle_counter, &u16CycleCounter);
- u8DataStatus = tvb_get_guint8(tvb, offset);
- u8TransferStatus = tvb_get_guint8(tvb, offset+1);
+ u8DataStatus = tvb_get_guint8(tvb, offset);
+ u8TransferStatus = tvb_get_guint8(tvb, offset+1);
/* add data status subtree */
ds_item = proto_tree_add_uint_format(iocr_tree, hf_pn_io_data_status,
@@ -5907,19 +5907,19 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
}
/* AlarmCRType */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_alarmcr_type, &u16AlarmCRType);
/* LocalAlarmReference */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_localalarmref, &u16LocalAlarmReference);
/* RemoteAlarmReference */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_remotealarmref, &u16RemoteAlarmReference);
/* ParameterServerObjectUUID */
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_parameter_server_objectuuid, &uuid);
/* StationNameLength */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_station_name_length, &u16NameLength);
/* ParameterServerStationName */
pStationName = ep_alloc(u16NameLength+1);
@@ -5928,137 +5928,137 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
proto_tree_add_string (tree, hf_pn_io_parameter_server_station_name, tvb, offset, u16NameLength, pStationName);
offset += u16NameLength;
/* NumberOfAPIs */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_apis, &u16NumberOfAPIs);
/* API */
if (u16NumberOfAPIs > 0){
offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_api, &u32Api);
- }
- }
- }
- else
- { /* BlockversionLow == 1 */
- while(u16NumberOfARs--) {
- /*ARUUID */
- offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_ar_uuid, &aruuid);
- /* CMInitiatorObjectUUID */
- offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_cminitiator_objectuuid, &uuid);
- /* ParameterServerObjectUUID */
- offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_parameter_server_objectuuid, &uuid);
- /* ARProperties*/
- offset = dissect_ARProperties(tvb, offset, pinfo, tree, item, drep);
- /* ARType*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_ar_type, &u16ARType);
- /* AlarmCRType */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_alarmcr_type, &u16AlarmCRType);
- /* LocalAlarmReference */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_localalarmref, &u16LocalAlarmReference);
- /* RemoteAlarmReference */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_remotealarmref, &u16RemoteAlarmReference);
- /* InitiatorUDPRTPort*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_cminitiator_udprtport, &u16UDPRTPort);
- /* ResponderUDPRTPort*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_cmresponder_udprtport, &u16UDPRTPort);
- /* CMInitiatorStationName*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_station_name_length, &u16NameLength);
- pStationName = ep_alloc(u16NameLength+1);
- tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
- pStationName[u16NameLength] = '\0';
- proto_tree_add_string (tree, hf_pn_io_cminitiator_station_name, tvb, offset, u16NameLength, pStationName);
- offset += u16NameLength;
- /** align padding! **/
- offset = dissect_pn_align4(tvb, offset, pinfo, tree);
-
- /* StationNameLength */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_station_name_length, &u16NameLength);
- if(u16NameLength != 0){
- /* ParameterServerStationName */
- pStationName = ep_alloc(u16NameLength+1);
- tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
- pStationName[u16NameLength] = '\0';
- proto_tree_add_string (tree, hf_pn_io_parameter_server_station_name, tvb, offset, u16NameLength, pStationName);
- offset += u16NameLength;
- }
- /** align padding! **/
- offset = dissect_pn_align4(tvb, offset, pinfo, tree);
-
- /* NumberOfIOCRs*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,hf_pn_io_number_of_iocrs, &u16NumberOfIOCRs);
- /* align to next 32 bit */
- offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
-
- while(u16NumberOfIOCRs--) {
- iocr_item = proto_tree_add_item(tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
- u32IOCRStart = offset;
-
- /* IOCRProperties*/
- offset = dissect_IOCRProperties(tvb, offset, pinfo, iocr_tree, drep);
- /* IOCRType*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep, hf_pn_io_iocr_type, &u16IOCRType);
- /* FrameID*/
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep, hf_pn_io_frame_id, &u16FrameID);
- proto_item_append_text(iocr_item, ": FrameID:0x%x", u16FrameID);
-
- /* add cycle counter */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
- hf_pn_io_cycle_counter, &u16CycleCounter);
-
- u8DataStatus = tvb_get_guint8(tvb, offset);
- u8TransferStatus = tvb_get_guint8(tvb, offset+1);
-
- /* add data status subtree */
- ds_item = proto_tree_add_uint_format(iocr_tree, hf_pn_io_data_status,
- tvb, offset, 1, u8DataStatus,
- "DataStatus: 0x%02x (Frame: %s and %s, Provider: %s and %s)",
- u8DataStatus,
- (u8DataStatus & 0x04) ? "Valid" : "Invalid",
- (u8DataStatus & 0x01) ? "Primary" : "Backup",
- (u8DataStatus & 0x20) ? "Ok" : "Problem",
- (u8DataStatus & 0x10) ? "Run" : "Stop");
- ds_tree = proto_item_add_subtree(ds_item, ett_pn_io_data_status);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res67, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_ok, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_operate, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res3, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_valid, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res1, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_primary, tvb, offset, 1, u8DataStatus);
-
- offset++;
-
- /* add transfer status */
- if (u8TransferStatus) {
- proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
- offset, 1, u8TransferStatus,
- "TransferStatus: 0x%02x (ignore this frame)", u8TransferStatus);
- } else {
- proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
- offset, 1, u8TransferStatus,
- "TransferStatus: 0x%02x (OK)", u8TransferStatus);
- }
- offset++;
- }
- /* NumberOfAPIs */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_number_of_apis, &u16NumberOfAPIs);
- /* align to next 32 bit */
- offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
- /* API */
- if (u16NumberOfAPIs > 0){
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_api, &u32Api);
- }
- /* get the number of subblocks an dissect them */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_number_of_ARDATAInfo, &u16NumberofEntries);
-
- offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
-
- while ((offset < i32EndOffset) && (u16NumberofEntries > 0)){
- offset = dissect_a_block(tvb, offset, pinfo, tree, drep);
- u16NumberofEntries--;
- }
- }
- }
+ }
+ }
+ }
+ else
+ { /* BlockversionLow == 1 */
+ while(u16NumberOfARs--) {
+ /*ARUUID */
+ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_ar_uuid, &aruuid);
+ /* CMInitiatorObjectUUID */
+ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_cminitiator_objectuuid, &uuid);
+ /* ParameterServerObjectUUID */
+ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_parameter_server_objectuuid, &uuid);
+ /* ARProperties*/
+ offset = dissect_ARProperties(tvb, offset, pinfo, tree, item, drep);
+ /* ARType*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_ar_type, &u16ARType);
+ /* AlarmCRType */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_alarmcr_type, &u16AlarmCRType);
+ /* LocalAlarmReference */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_localalarmref, &u16LocalAlarmReference);
+ /* RemoteAlarmReference */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_remotealarmref, &u16RemoteAlarmReference);
+ /* InitiatorUDPRTPort*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_cminitiator_udprtport, &u16UDPRTPort);
+ /* ResponderUDPRTPort*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_cmresponder_udprtport, &u16UDPRTPort);
+ /* CMInitiatorStationName*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_station_name_length, &u16NameLength);
+ pStationName = ep_alloc(u16NameLength+1);
+ tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
+ pStationName[u16NameLength] = '\0';
+ proto_tree_add_string (tree, hf_pn_io_cminitiator_station_name, tvb, offset, u16NameLength, pStationName);
+ offset += u16NameLength;
+ /** align padding! **/
+ offset = dissect_pn_align4(tvb, offset, pinfo, tree);
+
+ /* StationNameLength */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_station_name_length, &u16NameLength);
+ if(u16NameLength != 0){
+ /* ParameterServerStationName */
+ pStationName = ep_alloc(u16NameLength+1);
+ tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
+ pStationName[u16NameLength] = '\0';
+ proto_tree_add_string (tree, hf_pn_io_parameter_server_station_name, tvb, offset, u16NameLength, pStationName);
+ offset += u16NameLength;
+ }
+ /** align padding! **/
+ offset = dissect_pn_align4(tvb, offset, pinfo, tree);
+
+ /* NumberOfIOCRs*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,hf_pn_io_number_of_iocrs, &u16NumberOfIOCRs);
+ /* align to next 32 bit */
+ offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
+
+ while(u16NumberOfIOCRs--) {
+ iocr_item = proto_tree_add_item(tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
+ iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
+ u32IOCRStart = offset;
+
+ /* IOCRProperties*/
+ offset = dissect_IOCRProperties(tvb, offset, pinfo, iocr_tree, drep);
+ /* IOCRType*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep, hf_pn_io_iocr_type, &u16IOCRType);
+ /* FrameID*/
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep, hf_pn_io_frame_id, &u16FrameID);
+ proto_item_append_text(iocr_item, ": FrameID:0x%x", u16FrameID);
+
+ /* add cycle counter */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ hf_pn_io_cycle_counter, &u16CycleCounter);
+
+ u8DataStatus = tvb_get_guint8(tvb, offset);
+ u8TransferStatus = tvb_get_guint8(tvb, offset+1);
+
+ /* add data status subtree */
+ ds_item = proto_tree_add_uint_format(iocr_tree, hf_pn_io_data_status,
+ tvb, offset, 1, u8DataStatus,
+ "DataStatus: 0x%02x (Frame: %s and %s, Provider: %s and %s)",
+ u8DataStatus,
+ (u8DataStatus & 0x04) ? "Valid" : "Invalid",
+ (u8DataStatus & 0x01) ? "Primary" : "Backup",
+ (u8DataStatus & 0x20) ? "Ok" : "Problem",
+ (u8DataStatus & 0x10) ? "Run" : "Stop");
+ ds_tree = proto_item_add_subtree(ds_item, ett_pn_io_data_status);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res67, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_ok, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_operate, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res3, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_valid, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res1, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_primary, tvb, offset, 1, u8DataStatus);
+
+ offset++;
+
+ /* add transfer status */
+ if (u8TransferStatus) {
+ proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
+ offset, 1, u8TransferStatus,
+ "TransferStatus: 0x%02x (ignore this frame)", u8TransferStatus);
+ } else {
+ proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
+ offset, 1, u8TransferStatus,
+ "TransferStatus: 0x%02x (OK)", u8TransferStatus);
+ }
+ offset++;
+ }
+ /* NumberOfAPIs */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_number_of_apis, &u16NumberOfAPIs);
+ /* align to next 32 bit */
+ offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
+ /* API */
+ if (u16NumberOfAPIs > 0){
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_api, &u32Api);
+ }
+ /* get the number of subblocks an dissect them */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_io_number_of_ARDATAInfo, &u16NumberofEntries);
+
+ offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
+
+ while ((offset < i32EndOffset) && (u16NumberofEntries > 0)){
+ offset = dissect_a_block(tvb, offset, pinfo, tree, drep);
+ u16NumberofEntries--;
+ }
+ }
+ }
return offset;
}
@@ -6066,17 +6066,17 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
/* dissect the APIData block */
static int
dissect_APIData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16NumberOfAPIs;
guint32 u32Api;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* NumberOfAPIs */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
@@ -6093,27 +6093,27 @@ dissect_APIData_block(tvbuff_t *tvb, int offset,
/* dissect the SLRData block */
static int
dissect_SRLData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 RedundancyInfo;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
- /* bit 0 ..1 EndPoint1 and EndPoint2*/
- dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_RedundancyInfo, &RedundancyInfo);
- /* bit 2 .. 15 reserved */
+ }
+ /* bit 0 ..1 EndPoint1 and EndPoint2*/
+ dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_RedundancyInfo, &RedundancyInfo);
+ /* bit 2 .. 15 reserved */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, hf_pn_RedundancyInfo_reserved, &RedundancyInfo);
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
- return offset;
+ return offset;
}
/* dissect the LogData block */
static int
dissect_LogData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint64 u64ActualLocaltimeStamp;
guint16 u16NumberOfLogEntries;
@@ -6122,11 +6122,11 @@ dissect_LogData_block(tvbuff_t *tvb, int offset,
guint32 u32EntryDetail;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* ActualLocalTimeStamp */
offset = dissect_dcerpc_uint64(tvb, offset, pinfo, tree, drep,
@@ -6145,7 +6145,7 @@ dissect_LogData_block(tvbuff_t *tvb, int offset,
/* PNIOStatus */
offset = dissect_PNIO_status(tvb, offset, pinfo, tree, drep);
/* EntryDetail */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_entry_detail, &u32EntryDetail);
}
@@ -6156,71 +6156,71 @@ dissect_LogData_block(tvbuff_t *tvb, int offset,
/* dissect the FS Hello block */
static int
dissect_FSHello_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
- guint32 u32FSHelloMode;
- guint32 u32FSHelloInterval;
- guint32 u32FSHelloRetry;
- guint32 u32FSHelloDelay;
+ guint32 u32FSHelloMode;
+ guint32 u32FSHelloInterval;
+ guint32 u32FSHelloRetry;
+ guint32 u32FSHelloDelay;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_pn_align4(tvb, offset, pinfo, tree);
+ offset = dissect_pn_align4(tvb, offset, pinfo, tree);
- /* FSHelloMode */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ /* FSHelloMode */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fs_hello_mode, &u32FSHelloMode);
- /* FSHelloInterval */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ /* FSHelloInterval */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fs_hello_interval, &u32FSHelloInterval);
- /* FSHelloRetry */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ /* FSHelloRetry */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fs_hello_retry, &u32FSHelloRetry);
- /* FSHelloDelay */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ /* FSHelloDelay */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fs_hello_delay, &u32FSHelloDelay);
proto_item_append_text(item, ": Mode:%s, Interval:%ums, Retry:%u, Delay:%ums",
val_to_str(u32FSHelloMode, pn_io_fs_hello_mode_vals, "0x%x"),
- u32FSHelloInterval, u32FSHelloRetry, u32FSHelloDelay);
+ u32FSHelloInterval, u32FSHelloRetry, u32FSHelloDelay);
- return offset;
+ return offset;
}
/* dissect the FS Parameter block */
static int
dissect_FSParameter_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
- guint32 u32FSParameterMode;
- e_uuid_t FSParameterUUID;
+ guint32 u32FSParameterMode;
+ e_uuid_t FSParameterUUID;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_pn_align4(tvb, offset, pinfo, tree);
+ offset = dissect_pn_align4(tvb, offset, pinfo, tree);
- /* FSParameterMode */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ /* FSParameterMode */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_fs_parameter_mode, &u32FSParameterMode);
- /* FSParameterUUID */
- offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
+ /* FSParameterUUID */
+ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_fs_parameter_uuid, &FSParameterUUID);
proto_item_append_text(item, ": Mode:%s",
val_to_str(u32FSParameterMode, pn_io_fs_parameter_mode_vals, "0x%x"));
- return offset;
+ return offset;
}
@@ -6229,17 +6229,17 @@ dissect_FSParameter_block(tvbuff_t *tvb, int offset,
/* dissect the FSUDataAdjust block */
static int
dissect_PDInterfaceFSUDataAdjust_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
tvbuff_t *new_tvb;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* Padding */
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
@@ -6251,24 +6251,24 @@ dissect_PDInterfaceFSUDataAdjust_block(tvbuff_t *tvb, int offset,
dissect_blocks(new_tvb, 0, pinfo, tree, drep);
offset += u16BodyLength;
- return offset;
+ return offset;
}
/* dissect the ARFSUDataAdjust block */
static int
dissect_ARFSUDataAdjust_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
tvbuff_t *new_tvb;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* Padding */
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
@@ -6280,14 +6280,14 @@ dissect_ARFSUDataAdjust_block(tvbuff_t *tvb, int offset,
dissect_blocks(new_tvb, 0, pinfo, tree, drep);
offset += u16BodyLength;
- return offset;
+ return offset;
}
/* dissect the ARBlockReq */
static int
dissect_ARBlockReq_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t ** ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t ** ar)
{
guint16 u16ARType;
e_uuid_t aruuid;
@@ -6301,17 +6301,17 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset,
pnio_ar_t * par;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_type, &u16ARType);
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_uuid, &aruuid);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_sessionkey, &u16SessionKey);
offset = dissect_pn_mac(tvb, offset, pinfo, tree,
hf_pn_io_cminitiator_macadd, mac);
@@ -6321,11 +6321,11 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset,
offset = dissect_ARProperties(tvb, offset, pinfo, tree, item, drep);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_cminitiator_activitytimeoutfactor, &u16TimeoutFactor); /* XXX - special values */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_cminitiator_udprtport, &u16UDPRTPort);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_station_name_length, &u16NameLength);
pStationName = ep_alloc(u16NameLength+1);
@@ -6359,8 +6359,8 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset,
/* dissect the ARBlockRes */
static int
dissect_ARBlockRes_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t ** ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t ** ar)
{
guint16 u16ARType;
e_uuid_t uuid;
@@ -6370,21 +6370,21 @@ dissect_ARBlockRes_block(tvbuff_t *tvb, int offset,
pnio_ar_t * par;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_type, &u16ARType);
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep,
hf_pn_io_ar_uuid, &uuid);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_sessionkey, &u16SessionKey);
offset = dissect_pn_mac(tvb, offset, pinfo, tree,
hf_pn_io_cmresponder_macadd, mac);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_cmresponder_udprtport, &u16UDPRTPort);
proto_item_append_text(item, ": %s, Session:%u, MAC:%02x:%02x:%02x:%02x:%02x:%02x, Port:0x%x",
@@ -6408,8 +6408,8 @@ dissect_ARBlockRes_block(tvbuff_t *tvb, int offset,
/* dissect the IOCRBlockReq */
static int
dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t *ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t *ar)
{
guint16 u16IOCRType;
guint16 u16IOCRReference;
@@ -6434,53 +6434,53 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
guint16 u16NumberOfIOCS;
guint16 u16IOCSFrameOffset;
proto_item *api_item;
- proto_tree *api_tree;
- guint32 u32ApiStart;
+ proto_tree *api_tree;
+ guint32 u32ApiStart;
guint16 u16Tmp;
proto_item *sub_item;
- proto_tree *sub_tree;
- guint32 u32SubStart;
+ proto_tree *sub_tree;
+ guint32 u32SubStart;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_type, &u16IOCRType);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_reference, &u16IOCRReference);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_lt, &u16LT);
offset = dissect_IOCRProperties(tvb, offset, pinfo, tree, drep);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_data_length, &u16DataLength);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_frame_id, &u16FrameID);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_send_clock_factor, &u16SendClockFactor);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_reduction_ratio, &u16ReductionRatio);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_phase, &u16Phase);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_sequence, &u16Sequence);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_frame_send_offset, &u32FrameSendOffset);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_watchdog_factor, &u16WatchdogFactor);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_data_hold_factor, &u16DataHoldFactor);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_tag_header, &u16IOCRTagHeader);
offset = dissect_pn_mac(tvb, offset, pinfo, tree,
hf_pn_io_iocr_multicast_mac_add, mac);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_apis, &u16NumberOfAPIs);
proto_item_append_text(item, ": %s, Ref:0x%x, Len:%u, FrameID:0x%x, Clock:%u, Ratio:%u, Phase:%u APIs:%u",
@@ -6490,67 +6490,67 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
while(u16NumberOfAPIs--) {
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
+ api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
u32ApiStart = offset;
/* API */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_api, &u32Api);
/* NumberOfIODataObjects */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_number_of_io_data_objects, &u16NumberOfIODataObjects);
u16Tmp = u16NumberOfIODataObjects;
while(u16Tmp--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_data_object, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_data_object);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_data_object);
u32SubStart = offset;
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* IODataObjectFrameOffset */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_io_data_object_frame_offset, &u16IODataObjectFrameOffset);
proto_item_append_text(sub_item, ": Slot: 0x%x, Subslot: 0x%x FrameOffset: %u",
u16SlotNr, u16SubslotNr, u16IODataObjectFrameOffset);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
}
/* NumberOfIOCS */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_number_of_iocs, &u16NumberOfIOCS);
u16Tmp = u16NumberOfIOCS;
while(u16Tmp--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_cs, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_cs);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_cs);
u32SubStart = offset;
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* IOCSFrameOffset */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_iocs_frame_offset, &u16IOCSFrameOffset);
proto_item_append_text(sub_item, ": Slot: 0x%x, Subslot: 0x%x FrameOffset: %u",
u16SlotNr, u16SubslotNr, u16IOCSFrameOffset);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
}
proto_item_append_text(api_item, ": 0x%x, NumberOfIODataObjects: %u NumberOfIOCS: %u",
u32Api, u16NumberOfIODataObjects, u16NumberOfIOCS);
- proto_item_set_len(api_item, offset - u32ApiStart);
+ proto_item_set_len(api_item, offset - u32ApiStart);
}
if(ar != NULL) {
@@ -6586,8 +6586,8 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
/* dissect the AlarmCRBlockReq */
static int
dissect_AlarmCRBlockReq_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t *ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t *ar)
{
guint16 u16AlarmCRType;
guint16 u16LT;
@@ -6599,22 +6599,22 @@ dissect_AlarmCRBlockReq_block(tvbuff_t *tvb, int offset,
guint16 u16AlarmCRTagHeaderHigh;
guint16 u16AlarmCRTagHeaderLow;
proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_tree *sub_tree;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_alarmcr_type, &u16AlarmCRType);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_lt, &u16LT);
sub_item = proto_tree_add_item(tree, hf_pn_io_alarmcr_properties, tvb, offset, 4, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_alarmcr_properties);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_alarmcr_properties);
dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarmcr_properties_reserved, &u32AlarmCRProperties);
dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
@@ -6622,17 +6622,17 @@ dissect_AlarmCRBlockReq_block(tvbuff_t *tvb, int offset,
offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_alarmcr_properties_priority, &u32AlarmCRProperties);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_rta_timeoutfactor, &u16RTATimeoutFactor);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_rta_retries, &u16RTARetries);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_localalarmref, &u16LocalAlarmReference);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_maxalarmdatalength, &u16MaxAlarmDataLength);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_alarmcr_tagheaderhigh, &u16AlarmCRTagHeaderHigh);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_alarmcr_tagheaderlow, &u16AlarmCRTagHeaderLow);
proto_item_append_text(item, ": %s, LT:0x%x, TFactor:%u, Retries:%u, Ref:0x%x, Len:%u Tag:0x%x/0x%x",
@@ -6657,25 +6657,25 @@ dissect_AlarmCRBlockReq_block(tvbuff_t *tvb, int offset,
/* dissect the AlarmCRBlockRes */
static int
dissect_AlarmCRBlockRes_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t *ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t *ar)
{
guint16 u16AlarmCRType;
guint16 u16LocalAlarmReference;
guint16 u16MaxAlarmDataLength;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_alarmcr_type, &u16AlarmCRType);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_localalarmref, &u16LocalAlarmReference);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_maxalarmdatalength, &u16MaxAlarmDataLength);
proto_item_append_text(item, ": %s, Ref:0x%04x, MaxDataLen:%u",
@@ -6717,9 +6717,9 @@ dissect_ARServerBlock(tvbuff_t *tvb, int offset,
proto_tree_add_string (tree, hf_pn_io_cminitiator_station_name, tvb, offset, u16NameLength, pStationName);
offset += u16NameLength;
/* Padding to next 4 byte allignment in this block */
- u16padding = (u16NameLength-2) & 0x3;
- if(u16padding >0)
- offset = dissect_pn_padding(tvb, offset, pinfo, tree, u16padding);
+ u16padding = (u16NameLength-2) & 0x3;
+ if(u16padding >0)
+ offset = dissect_pn_padding(tvb, offset, pinfo, tree, u16padding);
return offset;
}
@@ -6728,25 +6728,25 @@ dissect_ARServerBlock(tvbuff_t *tvb, int offset,
/* dissect the IOCRBlockRes */
static int
dissect_IOCRBlockRes_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- pnio_ar_t *ar)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ pnio_ar_t *ar)
{
guint16 u16IOCRType;
guint16 u16IOCRReference;
guint16 u16FrameID;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_type, &u16IOCRType);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_reference, &u16IOCRReference);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_frame_id, &u16FrameID);
proto_item_append_text(item, ": %s, Ref:0x%04x, FrameID:0x%04x",
@@ -6784,7 +6784,7 @@ dissect_IOCRBlockRes_block(tvbuff_t *tvb, int offset,
/* dissect the MCRBlockReq */
static int
dissect_MCRBlockReq_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16IOCRReference;
guint32 u32AddressResolutionProperties;
@@ -6793,20 +6793,20 @@ dissect_MCRBlockReq_block(tvbuff_t *tvb, int offset,
char *pStationName;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_reference, &u16IOCRReference);
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_address_resolution_properties, &u32AddressResolutionProperties);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_mci_timeout_factor, &u16MCITimeoutFactor);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_station_name_length, &u16NameLength);
pStationName = ep_alloc(u16NameLength+1);
@@ -6826,54 +6826,54 @@ dissect_MCRBlockReq_block(tvbuff_t *tvb, int offset,
/* dissect the SubFrameBlock */
static int
dissect_SubFrameBlock_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint16 u16IOCRReference;
guint8 mac[6];
- guint32 u32SubFrameData;
- guint16 u16Tmp;
+ guint32 u32SubFrameData;
+ guint16 u16Tmp;
proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_tree *sub_tree;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
- /* IOCRReference */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ /* IOCRReference */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_reference, &u16IOCRReference);
- /* CMInitiatorMACAdd */
+ /* CMInitiatorMACAdd */
offset = dissect_pn_mac(tvb, offset, pinfo, tree,
hf_pn_io_cminitiator_macadd, mac);
- /* SubFrameData n*32 */
- u16BodyLength -= 10;
- u16Tmp = u16BodyLength;
- do {
- sub_item = proto_tree_add_item(tree, hf_pn_io_subframe_data, tvb, offset, 4, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_subframe_data);
- /* 31-16 reserved_2 */
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
- hf_pn_io_subframe_data_reserved2, &u32SubFrameData);
- /* 15- 8 DataLength */
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
- hf_pn_io_subframe_data_length, &u32SubFrameData);
- /* 7 reserved_1 */
- dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
- hf_pn_io_subframe_data_reserved1, &u32SubFrameData);
- /* 6-0 Position */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
- hf_pn_io_subframe_data_position, &u32SubFrameData);
-
- proto_item_append_text(sub_item, ", Length:%u, Pos:%u",
- (u32SubFrameData & 0x0000FF00) >> 8, u32SubFrameData & 0x0000007F);
- } while(u16Tmp -= 4);
+ /* SubFrameData n*32 */
+ u16BodyLength -= 10;
+ u16Tmp = u16BodyLength;
+ do {
+ sub_item = proto_tree_add_item(tree, hf_pn_io_subframe_data, tvb, offset, 4, ENC_BIG_ENDIAN);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_subframe_data);
+ /* 31-16 reserved_2 */
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ hf_pn_io_subframe_data_reserved2, &u32SubFrameData);
+ /* 15- 8 DataLength */
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ hf_pn_io_subframe_data_length, &u32SubFrameData);
+ /* 7 reserved_1 */
+ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ hf_pn_io_subframe_data_reserved1, &u32SubFrameData);
+ /* 6-0 Position */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ hf_pn_io_subframe_data_position, &u32SubFrameData);
+
+ proto_item_append_text(sub_item, ", Length:%u, Pos:%u",
+ (u32SubFrameData & 0x0000FF00) >> 8, u32SubFrameData & 0x0000007F);
+ } while(u16Tmp -= 4);
proto_item_append_text(item, ", CRRef:%u, %u*Data",
u16IOCRReference, u16BodyLength/4);
@@ -6901,17 +6901,17 @@ dissect_PDSubFrameBlock_block(tvbuff_t *tvb, int offset,
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_SFIOCRProperties, &u32SFIOCRProperties);
/* bit 0..7 SFIOCRProperties.DistributedWatchDogFactor */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_DistributedWatchDogFactor, &u32SFIOCRProperties);
- /* Bit 8 – 15: SFIOCRProperties.RestartFactorForDistributedWD */
-/* 0x00 Mandatory No restart delay necessary
- 0x01 – 0x09 Optional Less than 1 s restart delay
- 0x0A – 0x50 Mandatory 1 s to 8 s restart delay
- 0x51 – 0xFF Optional More than 8 s restart delay */
+ /* Bit 8 - 15: SFIOCRProperties.RestartFactorForDistributedWD */
+/* 0x00 Mandatory No restart delay necessary
+ 0x01 - 0x09 Optional Less than 1 s restart delay
+ 0x0A - 0x50 Mandatory 1 s to 8 s restart delay
+ 0x51 - 0xFF Optional More than 8 s restart delay */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_RestartFactorForDistributedWD, &u32SFIOCRProperties);
- /* Bit 16 – 23: SFIOCRProperties.DFPmode */
+ /* Bit 16 - 23: SFIOCRProperties.DFPmode */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_SFIOCRProperties_DFPmode, &u32SFIOCRProperties);
- /* Bit 24 – 27: SFIOCRProperties.reserved_1 */
+ /* Bit 24 - 27: SFIOCRProperties.reserved_1 */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_SFIOCRProperties_reserved_1, &u32SFIOCRProperties);
- /* Bit 28 – 29: SFIOCRProperties.reserved_2 */
+ /* Bit 28 - 29: SFIOCRProperties.reserved_2 */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_SFIOCRProperties_reserved_2, &u32SFIOCRProperties);
/* Bit 30: SFIOCRProperties.DFPRedundantPathLayout */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_SFIOCRProperties_DFPRedundantPathLayout, &u32SFIOCRProperties);
@@ -6921,13 +6921,13 @@ dissect_PDSubFrameBlock_block(tvbuff_t *tvb, int offset,
/* SubframeData */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_subframe_data, &u32SubFrameData);
- /* Bit 0 – 6: SubframeData.Position */
+ /* Bit 0 - 6: SubframeData.Position */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_subframe_data_position, &u32SubFrameData);
/* Bit 7: SubframeData.reserved_1 */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_subframe_reserved1, &u32SubFrameData);
- /* Bit 8 – 15: SubframeData.DataLength */
+ /* Bit 8 - 15: SubframeData.DataLength */
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_subframe_data_length, &u32SubFrameData);
- /* Bit 16 – 31: SubframeData.reserved_2 */
+ /* Bit 16 - 31: SubframeData.reserved_2 */
offset =
dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_subframe_reserved2, &u32SubFrameData);
@@ -7034,39 +7034,39 @@ dissect_PDIRSubframeData_block(tvbuff_t *tvb, int offset,
static int
dissect_IRTFrameBlock_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength _U_)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength _U_)
{
guint16 u16IOCRReference;
guint8 u8IOCRTxPortsRedundantPort;
guint8 u8IOCRTxPortsPort;
- guint32 u32FrameSendOffset;
+ guint32 u32FrameSendOffset;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
- /* IOCRReference */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ /* IOCRReference */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_reference, &u16IOCRReference);
- /* IOCRTxPortsRedundantPort */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ /* IOCRTxPortsRedundantPort */
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_txports_redundantport, &u8IOCRTxPortsRedundantPort);
- /* IOCRTxPortsPort */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
+ /* IOCRTxPortsPort */
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, tree, drep,
hf_pn_io_iocr_txports_port, &u8IOCRTxPortsPort);
- /* FrameSendOffset */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ /* FrameSendOffset */
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_frame_send_offset, &u32FrameSendOffset);
- proto_item_append_text(item, ", CRRef:%u, Port:%u, RedPort:%u, Offset:%u",
+ proto_item_append_text(item, ", CRRef:%u, Port:%u, RedPort:%u, Offset:%u",
u16IOCRReference, u8IOCRTxPortsPort, u8IOCRTxPortsRedundantPort, u32FrameSendOffset);
return offset;
@@ -7076,38 +7076,38 @@ dissect_IRTFrameBlock_block(tvbuff_t *tvb, int offset,
/* dissect the DataDescription */
static int
dissect_DataDescription(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint16 u16DataDescription;
guint16 u16SubmoduleDataLength;
guint8 u8LengthIOCS;
guint8 u8LengthIOPS;
proto_item *sub_item;
- proto_tree *sub_tree;
- guint32 u32SubStart;
+ proto_tree *sub_tree;
+ guint32 u32SubStart;
sub_item = proto_tree_add_item(tree, hf_pn_io_data_description_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_data_description);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_data_description);
u32SubStart = offset;
/* DataDescription */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_data_description, &u16DataDescription);
/* SubmoduleDataLength */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_submodule_data_length, &u16SubmoduleDataLength);
/* LengthIOCS */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_length_iocs, &u8LengthIOCS);
/* LengthIOPS */
- offset = dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_length_iops, &u8LengthIOPS);
proto_item_append_text(sub_item, ": %s, SubmoduleDataLength: %u, LengthIOCS: %u, u8LengthIOPS: %u",
val_to_str(u16DataDescription, pn_io_data_description, "(0x%x)"),
u16SubmoduleDataLength, u8LengthIOCS, u8LengthIOPS);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
return offset;
}
@@ -7116,7 +7116,7 @@ dissect_DataDescription(tvbuff_t *tvb, int offset,
/* dissect the ExpectedSubmoduleBlockReq */
static int
dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16NumberOfAPIs;
guint32 u32Api;
@@ -7128,45 +7128,45 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
guint32 u32SubmoduleIdentNumber;
guint16 u16SubmoduleProperties;
proto_item *api_item;
- proto_tree *api_tree;
- guint32 u32ApiStart;
+ proto_tree *api_tree;
+ guint32 u32ApiStart;
proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_tree *sub_tree;
proto_item *submodule_item;
- proto_tree *submodule_tree;
- guint32 u32SubStart;
+ proto_tree *submodule_tree;
+ guint32 u32SubStart;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_apis, &u16NumberOfAPIs);
proto_item_append_text(item, ": APIs:%u", u16NumberOfAPIs);
while(u16NumberOfAPIs--) {
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
+ api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
u32ApiStart = offset;
/* API */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_api, &u32Api);
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* ModuleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_module_ident_number, &u32ModuleIdentNumber);
/* ModuleProperties */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_module_properties, &u16ModuleProperties);
/* NumberOfSubmodules */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_number_of_submodules, &u16NumberOfSubmodules);
proto_item_append_text(api_item, ": %u, Slot:0x%x, IdentNumber:0x%x Properties:0x%x Submodules:%u",
@@ -7176,29 +7176,29 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
while(u16NumberOfSubmodules--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_submodule_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_submodule);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_submodule);
u32SubStart = offset;
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* SubmoduleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_submodule_ident_number, &u32SubmoduleIdentNumber);
/* SubmoduleProperties */
submodule_item = proto_tree_add_item(sub_tree, hf_pn_io_submodule_properties, tvb, offset, 2, ENC_BIG_ENDIAN);
- submodule_tree = proto_item_add_subtree(submodule_item, ett_pn_io_submodule_properties);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ submodule_tree = proto_item_add_subtree(submodule_item, ett_pn_io_submodule_properties);
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_properties_reserved, &u16SubmoduleProperties);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_properties_discard_ioxs, &u16SubmoduleProperties);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_properties_reduce_output_submodule_data_length, &u16SubmoduleProperties);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_properties_reduce_input_submodule_data_length, &u16SubmoduleProperties);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_properties_shared_input, &u16SubmoduleProperties);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_properties_type, &u16SubmoduleProperties);
switch(u16SubmoduleProperties & 0x03) {
@@ -7219,10 +7219,10 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
proto_item_append_text(sub_item, ": Subslot:0x%x, Ident:0x%x Properties:0x%x",
u16SubslotNr, u32SubmoduleIdentNumber, u16SubmoduleProperties);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
}
- proto_item_set_len(api_item, offset - u32ApiStart);
+ proto_item_set_len(api_item, offset - u32ApiStart);
}
return offset;
@@ -7232,7 +7232,7 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
/* dissect the ModuleDiffBlock */
static int
dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16NumberOfAPIs;
guint32 u32Api;
@@ -7245,40 +7245,40 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
guint32 u32SubmoduleIdentNumber;
guint16 u16SubmoduleState;
proto_item *api_item;
- proto_tree *api_tree;
- guint32 u32ApiStart;
+ proto_tree *api_tree;
+ guint32 u32ApiStart;
proto_item *module_item;
- proto_tree *module_tree;
- guint32 u32ModuleStart;
+ proto_tree *module_tree;
+ guint32 u32ModuleStart;
proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_tree *sub_tree;
proto_item *submodule_item;
- proto_tree *submodule_tree;
- guint32 u32SubStart;
+ proto_tree *submodule_tree;
+ guint32 u32SubStart;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* NumberOfAPIs */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_number_of_apis, &u16NumberOfAPIs);
proto_item_append_text(item, ": APIs:%u", u16NumberOfAPIs);
while(u16NumberOfAPIs--) {
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
+ api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
u32ApiStart = offset;
/* API */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_api, &u32Api);
/* NumberOfModules */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_number_of_modules, &u16NumberOfModules);
proto_item_append_text(api_item, ": %u, Modules: %u",
@@ -7288,20 +7288,20 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
while(u16NumberOfModules--) {
module_item = proto_tree_add_item(api_tree, hf_pn_io_module_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- module_tree = proto_item_add_subtree(module_item, ett_pn_io_module);
+ module_tree = proto_item_add_subtree(module_item, ett_pn_io_module);
u32ModuleStart = offset;
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* ModuleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_module_ident_number, &u32ModuleIdentNumber);
/* ModuleState */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_module_state, &u16ModuleState);
/* NumberOfSubmodules */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, module_tree, drep,
hf_pn_io_number_of_submodules, &u16NumberOfSubmodules);
proto_item_append_text(module_item, ": Slot 0x%x, Ident: 0x%x State: %s Submodules: %u",
@@ -7313,50 +7313,50 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
while(u16NumberOfSubmodules--) {
sub_item = proto_tree_add_item(module_tree, hf_pn_io_submodule_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_submodule);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_submodule);
u32SubStart = offset;
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* SubmoduleIdentNumber */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_submodule_ident_number, &u32SubmoduleIdentNumber);
/* SubmoduleState */
submodule_item = proto_tree_add_item(sub_tree, hf_pn_io_submodule_state, tvb, offset, 2, ENC_BIG_ENDIAN);
- submodule_tree = proto_item_add_subtree(submodule_item, ett_pn_io_submodule_state);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ submodule_tree = proto_item_add_subtree(submodule_item, ett_pn_io_submodule_state);
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_format_indicator, &u16SubmoduleState);
if(u16SubmoduleState & 0x8000) {
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_ident_info, &u16SubmoduleState);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_ar_info, &u16SubmoduleState);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_diag_info, &u16SubmoduleState);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_maintenance_demanded, &u16SubmoduleState);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_maintenance_required, &u16SubmoduleState);
- dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_qualified_info, &u16SubmoduleState);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_add_info, &u16SubmoduleState);
} else {
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_detail, &u16SubmoduleState);
}
proto_item_append_text(sub_item, ": Subslot 0x%x, IdentNumber: 0x%x, State: 0x%x",
u16SubslotNr, u32SubmoduleIdentNumber, u16SubmoduleState);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
} /* NumberOfSubmodules */
- proto_item_set_len(module_item, offset - u32ModuleStart);
+ proto_item_set_len(module_item, offset - u32ModuleStart);
}
- proto_item_set_len(api_item, offset - u32ApiStart);
+ proto_item_set_len(api_item, offset - u32ApiStart);
}
return offset;
@@ -7366,7 +7366,7 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
/* dissect the IsochronousModeData block */
static int
dissect_IsochronousModeData_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
+ packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
{
guint16 u16SlotNr;
guint16 u16SubslotNr;
@@ -7378,38 +7378,38 @@ dissect_IsochronousModeData_block(tvbuff_t *tvb, int offset,
guint32 u32TimeIOOutputValid;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
/* SlotNumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_slot_nr, &u16SlotNr);
/* Subslotnumber */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_subslot_nr, &u16SubslotNr);
/* ControllerApplicationCycleFactor */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_controller_appl_cycle_factor, &u16ControllerApplicationCycleFactor);
/* TimeDataCycle */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_time_data_cycle, &u16TimeDataCycle);
/* TimeIOInput (ns) */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_time_io_input, &u32TimeIOInput);
/* TimeIOOutput (ns) */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_time_io_output, &u32TimeIOOutput);
/* TimeIOInputValid (ns) */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_time_io_input_valid, &u32TimeIOInputValid);
/* TimeIOOutputValid (ns) */
- offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_time_io_output_valid, &u32TimeIOOutputValid);
@@ -7420,8 +7420,8 @@ dissect_IsochronousModeData_block(tvbuff_t *tvb, int offset,
/* dissect the MultipleBlockHeader block */
static int
dissect_MultipleBlockHeader_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
- guint16 u16BodyLength)
+ packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ guint16 u16BodyLength)
{
guint32 u32Api;
guint16 u16SlotNr;
@@ -7429,11 +7429,11 @@ dissect_MultipleBlockHeader_block(tvbuff_t *tvb, int offset,
tvbuff_t *new_tvb;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
offset = dissect_pn_align4(tvb, offset, pinfo, tree);
@@ -7483,17 +7483,17 @@ indexReservedForProfiles(guint16 u16Index)
/* dissect the RecordDataReadQuery block */
static int
dissect_RecordDataReadQuery_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
+ packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
guint16 u16Index, guint16 u16BodyLength)
{
const gchar *userProfile;
- if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
+ if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
- "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
+ "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
return offset;
- }
+ }
/* user specified format? */
if(u16Index < 0x8000) {
@@ -7515,7 +7515,7 @@ dissect_RecordDataReadQuery_block(tvbuff_t *tvb, int offset,
/* dissect one PN-IO block (depending on the block type) */
static int
dissect_block(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 *u16Index, guint32 *u32RecDataLen, pnio_ar_t **ar)
{
guint16 u16BlockType;
guint16 u16BlockLength;
@@ -7527,7 +7527,7 @@ dissect_block(tvbuff_t *tvb, int offset,
guint16 u16BodyLength;
proto_item *header_item;
proto_tree *header_tree;
- gint remainingBytes;
+ gint remainingBytes;
/* from here, we only have big endian (network byte ordering)!!! */
drep[0] &= ~DREP_LITTLE_ENDIAN;
@@ -7571,19 +7571,19 @@ dissect_block(tvbuff_t *tvb, int offset,
case(0x0001):
case(0x0002):
dissect_AlarmNotification_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16BodyLength);
+ u16BodyLength);
break;
case(0x0008):
dissect_IODWriteReqHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16Index, u32RecDataLen, ar);
+ u16Index, u32RecDataLen, ar);
break;
case(0x0009):
dissect_IODReadReqHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16Index, u32RecDataLen, ar);
+ u16Index, u32RecDataLen, ar);
break;
case(0x0010):
dissect_DiagnosisData_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16BodyLength);
+ u16BodyLength);
break;
case(0x0012): /* ExpectedIdentificationData */
case(0x0013): /* RealIdentificationData */
@@ -7591,7 +7591,7 @@ dissect_block(tvbuff_t *tvb, int offset,
break;
case(0x0014):
dissect_SubstituteValue_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16BodyLength);
+ u16BodyLength);
break;
case(0x0015):
dissect_RecordInputDataObjectElement_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
@@ -7638,15 +7638,15 @@ dissect_block(tvbuff_t *tvb, int offset,
break;
case(0x0101):
dissect_ARBlockReq_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- ar);
+ ar);
break;
case(0x0102):
dissect_IOCRBlockReq_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- *ar);
+ *ar);
break;
case(0x0103):
dissect_AlarmCRBlockReq_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- *ar);
+ *ar);
break;
case(0x0104):
dissect_ExpectedSubmoduleBlockReq_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
@@ -7678,7 +7678,7 @@ dissect_block(tvbuff_t *tvb, int offset,
dissect_ControlConnect_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, ar);
break;
- case(0x0118):
+ case(0x0118):
dissect_ControlBlockPrmBegin(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, u16BodyLength, ar);
break;
@@ -7711,11 +7711,11 @@ dissect_block(tvbuff_t *tvb, int offset,
break;
case(0x0207):
dissect_PDIRFrameData_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16BodyLength);
+ u16BodyLength);
break;
case(0x0208):
dissect_PDIRBeginEndData_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16BodyLength);
+ u16BodyLength);
break;
case(0x0209):
dissect_AdjustDomainBoundary_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
@@ -7796,7 +7796,7 @@ dissect_block(tvbuff_t *tvb, int offset,
case(0x0226):
dissect_AdjustPreambleLength_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
break;
- case(0x022A):
+ case(0x022A):
dissect_PDIRSubframeData_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
break;
case(0x022B):
@@ -7827,7 +7827,7 @@ dissect_block(tvbuff_t *tvb, int offset,
case(0x0608):
dissect_PDInterfaceFSUDataAdjust_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, u16BodyLength);
break;
- case(0x010B):
+ case(0x010B):
case(0x0609):
dissect_ARFSUDataAdjust_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, u16BodyLength);
break;
@@ -7840,11 +7840,11 @@ dissect_block(tvbuff_t *tvb, int offset,
break;
case(0x8008):
dissect_IODWriteResHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16Index, u32RecDataLen, ar);
+ u16Index, u32RecDataLen, ar);
break;
case(0x8009):
dissect_IODReadResHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
- u16Index, u32RecDataLen, ar);
+ u16Index, u32RecDataLen, ar);
break;
case(0x8101):
dissect_ARBlockRes_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, ar);
@@ -7858,7 +7858,7 @@ dissect_block(tvbuff_t *tvb, int offset,
case(0x8104):
dissect_ModuleDiffBlock_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
break;
- case (0x8106):
+ case(0x8106):
dissect_ARServerBlock(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow);
break;
case(0x8110):
@@ -7868,7 +7868,7 @@ dissect_block(tvbuff_t *tvb, int offset,
case(0x8114):
case(0x8116):
case(0x8117):
- case(0x8118):
+ case(0x8118):
dissect_ControlConnect_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,ar);
break;
default:
@@ -7903,7 +7903,7 @@ dissect_a_block(tvbuff_t *tvb, int offset,
/* dissect any number of PN-IO blocks */
static int
dissect_blocks(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint16 u16Index = 0;
guint32 u32RecDataLen;
@@ -7919,14 +7919,14 @@ dissect_blocks(tvbuff_t *tvb, int offset,
pnio_ar_info(tvb, pinfo, tree, ar);
}
- return offset;
+ return offset;
}
/* dissect a PN-IO (DCE-RPC) request header */
static int
dissect_IPNIO_rqst_header(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint32 u32ArgsMax;
guint32 u32ArgsLen;
@@ -7934,35 +7934,35 @@ dissect_IPNIO_rqst_header(tvbuff_t *tvb, int offset,
guint32 u32Offset;
guint32 u32ArraySize;
- proto_item *sub_item;
- proto_tree *sub_tree;
- guint32 u32SubStart;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
+ guint32 u32SubStart;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-CM");
/* args_max */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_args_max, &u32ArgsMax);
/* args_len */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_args_len, &u32ArgsLen);
sub_item = proto_tree_add_item(tree, hf_pn_io_array, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io);
u32SubStart = offset;
/* RPC array header */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_array_max_count, &u32MaxCount);
- offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_array_offset, &u32Offset);
- offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_array_act_count, &u32ArraySize);
- proto_item_append_text(sub_item, ": Max: %u, Offset: %u, Size: %u",
+ proto_item_append_text(sub_item, ": Max: %u, Offset: %u, Size: %u",
u32MaxCount, u32Offset, u32ArraySize);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
return offset;
}
@@ -7971,16 +7971,16 @@ dissect_IPNIO_rqst_header(tvbuff_t *tvb, int offset,
/* dissect a PN-IO (DCE-RPC) response header */
static int
dissect_IPNIO_resp_header(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint32 u32ArgsLen;
guint32 u32MaxCount;
guint32 u32Offset;
guint32 u32ArraySize;
- proto_item *sub_item;
- proto_tree *sub_tree;
- guint32 u32SubStart;
+ proto_item *sub_item;
+ proto_tree *sub_tree;
+ guint32 u32SubStart;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-CM");
@@ -7988,24 +7988,24 @@ dissect_IPNIO_resp_header(tvbuff_t *tvb, int offset,
offset = dissect_PNIO_status(tvb, offset, pinfo, tree, drep);
/* args_len */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_args_len, &u32ArgsLen);
sub_item = proto_tree_add_item(tree, hf_pn_io_array, tvb, offset, 0, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io);
u32SubStart = offset;
/* RPC array header */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_array_max_count, &u32MaxCount);
- offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_array_offset, &u32Offset);
- offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_array_act_count, &u32ArraySize);
proto_item_append_text(sub_item, ": Max: %u, Offset: %u, Size: %u",
u32MaxCount, u32Offset, u32ArraySize);
- proto_item_set_len(sub_item, offset - u32SubStart);
+ proto_item_set_len(sub_item, offset - u32SubStart);
return offset;
}
@@ -8014,34 +8014,34 @@ dissect_IPNIO_resp_header(tvbuff_t *tvb, int offset,
/* dissect a PN-IO request */
static int
dissect_IPNIO_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
offset = dissect_IPNIO_rqst_header(tvb, offset, pinfo, tree, drep);
offset = dissect_blocks(tvb, offset, pinfo, tree, drep);
- return offset;
+ return offset;
}
/* dissect a PN-IO response */
static int
dissect_IPNIO_resp(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
offset = dissect_IPNIO_resp_header(tvb, offset, pinfo, tree, drep);
offset = dissect_blocks(tvb, offset, pinfo, tree, drep);
- return offset;
+ return offset;
}
/* dissect a PROFIDrive parameter request */
static int
dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint8 request_reference;
guint8 request_id;
@@ -8145,7 +8145,7 @@ dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset,
static int
dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint8 request_reference;
guint8 response_id;
@@ -8197,9 +8197,9 @@ dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset,
val_to_str(format, pn_io_profidrive_format_vals, "Unknown"), no_of_vals);
while(no_of_vals--) {
- guint16 value;
-
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
+ guint16 value;
+
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_profidrive_param_value, &value);
}
}
@@ -8209,7 +8209,7 @@ dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset,
static int
dissect_RecordDataRead(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 u16Index, guint32 u32RecDataLen)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 u16Index, guint32 u32RecDataLen)
{
const gchar *userProfile;
pnio_ar_t *ar = NULL;
@@ -8298,10 +8298,10 @@ dissect_RecordDataRead(tvbuff_t *tvb, int offset,
offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
break;
- case (0xB050):
- case (0xB051):
- case (0xB060):
- case (0xB061):
+ case(0xB050):
+ case(0xB051):
+ case(0xB060):
+ case(0xB061):
offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
break;
@@ -8351,7 +8351,7 @@ dissect_RecordDataRead(tvbuff_t *tvb, int offset,
case(0x804d):
case(0x804e):
case(0x804f): /* Expected PDSyncData for one subslot with SyncID value 31 */
- case(0x8072): /* PDPortStatistic for one subslot */
+ case(0x8072): /* PDPortStatistic for one subslot */
case(0xc000): /* ExpectedIdentificationData for one slot */
case(0xc001): /* RealIdentificationData for one slot */
case(0xc00a): /* Diagnosis in channel coding for one slot */
@@ -8386,7 +8386,7 @@ dissect_RecordDataRead(tvbuff_t *tvb, int offset,
/* dissect a PN-IO read response */
static int
dissect_IPNIO_Read_resp(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint16 u16Index = 0;
guint32 u32RecDataLen;
@@ -8406,13 +8406,13 @@ dissect_IPNIO_Read_resp(tvbuff_t *tvb, int offset,
pnio_ar_info(tvb, pinfo, tree, ar);
}
- return offset;
+ return offset;
}
/* F-Parameter record data object */
static int
dissect_ProfiSafeParameterRequest(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
proto_item *f_item;
proto_tree *f_tree;
@@ -8489,7 +8489,7 @@ dissect_ProfiSafeParameterRequest(tvbuff_t *tvb, int offset,
}
static int
dissect_RecordDataWrite(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 u16Index, guint32 u32RecDataLen)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep, guint16 u16Index, guint32 u32RecDataLen)
{
const gchar *userProfile;
pnio_ar_t *ar = NULL;
@@ -8548,7 +8548,7 @@ dissect_RecordDataWrite(tvbuff_t *tvb, int offset,
static int
dissect_IODWriteReq(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep, pnio_ar_t **ar)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep, pnio_ar_t **ar)
{
guint16 u16Index = 0;
guint32 u32RecDataLen;
@@ -8587,7 +8587,7 @@ dissect_IODWriteReq(tvbuff_t *tvb, int offset,
/* dissect a PN-IO write request */
static int
dissect_IPNIO_Write_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
pnio_ar_t *ar = NULL;
@@ -8599,14 +8599,14 @@ dissect_IPNIO_Write_rqst(tvbuff_t *tvb, int offset,
pnio_ar_info(tvb, pinfo, tree, ar);
}
- return offset;
+ return offset;
}
static int
dissect_IODWriteRes(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint16 u16Index = 0;
guint32 u32RecDataLen;
@@ -8619,7 +8619,7 @@ dissect_IODWriteRes(tvbuff_t *tvb, int offset,
/* IODWriteMultipleRes? */
if(u16Index == 0xe040) {
while(tvb_length_remaining(tvb, offset) > 0) {
- offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
+ offset = dissect_block(tvb, offset, pinfo, tree, drep, &u16Index, &u32RecDataLen, &ar);
}
}
@@ -8634,21 +8634,21 @@ dissect_IODWriteRes(tvbuff_t *tvb, int offset,
/* dissect a PN-IO write response */
static int
dissect_IPNIO_Write_resp(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
offset = dissect_IPNIO_resp_header(tvb, offset, pinfo, tree, drep);
offset = dissect_IODWriteRes(tvb, offset, pinfo, tree, drep);
- return offset;
+ return offset;
}
/* dissect the IOxS (IOCS, IOPS) field */
static int
dissect_PNIO_IOxS(tvbuff_t *tvb, int offset,
- packet_info *pinfo _U_, proto_tree *tree, guint8 *drep _U_, int hfindex)
+ packet_info *pinfo _U_, proto_tree *tree, guint8 *drep _U_, int hfindex)
{
guint8 u8IOxS;
proto_item *ioxs_item = NULL;
@@ -8658,17 +8658,17 @@ dissect_PNIO_IOxS(tvbuff_t *tvb, int offset,
u8IOxS = tvb_get_guint8(tvb, offset);
/* add ioxs subtree */
- ioxs_item = proto_tree_add_uint(tree, hfindex, tvb, offset, 1, u8IOxS);
- proto_item_append_text(ioxs_item,
- " (%s%s)",
- (u8IOxS & 0x01) ? "another IOxS follows " : "",
- (u8IOxS & 0x80) ? "good" : "bad");
- ioxs_tree = proto_item_add_subtree(ioxs_item, ett_pn_io_ioxs);
-
- proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_datastate, tvb, offset, 1, u8IOxS);
- proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_instance, tvb, offset, 1, u8IOxS);
- proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_res14, tvb, offset, 1, u8IOxS);
- proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_extension, tvb, offset, 1, u8IOxS);
+ ioxs_item = proto_tree_add_uint(tree, hfindex, tvb, offset, 1, u8IOxS);
+ proto_item_append_text(ioxs_item,
+ " (%s%s)",
+ (u8IOxS & 0x01) ? "another IOxS follows " : "",
+ (u8IOxS & 0x80) ? "good" : "bad");
+ ioxs_tree = proto_item_add_subtree(ioxs_item, ett_pn_io_ioxs);
+
+ proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_datastate, tvb, offset, 1, u8IOxS);
+ proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_instance, tvb, offset, 1, u8IOxS);
+ proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_res14, tvb, offset, 1, u8IOxS);
+ proto_tree_add_uint(ioxs_tree, hf_pn_io_ioxs_extension, tvb, offset, 1, u8IOxS);
return offset + 1;
}
@@ -8677,17 +8677,17 @@ dissect_PNIO_IOxS(tvbuff_t *tvb, int offset,
/* dissect a PN-IO Cyclic Service Data Unit (on top of PN-RT protocol) */
static int
dissect_PNIO_C_SDU(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
proto_item *data_item;
- proto_tree *data_tree;
+ proto_tree *data_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO");
if(tree) {
- data_item = proto_tree_add_protocol_format(tree, proto_pn_io, tvb, offset, tvb_length(tvb),
- "PROFINET IO Cyclic Service Data Unit: %u bytes", tvb_length(tvb));
+ data_item = proto_tree_add_protocol_format(tree, proto_pn_io, tvb, offset, tvb_length(tvb),
+ "PROFINET IO Cyclic Service Data Unit: %u bytes", tvb_length(tvb));
data_tree = proto_item_add_subtree(data_item, ett_pn_io_rtc);
offset = dissect_PNIO_IOxS(tvb, offset, pinfo, data_tree, drep, hf_pn_io_ioxs);
@@ -8706,7 +8706,7 @@ dissect_PNIO_C_SDU(tvbuff_t *tvb, int offset,
/* dissect a PN-IO RTA PDU (on top of PN-RT protocol) */
static int
dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
guint16 u16AlarmDstEndpoint;
guint16 u16AlarmSrcEndpoint;
@@ -8724,17 +8724,17 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
proto_item *rta_item;
- proto_tree *rta_tree;
+ proto_tree *rta_tree;
proto_item *sub_item;
- proto_tree *sub_tree;
+ proto_tree *sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-AL");
- rta_item = proto_tree_add_protocol_format(tree, proto_pn_io, tvb, offset, tvb_length(tvb),
+ rta_item = proto_tree_add_protocol_format(tree, proto_pn_io, tvb, offset, tvb_length(tvb),
"PROFINET IO Alarm");
- rta_tree = proto_item_add_subtree(rta_item, ett_pn_io_rta);
+ rta_tree = proto_item_add_subtree(rta_item, ett_pn_io_rta);
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, rta_tree, drep,
hf_pn_io_alarm_dst_endpoint, &u16AlarmDstEndpoint);
@@ -8745,8 +8745,8 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
u16AlarmSrcEndpoint, u16AlarmDstEndpoint);
/* PDU type */
- sub_item = proto_tree_add_item(rta_tree, hf_pn_io_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_pdu_type);
+ sub_item = proto_tree_add_item(rta_tree, hf_pn_io_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_pdu_type);
dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_pdu_type_type, &u8PDUType);
u8PDUType &= 0x0F;
@@ -8758,8 +8758,8 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
u8PDUVersion);
/* additional flags */
- sub_item = proto_tree_add_item(rta_tree, hf_pn_io_add_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
- sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_add_flags);
+ sub_item = proto_tree_add_item(rta_tree, hf_pn_io_add_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
+ sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_add_flags);
dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_window_size, &u8WindowSize);
u8WindowSize &= 0x0F;
@@ -8778,19 +8778,19 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
switch(u8PDUType & 0x0F) {
case(1): /* Data-RTA */
- col_append_str(pinfo->cinfo, COL_INFO, ", Data-RTA");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Data-RTA");
offset = dissect_block(tvb, offset, pinfo, rta_tree, drep, &u16Index, &u32RecDataLen, &ar);
break;
case(2): /* NACK-RTA */
- col_append_str(pinfo->cinfo, COL_INFO, ", NACK-RTA");
+ col_append_str(pinfo->cinfo, COL_INFO, ", NACK-RTA");
/* no additional data */
break;
case(3): /* ACK-RTA */
- col_append_str(pinfo->cinfo, COL_INFO, ", ACK-RTA");
+ col_append_str(pinfo->cinfo, COL_INFO, ", ACK-RTA");
/* no additional data */
break;
case(4): /* ERR-RTA */
- col_append_str(pinfo->cinfo, COL_INFO, ", ERR-RTA");
+ col_append_str(pinfo->cinfo, COL_INFO, ", ERR-RTA");
offset = dissect_PNIO_status(tvb, offset, pinfo, rta_tree, drep);
break;
default:
@@ -8806,11 +8806,11 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
/* possibly dissect a PN-IO related PN-RT packet */
static gboolean
dissect_PNIO_heur(tvbuff_t *tvb,
- packet_info *pinfo, proto_tree *tree)
+ packet_info *pinfo, proto_tree *tree)
{
guint8 drep_data = 0;
guint8 *drep = &drep_data;
- guint8 u8CBAVersion;
+ guint8 u8CBAVersion;
guint16 u16FrameID;
/*
@@ -8827,7 +8827,7 @@ dissect_PNIO_heur(tvbuff_t *tvb,
u8CBAVersion = tvb_get_guint8 (tvb, 0);
/* is this a (none DFP) PNIO class 3 data packet? */
- /* frame id must be in valid range (cyclic Real-Time, class=3) */
+ /* frame id must be in valid range (cyclic Real-Time, class=3) */
if ((u16FrameID >= 0x0100 && u16FrameID <= 0x6FF /*0x04ff*/) || /* non redundant */
(u16FrameID >= 0x700/*0x0800*/ && u16FrameID <= 0x0fff)) { /* redundant */
dissect_PNIO_C_SDU(tvb, 0, pinfo, tree, drep);
@@ -8835,22 +8835,22 @@ dissect_PNIO_heur(tvbuff_t *tvb,
}
/* is this a (none DFP) PNIO class 2 data packet? */
- /* frame id must be in valid range (cyclic Real-Time, class=2) and
+ /* frame id must be in valid range (cyclic Real-Time, class=2) and
* first byte (CBA version field) has to be != 0x11 */
- if ((
- (u16FrameID >= 0x5000 && u16FrameID <= 0x57ff) || /* redundant */
- (u16FrameID >= 0x6000 && u16FrameID <= 0x67ff) || /* non redundant */
- (u16FrameID >= 0x7000 && u16FrameID <= 0x77ff) || /* redundant */
- (u16FrameID >= 0x8000 && u16FrameID <= 0xbfff)) /* non redundant */
- && u8CBAVersion != 0x11) {
+ if ((
+ (u16FrameID >= 0x5000 && u16FrameID <= 0x57ff) || /* redundant */
+ (u16FrameID >= 0x6000 && u16FrameID <= 0x67ff) || /* non redundant */
+ (u16FrameID >= 0x7000 && u16FrameID <= 0x77ff) || /* redundant */
+ (u16FrameID >= 0x8000 && u16FrameID <= 0xbfff)) /* non redundant */
+ && u8CBAVersion != 0x11) {
dissect_PNIO_C_SDU(tvb, 0, pinfo, tree, drep);
return TRUE;
}
/* is this a PNIO class 1 data packet? */
- /* frame id must be in valid range (cyclic Real-Time, class=1) and
+ /* frame id must be in valid range (cyclic Real-Time, class=1) and
* first byte (CBA version field) has to be != 0x11 */
- if (u16FrameID >= 0xc000 && u16FrameID < 0xfbff && u8CBAVersion != 0x11) {
+ if (u16FrameID >= 0xc000 && u16FrameID < 0xfbff && u8CBAVersion != 0x11) {
dissect_PNIO_C_SDU(tvb, 0, pinfo, tree, drep);
return TRUE;
}
@@ -8951,7 +8951,7 @@ static dcerpc_sub_dissector pn_io_dissectors[] = {
{ 3, "Write", dissect_IPNIO_Write_rqst, dissect_IPNIO_Write_resp },
{ 4, "Control", dissect_IPNIO_rqst, dissect_IPNIO_resp },
{ 5, "Read Implicit", dissect_IPNIO_rqst, dissect_IPNIO_Read_resp },
- { 0, NULL, NULL, NULL }
+ { 0, NULL, NULL, NULL }
};
@@ -8963,42 +8963,42 @@ static void pnio_reinit( void) {
void
proto_register_pn_io (void)
{
- static hf_register_info hf[] = {
- { &hf_pn_io_opnum,
- { "Operation", "pn_io.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_reserved16,
- { "Reserved", "pn_io.reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_array,
+ static hf_register_info hf[] = {
+ { &hf_pn_io_opnum,
+ { "Operation", "pn_io.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_reserved16,
+ { "Reserved", "pn_io.reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_array,
{ "Array", "pn_io.array", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_status,
- { "Status", "pn_io.status", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_args_max,
- { "ArgsMaximum", "pn_io.args_max", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_args_len,
- { "ArgsLength", "pn_io.args_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_array_max_count,
- { "MaximumCount", "pn_io.array_max_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_array_offset,
- { "Offset", "pn_io.array_offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_array_act_count,
- { "ActualCount", "pn_io.array_act_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_status,
+ { "Status", "pn_io.status", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_args_max,
+ { "ArgsMaximum", "pn_io.args_max", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_args_len,
+ { "ArgsLength", "pn_io.args_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_array_max_count,
+ { "MaximumCount", "pn_io.array_max_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_array_offset,
+ { "Offset", "pn_io.array_offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_array_act_count,
+ { "ActualCount", "pn_io.array_act_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_ar_type,
{ "ARType", "pn_io.ar_type", FT_UINT16, BASE_HEX, VALS(pn_io_ar_type), 0x0, NULL, HFILL }},
- { &hf_pn_io_cminitiator_macadd,
+ { &hf_pn_io_cminitiator_macadd,
{ "CMInitiatorMacAdd", "pn_io.cminitiator_mac_add", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
- { &hf_pn_io_cminitiator_objectuuid,
+ { &hf_pn_io_cminitiator_objectuuid,
{ "CMInitiatorObjectUUID", "pn_io.cminitiator_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
{ &hf_pn_io_parameter_server_objectuuid,
{ "ParameterServerObjectUUID", "pn_io.parameter_server_objectuuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
- { &hf_pn_io_ar_properties,
- { "ARProperties", "pn_io.ar_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_ar_properties_state,
- { "State", "pn_io.ar_properties.state", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_state), 0x00000007, NULL, HFILL }},
- { &hf_pn_io_ar_properties_supervisor_takeover_allowed,
- { "SupervisorTakeoverAllowed", "pn_io.ar_properties.supervisor_takeover_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_supervisor_takeover_allowed), 0x00000008, NULL, HFILL }},
- { &hf_pn_io_ar_properties_parametrization_server,
- { "ParametrizationServer", "pn_io.ar_properties.parametrization_server", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_parametrization_server), 0x00000010, NULL, HFILL }},
+ { &hf_pn_io_ar_properties,
+ { "ARProperties", "pn_io.ar_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_ar_properties_state,
+ { "State", "pn_io.ar_properties.state", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_state), 0x00000007, NULL, HFILL }},
+ { &hf_pn_io_ar_properties_supervisor_takeover_allowed,
+ { "SupervisorTakeoverAllowed", "pn_io.ar_properties.supervisor_takeover_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_supervisor_takeover_allowed), 0x00000008, NULL, HFILL }},
+ { &hf_pn_io_ar_properties_parametrization_server,
+ { "ParametrizationServer", "pn_io.ar_properties.parametrization_server", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_parametrization_server), 0x00000010, NULL, HFILL }},
/*removed with 2.3
{ &hf_pn_io_ar_properties_data_rate,
{ "DataRate", "pn_io.ar_properties.data_rate", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_data_rate), 0x00000060, NULL, HFILL }},
@@ -9015,35 +9015,35 @@ proto_register_pn_io (void)
{ &hf_pn_io_arproperties_StartupMode,
{ "StartupMode", "pn_io.ar_properties.StartupMode", FT_UINT32, BASE_HEX, VALS(pn_io_arpropertiesStartupMode), 0x40000000, NULL, HFILL }},
- { &hf_pn_io_ar_properties_reserved,
+ { &hf_pn_io_ar_properties_reserved,
{ "Reserved", "pn_io.ar_properties.reserved", FT_UINT32, BASE_HEX, NULL, 0x3FFFF000, NULL, HFILL }},
- { &hf_pn_io_ar_properties_pull_module_alarm_allowed,
- { "PullModuleAlarmAllowed", "pn_io.ar_properties.pull_module_alarm_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_pull_module_alarm_allowed), 0x80000000, NULL, HFILL }},
+ { &hf_pn_io_ar_properties_pull_module_alarm_allowed,
+ { "PullModuleAlarmAllowed", "pn_io.ar_properties.pull_module_alarm_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_pull_module_alarm_allowed), 0x80000000, NULL, HFILL }},
- { &hf_pn_RedundancyInfo,
- { "RedundancyInfo.EndPoint", "pn_io.srl_data.redundancyInfo", FT_UINT16, BASE_HEX, VALS(pn_io_RedundancyInfo), 0x0000003, NULL, HFILL }},
- { &hf_pn_RedundancyInfo_reserved,
- { "RedundancyInfo.reserved", "pn_io.srl_data.redundancyInfoReserved", FT_UINT16, BASE_HEX, NULL, 0xFFFFFFFC, NULL, HFILL }},
+ { &hf_pn_RedundancyInfo,
+ { "RedundancyInfo.EndPoint", "pn_io.srl_data.redundancyInfo", FT_UINT16, BASE_HEX, VALS(pn_io_RedundancyInfo), 0x0000003, NULL, HFILL }},
+ { &hf_pn_RedundancyInfo_reserved,
+ { "RedundancyInfo.reserved", "pn_io.srl_data.redundancyInfoReserved", FT_UINT16, BASE_HEX, NULL, 0xFFFFFFFC, NULL, HFILL }},
{ &hf_pn_io_number_of_ARDATAInfo,
{ "ARDataInfo.NumberOfEntries", "pn_io.number_of_ARDATAInfo", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_cminitiator_activitytimeoutfactor,
- { "CMInitiatorActivityTimeoutFactor", "pn_io.cminitiator_activitytimeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
- { &hf_pn_io_cminitiator_udprtport,
- { "CMInitiatorUDPRTPort", "pn_io.cminitiator_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
- { &hf_pn_io_station_name_length,
- { "StationNameLength", "pn_io.station_name_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_cminitiator_station_name,
- { "CMInitiatorStationName", "pn_io.cminitiator_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_cminitiator_activitytimeoutfactor,
+ { "CMInitiatorActivityTimeoutFactor", "pn_io.cminitiator_activitytimeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
+ { &hf_pn_io_cminitiator_udprtport,
+ { "CMInitiatorUDPRTPort", "pn_io.cminitiator_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
+ { &hf_pn_io_station_name_length,
+ { "StationNameLength", "pn_io.station_name_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_cminitiator_station_name,
+ { "CMInitiatorStationName", "pn_io.cminitiator_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_responder_station_name,
{ "CMResponderrStationName", "pn_io.cmresponder_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_parameter_server_station_name,
- { "ParameterServerStationName", "pn_io.parameter_server_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_parameter_server_station_name,
+ { "ParameterServerStationName", "pn_io.parameter_server_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_cmresponder_macadd,
+ { &hf_pn_io_cmresponder_macadd,
{ "CMResponderMacAdd", "pn_io.cmresponder_macadd", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
- { &hf_pn_io_cmresponder_udprtport,
- { "CMResponderUDPRTPort", "pn_io.cmresponder_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
+ { &hf_pn_io_cmresponder_udprtport,
+ { "CMResponderUDPRTPort", "pn_io.cmresponder_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
{ &hf_pn_io_number_of_iocrs,
{ "NumberOfIOCRs", "pn_io.number_of_iocrs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
@@ -9085,19 +9085,19 @@ proto_register_pn_io (void)
{ "IOCRProperties", "pn_io.iocr_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_iocr_properties_rtclass,
{ "RTClass", "pn_io.iocr_properties.rtclass", FT_UINT32, BASE_HEX, VALS(pn_io_iocr_properties_rtclass), 0x0000000F, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_reserved_1,
+ { &hf_pn_io_iocr_properties_reserved_1,
{ "Reserved1", "pn_io.iocr_properties.reserved1", FT_UINT32, BASE_HEX, NULL, 0x000007F0, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_media_redundancy,
+ { &hf_pn_io_iocr_properties_media_redundancy,
{ "MediaRedundancy", "pn_io.iocr_properties.media_redundancy", FT_UINT32, BASE_HEX, VALS(pn_io_iocr_properties_media_redundancy), 0x00000800, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_reserved_2,
+ { &hf_pn_io_iocr_properties_reserved_2,
{ "Reserved2", "pn_io.iocr_properties.reserved2", FT_UINT32, BASE_HEX, NULL, 0x00FFF000, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_reserved_3,
+ { &hf_pn_io_iocr_properties_reserved_3,
{ "Reserved3", "pn_io.iocr_properties.reserved3", FT_UINT32, BASE_HEX, NULL, 0x1F000000, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_fast_forwarding_mac_adr,
+ { &hf_pn_io_iocr_properties_fast_forwarding_mac_adr,
{ "FastForwardingMACAdr", "pn_io.iocr_properties.fast_forwarding_mac_adr", FT_UINT32, BASE_HEX, NULL, 0x20000000, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_distributed_subframe_watchdog,
+ { &hf_pn_io_iocr_properties_distributed_subframe_watchdog,
{ "DistributedSubFrameWatchDog", "pn_io.iocr_properties.distributed_subframe_watchdog", FT_UINT32, BASE_HEX, NULL, 0x40000000, NULL, HFILL }},
- { &hf_pn_io_iocr_properties_full_subframe_structure,
+ { &hf_pn_io_iocr_properties_full_subframe_structure,
{ "FullSubFrameStructure", "pn_io.iocr_properties.full_subframe_structure", FT_UINT32, BASE_HEX, NULL, 0x80000000, NULL, HFILL }},
{ &hf_pn_io_SFIOCRProperties,
{ "SFIOCRProperties", "pn_io.SFIOCRProperties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
@@ -9165,20 +9165,20 @@ proto_register_pn_io (void)
{ &hf_pn_io_alarmcr_properties_reserved,
{ "Reserved", "pn_io.alarmcr_properties.reserved", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFFC, NULL, HFILL }},
- { &hf_pn_io_rta_timeoutfactor,
- { "RTATimeoutFactor", "pn_io.rta_timeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
- { &hf_pn_io_rta_retries,
- { "RTARetries", "pn_io.rta_retries", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - only values 3 - 15 allowed */
- { &hf_pn_io_localalarmref,
- { "LocalAlarmReference", "pn_io.localalarmref", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
- { &hf_pn_io_remotealarmref,
- { "RemoteAlarmReference", "pn_io.remotealarmref", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
- { &hf_pn_io_maxalarmdatalength,
- { "MaxAlarmDataLength", "pn_io.maxalarmdatalength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - only values 200 - 1432 allowed */
- { &hf_pn_io_alarmcr_tagheaderhigh,
- { "AlarmCRTagHeaderHigh", "pn_io.alarmcr_tagheaderhigh", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - 16 bitfield! */
- { &hf_pn_io_alarmcr_tagheaderlow,
- { "AlarmCRTagHeaderLow", "pn_io.alarmcr_tagheaderlow", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - 16 bitfield!*/
+ { &hf_pn_io_rta_timeoutfactor,
+ { "RTATimeoutFactor", "pn_io.rta_timeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
+ { &hf_pn_io_rta_retries,
+ { "RTARetries", "pn_io.rta_retries", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - only values 3 - 15 allowed */
+ { &hf_pn_io_localalarmref,
+ { "LocalAlarmReference", "pn_io.localalarmref", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
+ { &hf_pn_io_remotealarmref,
+ { "RemoteAlarmReference", "pn_io.remotealarmref", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
+ { &hf_pn_io_maxalarmdatalength,
+ { "MaxAlarmDataLength", "pn_io.maxalarmdatalength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - only values 200 - 1432 allowed */
+ { &hf_pn_io_alarmcr_tagheaderhigh,
+ { "AlarmCRTagHeaderHigh", "pn_io.alarmcr_tagheaderhigh", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - 16 bitfield! */
+ { &hf_pn_io_alarmcr_tagheaderlow,
+ { "AlarmCRTagHeaderLow", "pn_io.alarmcr_tagheaderlow", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - 16 bitfield!*/
{ &hf_pn_io_api_tree,
{ "API", "pn_io.api", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -9452,10 +9452,10 @@ proto_register_pn_io (void)
{ "AddressResolutionProperties", "pn_io.address_resolution_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mci_timeout_factor,
{ "MCITimeoutFactor", "pn_io.mci_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_provider_station_name,
- { "ProviderStationName", "pn_io.provider_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_pn_io_user_structure_identifier,
- { "UserStructureIdentifier", "pn_io.user_structure_identifier", FT_UINT16, BASE_HEX, VALS(pn_io_user_structure_identifier), 0x0, NULL, HFILL }},
+ { &hf_pn_io_provider_station_name,
+ { "ProviderStationName", "pn_io.provider_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_pn_io_user_structure_identifier,
+ { "UserStructureIdentifier", "pn_io.user_structure_identifier", FT_UINT16, BASE_HEX, VALS(pn_io_user_structure_identifier), 0x0, NULL, HFILL }},
{ &hf_pn_io_subframe_data,
@@ -9738,9 +9738,9 @@ proto_register_pn_io (void)
{ "VendorBlockType", "pn_io.vendor_block_type", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_order_id,
- { "OrderID", "pn_io.order_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "OrderID", "pn_io.order_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_im_serial_number,
- { "IMSerialNumber", "pn_io.im_serial_number", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "IMSerialNumber", "pn_io.im_serial_number", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_im_hardware_revision,
{ "IMHardwareRevision", "pn_io.im_hardware_revision", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
@@ -9799,86 +9799,86 @@ proto_register_pn_io (void)
{ "EntryDetail", "pn_io.entry_detail", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_ip_address,
- { "IPAddress", "pn_io.ip_address", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "IPAddress", "pn_io.ip_address", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_subnetmask,
- { "Subnetmask", "pn_io.subnetmask", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "Subnetmask", "pn_io.subnetmask", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_standard_gateway,
- { "StandardGateway", "pn_io.standard_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "StandardGateway", "pn_io.standard_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_domain_uuid,
{ "MRP_DomainUUID", "pn_io.mrp_domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_role,
{ "MRP_Role", "pn_io.mrp_role", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_role_vals), 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_length_domain_name,
- { "MRP_LengthDomainName", "pn_io.mrp_length_domain_name", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "MRP_LengthDomainName", "pn_io.mrp_length_domain_name", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_domain_name,
- { "MRP_DomainName", "pn_io.mrp_domain_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "MRP_DomainName", "pn_io.mrp_domain_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_prio,
- { "MRP_Prio", "pn_io.mrp_prio", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_prio_vals), 0x0, NULL, HFILL }},
+ { "MRP_Prio", "pn_io.mrp_prio", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_prio_vals), 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_topchgt,
- { "MRP_TOPchgT", "pn_io.mrp_topchgt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 10ms", HFILL }},
+ { "MRP_TOPchgT", "pn_io.mrp_topchgt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 10ms", HFILL }},
{ &hf_pn_io_mrp_topnrmax,
- { "MRP_TOPNRmax", "pn_io.mrp_topnrmax", FT_UINT16, BASE_DEC, NULL, 0x0, "number of iterations", HFILL }},
+ { "MRP_TOPNRmax", "pn_io.mrp_topnrmax", FT_UINT16, BASE_DEC, NULL, 0x0, "number of iterations", HFILL }},
{ &hf_pn_io_mrp_tstshortt,
- { "MRP_TSTshortT", "pn_io.mrp_tstshortt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 1 ms", HFILL }},
+ { "MRP_TSTshortT", "pn_io.mrp_tstshortt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 1 ms", HFILL }},
{ &hf_pn_io_mrp_tstdefaultt,
- { "MRP_TSTdefaultT", "pn_io.mrp_tstdefaultt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 1ms", HFILL }},
+ { "MRP_TSTdefaultT", "pn_io.mrp_tstdefaultt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 1ms", HFILL }},
{ &hf_pn_io_mrp_tstnrmax,
- { "MRP_TSTNRmax", "pn_io.mrp_tstnrmax", FT_UINT16, BASE_DEC, NULL, 0x0, "number of outstanding test indications causes ring failure", HFILL }},
+ { "MRP_TSTNRmax", "pn_io.mrp_tstnrmax", FT_UINT16, BASE_DEC, NULL, 0x0, "number of outstanding test indications causes ring failure", HFILL }},
{ &hf_pn_io_mrp_check,
- { "MRP_Check", "pn_io.mrp_check", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { "MRP_Check", "pn_io.mrp_check", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_rtmode,
- { "MRP_RTMode", "pn_io.mrp_rtmode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { "MRP_RTMode", "pn_io.mrp_rtmode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_rtmode_rtclass12,
- { "RTClass1_2", "pn_io.mrp_rtmode.class1_2", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass12_vals), 0x00000001, NULL, HFILL }},
+ { "RTClass1_2", "pn_io.mrp_rtmode.class1_2", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass12_vals), 0x00000001, NULL, HFILL }},
{ &hf_pn_io_mrp_rtmode_rtclass3,
- { "RTClass1_3", "pn_io.mrp_rtmode.class3", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass3_vals), 0x00000002, NULL, HFILL }},
+ { "RTClass1_3", "pn_io.mrp_rtmode.class3", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass3_vals), 0x00000002, NULL, HFILL }},
{ &hf_pn_io_mrp_rtmode_reserved1,
- { "Reserved_1", "pn_io.mrp_rtmode.reserved_1", FT_UINT32, BASE_HEX, NULL, 0x00fffffc, NULL, HFILL }},
+ { "Reserved_1", "pn_io.mrp_rtmode.reserved_1", FT_UINT32, BASE_HEX, NULL, 0x00fffffc, NULL, HFILL }},
{ &hf_pn_io_mrp_rtmode_reserved2,
- { "Reserved_2", "pn_io.mrp_rtmode.reserved_2", FT_UINT32, BASE_HEX, NULL, 0xff000000, NULL, HFILL }},
+ { "Reserved_2", "pn_io.mrp_rtmode.reserved_2", FT_UINT32, BASE_HEX, NULL, 0xff000000, NULL, HFILL }},
{ &hf_pn_io_mrp_lnkdownt,
- { "MRP_LNKdownT", "pn_io.mrp_lnkdownt", FT_UINT16, BASE_HEX, NULL, 0x0, "Link down Interval in ms", HFILL }},
+ { "MRP_LNKdownT", "pn_io.mrp_lnkdownt", FT_UINT16, BASE_HEX, NULL, 0x0, "Link down Interval in ms", HFILL }},
{ &hf_pn_io_mrp_lnkupt,
- { "MRP_LNKupT", "pn_io.mrp_lnkupt", FT_UINT16, BASE_HEX, NULL, 0x0, "Link up Interval in ms", HFILL }},
+ { "MRP_LNKupT", "pn_io.mrp_lnkupt", FT_UINT16, BASE_HEX, NULL, 0x0, "Link up Interval in ms", HFILL }},
{ &hf_pn_io_mrp_lnknrmax,
- { "MRP_LNKNRmax", "pn_io.mrp_lnknrmax", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { "MRP_LNKNRmax", "pn_io.mrp_lnknrmax", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_version,
- { "MRP_Version", "pn_io.mrp_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "MRP_Version", "pn_io.mrp_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_substitute_active_flag,
- { "SubstituteActiveFlag", "pn_io.substitute_active_flag", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { "SubstituteActiveFlag", "pn_io.substitute_active_flag", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_length_data,
- { "LengthData", "pn_io.length_data", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "LengthData", "pn_io.length_data", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_ring_state,
- { "MRP_RingState", "pn_io.mrp_ring_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_ring_state_vals), 0x0, NULL, HFILL }},
+ { "MRP_RingState", "pn_io.mrp_ring_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_ring_state_vals), 0x0, NULL, HFILL }},
{ &hf_pn_io_mrp_rt_state,
- { "MRP_RTState", "pn_io.mrp_rt_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_rt_state_vals), 0x0, NULL, HFILL }},
+ { "MRP_RTState", "pn_io.mrp_rt_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_rt_state_vals), 0x0, NULL, HFILL }},
{ &hf_pn_io_im_tag_function,
- { "IM_Tag_Function", "pn_io.im_tag_function", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "IM_Tag_Function", "pn_io.im_tag_function", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_im_tag_location,
- { "IM_Tag_Location", "pn_io.im_tag_location", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "IM_Tag_Location", "pn_io.im_tag_location", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_im_date,
- { "IM_Date", "pn_io.im_date", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "IM_Date", "pn_io.im_date", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_im_descriptor,
- { "IM_Descriptor", "pn_io.im_descriptor", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { "IM_Descriptor", "pn_io.im_descriptor", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_fs_hello_mode,
- { "FSHelloMode", "pn_io.fs_hello_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_hello_mode_vals), 0x0, NULL, HFILL }},
+ { "FSHelloMode", "pn_io.fs_hello_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_hello_mode_vals), 0x0, NULL, HFILL }},
{ &hf_pn_io_fs_hello_interval,
- { "FSHelloInterval", "pn_io.fs_hello_interval", FT_UINT32, BASE_DEC, NULL, 0x0, "ms before conveying a second DCP_Hello.req", HFILL }},
+ { "FSHelloInterval", "pn_io.fs_hello_interval", FT_UINT32, BASE_DEC, NULL, 0x0, "ms before conveying a second DCP_Hello.req", HFILL }},
{ &hf_pn_io_fs_hello_retry,
- { "FSHelloRetry", "pn_io.fs_hello_retry", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "FSHelloRetry", "pn_io.fs_hello_retry", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_fs_hello_delay,
- { "FSHelloDelay", "pn_io.fs_hello_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "FSHelloDelay", "pn_io.fs_hello_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_pn_io_fs_parameter_mode,
- { "FSParameterMode", "pn_io.fs_parameter_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_parameter_mode_vals), 0x0, NULL, HFILL }},
+ { "FSParameterMode", "pn_io.fs_parameter_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_parameter_mode_vals), 0x0, NULL, HFILL }},
{ &hf_pn_io_fs_parameter_uuid,
{ "FSParameterUUID", "pn_io.fs_parameter_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -9948,14 +9948,14 @@ proto_register_pn_io (void)
{ "Value", "pn_io.profidrive.parameter.value", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}
};
- static gint *ett[] = {
- &ett_pn_io,
+ static gint *ett[] = {
+ &ett_pn_io,
&ett_pn_io_block,
&ett_pn_io_block_header,
&ett_pn_io_status,
&ett_pn_io_rtc,
&ett_pn_io_rta,
- &ett_pn_io_pdu_type,
+ &ett_pn_io_pdu_type,
&ett_pn_io_add_flags,
&ett_pn_io_control_command,
&ett_pn_io_ioxs,
@@ -9994,15 +9994,15 @@ proto_register_pn_io (void)
&ett_pn_io_GroupProperties
};
- proto_pn_io = proto_register_protocol ("PROFINET IO", "PNIO", "pn_io");
- proto_register_field_array (proto_pn_io, hf, array_length (hf));
- proto_register_subtree_array (ett, array_length (ett));
+ proto_pn_io = proto_register_protocol ("PROFINET IO", "PNIO", "pn_io");
+ proto_register_field_array (proto_pn_io, hf, array_length (hf));
+ proto_register_subtree_array (ett, array_length (ett));
- /* subdissector code */
+ /* subdissector code */
new_register_dissector("pn_io", dissect_PNIO_heur, proto_pn_io);
register_heur_dissector_list("pn_io", &heur_pn_subdissector_list);
- register_init_routine(pnio_reinit);
+ register_init_routine(pnio_reinit);
register_dissector_filter("PN-IO AR", pn_io_ar_conv_valid, pn_io_ar_conv_filter);
register_dissector_filter("PN-IO AR (with data)", pn_io_ar_conv_valid, pn_io_ar_conv_data_filter);
@@ -10011,12 +10011,11 @@ proto_register_pn_io (void)
void
proto_reg_handoff_pn_io (void)
{
- /* Register the protocols as dcerpc */
- dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_device, ver_pn_io_device, pn_io_dissectors, hf_pn_io_opnum);
- dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_controller, ver_pn_io_controller, pn_io_dissectors, hf_pn_io_opnum);
- dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_supervisor, ver_pn_io_supervisor, pn_io_dissectors, hf_pn_io_opnum);
- dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_parameterserver, ver_pn_io_parameterserver, pn_io_dissectors, hf_pn_io_opnum);
-
- heur_dissector_add("pn_rt", dissect_PNIO_heur, proto_pn_io);
+ /* Register the protocols as dcerpc */
+ dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_device, ver_pn_io_device, pn_io_dissectors, hf_pn_io_opnum);
+ dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_controller, ver_pn_io_controller, pn_io_dissectors, hf_pn_io_opnum);
+ dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_supervisor, ver_pn_io_supervisor, pn_io_dissectors, hf_pn_io_opnum);
+ dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_parameterserver, ver_pn_io_parameterserver, pn_io_dissectors, hf_pn_io_opnum);
+ heur_dissector_add("pn_rt", dissect_PNIO_heur, proto_pn_io);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 10:44:10 +0000