proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 20:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

Browse Source
This commit is contained in:
Donald Sharp 2016-03-10 08:49:47 -05:00
commit 2286f0fb56
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bgpd/bgp_fsm.c
View File

@ -160,10 +160,32 @@ peer_xfer_conn(struct peer *from_peer)
from_peer->last_event = last_evt; from_peer->last_event = last_evt;
from_peer->last_major_event = last_maj_evt; from_peer->last_major_event = last_maj_evt;
peer->remote_id = from_peer->remote_id; peer->remote_id = from_peer->remote_id;
if (from_peer->hostname != NULL) if (from_peer->hostname != NULL)
{
if (peer->hostname)
{
XFREE(MTYPE_HOST, peer->hostname);
peer->hostname = NULL;
}
peer->hostname = XSTRDUP(MTYPE_HOST, from_peer->hostname); peer->hostname = XSTRDUP(MTYPE_HOST, from_peer->hostname);
XFREE(MTYPE_HOST, from_peer->hostname);
from_peer->hostname = NULL;
}
if (from_peer->domainname != NULL) if (from_peer->domainname != NULL)
{
if (peer->domainname)
{
XFREE(MTYPE_HOST, peer->domainname);
peer->domainname= NULL;
}
peer->domainname = XSTRDUP(MTYPE_HOST, from_peer->domainname); peer->domainname = XSTRDUP(MTYPE_HOST, from_peer->domainname);
XFREE(MTYPE_HOST, from_peer->domainname);
from_peer->domainname = NULL;
}
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)
for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++) for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)

3
bgpd/bgp_open.c
View File

@ -627,7 +627,10 @@ bgp_capability_hostname (struct peer *peer, struct capability_header *hdr)
str[len] = '\0'; str[len] = '\0';
if (peer->hostname != NULL) if (peer->hostname != NULL)
{
XFREE(MTYPE_HOST, peer->hostname); XFREE(MTYPE_HOST, peer->hostname);
peer->hostname = NULL;
}
if (peer->domainname != NULL) if (peer->domainname != NULL)
{ {

10
tools/quagga
View File

@ -4,18 +4,18 @@ startup()
{ {
FILE="/var/run/quagga/$1.was_running" FILE="/var/run/quagga/$1.was_running"
/bin/systemctl reset-failed $1 /bin/systemctl reset-failed $1 > /dev/null 2>&1
if [ -e $FILE ] if [ -e $FILE ]
then then
rm $FILE rm $FILE
systemctl start $1 /bin/systemctl start $1 > /dev/null 2>&1
fi fi
/bin/systemctl is-enabled $1 > /dev/null 2>&1 /bin/systemctl is-enabled $1 > /dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
systemctl start $1 /bin/systemctl start $1 > /dev/null 2>&1
fi fi
} }
@ -41,14 +41,14 @@ start_daemons()
stop_ospfd_multiinstance() stop_ospfd_multiinstance()
{ {
for instance in $MI; do for instance in $MI; do
/bin/systemctl stop ospfd@$instance /bin/systemctl stop ospfd@$instance > /dev/null 2>&1
done done
} }
stop_daemons() stop_daemons()
{ {
stop_ospfd_multiinstance stop_ospfd_multiinstance
/bin/systemctl stop bgpd ospfd ospf6d ripd ripngd isisd zebra /bin/systemctl stop bgpd ospfd ospf6d ripd ripngd isisd zebra > /dev/null 2>&1
} }
MI=`systemctl list-units 'ospfd@*'| sed -n -e '/@/s/\..*//' -e 's/.*@//p'` MI=`systemctl list-units 'ospfd@*'| sed -n -e '/@/s/\..*//' -e 's/.*@//p'`