Rename utility functions to avoid partner namespace conflicts.

[sliver-openvswitch.git] / include / dhcp.h

diff --git a/include/dhcp.h b/include/dhcp.h
index 2d00f02..c513f4e 100644 (file)
--- a/include/dhcp.h
+++ b/include/dhcp.h
@@ -39,7 +39,7 @@
 #include "util.h"
 
 struct ds;
-struct buffer;
+struct ofpbuf;
 
 /* Values for 'op' field. */
 #define DHCP_BOOTREQUEST        1        /* Message sent by DHCP client. */
@@ -218,6 +218,11 @@ struct dhcp_option {
     void *data;                 /* Data. */
 };
 
+const char *dhcp_option_to_string(const struct dhcp_option *, int code,
+                                  struct ds *);
+bool dhcp_option_equals(const struct dhcp_option *,
+                        const struct dhcp_option *);
+
 /* Abstracted DHCP protocol message, to make them easier to manipulate than
  * through raw protocol buffers. */
 struct dhcp_msg {
@@ -266,11 +271,9 @@ bool dhcp_msg_get_uint8(const struct dhcp_msg *, int code,
                         size_t offset, uint8_t *);
 bool dhcp_msg_get_uint16(const struct dhcp_msg *, int code,
                          size_t offset, uint16_t *);
-const char *dhcp_option_to_string(const struct dhcp_option *, int code,
-                                  struct ds *);
 const char *dhcp_msg_to_string(const struct dhcp_msg *, bool multiline,
                                struct ds *);
-int dhcp_parse(struct dhcp_msg *, const struct buffer *);
-void dhcp_assemble(const struct dhcp_msg *, struct buffer *);
+int dhcp_parse(struct dhcp_msg *, const struct ofpbuf *);
+void dhcp_assemble(const struct dhcp_msg *, struct ofpbuf *);
 
 #endif /* dhcp.h */