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
ofproto: Querying port stats for individual ports (OpenFlow 1.0)
[sliver-openvswitch.git]
/
extras
/
ezio
/
ovs-switchui.c
diff --git
a/extras/ezio/ovs-switchui.c
b/extras/ezio/ovs-switchui.c
index
040bc70
..
6656ae3
100644
(file)
--- a/
extras/ezio/ovs-switchui.c
+++ b/
extras/ezio/ovs-switchui.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* Copyright (c) 2008, 2009
, 2010
Nicira Networks, Inc.
*
* 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.
@@
-114,7
+114,7
@@
static void compose_messages(const struct dict *, struct rconn *rconn);
static void show_flows(struct rconn *);
static void show_dpid_ip(struct rconn *, const struct dict *);
static void show_flows(struct rconn *);
static void show_dpid_ip(struct rconn *, const struct dict *);
-static void show_
secchan
_state(const struct dict *);
+static void show_
ofproto
_state(const struct dict *);
static void show_fail_open_state(const struct dict *);
static void show_discovery_state(const struct dict *);
static void show_remote_state(const struct dict *);
static void show_fail_open_state(const struct dict *);
static void show_discovery_state(const struct dict *);
static void show_remote_state(const struct dict *);
@@
-257,7
+257,7
@@
compose_messages(const struct dict *dict, struct rconn *rconn)
if (!show_reboot_state()) {
show_flows(rconn);
show_dpid_ip(rconn, dict);
if (!show_reboot_state()) {
show_flows(rconn);
show_dpid_ip(rconn, dict);
- show_
secchan
_state(dict);
+ show_
ofproto
_state(dict);
show_fail_open_state(dict);
show_discovery_state(dict);
show_remote_state(dict);
show_fail_open_state(dict);
show_discovery_state(dict);
show_remote_state(dict);
@@
-648,7
+648,7
@@
addf(const char *format, ...)
}
static void
}
static void
-show_
secchan
_state(const struct dict *dict)
+show_
ofproto
_state(const struct dict *dict)
{
static struct message *msg;
const char *is_connected;
{
static struct message *msg;
const char *is_connected;
@@
-1104,6
+1104,7
@@
do_show_data_rates(void *rates_)
}
if (!rates->xid) {
struct ofp_stats_request *rq;
}
if (!rates->xid) {
struct ofp_stats_request *rq;
+ struct ofp_port_stats_request *psr;
struct ofpbuf *b;
rates->xid = random_uint32();
struct ofpbuf *b;
rates->xid = random_uint32();
@@
-1111,6
+1112,10
@@
do_show_data_rates(void *rates_)
rates->xid, &b);
rq->type = htons(OFPST_PORT);
rq->flags = htons(0);
rates->xid, &b);
rq->type = htons(OFPST_PORT);
rq->flags = htons(0);
+ psr = ofbuf_put_uninit(b, sizeof *psr);
+ memset(psr, 0, sizeof *psr);
+ psr->port_no = htons(OFPP_NONE);
+ update_openflow_length(b);
rconn_send_with_limit(rates->rconn, b, counter, 10);
}
rconn_send_with_limit(rates->rconn, b, counter, 10);
}
@@
-1486,7
+1491,7
@@
static int menu_show(const struct menu *, int start, bool select);
static void cmd_shell(const struct dict *);
static void cmd_show_version(const struct dict *);
static void cmd_configure(const struct dict *);
static void cmd_shell(const struct dict *);
static void cmd_show_version(const struct dict *);
static void cmd_configure(const struct dict *);
-static void cmd_setup_pki(const struct dict *);
+static void cmd_set
_
up_pki(const struct dict *);
static void cmd_browse_status(const struct dict *);
static void cmd_show_motto(const struct dict *);
static void cmd_browse_status(const struct dict *);
static void cmd_show_motto(const struct dict *);
@@
-1542,7
+1547,7
@@
menu(const struct dict *dict)
menu_add_item(&menu, "Exit");
menu_add_item(&menu, "Show Version")->f = cmd_show_version;
menu_add_item(&menu, "Configure")->f = cmd_configure;
menu_add_item(&menu, "Exit");
menu_add_item(&menu, "Show Version")->f = cmd_show_version;
menu_add_item(&menu, "Configure")->f = cmd_configure;
- menu_add_item(&menu, "Set
up PKI")->f = cmd_set
up_pki;
+ menu_add_item(&menu, "Set
up PKI")->f = cmd_set_
up_pki;
if (debug_mode) {
menu_add_item(&menu, "Browse Status")->f = cmd_browse_status;
menu_add_item(&menu, "Shell")->f = cmd_shell;
if (debug_mode) {
menu_add_item(&menu, "Browse Status")->f = cmd_browse_status;
menu_add_item(&menu, "Shell")->f = cmd_shell;
@@
-2480,7
+2485,7
@@
choose_netdevs(struct svec *choices)
retval = netdev_open(name, NETDEV_ETH_TYPE_NONE, &netdev);
if (!retval) {
retval = netdev_open(name, NETDEV_ETH_TYPE_NONE, &netdev);
if (!retval) {
- bool exclude = netdev_get_in4(netdev, NULL
)
;
+ bool exclude = netdev_get_in4(netdev, NULL
, NULL) == 0
;
netdev_close(netdev);
if (exclude) {
continue;
netdev_close(netdev);
if (exclude) {
continue;
@@
-2801,7
+2806,8
@@
cmd_configure(const struct dict *dict UNUSED)
out = prompt("Ctlr rate limit:", in,
"^(Disabled|("NUM100_TO_99999_RE")/s)$");
free(in);
out = prompt("Ctlr rate limit:", in,
"^(Disabled|("NUM100_TO_99999_RE")/s)$");
free(in);
- config.rate_limit = isdigit(out[0]) ? atoi(out) : -1;
+ config.rate_limit
+ = isdigit((unsigned char)out[0]) ? atoi(out) : -1;
free(out);
break;
free(out);
break;
@@
-2812,7
+2818,8
@@
cmd_configure(const struct dict *dict UNUSED)
out = prompt("Activity probe:", in,
"^(Default|("NUM5_TO_99999_RE") s)$");
free(in);
out = prompt("Activity probe:", in,
"^(Default|("NUM5_TO_99999_RE") s)$");
free(in);
- config.inactivity_probe = isdigit(out[0]) ? atoi(out) : -1;
+ config.inactivity_probe
+ = isdigit((unsigned char)out[0]) ? atoi(out) : -1;
free(out);
break;
free(out);
break;
@@
-2823,7
+2830,8
@@
cmd_configure(const struct dict *dict UNUSED)
out = prompt("Max backoff:", in,
"^(Default|("NUM1_TO_99999_RE") s)$");
free(in);
out = prompt("Max backoff:", in,
"^(Default|("NUM1_TO_99999_RE") s)$");
free(in);
- config.max_backoff = isdigit(out[0]) ? atoi(out) : -1;
+ config.max_backoff
+ = isdigit((unsigned char)out[0]) ? atoi(out) : -1;
free(out);
break;
}
free(out);
break;
}
@@
-2886,7
+2894,7
@@
cmd_configure(const struct dict *dict UNUSED)
}
static void
}
static void
-cmd_setup_pki(const struct dict *dict UNUSED)
+cmd_set
_
up_pki(const struct dict *dict UNUSED)
{
static const char def_privkey_file[]
= "/etc/openflow-switch/of0-privkey.pem";
{
static const char def_privkey_file[]
= "/etc/openflow-switch/of0-privkey.pem";