diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-11 21:32:53 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-16 15:25:18 +0000 |
| commit | ada1eec702ff44dc89670a1aa25c1e34d370bebb (patch) | |
| tree | cb754fdadbad9312340bbbc2e0a13d4ff71d2349 /epan/conversation.c | |
| parent | 260b19e98d02b92afe9a1d361fa6f98b3a63efb4 (diff) | |
SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
Copy addresses with wmem-scope instead of (forced) seasonal scope. All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.
Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
Reviewed-on: https://code.wireshark.org/review/6564
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index d7f1b80015..e466e5f82a 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -698,8 +698,8 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address new_key = wmem_new(wmem_file_scope(), struct conversation_key); new_key->next = conversation_keys; conversation_keys = new_key; - SE_COPY_ADDRESS(&new_key->addr1, addr1); - SE_COPY_ADDRESS(&new_key->addr2, addr2); + WMEM_COPY_ADDRESS(wmem_file_scope(), &new_key->addr1, addr1); + WMEM_COPY_ADDRESS(wmem_file_scope(), &new_key->addr2, addr2); new_key->ptype = ptype; new_key->port1 = port1; new_key->port2 = port2; @@ -789,7 +789,7 @@ conversation_set_addr2(conversation_t *conv, const address *addr) conversation_remove_from_hashtable(conversation_hashtable_no_port2, conv); } conv->options &= ~NO_ADDR2; - SE_COPY_ADDRESS(&conv->key_ptr->addr2, addr); + WMEM_COPY_ADDRESS(wmem_file_scope(), &conv->key_ptr->addr2, addr); if (conv->options & NO_PORT2) { conversation_insert_into_hashtable(conversation_hashtable_no_port2, conv); } else { |