diff --git a/configure.ac b/configure.ac index b5c6f11ca4f677cb11b220ef1fc974474ec7f70d..a4d2603c4aec1935129e13f39e9fdc66cb9bddd7 100644 --- a/configure.ac +++ b/configure.ac @@ -40,9 +40,9 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib" AC_SEARCH_LIBS([pow], [m]) AC_SEARCH_LIBS([pthread_create], [pthread], [], [AC_MSG_ERROR([pthreads not found])]) AC_SEARCH_LIBS([rcu_read_lock], [urcu], [], [AC_MSG_ERROR([liburcu not found])]) -AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([librt not found])]) +#AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([librt not found])]) AC_SEARCH_LIBS([OpenSSL_add_all_digests], [crypto],[], [AC_MSG_ERROR([libcrypto not found])]) -AC_SEARCH_LIBS([ev_loop], [ev],[], [AC_MSG_ERROR([libev not found])]) +AC_SEARCH_LIBS([ev_run], [ev],[], [AC_MSG_ERROR([libev not found])]) #AC_SEARCH_LIBS([ldns_rr_list_pop_rrset], [ldns], [], [AC_MSG_ERROR([libldns not found])]) # Checks for header files. diff --git a/resource.sh b/resource.sh index 894f2781d87e29c2b9dd2b3858e3627ff233ee4b..3679d2c9988248713d89d1c54f0a38310717a218 100755 --- a/resource.sh +++ b/resource.sh @@ -19,12 +19,12 @@ header="${1%.*}_rc" header=`basename ${header}` # Get file size and dump content -size=`stat --format "%s" ${1} 2>/dev/null` +size=`stat -f "%z" ${1} 2>/dev/null` dump=`${hd} "${fmt}" ${1} 2>/dev/null` # Format file size variable echo "static const unsigned ${header}_size = ${size};" # Format file content dump -echo -n "static const char ${header}[] = { " +echo "static const char ${header}[] = { " echo "${dump}0x00 };" diff --git a/src/knot/server/dthreads.h b/src/knot/server/dthreads.h index a34b90c9064f25960255f1857a0e1f2db70f021d..89e7210031af900b16c6a4288c405baa7a9bc80f 100644 --- a/src/knot/server/dthreads.h +++ b/src/knot/server/dthreads.h @@ -33,7 +33,7 @@ struct dt_unit_t; /*! * \brief Thread state enumeration. */ -enum { +typedef enum { ThreadJoined = 1 << 0, /*!< Thread is finished and joined. */ ThreadJoinable = 1 << 1, /*!< Thread is waiting to be reclaimed. */ ThreadCancelled = 1 << 2, /*!< Thread is cancelled, finishing task. */ diff --git a/src/knot/server/socket.h b/src/knot/server/socket.h index a129d41b638f0ae42d54f86457eaa9a1bcd2178c..f6765e722912c90a186deaf722fc19f8d61ed404 100644 --- a/src/knot/server/socket.h +++ b/src/knot/server/socket.h @@ -23,7 +23,7 @@ #include "common/sockaddr.h" /*! \brief Socket-related constants. */ -enum { +typedef enum { SOCKET_MTU_SZ = 8192, /*!< \todo Determine UDP MTU size. */ } socket_const_t; diff --git a/src/knot/server/tcp-handler.c b/src/knot/server/tcp-handler.c index 4fc7fa9ff41196514abd8b90b6a5f7ebfaa0f4cd..e9414b9b3ee1f9f621db3400d5bf56e37dcb5e63 100644 --- a/src/knot/server/tcp-handler.c +++ b/src/knot/server/tcp-handler.c @@ -366,8 +366,10 @@ int tcp_send(int fd, uint8_t *msg, size_t msglen) /*! \brief TCP corking. * \see http://vger.kernel.org/~acme/unbehaved.txt */ +#ifdef TCP_CORK int cork = 1; setsockopt(fd, SOL_TCP, TCP_CORK, &cork, sizeof(cork)); +#endif§ /* Send message size. */ unsigned short pktsize = htons(msglen); @@ -382,9 +384,11 @@ int tcp_send(int fd, uint8_t *msg, size_t msglen) return KNOT_ERROR; } +#ifdef TCP_CORK /* Uncork. */ cork = 0; setsockopt(fd, SOL_TCP, TCP_CORK, &cork, sizeof(cork)); +#endif return sent; }