diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-26 04:44:52 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-07 23:22:30 +0000 |
| commit | 13ec77a9fc3af3b0b502820d0b55796c89997896 (patch) | |
| tree | c5f5f72f090efd5471cf95095b00e13efa407959 /plugins/irda | |
| parent | d762a895ab570680e4e72142a348ad2b07c97d4f (diff) | |
Add free_address_wmem() and other extensions to address API
Try to improve 'address' API (to be easier/safer) and also avoid
some constness warnings by not overloading the 'data' pointer to
store malloc'ed buffers (use private pointer for that instead).
Change-Id: I7456516b12c67620ceadac447907c12f5905bd49
Reviewed-on: https://code.wireshark.org/review/13463
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins/irda')
| -rw-r--r-- | plugins/irda/packet-irda.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 1e2d070ee6..7975d1cbec 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -529,13 +529,9 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r /* create conversation entry */ src = circuit_id ^ CMD_FRAME; - srcaddr.type = AT_NONE; - srcaddr.len = 1; - srcaddr.data = (guint8*)&src; + set_address(&srcaddr, AT_NONE, 1, &src); - destaddr.type = AT_NONE; - destaddr.len = 1; - destaddr.data = (guint8*)&circuit_id; + set_address(&destaddr, AT_NONE, 1, &circuit_id); conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) @@ -682,13 +678,9 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro retcode = tvb_get_guint8(tvb, offset + 1); src = circuit_id ^ CMD_FRAME; - srcaddr.type = AT_NONE; - srcaddr.len = 1; - srcaddr.data = (guint8*)&src; + set_address(&srcaddr, AT_NONE, 1, &src); - destaddr.type = AT_NONE; - destaddr.len = 1; - destaddr.data = (guint8*)&circuit_id; + set_address(&destaddr, AT_NONE, 1, &circuit_id); /* Find result value dissector */ conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); @@ -967,13 +959,9 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro src = circuit_id ^ CMD_FRAME; - srcaddr.type = AT_NONE; - srcaddr.len = 1; - srcaddr.data = (guint8*)&src; + set_address(&srcaddr, AT_NONE, 1, &src); - destaddr.type = AT_NONE; - destaddr.len = 1; - destaddr.data = (guint8*)&circuit_id; + set_address(&destaddr, AT_NONE, 1, &circuit_id); /* Find result value dissector */ conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); @@ -1200,14 +1188,9 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec /*g_message("%d: add_lmp_conversation(%p, %d, %d, %p) = ", pinfo->num, pinfo, dlsap, ttp, proto_dissector); */ - srcaddr.type = AT_NONE; - srcaddr.len = 1; - srcaddr.data = (guint8*)&circuit_id; - - dest = circuit_id ^ CMD_FRAME; - destaddr.type = AT_NONE; - destaddr.len = 1; - destaddr.data = (guint8*)&dest; + set_address(&srcaddr, AT_NONE, 1, &circuit_id); + + set_address(&destaddr, AT_NONE, 1, &dest); conv = find_conversation(pinfo->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); if (conv) |