projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofpbuf: Simplify ofpbuf API.
[cascardo/ovs.git]
/
tests
/
test-sflow.c
diff --git
a/tests/test-sflow.c
b/tests/test-sflow.c
index
4f7940d
..
3e3c450
100644
(file)
--- a/
tests/test-sflow.c
+++ b/
tests/test-sflow.c
@@
-607,13
+607,13
@@
static void
print_sflow(struct ofpbuf *buf)
{
char *dgram_buf;
print_sflow(struct ofpbuf *buf)
{
char *dgram_buf;
- int dgram_len =
ofpbuf_size(buf)
;
+ int dgram_len =
buf->size
;
struct sflow_xdr xdrDatagram;
struct sflow_xdr *x = &xdrDatagram;
memset(x, 0, sizeof *x);
if (SFLOWXDR_try(x)) {
struct sflow_xdr xdrDatagram;
struct sflow_xdr *x = &xdrDatagram;
memset(x, 0, sizeof *x);
if (SFLOWXDR_try(x)) {
- SFLOWXDR_assert(x, (dgram_buf = ofpbuf_try_pull(buf,
ofpbuf_size(buf)
)));
+ SFLOWXDR_assert(x, (dgram_buf = ofpbuf_try_pull(buf,
buf->size
)));
sflowxdr_init(x, dgram_buf, dgram_len);
SFLOWXDR_assert(x, dgram_len >= SFLOW_MIN_LEN);
process_datagram(x);
sflowxdr_init(x, dgram_buf, dgram_len);
SFLOWXDR_assert(x, dgram_len >= SFLOW_MIN_LEN);
process_datagram(x);
@@
-669,7
+669,7
@@
test_sflow_main(int argc, char *argv[])
ofpbuf_clear(&buf);
do {
ofpbuf_clear(&buf);
do {
- retval = recv(sock,
ofpbuf_data(&buf)
, buf.allocated, 0);
+ retval = recv(sock,
buf.data
, buf.allocated, 0);
} while (retval < 0 && errno == EINTR);
if (retval > 0) {
ofpbuf_put_uninit(&buf, retval);
} while (retval < 0 && errno == EINTR);
if (retval > 0) {
ofpbuf_put_uninit(&buf, retval);