diff options
| author | hasso <hasso> | 2005-09-01 17:52:33 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-09-01 17:52:33 +0000 |
| commit | aac372f4f5b617a579dafeab31fb486a5d69d65d (patch) | |
| tree | 9aac3362db19f195238b8508761e82f2d6b8a370 /isisd/isis_tlv.c | |
| parent | deba35508e28a3861bb182218bb51af6769b2581 (diff) | |
* isis_adjacency.c, isis_lsp.c, isisd.c: Replace XMALLOC && memset
with XCALLOC.
* isis_lsp.c (lsp_build_pseudo): Fix adding ES neighbour.
* isis_tlv.c: More compact free_tlvs() function.
* isis_lsp.c (lsp_build_nonpseudo) : Try to fix one more regression
introduced by stream cleanup. Seek enp to the right place before
starting to fill stream with TLVs.
Diffstat (limited to 'isisd/isis_tlv.c')
| -rw-r--r-- | isisd/isis_tlv.c | 53 |
1 files changed, 14 insertions, 39 deletions
diff --git a/isisd/isis_tlv.c b/isisd/isis_tlv.c index 1194f046..1850e15d 100644 --- a/isisd/isis_tlv.c +++ b/isisd/isis_tlv.c @@ -61,59 +61,34 @@ void free_tlvs (struct tlvs *tlvs) { if (tlvs->area_addrs) - { - list_delete (tlvs->area_addrs); - } + list_delete (tlvs->area_addrs); if (tlvs->is_neighs) - { - list_delete (tlvs->is_neighs); - } + list_delete (tlvs->is_neighs); if (tlvs->te_is_neighs) - { - list_delete (tlvs->te_is_neighs); - } + list_delete (tlvs->te_is_neighs); if (tlvs->es_neighs) - { - list_delete (tlvs->es_neighs); - } + list_delete (tlvs->es_neighs); if (tlvs->lsp_entries) - { - list_delete (tlvs->lsp_entries); - } + list_delete (tlvs->lsp_entries); if (tlvs->lan_neighs) - { - list_delete (tlvs->lan_neighs); - } + list_delete (tlvs->lan_neighs); if (tlvs->prefix_neighs) - { - list_delete (tlvs->prefix_neighs); - } + list_delete (tlvs->prefix_neighs); if (tlvs->ipv4_addrs) - { - list_delete (tlvs->ipv4_addrs); - } + list_delete (tlvs->ipv4_addrs); if (tlvs->ipv4_int_reachs) - { - list_delete (tlvs->ipv4_int_reachs); - } + list_delete (tlvs->ipv4_int_reachs); if (tlvs->ipv4_ext_reachs) - { - list_delete (tlvs->ipv4_ext_reachs); - } + list_delete (tlvs->ipv4_ext_reachs); if (tlvs->te_ipv4_reachs) - { - list_delete (tlvs->te_ipv4_reachs); - } + list_delete (tlvs->te_ipv4_reachs); #ifdef HAVE_IPV6 if (tlvs->ipv6_addrs) - { - list_delete (tlvs->ipv6_addrs); - } + list_delete (tlvs->ipv6_addrs); if (tlvs->ipv6_reachs) - { - list_delete (tlvs->ipv6_reachs); - } + list_delete (tlvs->ipv6_reachs); #endif /* HAVE_IPV6 */ + return; } |