diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-04-24 23:37:01 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-04-24 23:37:01 +0200 |
| commit | 3589546af4baa4d349409a318f8c9658dd11b3cc (patch) | |
| tree | db46bd5ccbd10744545da35df0776e015d19fded | |
| parent | 7d0a31deed92971e274aa0314e12619f93c850c9 (diff) | |
| parent | cca970666a90af02eaeb6848bbfc3d5a2222fa21 (diff) | |
Merge commit 'origin/master'
| -rw-r--r-- | lib/resource.c | 2 | ||||
| -rw-r--r-- | sysdep/linux/netlink/netlink.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/resource.c b/lib/resource.c index 24164ec2..42243aa2 100644 --- a/lib/resource.c +++ b/lib/resource.c @@ -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(). */ diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c index 2b0d7633..182088a1 100644 --- a/sysdep/linux/netlink/netlink.c +++ b/sysdep/linux/netlink/netlink.c @@ -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]) |