mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
. fix an ospf6d bug on quagga-0.99.14 (bug #541 on quagga's bugzilla); [1]
. bump PORTREVISION. PR: ports/137510 [1] Submitted by: dikshie <dikshie at sfc.wide.ad.jp> [1] Approved by: Boris Kovalenko <boris at tagnet.ru> (maintainer) [1]
This commit is contained in:
parent
3cfb9e7970
commit
3aeec832f2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=239857
2 changed files with 29 additions and 1 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
PORTNAME= quagga
|
PORTNAME= quagga
|
||||||
PORTVERSION= 0.99.14
|
PORTVERSION= 0.99.14
|
||||||
PORTREVISION= 1
|
PORTREVISION= 2
|
||||||
CATEGORIES= net ipv6
|
CATEGORIES= net ipv6
|
||||||
MASTER_SITES= http://quagga.net/download/ \
|
MASTER_SITES= http://quagga.net/download/ \
|
||||||
http://www.ru.quagga.net/download/ \
|
http://www.ru.quagga.net/download/ \
|
||||||
|
|
28
net/quagga/files/patch-ospf6d-ospf6_lsa.c
Normal file
28
net/quagga/files/patch-ospf6d-ospf6_lsa.c
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
--- ospf6d/ospf6_lsa.c (revision 21)
|
||||||
|
+++ ospf6d/ospf6_lsa.c (working copy)
|
||||||
|
@@ -207,9 +207,11 @@
|
||||||
|
zlog_warn ("LSA: quagga_gettime failed, may fail LSA AGEs: %s",
|
||||||
|
safe_strerror (errno));
|
||||||
|
|
||||||
|
- if (lsa->header->age >= htons (MAXAGE))
|
||||||
|
+ if (ntohs (lsa->header->age) >= MAXAGE)
|
||||||
|
{
|
||||||
|
- /* LSA may have been prematurely aged */
|
||||||
|
+ /* ospf6_lsa_premature_aging () sets age to MAXAGE; when using
|
||||||
|
+ relative time, we cannot compare against lsa birth time, so
|
||||||
|
+ we catch this special case here. */
|
||||||
|
lsa->header->age = htons (MAXAGE);
|
||||||
|
return MAXAGE;
|
||||||
|
}
|
||||||
|
@@ -245,11 +247,6 @@
|
||||||
|
THREAD_OFF (lsa->expire);
|
||||||
|
THREAD_OFF (lsa->refresh);
|
||||||
|
|
||||||
|
- /*
|
||||||
|
- * The below technique to age out LSA does not work when using relative time
|
||||||
|
- *
|
||||||
|
- memset (&lsa->birth, 0, sizeof (struct timeval));
|
||||||
|
- */
|
||||||
|
lsa->header->age = htons (MAXAGE);
|
||||||
|
thread_execute (master, ospf6_lsa_expire, lsa, 0);
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue