diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 12:04:16 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:45:56 +0000 |
| commit | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (patch) | |
| tree | 4aca52419f6ee7dc9a58ca8e4cd79fbeaa8d3387 /epan/dissectors/packet-tacacs.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
Use address functions instead of ADDRESS macros in asn1 and epan
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.
Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
| -rw-r--r-- | epan/dissectors/packet-tacacs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index cdd191b35e..5cac0f86f8 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -772,9 +772,9 @@ cmp_conv_address( gconstpointer p1, gconstpointer p2 ) printf("p2=>"); tacplus_print_key_entry( p2, NULL ); */ - ret=CMP_ADDRESS( a1->s, a2->s ); + ret=cmp_address( a1->s, a2->s ); if( !ret ) { - ret=CMP_ADDRESS( a1->c, a2->c ); + ret=cmp_address( a1->c, a2->c ); /* if(ret) printf("No Client found!"); */ @@ -812,9 +812,9 @@ mkipv4_address( address **addr, const char *str_addr ) addr_data=(char *)g_malloc( 4 ); ret = str_to_ip(str_addr, addr_data); if (ret) - SET_ADDRESS(*addr, AT_IPv4, 4, addr_data); + set_address(*addr, AT_IPv4, 4, addr_data); else - SET_ADDRESS(*addr, AT_STRINGZ, (int)strlen(ADDR_INVLD)+1, ADDR_INVLD); + set_address(*addr, AT_STRINGZ, (int)strlen(ADDR_INVLD)+1, ADDR_INVLD); } static void parse_tuple( char *key_from_option ) |