diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-03-03 02:47:53 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-03-03 10:55:29 +0000 |
commit | 499d95964d0d19bbec7f78d6fe4461eb26c552ca (patch) | |
tree | bf926f264babd15bcbc12456a6985f5fc5969bdb /plugins/profinet | |
parent | a0ce286d8d3aaa5a63f69bb03d15d2d225941169 (diff) |
Eliminate e_uuid_t in favor of e_guid_t.
That eliminates a redundant and confusing data type, and avoids issues
with one piece of code using e_uuid_t but wanting to use routines
expecting an e_guid_t.
Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
Reviewed-on: https://code.wireshark.org/review/7506
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins/profinet')
-rw-r--r-- | plugins/profinet/packet-dcerpc-pn-io.c | 80 | ||||
-rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.c | 24 | ||||
-rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.h | 4 | ||||
-rw-r--r-- | plugins/profinet/packet-dcom-cba.c | 38 | ||||
-rw-r--r-- | plugins/profinet/packet-pn-mrp.c | 2 | ||||
-rw-r--r-- | plugins/profinet/packet-pn-mrrt.c | 2 | ||||
-rw-r--r-- | plugins/profinet/packet-pn-ptcp.c | 24 | ||||
-rw-r--r-- | plugins/profinet/packet-pn.c | 2 | ||||
-rw-r--r-- | plugins/profinet/packet-pn.h | 2 |
9 files changed, 89 insertions, 89 deletions
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index a2c450b58a..44fef1b21b 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -681,16 +681,16 @@ static expert_field ei_pn_io_iocr_type = EI_INIT; static expert_field ei_pn_io_frame_id = EI_INIT; static expert_field ei_pn_io_nr_of_tx_port_groups = EI_INIT; -static e_uuid_t uuid_pn_io_device = { 0xDEA00001, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; +static e_guid_t uuid_pn_io_device = { 0xDEA00001, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; static guint16 ver_pn_io_device = 1; -static e_uuid_t uuid_pn_io_controller = { 0xDEA00002, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; +static e_guid_t uuid_pn_io_controller = { 0xDEA00002, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; static guint16 ver_pn_io_controller = 1; -static e_uuid_t uuid_pn_io_supervisor = { 0xDEA00003, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; +static e_guid_t uuid_pn_io_supervisor = { 0xDEA00003, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; static guint16 ver_pn_io_supervisor = 1; -static e_uuid_t uuid_pn_io_parameterserver = { 0xDEA00004, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; +static e_guid_t uuid_pn_io_parameterserver = { 0xDEA00004, 0x6C97, 0x11D1, { 0x82, 0x71, 0x00, 0xA0, 0x24, 0x42, 0xDF, 0x7D } }; static guint16 ver_pn_io_parameterserver = 1; /* Allow heuristic dissection */ @@ -2639,7 +2639,7 @@ GList *pnio_ars; typedef struct pnio_ar_s { /* generic */ - e_uuid_t aruuid; + e_guid_t aruuid; guint16 inputframeid; guint16 outputframeid; @@ -2719,7 +2719,7 @@ static int dissect_PNIO_IOxS(tvbuff_t *tvb, int offset, static pnio_ar_t * -pnio_ar_find_by_aruuid(packet_info *pinfo _U_, e_uuid_t *aruuid) +pnio_ar_find_by_aruuid(packet_info *pinfo _U_, e_guid_t *aruuid) { GList *ars; pnio_ar_t *ar; @@ -2729,7 +2729,7 @@ pnio_ar_find_by_aruuid(packet_info *pinfo _U_, e_uuid_t *aruuid) for(ars = pnio_ars; ars != NULL; ars = g_list_next(ars)) { ar = (pnio_ar_t *)ars->data; - if (memcmp(&ar->aruuid, aruuid, sizeof(e_uuid_t)) == 0) { + if (memcmp(&ar->aruuid, aruuid, sizeof(e_guid_t)) == 0) { return ar; } } @@ -2739,14 +2739,14 @@ pnio_ar_find_by_aruuid(packet_info *pinfo _U_, e_uuid_t *aruuid) static pnio_ar_t * -pnio_ar_new(e_uuid_t *aruuid) +pnio_ar_new(e_guid_t *aruuid) { pnio_ar_t *ar; ar = (pnio_ar_t *)wmem_alloc0(wmem_file_scope(), sizeof(pnio_ar_t)); - memcpy(&ar->aruuid, aruuid, sizeof(e_uuid_t)); + memcpy(&ar->aruuid, aruuid, sizeof(e_guid_t)); ar->controlleralarmref = 0xffff; ar->devicealarmref = 0xffff; @@ -3802,7 +3802,7 @@ 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_guid_t *aruuid) { guint32 u32Api; guint16 u16SlotNr; @@ -3843,8 +3843,8 @@ 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) { - e_uuid_t aruuid; - e_uuid_t null_uuid; + e_guid_t aruuid; + e_guid_t null_uuid; if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) { expert_add_info_format(pinfo, item, &ei_pn_io_block_version, @@ -3862,8 +3862,8 @@ dissect_IODWriteReqHeader_block(tvbuff_t *tvb, int offset, offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_record_data_length, u32RecDataLen); - memset(&null_uuid, 0, sizeof(e_uuid_t)); - if (memcmp(&aruuid, &null_uuid, sizeof (e_uuid_t)) == 0) { + memset(&null_uuid, 0, sizeof(e_guid_t)); + if (memcmp(&aruuid, &null_uuid, sizeof (e_guid_t)) == 0) { offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_target_ar_uuid, &aruuid); } @@ -3886,8 +3886,8 @@ 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) { - e_uuid_t aruuid; - e_uuid_t null_uuid; + e_guid_t aruuid; + e_guid_t null_uuid; if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) { expert_add_info_format(pinfo, item, &ei_pn_io_block_version, @@ -3905,8 +3905,8 @@ dissect_IODReadReqHeader_block(tvbuff_t *tvb, int offset, offset = dissect_dcerpc_uint32(tvb, offset, pinfo, tree, drep, hf_pn_io_record_data_length, u32RecDataLen); - memset(&null_uuid, 0, sizeof(e_uuid_t)); - if (memcmp(&aruuid, &null_uuid, sizeof (e_uuid_t)) == 0) { + memset(&null_uuid, 0, sizeof(e_guid_t)); + if (memcmp(&aruuid, &null_uuid, sizeof (e_guid_t)) == 0) { offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, tree, drep, hf_pn_io_target_ar_uuid, &aruuid); offset = dissect_pn_padding(tvb, offset, pinfo, tree, 8); @@ -3930,7 +3930,7 @@ 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) { - e_uuid_t aruuid; + e_guid_t aruuid; guint16 u16AddVal1; guint16 u16AddVal2; guint32 u32Status; @@ -3983,7 +3983,7 @@ 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) { - e_uuid_t aruuid; + e_guid_t aruuid; guint16 u16AddVal1; guint16 u16AddVal2; @@ -4029,7 +4029,7 @@ 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) { - e_uuid_t ar_uuid; + e_guid_t ar_uuid; guint16 u16SessionKey; proto_item *sub_item; proto_tree *sub_tree; @@ -4124,7 +4124,7 @@ dissect_ControlBlockPrmBegin(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint32 u32RecDataLen, pnio_ar_t **ar) { - e_uuid_t ar_uuid; + e_guid_t ar_uuid; guint16 u16SessionKey; guint16 u16Command; proto_item *sub_item; @@ -4467,7 +4467,7 @@ static int dissect_PDInterfaceMrpDataAdjust_block(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint16 u16BodyLength) { - e_uuid_t uuid; + e_guid_t uuid; guint16 u16Role; guint8 u8LengthDomainName; guint8 u8NumberOfMrpInstances; @@ -4536,7 +4536,7 @@ static int dissect_PDInterfaceMrpDataReal_block(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint16 u16BodyLength) { - e_uuid_t uuid; + e_guid_t uuid; guint16 u16Role; guint16 u16Version; guint8 u8LengthDomainName; @@ -4616,7 +4616,7 @@ 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) { - e_uuid_t uuid; + e_guid_t uuid; guint32 u32Check; guint8 u8NumberOfMrpInstances; @@ -4673,7 +4673,7 @@ 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) { - e_uuid_t uuid; + e_guid_t uuid; guint8 u8MrpInstance; /* added BlockVersionLow == 1 */ @@ -5380,7 +5380,7 @@ dissect_MrpInstanceDataAdjust_block(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint16 u16BodyLength) { guint8 u8MrpInstance; - e_uuid_t uuid; + e_guid_t uuid; guint16 u16Role; guint8 u8LengthDomainName; char* pDomainName; @@ -5428,7 +5428,7 @@ dissect_MrpInstanceDataReal_block(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow, guint16 u16BodyLength) { guint8 u8MrpInstance; - e_uuid_t uuid; + e_guid_t uuid; guint16 u16Role; guint16 u16Version; guint8 u8LengthDomainName; @@ -5478,7 +5478,7 @@ dissect_MrpInstanceDataCheck_block(tvbuff_t *tvb, int offset, { guint8 u8MrpInstance; guint32 u32Check; - e_uuid_t uuid; + e_guid_t uuid; if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) { expert_add_info_format(pinfo, item, &ei_pn_io_block_version, @@ -5628,7 +5628,7 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset, { guint16 u16SlotNr; guint16 u16SubslotNr; - e_uuid_t uuid; + e_guid_t uuid; guint32 u32ReservedIntervalBegin; guint32 u32ReservedIntervalEnd; guint32 u32PLLWindow; @@ -5814,7 +5814,7 @@ 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) { - e_uuid_t uuid; + e_guid_t uuid; guint32 u32MaxBridgeDelay; guint32 u32NumberOfPorts; guint32 u32MaxPortTxDelay; @@ -6320,8 +6320,8 @@ dissect_ARData_block(tvbuff_t *tvb, int offset, { guint16 u16NumberOfARs; guint16 u16NumberofEntries; - e_uuid_t aruuid; - e_uuid_t uuid; + e_guid_t aruuid; + e_guid_t uuid; guint16 u16ARType; char *pStationName; guint16 u16NameLength; @@ -6665,7 +6665,7 @@ dissect_LogData_block(tvbuff_t *tvb, int offset, guint64 u64ActualLocaltimeStamp; guint16 u16NumberOfLogEntries; guint64 u64LocaltimeStamp; - e_uuid_t aruuid; + e_guid_t aruuid; guint32 u32EntryDetail; dcerpc_info di; /* fake dcerpc_info struct */ dcerpc_call_value call_data; @@ -6753,7 +6753,7 @@ dissect_FSParameter_block(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow) { guint32 u32FSParameterMode; - e_uuid_t FSParameterUUID; + e_guid_t FSParameterUUID; if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) { @@ -6867,8 +6867,8 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset, { guint16 u16ARType; guint32 u32ARProperties; - e_uuid_t aruuid; - e_uuid_t uuid; + e_guid_t aruuid; + e_guid_t uuid; guint16 u16SessionKey; guint8 mac[6]; guint16 u16TimeoutFactor; @@ -6952,7 +6952,7 @@ dissect_ARBlockRes_block(tvbuff_t *tvb, int offset, pnio_ar_t **ar) { guint16 u16ARType; - e_uuid_t uuid; + e_guid_t uuid; guint16 u16SessionKey; guint8 mac[6]; guint16 u16UDPRTPort; @@ -7525,7 +7525,7 @@ dissect_PDSubFrameBlock_block(tvbuff_t *tvb, int offset, dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep, hf_pn_io_subframe_data_position, &u32SubFrameData); /* Bit 7: SubframeData.reserved_1 */ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep, hf_pn_io_subframe_reserved1, &u32SubFrameData); - /* Bit 8 - 15: SubframeData.DataLength */ + /* Bit 8 - 15: SubframeData.dataLength */ dissect_dcerpc_uint32(tvb, offset, pinfo, sub_tree, drep, hf_pn_io_subframe_data_length, &u32SubFrameData); /* Bit 16 - 31: SubframeData.reserved_2 */ offset = @@ -7550,7 +7550,7 @@ dissect_IRInfoBlock_block(tvbuff_t *tvb, int offset, guint16 u16SubframeOffset; guint32 u32SubframeData; guint16 u16IOCRReference; - e_uuid_t IRDataUUID; + e_guid_t IRDataUUID; if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) { diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 38356f0a8c..6ebc8675f5 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -155,41 +155,41 @@ static expert_field ei_cba_acco_pdev_find_unknown_interface = EI_INIT; static int proto_ICBAAccoMgt = -1; static gint ett_ICBAAccoMgt = -1; -static e_uuid_t uuid_ICBAAccoMgt = { 0xcba00041, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoMgt = { 0xcba00041, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoMgt = 0; static int proto_ICBAAccoMgt2 = -1; -static e_uuid_t uuid_ICBAAccoMgt2 = { 0xcba00046, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoMgt2 = { 0xcba00046, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoMgt2 = 0; static int proto_ICBAAccoCallback = -1; static gint ett_ICBAAccoCallback = -1; static gint ett_ICBAAccoCallback_Buffer = -1; static gint ett_ICBAAccoCallback_Item = -1; -static e_uuid_t uuid_ICBAAccoCallback = { 0xcba00042, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoCallback = { 0xcba00042, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoCallback = 0; static int proto_ICBAAccoCallback2 = -1; -static e_uuid_t uuid_ICBAAccoCallback2 = { 0xcba00047, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoCallback2 = { 0xcba00047, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoCallback2 = 0; static int proto_ICBAAccoServer = -1; static gint ett_ICBAAccoServer = -1; -static e_uuid_t uuid_ICBAAccoServer = { 0xcba00043, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoServer = { 0xcba00043, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoServer = 0; static int proto_ICBAAccoServer2 = -1; -static e_uuid_t uuid_ICBAAccoServer2 = { 0xcba00048, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoServer2 = { 0xcba00048, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoServer2 = 0; static int proto_ICBAAccoServerSRT = -1; static gint ett_ICBAAccoServerSRT = -1; -static e_uuid_t uuid_ICBAAccoServerSRT = { 0xcba00045, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoServerSRT = { 0xcba00045, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoServerSRT = 0; static int proto_ICBAAccoSync = -1; static gint ett_ICBAAccoSync = -1; -static e_uuid_t uuid_ICBAAccoSync = { 0xcba00044, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAAccoSync = { 0xcba00044, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAAccoSync = 0; @@ -467,7 +467,7 @@ cba_object_dump(void) cba_pdev_t * -cba_pdev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid) +cba_pdev_find(packet_info *pinfo, const address *addr, e_guid_t *ipid) { cba_pdev_t *pdev; dcom_interface_t *interf; @@ -478,11 +478,11 @@ cba_pdev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid) pdev = (cba_pdev_t *)interf->parent->private_data; if (pdev == NULL) { expert_add_info_format(pinfo, NULL, &ei_cba_acco_pdev_find, "pdev_find: no pdev for IP:%s IPID:%s", - address_to_str(wmem_packet_scope(), addr), guids_resolve_uuid_to_str(ipid)); + address_to_str(wmem_packet_scope(), addr), guids_resolve_guid_to_str(ipid)); } } else { expert_add_info_format(pinfo, NULL, &ei_cba_acco_pdev_find_unknown_interface, "pdev_find: unknown interface of IP:%s IPID:%s", - address_to_str(wmem_packet_scope(), addr), guids_resolve_uuid_to_str(ipid)); + address_to_str(wmem_packet_scope(), addr), guids_resolve_guid_to_str(ipid)); pdev = NULL; } @@ -591,7 +591,7 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name) cba_ldev_t * -cba_ldev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid) { +cba_ldev_find(packet_info *pinfo, const address *addr, e_guid_t *ipid) { dcom_interface_t *interf; cba_ldev_t *ldev; diff --git a/plugins/profinet/packet-dcom-cba-acco.h b/plugins/profinet/packet-dcom-cba-acco.h index 6951851ba1..356d540377 100644 --- a/plugins/profinet/packet-dcom-cba-acco.h +++ b/plugins/profinet/packet-dcom-cba-acco.h @@ -48,7 +48,7 @@ typedef struct cba_ldev_s { extern GList *cba_pdevs; extern cba_pdev_t * -cba_pdev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid); +cba_pdev_find(packet_info *pinfo, const address *addr, e_guid_t *ipid); extern void cba_pdev_link(packet_info *pinfo, cba_pdev_t *pdev, dcom_interface_t *pdev_interf); @@ -63,7 +63,7 @@ extern void cba_ldev_link_acco(packet_info *pinfo, cba_ldev_t *ldev, dcom_interface_t *acco_interf); extern cba_ldev_t * -cba_ldev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid); +cba_ldev_find(packet_info *pinfo, const address *addr, e_guid_t *ipid); extern cba_ldev_t * cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name); diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c index e44e5c421d..b89e9fcfac 100644 --- a/plugins/profinet/packet-dcom-cba.c +++ b/plugins/profinet/packet-dcom-cba.c @@ -79,93 +79,93 @@ static int hf_cba_save_result = -1; static expert_field ei_cba_acco_interface_pointer_unresolved = EI_INIT; -static e_uuid_t uuid_coclass_CBAPhysicalDevice = { 0xcba00000, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_coclass_CBAPhysicalDevice = { 0xcba00000, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; /* CBA interfaces */ static int proto_ICBAPhysicalDevice = -1; static gint ett_ICBAPhysicalDevice = -1; -static e_uuid_t uuid_ICBAPhysicalDevice = { 0xcba00001, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAPhysicalDevice = { 0xcba00001, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAPhysicalDevice = 0; static int proto_ICBAPhysicalDevice2 = -1; -static e_uuid_t uuid_ICBAPhysicalDevice2 = { 0xcba00006, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAPhysicalDevice2 = { 0xcba00006, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAPhysicalDevice2 = 0; static int proto_ICBABrowse = -1; static gint ett_ICBABrowse = -1; -static e_uuid_t uuid_ICBABrowse = { 0xcba00002, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBABrowse = { 0xcba00002, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBABrowse = 0; static int proto_ICBABrowse2 = -1; -static e_uuid_t uuid_ICBABrowse2 = { 0xcba00007, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBABrowse2 = { 0xcba00007, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBABrowse2 = 0; static int proto_ICBAPhysicalDevicePC = -1; static gint ett_ICBAPhysicalDevicePC = -1; -static e_uuid_t uuid_ICBAPhysicalDevicePC = { 0xcba00003, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAPhysicalDevicePC = { 0xcba00003, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAPhysicalDevicePC = 0; static int proto_ICBAPhysicalDevicePCEvent = -1; static gint ett_ICBAPhysicalDevicePCEvent = -1; -static e_uuid_t uuid_ICBAPhysicalDevicePCEvent = { 0xcba00004, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAPhysicalDevicePCEvent = { 0xcba00004, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAPhysicalDevicePCEvent = 0; static int proto_ICBAPersist = -1; static gint ett_ICBAPersist = -1; -static e_uuid_t uuid_ICBAPersist = { 0xcba00005, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAPersist = { 0xcba00005, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAPersist = 0; static int proto_ICBAPersist2 = -1; -static e_uuid_t uuid_ICBAPersist2 = { 0xcba00008, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAPersist2 = { 0xcba00008, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAPersist2 = 0; static int proto_ICBALogicalDevice = -1; static gint ett_ICBALogicalDevice = -1; -static e_uuid_t uuid_ICBALogicalDevice = { 0xcba00011, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBALogicalDevice = { 0xcba00011, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBALogicalDevice = 0; static int proto_ICBALogicalDevice2 = -1; -static e_uuid_t uuid_ICBALogicalDevice2 = { 0xcba00017, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBALogicalDevice2 = { 0xcba00017, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBALogicalDevice2 = 0; static int proto_ICBAState = -1; static gint ett_ICBAState = -1; -static e_uuid_t uuid_ICBAState = { 0xcba00012, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAState = { 0xcba00012, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAState = 0; static int proto_ICBAStateEvent = -1; static gint ett_ICBAStateEvent = -1; -static e_uuid_t uuid_ICBAStateEvent = { 0xcba00013, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAStateEvent = { 0xcba00013, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAStateEvent = 0; static int proto_ICBATime = -1; static gint ett_ICBATime = -1; -static e_uuid_t uuid_ICBATime = { 0xcba00014, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBATime = { 0xcba00014, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBATime = 0; static int proto_ICBAGroupError = -1; static gint ett_ICBAGroupError = -1; -static e_uuid_t uuid_ICBAGroupError = { 0xcba00015, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAGroupError = { 0xcba00015, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAGroupError = 0; static int proto_ICBAGroupErrorEvent = -1; static gint ett_ICBAGroupErrorEvent = -1; -static e_uuid_t uuid_ICBAGroupErrorEvent = { 0xcba00016, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBAGroupErrorEvent = { 0xcba00016, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBAGroupErrorEvent = 0; static int proto_ICBARTAuto = -1; static gint ett_ICBARTAuto = -1; -static e_uuid_t uuid_ICBARTAuto = { 0xcba00051, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBARTAuto = { 0xcba00051, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBARTAuto = 0; static int proto_ICBARTAuto2 = -1; -static e_uuid_t uuid_ICBARTAuto2 = { 0xcba00052, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBARTAuto2 = { 0xcba00052, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBARTAuto2 = 0; static int proto_ICBASystemProperties = -1; static gint ett_ICBASystemProperties = -1; -static e_uuid_t uuid_ICBASystemProperties = { 0xcba00062, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; +static e_guid_t uuid_ICBASystemProperties = { 0xcba00062, 0x6c97, 0x11d1, { 0x82, 0x71, 0x00, 0xa0, 0x24, 0x42, 0xdf, 0x7d } }; static guint16 ver_ICBASystemProperties = 0; diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 8a0545a016..13c14e9729 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -120,7 +120,7 @@ dissect_PNMRP_Common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item _U_) { guint16 sequence_id; - e_uuid_t uuid; + e_guid_t uuid; /* MRP_SequenceID */ diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c index 58e26661b0..7dcebf2077 100644 --- a/plugins/profinet/packet-pn-mrrt.c +++ b/plugins/profinet/packet-pn-mrrt.c @@ -62,7 +62,7 @@ dissect_PNMRRT_Common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 length _U_) { guint16 sequence_id; - e_uuid_t uuid; + e_guid_t uuid; /* MRRT_SequenceID */ diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index b8d1f50cea..60d5a1517f 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -216,7 +216,7 @@ dissect_PNPTCP_Subdomain(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item, guint16 u16FrameID) { guint8 mac[6]; - e_uuid_t uuid; + e_guid_t uuid; /* MasterSourceAddress */ @@ -234,11 +234,11 @@ dissect_PNPTCP_Subdomain(tvbuff_t *tvb, int offset, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); proto_item_append_text(item, ", Subdomain=%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); return offset; } @@ -434,7 +434,7 @@ dissect_PNPTCP_Option_PROFINET(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item, guint16 length) { guint8 subType; - e_uuid_t uuid; + e_guid_t uuid; /* OUI already dissected! */ @@ -450,11 +450,11 @@ dissect_PNPTCP_Option_PROFINET(tvbuff_t *tvb, int offset, /* IRDataUUID */ offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_ptcp_irdata_uuid, &uuid); proto_item_append_text(item, ": IRDataUUID=%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); break; default: diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c index c89fa93f0c..f5de71a37a 100644 --- a/plugins/profinet/packet-pn.c +++ b/plugins/profinet/packet-pn.c @@ -200,7 +200,7 @@ dissect_pn_ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* dissect a 16 byte UUID address */ int dissect_pn_uuid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree, int hfindex, e_uuid_t *uuid) + proto_tree *tree, int hfindex, e_guid_t *uuid) { guint8 drep[2] = { 0,0 }; diff --git a/plugins/profinet/packet-pn.h b/plugins/profinet/packet-pn.h index cfedb86d02..825dbafee7 100644 --- a/plugins/profinet/packet-pn.h +++ b/plugins/profinet/packet-pn.h @@ -55,7 +55,7 @@ extern int dissect_pn_ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hfindex, guint32 *pdata); extern int dissect_pn_uuid(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, int hfindex, e_uuid_t *uuid); + proto_tree *tree, int hfindex, e_guid_t *uuid); extern int dissect_pn_undecoded(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 length); |