From 4408d18aac89b94249c46f39757026cb337b949f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 29 Nov 2010 13:48:30 -0800 Subject: [PATCH] Convert stream and vconn interfaces to use ovs_be16, ovs_be32. --- lib/stream-provider.h | 18 +++++++++--------- lib/stream.c | 16 ++++++++-------- lib/stream.h | 9 +++++---- lib/vconn-provider.h | 18 +++++++++--------- lib/vconn.c | 22 +++++++++++----------- lib/vconn.h | 8 ++++---- 6 files changed, 46 insertions(+), 45 deletions(-) diff --git a/lib/stream-provider.h b/lib/stream-provider.h index d6bf0a295..2b8ca6988 100644 --- a/lib/stream-provider.h +++ b/lib/stream-provider.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,19 +30,19 @@ struct stream { struct stream_class *class; int state; int error; - uint32_t remote_ip; - uint16_t remote_port; - uint32_t local_ip; - uint16_t local_port; + ovs_be32 remote_ip; + ovs_be16 remote_port; + ovs_be32 local_ip; + ovs_be16 local_port; char *name; }; void stream_init(struct stream *, struct stream_class *, int connect_status, const char *name); -void stream_set_remote_ip(struct stream *, uint32_t remote_ip); -void stream_set_remote_port(struct stream *, uint16_t remote_port); -void stream_set_local_ip(struct stream *, uint32_t local_ip); -void stream_set_local_port(struct stream *, uint16_t local_port); +void stream_set_remote_ip(struct stream *, ovs_be32 remote_ip); +void stream_set_remote_port(struct stream *, ovs_be16 remote_port); +void stream_set_local_ip(struct stream *, ovs_be32 local_ip); +void stream_set_local_port(struct stream *, ovs_be16 local_port); static inline void stream_assert_class(const struct stream *stream, const struct stream_class *class) { diff --git a/lib/stream.c b/lib/stream.c index eb75be8d7..44d94d790 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -280,7 +280,7 @@ stream_get_name(const struct stream *stream) /* Returns the IP address of the peer, or 0 if the peer is not connected over * an IP-based protocol or if its IP address is not yet known. */ -uint32_t +ovs_be32 stream_get_remote_ip(const struct stream *stream) { return stream->remote_ip; @@ -288,7 +288,7 @@ stream_get_remote_ip(const struct stream *stream) /* Returns the transport port of the peer, or 0 if the connection does not * contain a port or if the port is not yet known. */ -uint16_t +ovs_be16 stream_get_remote_port(const struct stream *stream) { return stream->remote_port; @@ -296,7 +296,7 @@ stream_get_remote_port(const struct stream *stream) /* Returns the IP address used to connect to the peer, or 0 if the connection * is not an IP-based protocol or if its IP address is not yet known. */ -uint32_t +ovs_be32 stream_get_local_ip(const struct stream *stream) { return stream->local_ip; @@ -304,7 +304,7 @@ stream_get_local_ip(const struct stream *stream) /* Returns the transport port used to connect to the peer, or 0 if the * connection does not contain a port or if the port is not yet known. */ -uint16_t +ovs_be16 stream_get_local_port(const struct stream *stream) { return stream->local_port; @@ -623,25 +623,25 @@ stream_init(struct stream *stream, struct stream_class *class, } void -stream_set_remote_ip(struct stream *stream, uint32_t ip) +stream_set_remote_ip(struct stream *stream, ovs_be32 ip) { stream->remote_ip = ip; } void -stream_set_remote_port(struct stream *stream, uint16_t port) +stream_set_remote_port(struct stream *stream, ovs_be16 port) { stream->remote_port = port; } void -stream_set_local_ip(struct stream *stream, uint32_t ip) +stream_set_local_ip(struct stream *stream, ovs_be32 ip) { stream->local_ip = ip; } void -stream_set_local_port(struct stream *stream, uint16_t port) +stream_set_local_port(struct stream *stream, ovs_be16 port) { stream->local_port = port; } diff --git a/lib/stream.h b/lib/stream.h index 5c536c6ae..2482bf20c 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -20,6 +20,7 @@ #include #include #include +#include "openvswitch/types.h" #include "vlog.h" struct pstream; @@ -33,10 +34,10 @@ int stream_open(const char *name, struct stream **); int stream_open_block(int error, struct stream **); void stream_close(struct stream *); const char *stream_get_name(const struct stream *); -uint32_t stream_get_remote_ip(const struct stream *); -uint16_t stream_get_remote_port(const struct stream *); -uint32_t stream_get_local_ip(const struct stream *); -uint16_t stream_get_local_port(const struct stream *); +ovs_be32 stream_get_remote_ip(const struct stream *); +ovs_be16 stream_get_remote_port(const struct stream *); +ovs_be32 stream_get_local_ip(const struct stream *); +ovs_be16 stream_get_local_port(const struct stream *); int stream_connect(struct stream *); int stream_recv(struct stream *, void *buffer, size_t n); int stream_send(struct stream *, const void *buffer, size_t n); diff --git a/lib/vconn-provider.h b/lib/vconn-provider.h index 1c8b86da6..682a593c8 100644 --- a/lib/vconn-provider.h +++ b/lib/vconn-provider.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,19 +34,19 @@ struct vconn { int error; int min_version; int version; - uint32_t remote_ip; - uint16_t remote_port; - uint32_t local_ip; - uint16_t local_port; + ovs_be32 remote_ip; + ovs_be16 remote_port; + ovs_be32 local_ip; + ovs_be16 local_port; char *name; }; void vconn_init(struct vconn *, struct vconn_class *, int connect_status, const char *name); -void vconn_set_remote_ip(struct vconn *, uint32_t remote_ip); -void vconn_set_remote_port(struct vconn *, uint16_t remote_port); -void vconn_set_local_ip(struct vconn *, uint32_t local_ip); -void vconn_set_local_port(struct vconn *, uint16_t local_port); +void vconn_set_remote_ip(struct vconn *, ovs_be32 remote_ip); +void vconn_set_remote_port(struct vconn *, ovs_be16 remote_port); +void vconn_set_local_ip(struct vconn *, ovs_be32 local_ip); +void vconn_set_local_port(struct vconn *, ovs_be16 local_port); static inline void vconn_assert_class(const struct vconn *vconn, const struct vconn_class *class) { diff --git a/lib/vconn.c b/lib/vconn.c index 380e374aa..3804061b6 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -317,7 +317,7 @@ vconn_get_name(const struct vconn *vconn) /* Returns the IP address of the peer, or 0 if the peer is not connected over * an IP-based protocol or if its IP address is not yet known. */ -uint32_t +ovs_be32 vconn_get_remote_ip(const struct vconn *vconn) { return vconn->remote_ip; @@ -325,7 +325,7 @@ vconn_get_remote_ip(const struct vconn *vconn) /* Returns the transport port of the peer, or 0 if the connection does not * contain a port or if the port is not yet known. */ -uint16_t +ovs_be16 vconn_get_remote_port(const struct vconn *vconn) { return vconn->remote_port; @@ -334,7 +334,7 @@ vconn_get_remote_port(const struct vconn *vconn) /* Returns the IP address used to connect to the peer, or 0 if the * connection is not an IP-based protocol or if its IP address is not * yet known. */ -uint32_t +ovs_be32 vconn_get_local_ip(const struct vconn *vconn) { return vconn->local_ip; @@ -342,7 +342,7 @@ vconn_get_local_ip(const struct vconn *vconn) /* Returns the transport port used to connect to the peer, or 0 if the * connection does not contain a port or if the port is not yet known. */ -uint16_t +ovs_be16 vconn_get_local_port(const struct vconn *vconn) { return vconn->local_port; @@ -648,10 +648,10 @@ vconn_recv_block(struct vconn *vconn, struct ofpbuf **msgp) * * 'request' is always destroyed, regardless of the return value. */ int -vconn_recv_xid(struct vconn *vconn, uint32_t xid, struct ofpbuf **replyp) +vconn_recv_xid(struct vconn *vconn, ovs_be32 xid, struct ofpbuf **replyp) { for (;;) { - uint32_t recv_xid; + ovs_be32 recv_xid; struct ofpbuf *reply; int error; @@ -683,7 +683,7 @@ int vconn_transact(struct vconn *vconn, struct ofpbuf *request, struct ofpbuf **replyp) { - uint32_t send_xid = ((struct ofp_header *) request->data)->xid; + ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid; int error; *replyp = NULL; @@ -903,25 +903,25 @@ vconn_init(struct vconn *vconn, struct vconn_class *class, int connect_status, } void -vconn_set_remote_ip(struct vconn *vconn, uint32_t ip) +vconn_set_remote_ip(struct vconn *vconn, ovs_be32 ip) { vconn->remote_ip = ip; } void -vconn_set_remote_port(struct vconn *vconn, uint16_t port) +vconn_set_remote_port(struct vconn *vconn, ovs_be16 port) { vconn->remote_port = port; } void -vconn_set_local_ip(struct vconn *vconn, uint32_t ip) +vconn_set_local_ip(struct vconn *vconn, ovs_be32 ip) { vconn->local_ip = ip; } void -vconn_set_local_port(struct vconn *vconn, uint16_t port) +vconn_set_local_port(struct vconn *vconn, ovs_be16 port) { vconn->local_port = port; } diff --git a/lib/vconn.h b/lib/vconn.h index 80846fff3..e34120526 100644 --- a/lib/vconn.h +++ b/lib/vconn.h @@ -39,10 +39,10 @@ int vconn_verify_name(const char *name); int vconn_open(const char *name, int min_version, struct vconn **); void vconn_close(struct vconn *); const char *vconn_get_name(const struct vconn *); -uint32_t vconn_get_remote_ip(const struct vconn *); -uint16_t vconn_get_remote_port(const struct vconn *); -uint32_t vconn_get_local_ip(const struct vconn *); -uint16_t vconn_get_local_port(const struct vconn *); +ovs_be32 vconn_get_remote_ip(const struct vconn *); +ovs_be16 vconn_get_remote_port(const struct vconn *); +ovs_be32 vconn_get_local_ip(const struct vconn *); +ovs_be16 vconn_get_local_port(const struct vconn *); int vconn_connect(struct vconn *); int vconn_recv(struct vconn *, struct ofpbuf **); int vconn_send(struct vconn *, struct ofpbuf *); -- 2.43.0