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

evhtp configure and warnings

Browse source
This commit is contained in:
Olof hagsand 2021-04-02 13:09:53 +02:00
parent 2def5d2367
commit 698625aa65
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -5189,7 +5189,6 @@ do :
ac_fn_c_check_header_compile "$LINENO" "evhtp/evhtp.h" "ac_cv_header_evhtp_evhtp_h" "$ac_includes_default ac_fn_c_check_header_compile "$LINENO" "evhtp/evhtp.h" "ac_cv_header_evhtp_evhtp_h" "$ac_includes_default
#define EVHTP_DISABLE_REGEX #define EVHTP_DISABLE_REGEX
#define EVHTP_DISABLE_EVTHR #define EVHTP_DISABLE_EVTHR
#define EVHTP_EXPORT
" "
if test "x$ac_cv_header_evhtp_evhtp_h" = xyes; then : if test "x$ac_cv_header_evhtp_evhtp_h" = xyes; then :

1
configure.ac
View file

@ -219,7 +219,6 @@ elif test "x${with_restconf}" == xevhtp; then
[AC_INCLUDES_DEFAULT[ [AC_INCLUDES_DEFAULT[
#define EVHTP_DISABLE_REGEX #define EVHTP_DISABLE_REGEX
#define EVHTP_DISABLE_EVTHR #define EVHTP_DISABLE_EVTHR
#define EVHTP_EXPORT
]]) ]])
AC_CHECK_LIB(evhtp, evhtp_new,, AC_MSG_ERROR([libevhtp missing]),[-lpthread -levent -levent_openssl -lssl -lcrypto]) AC_CHECK_LIB(evhtp, evhtp_new,, AC_MSG_ERROR([libevhtp missing]),[-lpthread -levent -levent_openssl -lssl -lcrypto])
elif test "x${with_restconf}" == xno; then elif test "x${with_restconf}" == xno; then

2
lib/src/clixon_netns.c
View file

@ -168,6 +168,7 @@ create_socket(struct sockaddr *sa,
return retval; return retval;
} }
#ifdef HAVE_SETNS
/*! Fork a child, create and bind a socket in a separate network namespace and send back to parent /*! Fork a child, create and bind a socket in a separate network namespace and send back to parent
* *
* @param[in] netns Network namespace * @param[in] netns Network namespace
@ -246,6 +247,7 @@ fork_netns_socket(const char *netns,
clicon_debug(1, "%s %d", __FUNCTION__, retval); clicon_debug(1, "%s %d", __FUNCTION__, retval);
return retval; return retval;
} }
#endif /* HAVE_SETNS */
/*! Create and bind stream socket in network namespace /*! Create and bind stream socket in network namespace
* @param[in] netns Network namespace * @param[in] netns Network namespace

4
test/vagrant/vagrant.sh
View file

@ -254,7 +254,9 @@ case ${with_restconf} in
. ./nginx.sh $dir $idfile $port $wwwuser . ./nginx.sh $dir $idfile $port $wwwuser
;; ;;
evhtp) evhtp)
$sshcmd << 'EOF' $sshcmd << EOF
test -d src || mkdir src
cd src
test -d clixon-libevhtp || git clone https://github.com/clicon/clixon-libevhtp.git test -d clixon-libevhtp || git clone https://github.com/clicon/clixon-libevhtp.git
cd clixon-libevhtp; cd clixon-libevhtp;
./configure --libdir=/usr/lib # otherwise in /usr/local/lib where RH dont look ./configure --libdir=/usr/lib # otherwise in /usr/local/lib where RH dont look