diff options
Diffstat (limited to 'src/isi-phoneinfo.c')
| -rw-r--r-- | src/isi-phoneinfo.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/isi-phoneinfo.c b/src/isi-phoneinfo.c index 30271f2..c689d58 100644 --- a/src/isi-phoneinfo.c +++ b/src/isi-phoneinfo.c @@ -23,7 +23,6 @@ #include <glib.h> #include <epan/prefs.h> #include <epan/packet.h> -#include <epan/expert.h> #include "packet-isi.h" #include "isi-phoneinfo.h" @@ -311,7 +310,7 @@ void proto_register_isi_phoneinfo(void) { static void _sub_sb_string(tvbuff_t *tvb, proto_tree *tree, guint8 offset, guint32 hf) { guint8 l = tvb_get_guint8(tvb, offset); - proto_tree_add_string(tree, hf, tvb, offset+1, l, tvb_memdup(tvb, offset+1, l)); + proto_tree_add_string(tree, hf, tvb, offset+1, l, tvb_memdup(NULL, tvb, offset+1, l)); } @@ -325,7 +324,7 @@ static void dissect_isi_phoneinfo_subpacket_wt(guint8 sptype, tvbuff_t *tvb, pac case 0x06: /* INFO_SB_WT_WIS */ case 0x07: /* INFO_SB_WT_RPF */ default: - expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported subblock (wt)"); + expert_add_info_format(pinfo, item, &ei_isi_unknown_packet, "unsupported subblock (wt)"); break; } } @@ -337,7 +336,7 @@ static void dissect_isi_phoneinfo_subpacket_cs(guint8 sptype, tvbuff_t *tvb, pac case 0x02: /* INFO_SB_PRODUCT_TYPE_HW_INFO */ case 0x03: /* INFO_SB_PRODUCT_TYPE_CS_SEC */ default: - expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported subblock (cs)"); + expert_add_info_format(pinfo, item, &ei_isi_unknown_packet, "unsupported subblock (cs)"); break; } } @@ -360,7 +359,7 @@ static void dissect_isi_phoneinfo_subpacket_product(guint8 sptype, tvbuff_t *tvb case 0x0E: /* INFO_SB_USB_SICD_ID */ case 0x10: /* INFO_SB_USB_RNDIS_ID */ default: - expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported subblock (product)"); + expert_add_info_format(pinfo, item, &ei_isi_unknown_packet, "unsupported subblock (product)"); break; } } @@ -371,7 +370,7 @@ static void dissect_isi_phoneinfo_subpacket_bt(guint8 sptype, tvbuff_t *tvb, pac case 0x02: /* INFO_SB_BT_ID_SEC */ case 0x0F: /* INFO_SB_BT_PID */ default: - expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported subblock (bt)"); + expert_add_info_format(pinfo, item, &ei_isi_unknown_packet, "unsupported subblock (bt)"); break; } } @@ -451,7 +450,7 @@ static void dissect_isi_phoneinfo_subpacket(guint8 sptype, tvbuff_t *tvb, packet case 0xA8: /* INFO_SB_ACCELEROMETER_VERSION */ //case 0xF000: /* INFO_SB_RAT_BAND_INFO */ default: - expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported subblock"); + expert_add_info_format(pinfo, item, &ei_isi_unknown_packet, "unsupported subblock"); break; } } @@ -548,7 +547,7 @@ static void dissect_isi_phoneinfo(tvbuff_t *tvb, packet_info *pinfo, proto_item case 0x31: /* INFO_PRODUCT_RAT_BAND_WRITE_RESP */ default: col_set_str(pinfo->cinfo, COL_INFO, "unknown PhoneInfo packet"); - expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported packet"); + expert_add_info_format(pinfo, item, &ei_isi_unknown_packet, "unsupported packet"); break; } } |