Merge "master" into "wdp".

[sliver-openvswitch.git] / ofproto / discovery.c

diff --git a/ofproto/discovery.c b/ofproto/discovery.c
index 9608ffb..3a4b1eb 100644 (file)
--- a/ofproto/discovery.c
+++ b/ofproto/discovery.c
@@ -156,6 +156,12 @@ discovery_destroy(struct discovery *d)
     }
 }
 
+bool
+discovery_get_update_resolv_conf(const struct discovery *d)
+{
+    return d->update_resolv_conf;
+}
+
 void
 discovery_set_update_resolv_conf(struct discovery *d,
                                  bool update_resolv_conf)
@@ -163,6 +169,12 @@ discovery_set_update_resolv_conf(struct discovery *d,
     d->update_resolv_conf = update_resolv_conf;
 }
 
+const char *
+discovery_get_accept_controller_re(const struct discovery *d)
+{
+    return d->re;
+}
+
 int
 discovery_set_accept_controller_re(struct discovery *d, const char *re_)
 {