projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce default probe interval to 5 seconds (and fail-open timeout to 15).
[openvswitch]
/
secchan
/
ofproto.c
diff --git
a/secchan/ofproto.c
b/secchan/ofproto.c
index e6c384103bf57aa4f9d6c613165c399156b1e913..19baab9ba42918ce259d2d3548509ac6fe20c42e 100644
(file)
--- a/
secchan/ofproto.c
+++ b/
secchan/ofproto.c
@@
-333,7
+333,7
@@
ofproto_create(const char *datapath, const struct ofhooks *ofhooks, void *aux,
/* Initialize OpenFlow connections. */
list_init(&p->all_conns);
/* Initialize OpenFlow connections. */
list_init(&p->all_conns);
- p->controller = ofconn_create(p, rconn_create(
15, 15
));
+ p->controller = ofconn_create(p, rconn_create(
5, 8
));
p->controller->pktbuf = pktbuf_create();
p->controller->miss_send_len = OFP_DEFAULT_MISS_SEND_LEN;
p->listeners = NULL;
p->controller->pktbuf = pktbuf_create();
p->controller->miss_send_len = OFP_DEFAULT_MISS_SEND_LEN;
p->listeners = NULL;
@@
-431,8
+431,9
@@
ofproto_set_in_band(struct ofproto *p, bool in_band)
{
if (in_band != (p->in_band != NULL)) {
if (in_band) {
{
if (in_band != (p->in_band != NULL)) {
if (in_band) {
- return in_band_create(p, &p->dpif, p->switch_status,
- p->controller->rconn, &p->in_band);
+ in_band_create(p, p->switch_status, p->controller->rconn,
+ &p->in_band);
+ return 0;
} else {
ofproto_set_discovery(p, false, NULL, true);
in_band_destroy(p->in_band);
} else {
ofproto_set_discovery(p, false, NULL, true);
in_band_destroy(p->in_band);