X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=secchan%2Fofproto.c;h=19baab9ba42918ce259d2d3548509ac6fe20c42e;hb=f9fb1858ef9f5c85863b320638b07af8043d1e5a;hp=aa9e44a1baef453773098260975f1687918c5f84;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=openvswitch diff --git a/secchan/ofproto.c b/secchan/ofproto.c index aa9e44a1..19baab9b 100644 --- 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); - 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; @@ -431,8 +431,9 @@ ofproto_set_in_band(struct ofproto *p, bool 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); @@ -635,6 +636,12 @@ ofproto_get_datapath_id(const struct ofproto *ofproto) return ofproto->datapath_id; } +uint64_t +ofproto_get_mgmt_id(const struct ofproto *ofproto) +{ + return ofproto->mgmt_id; +} + int ofproto_get_probe_interval(const struct ofproto *ofproto) {