Godopu
d9c8f86889
code-check / Mininet Code Check (push) Waiting to run
mininet-tests / Mininet Tests (ubuntu-20.04, python2) (push) Waiting to run
mininet-tests / Mininet Tests (ubuntu-20.04, python3) (push) Waiting to run
mininet-tests / Mininet Tests (ubuntu-22.04, python2) (push) Waiting to run
mininet-tests / Mininet Tests (ubuntu-22.04, python3) (push) Waiting to run
89 lines
2.1 KiB
Diff
89 lines
2.1 KiB
Diff
diff --git a/lib/backtrace.c b/lib/backtrace.c
|
|
index 5b61ffe..f77e489 100644
|
|
--- a/lib/backtrace.c
|
|
+++ b/lib/backtrace.c
|
|
@@ -123,6 +123,6 @@ backtrace_capture(struct backtrace *bt)
|
|
}
|
|
bt->n_frames = n;
|
|
#else
|
|
- bt->n_frames = backtrace(bt->frames, BACKTRACE_MAX_FRAMES);
|
|
+ bt->n_frames = backtrace((void **)bt->frames, BACKTRACE_MAX_FRAMES);
|
|
#endif
|
|
}
|
|
diff --git a/lib/flow.c b/lib/flow.c
|
|
index 523eff0..4a1bf7b 100644
|
|
--- a/lib/flow.c
|
|
+++ b/lib/flow.c
|
|
@@ -44,11 +44,10 @@
|
|
#include "vlog.h"
|
|
#define THIS_MODULE VLM_flow
|
|
|
|
-static struct arp_header *
|
|
+static struct arp_eth_header *
|
|
pull_arp(struct ofpbuf *packet)
|
|
{
|
|
if (packet->size >= ARP_ETH_HEADER_LEN) {
|
|
- struct arp_eth_header *arp = packet->data;
|
|
return ofpbuf_pull(packet, ARP_ETH_HEADER_LEN);
|
|
}
|
|
return NULL;
|
|
diff --git a/lib/socket-util.c b/lib/socket-util.c
|
|
index c7b5d6d..5b3d602 100644
|
|
--- a/lib/socket-util.c
|
|
+++ b/lib/socket-util.c
|
|
@@ -42,6 +42,7 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sys/resource.h>
|
|
+#include <sys/stat.h>
|
|
#include <sys/un.h>
|
|
#include <unistd.h>
|
|
#include "fatal-signal.h"
|
|
diff --git a/lib/stp.c b/lib/stp.c
|
|
index b638311..b81ae53 100644
|
|
--- a/lib/stp.c
|
|
+++ b/lib/stp.c
|
|
@@ -34,6 +34,7 @@
|
|
/* Based on sample implementation in 802.1D-1998. Above copyright and license
|
|
* applies to all modifications. */
|
|
|
|
+#include <config.h>
|
|
#include "stp.h"
|
|
#include <arpa/inet.h>
|
|
#include <assert.h>
|
|
diff --git a/lib/util.c b/lib/util.c
|
|
index 21cc28d..1f341b1 100644
|
|
--- a/lib/util.c
|
|
+++ b/lib/util.c
|
|
@@ -138,6 +138,7 @@ xasprintf(const char *format, ...)
|
|
return s;
|
|
}
|
|
|
|
+#ifndef HAVE_STRLCPY
|
|
void
|
|
strlcpy(char *dst, const char *src, size_t size)
|
|
{
|
|
@@ -148,6 +149,7 @@ strlcpy(char *dst, const char *src, size_t size)
|
|
dst[n_copy] = '\0';
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
void
|
|
ofp_fatal(int err_no, const char *format, ...)
|
|
diff --git a/lib/util.h b/lib/util.h
|
|
index fde681f..dc4e71f 100644
|
|
--- a/lib/util.h
|
|
+++ b/lib/util.h
|
|
@@ -34,6 +34,10 @@
|
|
#ifndef UTIL_H
|
|
#define UTIL_H 1
|
|
|
|
+#if HAVE_CONFIG_H
|
|
+#include <config.h>
|
|
+#endif
|
|
+
|
|
#include <stdarg.h>
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|