0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00

Merge commit 'v2.14-28-g87fcb810' into mq-merge-step-2

This commit is contained in:
Maria Matejka 2024-01-28 14:54:06 +01:00
commit 94a95a6944
2 changed files with 2 additions and 2 deletions

View File

@ -1715,7 +1715,7 @@ in the foot).
Prefix <cf><m>ip1</m>/<m>len1</m></cf> matches prefix Prefix <cf><m>ip1</m>/<m>len1</m></cf> matches prefix
pattern <cf><m>ip2</m>/<m>len2</m>{<m>l</m>,<m>h</m>}</cf> if the pattern <cf><m>ip2</m>/<m>len2</m>{<m>l</m>,<m>h</m>}</cf> if the
first <cf>min(len1, len2)</cf> bits of <cf/ip1/ and <cf/ip2/ are first <cf>min(len1, len2)</cf> bits of <cf/ip1/ and <cf/ip2/ are
identical and <cf>len1 &lt;= ip1 &lt;= len2</cf>. A valid prefix pattern identical and <cf>l &lt;= len1 &lt;= h</cf>. A valid prefix pattern
has to satisfy <cf>low &lt;= high</cf>, but <cf/pxlen/ is not has to satisfy <cf>low &lt;= high</cf>, but <cf/pxlen/ is not
constrained by <cf/low/ or <cf/high/. Obviously, a prefix matches a constrained by <cf/low/ or <cf/high/. Obviously, a prefix matches a
prefix set literal if it matches any prefix pattern in the prefix set prefix set literal if it matches any prefix pattern in the prefix set

View File

@ -1264,7 +1264,7 @@ rta__free(rta *a)
rta * rta *
rta_do_cow(rta *o, linpool *lp) rta_do_cow(rta *o, linpool *lp)
{ {
rta *r = lp_alloc(lp, rta_size(o)); rta *r = lp_alloc(lp, RTA_MAX_SIZE);
memcpy(r, o, rta_size(o)); memcpy(r, o, rta_size(o));
for (struct nexthop **nhn = &(r->nh.next), *nho = o->nh.next; nho; nho = nho->next) for (struct nexthop **nhn = &(r->nh.next), *nho = o->nh.next; nho; nho = nho->next)
{ {