git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
netlink.c
diff --git
a/lib/netlink.c
b/lib/netlink.c
index
680c676
..
ada429e
100644
(file)
--- a/
lib/netlink.c
+++ b/
lib/netlink.c
@@
-66,7
+66,7
@@
nl_msg_nlmsgerr(const struct ofpbuf *msg, int *errorp)
struct nlmsgerr *err = ofpbuf_at(msg, NLMSG_HDRLEN, sizeof *err);
int code = EPROTO;
if (!err) {
struct nlmsgerr *err = ofpbuf_at(msg, NLMSG_HDRLEN, sizeof *err);
int code = EPROTO;
if (!err) {
- VLOG_ERR_RL(&rl, "received invalid nlmsgerr (%
zd bytes < %z
d)",
+ VLOG_ERR_RL(&rl, "received invalid nlmsgerr (%
"PRIuSIZE"d bytes < %"PRIuSIZE"
d)",
msg->size, NLMSG_HDRLEN + sizeof *err);
} else if (err->error <= 0 && err->error > INT_MIN) {
code = -err->error;
msg->size, NLMSG_HDRLEN + sizeof *err);
} else if (err->error <= 0 && err->error > INT_MIN) {
code = -err->error;
@@
-643,7
+643,7
@@
min_attr_len(enum nl_attr_type type)
case NL_A_STRING: return 1;
case NL_A_FLAG: return 0;
case NL_A_NESTED: return 0;
case NL_A_STRING: return 1;
case NL_A_FLAG: return 0;
case NL_A_NESTED: return 0;
- case N_NL_ATTR_TYPES: default: NOT_REACHED();
+ case N_NL_ATTR_TYPES: default:
OVS_
NOT_REACHED();
}
}
}
}
@@
-661,7
+661,7
@@
max_attr_len(enum nl_attr_type type)
case NL_A_STRING: return SIZE_MAX;
case NL_A_FLAG: return SIZE_MAX;
case NL_A_NESTED: return SIZE_MAX;
case NL_A_STRING: return SIZE_MAX;
case NL_A_FLAG: return SIZE_MAX;
case NL_A_NESTED: return SIZE_MAX;
- case N_NL_ATTR_TYPES: default: NOT_REACHED();
+ case N_NL_ATTR_TYPES: default:
OVS_
NOT_REACHED();
}
}
}
}
@@
-690,8
+690,8
@@
nl_attr_validate(const struct nlattr *nla, const struct nl_policy *policy)
/* Verify length. */
len = nl_attr_get_size(nla);
if (len < min_len || len > max_len) {
/* Verify length. */
len = nl_attr_get_size(nla);
if (len < min_len || len > max_len) {
- VLOG_DBG_RL(&rl, "attr %"PRIu16" length %
zu
not in "
- "allowed range %
zu...%zu"
, type, len, min_len, max_len);
+ VLOG_DBG_RL(&rl, "attr %"PRIu16" length %
"PRIuSIZE"
not in "
+ "allowed range %
"PRIuSIZE"...%"PRIuSIZE
, type, len, min_len, max_len);
return false;
}
return false;
}
@@
-756,7
+756,7
@@
nl_policy_parse(const struct ofpbuf *msg, size_t nla_offset,
for (i = 0; i < n_attrs; i++) {
const struct nl_policy *e = &policy[i];
if (!e->optional && e->type != NL_A_NO_ATTR && !attrs[i]) {
for (i = 0; i < n_attrs; i++) {
const struct nl_policy *e = &policy[i];
if (!e->optional && e->type != NL_A_NO_ATTR && !attrs[i]) {
- VLOG_DBG_RL(&rl, "required attr %
zu
missing", i);
+ VLOG_DBG_RL(&rl, "required attr %
"PRIuSIZE"
missing", i);
return false;
}
}
return false;
}
}