Skip to content

Commit 9060136

Browse files
VictorTrapenokVictorTrapenok
authored
Merge pull request #47 from CppComet/alfa
v3.34
2 parents dfaf546 + f33d96b commit 9060136

File tree

356 files changed

+169685
-1149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+169685
-1149
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ FEATURES:
55
IMPROVEMENTS:
66
BUG FIXES:
77

8+
## v3.34
9+
10+
FEATURES:
11+
* video api 1.01
12+
* add table users_data
13+
814
## v3.33
915

1016
FEATURES:

‎CMakeLists.txt

+51-44
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ add_definitions(-DCMAKE_BUILD_TYPE=debug)
1212
# Поиск библиотеки pthreads
1313
find_package(Threads REQUIRED)
1414
if(NOT Threads_FOUND)
15-
message(SEND_ERROR "Threads - Not Found")
15+
message(SEND_ERROR "Не найден Threads.")
1616
return()
1717
else()
1818
include_directories(${Threads_INCLUDE_DIRS})
@@ -75,9 +75,11 @@ MARK_AS_ADVANCED(
7575
MYSQL_LIBRARY
7676
MYSQL_INCLUDE_DIR
7777
)
78-
###########################################
79-
include_directories(${MYSQL_INCLUDE_DIR} src/freeswitch-esl/include)
78+
###########################################
79+
8080

81+
include_directories(${MYSQL_INCLUDE_DIR} dependencies dependencies/freeswitch-esl/include dependencies/jwt-cpp/src/include)
82+
8183

8284
# Расположение заголовочных файлов
8385
#include_directories(foo)
@@ -89,62 +91,67 @@ execute_process( COMMAND bison -d --verbose --debug src/CometQL.y -o src/CometQL
8991
execute_process( COMMAND yacc -d --verbose --debug src/CometQL.y -o src/CometQL.cc)
9092
execute_process( COMMAND cc -c src/lex.yy.c -o src/lex.yy.o)
9193

94+
9295
execute_process( COMMAND mv CometQL.tab.c src/CometQL.tab.c)
9396
execute_process( COMMAND mv CometQL.tab.h src/CometQL.tab.h)
9497
execute_process( COMMAND mv lex.yy.c src/lex.yy.c)
9598
execute_process( COMMAND mv y.tab.c src/y.tab.c)
9699
execute_process( COMMAND mv y.tab.h src/y.tab.h)
97100

101+
MESSAGE(STATUS "Build dependencies")
102+
execute_process( COMMAND sh dependencies/build.sh)
103+
98104
set(ESL_EXE
99-
src/freeswitch-esl/cJSON.c
100-
src/freeswitch-esl/cJSON_Utils.c
101-
src/freeswitch-esl/esl.c
102-
src/freeswitch-esl/esl_buffer.c
103-
src/freeswitch-esl/esl_config.c
104-
src/freeswitch-esl/esl_event.c
105-
src/freeswitch-esl/esl_json.c
106-
src/freeswitch-esl/esl_threadmutex.c)
105+
dependencies/freeswitch-esl/cJSON.c
106+
dependencies/freeswitch-esl/cJSON_Utils.c
107+
dependencies/freeswitch-esl/esl.c
108+
dependencies/freeswitch-esl/esl_buffer.c
109+
dependencies/freeswitch-esl/esl_config.c
110+
dependencies/freeswitch-esl/esl_event.c
111+
dependencies/freeswitch-esl/esl_json.c
112+
dependencies/freeswitch-esl/esl_threadmutex.c)
107113

108114
set(TINYXML2_EXE
109-
src/tinyxml2/tinyxml2.cpp)
115+
dependencies/tinyxml2/tinyxml2.cpp)
110116

117+
set(HASHLIB2PLUS_EXE
118+
dependencies/hashlib2plus/src/hl_md5.cpp
119+
dependencies/hashlib2plus/src/hl_md5wrapper.cpp)
111120

112121
# Установка переменной со списком исходников для исполняемого файла
113122
set(SOURCE_EXE
114-
src/hashlib2plus/src/hl_md5.cpp
115-
src/hashlib2plus/src/hl_md5wrapper.cpp
116-
src/TagLoger.cpp
117-
src/TagTimer.cpp
118-
src/main.cpp
119-
src/dbLink.cpp
120-
src/appConf.cpp
121-
src/intervalLoop.cpp
122-
src/tcpServer_benchmark.cpp
123-
src/base64.cpp
124-
src/sha1.cpp
125-
src/CometQL.cpp
126-
src/devManager.cpp
127-
src/internalApi.cpp
128-
src/Client_connection.cpp
129-
src/Freeswitch_connection.cpp
130-
src/MySqlProtocol.cpp
131-
src/connection.cpp
132-
src/mystring.cpp
133-
src/MySql_connection.cpp
134-
src/CometQLProxy_connection.cpp
135-
src/tcpServer.cpp
136-
src/user_index.cpp
137-
src/backtrace.cpp
138-
src/thread_data.cpp
139-
src/thread_data.h
140-
src/lex.yy.o
141-
src/CometQL.cc)
142-
143-
# Создает исполняемый файл с именем cpp_comet_coverage из исходников
144-
add_executable(cpp_comet ${ESL_EXE} ${SOURCE_EXE} ${TINYXML2_EXE})
123+
src/TagLoger.cpp
124+
src/TagTimer.cpp
125+
src/main.cpp
126+
src/appConf.cpp
127+
src/dbLink.cpp
128+
src/intervalLoop.cpp
129+
src/tcpServer_benchmark.cpp
130+
src/base64.cpp
131+
src/sha1.cpp
132+
src/CometQL.cpp
133+
src/devManager.cpp
134+
src/internalApi.cpp
135+
src/Client_connection.cpp
136+
src/Freeswitch_connection.cpp
137+
src/MySqlProtocol.cpp
138+
src/connection.cpp
139+
src/mystring.cpp
140+
src/MySql_connection.cpp
141+
src/CometQLProxy_connection.cpp
142+
src/tcpServer.cpp
143+
src/user_index.cpp
144+
src/backtrace.cpp
145+
src/thread_data.cpp
146+
src/thread_data.h
147+
src/lex.yy.o
148+
src/CometQL.cc)
149+
150+
# Создает исполняемый файл с именем cpp_comet из исходников
151+
add_executable(cpp_comet ${ESL_EXE} ${HASHLIB2PLUS_EXE} ${SOURCE_EXE} ${TINYXML2_EXE} ./dependencies/jwt-cpp/src/libjwt.a)
145152

146153
# Подключение библиотеки pthreads
147-
target_link_libraries (cpp_comet ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_LIBRARIES} crypt uuid )
154+
target_link_libraries (cpp_comet ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_LIBRARIES} crypt uuid)
148155

149156

150157
#cmake ./ && make

‎comet.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ interval = 3600
7070
js = application/javascript
7171

7272
[sip]
73-
pipesalt = fFg34F3nf4n3fGF
73+
pipesalt = salt_string
74+
freeswitch = []Server=app.comet-server.ru,Pwd=ClueCon,WSport=7443,Port=8021
7475

7576

7677
[log]

‎coverage/CMakeLists.txt

+49-47
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
project(cpp_comet_coverage)
1+
project(ccommet)
22
cmake_minimum_required(VERSION 2.6)
33

44
message(STATUS "System: " ${CMAKE_SYSTEM_NAME} " " ${CMAKE_SYSTEM_VERSION})
55
message(STATUS "Processor: " ${CMAKE_HOST_SYSTEM_PROCESSOR})
66

7-
8-
#SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
9-
SET(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
10-
SET(CMAKE_CXX_FLAGS "-std=c++11 -g3 -fprofile-arcs -ftest-coverage")
7+
SET(CMAKE_CXX_FLAGS "-std=c++11 -g3")
118

129
#add_definitions(-DMY_PROJECT)
1310
add_definitions(-DCMAKE_BUILD_TYPE=debug)
1411

1512
# Поиск библиотеки pthreads
1613
find_package(Threads REQUIRED)
1714
if(NOT Threads_FOUND)
18-
message(SEND_ERROR "Threads - Not Found")
15+
message(SEND_ERROR "Не найден Threads.")
1916
return()
2017
else()
2118
include_directories(${Threads_INCLUDE_DIRS})
@@ -79,7 +76,7 @@ MARK_AS_ADVANCED(
7976
MYSQL_INCLUDE_DIR
8077
)
8178
###########################################
82-
include_directories(${MYSQL_INCLUDE_DIR} ../src/freeswitch-esl/include)
79+
include_directories(${MYSQL_INCLUDE_DIR} ../dependencies ../dependencies/freeswitch-esl/include ../dependencies/jwt-cpp/src/include)
8380

8481

8582
# Расположение заголовочных файлов
@@ -97,58 +94,63 @@ execute_process( COMMAND mv ./CometQL.tab.h ../src/CometQL.tab.h)
9794
execute_process( COMMAND mv ./lex.yy.c ../src/lex.yy.c)
9895
execute_process( COMMAND mv ./y.tab.c ../src/y.tab.c)
9996
execute_process( COMMAND mv ./y.tab.h ../src/y.tab.h)
100-
97+
10198
add_definitions(-DUSE_COVERAGE=1)
10299

100+
MESSAGE(STATUS "Build dependencies")
101+
execute_process( COMMAND cd .. && sh ./dependencies/build.sh)
102+
103103
set(ESL_EXE
104-
../src/freeswitch-esl/cJSON.c
105-
../src/freeswitch-esl/cJSON_Utils.c
106-
../src/freeswitch-esl/esl.c
107-
../src/freeswitch-esl/esl_buffer.c
108-
../src/freeswitch-esl/esl_config.c
109-
../src/freeswitch-esl/esl_event.c
110-
../src/freeswitch-esl/esl_json.c
111-
../src/freeswitch-esl/esl_threadmutex.c)
104+
../dependencies/freeswitch-esl/cJSON.c
105+
../dependencies/freeswitch-esl/cJSON_Utils.c
106+
../dependencies/freeswitch-esl/esl.c
107+
../dependencies/freeswitch-esl/esl_buffer.c
108+
../dependencies/freeswitch-esl/esl_config.c
109+
../dependencies/freeswitch-esl/esl_event.c
110+
../dependencies/freeswitch-esl/esl_json.c
111+
../dependencies/freeswitch-esl/esl_threadmutex.c)
112112

113113
set(TINYXML2_EXE
114-
../src/tinyxml2/tinyxml2.cpp)
114+
../dependencies/tinyxml2/tinyxml2.cpp)
115+
116+
set(HASHLIB2PLUS_EXE
117+
../dependencies/hashlib2plus/src/hl_md5.cpp
118+
../dependencies/hashlib2plus/src/hl_md5wrapper.cpp)
115119

116120
# Установка переменной со списком исходников для исполняемого файла
117121
set(SOURCE_EXE
118-
../src/hashlib2plus/src/hl_md5.cpp
119-
../src/hashlib2plus/src/hl_md5wrapper.cpp
120-
../src/TagLoger.cpp
121-
../src/TagTimer.cpp
122-
../src/main.cpp
123-
../src/dbLink.cpp
124-
../src/appConf.cpp
125-
../src/intervalLoop.cpp
126-
../src/tcpServer_benchmark.cpp
127-
../src/base64.cpp
128-
../src/sha1.cpp
129-
../src/CometQL.cpp
130-
../src/devManager.cpp
131-
../src/internalApi.cpp
132-
../src/Client_connection.cpp
133-
../src/Freeswitch_connection.cpp
134-
../src/MySqlProtocol.cpp
135-
../src/connection.cpp
136-
../src/mystring.cpp
137-
../src/MySql_connection.cpp
138-
../src/CometQLProxy_connection.cpp
139-
../src/tcpServer.cpp
140-
../src/user_index.cpp
141-
../src/backtrace.cpp
142-
../src/thread_data.cpp
143-
../src/thread_data.h
144-
../src/lex.yy.o
145-
../src/CometQL.cc)
122+
../src/TagLoger.cpp
123+
../src/TagTimer.cpp
124+
../src/main.cpp
125+
../src/dbLink.cpp
126+
../src/appConf.cpp
127+
../src/intervalLoop.cpp
128+
../src/tcpServer_benchmark.cpp
129+
../src/base64.cpp
130+
../src/sha1.cpp
131+
../src/CometQL.cpp
132+
../src/devManager.cpp
133+
../src/internalApi.cpp
134+
../src/Client_connection.cpp
135+
../src/Freeswitch_connection.cpp
136+
../src/MySqlProtocol.cpp
137+
../src/connection.cpp
138+
../src/mystring.cpp
139+
../src/MySql_connection.cpp
140+
../src/CometQLProxy_connection.cpp
141+
../src/tcpServer.cpp
142+
../src/user_index.cpp
143+
../src/backtrace.cpp
144+
../src/thread_data.cpp
145+
../src/thread_data.h
146+
../src/lex.yy.o
147+
../src/CometQL.cc)
146148

147149
# Создает исполняемый файл с именем cpp_comet_coverage из исходников
148-
add_executable(cpp_comet_coverage ${ESL_EXE} ${SOURCE_EXE} ${TINYXML2_EXE})
150+
add_executable(cpp_comet_coverage ${ESL_EXE} ${HASHLIB2PLUS_EXE} ${SOURCE_EXE} ${TINYXML2_EXE} ../dependencies/jwt-cpp/src/libjwt.a)
149151

150152
# Подключение библиотеки pthreads
151-
target_link_libraries (cpp_comet_coverage ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_LIBRARIES} crypt uuid gcov )
153+
target_link_libraries (cpp_comet_coverage ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_LIBRARIES} crypt uuid)
152154

153155

154156
#cmake ./ && make

0 commit comments

Comments
 (0)