#include <config.h>
-
+#undef NDEBUG
#include "rstp-common.h"
#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
#include "ofpbuf.h"
#include "ovstest.h"
+#include "dp-packet.h"
#include "packets.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
#define MAX_PORTS 10
/* This callback is called with rstp_mutex held. */
static void
-send_bpdu(struct ofpbuf *pkt, void *port_, void *b_)
+send_bpdu(struct dp_packet *pkt, void *port_, void *b_)
OVS_REQUIRES(rstp_mutex)
{
struct bridge *b = b_;
assert(port_no < b->n_ports);
lan = b->ports[port_no];
if (lan) {
- const void *data = ofpbuf_l3(pkt);
- size_t size = (char *) ofpbuf_tail(pkt) - (char *) data;
+ const void *data = dp_packet_l3(pkt);
+ size_t size = (char *) dp_packet_tail(pkt) - (char *) data;
int i;
for (i = 0; i < lan->n_conns; i++) {
}
}
}
- ofpbuf_delete(pkt);
+ dp_packet_delete(pkt);
}
static struct bridge *
}
}
-static void
+OVS_NO_RETURN static void
err(const char *message, ...)
- PRINTF_FORMAT(1, 2)
- NO_RETURN;
+ OVS_PRINTF_FORMAT(1, 2);
static void
err(const char *message, ...)
static void
warn(const char *message, ...)
- PRINTF_FORMAT(1, 2);
+ OVS_PRINTF_FORMAT(1, 2);
static void
warn(const char *message, ...)