diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
commit | 8c48c6835fbfada96d2197bcbc7a87023bfc8291 (patch) | |
tree | 2a60509a6637549f370b63ce3b27a3de8f9736d8 /epan/dissectors/packet-tacacs.c | |
parent | d6b920b8f6b22548e3828258ea11b2443af89ce4 (diff) |
Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().
svn path=/trunk/; revision=29747
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
-rw-r--r-- | epan/dissectors/packet-tacacs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 23405cd175..c49e585e38 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -788,11 +788,11 @@ tacplus_print_key_entry( gpointer data, gpointer user_data ) { tacplus_key_entry *tacplus_data=(tacplus_key_entry *)data; if( user_data ) { - printf("%s:%s=%s\n", address_to_str( tacplus_data->s ), - address_to_str( tacplus_data->c ), tacplus_data->k ); + printf("%s:%s=%s\n", ep_address_to_str( tacplus_data->s ), + ep_address_to_str( tacplus_data->c ), tacplus_data->k ); } else { - printf("%s:%s\n", address_to_str( tacplus_data->s ), - address_to_str( tacplus_data->c ) ); + printf("%s:%s\n", ep_address_to_str( tacplus_data->s ), + ep_address_to_str( tacplus_data->c ) ); } } #endif @@ -924,14 +924,14 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *key=NULL; len = tvb_get_ntohl(tvb, 8); - + if(len > (guint)tvb_length_remaining(tvb, 12) && pinfo->can_desegment && tacplus_preference_desegment) { pinfo->desegment_offset = 0; pinfo->desegment_len = len; return; } - + if( request ) { key=find_key( &pinfo->dst, &pinfo->src ); } else { |