mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 01:31:55 +00:00
Merge commit 'origin/master'
This commit is contained in:
commit
3589546af4
@ -352,7 +352,7 @@ mb_alloc(pool *p, unsigned size)
|
||||
* zeroes and creates a memory block resource representing this memory
|
||||
* chunk in the pool @p.
|
||||
*
|
||||
* Please note that mb_alloc() returns a pointer to the memory
|
||||
* Please note that mb_allocz() returns a pointer to the memory
|
||||
* chunk, not to the resource, hence you have to free it using
|
||||
* mb_free(), not rfree().
|
||||
*/
|
||||
|
@ -752,11 +752,11 @@ nl_parse_route(struct nlmsghdr *h, int scan)
|
||||
if (a[RTA_OIF])
|
||||
memcpy(&oif, RTA_DATA(a[RTA_OIF]), sizeof(oif));
|
||||
|
||||
DBG("KRT: Got %I/%d, type=%d, oif=%d, table=%d, prid=%d, proto=%s\n", dst, i->rtm_dst_len, i->rtm_type, oif, i->rtm_table, i->rtm_protocol, p->p.name);
|
||||
|
||||
p = nl_table_map[i->rtm_table]; /* Do we know this table? */
|
||||
DBG("KRT: Got %I/%d, type=%d, oif=%d, table=%d, prid=%d, proto=%s\n", dst, i->rtm_dst_len, i->rtm_type, oif, i->rtm_table, i->rtm_protocol, p ? p->p.name : "(none)");
|
||||
if (!p)
|
||||
SKIP("unknown table %d", i->rtm_table);
|
||||
SKIP("unknown table %d\n", i->rtm_table);
|
||||
|
||||
|
||||
#ifdef IPV6
|
||||
if (a[RTA_IIF])
|
||||
|
Loading…
Reference in New Issue
Block a user