projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Remove unused and write-only members of 'struct bridge'.
[openvswitch]
/
extras
/
ezio
/
ovs-switchui.c
diff --git
a/extras/ezio/ovs-switchui.c
b/extras/ezio/ovs-switchui.c
index 365a708b0294e94394eb4ec20d4eca2d85451664..af74af56d5705f8006874f288c1b34e157c2342c 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.
@@
-144,6
+144,7
@@
main(int argc, char *argv[])
long long int last_key_time = 0;
int repeat_count = 0;
long long int last_key_time = 0;
int repeat_count = 0;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
time_init();
vlog_init();
set_program_name(argv[0]);
time_init();
vlog_init();
@@
-159,13
+160,14
@@
main(int argc, char *argv[])
"use --help for help");
}
"use --help for help");
}
- rconn = rconn_new(argv[0], 5, 5);
+ rconn = rconn_create(5, 5);
+ rconn_connect(rconn, argv[0], NULL);
die_if_already_running();
daemonize();
initialize_terminal();
die_if_already_running();
daemonize();
initialize_terminal();
- fatal_signal_add_hook(restore_terminal, NULL, true);
+ fatal_signal_add_hook(restore_terminal, NULL,
NULL,
true);
msg = NULL;
countdown = 0;
msg = NULL;
countdown = 0;
@@
-241,7
+243,7
@@
main(int argc, char *argv[])
refresh();
poll_fd_wait(STDIN_FILENO, POLLIN);
refresh();
poll_fd_wait(STDIN_FILENO, POLLIN);
- poll_timer_wait
(timeout - time_msec()
);
+ poll_timer_wait
_until(timeout
);
poll_block();
} while (time_msec() < timeout);
age_messages();
poll_block();
} while (time_msec() < timeout);
age_messages();
@@
-867,7
+869,7
@@
fetch_status(struct rconn *rconn, struct dict *dict, long long timeout)
rconn_run_wait(rconn);
rconn_recv_wait(rconn);
rconn_run_wait(rconn);
rconn_recv_wait(rconn);
- poll_timer_wait
(timeout - time_msec()
);
+ poll_timer_wait
_until(timeout
);
poll_block();
}
}
poll_block();
}
}
@@
-995,7
+997,7
@@
initialize_terminal(void)
}
static void
}
static void
-restore_terminal(void *aux UNUSED)
+restore_terminal(void *aux
OVS_
UNUSED)
{
endwin();
}
{
endwin();
}
@@
-1104,6
+1106,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
+1114,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 = ofpbuf_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);
}
@@
-1444,7
+1451,7
@@
init_reboot_notifier(void)
}
static void
}
static void
-sigusr1_handler(int signr UNUSED)
+sigusr1_handler(int signr
OVS_
UNUSED)
{
sigusr1_triggered = true;
}
{
sigusr1_triggered = true;
}
@@
-1708,7
+1715,7
@@
menu_show(const struct menu *menu, int start, bool select)
refresh();
if (pos < min || pos > max) {
refresh();
if (pos < min || pos > max) {
- poll_timer_wait
(adjust - time_msec()
);
+ poll_timer_wait
_until(adjust
);
}
poll_fd_wait(STDIN_FILENO, POLLIN);
poll_block();
}
poll_fd_wait(STDIN_FILENO, POLLIN);
poll_block();
@@
-1874,7
+1881,7
@@
yesno(const char *title, bool def)
}
static void
}
static void
-cmd_show_version(const struct dict *dict UNUSED)
+cmd_show_version(const struct dict *dict
OVS_
UNUSED)
{
show_string(VERSION BUILDNR);
}
{
show_string(VERSION BUILDNR);
}
@@
-1895,7
+1902,7
@@
cmd_browse_status(const struct dict *dict)
}
static void
}
static void
-cmd_shell(const struct dict *dict UNUSED)
+cmd_shell(const struct dict *dict
OVS_
UNUSED)
{
const char *home;
{
const char *home;
@@
-1919,7
+1926,7
@@
cmd_shell(const struct dict *dict UNUSED)
}
static void
}
static void
-cmd_show_motto(const struct dict *dict UNUSED)
+cmd_show_motto(const struct dict *dict
OVS_
UNUSED)
{
show_string("\"Just Add Ice\"");
}
{
show_string("\"Just Add Ice\"");
}
@@
-1940,7
+1947,7
@@
static void
block_until(long long timeout)
{
while (timeout > time_msec()) {
block_until(long long timeout)
{
while (timeout > time_msec()) {
- poll_timer_wait
(timeout - time_msec()
);
+ poll_timer_wait
_until(timeout
);
poll_block();
}
drain_keyboard_buffer();
poll_block();
}
drain_keyboard_buffer();
@@
-2457,7
+2464,7
@@
abbreviate_netdevs(const struct svec *netdevs, struct ds *abbrev)
static void
choose_netdevs(struct svec *choices)
{
static void
choose_netdevs(struct svec *choices)
{
- struct svec netdevs;
+ struct svec netdevs
= SVEC_EMPTY_INITIALIZER
;
struct menu menu;
size_t i;
struct menu menu;
size_t i;
@@
-2547,7
+2554,7
@@
disconnected_string(int value)
}
static void
}
static void
-cmd_configure(const struct dict *dict UNUSED)
+cmd_configure(const struct dict *dict
OVS_
UNUSED)
{
bool debug_mode = dict_get_bool(dict, "debug", false);
struct dict config_dict;
{
bool debug_mode = dict_get_bool(dict, "debug", false);
struct dict config_dict;
@@
-2889,7
+2896,7
@@
cmd_configure(const struct dict *dict UNUSED)
}
static void
}
static void
-cmd_set_up_pki(const struct dict *dict UNUSED)
+cmd_set_up_pki(const struct dict *dict
OVS_
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";