Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Easier cleanup of an interface.

Browse source
This commit is contained in:
Ondrej Filip 2004-06-01 13:44:53 +00:00
parent c9f6cf8a05
commit e8bf6c0766
1 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
proto/ospf/iface.c
View file

@ -68,11 +68,8 @@ iface_chstate(struct ospf_iface *ifa, u8 state)
} }
else else
{ {
if(ifa->dr_sk!=NULL) rfree(ifa->dr_sk);
{ ifa->dr_sk=NULL;
rfree(ifa->dr_sk);
ifa->dr_sk=NULL;
}
} }
if((oldstate==OSPF_IS_DR)&&(ifa->nlsa!=NULL)) if((oldstate==OSPF_IS_DR)&&(ifa->nlsa!=NULL))
{ {
@ -101,30 +98,15 @@ downint(struct ospf_iface *ifa)
ospf_neigh_remove(n); ospf_neigh_remove(n);
} }
rem_node(NODE ifa); rem_node(NODE ifa);
if(ifa->hello_sk!=NULL)
rfree(ifa->hello_sk);
if(ifa->dr_sk!=NULL) rfree(ifa->hello_sk);
rfree(ifa->dr_sk); rfree(ifa->dr_sk);
rfree(ifa->ip_sk);
if(ifa->ip_sk!=NULL) rfree(ifa->wait_timer);
rfree(ifa->ip_sk); rfree(ifa->hello_timer);
rfree(ifa->poll_timer);
if(ifa->wait_timer!=NULL)
{
tm_stop(ifa->wait_timer);
rfree(ifa->wait_timer);
}
if(ifa->hello_timer!=NULL)
{
tm_stop(ifa->hello_timer);
rfree(ifa->hello_timer);
}
if(ifa->poll_timer!=NULL)
{
tm_stop(ifa->poll_timer);
rfree(ifa->poll_timer);
}
rfree(ifa->lock); rfree(ifa->lock);
mb_free(ifa); mb_free(ifa);
} }