Author: tjansen Date: Tue Nov 24 10:55:39 2009 New Revision: 1761 Log: Renamed function pisa_nat_del_mapping to pisa_nat_del_mappings_for_hit. This better reflects the purpose of the function, as I intend to add a second delete function for a single mapping. Modified: trunk/libpisa/conmgr.c trunk/libpisa/nat.c trunk/libpisa/nat.h Modified: trunk/libpisa/conmgr.c ============================================================================== --- trunk/libpisa/conmgr.c Tue Nov 24 10:47:23 2009 (r1760) +++ trunk/libpisa/conmgr.c Tue Nov 24 10:55:39 2009 (r1761) @@ -137,7 +137,7 @@ #endif /* remove nat mappings if we remove the connection */ - pisa_nat_del_mapping(natlist, &entry->hit); + pisa_nat_del_mappings_for_hit(natlist, &entry->hit); HASH_DELETE(hh, conlist->hash_ipv6, entry); if (entry->hh_ipv4.hashv != 0) HASH_DELETE(hh_ipv4, conlist->hash_ipv4, entry); Modified: trunk/libpisa/nat.c ============================================================================== --- trunk/libpisa/nat.c Tue Nov 24 10:47:23 2009 (r1760) +++ trunk/libpisa/nat.c Tue Nov 24 10:55:39 2009 (r1761) @@ -205,7 +205,7 @@ * Remove all NAT mappings for a given HIT from the list. * @param remote_hit the remote public IPv6 address (HIT) */ -void pisa_nat_del_mapping(pisa_nat_list *natlist, struct in6_addr *remote_hit) +void pisa_nat_del_mappings_for_hit(pisa_nat_list *natlist, struct in6_addr *remote_hit) { pisa_nat_mapping *cur = natlist->hash_remote, *next; Modified: trunk/libpisa/nat.h ============================================================================== --- trunk/libpisa/nat.h Tue Nov 24 10:47:23 2009 (r1760) +++ trunk/libpisa/nat.h Tue Nov 24 10:55:39 2009 (r1761) @@ -51,7 +51,7 @@ pisa_nat_mapping *pisa_nat_add_mapping(pisa_nat_list *natlist, struct in_addr *local_private, struct in_addr *remote_private, pisa_conmgr_entry *entry, pisa_mac *mac); pisa_nat_mapping *pisa_nat_add_preliminary(pisa_nat_list *natlist, struct in_addr *local_private); void pisa_nat_upgrade_preliminary(pisa_nat_list *natlist, pisa_nat_mapping *map, struct in_addr *remote_private, pisa_conmgr_entry *entry, pisa_mac *mac); -void pisa_nat_del_mapping(pisa_nat_list *natlist, struct in6_addr *remote_hit); +void pisa_nat_del_mappings_for_hit(pisa_nat_list *natlist, struct in6_addr *remote_hit); pisa_nat_mapping *pisa_nat_mapping_find_by_remote(pisa_nat_list *natlist, struct in6_addr *remote_hit, struct in_addr *remote_ipv4); pisa_nat_mapping *pisa_nat_mapping_find_by_local_private(pisa_nat_list *natlist, struct in_addr *local_private); pisa_nat_mapping *pisa_nat_mapping_find_by_mac(pisa_nat_list *natlist, pisa_mac *mac);