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

Merge commit 'origin/master'

Browse source
This commit is contained in:
Ondrej Zajicek 2012-04-24 23:37:01 +02:00
commit 3589546af4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/resource.c
View file

@ -352,7 +352,7 @@ mb_alloc(pool *p, unsigned size)
* zeroes and creates a memory block resource representing this memory * zeroes and creates a memory block resource representing this memory
* chunk in the pool @p. * 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 * chunk, not to the resource, hence you have to free it using
* mb_free(), not rfree(). * mb_free(), not rfree().
*/ */

6
sysdep/linux/netlink/netlink.c
View file

@ -752,11 +752,11 @@ nl_parse_route(struct nlmsghdr *h, int scan)
if (a[RTA_OIF]) if (a[RTA_OIF])
memcpy(&oif, RTA_DATA(a[RTA_OIF]), sizeof(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? */ 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) if (!p)
SKIP("unknown table %d", i->rtm_table); SKIP("unknown table %d\n", i->rtm_table);
#ifdef IPV6 #ifdef IPV6
if (a[RTA_IIF]) if (a[RTA_IIF])