projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Describe dummy test model. Work on OpenFlow intro.
[openvswitch]
/
tests
/
test-stp.c
diff --git
a/tests/test-stp.c
b/tests/test-stp.c
index 83d571defd046a983576daad4fde95869a986289..0acc7e0d91e46e03e685bd632558bde01142b730 100644
(file)
--- a/
tests/test-stp.c
+++ b/
tests/test-stp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010
, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-25,6
+25,7
@@
#include <stdlib.h>
#include "ofpbuf.h"
#include "packets.h"
#include <stdlib.h>
#include "ofpbuf.h"
#include "packets.h"
+#include "vlog.h"
struct bpdu {
int port_no;
struct bpdu {
int port_no;
@@
-243,7
+244,7
@@
dump_bridge_tree(struct test_case *tc, struct bridge *b, int level)
}
static void
}
static void
-dump_lan_tree(struct test_case *tc, struct lan *lan, int level)
+dump_lan_tree(struct test_case *tc, struct lan *lan, int level)
{
int i;
{
int i;
@@
-440,6
+441,9
@@
main(int argc, char *argv[])
FILE *input_file;
int i;
FILE *input_file;
int i;
+ vlog_set_pattern(VLF_CONSOLE, "%c|%p|%m");
+ vlog_set_levels(NULL, VLF_SYSLOG, VLL_OFF);
+
if (argc != 2) {
ovs_fatal(0, "usage: test-stp INPUT.STP\n");
}
if (argc != 2) {
ovs_fatal(0, "usage: test-stp INPUT.STP\n");
}
@@
-507,7
+511,7
@@
main(int argc, char *argv[])
lan = NULL;
} else if (strlen(token) == 1
&& islower((unsigned char)*token)) {
lan = NULL;
} else if (strlen(token) == 1
&& islower((unsigned char)*token)) {
- lan = tc->lans[*token - 'a'];
+ lan = tc->lans[*token - 'a'];
} else {
err("%s is not a valid LAN name "
"(0 or a lowercase letter)", token);
} else {
err("%s is not a valid LAN name "
"(0 or a lowercase letter)", token);
@@
-652,7
+656,7
@@
main(int argc, char *argv[])
for (i = 0; i < tc->n_lans; i++) {
struct lan *lan = tc->lans[i];
for (i = 0; i < tc->n_lans; i++) {
struct lan *lan = tc->lans[i];
- free(
(char *) lan->name
);
+ free(
CONST_CAST(char *, lan->name)
);
free(lan);
}
for (i = 0; i < tc->n_bridges; i++) {
free(lan);
}
for (i = 0; i < tc->n_bridges; i++) {