From e8394a8f011562bf30dec38b538f06ee5786273a Mon Sep 17 00:00:00 2001
From: mom040267 <mom040267@users.noreply.github.com>
Date: Sun, 4 Jan 2015 03:09:35 +0000
Subject: [PATCH] working on https

---
 Makefile.in                                       | 4 ++--
 src/apps/relay/mainrelay.h                        | 2 +-
 src/apps/relay/{turncli.c => turn_admin_server.c} | 2 +-
 src/apps/relay/{turncli.h => turn_admin_server.h} | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/apps/relay/{turncli.c => turn_admin_server.c} (99%)
 rename src/apps/relay/{turncli.h => turn_admin_server.h} (97%)

diff --git a/Makefile.in b/Makefile.in
index bae43e1..7b99032 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,8 +30,8 @@ HIREDIS_MODS = src/apps/common/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
 
-SERVERAPP_HEADERS = src/apps/relay/userdb.h src/apps/relay/tls_listener.h src/apps/relay/mainrelay.h src/apps/relay/turncli.h src/apps/relay/dtls_listener.h src/apps/relay/libtelnet.h ${HIREDIS_HEADERS} ${USERDB_HEADERS}
-SERVERAPP_MODS = src/apps/relay/mainrelay.c src/apps/relay/netengine.c src/apps/relay/libtelnet.c src/apps/relay/turncli.c src/apps/relay/userdb.c src/apps/relay/tls_listener.c src/apps/relay/dtls_listener.c ${HIREDIS_MODS} ${USERDB_MODS}
+SERVERAPP_HEADERS = src/apps/relay/userdb.h src/apps/relay/tls_listener.h src/apps/relay/mainrelay.h src/apps/relay/turn_admin_server.h src/apps/relay/dtls_listener.h src/apps/relay/libtelnet.h ${HIREDIS_HEADERS} ${USERDB_HEADERS}
+SERVERAPP_MODS = src/apps/relay/mainrelay.c src/apps/relay/netengine.c src/apps/relay/libtelnet.c src/apps/relay/turn_admin_server.c src/apps/relay/userdb.c src/apps/relay/tls_listener.c src/apps/relay/dtls_listener.c ${HIREDIS_MODS} ${USERDB_MODS}
 SERVERAPP_DEPS = ${SERVERTURN_MODS} ${SERVERTURN_DEPS} ${SERVERAPP_MODS} ${SERVERAPP_HEADERS} ${COMMON_DEPS} ${IMPL_DEPS} lib/libturnclient.a
 
 TURN_BUILD_RESULTS = bin/turnutils_stunclient bin/turnutils_rfc5769check bin/turnutils_uclient bin/turnserver bin/turnutils_peer lib/libturnclient.a include/turn/ns_turn_defs.h sqlite_empty_db
diff --git a/src/apps/relay/mainrelay.h b/src/apps/relay/mainrelay.h
index be020ac..b57c27a 100644
--- a/src/apps/relay/mainrelay.h
+++ b/src/apps/relay/mainrelay.h
@@ -70,7 +70,7 @@
 #include "ns_turn_khash.h"
 
 #include "userdb.h"
-#include "turncli.h"
+#include "turn_admin_server.h"
 
 #include "tls_listener.h"
 #include "dtls_listener.h"
diff --git a/src/apps/relay/turncli.c b/src/apps/relay/turn_admin_server.c
similarity index 99%
rename from src/apps/relay/turncli.c
rename to src/apps/relay/turn_admin_server.c
index c84b663..894adda 100644
--- a/src/apps/relay/turncli.c
+++ b/src/apps/relay/turn_admin_server.c
@@ -64,7 +64,7 @@
 
 #include "apputils.h"
 
-#include "turncli.h"
+#include "turn_admin_server.h"
 
 ///////////////////////////////
 
diff --git a/src/apps/relay/turncli.h b/src/apps/relay/turn_admin_server.h
similarity index 97%
rename from src/apps/relay/turncli.h
rename to src/apps/relay/turn_admin_server.h
index aef0e0c..05c8d26 100644
--- a/src/apps/relay/turncli.h
+++ b/src/apps/relay/turn_admin_server.h
@@ -28,8 +28,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __TURNCLI__
-#define __TURNCLI__
+#ifndef __TURN_ADMIN_SERVER__
+#define __TURN_ADMIN_SERVER__
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -101,5 +101,5 @@ void send_https_socket(ioa_socket_handle s);
 #endif
 
 #endif
-/// __TURNCLI__///
+/// __TURN_ADMIN_SERVER__///