mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-11-05 17:31:09 +01:00
Code Issues Projects Releases Wiki Activity

working on sqlite install

Browse Source
This commit is contained in:
mom040267 2014-11-20 02:56:53 +00:00
parent c7cf2af401
commit 221f014a6c
14 changed files with 61 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -104,6 +104,7 @@ distclean: clean
install: all ${MAKE_DEPS} install: all ${MAKE_DEPS}
${MKDIR} ${DESTDIR}${PREFIX} ${MKDIR} ${DESTDIR}${PREFIX}
${MKDIR} ${DESTDIR}${BINDIR} ${MKDIR} ${DESTDIR}${BINDIR}
${MKDIR} ${DESTDIR}${LOCALSTATEDIR}
${MKDIR} ${DESTDIR}${MANPREFIX}/man/man1 ${MKDIR} ${DESTDIR}${MANPREFIX}/man/man1
${MKDIR} ${DESTDIR}${CONFDIR} ${MKDIR} ${DESTDIR}${CONFDIR}
${MKDIR} ${DESTDIR}${LIBDIR} ${MKDIR} ${DESTDIR}${LIBDIR}
@ -147,10 +148,12 @@ install: all ${MAKE_DEPS}
${RMCMD} ${DESTDIR}${EXAMPLESDIR}/scripts/rfc5769.sh ${RMCMD} ${DESTDIR}${EXAMPLESDIR}/scripts/rfc5769.sh
${INSTALL_DIR} include/turn/client ${DESTDIR}${TURNINCLUDEDIR} ${INSTALL_DIR} include/turn/client ${DESTDIR}${TURNINCLUDEDIR}
${INSTALL_DATA} include/turn/ns_turn_defs.h ${DESTDIR}${TURNINCLUDEDIR} ${INSTALL_DATA} include/turn/ns_turn_defs.h ${DESTDIR}${TURNINCLUDEDIR}
${SQLITECMD} ${DESTDIR}${LOCALSTATEDIR}/turndb < turndb/schema.sql
${MORECMD} ${DESTDIR}${DOCSDIR}/postinstall.txt ${MORECMD} ${DESTDIR}${DOCSDIR}/postinstall.txt
deinstall: ${MAKE_DEPS} deinstall: ${MAKE_DEPS}
${PKILL_PROGRAM} turnserver || ${ECHO_CMD} OK ${PKILL_PROGRAM} turnserver || ${ECHO_CMD} OK
${RMCMD} ${DESTDIR}${LOCALSTATEDIR}/turndb
${RMCMD} ${DESTDIR}${DOCSDIR} ${RMCMD} ${DESTDIR}${DOCSDIR}
${RMCMD} ${DESTDIR}${SCHEMADIR} ${RMCMD} ${DESTDIR}${SCHEMADIR}
${RMCMD} ${DESTDIR}${BINDIR}/turnserver ${RMCMD} ${DESTDIR}${BINDIR}/turnserver

4
README.turnadmin
View File

@ -80,7 +80,7 @@ Commands:
Options with required values: Options with required values:
-b, --db, --userdb SQLite user database file name (default - /var/db/turndb). -b, --db, --userdb SQLite user database file name (default - /var/turndb).
See the same option in the turnserver section. See the same option in the turnserver section.
-e, --psql-userdb PostgreSQL user database connection string. -e, --psql-userdb PostgreSQL user database connection string.
See the --psql-userdb option in the turnserver section. See the --psql-userdb option in the turnserver section.
@ -170,7 +170,7 @@ to see the man page.
/etc/turnserver.conf /etc/turnserver.conf
/var/db/turndb /var/turndb
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf

6
README.turnserver
View File

@ -81,7 +81,7 @@ Config file settings:
User database settings: User database settings:
-b, --db, --userdb SQLite user database file name (default - /var/db/turndb). -b, --db, --userdb SQLite user database file name (default - /var/turndb).
-e, --psql-userdb User database connection string for PostgreSQL. -e, --psql-userdb User database connection string for PostgreSQL.
This database can be used for long-term and short-term This database can be used for long-term and short-term
@ -716,7 +716,7 @@ For the user database, the turnserver has the following options:
Obviously, only a few users can be set that way, and their credentials are fixed Obviously, only a few users can be set that way, and their credentials are fixed
for the turnserver process lifetime. for the turnserver process lifetime.
2) Users can be stored in SQLite DB. The default SQLite database file is /var/db/turndb. 2) Users can be stored in SQLite DB. The default SQLite database file is /var/turndb.
3) Users can be stored in PostgreSQL database, if the turnserver was compiled with PostgreSQL 3) Users can be stored in PostgreSQL database, if the turnserver was compiled with PostgreSQL
support. Each time turnserver checks user credentials, it reads the database (asynchronously, support. Each time turnserver checks user credentials, it reads the database (asynchronously,
@ -841,7 +841,7 @@ FILES
/etc/turnserver.conf /etc/turnserver.conf
/var/db/turndb /var/turndb
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf

2
README.turnutils
View File

@ -251,7 +251,7 @@ FILES
/etc/turnserver.conf /etc/turnserver.conf
/var/db/turndb /var/turndb
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf

26
configure vendored
View File

@ -346,6 +346,11 @@ do
-bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
BINDIR=$ac_optarg ;; BINDIR=$ac_optarg ;;
-localstatedir | --localstatedir | --localstatedi | --localstated | --localstate | --localstat)
ac_prev=LOCALSTATEDIR ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* | --localstate=* | --localstat=*)
LOCALSTATEDIR=$ac_optarg ;;
-datadir | --datadir | --datadi | --datad | -schemadir | --schemadir) -datadir | --datadir | --datadi | --datad | -schemadir | --schemadir)
ac_prev=SCHEMADIR ;; ac_prev=SCHEMADIR ;;
-datadir=* | --datadir=* | --datadi=* | --datad=* | -schemadir=* | --schemadir=*) -datadir=* | --datadir=* | --datadi=* | --datad=* | -schemadir=* | --schemadir=*)
@ -438,6 +443,14 @@ if [ -z "${BINDIR}" ] ; then
fi fi
fi fi
if [ -z "${LOCALSTATEDIR}" ] ; then
if [ -z "${localstatedir}" ] ; then
LOCALSTATEDIR=/var
else
LOCALSTATEDIR=${localstatedir}
fi
fi
if [ -z "${CONFDIR}" ] ; then if [ -z "${CONFDIR}" ] ; then
if [ -z "${confdir}" ] ; then if [ -z "${confdir}" ] ; then
CONFDIR=${PREFIX}/etc CONFDIR=${PREFIX}/etc
@ -591,6 +604,14 @@ INSTALL_DIR="cp -rpf"
MKBUILDDIR="mkdir -p" MKBUILDDIR="mkdir -p"
RMCMD="rm -rf" RMCMD="rm -rf"
type sqlite3 2>>/dev/null
ER=$?
if [ ${ER} -eq 0 ] ; then
SQLITECMD="sqlite3"
else
SQLITECMD="echo"
fi
############################# #############################
# Adjustments for Solaris # Adjustments for Solaris
############################# #############################
@ -1044,6 +1065,7 @@ if [ -z "${TURN_NO_SQLITE}" ] ; then
TURN_NO_SQLITE="-DTURN_NO_SQLITE" TURN_NO_SQLITE="-DTURN_NO_SQLITE"
fi fi
if [ -z "${TURN_NO_SQLITE}" ] ; then
testsqlite_comp testsqlite_comp
ER=$? ER=$?
if ! [ ${ER} -eq 0 ] ; then if ! [ ${ER} -eq 0 ] ; then
@ -1053,6 +1075,7 @@ if [ -z "${TURN_NO_SQLITE}" ] ; then
TURN_NO_SQLITE="-DTURN_NO_SQLITE" TURN_NO_SQLITE="-DTURN_NO_SQLITE"
fi fi
fi fi
fi
########################### ###########################
# Test PostgreSQL # Test PostgreSQL
@ -1184,6 +1207,8 @@ ${ECHO_CMD} "PREFIX = ${PREFIX}" >> Makefile
${ECHO_CMD} "prefix = ${PREFIX}" >> Makefile ${ECHO_CMD} "prefix = ${PREFIX}" >> Makefile
${ECHO_CMD} "BINDIR = ${BINDIR}" >> Makefile ${ECHO_CMD} "BINDIR = ${BINDIR}" >> Makefile
${ECHO_CMD} "bindir = ${BINDIR}" >> Makefile ${ECHO_CMD} "bindir = ${BINDIR}" >> Makefile
${ECHO_CMD} "LOCALSTATEDIR = ${LOCALSTATEDIR}" >> Makefile
${ECHO_CMD} "localstatedir = ${LOCALSTATEDIR}" >> Makefile
${ECHO_CMD} "CONFDIR = ${CONFDIR}" >> Makefile ${ECHO_CMD} "CONFDIR = ${CONFDIR}" >> Makefile
${ECHO_CMD} "confdir = ${CONFDIR}" >> Makefile ${ECHO_CMD} "confdir = ${CONFDIR}" >> Makefile
${ECHO_CMD} "MANPREFIX = ${MANPREFIX}" >> Makefile ${ECHO_CMD} "MANPREFIX = ${MANPREFIX}" >> Makefile
@ -1203,6 +1228,7 @@ ${ECHO_CMD} "turnincludedir = ${TURNINCLUDEDIR}" >> Makefile
${ECHO_CMD} "#" >> Makefile ${ECHO_CMD} "#" >> Makefile
${ECHO_CMD} "ARCHIVERCMD = ${ARCHIVERCMD}" >> Makefile ${ECHO_CMD} "ARCHIVERCMD = ${ARCHIVERCMD}" >> Makefile
${ECHO_CMD} "MKDIR = ${MKDIR}" >> Makefile ${ECHO_CMD} "MKDIR = ${MKDIR}" >> Makefile
${ECHO_CMD} "SQLITECMD = ${SQLITECMD}" >> Makefile
${ECHO_CMD} "INSTALL_PROGRAM = ${INSTALL_PROGRAM}" >> Makefile ${ECHO_CMD} "INSTALL_PROGRAM = ${INSTALL_PROGRAM}" >> Makefile
${ECHO_CMD} "PKILL_PROGRAM = ${PKILL_PROGRAM}" >> Makefile ${ECHO_CMD} "PKILL_PROGRAM = ${PKILL_PROGRAM}" >> Makefile
${ECHO_CMD} "INSTALL_MAN = ${INSTALL_MAN}" >> Makefile ${ECHO_CMD} "INSTALL_MAN = ${INSTALL_MAN}" >> Makefile

4
examples/etc/turnserver.conf
View File

@ -250,9 +250,9 @@
# SQLite database file name. # SQLite database file name.
# #
# Default file name is /var/db/turndb (turndb in the process' home directory). # Default file name is /var/turndb.
# #
#userdb=/var/db/turndb #userdb=/var/turndb
# PostgreSQL database connection string in the case that we are using PostgreSQL # PostgreSQL database connection string in the case that we are using PostgreSQL
# as the user database. # as the user database.

2
examples/scripts/longtermsecuredb/secure_relay_with_db_sqlite.sh
View File

@ -31,5 +31,5 @@ fi
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/ export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver --server-name="blackdow.carleon.gov" -v --syslog -a -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 -r north.gov --db="var/db/turndb" --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout --cipher-list=ALL:SSLv2 --oauth $@ PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver --server-name="blackdow.carleon.gov" -v --syslog -a -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 -r north.gov --db="var/turndb" --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout --cipher-list=ALL:SSLv2 --oauth $@

2
examples/scripts/restapi/secure_relay_secret_with_db_sqlite.sh
View File

@ -34,4 +34,4 @@ fi
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/ export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver -v --syslog -a -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 --use-auth-secret --realm=north.gov --db="var/db/turndb" --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout --cipher-list=ALL:SSLv2 $@ PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver -v --syslog -a -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 --use-auth-secret --realm=north.gov --db="var/turndb" --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout --cipher-list=ALL:SSLv2 $@

4
examples/scripts/shorttermsecure/secure_relay_short_term_mech.sh
View File

@ -15,7 +15,7 @@
# 2) use fingerprints (-f) # 2) use fingerprints (-f)
# 3) use 3 relay threads (-m 3) # 3) use 3 relay threads (-m 3)
# 4) use min UDP relay port 32355 and max UDP relay port 65535 # 4) use min UDP relay port 32355 and max UDP relay port 65535
# 5) --db="var/db/turndb" means that SQLite database "var/db/turndb" will be used. # 5) --db="var/turndb" means that SQLite database "var/turndb" will be used.
# 6) "--cert=example_turn_server_cert.pem" sets the OpenSSL certificate file name. # 6) "--cert=example_turn_server_cert.pem" sets the OpenSSL certificate file name.
# 7) "--pkey=example_turn_server_pkey.pem" sets the OpenSSL private key name. # 7) "--pkey=example_turn_server_pkey.pem" sets the OpenSSL private key name.
# 8) "--log-file=stdout" means that all log output will go to the stdout. # 8) "--log-file=stdout" means that all log output will go to the stdout.
@ -31,4 +31,4 @@ fi
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/ export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver -v --syslog -A --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 --db="var/db/turndb" --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout -E 127.0.0.1 -E ::1 --cipher-list=ALL:SSLv2 $@ PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver -v --syslog -A --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 --db="var/turndb" --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout -E 127.0.0.1 -E ::1 --cipher-list=ALL:SSLv2 $@

4
man/man1/turnadmin.1
View File

@ -132,7 +132,7 @@ Options with required values:
.TP .TP
.B .B
\fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP \fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP
SQLite user database file name (default \- /var/db/turndb). SQLite user database file name (default \- /var/turndb).
See the same option in the \fIturnserver\fP section. See the same option in the \fIturnserver\fP section.
.TP .TP
.B .B
@ -261,7 +261,7 @@ to see the man page.
/etc/turnserver.conf /etc/turnserver.conf
.PP .PP
/var/db/turndb /var/turndb
.PP .PP
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
.PP .PP

6
man/man1/turnserver.1
View File

@ -132,7 +132,7 @@ User database settings:
.TP .TP
.B .B
\fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP \fB\-b\fP, \fB\-\-db\fP, \fB\-\-userdb\fP
SQLite user database file name (default \- /var/db/turndb). SQLite user database file name (default \- /var/turndb).
.TP .TP
.B .B
\fB\-e\fP, \fB\-\-psql\-userdb\fP \fB\-e\fP, \fB\-\-psql\-userdb\fP
@ -971,7 +971,7 @@ Users can be set in the command line, with multiple \fB\-u\fP or \fB\-\-user\fP
Obviously, only a few users can be set that way, and their credentials are fixed Obviously, only a few users can be set that way, and their credentials are fixed
for the \fIturnserver\fP process lifetime. for the \fIturnserver\fP process lifetime.
.IP 2) 4 .IP 2) 4
Users can be stored in SQLite DB. The default SQLite database file is /var/db/turndb. Users can be stored in SQLite DB. The default SQLite database file is /var/turndb.
.IP 3) 4 .IP 3) 4
Users can be stored in PostgreSQL database, if the \fIturnserver\fP was compiled with PostgreSQL Users can be stored in PostgreSQL database, if the \fIturnserver\fP was compiled with PostgreSQL
support. Each time \fIturnserver\fP checks user credentials, it reads the database (asynchronously, support. Each time \fIturnserver\fP checks user credentials, it reads the database (asynchronously,
@ -1096,7 +1096,7 @@ it would affect the performance.
/etc/turnserver.conf /etc/turnserver.conf
.PP .PP
/var/db/turndb /var/turndb
.PP .PP
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
.PP .PP

2
man/man1/turnutils.1
View File

@ -374,7 +374,7 @@ to see the man page.
/etc/turnserver.conf /etc/turnserver.conf
.PP .PP
/var/db/turndb /var/turndb
.PP .PP
/usr/local/etc/turnserver.conf /usr/local/etc/turnserver.conf
.PP .PP

6
src/apps/relay/mainrelay.c
View File

@ -95,7 +95,7 @@ LOW_DEFAULT_PORTS_BOUNDARY,HIGH_DEFAULT_PORTS_BOUNDARY,0,0,0,"",
/////////////// MISC PARAMS //////////////// /////////////// MISC PARAMS ////////////////
0,0,0,0,0,SHATYPE_SHA1,':',0,0,TURN_CREDENTIALS_NONE,0,0,0,0,0,0, 0,0,0,0,0,SHATYPE_SHA1,':',0,0,TURN_CREDENTIALS_NONE,0,0,0,0,0,0,
///////////// Users DB ////////////// ///////////// Users DB //////////////
{ 0, {"\0",NULL}, {0,NULL,NULL, {NULL,0}} } { (TURN_USERDB_TYPE)0, {"\0",NULL}, {0,NULL,NULL, {NULL,0}} }
}; };
@ -413,7 +413,7 @@ static char Usage[] = "Usage: turnserver [options]\n"
" for the sessions, combined (input and output network streams are treated separately).\n" " for the sessions, combined (input and output network streams are treated separately).\n"
" -c <filename> Configuration file name (default - turnserver.conf).\n" " -c <filename> Configuration file name (default - turnserver.conf).\n"
#if !defined(TURN_NO_SQLITE) #if !defined(TURN_NO_SQLITE)
" -b, , --db, --userdb <filename> SQLite database file name (default - /var/db/turndb).\n" " -b, , --db, --userdb <filename> SQLite database file name (default - /var/turndb).\n"
#endif #endif
#if !defined(TURN_NO_PQ) #if !defined(TURN_NO_PQ)
" -e, --psql-userdb, --sql-userdb <conn-string> PostgreSQL database connection string, if used (default - empty, no PostreSQL DB used).\n" " -e, --psql-userdb, --sql-userdb <conn-string> PostgreSQL database connection string, if used (default - empty, no PostreSQL DB used).\n"
@ -587,7 +587,7 @@ static char AdminUsage[] = "Usage: turnadmin [command] [options]\n"
" -G, --list-realm-options List realm params.\n" " -G, --list-realm-options List realm params.\n"
"\nOptions with mandatory values:\n\n" "\nOptions with mandatory values:\n\n"
#if !defined(TURN_NO_SQLITE) #if !defined(TURN_NO_SQLITE)
" -b, --db, --userdb SQLite database file, default value is /var/db/turndb.\n" " -b, --db, --userdb SQLite database file, default value is /var/turndb.\n"
#endif #endif
#if !defined(TURN_NO_PQ) #if !defined(TURN_NO_PQ)
" -e, --psql-userdb, --sql-userdb PostgreSQL user database connection string, if PostgreSQL DB is used.\n" " -e, --psql-userdb, --sql-userdb PostgreSQL user database connection string, if PostgreSQL DB is used.\n"

2
src/apps/relay/userdb.h
View File

@ -48,7 +48,7 @@ extern "C" {
//////////// Defines ////////////////////////////// //////////// Defines //////////////////////////////
#define DEFAULT_USERDB_FILE ("/var/db/turndb") #define DEFAULT_USERDB_FILE ("/var/turndb")
#define AUTH_SECRET_SIZE (512) #define AUTH_SECRET_SIZE (512)