Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加util相关函数，整理库文件名

Browse Source
This commit is contained in:
xiongziliang
2019-12-27 10:10:31 +08:00
parent 528e4fffe5
commit 5b43b2c004
25 changed files with 228 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/tests/server.c
View File

@@ -26,7 +26,7 @@
#include <signal.h>
#include <string.h>
#include "mediakit.h"
#include "mk_mediakit.h"
#ifdef _WIN32
#include "windows.h"
@@ -396,12 +396,24 @@ static void s_on_exit(int sig){
flag = 0;
}
int main(int argc, char *argv[]) {
char ini_path[2048] = {0};
strcpy(ini_path,argv[0]);
strcat(ini_path,".ini");
char *ini_path = mk_uitl_get_exe_dir("c_api.ini");
char *ssl_path = mk_uitl_get_exe_dir("ssl.p12");
mk_config config = {
.ini = ini_path,
.ini_is_path = 1,
.log_level = 0,
.ssl = ssl_path,
.ssl_is_path = 1,
.ssl_pwd = NULL,
.thread_num = 0
};
mk_env_init(&config);
free(ini_path);
free(ssl_path);
mk_env_init1(0, 0, 1, ini_path, 0, NULL, NULL);
mk_http_server_start(80, 0);
mk_http_server_start(443, 1);
mk_rtsp_server_start(554, 0);
mk_rtmp_server_start(1935, 0);
mk_shell_server_start(9000);
@@ -424,7 +436,6 @@ int main(int argc, char *argv[]) {
};
mk_events_listen(&events);
signal(SIGINT, s_on_exit );// 设置退出信号
while (flag) {
#ifdef _WIN32

21
api/tests/websocket.c
View File

@@ -28,7 +28,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "mediakit.h"
#include "mk_mediakit.h"
#ifdef _WIN32
#include "windows.h"
#else
@@ -36,6 +36,7 @@
#endif
#define LOG_LEV 4
//修改此宏，可以选择协议类型
#define TCP_TYPE mk_type_ws
static int flag = 1;
@@ -194,11 +195,21 @@ void test_client(){
}
int main(int argc, char *argv[]) {
char ini_path[2048] = {0};
strcpy(ini_path,argv[0]);
strcat(ini_path,".ini");
char *ini_path = mk_uitl_get_exe_dir("c_api.ini");
char *ssl_path = mk_uitl_get_exe_dir("ssl.p12");
mk_env_init1(0, 0, 1, ini_path, 0, NULL, NULL);
mk_config config = {
.ini = ini_path,
.ini_is_path = 1,
.log_level = 0,
.ssl = ssl_path,
.ssl_is_path = 1,
.ssl_pwd = NULL,
.thread_num = 0
};
mk_env_init(&config);
free(ini_path);
free(ssl_path);
test_server();
test_client();