aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-aps.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-18 13:02:15 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-18 21:02:40 +0000
commit050bc7d100e9846663ac2c14eadde15e9cd9fdb9 (patch)
tree29b58df68f42d396d1507e89df1e9d8631713368 /epan/dissectors/packet-zbee-aps.c
parent929d41c6856139168c441a14498210d31574de97 (diff)
Update some comments to reflect reality.
Get rid of references to ep_ and se_ allocation in code that now uses wmem allocation instead. Fix API documentation of conversation_table.h routines to reflect that as well - some APIs changed to pass wmem scopes. Also, zbee_sec_key_hash() now takes the output buffer as an argument and just returns it, and nobody actually uses the return value, so change it to return void. Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a Reviewed-on: https://code.wireshark.org/review/6636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-zbee-aps.c')
-rw-r--r--epan/dissectors/packet-zbee-aps.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index b28393ac7f..cabd99771c 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -1290,6 +1290,10 @@ dissect_zbee_aps_transport_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
/* Create an empty key ring for this pan. Use g_malloc0() because we must free
* GSLists after a capture is closed and wireshark frees seasonal memory
* with se_free_all() before calling the registered init routine.
+ *
+ * XXX - we don't use seasonal memory any more, and libwireshark
+ * just does wmem_enter_file_scope() before calling registered init
+ * routines; does this still apply?
*/
nwk_keyring = (GSList **)g_malloc0(sizeof(GSList*));
g_hash_table_insert(zbee_table_nwk_keyring,