PROFINET: Refactoring

According to the prediction, some new features will be
added in the future. I'm working on the implementation
of these new features. dissect_PNIO_status is updated
as "extern" and transferred to the packet-pn.c.
Because upcoming feature will have own c file and it
will use this dissection. Thus, dependence between
classes will be decreased and duplicated code lines
will be prevented. So that future changes will be easier.

Change-Id: I067d9582dcc8b9909e5a9bc3ab5f30d3c879b226
Reviewed-on: https://code.wireshark.org/review/28677
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 1080 insertions, 1070 deletions

diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index 03f262a50f..bf7c69dd7d 100644
--- a/plugins/epan/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
@@ -95,7 +95,6 @@ static int hf_pn_io_opnum = -1;
 static int hf_pn_io_reserved16 = -1;
 
 static int hf_pn_io_array = -1;
-static int hf_pn_io_status = -1;
 static int hf_pn_io_args_max = -1;
 static int hf_pn_io_args_len = -1;
 static int hf_pn_io_array_max_count = -1;
@@ -282,44 +281,6 @@ static int hf_pn_io_control_block_properties_applready0 = -1;
 /* static int hf_pn_io_AlarmSequenceNumber = -1; */
 static int hf_pn_io_control_command_reserved = -1;
 static int hf_pn_io_SubmoduleListEntries = -1;
-static int hf_pn_io_error_code = -1;
-static int hf_pn_io_error_decode = -1;
-static int hf_pn_io_error_code1 = -1;
-static int hf_pn_io_error_code1_pniorw = -1;
-static int hf_pn_io_error_code1_pnio = -1;
-static int hf_pn_io_error_code2 = -1;
-static int hf_pn_io_error_code2_pniorw = -1;
-static int hf_pn_io_error_code2_pnio_1 = -1;
-static int hf_pn_io_error_code2_pnio_2 = -1;
-static int hf_pn_io_error_code2_pnio_3 = -1;
-static int hf_pn_io_error_code2_pnio_4 = -1;
-static int hf_pn_io_error_code2_pnio_5 = -1;
-static int hf_pn_io_error_code2_pnio_6 = -1;
-static int hf_pn_io_error_code2_pnio_7 = -1;
-static int hf_pn_io_error_code2_pnio_8 = -1;
-static int hf_pn_io_error_code2_pnio_13 = -1;
-static int hf_pn_io_error_code2_pnio_20 = -1;
-static int hf_pn_io_error_code2_pnio_21 = -1;
-static int hf_pn_io_error_code2_pnio_22 = -1;
-static int hf_pn_io_error_code2_pnio_23 = -1;
-static int hf_pn_io_error_code2_pnio_40 = -1;
-static int hf_pn_io_error_code2_pnio_60 = -1;
-static int hf_pn_io_error_code2_pnio_61 = -1;
-static int hf_pn_io_error_code2_pnio_62 = -1;
-static int hf_pn_io_error_code2_pnio_63 = -1;
-static int hf_pn_io_error_code2_pnio_64 = -1;
-static int hf_pn_io_error_code2_pnio_65 = -1;
-static int hf_pn_io_error_code2_pnio_66 = -1;
-static int hf_pn_io_error_code2_pnio_70 = -1;
-static int hf_pn_io_error_code2_pnio_71 = -1;
-static int hf_pn_io_error_code2_pnio_72 = -1;
-static int hf_pn_io_error_code2_pnio_73 = -1;
-static int hf_pn_io_error_code2_pnio_74 = -1;
-static int hf_pn_io_error_code2_pnio_75 = -1;
-static int hf_pn_io_error_code2_pnio_76 = -1;
-static int hf_pn_io_error_code2_pnio_77 = -1;
-static int hf_pn_io_error_code2_pnio_253 = -1;
-static int hf_pn_io_error_code2_pnio_255 = -1;
 
 static int hf_pn_io_alarm_type = -1;
 static int hf_pn_io_alarm_specifier = -1;
@@ -771,7 +732,6 @@ static int hf_pn_io_mau_type_extension = -1;
 static gint ett_pn_io = -1;
 static gint ett_pn_io_block = -1;
 static gint ett_pn_io_block_header = -1;
-static gint ett_pn_io_status = -1;
 static gint ett_pn_io_rtc = -1;
 static gint ett_pn_io_rta = -1;
 static gint ett_pn_io_pdu_type = -1;
@@ -849,10 +809,8 @@ static gint ett_pn_io_mau_type_extension = -1;
 static expert_field ei_pn_io_block_version = EI_INIT;
 static expert_field ei_pn_io_block_length = EI_INIT;
 static expert_field ei_pn_io_unsupported = EI_INIT;
-static expert_field ei_pn_io_error_code1 = EI_INIT;
 static expert_field ei_pn_io_localalarmref = EI_INIT;
 static expert_field ei_pn_io_mrp_instances = EI_INIT;
-static expert_field ei_pn_io_error_code2 = EI_INIT;
 static expert_field ei_pn_io_ar_info_not_found = EI_INIT;
 static expert_field ei_pn_io_iocr_type = EI_INIT;
 static expert_field ei_pn_io_frame_id = EI_INIT;
@@ -1133,542 +1091,6 @@ static const value_string pn_io_txgroup_state[] = {
     { 0, NULL }
 };
 
-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" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_decode[] = {
-    { 0x00, "OK" },
-    { 0x80, "PNIORW" },
-    { 0x81, "PNIO" },
-    { 0, NULL }
-};
-
-/* dummy for unknown decode */
-static const value_string pn_io_error_code1[] = {
-    { 0x00, "OK" },
-    { 0, NULL }
-};
-
-/* dummy for unknown decode/code1 combination */
-static const value_string pn_io_error_code2[] = {
-    { 0x00, "OK" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code1_pniorw[] = {
-    /* high nibble 0-9 not specified -> legacy codes */
-    { 0xa0, "application: read error" },
-    { 0xa1, "application: write error" },
-    { 0xa2, "application: module failure" },
-    { 0xa3, "application: not specified" },
-    { 0xa4, "application: not specified" },
-    { 0xa5, "application: not specified" },
-    { 0xa6, "application: not specified" },
-    { 0xa7, "application: busy" },
-    { 0xa8, "application: version conflict" },
-    { 0xa9, "application: feature not supported" },
-    { 0xaa, "application: User specific 1" },
-    { 0xab, "application: User specific 2" },
-    { 0xac, "application: User specific 3" },
-    { 0xad, "application: User specific 4" },
-    { 0xae, "application: User specific 5" },
-    { 0xaf, "application: User specific 6" },
-    { 0xb0, "access: invalid index" },
-    { 0xb1, "access: write length error" },
-    { 0xb2, "access: invalid slot/subslot" },
-    { 0xb3, "access: type conflict" },
-    { 0xb4, "access: invalid area" },
-    { 0xb5, "access: state conflict" },
-    { 0xb6, "access: access denied" },
-    { 0xb7, "access: invalid range" },
-    { 0xb8, "access: invalid parameter" },
-    { 0xb9, "access: invalid type" },
-    { 0xba, "access: backup" },
-    { 0xbb, "access: User specific 7" },
-    { 0xbc, "access: User specific 8" },
-    { 0xbd, "access: User specific 9" },
-    { 0xbe, "access: User specific 10" },
-    { 0xbf, "access: User specific 11" },
-    { 0xc0, "resource: read constrain conflict" },
-    { 0xc1, "resource: write constrain conflict" },
-    { 0xc2, "resource: resource busy" },
-    { 0xc3, "resource: resource unavailable" },
-    { 0xc4, "resource: not specified" },
-    { 0xc5, "resource: not specified" },
-    { 0xc6, "resource: not specified" },
-    { 0xc7, "resource: not specified" },
-    { 0xc8, "resource: User specific 12" },
-    { 0xc9, "resource: User specific 13" },
-    { 0xca, "resource: User specific 14" },
-    { 0xcb, "resource: User specific 15" },
-    { 0xcc, "resource: User specific 16" },
-    { 0xcd, "resource: User specific 17" },
-    { 0xce, "resource: User specific 18" },
-    { 0xcf, "resource: User specific 19" },
-    /* high nibble d-f user specific */
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pniorw[] = {
-    /* all values are user specified */
-    { 0, NULL }
-};
-
-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" },
-    { 0x0D /* 13*/, "Connect: Faulty RSInfoBlock" },
-    { 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" },
-
-    { 0x32 /* 50*/, "Response: Faulty ARBlockRes" },
-    { 0x33 /* 51*/, "Response: Faulty IOCRBlockRes" },
-    { 0x34 /* 52*/, "Response: Faulty AlarmCRBlockRes" },
-    { 0x35 /* 53*/, "Response: Faulty ModuleDifflock" },
-    { 0x36 /* 54*/, "Response: Faulty ARRPCBlockRes" },
-
-    { 0x3c /* 60*/, "AlarmAck Error Codes" },
-    { 0x3d /* 61*/, "CMDEV" },
-    { 0x3e /* 62*/, "CMCTL" },
-    { 0x3f /* 63*/, "NRPM" },
-    { 0x40 /* 64*/, "RMPM" },
-    { 0x41 /* 65*/, "ALPMI" },
-    { 0x42 /* 66*/, "ALPMR" },
-    { 0x43 /* 67*/, "LMPM" },
-    { 0x44 /* 68*/, "MMAC" },
-    { 0x45 /* 69*/, "RPC" },
-    { 0x46 /* 70*/, "APMR" },
-    { 0x47 /* 71*/, "APMS" },
-    { 0x48 /* 72*/, "CPM" },
-    { 0x49 /* 73*/, "PPM" },
-    { 0x4a /* 74*/, "DCPUCS" },
-    { 0x4b /* 75*/, "DCPUCR" },
-    { 0x4c /* 76*/, "DCPMCS" },
-    { 0x4d /* 77*/, "DCPMCR" },
-    { 0x4e /* 78*/, "FSPM" },
-    { 0xfd /*253*/, "RTA_ERR_CLS_PROTOCOL" },
-    { 0xff /*255*/, "User specific" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_1[] = {
-    /* CheckingRules for ARBlockReq */
-    {  0, "Error in Parameter BlockType" },
-    {  1, "Error in Parameter BlockLength" },
-    {  2, "Error in Parameter BlockVersionHigh" },
-    {  3, "Error in Parameter BlockVersionLow" },
-    {  4, "Error in Parameter ARType" },
-    {  5, "Error in Parameter ARUUID" },
-    {  7, "Error in Parameter CMInitiatorMACAddress" },
-    {  8, "Error in Parameter CMInitiatorObjectUUID" },
-    {  9, "Error in Parameter ARProperties" },
-    { 10, "Error in Parameter CMInitiatorActivityTimeoutFactor" },
-    { 11, "Error in Parameter InitiatorUDPRTPort" },
-    { 12, "Error in Parameter StationNameLength" },
-    { 13, "Error in Parameter CMInitiatorStationName" },
-    {  0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_2[] = {
-    /* CheckingRules for IOCRBlockReq */
-    {  0, "Error in Parameter BlockType" },
-    {  1, "Error in Parameter BlockLength" },
-    {  2, "Error in Parameter BlockVersionHigh" },
-    {  3, "Error in Parameter BlockVersionLow" },
-    {  4, "Error in Parameter IOCRType" },
-    {  5, "Error in Parameter IOCRReference" },
-    {  6, "Error in Parameter LT" },
-    {  7, "Error in Parameter IOCRProperties" },
-    {  8, "Error in Parameter DataLength" },
-    {  9, "Error in Parameter FrameID" },
-    { 10, "Error in Parameter SendClockFactor" },
-    { 11, "Error in Parameter ReductionRatio" },
-    { 12, "Error in Parameter Phase" },
-    { 14, "Error in Parameter FrameSendOffset" },
-    { 15, "Error in Parameter WatchdogFactor" },
-    { 16, "Error in Parameter DataHoldFactor" },
-    { 17, "Error in Parameter IOCRTagHeader" },
-    { 18, "Error in Parameter IOCRMulticastMacAddress" },
-    { 19, "Error in Parameter NumberOfAPI" },
-    { 20, "Error in Parameter API" },
-    { 21, "Error in Parameter NumberOfIODataObjects" },
-    { 22, "Error in Parameter SlotNumber" },
-    { 23, "Error in Parameter SubslotNumber" },
-    { 24, "Error in Parameter IODataObjectFrameOffset" },
-    { 25, "Error in Parameter NumberOfIOCS" },
-    { 26, "Error in Parameter SlotNumber" },
-    { 27, "Error in Parameter SubslotNumber" },
-    { 28, "Error in Parameter IOCSFrameOffset" },
-    {  0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_3[] = {
-    /* CheckingRules for ExpectedSubmoduleBlockReq */
-    {  0, "Error in Parameter BlockType" },
-    {  1, "Error in Parameter BlockLength" },
-    {  2, "Error in Parameter BlockVersionHigh" },
-    {  3, "Error in Parameter BlockVersionLow" },
-    {  4, "Error in Parameter NumberOfAPI" },
-    {  5, "Error in Parameter API" },
-    {  6, "Error in Parameter SlotNumber" },
-    {  7, "Error in Parameter ModuleIdentNumber" },
-    {  8, "Error in Parameter ModuleProperties" },
-    {  9, "Error in Parameter NumberOfSubmodules" },
-    { 10, "Error in Parameter SubslotNumber" },
-    { 12, "Error in Parameter SubmoduleProperties" },
-    { 13, "Error in Parameter DataDescription" },
-    { 14, "Error in Parameter SubmoduleDataLength" },
-    { 15, "Error in Parameter LengthIOPS" },
-    { 16, "Error in Parameter LengthIOCS" },
-    {  0, NULL }
-};
-
-
-static const value_string pn_io_error_code2_pnio_4[] = {
-    /* CheckingRules for AlarmCRBlockReq */
-    {  0, "Error in Parameter BlockType" },
-    {  1, "Error in Parameter BlockLength" },
-    {  2, "Error in Parameter BlockVersionHigh" },
-    {  3, "Error in Parameter BlockVersionLow" },
-    {  4, "Error in Parameter AlarmCRType" },
-    {  5, "Error in Parameter LT" },
-    {  6, "Error in Parameter AlarmCRProperties" },
-    {  7, "Error in Parameter RTATimeoutFactor" },
-    {  8, "Error in Parameter RTARetries" },
-    { 10, "Error in Parameter MaxAlarmDataLength" },
-    { 11, "Error in Parameter AlarmCRTagHeaderHigh" },
-    { 12, "Error in Parameter AlarmCRTagHeaderLow" },
-    {  0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_5[] = {
-    /* CheckingRules for PrmServerBlockReq */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 6, "Error in Parameter CMInitiatorActivityTimeoutFactor" },
-    { 7, "Error in Parameter StationNameLength" },
-    { 8, "Error in Parameter ParameterServerStationName" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_6[] = {
-    /* CheckingRules for MCRBlockReq */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter IOCRReference" },
-    { 5, "Error in Parameter AddressResolutionProperties" },
-    { 6, "Error in Parameter MCITimeoutFactor" },
-    { 7, "Error in Parameter StationNameLength" },
-    { 8, "Error in Parameter ProviderStationName" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_7[] = {
-    /* CheckingRules for MCRBlockReq */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter InitiatorRPCServerPort" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_8[] = {
-    /* CheckingRules for Read/Write ParameterReqHeader */
-    {  0, "Error in Parameter BlockType" },
-    {  1, "Error in Parameter BlockLength" },
-    {  2, "Error in Parameter BlockVersionHigh" },
-    {  3, "Error in Parameter BlockVersionLow" },
-    {  5, "Error in Parameter ARUUID" },
-    {  6, "Error in Parameter API" },
-    {  7, "Error in Parameter SlotNumber" },
-    {  8, "Error in Parameter SubslotNumber" },
-    {  9, "Error in Parameter Padding" },
-    { 10, "Error in Parameter Index" },
-    { 11, "Error in Parameter RecordDataLength" },
-    { 12, "Error in Parameter TargetARUUID" },
-    {  0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_13[] = {
-    /* CheckingRules for RSInfoBlock */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter Padding" },
-    { 5, "Error in Parameter RSProperties" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_20[] = {
-    /* CheckingRules for ControlBlockConnect */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter Padding" },
-    { 6, "Error in Parameter SessionKey" },
-    { 7, "Error in Parameter Padding" },
-    { 8, "Error in Parameter ControlCommand" },
-    { 9, "Error in Parameter ControlBlockProperties" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_21[] = {
-    /* CheckingRules for ControlBlockPlug */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter Padding" },
-    { 6, "Error in Parameter SessionKey" },
-    { 7, "Error in Parameter AlarmSequenceNumber" },
-    { 8, "Error in Parameter ControlCommand" },
-    { 9, "Error in Parameter ControlBlockProperties" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_22[] = {
-    /* CheckingRule for ControlBlockConnect */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter Padding" },
-    { 6, "Error in Parameter SessionKey" },
-    { 7, "Error in Parameter Padding" },
-    { 8, "Error in Parameter ControlCommand" },
-    { 9, "Error in Parameter ControlBlockProperties" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_23[] = {
-    /* CheckingRules for ControlBlockPlug */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter Padding" },
-    { 6, "Error in Parameter SessionKey" },
-    { 7, "Error in Parameter AlarmSequenceNumber" },
-    { 8, "Error in Parameter ControlCommand" },
-    { 9, "Error in Parameter ControlBlockProperties" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_40[] = {
-    /* CheckingRules for ReleaseBlock */
-    { 0, "Error in Parameter BlockType" },
-    { 1, "Error in Parameter BlockLength" },
-    { 2, "Error in Parameter BlockVersionHigh" },
-    { 3, "Error in Parameter BlockVersionLow" },
-    { 4, "Error in Parameter Padding" },
-    { 6, "Error in Parameter SessionKey" },
-    { 7, "Error in Parameter Padding" },
-    { 8, "Error in Parameter ControlCommand" },
-    { 9, "Error in Parameter ControlBlockProperties" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_60[] = {
-    /* AlarmAck Error Codes */
-    { 0, "Alarm Type Not Supported" },
-    { 1, "Wrong Submodule State" },
-    { 2, "IOCARSR Backup - Alarm not executed" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_61[] = {
-    /* CMDEV */
-    { 0, "State Conflict" },
-    { 1, "Resources" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_62[] = {
-    /* CMCTL */
-    { 0, "State Conflict" },
-    { 1, "Timeout" },
-    { 2, "No data send" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_63[] = {
-    /* NRPM */
-    { 0, "No DCP active" },
-    { 1, "DNS Unknown_RealStationName" },
-    { 2, "DCP No_RealStationName" },
-    { 3, "DCP Multiple_RealStationName" },
-    { 4, "DCP No_StationName" },
-    { 5, "No_IP_Addr" },
-    { 6, "DCP_Set_Error" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_64[] = {
-    /* RMPM */
-    {  0, "ArgsLength invalid" },
-    {  1, "Unknown Blocks" },
-    {  2, "IOCR Missing" },
-    {  3, "Wrong AlarmCRBlock count" },
-    {  4, "Out of AR Resources" },
-    {  5, "AR UUID unknown" },
-    {  6, "State conflict" },
-    {  7, "Out of Provider, Consumer or Alarm Resources" },
-    {  8, "Out of Memory" },
-    {  9, "Pdev already owned" },
-    { 10, "ARset State conflict during connection establishment" },
-    { 11, "ARset Parameter conflict during connection establishment" },
-    { 12, "Pdev, port(s) without interface" },
-    {  0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_65[] = {
-    /* ALPMI */
-    { 0, "Invalid State" },
-    { 1, "Wrong ACK-PDU" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_66[] = {
-    /* ALPMR */
-    { 0, "Invalid State" },
-    { 1, "Wrong Notification PDU" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_70[] = {
-    /* APMR */
-    { 0, "Invalid State" },
-    { 1, "LMPM signaled error" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_71[] = {
-    /* APMS */
-    { 0, "Invalid State" },
-    { 1, "LMPM signaled error" },
-    { 2, "Timeout" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_72[] = {
-    /* CPM */
-    { 1, "Invalid State" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_73[] = {
-    /* PPM */
-    { 1, "Invalid State" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_74[] = {
-    /* DCPUCS */
-    { 0, "Invalid State" },
-    { 1, "LMPM signaled an error" },
-    { 2, "Timeout" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_75[] = {
-    /* DCPUCR */
-    { 0, "Invalid State" },
-    { 1, "LMPM signaled an error" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_76[] = {
-    /* DCPMCS */
-    { 0, "Invalid State" },
-    { 1, "LMPM signaled an error" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_77[] = {
-    /* DCPMCR */
-    { 0, "Invalid State" },
-    { 1, "LMPM signaled an error" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_253[] = {
-    {  0, "reserved" },
-    {  1, "Error within the coordination of sequence numbers (RTA_ERR_CODE_SEQ) error" },
-    {  2, "Instance closed (RTA_ERR_ABORT)" },
-    {  3, "AR out of memory (RTA_ERR_ABORT)" },
-    {  4, "AR add provider or consumer failed (RTA_ERR_ABORT)" },
-    {  5, "AR consumer DHT/WDT expired (RTA_ERR_ABORT)" },
-    {  6, "AR cmi timeout (RTA_ERR_ABORT)" },
-    {  7, "AR alarm-open failed (RTA_ERR_ABORT)" },
-    {  8, "AR alarm-send.cnf(-) (RTA_ERR_ABORT)" },
-    {  9, "AR alarm-ack-send.cnf(-) (RTA_ERR_ABORT)" },
-    { 10, "AR alarm data too long (RTA_ERR_ABORT)" },
-    { 11, "AR alarm.ind(err) (RTA_ERR_ABORT)" },
-    { 12, "AR rpc-client call.cnf(-) (RTA_ERR_ABORT)" },
-    { 13, "AR abort.req (RTA_ERR_ABORT)" },
-    { 14, "AR re-run aborts existing (RTA_ERR_ABORT)" },
-    { 15, "AR release.ind received (RTA_ERR_ABORT)" },
-    { 16, "AR device deactivated (RTA_ERR_ABORT)" },
-    { 17, "AR removed (RTA_ERR_ABORT)" },
-    { 18, "AR protocol violation (RTA_ERR_ABORT)" },
-    { 19, "AR name resolution error (RTA_ERR_ABORT)" },
-    { 20, "AR RPC-Bind error (RTA_ERR_ABORT)" },
-    { 21, "AR RPC-Connect error (RTA_ERR_ABORT)" },
-    { 22, "AR RPC-Read error (RTA_ERR_ABORT)" },
-    { 23, "AR RPC-Write error (RTA_ERR_ABORT)" },
-    { 24, "AR RPC-Control error (RTA_ERR_ABORT)" },
-    { 25, "AR forbidden pull or plug after check.rsp and before in-data.ind (RTA_ERR_ABORT)" },
-    { 26, "AR AP removed (RTA_ERR_ABORT)" },
-    { 27, "AR link down (RTA_ERR_ABORT)" },
-    { 28, "AR could not register multicast-mac address (RTA_ERR_ABORT)" },
-    { 29, "not synchronized (cannot start companion-ar) (RTA_ERR_ABORT)" },
-    { 30, "wrong topology (cannot start companion-ar) (RTA_ERR_ABORT)" },
-    { 31, "dcp, station-name changed (RTA_ERR_ABORT)" },
-    { 32, "dcp, reset to factory-settings (RTA_ERR_ABORT)" },
-    { 33, "cannot start companion-AR because a 0x8ipp submodule in the first AR... (RTA_ERR_ABORT)" },
-    { 34, "no irdata record yet (RTA_ERR_ABORT)" },
-    { 35, "PDEV (RTA_ERROR_ABORT)" },
-    { 36, "PDEV, no port offers required speed/duplexity (RTA_ERROR_ABORT)" },
-    { 37, "IP-Suite [of the IOC] changed by means of DCP_Set(IPParameter) or local engineering (RTA_ERROR_ABORT)" },
-    { 0, NULL }
-};
-
-static const value_string pn_io_error_code2_pnio_255[] = {
-    /* User specific */
-    { 255, "User abort" },
-    { 0, NULL }
-};
-
 static const value_string pn_io_ioxs[] = {
     { 0x00 /*  0*/, "detected by subslot" },
     { 0x01 /*  1*/, "detected by slot" },
@@ -3146,7 +2568,7 @@ static int dissect_block(tvbuff_t *tvb, int offset,
 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,
+int dissect_blocks(tvbuff_t *tvb, int offset,
     packet_info *pinfo, proto_tree *tree, guint8 *drep);
 
 static int dissect_PNIO_IOxS(tvbuff_t *tvb, int offset,
@@ -3194,264 +2616,6 @@ pnio_ar_new(e_guid_t *aruuid)
     return ar;
 }
 
-
-
-/* dissect the four status (error) fields */
-static int
-dissect_PNIO_status(tvbuff_t *tvb, int offset,
-    packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-    guint8  u8ErrorCode;
-    guint8  u8ErrorDecode;
-    guint8  u8ErrorCode1;
-    guint8  u8ErrorCode2;
-
-    proto_item *sub_item;
-    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 */
-
-
-
-    /* status */
-    sub_item = proto_tree_add_item(tree, hf_pn_io_status, tvb, offset, 0, ENC_NA);
-    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,
-     * depending on the current PDU.
-     * As the byte representation of these layers are different, this has to be handled
-     * in a somewhat different way than elsewhere. */
-
-    dissect_dcerpc_uint8(tvb, offset+(0^bytemask), pinfo, sub_tree, drep,
-                         hf_pn_io_error_code, &u8ErrorCode);
-    dissect_dcerpc_uint8(tvb, offset+(1^bytemask), pinfo, sub_tree, drep,
-                         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);
-        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);
-
-        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);
-        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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            error_code2_vals = pn_io_error_code2_pnio_8;
-            break;
-        case(13):
-            dissect_dcerpc_uint8(tvb, offset + (3 ^ bytemask), pinfo, sub_tree, drep,
-                                 hf_pn_io_error_code2_pnio_13, &u8ErrorCode2);
-            error_code2_vals = pn_io_error_code2_pnio_13;
-            break;
-        case(20):
-            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);
-            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);
-            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);
-            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);
-            error_code2_vals = pn_io_error_code2_pnio_40;
-            break;
-        case(60) :
-            dissect_dcerpc_uint8(tvb, offset + (3 ^ bytemask), pinfo, sub_tree, drep,
-                                 hf_pn_io_error_code2_pnio_60, &u8ErrorCode2);
-            error_code2_vals = pn_io_error_code2_pnio_60;
-            break;
-        case(61):
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            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);
-            expert_add_info_format(pinfo, sub_item, &ei_pn_io_error_code1, "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);
-        if (u8ErrorDecode!=0) {
-            expert_add_info_format(pinfo, sub_item, &ei_pn_io_error_code1, "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);
-        if (u8ErrorDecode != 0) {
-            expert_add_info_format(pinfo, sub_item, &ei_pn_io_error_code2, "Unknown ErrorDecode 0x%x", u8ErrorDecode);
-        }
-    }
-
-    offset += 4;
-
-    if ((u8ErrorCode == 0) && (u8ErrorDecode == 0) && (u8ErrorCode1 == 0) && (u8ErrorCode2 == 0)) {
-        proto_item_append_text(sub_item, ": 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)"),
-            val_to_str(u8ErrorDecode, pn_io_error_decode, "(0x%x)"),
-            val_to_str(u8ErrorCode1, error_code1_vals, "(0x%x)"),
-            val_to_str(u8ErrorCode2, error_code2_vals, "(0x%x)"));
-        col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: \"%s\", \"%s\", \"%s\", \"%s\"",
-            val_to_str(u8ErrorCode, pn_io_error_code, "(0x%x)"),
-            val_to_str(u8ErrorDecode, pn_io_error_decode, "(0x%x)"),
-            val_to_str(u8ErrorCode1, error_code1_vals, "(0x%x)"),
-            val_to_str(u8ErrorCode2, error_code2_vals, "(0x%x)"));
-    }
-    proto_item_set_len(sub_item, offset - u32SubStart);
-
-    return offset;
-}
-
-
 /* dissect the alarm specifier */
 static int
 dissect_Alarm_specifier(tvbuff_t *tvb, int offset,
@@ -10891,7 +10055,7 @@ dissect_a_block(tvbuff_t *tvb, int offset,
 }
 
 /* dissect any number of PN-IO blocks */
-static int
+int
 dissect_blocks(tvbuff_t *tvb, int offset,
     packet_info *pinfo, proto_tree *tree, guint8 *drep)
 {
@@ -12113,11 +11277,6 @@ proto_register_pn_io (void)
         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,
@@ -12854,196 +12013,6 @@ proto_register_pn_io (void)
         FT_UINT16, BASE_DEC, NULL, 0x0,
         NULL, HFILL }
     },
-    { &hf_pn_io_error_code,
-      { "ErrorCode", "pn_io.error_code",
-        FT_UINT8, BASE_HEX, VALS(pn_io_error_code), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_decode,
-      { "ErrorDecode", "pn_io.error_decode",
-        FT_UINT8, BASE_HEX, VALS(pn_io_error_decode), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code1,
-      { "ErrorCode1", "pn_io.error_code1",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code1), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code1_pniorw,
-      { "ErrorCode1", "pn_io.error_code1",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pniorw), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pniorw,
-      { "ErrorCode2 for PNIORW is user specified!", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code1_pnio,
-      { "ErrorCode1", "pn_io.error_code1",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pnio), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_1,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_1), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_2,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_2), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_3,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_3), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_4,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_4), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_5,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_5), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_6,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_6), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_7,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_7), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_8,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_8), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_13,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_13), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_20,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_20), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_21,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_21), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_22,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_22), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_23,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_23), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_40,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_40), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_60,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_60), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_61,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_61), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_62,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_62), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_63,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_63), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_64,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_64), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_65,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_65), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_66,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_66), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_70,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_70), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_71,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_71), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_72,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_72), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_73,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_73), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_74,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_74), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_75,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_75), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_76,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_76), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_77,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_77), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_253,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_253), 0x0,
-        NULL, HFILL }
-    },
-    { &hf_pn_io_error_code2_pnio_255,
-      { "ErrorCode2", "pn_io.error_code2",
-        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_255), 0x0,
-        NULL, HFILL }
-    },
     { &hf_pn_io_block,
       { "Block", "pn_io.block",
         FT_NONE, BASE_NONE, NULL, 0x0,
@@ -15051,7 +14020,6 @@ proto_register_pn_io (void)
         &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,
@@ -15121,8 +14089,6 @@ proto_register_pn_io (void)
 
     static ei_register_info ei[] = {
         { &ei_pn_io_block_version, { "pn_io.block_version.not_implemented", PI_UNDECODED, PI_WARN, "Block version not implemented yet!", EXPFILL }},
-        { &ei_pn_io_error_code1, { "pn_io.error_code1.expert", PI_UNDECODED, PI_WARN, "Unknown ErrorCode1", EXPFILL }},
-        { &ei_pn_io_error_code2, { "pn_io.error_code2.expert", PI_UNDECODED, PI_WARN, "Unknown ErrorDecode", EXPFILL }},
         { &ei_pn_io_ar_info_not_found, { "pn_io.ar_info_not_found", PI_UNDECODED, PI_NOTE, "IODWriteReq: AR information not found!", EXPFILL }},
         { &ei_pn_io_block_length, { "pn_io.block_length.invalid", PI_UNDECODED, PI_WARN, "Block length invalid!", EXPFILL }},
         { &ei_pn_io_unsupported, { "pn_io.profidrive.parameter.format.invalid", PI_UNDECODED, PI_WARN, "Unknown Fomatvalue", EXPFILL }},
diff --git a/plugins/epan/profinet/packet-pn.c b/plugins/epan/profinet/packet-pn.c
index 7096d1355d..fd8869bf27 100644
--- a/plugins/epan/profinet/packet-pn.c
+++ b/plugins/epan/profinet/packet-pn.c
@@ -20,8 +20,6 @@
 
 #include "packet-pn.h"
 
-
-
 static int hf_pn_padding = -1;
 static int hf_pn_undecoded_data = -1;
 static int hf_pn_user_data = -1;
@@ -29,7 +27,589 @@ static int hf_pn_user_bytes = -1;
 static int hf_pn_frag_bytes = -1;
 static int hf_pn_malformed = -1;
 
+static int hf_pn_io_status = -1;
+
+static int hf_pn_io_error_code = -1;
+static int hf_pn_io_error_decode = -1;
+static int hf_pn_io_error_code1 = -1;
+static int hf_pn_io_error_code1_pniorw = -1;
+static int hf_pn_io_error_code1_pnio = -1;
+static int hf_pn_io_error_code2 = -1;
+static int hf_pn_io_error_code2_pniorw = -1;
+static int hf_pn_io_error_code2_pnio_1 = -1;
+static int hf_pn_io_error_code2_pnio_2 = -1;
+static int hf_pn_io_error_code2_pnio_3 = -1;
+static int hf_pn_io_error_code2_pnio_4 = -1;
+static int hf_pn_io_error_code2_pnio_5 = -1;
+static int hf_pn_io_error_code2_pnio_6 = -1;
+static int hf_pn_io_error_code2_pnio_7 = -1;
+static int hf_pn_io_error_code2_pnio_8 = -1;
+static int hf_pn_io_error_code2_pnio_13 = -1;
+static int hf_pn_io_error_code2_pnio_20 = -1;
+static int hf_pn_io_error_code2_pnio_21 = -1;
+static int hf_pn_io_error_code2_pnio_22 = -1;
+static int hf_pn_io_error_code2_pnio_23 = -1;
+static int hf_pn_io_error_code2_pnio_40 = -1;
+static int hf_pn_io_error_code2_pnio_60 = -1;
+static int hf_pn_io_error_code2_pnio_61 = -1;
+static int hf_pn_io_error_code2_pnio_62 = -1;
+static int hf_pn_io_error_code2_pnio_63 = -1;
+static int hf_pn_io_error_code2_pnio_64 = -1;
+static int hf_pn_io_error_code2_pnio_65 = -1;
+static int hf_pn_io_error_code2_pnio_66 = -1;
+static int hf_pn_io_error_code2_pnio_70 = -1;
+static int hf_pn_io_error_code2_pnio_71 = -1;
+static int hf_pn_io_error_code2_pnio_72 = -1;
+static int hf_pn_io_error_code2_pnio_73 = -1;
+static int hf_pn_io_error_code2_pnio_74 = -1;
+static int hf_pn_io_error_code2_pnio_75 = -1;
+static int hf_pn_io_error_code2_pnio_76 = -1;
+static int hf_pn_io_error_code2_pnio_77 = -1;
+static int hf_pn_io_error_code2_pnio_253 = -1;
+static int hf_pn_io_error_code2_pnio_255 = -1;
+
+static gint ett_pn_io_status = -1;
+
 static expert_field ei_pn_undecoded_data = EI_INIT;
+static expert_field ei_pn_io_error_code1 = EI_INIT;
+static expert_field ei_pn_io_error_code2 = EI_INIT;
+
+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" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_decode[] = {
+    { 0x00, "OK" },
+    { 0x80, "PNIORW" },
+    { 0x81, "PNIO" },
+    { 0, NULL }
+};
+
+/* dummy for unknown decode */
+static const value_string pn_io_error_code1[] = {
+    { 0x00, "OK" },
+    { 0, NULL }
+};
+
+/* dummy for unknown decode/code1 combination */
+static const value_string pn_io_error_code2[] = {
+    { 0x00, "OK" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code1_pniorw[] = {
+    /* high nibble 0-9 not specified -> legacy codes */
+    { 0xa0, "application: read error" },
+    { 0xa1, "application: write error" },
+    { 0xa2, "application: module failure" },
+    { 0xa3, "application: not specified" },
+    { 0xa4, "application: not specified" },
+    { 0xa5, "application: not specified" },
+    { 0xa6, "application: not specified" },
+    { 0xa7, "application: busy" },
+    { 0xa8, "application: version conflict" },
+    { 0xa9, "application: feature not supported" },
+    { 0xaa, "application: User specific 1" },
+    { 0xab, "application: User specific 2" },
+    { 0xac, "application: User specific 3" },
+    { 0xad, "application: User specific 4" },
+    { 0xae, "application: User specific 5" },
+    { 0xaf, "application: User specific 6" },
+    { 0xb0, "access: invalid index" },
+    { 0xb1, "access: write length error" },
+    { 0xb2, "access: invalid slot/subslot" },
+    { 0xb3, "access: type conflict" },
+    { 0xb4, "access: invalid area" },
+    { 0xb5, "access: state conflict" },
+    { 0xb6, "access: access denied" },
+    { 0xb7, "access: invalid range" },
+    { 0xb8, "access: invalid parameter" },
+    { 0xb9, "access: invalid type" },
+    { 0xba, "access: backup" },
+    { 0xbb, "access: User specific 7" },
+    { 0xbc, "access: User specific 8" },
+    { 0xbd, "access: User specific 9" },
+    { 0xbe, "access: User specific 10" },
+    { 0xbf, "access: User specific 11" },
+    { 0xc0, "resource: read constrain conflict" },
+    { 0xc1, "resource: write constrain conflict" },
+    { 0xc2, "resource: resource busy" },
+    { 0xc3, "resource: resource unavailable" },
+    { 0xc4, "resource: not specified" },
+    { 0xc5, "resource: not specified" },
+    { 0xc6, "resource: not specified" },
+    { 0xc7, "resource: not specified" },
+    { 0xc8, "resource: User specific 12" },
+    { 0xc9, "resource: User specific 13" },
+    { 0xca, "resource: User specific 14" },
+    { 0xcb, "resource: User specific 15" },
+    { 0xcc, "resource: User specific 16" },
+    { 0xcd, "resource: User specific 17" },
+    { 0xce, "resource: User specific 18" },
+    { 0xcf, "resource: User specific 19" },
+    /* high nibble d-f user specific */
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pniorw[] = {
+    /* all values are user specified */
+    { 0, NULL }
+};
+
+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" },
+    { 0x0D /* 13*/, "Connect: Faulty RSInfoBlock" },
+    { 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" },
+
+    { 0x32 /* 50*/, "Response: Faulty ARBlockRes" },
+    { 0x33 /* 51*/, "Response: Faulty IOCRBlockRes" },
+    { 0x34 /* 52*/, "Response: Faulty AlarmCRBlockRes" },
+    { 0x35 /* 53*/, "Response: Faulty ModuleDifflock" },
+    { 0x36 /* 54*/, "Response: Faulty ARRPCBlockRes" },
+
+    { 0x3c /* 60*/, "AlarmAck Error Codes" },
+    { 0x3d /* 61*/, "CMDEV" },
+    { 0x3e /* 62*/, "CMCTL" },
+    { 0x3f /* 63*/, "NRPM" },
+    { 0x40 /* 64*/, "RMPM" },
+    { 0x41 /* 65*/, "ALPMI" },
+    { 0x42 /* 66*/, "ALPMR" },
+    { 0x43 /* 67*/, "LMPM" },
+    { 0x44 /* 68*/, "MMAC" },
+    { 0x45 /* 69*/, "RPC" },
+    { 0x46 /* 70*/, "APMR" },
+    { 0x47 /* 71*/, "APMS" },
+    { 0x48 /* 72*/, "CPM" },
+    { 0x49 /* 73*/, "PPM" },
+    { 0x4a /* 74*/, "DCPUCS" },
+    { 0x4b /* 75*/, "DCPUCR" },
+    { 0x4c /* 76*/, "DCPMCS" },
+    { 0x4d /* 77*/, "DCPMCR" },
+    { 0x4e /* 78*/, "FSPM" },
+    { 0xfd /*253*/, "RTA_ERR_CLS_PROTOCOL" },
+    { 0xff /*255*/, "User specific" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_1[] = {
+    /* CheckingRules for ARBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter ARType" },
+    { 5, "Error in Parameter ARUUID" },
+    { 7, "Error in Parameter CMInitiatorMACAddress" },
+    { 8, "Error in Parameter CMInitiatorObjectUUID" },
+    { 9, "Error in Parameter ARProperties" },
+    { 10, "Error in Parameter CMInitiatorActivityTimeoutFactor" },
+    { 11, "Error in Parameter InitiatorUDPRTPort" },
+    { 12, "Error in Parameter StationNameLength" },
+    { 13, "Error in Parameter CMInitiatorStationName" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_2[] = {
+    /* CheckingRules for IOCRBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter IOCRType" },
+    { 5, "Error in Parameter IOCRReference" },
+    { 6, "Error in Parameter LT" },
+    { 7, "Error in Parameter IOCRProperties" },
+    { 8, "Error in Parameter DataLength" },
+    { 9, "Error in Parameter FrameID" },
+    { 10, "Error in Parameter SendClockFactor" },
+    { 11, "Error in Parameter ReductionRatio" },
+    { 12, "Error in Parameter Phase" },
+    { 14, "Error in Parameter FrameSendOffset" },
+    { 15, "Error in Parameter WatchdogFactor" },
+    { 16, "Error in Parameter DataHoldFactor" },
+    { 17, "Error in Parameter IOCRTagHeader" },
+    { 18, "Error in Parameter IOCRMulticastMacAddress" },
+    { 19, "Error in Parameter NumberOfAPI" },
+    { 20, "Error in Parameter API" },
+    { 21, "Error in Parameter NumberOfIODataObjects" },
+    { 22, "Error in Parameter SlotNumber" },
+    { 23, "Error in Parameter SubslotNumber" },
+    { 24, "Error in Parameter IODataObjectFrameOffset" },
+    { 25, "Error in Parameter NumberOfIOCS" },
+    { 26, "Error in Parameter SlotNumber" },
+    { 27, "Error in Parameter SubslotNumber" },
+    { 28, "Error in Parameter IOCSFrameOffset" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_3[] = {
+    /* CheckingRules for ExpectedSubmoduleBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter NumberOfAPI" },
+    { 5, "Error in Parameter API" },
+    { 6, "Error in Parameter SlotNumber" },
+    { 7, "Error in Parameter ModuleIdentNumber" },
+    { 8, "Error in Parameter ModuleProperties" },
+    { 9, "Error in Parameter NumberOfSubmodules" },
+    { 10, "Error in Parameter SubslotNumber" },
+    { 12, "Error in Parameter SubmoduleProperties" },
+    { 13, "Error in Parameter DataDescription" },
+    { 14, "Error in Parameter SubmoduleDataLength" },
+    { 15, "Error in Parameter LengthIOPS" },
+    { 16, "Error in Parameter LengthIOCS" },
+    { 0, NULL }
+};
+
+
+static const value_string pn_io_error_code2_pnio_4[] = {
+    /* CheckingRules for AlarmCRBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter AlarmCRType" },
+    { 5, "Error in Parameter LT" },
+    { 6, "Error in Parameter AlarmCRProperties" },
+    { 7, "Error in Parameter RTATimeoutFactor" },
+    { 8, "Error in Parameter RTARetries" },
+    { 10, "Error in Parameter MaxAlarmDataLength" },
+    { 11, "Error in Parameter AlarmCRTagHeaderHigh" },
+    { 12, "Error in Parameter AlarmCRTagHeaderLow" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_5[] = {
+    /* CheckingRules for PrmServerBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 6, "Error in Parameter CMInitiatorActivityTimeoutFactor" },
+    { 7, "Error in Parameter StationNameLength" },
+    { 8, "Error in Parameter ParameterServerStationName" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_6[] = {
+    /* CheckingRules for MCRBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter IOCRReference" },
+    { 5, "Error in Parameter AddressResolutionProperties" },
+    { 6, "Error in Parameter MCITimeoutFactor" },
+    { 7, "Error in Parameter StationNameLength" },
+    { 8, "Error in Parameter ProviderStationName" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_7[] = {
+    /* CheckingRules for MCRBlockReq */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter InitiatorRPCServerPort" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_8[] = {
+    /* CheckingRules for Read/Write ParameterReqHeader */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 5, "Error in Parameter ARUUID" },
+    { 6, "Error in Parameter API" },
+    { 7, "Error in Parameter SlotNumber" },
+    { 8, "Error in Parameter SubslotNumber" },
+    { 9, "Error in Parameter Padding" },
+    { 10, "Error in Parameter Index" },
+    { 11, "Error in Parameter RecordDataLength" },
+    { 12, "Error in Parameter TargetARUUID" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_13[] = {
+    /* CheckingRules for RSInfoBlock */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter Padding" },
+    { 5, "Error in Parameter RSProperties" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_20[] = {
+    /* CheckingRules for ControlBlockConnect */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter Padding" },
+    { 6, "Error in Parameter SessionKey" },
+    { 7, "Error in Parameter Padding" },
+    { 8, "Error in Parameter ControlCommand" },
+    { 9, "Error in Parameter ControlBlockProperties" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_21[] = {
+    /* CheckingRules for ControlBlockPlug */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter Padding" },
+    { 6, "Error in Parameter SessionKey" },
+    { 7, "Error in Parameter AlarmSequenceNumber" },
+    { 8, "Error in Parameter ControlCommand" },
+    { 9, "Error in Parameter ControlBlockProperties" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_22[] = {
+    /* CheckingRule for ControlBlockConnect */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter Padding" },
+    { 6, "Error in Parameter SessionKey" },
+    { 7, "Error in Parameter Padding" },
+    { 8, "Error in Parameter ControlCommand" },
+    { 9, "Error in Parameter ControlBlockProperties" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_23[] = {
+    /* CheckingRules for ControlBlockPlug */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter Padding" },
+    { 6, "Error in Parameter SessionKey" },
+    { 7, "Error in Parameter AlarmSequenceNumber" },
+    { 8, "Error in Parameter ControlCommand" },
+    { 9, "Error in Parameter ControlBlockProperties" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_40[] = {
+    /* CheckingRules for ReleaseBlock */
+    { 0, "Error in Parameter BlockType" },
+    { 1, "Error in Parameter BlockLength" },
+    { 2, "Error in Parameter BlockVersionHigh" },
+    { 3, "Error in Parameter BlockVersionLow" },
+    { 4, "Error in Parameter Padding" },
+    { 6, "Error in Parameter SessionKey" },
+    { 7, "Error in Parameter Padding" },
+    { 8, "Error in Parameter ControlCommand" },
+    { 9, "Error in Parameter ControlBlockProperties" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_60[] = {
+    /* AlarmAck Error Codes */
+    { 0, "Alarm Type Not Supported" },
+    { 1, "Wrong Submodule State" },
+    { 2, "IOCARSR Backup - Alarm not executed" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_61[] = {
+    /* CMDEV */
+    { 0, "State Conflict" },
+    { 1, "Resources" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_62[] = {
+    /* CMCTL */
+    { 0, "State Conflict" },
+    { 1, "Timeout" },
+    { 2, "No data send" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_63[] = {
+    /* NRPM */
+    { 0, "No DCP active" },
+    { 1, "DNS Unknown_RealStationName" },
+    { 2, "DCP No_RealStationName" },
+    { 3, "DCP Multiple_RealStationName" },
+    { 4, "DCP No_StationName" },
+    { 5, "No_IP_Addr" },
+    { 6, "DCP_Set_Error" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_64[] = {
+    /* RMPM */
+    { 0, "ArgsLength invalid" },
+    { 1, "Unknown Blocks" },
+    { 2, "IOCR Missing" },
+    { 3, "Wrong AlarmCRBlock count" },
+    { 4, "Out of AR Resources" },
+    { 5, "AR UUID unknown" },
+    { 6, "State conflict" },
+    { 7, "Out of Provider, Consumer or Alarm Resources" },
+    { 8, "Out of Memory" },
+    { 9, "Pdev already owned" },
+    { 10, "ARset State conflict during connection establishment" },
+    { 11, "ARset Parameter conflict during connection establishment" },
+    { 12, "Pdev, port(s) without interface" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_65[] = {
+    /* ALPMI */
+    { 0, "Invalid State" },
+    { 1, "Wrong ACK-PDU" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_66[] = {
+    /* ALPMR */
+    { 0, "Invalid State" },
+    { 1, "Wrong Notification PDU" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_70[] = {
+    /* APMR */
+    { 0, "Invalid State" },
+    { 1, "LMPM signaled error" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_71[] = {
+    /* APMS */
+    { 0, "Invalid State" },
+    { 1, "LMPM signaled error" },
+    { 2, "Timeout" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_72[] = {
+    /* CPM */
+    { 1, "Invalid State" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_73[] = {
+    /* PPM */
+    { 1, "Invalid State" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_74[] = {
+    /* DCPUCS */
+    { 0, "Invalid State" },
+    { 1, "LMPM signaled an error" },
+    { 2, "Timeout" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_75[] = {
+    /* DCPUCR */
+    { 0, "Invalid State" },
+    { 1, "LMPM signaled an error" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_76[] = {
+    /* DCPMCS */
+    { 0, "Invalid State" },
+    { 1, "LMPM signaled an error" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_77[] = {
+    /* DCPMCR */
+    { 0, "Invalid State" },
+    { 1, "LMPM signaled an error" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_253[] = {
+    { 0, "reserved" },
+    { 1, "Error within the coordination of sequence numbers (RTA_ERR_CODE_SEQ) error" },
+    { 2, "Instance closed (RTA_ERR_ABORT)" },
+    { 3, "AR out of memory (RTA_ERR_ABORT)" },
+    { 4, "AR add provider or consumer failed (RTA_ERR_ABORT)" },
+    { 5, "AR consumer DHT/WDT expired (RTA_ERR_ABORT)" },
+    { 6, "AR cmi timeout (RTA_ERR_ABORT)" },
+    { 7, "AR alarm-open failed (RTA_ERR_ABORT)" },
+    { 8, "AR alarm-send.cnf(-) (RTA_ERR_ABORT)" },
+    { 9, "AR alarm-ack-send.cnf(-) (RTA_ERR_ABORT)" },
+    { 10, "AR alarm data too long (RTA_ERR_ABORT)" },
+    { 11, "AR alarm.ind(err) (RTA_ERR_ABORT)" },
+    { 12, "AR rpc-client call.cnf(-) (RTA_ERR_ABORT)" },
+    { 13, "AR abort.req (RTA_ERR_ABORT)" },
+    { 14, "AR re-run aborts existing (RTA_ERR_ABORT)" },
+    { 15, "AR release.ind received (RTA_ERR_ABORT)" },
+    { 16, "AR device deactivated (RTA_ERR_ABORT)" },
+    { 17, "AR removed (RTA_ERR_ABORT)" },
+    { 18, "AR protocol violation (RTA_ERR_ABORT)" },
+    { 19, "AR name resolution error (RTA_ERR_ABORT)" },
+    { 20, "AR RPC-Bind error (RTA_ERR_ABORT)" },
+    { 21, "AR RPC-Connect error (RTA_ERR_ABORT)" },
+    { 22, "AR RPC-Read error (RTA_ERR_ABORT)" },
+    { 23, "AR RPC-Write error (RTA_ERR_ABORT)" },
+    { 24, "AR RPC-Control error (RTA_ERR_ABORT)" },
+    { 25, "AR forbidden pull or plug after check.rsp and before in-data.ind (RTA_ERR_ABORT)" },
+    { 26, "AR AP removed (RTA_ERR_ABORT)" },
+    { 27, "AR link down (RTA_ERR_ABORT)" },
+    { 28, "AR could not register multicast-mac address (RTA_ERR_ABORT)" },
+    { 29, "not synchronized (cannot start companion-ar) (RTA_ERR_ABORT)" },
+    { 30, "wrong topology (cannot start companion-ar) (RTA_ERR_ABORT)" },
+    { 31, "dcp, station-name changed (RTA_ERR_ABORT)" },
+    { 32, "dcp, reset to factory-settings (RTA_ERR_ABORT)" },
+    { 33, "cannot start companion-AR because a 0x8ipp submodule in the first AR... (RTA_ERR_ABORT)" },
+    { 34, "no irdata record yet (RTA_ERR_ABORT)" },
+    { 35, "PDEV (RTA_ERROR_ABORT)" },
+    { 36, "PDEV, no port offers required speed/duplexity (RTA_ERROR_ABORT)" },
+    { 37, "IP-Suite [of the IOC] changed by means of DCP_Set(IPParameter) or local engineering (RTA_ERROR_ABORT)" },
+    { 0, NULL }
+};
+
+static const value_string pn_io_error_code2_pnio_255[] = {
+    /* User specific */
+    { 255, "User abort" },
+    { 0, NULL }
+};
+
 
 /* Initialize PNIO RTC1 stationInfo memory */
 void
@@ -243,6 +823,264 @@ dissect_pn_align4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree
     return offset + padding;
 }
 
+/* dissect the four status (error) fields */
+int
+dissect_PNIO_status(tvbuff_t *tvb, int offset,
+    packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+    guint8  u8ErrorCode;
+    guint8  u8ErrorDecode;
+    guint8  u8ErrorCode1;
+    guint8  u8ErrorCode2;
+
+    proto_item *sub_item;
+    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 */
+
+
+
+                                                                /* status */
+    sub_item = proto_tree_add_item(tree, hf_pn_io_status, tvb, offset, 0, ENC_NA);
+    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,
+    * depending on the current PDU.
+    * As the byte representation of these layers are different, this has to be handled
+    * in a somewhat different way than elsewhere. */
+
+    dissect_dcerpc_uint8(tvb, offset + (0 ^ bytemask), pinfo, sub_tree, drep,
+        hf_pn_io_error_code, &u8ErrorCode);
+    dissect_dcerpc_uint8(tvb, offset + (1 ^ bytemask), pinfo, sub_tree, drep,
+        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);
+        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);
+
+        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);
+        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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            error_code2_vals = pn_io_error_code2_pnio_8;
+            break;
+        case(13):
+            dissect_dcerpc_uint8(tvb, offset + (3 ^ bytemask), pinfo, sub_tree, drep,
+                hf_pn_io_error_code2_pnio_13, &u8ErrorCode2);
+            error_code2_vals = pn_io_error_code2_pnio_13;
+            break;
+        case(20):
+            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);
+            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);
+            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);
+            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);
+            error_code2_vals = pn_io_error_code2_pnio_40;
+            break;
+        case(60):
+            dissect_dcerpc_uint8(tvb, offset + (3 ^ bytemask), pinfo, sub_tree, drep,
+                hf_pn_io_error_code2_pnio_60, &u8ErrorCode2);
+            error_code2_vals = pn_io_error_code2_pnio_60;
+            break;
+        case(61):
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            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);
+            expert_add_info_format(pinfo, sub_item, &ei_pn_io_error_code1, "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);
+        if (u8ErrorDecode != 0) {
+            expert_add_info_format(pinfo, sub_item, &ei_pn_io_error_code1, "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);
+        if (u8ErrorDecode != 0) {
+            expert_add_info_format(pinfo, sub_item, &ei_pn_io_error_code2, "Unknown ErrorDecode 0x%x", u8ErrorDecode);
+        }
+    }
+
+    offset += 4;
+
+    if ((u8ErrorCode == 0) && (u8ErrorDecode == 0) && (u8ErrorCode1 == 0) && (u8ErrorCode2 == 0)) {
+        proto_item_append_text(sub_item, ": 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)"),
+            val_to_str(u8ErrorDecode, pn_io_error_decode, "(0x%x)"),
+            val_to_str(u8ErrorCode1, error_code1_vals, "(0x%x)"),
+            val_to_str(u8ErrorCode2, error_code2_vals, "(0x%x)"));
+        col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: \"%s\", \"%s\", \"%s\", \"%s\"",
+            val_to_str(u8ErrorCode, pn_io_error_code, "(0x%x)"),
+            val_to_str(u8ErrorDecode, pn_io_error_decode, "(0x%x)"),
+            val_to_str(u8ErrorCode1, error_code1_vals, "(0x%x)"),
+            val_to_str(u8ErrorCode2, error_code2_vals, "(0x%x)"));
+    }
+    proto_item_set_len(sub_item, offset - u32SubStart);
+
+    return offset;
+}
+
+
+
 /* append the given info text to item and column */
 void
 pn_append_info(packet_info *pinfo, proto_item *dcp_item, const char *text)
@@ -258,50 +1096,250 @@ void
 init_pn (int proto)
 {
     static hf_register_info hf[] = {
-        { &hf_pn_padding,
-          { "Padding", "pn.padding",
-            FT_STRING, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
-        { &hf_pn_undecoded_data,
-          { "Undecoded Data", "pn.undecoded",
-            FT_STRING, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
-        { &hf_pn_user_data,
-          { "User Data", "pn.user_data",
-            FT_STRING, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
-        { &hf_pn_user_bytes,
-          { "Substitute Data", "pn.user_bytes",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
-        { &hf_pn_frag_bytes,
-          { "Fragment Data", "pn.frag_bytes",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
-        { &hf_pn_malformed,
-          { "Malformed", "pn_rt.malformed",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }}
+    { &hf_pn_padding,
+      { "Padding", "pn.padding",
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_undecoded_data,
+      { "Undecoded Data", "pn.undecoded",
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_user_data,
+      { "User Data", "pn.user_data",
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_user_bytes,
+      { "Substitute Data", "pn.user_bytes",
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_frag_bytes,
+      { "Fragment Data", "pn.frag_bytes",
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_malformed,
+      { "Malformed", "pn_rt.malformed",
+        FT_BYTES, 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_error_code,
+      { "ErrorCode", "pn_io.error_code",
+        FT_UINT8, BASE_HEX, VALS(pn_io_error_code), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_decode,
+      { "ErrorDecode", "pn_io.error_decode",
+        FT_UINT8, BASE_HEX, VALS(pn_io_error_decode), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code1,
+      { "ErrorCode1", "pn_io.error_code1",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code1), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code1_pniorw,
+      { "ErrorCode1", "pn_io.error_code1",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pniorw), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pniorw,
+      { "ErrorCode2 for PNIORW is user specified!", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code1_pnio,
+      { "ErrorCode1", "pn_io.error_code1",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pnio), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_1,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_1), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_2,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_2), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_3,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_3), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_4,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_4), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_5,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_5), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_6,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_6), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_7,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_7), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_8,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_8), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_13,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_13), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_20,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_20), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_21,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_21), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_22,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_22), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_23,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_23), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_40,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_40), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_60,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_60), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_61,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_61), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_62,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_62), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_63,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_63), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_64,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_64), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_65,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_65), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_66,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_66), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_70,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_70), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_71,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_71), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_72,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_72), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_73,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_73), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_74,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_74), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_75,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_75), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_76,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_76), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_77,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_77), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_253,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_253), 0x0,
+        NULL, HFILL }
+    },
+    { &hf_pn_io_error_code2_pnio_255,
+      { "ErrorCode2", "pn_io.error_code2",
+        FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_255), 0x0,
+        NULL, HFILL }
+    },
 
     };
 
-    /*static gint *ett[] = {
-      };*/
+    static gint *ett[] = {
+        &ett_pn_io_status
+      };
 
     static ei_register_info ei[] = {
         { &ei_pn_undecoded_data, { "pn.undecoded_data", PI_UNDECODED, PI_WARN, "Undecoded Data", EXPFILL }},
+        { &ei_pn_io_error_code1, { "pn_io.error_code1.expert", PI_UNDECODED, PI_WARN, "Unknown ErrorCode1", EXPFILL }},
+        { &ei_pn_io_error_code2, { "pn_io.error_code2.expert", PI_UNDECODED, PI_WARN, "Unknown ErrorDecode", EXPFILL } },
+
     };
 
     expert_module_t* expert_pn;
 
 
     proto_register_field_array (proto, hf, array_length (hf));
-    /*proto_register_subtree_array (ett, array_length (ett));*/
+    proto_register_subtree_array (ett, array_length (ett));
     expert_pn = expert_register_protocol(proto);
     expert_register_field_array(expert_pn, ei, array_length(ei));
 }
diff --git a/plugins/epan/profinet/packet-pn.h b/plugins/epan/profinet/packet-pn.h
index 593355b481..e5e80eaf4e 100644
--- a/plugins/epan/profinet/packet-pn.h
+++ b/plugins/epan/profinet/packet-pn.h
@@ -134,6 +134,9 @@ extern int dissect_pn_undecoded(tvbuff_t *tvb, int offset, packet_info *pinfo,
 extern int dissect_pn_user_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
                     proto_tree *tree, guint32 length, const char *text);
 
+extern int dissect_blocks(tvbuff_t *tvb, int offset,
+                    packet_info *pinfo, proto_tree *tree, guint8 *drep);
+
 #define SUBST_DATA  1
 #define FRAG_DATA   2
 
@@ -148,6 +151,9 @@ extern int dissect_pn_padding(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 extern int dissect_pn_align4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
+extern int dissect_PNIO_status(tvbuff_t *tvb, int offset, packet_info *pinfo,
+                    proto_tree *tree, guint8 *drep);
+
 extern int dissect_PNIO_C_SDU_RTC1(tvbuff_t *tvb, int offset, packet_info *pinfo,
                     proto_tree *tree, guint8 *drep _U_);