Global replace of Nicira Networks.

[sliver-openvswitch.git] / tests / test-stp.c

diff --git a/tests/test-stp.c b/tests/test-stp.c
index ce9decc..87c12a0 100644 (file)
--- a/tests/test-stp.c
+++ b/tests/test-stp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira, Inc.
  *
  * 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.
  */
 
+#include <config.h>
+
 #include "stp.h"
 #include <assert.h>
 #include <ctype.h>
@@ -23,6 +25,7 @@
 #include <stdlib.h>
 #include "ofpbuf.h"
 #include "packets.h"
+#include "vlog.h"
 
 struct bpdu {
     int port_no;
@@ -241,7 +244,7 @@ dump_bridge_tree(struct test_case *tc, struct bridge *b, int level)
 }
 
 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;
 
@@ -301,6 +304,7 @@ simulate(struct test_case *tc, int granularity)
                     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;
                 }
             }
@@ -357,6 +361,7 @@ get_token(void)
         pos++;
     }
     if (*pos == '\0') {
+        free(token);
         token = NULL;
         return false;
     }
@@ -436,6 +441,9 @@ main(int argc, char *argv[])
     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");
     }
@@ -503,7 +511,7 @@ main(int argc, char *argv[])
                             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);
@@ -644,6 +652,19 @@ main(int argc, char *argv[])
             err("trailing garbage on line");
         }
     }
+    free(token);
+
+    for (i = 0; i < tc->n_lans; i++) {
+        struct lan *lan = tc->lans[i];
+        free((char *) lan->name);
+        free(lan);
+    }
+    for (i = 0; i < tc->n_bridges; i++) {
+        struct bridge *bridge = tc->bridges[i];
+        stp_destroy(bridge->stp);
+        free(bridge);
+    }
+    free(tc);
 
     return 0;
 }