proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 23:21:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Brown paperbag please. Fix previous commit.

Browse Source
This commit is contained in:
hasso 2004-09-26 19:53:47 +00:00
parent 4289546d79
commit 0dae85e67a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/ChangeLog
View File

@ -1,3 +1,8 @@
2004-09-26 Hasso Tepper <hasso at quagga.net>
* isis_circuit.c: Fix previous commit. Don't schedule LSP regeneration
and don't crash if circuit->area == NULL.
2004-09-26 Hasso Tepper <hasso at quagga.net> 2004-09-26 Hasso Tepper <hasso at quagga.net>
* *.[c|h]: Fix a lot of compiler warnings. * *.[c|h]: Fix a lot of compiler warnings.

13
isisd/isis_circuit.c
View File

@ -241,7 +241,8 @@ isis_circuit_add_addr (struct isis_circuit *circuit,
ipv4->prefixlen = connected->address->prefixlen; ipv4->prefixlen = connected->address->prefixlen;
ipv4->prefix = connected->address->u.prefix4; ipv4->prefix = connected->address->u.prefix4;
listnode_add (circuit->ip_addrs, ipv4); listnode_add (circuit->ip_addrs, ipv4);
lsp_regenerate_schedule (circuit->area); if (circuit->area)
lsp_regenerate_schedule (circuit->area);
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
prefix2str (connected->address, buf, BUFSIZ); prefix2str (connected->address, buf, BUFSIZ);
@ -260,8 +261,8 @@ isis_circuit_add_addr (struct isis_circuit *circuit,
listnode_add (circuit->ipv6_link, ipv6); listnode_add (circuit->ipv6_link, ipv6);
else else
listnode_add (circuit->ipv6_non_link, ipv6); listnode_add (circuit->ipv6_non_link, ipv6);
if (circuit->area)
lsp_regenerate_schedule (circuit->area); lsp_regenerate_schedule (circuit->area);
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
prefix2str (connected->address, buf, BUFSIZ); prefix2str (connected->address, buf, BUFSIZ);
@ -302,7 +303,8 @@ isis_circuit_del_addr (struct isis_circuit *circuit,
if (ip) if (ip)
{ {
listnode_delete (circuit->ip_addrs, ip); listnode_delete (circuit->ip_addrs, ip);
lsp_regenerate_schedule (circuit->area); if (circuit->area)
lsp_regenerate_schedule (circuit->area);
} }
else else
{ {
@ -354,7 +356,8 @@ isis_circuit_del_addr (struct isis_circuit *circuit,
circuit %d", buf, circuit->circuit_id); circuit %d", buf, circuit->circuit_id);
} }
else else
lsp_regenerate_schedule (circuit->area); if (circuit->area)
lsp_regenerate_schedule (circuit->area);
} }
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */
return; return;