ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / lib / vconn.h

diff --git a/lib/vconn.h b/lib/vconn.h
index 80846fff36513dfb5464b83230083e87cc37dee3..ee4a5681449c132dd960d4192eae456f6b632caa 100644 (file)
--- a/lib/vconn.h
+++ b/lib/vconn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,15 @@
 #ifndef VCONN_H
 #define VCONN_H 1
 
-#include <assert.h>
 #include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
+#include "openvswitch/types.h"
 
-#include "flow.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+struct list;
 struct ofpbuf;
-struct ofp_action_header;
-struct ofp_header;
-struct ofp_match;
-struct ofp_stats_reply;
 struct pvconn;
 struct vconn;
 
@@ -36,18 +33,23 @@ void vconn_usage(bool active, bool passive, bool bootstrap);
 
 /* Active vconns: virtual connections to OpenFlow devices. */
 int vconn_verify_name(const char *name);
-int vconn_open(const char *name, int min_version, struct vconn **);
+int vconn_open(const char *name, int min_version,
+               struct vconn **, uint8_t dscp);
 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_get_version(const struct vconn *);
 int vconn_connect(struct vconn *);
 int vconn_recv(struct vconn *, struct ofpbuf **);
 int vconn_send(struct vconn *, struct ofpbuf *);
-int vconn_recv_xid(struct vconn *, uint32_t xid, struct ofpbuf **);
+int vconn_recv_xid(struct vconn *, ovs_be32 xid, struct ofpbuf **);
 int vconn_transact(struct vconn *, struct ofpbuf *, struct ofpbuf **);
+int vconn_transact_noreply(struct vconn *, struct ofpbuf *, struct ofpbuf **);
+int vconn_transact_multiple_noreply(struct vconn *, struct list *requests,
+                                    struct ofpbuf **replyp);
 
 void vconn_run(struct vconn *);
 void vconn_run_wait(struct vconn *);
@@ -68,10 +70,14 @@ void vconn_send_wait(struct vconn *);
 
 /* Passive vconns: virtual listeners for incoming OpenFlow connections. */
 int pvconn_verify_name(const char *name);
-int pvconn_open(const char *name, struct pvconn **);
+int pvconn_open(const char *name, struct pvconn **, uint8_t dscp);
 const char *pvconn_get_name(const struct pvconn *);
 void pvconn_close(struct pvconn *);
 int pvconn_accept(struct pvconn *, int min_version, struct vconn **);
 void pvconn_wait(struct pvconn *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* vconn.h */