X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn.c;h=f0549d5da90d5bf2fa88834264e6e0035c735e9e;hb=b3f2fc93e3f357f8d05a92f53ec253339a40887f;hp=2a83eda479b3f4ab03b0a0e3e1303f0411f959aa;hpb=2b4cca6fc24ece6c727f877a9f17dd5f32da7f84;p=sliver-openvswitch.git diff --git a/lib/vconn.c b/lib/vconn.c index 2a83eda47..f0549d5da 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -350,39 +350,6 @@ vconn_set_allowed_versions(struct vconn *vconn, uint32_t allowed_versions) vconn->allowed_versions = allowed_versions; } -/* 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. */ -ovs_be32 -vconn_get_remote_ip(const struct vconn *vconn) -{ - return vconn->remote_ip; -} - -/* 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. */ -ovs_be16 -vconn_get_remote_port(const struct vconn *vconn) -{ - return vconn->remote_port; -} - -/* 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. */ -ovs_be32 -vconn_get_local_ip(const struct vconn *vconn) -{ - return vconn->local_ip; -} - -/* 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. */ -ovs_be16 -vconn_get_local_port(const struct vconn *vconn) -{ - return vconn->local_port; -} - /* Returns the OpenFlow version negotiated with the peer, or -1 if version * negotiation is not yet complete. * @@ -596,7 +563,7 @@ vconn_connect(struct vconn *vconn) return vconn->error; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } while (vconn->state != last_state); @@ -1137,30 +1104,6 @@ vconn_init(struct vconn *vconn, const struct vconn_class *class, ovs_assert(vconn->state != VCS_CONNECTING || class->connect); } -void -vconn_set_remote_ip(struct vconn *vconn, ovs_be32 ip) -{ - vconn->remote_ip = ip; -} - -void -vconn_set_remote_port(struct vconn *vconn, ovs_be16 port) -{ - vconn->remote_port = port; -} - -void -vconn_set_local_ip(struct vconn *vconn, ovs_be32 ip) -{ - vconn->local_ip = ip; -} - -void -vconn_set_local_port(struct vconn *vconn, ovs_be16 port) -{ - vconn->local_port = port; -} - void pvconn_init(struct pvconn *pvconn, const struct pvconn_class *class, const char *name, uint32_t allowed_versions)