git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: New functions hton_ofp_phy_port(), ntoh_ofp_phy_port().
[sliver-openvswitch.git]
/
ofproto
/
discovery.c
diff --git
a/ofproto/discovery.c
b/ofproto/discovery.c
index
2868db5
..
1a9bb58
100644
(file)
--- a/
ofproto/discovery.c
+++ b/
ofproto/discovery.c
@@
-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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,23
+18,26
@@
#include "discovery.h"
#include <errno.h>
#include <inttypes.h>
#include "discovery.h"
#include <errno.h>
#include <inttypes.h>
+#include <sys/socket.h>
#include <net/if.h>
#include <regex.h>
#include <stdlib.h>
#include <string.h>
#include "dhcp-client.h"
#include "dhcp.h"
#include <net/if.h>
#include <regex.h>
#include <stdlib.h>
#include <string.h>
#include "dhcp-client.h"
#include "dhcp.h"
-#include "dpif.h"
#include "netdev.h"
#include "openflow/openflow.h"
#include "packets.h"
#include "status.h"
#include "netdev.h"
#include "openflow/openflow.h"
#include "packets.h"
#include "status.h"
-#include "vconn-ssl.h"
+#include "stream-ssl.h"
+#include "wdp.h"
+#include "xfif.h"
#define THIS_MODULE VLM_discovery
#include "vlog.h"
struct discovery {
#define THIS_MODULE VLM_discovery
#include "vlog.h"
struct discovery {
+ char *dpif_name;
char *re;
bool update_resolv_conf;
regex_t *regex;
char *re;
bool update_resolv_conf;
regex_t *regex;
@@
-95,14
+98,16
@@
discovery_status_cb(struct status_reply *sr, void *d_)
int
discovery_create(const char *re, bool update_resolv_conf,
int
discovery_create(const char *re, bool update_resolv_conf,
- struct
dpif *dpif
, struct switch_status *ss,
+ struct
wdp *wdp
, struct switch_status *ss,
struct discovery **discoveryp)
{
struct discovery *d;
struct discovery **discoveryp)
{
struct discovery *d;
- char
local_name[IF_NAMESIZE]
;
+ char
*local_name
;
int error;
int error;
- d = xcalloc(1, sizeof *d);
+ d = xzalloc(sizeof *d);
+
+ d->dpif_name = xstrdup(wdp_base_name(wdp));
/* Controller regular expression. */
error = discovery_set_accept_controller_re(d, re);
/* Controller regular expression. */
error = discovery_set_accept_controller_re(d, re);
@@
-112,16
+117,18
@@
discovery_create(const char *re, bool update_resolv_conf,
d->update_resolv_conf = update_resolv_conf;
/* Initialize DHCP client. */
d->update_resolv_conf = update_resolv_conf;
/* Initialize DHCP client. */
- error = dpif_port_get_name(dpif, ODPP_LOCAL,
- local_name, sizeof local_name);
+ error = wdp_port_get_name(wdp, OFPP_LOCAL, &local_name);
if (error) {
if (error) {
- VLOG_ERR("failed to query datapath local port: %s", strerror(error));
+ VLOG_ERR("%s: failed to query datapath local port: %s",
+ d->dpif_name, strerror(error));
goto error_regfree;
}
error = dhclient_create(local_name, modify_dhcp_request,
validate_dhcp_offer, d, &d->dhcp);
goto error_regfree;
}
error = dhclient_create(local_name, modify_dhcp_request,
validate_dhcp_offer, d, &d->dhcp);
+ free(local_name);
if (error) {
if (error) {
- VLOG_ERR("failed to initialize DHCP client: %s", strerror(error));
+ VLOG_ERR("%s: failed to initialize DHCP client: %s",
+ d->dpif_name, strerror(error));
goto error_regfree;
}
dhclient_set_max_timeout(d->dhcp, 3);
goto error_regfree;
}
dhclient_set_max_timeout(d->dhcp, 3);
@@
-137,6
+144,7
@@
error_regfree:
regfree(d->regex);
free(d->regex);
error_free:
regfree(d->regex);
free(d->regex);
error_free:
+ free(d->dpif_name);
free(d);
*discoveryp = 0;
return error;
free(d);
*discoveryp = 0;
return error;
@@
-151,10
+159,17
@@
discovery_destroy(struct discovery *d)
free(d->regex);
dhclient_destroy(d->dhcp);
switch_status_unregister(d->ss_cat);
free(d->regex);
dhclient_destroy(d->dhcp);
switch_status_unregister(d->ss_cat);
+ free(d->dpif_name);
free(d);
}
}
free(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)
void
discovery_set_update_resolv_conf(struct discovery *d,
bool update_resolv_conf)
@@
-162,6
+177,12
@@
discovery_set_update_resolv_conf(struct discovery *d,
d->update_resolv_conf = update_resolv_conf;
}
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_)
{
int
discovery_set_accept_controller_re(struct discovery *d, const char *re_)
{
@@
-169,7
+190,7
@@
discovery_set_accept_controller_re(struct discovery *d, const char *re_)
int error;
char *re;
int error;
char *re;
- re = (!re_ ? xstrdup(
vconn
_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*")
+ re = (!re_ ? xstrdup(
stream
_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*")
: re_[0] == '^' ? xstrdup(re_) : xasprintf("^%s", re_));
regex = xmalloc(sizeof *regex);
error = regcomp(regex, re, REG_NOSUB | REG_EXTENDED);
: re_[0] == '^' ? xstrdup(re_) : xasprintf("^%s", re_));
regex = xmalloc(sizeof *regex);
error = regcomp(regex, re, REG_NOSUB | REG_EXTENDED);
@@
-177,7
+198,7
@@
discovery_set_accept_controller_re(struct discovery *d, const char *re_)
size_t length = regerror(error, regex, NULL, 0);
char *buffer = xmalloc(length);
regerror(error, regex, buffer, length);
size_t length = regerror(error, regex, NULL, 0);
char *buffer = xmalloc(length);
regerror(error, regex, buffer, length);
- VLOG_WARN("%s: %s
"
, re, buffer);
+ VLOG_WARN("%s: %s
: %s", d->dpif_name
, re, buffer);
free(regex);
free(re);
return EINVAL;
free(regex);
free(re);
return EINVAL;
@@
-223,12
+244,14
@@
discovery_run(struct discovery *d, char **controller_name)
if (dhclient_is_bound(d->dhcp)) {
*controller_name = dhcp_msg_get_string(dhclient_get_config(d->dhcp),
DHCP_CODE_OFP_CONTROLLER_VCONN);
if (dhclient_is_bound(d->dhcp)) {
*controller_name = dhcp_msg_get_string(dhclient_get_config(d->dhcp),
DHCP_CODE_OFP_CONTROLLER_VCONN);
- VLOG_INFO("%s: discovered controller", *controller_name);
+ VLOG_INFO("%s: discovered controller %s",
+ d->dpif_name, *controller_name);
d->n_changes++;
} else {
*controller_name = NULL;
if (d->n_changes) {
d->n_changes++;
} else {
*controller_name = NULL;
if (d->n_changes) {
- VLOG_INFO("discovered controller no longer available");
+ VLOG_INFO("%s: discovered controller no longer available",
+ d->dpif_name);
d->n_changes++;
}
}
d->n_changes++;
}
}
@@
-244,7
+267,7
@@
discovery_wait(struct discovery *d)
}
static void
}
static void
-modify_dhcp_request(struct dhcp_msg *msg, void *aux UNUSED)
+modify_dhcp_request(struct dhcp_msg *msg, void *aux
OVS_
UNUSED)
{
dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, "OpenFlow");
}
{
dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, "OpenFlow");
}
@@
-258,13
+281,14
@@
validate_dhcp_offer(const struct dhcp_msg *msg, void *d_)
vconn_name = dhcp_msg_get_string(msg, DHCP_CODE_OFP_CONTROLLER_VCONN);
if (!vconn_name) {
vconn_name = dhcp_msg_get_string(msg, DHCP_CODE_OFP_CONTROLLER_VCONN);
if (!vconn_name) {
- VLOG_WARN_RL(&rl, "rejecting DHCP offer missing controller vconn");
+ VLOG_WARN_RL(&rl, "%s: rejecting DHCP offer missing controller vconn",
+ d->dpif_name);
return false;
}
accept = !regexec(d->regex, vconn_name, 0, NULL, 0);
if (!accept) {
return false;
}
accept = !regexec(d->regex, vconn_name, 0, NULL, 0);
if (!accept) {
- VLOG_WARN_RL(&rl, "
rejecting controller vconn that fails to match %s",
- d->re);
+ VLOG_WARN_RL(&rl, "
%s: rejecting controller vconn that fails to "
+
"match %s", d->dpif_name,
d->re);
}
free(vconn_name);
return accept;
}
free(vconn_name);
return accept;