X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-version-opt.c;h=46fb45a4de3d3d4edd74cd6a92a6055bc67a9d67;hb=6d308b28c023e864925b1a6775b3b91d215e89bf;hp=35d79e671d08a23f8a10a6e0f744ea17eabf8115;hpb=37923ac734a8b8bdb4da2fe77a24d77d487dc056;p=sliver-openvswitch.git diff --git a/lib/ofp-version-opt.c b/lib/ofp-version-opt.c index 35d79e671..46fb45a4d 100644 --- a/lib/ofp-version-opt.c +++ b/lib/ofp-version-opt.c @@ -1,10 +1,8 @@ #include +#include "dynamic-string.h" #include "ofp-util.h" #include "ofp-version-opt.h" -#include "vlog.h" -#include "dynamic-string.h" - -VLOG_DEFINE_THIS_MODULE(ofp_version); +#include "ovs-thread.h" static uint32_t allowed_versions = 0; @@ -17,12 +15,14 @@ get_allowed_ofp_versions(void) void set_allowed_ofp_versions(const char *string) { + assert_single_threaded(); allowed_versions = ofputil_versions_from_string(string); } void mask_allowed_ofp_versions(uint32_t bitmap) { + assert_single_threaded(); allowed_versions &= bitmap; } @@ -33,9 +33,9 @@ ofp_version_usage(void) ofputil_format_version_bitmap_names(&msg, OFPUTIL_DEFAULT_VERSIONS); printf( - "\nOpen Flow Version options:\n" + "\nOpenFlow version options:\n" " -V, --version display version information\n" - " -O, --protocols set allowed Open Flow versions\n" + " -O, --protocols set allowed OpenFlow versions\n" " (default: %s)\n", ds_cstr(&msg)); ds_destroy(&msg);