Skip to content

Add patch for openflow to fix compile error when strlcpy is present on the system. #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −1
Open

Add patch for openflow to fix compile error when strlcpy is present on the system. #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion util/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,9 @@ function of {
# Patch controller to handle more than 16 switches
patch -p1 < $MININET_DIR/mininet/util/openflow-patches/controller.patch

# Patch openflow to recognize strlcpy if present on the system
patch -p1 < $MININET_DIR/mininet/util/openflow-patches/strlcpy.patch

# Resume the install:
./boot.sh
./configure
Expand Down Expand Up @@ -869,7 +872,7 @@ function usage {
printf -- ' -v: install Open (V)switch\n' >&2
printf -- ' -V <version>: install a particular version of Open (V)switch on Ubuntu\n' >&2
printf -- ' -w: install OpenFlow (W)ireshark dissector\n' >&2
printf -- ' -x: install NO(X) Classic OpenFlow controller\n' >&2
printf -- ' -x: install NO(X) Classic OpenFlow controller\n' >&2
printf -- ' -y: install R(y)u Controller\n' >&2
printf -- ' -0: (default) -0[fx] installs OpenFlow 1.0 versions\n' >&2
printf -- ' -3: -3[fx] installs OpenFlow 1.3 versions\n' >&2
Expand Down
2 changes: 2 additions & 0 deletions util/openflow-patches/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ Patches for OpenFlow Reference Implementation
controller.patch: patch controller to support up to 4096 switches (up from 16!)

datapath.patch: patch to kernel datapath to compile with CONFIG_NET_NS=y

strlcpy.patch: patch openflow to recognize strlcpy on the system and avoid type clashes
32 changes: 32 additions & 0 deletions util/openflow-patches/strlcpy.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
diff --git a/lib/util.c b/lib/util.c
index 21cc28d..ca45f18 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..0f8b063 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -34,6 +34,7 @@
#ifndef UTIL_H
#define UTIL_H 1

+#include <config.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>