diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-04-11 13:19:34 +0200 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2014-05-30 11:26:28 +0000 |
| commit | 53c66a9e08690168d539bd5f3506c6cdbc8f4dc9 (patch) | |
| tree | a370d70cbaff5ff5673d4209fcb643f7ffd41a3a /epan/dissectors/packet-btavctp.c | |
| parent | 5742d2e145cb6c9eed517685d5229ac17bc775b1 (diff) | |
Bluetooth: Avoid using macro GPOINTER_TO_UINT()
Fix warnings and try to inform user about unknown values in
"Decode As".
Also use define instead of magic number for Unknown L2CAP CIDs.
Change-Id: Ie6f26a9e3330b84cef14bbf8861ffbdbdb789225
Reviewed-on: https://code.wireshark.org/review/1880
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-btavctp.c')
| -rw-r--r-- | epan/dissectors/packet-btavctp.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index bde61fed37..18740de817 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -105,13 +105,25 @@ void proto_reg_handoff_btavctp(void); static void btavctp_pid_prompt(packet_info *pinfo, gchar* result) { - g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "AVCTP SERVICE 0x%04x as", - GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV ))); + gulong *value_data; + + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV); + if (value_data) + g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "AVCTP SERVICE 0x%04x as", (guint) *value_data); + else + g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Unknown AVCTP SERVICE"); } static gpointer btavctp_pid_value(packet_info *pinfo) { - return p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV ); + gulong *value_data; + + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV); + + if (value_data) + return (gpointer) *value_data; + + return NULL; } static gint @@ -180,7 +192,11 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pid = tvb_get_ntohs(tvb, offset); if (p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV ) == NULL) { - p_add_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV, GUINT_TO_POINTER(pid)); + gulong *value_data; + + value_data = wmem_new(wmem_file_scope(), gulong); + *value_data = pid; + p_add_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV, value_data); } offset +=2; } |