/*
- * Copyright (c) 2008, 2009 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.
* limitations under the License.
*/
+#include <config.h>
+
#include "stp.h"
#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
#include "ofpbuf.h"
#include "packets.h"
+#include "vlog.h"
+#include "ovstest.h"
struct bpdu {
int port_no;
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;
}
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;
struct bpdu *bpdu = &b->rxq[b->rxq_tail % RXQ_SIZE];
stp_received_bpdu(stp_get_port(b->stp, bpdu->port_no),
bpdu->data, bpdu->size);
+ free(bpdu->data);
any = true;
}
}
{
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);
pos++;
}
if (*pos == '\0') {
+ free(token);
token = NULL;
return false;
}
}
}
-int
-main(int argc, char *argv[])
+static void
+test_stp_main(int argc, char *argv[])
{
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");
}
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);
err("trailing garbage on line");
}
}
+ free(token);
- return 0;
+ for (i = 0; i < tc->n_lans; i++) {
+ struct lan *lan = tc->lans[i];
+ free(CONST_CAST(char *, lan->name));
+ free(lan);
+ }
+ for (i = 0; i < tc->n_bridges; i++) {
+ struct bridge *bridge = tc->bridges[i];
+ stp_unref(bridge->stp);
+ free(bridge);
+ }
+ free(tc);
}
+
+OVSTEST_REGISTER("test-stp", test_stp_main);