From 868f15a67249b18eea763ce5199ec0334f211adc Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Sat, 1 Jun 2024 20:16:39 -0500 Subject: [PATCH] Move the hiredis_libevent2 code from common to relay (#1509) The point of this change is to make the build instructions a bit more straight forward. Since the hiresevent2 source files are only ever used by the relay target, this scoping makes sense in general. --- Makefile.in | 30 +++++++++---------- src/apps/common/CMakeLists.txt | 9 ------ src/apps/relay/CMakeLists.txt | 4 +-- src/apps/relay/dbdrivers/dbd_redis.c | 2 +- src/apps/relay/dbdrivers/dbd_redis.h | 2 +- .../{common => relay}/hiredis_libevent2.c | 0 .../{common => relay}/hiredis_libevent2.h | 0 7 files changed, 19 insertions(+), 28 deletions(-) rename src/apps/{common => relay}/hiredis_libevent2.c (100%) rename src/apps/{common => relay}/hiredis_libevent2.h (100%) diff --git a/Makefile.in b/Makefile.in index 88570e4a..279c3a6d 100755 --- a/Makefile.in +++ b/Makefile.in @@ -1,19 +1,19 @@ LIBEVENT_INCLUDE = -I${PREFIX}/include/ -I/usr/local/include/ -INCFLAGS = -Isrc -Isrc/apps/common -Isrc/server -Isrc/client -Isrc/client++ ${LIBEVENT_INCLUDE} +INCFLAGS = -Isrc -Isrc/apps/common -Isrc/server -Isrc/client -Isrc/client++ ${LIBEVENT_INCLUDE} CFLAGS += ${INCFLAGS} MAKE_DEPS = Makefile LIBCLIENTTURN_HEADERS = src/ns_turn_defs.h src/client++/TurnMsgLib.h src/client/ns_turn_ioaddr.h src/client/ns_turn_msg.h src/client/ns_turn_msg_defs.h src/client/ns_turn_msg_defs_experimental.h src/client/ns_turn_msg_addr.h -LIBCLIENTTURN_MODS = src/client/ns_turn_ioaddr.c src/client/ns_turn_msg_addr.c src/client/ns_turn_msg.c -LIBCLIENTTURN_DEPS = ${LIBCLIENTTURN_HEADERS} ${MAKE_DEPS} -LIBCLIENTTURN_OBJS = build/obj/ns_turn_ioaddr.o build/obj/ns_turn_msg_addr.o build/obj/ns_turn_msg.o +LIBCLIENTTURN_MODS = src/client/ns_turn_ioaddr.c src/client/ns_turn_msg_addr.c src/client/ns_turn_msg.c +LIBCLIENTTURN_DEPS = ${LIBCLIENTTURN_HEADERS} ${MAKE_DEPS} +LIBCLIENTTURN_OBJS = build/obj/ns_turn_ioaddr.o build/obj/ns_turn_msg_addr.o build/obj/ns_turn_msg.o SERVERTURN_HEADERS = src/server/ns_turn_allocation.h src/server/ns_turn_ioalib.h src/server/ns_turn_khash.h src/server/ns_turn_maps_rtcp.h src/server/ns_turn_maps.h src/server/ns_turn_server.h src/server/ns_turn_session.h -SERVERTURN_DEPS = ${LIBCLIENTTURN_HEADERS} ${SERVERTURN_HEADERS} ${MAKE_DEPS} +SERVERTURN_DEPS = ${LIBCLIENTTURN_HEADERS} ${SERVERTURN_HEADERS} ${MAKE_DEPS} SERVERTURN_MODS = ${LIBCLIENTTURN_MODS} src/server/ns_turn_allocation.c src/server/ns_turn_maps_rtcp.c src/server/ns_turn_maps.c src/server/ns_turn_server.c COMMON_HEADERS = src/apps/common/apputils.h src/apps/common/ns_turn_openssl.h src/apps/common/ns_turn_utils.h src/apps/common/stun_buffer.h @@ -24,8 +24,8 @@ IMPL_HEADERS = src/apps/relay/ns_ioalib_impl.h src/apps/relay/ns_sm.h src/apps/r IMPL_MODS = src/apps/relay/ns_ioalib_engine_impl.c src/apps/relay/turn_ports.c src/apps/relay/http_server.c src/apps/relay/acme.c IMPL_DEPS = ${COMMON_DEPS} ${IMPL_HEADERS} ${IMPL_MODS} -HIREDIS_HEADERS = src/apps/common/hiredis_libevent2.h -HIREDIS_MODS = src/apps/common/hiredis_libevent2.c +HIREDIS_HEADERS = src/apps/relay/hiredis_libevent2.h +HIREDIS_MODS = src/apps/relay/hiredis_libevent2.c USERDB_HEADERS = src/apps/relay/dbdrivers/dbdriver.h src/apps/relay/dbdrivers/dbd_sqlite.h src/apps/relay/dbdrivers/dbd_pgsql.h src/apps/relay/dbdrivers/dbd_mysql.h src/apps/relay/dbdrivers/dbd_mongo.h src/apps/relay/dbdrivers/dbd_redis.h USERDB_MODS = src/apps/relay/dbdrivers/dbdriver.c src/apps/relay/dbdrivers/dbd_sqlite.c src/apps/relay/dbdrivers/dbd_pgsql.c src/apps/relay/dbdrivers/dbd_mysql.c src/apps/relay/dbdrivers/dbd_mongo.c src/apps/relay/dbdrivers/dbd_redis.c @@ -60,7 +60,7 @@ include/turn/ns_turn_defs.h: src/ns_turn_defs.h bin/turnutils_uclient: ${COMMON_DEPS} src/apps/uclient/session.h lib/libturnclient.a src/apps/uclient/mainuclient.c src/apps/uclient/uclient.c src/apps/uclient/uclient.h src/apps/uclient/startuclient.c src/apps/uclient/startuclient.h ${MKBUILDDIR} bin - ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/uclient/uclient.c src/apps/uclient/startuclient.c src/apps/uclient/mainuclient.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} + ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/uclient/uclient.c src/apps/uclient/startuclient.c src/apps/uclient/mainuclient.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} bin/turnutils_natdiscovery: ${COMMON_DEPS} lib/libturnclient.a src/apps/natdiscovery/natdiscovery.c pwd @@ -72,21 +72,21 @@ bin/turnutils_oauth: ${COMMON_DEPS} lib/libturnclient.a src/apps/oauth/oauth.c ${MKBUILDDIR} bin ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/oauth/oauth.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} -bin/turnutils_stunclient: ${COMMON_DEPS} lib/libturnclient.a src/apps/stunclient/stunclient.c +bin/turnutils_stunclient: ${COMMON_DEPS} lib/libturnclient.a src/apps/stunclient/stunclient.c pwd ${MKBUILDDIR} bin - ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/stunclient/stunclient.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} + ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/stunclient/stunclient.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} -bin/turnutils_rfc5769check: ${COMMON_DEPS} lib/libturnclient.a src/apps/rfc5769/rfc5769check.c +bin/turnutils_rfc5769check: ${COMMON_DEPS} lib/libturnclient.a src/apps/rfc5769/rfc5769check.c pwd ${MKBUILDDIR} bin - ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/rfc5769/rfc5769check.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} + ${CC} ${CPPFLAGS} ${CFLAGS} src/apps/rfc5769/rfc5769check.c ${COMMON_MODS} -o $@ -Llib -lturnclient -Llib ${LDFLAGS} bin/turnserver: ${SERVERAPP_DEPS} ${MKBUILDDIR} bin ${RMCMD} bin/turnadmin - ${CC} ${CPPFLAGS} ${CFLAGS} ${DBCFLAGS} ${IMPL_MODS} -Ilib ${SERVERAPP_MODS} ${COMMON_MODS} ${SERVERTURN_MODS} -o $@ ${DBLIBS} ${LDFLAGS} - cd bin; ln -s turnserver turnadmin + ${CC} ${CPPFLAGS} ${CFLAGS} ${DBCFLAGS} ${IMPL_MODS} -Ilib ${SERVERAPP_MODS} ${COMMON_MODS} ${SERVERTURN_MODS} -o $@ ${DBLIBS} ${LDFLAGS} + cd bin; ln -s turnserver turnadmin bin/turnutils_peer: ${COMMON_DEPS} ${LIBCLIENTTURN_MODS} ${LIBCLIENTTURN_DEPS} lib/libturnclient.a src/apps/peer/mainudpserver.c src/apps/peer/udpserver.h src/apps/peer/udpserver.c ${MKBUILDDIR} bin @@ -112,7 +112,7 @@ build/obj/ns_turn_msg.o: src/client/ns_turn_msg.c ${LIBCLIENTTURN_DEPS} ### Clean all: -clean: +clean: ${RMCMD} bin build lib obj *bak *~ */*~ */*/*~ */*/*/*~ *core */*core */*/*core include tmp sqlite distclean: clean diff --git a/src/apps/common/CMakeLists.txt b/src/apps/common/CMakeLists.txt index 66bbb6f9..def6b08d 100644 --- a/src/apps/common/CMakeLists.txt +++ b/src/apps/common/CMakeLists.txt @@ -52,15 +52,6 @@ else() message(FATAL_ERROR "Must set Libevent") endif() endif() - -find_package(hiredis) -if(hiredis_FOUND) - list(APPEND SOURCE_FILES hiredis_libevent2.c) - list(APPEND HEADER_FILES hiredis_libevent2.h) - list(APPEND COMMON_LIBS hiredis::hiredis) -else() - list(APPEND COMMON_DEFINED TURN_NO_HIREDIS) -endif() message("COMMON_LIBS:${COMMON_LIBS}") add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES}) diff --git a/src/apps/relay/CMakeLists.txt b/src/apps/relay/CMakeLists.txt index 1d4f4c9d..96c95938 100644 --- a/src/apps/relay/CMakeLists.txt +++ b/src/apps/relay/CMakeLists.txt @@ -98,8 +98,8 @@ endif() find_package(hiredis) if(hiredis_FOUND) list(APPEND turnserver_LIBS hiredis::hiredis) - list(APPEND SOURCE_FILES dbdrivers/dbd_redis.c) - list(APPEND HEADER_FILES dbdrivers/dbd_redis.h) + list(APPEND SOURCE_FILES hiredis_libevent2.c dbdrivers/dbd_redis.c) + list(APPEND HEADER_FILES hiredis_libevent2.h dbdrivers/dbd_redis.h) else() list(APPEND turnserver_DEFINED TURN_NO_HIREDIS) endif() diff --git a/src/apps/relay/dbdrivers/dbd_redis.c b/src/apps/relay/dbdrivers/dbd_redis.c index 59d6fc38..fbb2c337 100644 --- a/src/apps/relay/dbdrivers/dbd_redis.c +++ b/src/apps/relay/dbdrivers/dbd_redis.c @@ -33,7 +33,7 @@ #include "../mainrelay.h" #if !defined(TURN_NO_HIREDIS) -#include "hiredis_libevent2.h" +#include "../hiredis_libevent2.h" #include /////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/apps/relay/dbdrivers/dbd_redis.h b/src/apps/relay/dbdrivers/dbd_redis.h index 1c475029..34bdffc3 100644 --- a/src/apps/relay/dbdrivers/dbd_redis.h +++ b/src/apps/relay/dbdrivers/dbd_redis.h @@ -32,8 +32,8 @@ #ifndef __DBD_REDIS__ #define __DBD_REDIS__ +#include "../hiredis_libevent2.h" #include "dbdriver.h" -#include "hiredis_libevent2.h" #ifdef __cplusplus extern "C" { diff --git a/src/apps/common/hiredis_libevent2.c b/src/apps/relay/hiredis_libevent2.c similarity index 100% rename from src/apps/common/hiredis_libevent2.c rename to src/apps/relay/hiredis_libevent2.c diff --git a/src/apps/common/hiredis_libevent2.h b/src/apps/relay/hiredis_libevent2.h similarity index 100% rename from src/apps/common/hiredis_libevent2.h rename to src/apps/relay/hiredis_libevent2.h