experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Clixon build on MacOS.

Browse source
This commit is contained in:
Kristofer Hallin 2022-08-16 08:34:26 +02:00
parent 9de052c144
commit 68b528ac0b
10 changed files with 112 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/backend/Makefile.in
View file

@ -45,7 +45,13 @@ CPPFLAGS += -fPIC
endif
SH_SUFFIX = @SH_SUFFIX@
LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
ifneq ($(LINKAGE),dynamic)
LDFLAGS += -rdynamic -L.

6
apps/cli/Makefile.in
View file

@ -49,7 +49,13 @@ CPPFLAGS += -fPIC
endif
SH_SUFFIX = @SH_SUFFIX@
LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
ifneq ($(LINKAGE),dynamic)
# -rdynamic for using -ldl

6
apps/netconf/Makefile.in
View file

@ -38,7 +38,13 @@ top_srcdir = @top_srcdir@
CC = @CC@
CFLAGS = @CFLAGS@
LINKAGE = @LINKAGE@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
prefix = @prefix@

6
apps/restconf/Makefile.in
View file

@ -41,7 +41,13 @@ top_srcdir = @top_srcdir@
CC = @CC@
CFLAGS = @CFLAGS@
LINKAGE = @LINKAGE@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
prefix = @prefix@

6
apps/snmp/Makefile.in
View file

@ -37,7 +37,13 @@ top_srcdir = @top_srcdir@
CC = @CC@
CFLAGS = @CFLAGS@
LINKAGE = @LINKAGE@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
prefix = @prefix@

6
example/main/Makefile.in
View file

@ -60,7 +60,13 @@ CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@
CC = @CC@
CFLAGS = @CFLAGS@ -fPIC
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
with_restconf = @with_restconf@
INCLUDES = -I$(includedir) @INCLUDES@

6
lib/src/Makefile.in
View file

@ -61,7 +61,13 @@ SH_SUFFIX = @SH_SUFFIX@
LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

39
lib/src/clixon_netns.c
View file

@ -134,12 +134,26 @@ create_socket(struct sockaddr *sa,
goto done;
}
/* create inet socket */
if ((s = socket(sa->sa_family,
SOCK_STREAM | SOCK_CLOEXEC | flags,
#ifndef __APPLE__
flags = SOCK_STREAM | SOCK_CLOEXEC | flags;
#else
flags = SOCK_STREAM | flags;
#endif
if ((s = socket(sa->sa_family, flags,
0)) < 0) {
clicon_err(OE_UNIX, errno, "socket");
goto done;
}
#ifdef __APPLE__
if (fcntl(s, O_CLOEXEC)) {
clicon_err(OE_UNIX, errno, "fcntl");
goto done;
}
#endif
if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on)) == -1) {
clicon_err(OE_UNIX, errno, "setsockopt SO_KEEPALIVE");
goto done;
@ -201,11 +215,30 @@ fork_netns_socket(const char *netns,
char nspath[MAXPATHLEN]; /* Path to namespace file */
struct stat st;
#ifdef __APPLE__
int sock_flags = SOCK_DGRAM;
#else
int sock_flags = SOCK_DGRAM | SOCK_CLOEXEC;
#endif
clicon_debug(1, "%s %s", __FUNCTION__, netns);
if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, sp) < 0){
if (socketpair(AF_UNIX, sock_flags, 0, sp) < 0){
clicon_err(OE_UNIX, errno, "socketpair");
goto done;
}
#ifdef __APPLE__
if (fcntl(sp[0], O_CLOEXEC)) {
clicon_err(OE_UNIX, errno, "fcntl, sp[0]");
goto done;
}
if (fcntl(sp[1], O_CLOEXEC)) {
clicon_err(OE_UNIX, errno, "fcntl, sp[1]");
goto done;
}
#endif
/* Check namespace exists */
sprintf(nspath,"/var/run/netns/%s", netns);
if (stat(nspath, &st) < 0){

21
lib/src/clixon_proc.c
View file

@ -182,14 +182,33 @@ clixon_proc_socket(char **argv,
sigset_t oset;
int sig = 0;
#ifdef __APPLE__
int sock_flags = SOCK_DGRAM;
#else
int sock_flags = SOCK_DGRAM | SOCK_CLOEXEC;
#endif
if (argv == NULL){
clicon_err(OE_UNIX, EINVAL, "argv is NULL");
goto done;
}
if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, sp) < 0){
if (socketpair(AF_UNIX, sock_flags, 0, sp) < 0){
clicon_err(OE_UNIX, errno, "socketpair");
goto done;
}
#ifdef __APPLE__
if (fcntl(sp[0], O_CLOEXEC)) {
clicon_err(OE_UNIX, errno, "fcntl, sp[0]");
goto done;
}
if (fcntl(sp[1], O_CLOEXEC)) {
clicon_err(OE_UNIX, errno, "fcntl, sp[1]");
goto done;
}
#endif
sigprocmask(0, NULL, &oset);
set_signal(SIGINT, clixon_proc_sigint, &oldhandler);
sig++;

6
util/Makefile.in
View file

@ -59,7 +59,13 @@ CC = @CC@
CFLAGS = @CFLAGS@
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
CPPFLAGS = @CPPFLAGS@