Mailing List Archive

Author: Antonio Borneo
Date: Wed Nov 9 03:02:00 2011
New Revision: 471

Log:
Antonio Borneo <borneo.antonio@gmail.com>

Port from Nortel branch procedure free_isakmp_attributes()
and replace inline code with calls.
This patch alignes the two brances and prepares for next
commit.

Modified:
trunk/isakmp-pkt.c

Modified: trunk/isakmp-pkt.c
==============================================================================
--- trunk/isakmp-pkt.c (original)
+++ trunk/isakmp-pkt.c Wed Nov 9 03:02:00 2011
@@ -300,6 +300,19 @@
return r;
}

+static void free_isakmp_attributes(struct isakmp_attribute *attributes)
+{
+ struct isakmp_attribute *att, *nextatt;
+ for (att = attributes; att; att = nextatt) {
+ nextatt = att->next;
+ if (att->af == isakmp_attr_lots)
+ free(att->u.lots.data);
+ if (att->af == isakmp_attr_acl)
+ free(att->u.acl.acl_ent);
+ free(att);
+ }
+}
+
struct isakmp_packet *new_isakmp_packet(void)
{
return xallocc(sizeof(struct isakmp_packet));
@@ -347,15 +360,7 @@
free_isakmp_payload(p->u.p.transforms);
break;
case ISAKMP_PAYLOAD_T:
- {
- struct isakmp_attribute *att, *natt;
- for (att = p->u.t.attributes; att; att = natt) {
- natt = att->next;
- if (att->af == isakmp_attr_lots)
- free(att->u.lots.data);
- free(att);
- }
- }
+ free_isakmp_attributes(p->u.t.attributes);
break;
case ISAKMP_PAYLOAD_KE:
case ISAKMP_PAYLOAD_HASH:
@@ -386,17 +391,7 @@
}
break;
case ISAKMP_PAYLOAD_MODECFG_ATTR:
- {
- struct isakmp_attribute *att, *natt;
- for (att = p->u.modecfg.attributes; att; att = natt) {
- natt = att->next;
- if (att->af == isakmp_attr_lots)
- free(att->u.lots.data);
- if (att->af == isakmp_attr_acl)
- free(att->u.acl.acl_ent);
- free(att);
- }
- }
+ free_isakmp_attributes(p->u.modecfg.attributes);
break;
default:
abort();

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/