diff options
| author | Stephen Fisher <sfisher@sdf.org> | 2014-12-18 17:46:27 -0700 |
|---|---|---|
| committer | Stephen Fisher <sfisher@sdf.org> | 2014-12-19 00:56:10 +0000 |
| commit | 07eef05406aec3b30d075505fa4c0dc33486adec (patch) | |
| tree | c134f82b45d95ab04a8b77d30f61f73454fee98d | |
| parent | 577e6a133c8428c4e1b16f18e969192435581016 (diff) | |
| download | wireshark-07eef05406aec3b30d075505fa4c0dc33486adec.tar.gz | |
Rename si_code variable to mtp3_si_code to avoid conflicts with NetBSD's
si_code #define in sys/siginfo.h
Change-Id: I5e183b997768c87f275569343afa69ca542aba46
Reviewed-on: https://code.wireshark.org/review/5844
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
| -rw-r--r-- | epan/dissectors/packet-m3ua.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-mtp3.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-mtp3.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index b01b3d06d1..3fdb6386b9 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1204,7 +1204,7 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro mtp3_tap->addr_opc.ni = tvb_get_guint8(parameter_tvb, DATA_NI_OFFSET); SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_opc); - mtp3_tap->si_code = tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET); + mtp3_tap->mtp3_si_code = tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET); mtp3_tap->size = 0; tap_queue_packet(m3ua_tap, pinfo, mtp3_tap); diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 5ceea836ef..8cf850537f 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -761,7 +761,7 @@ dissect_mtp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) memcpy(&(tap_rec->addr_opc), mtp3_addr_opc, sizeof(mtp3_addr_pc_t)); memcpy(&(tap_rec->addr_dpc), mtp3_addr_dpc, sizeof(mtp3_addr_pc_t)); - tap_rec->si_code = (tvb_get_guint8(tvb, SIO_OFFSET) & SERVICE_INDICATOR_MASK); + tap_rec->mtp3_si_code = (tvb_get_guint8(tvb, SIO_OFFSET) & SERVICE_INDICATOR_MASK); tap_rec->size = tvb_reported_length(tvb); tap_queue_packet(mtp3_tap, pinfo, tap_rec); diff --git a/epan/dissectors/packet-mtp3.h b/epan/dissectors/packet-mtp3.h index 31a399a728..0a02cd2c63 100644 --- a/epan/dissectors/packet-mtp3.h +++ b/epan/dissectors/packet-mtp3.h @@ -53,7 +53,7 @@ typedef struct _mtp3_addr_pc_t { typedef struct _mtp3_tap_rec_t { mtp3_addr_pc_t addr_opc; mtp3_addr_pc_t addr_dpc; - guint8 si_code; + guint8 mtp3_si_code; guint16 size; } mtp3_tap_rec_t; |