Improved debugging messages while constructing messages/attributes

diff --git a/lib/attr.c b/lib/attr.c
index 8a527eb4372178446b0c599d7569b745824fb2b9..71213db898514b4423b0c5967046007d4fdb752b 100644 (file)
--- a/lib/attr.c
+++ b/lib/attr.c
@@ -813,10 +813,11 @@ struct nlattr *nla_reserve(struct nl_msg *msg, int attrtype, int attrlen)
                memset((unsigned char *) nla + nla->nla_len, 0, nla_padlen(attrlen));
        msg->nm_nlh->nlmsg_len = tlen;
 
-       NL_DBG(2, "msg %p: Reserved %d bytes at offset +%td for attr %d "
-                 "nlmsg_len=%d\n", msg, attrlen,
+       NL_DBG(2, "msg %p: attr <%p> %d: Reserved %d (%d) bytes at offset +%td "
+                 "nlmsg_len=%d\n", msg, nla, nla->nla_type,
+                 nla_total_size(attrlen), attrlen,
                  (void *) nla - nlmsg_data(msg->nm_nlh),
-                 attrtype, msg->nm_nlh->nlmsg_len);
+                 msg->nm_nlh->nlmsg_len);
 
        return nla;
 }
@@ -845,8 +846,9 @@ int nla_put(struct nl_msg *msg, int attrtype, int datalen, const void *data)
 
        if (datalen > 0) {
                memcpy(nla_data(nla), data, datalen);
-               NL_DBG(2, "msg %p: Wrote %d bytes at offset +%td for attr %d\n",
-                      msg, datalen, (void *) nla - nlmsg_data(msg->nm_nlh), attrtype);
+               NL_DBG(2, "msg %p: attr <%p> %d: Wrote %d bytes at offset +%td\n",
+                      msg, nla, nla->nla_type, datalen,
+                      (void *) nla - nlmsg_data(msg->nm_nlh));
        }
 
        return 0;
@@ -1110,6 +1112,9 @@ unsigned long nla_get_msecs(struct nlattr *nla)
  */
 int nla_put_nested(struct nl_msg *msg, int attrtype, struct nl_msg *nested)
 {
+       NL_DBG(2, "msg %p: attr <> %d: adding msg %p as nested attribute\n",
+               msg, attrtype, nested);
+
        return nla_put(msg, attrtype, nlmsg_len(nested->nm_nlh),
                       nlmsg_data(nested->nm_nlh));
 }
@@ -1129,6 +1134,9 @@ struct nlattr *nla_nest_start(struct nl_msg *msg, int attrtype)
        if (nla_put(msg, attrtype, 0, NULL) < 0)
                return NULL;
 
+       NL_DBG(2, "msg %p: attr <%p> %d: starting nesting\n",
+               msg, start, start->nla_type);
+
        return start;
 }
 
@@ -1145,6 +1153,10 @@ int nla_nest_end(struct nl_msg *msg, struct nlattr *start)
 {
        start->nla_len = (unsigned char *) nlmsg_tail(msg->nm_nlh) -
                                (unsigned char *) start;
+
+       NL_DBG(2, "msg %p: attr <%p> %d: closing nesting, len=%u\n",
+               msg, start, start->nla_type, start->nla_len);
+
        return 0;
 }
 

diff --git a/lib/msg.c b/lib/msg.c
index 6a8e14a9eda305bfb419967a485a1580b88a2985..615decff79fd5923a5faca9735ca5c0e9ae3e1ee 100644 (file)
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -529,8 +529,8 @@ void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad)
        if (tlen > len)
                memset(buf + len, 0, tlen - len);
 
-       NL_DBG(2, "msg %p: Reserved %zu bytes, pad=%d, nlmsg_len=%d\n",
-                 n, len, pad, n->nm_nlh->nlmsg_len);
+       NL_DBG(2, "msg %p: Reserved %zu (%zu) bytes, pad=%d, nlmsg_len=%d\n",
+                 n, tlen, len, pad, n->nm_nlh->nlmsg_len);
 
        return buf;
 }