OFP_VERSION_OPTION_ENUMS,
VLOG_OPTION_ENUMS
};
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"timeout", required_argument, NULL, 't'},
{"strict", no_argument, NULL, OPT_STRICT},
{"readd", no_argument, NULL, OPT_READD},
return error;
}
+enum open_target { MGMT, SNOOP };
+
static enum ofputil_protocol
-open_vconn__(const char *name, const char *default_suffix,
+open_vconn__(const char *name, enum open_target target,
struct vconn **vconnp)
{
+ const char *suffix = target == MGMT ? "mgmt" : "snoop";
char *datapath_name, *datapath_type, *socket_name;
enum ofputil_protocol protocol;
char *bridge_path;
int ofp_version;
int error;
- bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, default_suffix);
+ bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, suffix);
ofproto_parse_name(name, &datapath_name, &datapath_type);
- socket_name = xasprintf("%s/%s.%s",
- ovs_rundir(), datapath_name, default_suffix);
+ socket_name = xasprintf("%s/%s.%s", ovs_rundir(), datapath_name, suffix);
free(datapath_name);
free(datapath_type);
if (strchr(name, ':')) {
- run(vconn_open_block(name, get_allowed_ofp_versions(), DSCP_DEFAULT,
- vconnp),
+ run(vconn_open(name, get_allowed_ofp_versions(), DSCP_DEFAULT, vconnp),
"connecting to %s", name);
} else if (!open_vconn_socket(name, vconnp)) {
/* Fall Through. */
ovs_fatal(0, "%s is not a bridge or a socket", name);
}
+ if (target == SNOOP) {
+ vconn_set_recv_any_version(*vconnp);
+ }
+
free(bridge_path);
free(socket_name);
static enum ofputil_protocol
open_vconn(const char *name, struct vconn **vconnp)
{
- return open_vconn__(name, "mgmt", vconnp);
+ return open_vconn__(name, MGMT, vconnp);
}
static void
if (timestamp) {
time_t now = time_wall();
+ struct tm tm;
char s[32];
- strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", gmtime(&now));
+ strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ",
+ gmtime_r(&now, &tm));
fputs(s, stderr);
}
{
struct vconn *vconn;
- open_vconn__(argv[1], "snoop", &vconn);
+ open_vconn__(argv[1], SNOOP, &vconn);
monitor_vconn(vconn);
}
break;
}
}
- ovs_assert(IS_POW2(protocol));
+ ovs_assert(is_pow2(protocol));
printf("chosen protocol: %s\n", ofputil_protocol_to_string(protocol));