mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 06:45:17 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ofp-parse.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2011, 2012 Nicira, Inc.
* Copyright (c) 2010, 2011, 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.
@@ -22,6 +22,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include "compiler.h"
struct flow;
struct ofpbuf;
@@ -30,26 +31,31 @@ struct ofputil_flow_monitor_request;
struct ofputil_flow_stats_request;
struct ofputil_meter_mod;
void parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
bool verbose);
char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_)
WARN_UNUSED_RESULT;
void parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
uint16_t command, bool verbose);
void parse_ofp_flow_mod_file(const char *file_name, uint16_t command,
struct ofputil_flow_mod **fms, size_t *n_fms);
char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
uint16_t command)
WARN_UNUSED_RESULT;
char *parse_ofp_flow_mod_file(const char *file_name, uint16_t command,
struct ofputil_flow_mod **fms, size_t *n_fms)
WARN_UNUSED_RESULT;
void parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
bool aggregate, const char *string);
char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
bool aggregate, const char *string)
WARN_UNUSED_RESULT;
void parse_ofpacts(const char *, struct ofpbuf *ofpacts);
char *parse_ofpacts(const char *, struct ofpbuf *ofpacts)
WARN_UNUSED_RESULT;
char *parse_ofp_exact_flow(struct flow *, const char *);
void parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string,
int command, bool verbose);
char *parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string,
int command)
WARN_UNUSED_RESULT;
void parse_flow_monitor_request(struct ofputil_flow_monitor_request *,
const char *);
char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *,
const char *)
WARN_UNUSED_RESULT;
#endif /* ofp-parse.h */