projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random: Get random seed from /dev/urandom.
[openvswitch]
/
utilities
/
ovs-dpctl.c
diff --git
a/utilities/ovs-dpctl.c
b/utilities/ovs-dpctl.c
index fceab4c1aafa78e5cd4e75c7f5accfe0813ddde4..fe44f27e26f0f5912b382c04e43b1cb0c88c9cdf 100644
(file)
--- a/
utilities/ovs-dpctl.c
+++ b/
utilities/ovs-dpctl.c
@@
-19,6
+19,7
@@
#include <errno.h>
#include <getopt.h>
#include <inttypes.h>
#include <errno.h>
#include <getopt.h>
#include <inttypes.h>
+#include <sys/socket.h>
#include <net/if.h>
#include <netinet/in.h>
#include <signal.h>
#include <net/if.h>
#include <netinet/in.h>
#include <signal.h>
@@
-39,9
+40,9
@@
#include "svec.h"
#include "timeval.h"
#include "util.h"
#include "svec.h"
#include "timeval.h"
#include "util.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_dpctl
+
+VLOG_DEFINE_THIS_MODULE(dpctl)
static const struct command all_commands[];
static const struct command all_commands[];
@@
-52,8
+53,6
@@
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
@@
-63,11
+62,15
@@
main(int argc, char *argv[])
static void
parse_options(int argc, char *argv[])
{
static void
parse_options(int argc, char *argv[])
{
+ enum {
+ OPT_DUMMY = UCHAR_MAX + 1,
+ VLOG_OPTION_ENUMS
+ };
static struct option long_options[] = {
{"timeout", required_argument, 0, 't'},
static struct option long_options[] = {
{"timeout", required_argument, 0, 't'},
- {"verbose", optional_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
+ VLOG_LONG_OPTIONS,
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
@@
-99,9
+102,7
@@
parse_options(int argc, char *argv[])
OVS_PRINT_VERSION(0, 0);
exit(EXIT_SUCCESS);
OVS_PRINT_VERSION(0, 0);
exit(EXIT_SUCCESS);
- case 'v':
- vlog_set_verbosity(optarg);
- break;
+ VLOG_OPTION_HANDLERS
case '?':
exit(EXIT_FAILURE);
case '?':
exit(EXIT_FAILURE);
@@
-194,7
+195,7
@@
parsed_dpif_open(const char *arg_, bool create, struct dpif **dpifp)
}
static void
}
static void
-do_add_dp(int argc UNUSED, char *argv[])
+do_add_dp(int argc
OVS_
UNUSED, char *argv[])
{
struct dpif *dpif;
run(parsed_dpif_open(argv[1], true, &dpif), "add_dp");
{
struct dpif *dpif;
run(parsed_dpif_open(argv[1], true, &dpif), "add_dp");
@@
-205,7
+206,7
@@
do_add_dp(int argc UNUSED, char *argv[])
}
static void
}
static void
-do_del_dp(int argc UNUSED, char *argv[])
+do_del_dp(int argc
OVS_
UNUSED, char *argv[])
{
struct dpif *dpif;
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");
{
struct dpif *dpif;
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");
@@
-229,7
+230,7
@@
query_ports(struct dpif *dpif, struct odp_port **ports, size_t *n_ports)
}
static void
}
static void
-do_add_if(int argc UNUSED, char *argv[])
+do_add_if(int argc
OVS_
UNUSED, char *argv[])
{
bool failure = false;
struct dpif *dpif;
{
bool failure = false;
struct dpif *dpif;
@@
-307,7
+308,7
@@
get_port_number(struct dpif *dpif, const char *name, uint16_t *port)
}
static void
}
static void
-do_del_if(int argc UNUSED, char *argv[])
+do_del_if(int argc
OVS_
UNUSED, char *argv[])
{
bool failure = false;
struct dpif *dpif;
{
bool failure = false;
struct dpif *dpif;
@@
-416,7
+417,7
@@
do_show(int argc, char *argv[])
}
static void
}
static void
-do_dump_dps(int argc
UNUSED, char *argv[]
UNUSED)
+do_dump_dps(int argc
OVS_UNUSED, char *argv[] OVS_
UNUSED)
{
struct svec dpif_names, dpif_types;
unsigned int i;
{
struct svec dpif_names, dpif_types;
unsigned int i;
@@
-452,7
+453,7
@@
do_dump_dps(int argc UNUSED, char *argv[] UNUSED)
}
static void
}
static void
-do_dump_flows(int argc UNUSED, char *argv[])
+do_dump_flows(int argc
OVS_
UNUSED, char *argv[])
{
struct odp_flow *flows;
struct dpif *dpif;
{
struct odp_flow *flows;
struct dpif *dpif;
@@
-471,18
+472,18
@@
do_dump_flows(int argc UNUSED, char *argv[])
f->actions = actions;
f->n_actions = MAX_ACTIONS;
f->actions = actions;
f->n_actions = MAX_ACTIONS;
- dpif_flow_get(dpif, f);
-
-
ds_clear(&ds
);
-
format_odp_flow(&ds, f
);
- printf("%s\n", ds_cstr(&ds));
+ if (!dpif_flow_get(dpif, f)) {
+ ds_clear(&ds);
+
format_odp_flow(&ds, f
);
+
printf("%s\n", ds_cstr(&ds)
);
+ }
}
ds_destroy(&ds);
dpif_close(dpif);
}
static void
}
ds_destroy(&ds);
dpif_close(dpif);
}
static void
-do_del_flows(int argc UNUSED, char *argv[])
+do_del_flows(int argc
OVS_
UNUSED, char *argv[])
{
struct dpif *dpif;
{
struct dpif *dpif;
@@
-492,7
+493,7
@@
do_del_flows(int argc UNUSED, char *argv[])
}
static void
}
static void
-do_dump_groups(int argc UNUSED, char *argv[])
+do_dump_groups(int argc
OVS_
UNUSED, char *argv[])
{
struct odp_stats stats;
struct dpif *dpif;
{
struct odp_stats stats;
struct dpif *dpif;
@@
-519,7
+520,7
@@
do_dump_groups(int argc UNUSED, char *argv[])
}
static void
}
static void
-do_help(int argc
UNUSED, char *argv[]
UNUSED)
+do_help(int argc
OVS_UNUSED, char *argv[] OVS_
UNUSED)
{
usage();
}
{
usage();
}