projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Don't track IP TOS value two different ways.
[openvswitch]
/
lib
/
stp.c
diff --git
a/lib/stp.c
b/lib/stp.c
index 87230bd9a27fd7c1979b38dc9982f5eaab45cc02..c5c8b3ba8a11238621b13f33b5ca4004cde373a0 100644
(file)
--- a/
lib/stp.c
+++ b/
lib/stp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* 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.
@@
-17,7
+17,11
@@
/* Based on sample implementation in 802.1D-1998. Above copyright and license
* applies to all modifications. */
/* Based on sample implementation in 802.1D-1998. Above copyright and license
* applies to all modifications. */
+#include <config.h>
+
#include "stp.h"
#include "stp.h"
+#include <sys/types.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#include <inttypes.h>
#include <arpa/inet.h>
#include <assert.h>
#include <inttypes.h>
@@
-25,10
+29,10
@@
#include "ofpbuf.h"
#include "packets.h"
#include "util.h"
#include "ofpbuf.h"
#include "packets.h"
#include "util.h"
+#include "vlog.h"
#include "xtoxll.h"
#include "xtoxll.h"
-#include "vlog.h"
-#define THIS_MODULE VLM_stp
+VLOG_DEFINE_THIS_MODULE(stp)
/* Ethernet address used as the destination for STP frames. */
const uint8_t stp_eth_addr[ETH_ADDR_LEN]
/* Ethernet address used as the destination for STP frames. */
const uint8_t stp_eth_addr[ETH_ADDR_LEN]
@@
-214,7
+218,7
@@
stp_create(const char *name, stp_identifier bridge_id,
struct stp *stp;
struct stp_port *p;
struct stp *stp;
struct stp_port *p;
- stp = x
calloc(1,
sizeof *stp);
+ stp = x
zalloc(
sizeof *stp);
stp->name = xstrdup(name);
stp->bridge_id = bridge_id;
if (!(stp->bridge_id >> 48)) {
stp->name = xstrdup(name);
stp->bridge_id = bridge_id;
if (!(stp->bridge_id >> 48)) {
@@
-256,7
+260,10
@@
stp_create(const char *name, stp_identifier bridge_id,
void
stp_destroy(struct stp *stp)
{
void
stp_destroy(struct stp *stp)
{
- free(stp);
+ if (stp) {
+ free(stp->name);
+ free(stp);
+ }
}
/* Runs 'stp' given that 'ms' milliseconds have passed. */
}
/* Runs 'stp' given that 'ms' milliseconds have passed. */