diff options
author | Mehak Mahajan <mmahajan@nicira.com> | 2012-03-10 15:58:10 -0800 |
---|---|---|
committer | Mehak Mahajan <mmahajan@nicira.com> | 2012-03-23 18:13:08 -0700 |
commit | f125905cdd3dc0339ad968c0a70128807884b400 (patch) | |
tree | ab389d41b625f2d9e5c820bdac80ec2df825ff8a /ovsdb | |
parent | 11460e2316b88f0bd0ea0005d94338d800ea16bd (diff) |
Allow configuring DSCP on controller and manager connections.
The changes allow the user to specify a separate dscp value for the
controller connection and the manager connection. The value will take
effect on resetting the connections. If no value is specified a default
value of 192 is chosen for each of the connections.
Feature #10074
Requested-by: Rajiv Ramanathan <rramanathan@nicira.com>
Signed-off-by: Mehak Mahajan <mmahajan@nicira.com>
Diffstat (limited to 'ovsdb')
-rw-r--r-- | ovsdb/jsonrpc-server.c | 12 | ||||
-rw-r--r-- | ovsdb/jsonrpc-server.h | 1 | ||||
-rw-r--r-- | ovsdb/ovsdb-client.c | 5 | ||||
-rw-r--r-- | ovsdb/ovsdb-server.c | 51 |
4 files changed, 62 insertions, 7 deletions
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 147dadc7..9e6ed257 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -98,7 +98,9 @@ struct ovsdb_jsonrpc_remote { }; static struct ovsdb_jsonrpc_remote *ovsdb_jsonrpc_server_add_remote( - struct ovsdb_jsonrpc_server *, const char *name); + struct ovsdb_jsonrpc_server *, const char *name, + const struct ovsdb_jsonrpc_options *options +); static void ovsdb_jsonrpc_server_del_remote(struct shash_node *); struct ovsdb_jsonrpc_server * @@ -156,7 +158,7 @@ ovsdb_jsonrpc_server_set_remotes(struct ovsdb_jsonrpc_server *svr, remote = shash_find_data(&svr->remotes, node->name); if (!remote) { - remote = ovsdb_jsonrpc_server_add_remote(svr, node->name); + remote = ovsdb_jsonrpc_server_add_remote(svr, node->name, options); if (!remote) { continue; } @@ -168,13 +170,14 @@ ovsdb_jsonrpc_server_set_remotes(struct ovsdb_jsonrpc_server *svr, static struct ovsdb_jsonrpc_remote * ovsdb_jsonrpc_server_add_remote(struct ovsdb_jsonrpc_server *svr, - const char *name) + const char *name, + const struct ovsdb_jsonrpc_options *options) { struct ovsdb_jsonrpc_remote *remote; struct pstream *listener; int error; - error = jsonrpc_pstream_open(name, &listener); + error = jsonrpc_pstream_open(name, &listener, options->dscp); if (error && error != EAFNOSUPPORT) { VLOG_ERR_RL(&rl, "%s: listen failed: %s", name, strerror(error)); return NULL; @@ -388,6 +391,7 @@ ovsdb_jsonrpc_session_set_options(struct ovsdb_jsonrpc_session *session, { jsonrpc_session_set_max_backoff(session->js, options->max_backoff); jsonrpc_session_set_probe_interval(session->js, options->probe_interval); + jsonrpc_session_set_dscp(session->js, options->dscp); } static void diff --git a/ovsdb/jsonrpc-server.h b/ovsdb/jsonrpc-server.h index 78ddb82d..c5ea6faf 100644 --- a/ovsdb/jsonrpc-server.h +++ b/ovsdb/jsonrpc-server.h @@ -28,6 +28,7 @@ void ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *); struct ovsdb_jsonrpc_options { int max_backoff; /* Maximum reconnection backoff, in msec. */ int probe_interval; /* Max idle time before probing, in msec. */ + int dscp; /* Dscp value for manager connections */ }; struct ovsdb_jsonrpc_options *ovsdb_jsonrpc_default_options(void); diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 8562fc9a..53da6ae2 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -306,11 +306,12 @@ open_jsonrpc(const char *server) struct stream *stream; int error; - error = stream_open_block(jsonrpc_stream_open(server, &stream), &stream); + error = stream_open_block(jsonrpc_stream_open(server, &stream, + DSCP_DEFAULT), &stream); if (error == EAFNOSUPPORT) { struct pstream *pstream; - error = jsonrpc_pstream_open(server, &pstream); + error = jsonrpc_pstream_open(server, &pstream, DSCP_DEFAULT); if (error) { ovs_fatal(error, "failed to connect or listen to \"%s\"", server); } diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 9e0636e9..776bbb25 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -319,13 +319,45 @@ get_datum(struct ovsdb_row *row, const char *column_name, return &row->fields[column->index]; } +/* This function is used to read the string-string key-values from a map. + * Returns the true if the 'key' is found and returns the "value" associated + * with the 'key' in 'stringp', else returns false. */ +static bool +read_map_string_column(const struct ovsdb_row *row, const char *column_name, + const char **stringp, const char *key) +{ + const struct ovsdb_datum *datum; + union ovsdb_atom *atom_key = NULL, *atom_value = NULL; + size_t i; + + datum = get_datum((struct ovsdb_row *) row, column_name, OVSDB_TYPE_STRING, + OVSDB_TYPE_STRING, UINT_MAX); + + if (!datum) { + *stringp = NULL; + return false; + } + + for (i = 0; i < datum->n; i++) { + atom_key = &datum->keys[i]; + if (!strcmp(atom_key->string, key)){ + atom_value = &datum->values[i]; + break; + } + } + + *stringp = atom_value ? atom_value->string : NULL; + return atom_value != NULL; +} + static const union ovsdb_atom * read_column(const struct ovsdb_row *row, const char *column_name, enum ovsdb_atomic_type type) { const struct ovsdb_datum *datum; - datum = get_datum((struct ovsdb_row *) row, column_name, type, OVSDB_TYPE_VOID, 1); + datum = get_datum((struct ovsdb_row *) row, column_name, type, OVSDB_TYPE_VOID, + 1); return datum && datum->n ? datum->keys : NULL; } @@ -395,6 +427,21 @@ write_string_string_column(struct ovsdb_row *row, const char *column_name, ovsdb_datum_sort_assert(datum, column->type.key.type); } +/* Get the other config for the manager from the database. */ +static void +manager_get_other_config(const struct ovsdb_row *row, + struct ovsdb_jsonrpc_options *options) +{ + const char *temp_string; + + /* Retrieve the configs and store in the options. */ + if (read_map_string_column(row, "other_config", &temp_string, "dscp")) { + options->dscp = atoi(temp_string); + } else { + options->dscp = DSCP_DEFAULT; + } +} + /* Adds a remote and options to 'remotes', based on the Manager table row in * 'row'. */ static void @@ -418,6 +465,8 @@ add_manager_options(struct shash *remotes, const struct ovsdb_row *row) if (read_integer_column(row, "inactivity_probe", &probe_interval)) { options->probe_interval = probe_interval; } + + manager_get_other_config(row, options); } static void |