This should help to highlight the different users of nl_dump.buffer.
A later patch will remove this field.
Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
lib/dpif-linux.c | 14 ++++++++------
lib/netdev-linux.c | 6 +++---
lib/netlink-socket.c | 30 ++++++++++++++++--------------
lib/netlink-socket.h | 2 +-
lib/route-table.c | 4 ++--
5 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 497a5bd..ed824a6 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -201,7 +201,7 @@ dpif_linux_enumerate(struct sset *all_dps)
}
dpif_linux_dp_dump_start(&dump);
- while (nl_dump_next(&dump, &msg)) {
+ while (nl_dump_next(&dump, &msg, &dump.buffer)) {
struct dpif_linux_dp dp;
if (!dpif_linux_dp_from_ofpbuf(&dp, &msg)) {
@@ -739,13 +739,14 @@ dpif_linux_port_dump_start(const struct dpif *dpif, void
**statep)
static int
dpif_linux_port_dump_next__(const struct dpif *dpif_, struct nl_dump *dump,
- struct dpif_linux_vport *vport)
+ struct dpif_linux_vport *vport,
+ struct ofpbuf *buffer)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
struct ofpbuf buf;
int error;
- if (!nl_dump_next(dump, &buf)) {
+ if (!nl_dump_next(dump, &buf, buffer)) {
return EOF;
}
@@ -765,7 +766,8 @@ dpif_linux_port_dump_next(const struct dpif *dpif
OVS_UNUSED, void *state_,
struct dpif_linux_vport vport;
int error;
- error = dpif_linux_port_dump_next__(dpif, &state->dump, &vport);
+ error = dpif_linux_port_dump_next__(dpif, &state->dump, &vport,
+ &state->dump.buffer);
if (error) {
return error;
}
@@ -1028,7 +1030,7 @@ dpif_linux_flow_dump_next(const struct dpif *dpif_
OVS_UNUSED, void *state_,
ofpbuf_delete(state->buf);
state->buf = NULL;
- if (!nl_dump_next(&state->dump, &buf)) {
+ if (!nl_dump_next(&state->dump, &buf, &state->dump.buffer)) {
return EOF;
}
@@ -1303,7 +1305,7 @@ dpif_linux_refresh_channels(struct dpif *dpif_)
dpif->n_events = dpif->event_offset = 0;
dpif_linux_port_dump_start__(dpif_, &dump);
- while (!dpif_linux_port_dump_next__(dpif_, &dump, &vport)) {
+ while (!dpif_linux_port_dump_next__(dpif_, &dump, &vport, &dump.buffer)) {
uint32_t port_no = odp_to_u32(vport.port_no);
struct nl_sock *sock = (port_no < dpif->uc_array_size
? dpif->channels[port_no].sock
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index 68d476f..3a67612 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -2162,7 +2162,7 @@ netdev_linux_dump_queue_stats(const struct netdev
*netdev_,
struct ofpbuf msg;
int retval;
- while (nl_dump_next(&dump, &msg)) {
+ while (nl_dump_next(&dump, &msg, &dump.buffer)) {
retval = netdev->tc->ops->class_dump_stats(netdev_, &msg,
cb, aux);
if (retval) {
@@ -2960,7 +2960,7 @@ htb_tc_load(struct netdev *netdev, struct ofpbuf *nlmsg
OVS_UNUSED)
if (!start_queue_dump(netdev, &dump)) {
return ENODEV;
}
- while (nl_dump_next(&dump, &msg)) {
+ while (nl_dump_next(&dump, &msg, &dump.buffer)) {
unsigned int queue_id;
if (!htb_parse_tcmsg__(&msg, &queue_id, &hc, NULL)) {
@@ -3459,7 +3459,7 @@ hfsc_tc_load(struct netdev *netdev, struct ofpbuf *nlmsg
OVS_UNUSED)
return ENODEV;
}
- while (nl_dump_next(&dump, &msg)) {
+ while (nl_dump_next(&dump, &msg, &dump.buffer)) {
unsigned int queue_id;
if (!hfsc_parse_tcmsg__(&msg, &queue_id, &hc, NULL)) {
diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
index bf8eb32..c7973bf 100644
--- a/lib/netlink-socket.c
+++ b/lib/netlink-socket.c
@@ -703,24 +703,24 @@ nl_dump_start(struct nl_dump *dump, int protocol, const
struct ofpbuf *request)
/* Helper function for nl_dump_next(). */
static int
-nl_dump_recv(struct nl_dump *dump)
+nl_dump_recv(struct nl_dump *dump, struct ofpbuf *buffer)
{
struct nlmsghdr *nlmsghdr;
int retval;
- retval = nl_sock_recv__(dump->sock, &dump->buffer, true);
+ retval = nl_sock_recv__(dump->sock, buffer, true);
if (retval) {
return retval == EINTR ? EAGAIN : retval;
}
- nlmsghdr = nl_msg_nlmsghdr(&dump->buffer);
+ nlmsghdr = nl_msg_nlmsghdr(buffer);
if (dump->seq != nlmsghdr->nlmsg_seq) {
VLOG_DBG_RL(&rl, "ignoring seq %#"PRIx32" != expected %#"PRIx32,
nlmsghdr->nlmsg_seq, dump->seq);
return EAGAIN;
}
- if (nl_msg_nlmsgerr(&dump->buffer, &retval)) {
+ if (nl_msg_nlmsgerr(buffer, &retval)) {
VLOG_INFO_RL(&rl, "netlink dump request error (%s)",
ovs_strerror(retval));
return retval && retval != EAGAIN ? retval : EPROTO;
@@ -729,12 +729,14 @@ nl_dump_recv(struct nl_dump *dump)
return 0;
}
-/* Attempts to retrieve another reply from 'dump', which must have been
- * initialized with nl_dump_start().
+/* Attempts to retrieve another reply from 'dump' into 'buffer'. 'dump' must
+ * have been initialized with nl_dump_start(), and 'buffer' must have been
+ * initialized with enough space to receive a netlink reply.
*
* If successful, returns true and points 'reply->data' and 'reply->size' to
- * the message that was retrieved. The caller must not modify 'reply' (because
- * it points into the middle of a larger buffer).
+ * the message that was retrieved. The caller must not modify 'reply' (because
+ * it points within 'buffer', which will be used by future calls to this
+ * function).
*
* On failure, returns false and sets 'reply->data' to NULL and 'reply->size'
* to 0. Failure might indicate an actual error or merely the end of replies.
@@ -742,7 +744,7 @@ nl_dump_recv(struct nl_dump *dump)
* completed by calling nl_dump_done().
*/
bool
-nl_dump_next(struct nl_dump *dump, struct ofpbuf *reply)
+nl_dump_next(struct nl_dump *dump, struct ofpbuf *reply, struct ofpbuf *buffer)
{
struct nlmsghdr *nlmsghdr;
@@ -752,10 +754,10 @@ nl_dump_next(struct nl_dump *dump, struct ofpbuf *reply)
return false;
}
- while (!dump->buffer.size) {
- int retval = nl_dump_recv(dump);
+ while (!buffer->size) {
+ int retval = nl_dump_recv(dump, buffer);
if (retval) {
- ofpbuf_clear(&dump->buffer);
+ ofpbuf_clear(buffer);
if (retval != EAGAIN) {
dump->status = retval;
return false;
@@ -763,7 +765,7 @@ nl_dump_next(struct nl_dump *dump, struct ofpbuf *reply)
}
}
- nlmsghdr = nl_msg_next(&dump->buffer, reply);
+ nlmsghdr = nl_msg_next(buffer, reply);
if (!nlmsghdr) {
VLOG_WARN_RL(&rl, "netlink dump reply contains message fragment");
dump->status = EPROTO;
@@ -788,7 +790,7 @@ nl_dump_done(struct nl_dump *dump)
* XXX We could just destroy and discard the socket in this case. */
while (!dump->status) {
struct ofpbuf reply;
- if (!nl_dump_next(dump, &reply)) {
+ if (!nl_dump_next(dump, &reply, &dump->buffer)) {
ovs_assert(dump->status);
}
}
diff --git a/lib/netlink-socket.h b/lib/netlink-socket.h
index 18db417..038e632 100644
--- a/lib/netlink-socket.h
+++ b/lib/netlink-socket.h
@@ -105,7 +105,7 @@ struct nl_dump {
void nl_dump_start(struct nl_dump *, int protocol,
const struct ofpbuf *request);
-bool nl_dump_next(struct nl_dump *, struct ofpbuf *reply);
+bool nl_dump_next(struct nl_dump *, struct ofpbuf *reply, struct ofpbuf *buf);
int nl_dump_done(struct nl_dump *);
/* Miscellaneous */
diff --git a/lib/route-table.c b/lib/route-table.c
index 1afc01d..1a2be0d 100644
--- a/lib/route-table.c
+++ b/lib/route-table.c
@@ -238,7 +238,7 @@ route_table_reset(void)
nl_dump_start(&dump, NETLINK_ROUTE, &request);
ofpbuf_uninit(&request);
- while (nl_dump_next(&dump, &reply)) {
+ while (nl_dump_next(&dump, &reply, &dump.buffer)) {
struct route_table_msg msg;
if (route_table_parse(&reply, &msg)) {
@@ -420,7 +420,7 @@ name_table_reset(void)
nl_dump_start(&dump, NETLINK_ROUTE, &request);
ofpbuf_uninit(&request);
- while (nl_dump_next(&dump, &reply)) {
+ while (nl_dump_next(&dump, &reply, &dump.buffer)) {
struct rtnetlink_link_change change;
if (rtnetlink_link_parse(&reply, &change)
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
