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-dcom.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-dcom.c')
| -rw-r--r-- | epan/dissectors/packet-dcom.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index d4014dbbd8..8ab4fe05d6 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -337,7 +337,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_ dcom_iter = dcom_machines; while(dcom_iter != NULL) { machine = (dcom_machine_t *)dcom_iter->data; - if(CMP_ADDRESS(&machine->ip, addr) == 0) { + if(cmp_address(&machine->ip, addr) == 0) { break; } dcom_iter = g_list_next(dcom_iter); @@ -346,7 +346,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_ /* create new machine if not found */ if(dcom_iter == NULL) { machine = g_new(dcom_machine_t,1); - COPY_ADDRESS(&machine->ip, addr); + copy_address(&machine->ip, addr); machine->objects = NULL; machine->first_packet = pinfo->fd->num; dcom_machines = g_list_append(dcom_machines, machine); @@ -1840,8 +1840,8 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo, if(first_ip != curr_ip) { address first_ip_addr, curr_ip_addr; - SET_ADDRESS(&first_ip_addr, AT_IPv4, 4, &first_ip); - SET_ADDRESS(&curr_ip_addr, AT_IPv4, 4, &curr_ip); + set_address(&first_ip_addr, AT_IPv4, 4, &first_ip); + set_address(&curr_ip_addr, AT_IPv4, 4, &curr_ip); expert_add_info_format(pinfo, pi, &ei_dcom_dualstringarray_mult_ip, "DUALSTRINGARRAY: multiple IP's %s %s", address_to_str(wmem_packet_scope(), &first_ip_addr), address_to_str(wmem_packet_scope(), &curr_ip_addr)); @@ -2101,7 +2101,7 @@ dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, if(pinfo->net_src.type == AT_IPv4) { address addr; - SET_ADDRESS(&addr, AT_IPv4, 4, ip); + set_address(&addr, AT_IPv4, 4, ip); dcom_if = dcom_interface_new(pinfo, &addr, &iid, oxid, oid, &ipid); |