2
0
mirror of https://github.com/openvswitch/ovs synced 2025-10-23 14:57:06 +00:00

ofp-parse: Do not exit() upon a parse error.

Until now, failure to parse a flow in the ofp-parse module has caused the
program to abort immediately with a fatal error.  This makes it hard to
use these functions from any long-lived program.  This commit fixes the
problem.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2013-07-08 10:15:00 -07:00
parent 5ed2d819bb
commit bdda5aca7b
20 changed files with 991 additions and 456 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2012 Nicira, Inc.
* Copyright (c) 2010, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ main(int argc, char *argv[])
enum { MP_MAX_LINKS = 63 };
struct ofpact_multipath mp;
bool ok = true;
char *error;
int n;
set_program_name(argv[0]);
@@ -44,7 +45,11 @@ main(int argc, char *argv[])
ovs_fatal(0, "usage: %s multipath_action", program_name);
}
multipath_parse(&mp, argv[1]);
error = multipath_parse(&mp, argv[1]);
if (error) {
ovs_fatal(0, "%s", error);
}
for (n = 1; n <= MP_MAX_LINKS; n++) {
enum { N_FLOWS = 65536 };
double disruption, perfect, distribution;