git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
tests
/
test-stp.c
diff --git
a/tests/test-stp.c
b/tests/test-stp.c
index
eab13d6
..
9ca9c6c
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, 2013, 2014 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.
@@
-14,6
+14,8
@@
* limitations under the License.
*/
* limitations under the License.
*/
+#include <config.h>
+
#include "stp.h"
#include <assert.h>
#include <ctype.h>
#include "stp.h"
#include <assert.h>
#include <ctype.h>
@@
-23,6
+25,8
@@
#include <stdlib.h>
#include "ofpbuf.h"
#include "packets.h"
#include <stdlib.h>
#include "ofpbuf.h"
#include "packets.h"
+#include "vlog.h"
+#include "ovstest.h"
struct bpdu {
int port_no;
struct bpdu {
int port_no;
@@
-89,7
+93,7
@@
send_bpdu(struct ofpbuf *pkt, int port_no, void *b_)
assert(port_no < b->n_ports);
lan = b->ports[port_no];
if (lan) {
assert(port_no < b->n_ports);
lan = b->ports[port_no];
if (lan) {
- const void *data =
pkt->l3
;
+ const void *data =
ofpbuf_l3(pkt)
;
size_t size = (char *) ofpbuf_tail(pkt) - (char *) data;
int i;
size_t size = (char *) ofpbuf_tail(pkt) - (char *) data;
int i;
@@
-241,7
+245,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;
@@
-322,7
+326,7
@@
err(const char *message, ...)
{
va_list args;
{
va_list args;
- fprintf(stderr, "%s:%d:%
td
: ", file_name, line_number, pos - line);
+ fprintf(stderr, "%s:%d:%
"PRIdPTR"
: ", file_name, line_number, pos - line);
va_start(args, message);
vfprintf(stderr, message, args);
va_end(args);
va_start(args, message);
vfprintf(stderr, message, args);
va_end(args);
@@
-431,13
+435,16
@@
must_match(const char *want)
}
}
}
}
-int
-main(int argc, char *argv[])
+static void
+
test_stp_
main(int argc, char *argv[])
{
struct test_case *tc;
FILE *input_file;
int i;
{
struct test_case *tc;
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");
}
@@
-505,7
+512,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);
@@
-650,15
+657,15
@@
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++) {
struct bridge *bridge = tc->bridges[i];
free(lan);
}
for (i = 0; i < tc->n_bridges; i++) {
struct bridge *bridge = tc->bridges[i];
- stp_
destroy
(bridge->stp);
+ stp_
unref
(bridge->stp);
free(bridge);
}
free(tc);
free(bridge);
}
free(tc);
-
- return 0;
}
}
+
+OVSTEST_REGISTER("test-stp", test_stp_main);