YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 12:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use config to declare signal/stun server info

Browse Source
This commit is contained in:
dijunkun
2023-07-18 16:58:53 +08:00
parent ea9ffbd6d8
commit 03cb767f1f
16 changed files with 830 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/pc/peer_connection.cpp
View File

@@ -1,8 +1,10 @@
#include "peer_connection.h"
#include <nlohmann/json.hpp>
#include <regex>
#include "INIReader.h"
#include "log.h"
#include "nlohmann/json.hpp"
using nlohmann::json;
@@ -17,7 +19,20 @@ PeerConnection::PeerConnection() {}
PeerConnection::~PeerConnection() {}
int PeerConnection::Init(std::string const &uri) {
int PeerConnection::Init(Params params) {
INIReader reader(params.cfg_path);
std::string cfg_signal_server_ip = reader.Get("signal server", "ip", "-1");
std::string cfg_signal_server_port =
reader.Get("signal server", "port", "-1");
std::string cfg_stun_server_ip = reader.Get("stun server", "ip", "-1");
std::string cfg_stun_server_port = reader.Get("stun server", "port", "-1");
std::regex regex("\n");
LOG_INFO("Read config success");
int signal_server_port = stoi(cfg_signal_server_port);
int stun_server_port = stoi(cfg_signal_server_port);
on_receive_ws_msg_ = [this](const std::string &msg) {
do {
} while (!ice_transport_);
@@ -47,12 +62,13 @@ int PeerConnection::Init(std::string const &uri) {
};
ws_transport_ = new WsTransport(on_receive_ws_msg_);
uri_ = "ws://" + cfg_signal_server_ip + ":" + cfg_signal_server_port;
if (ws_transport_) {
ws_transport_->Connect(uri);
ws_transport_->Connect(uri_);
}
ice_transport_ = new IceTransport(ws_transport_, on_receive_ice_msg_);
ice_transport_->InitIceTransport();
ice_transport_->InitIceTransport(cfg_stun_server_ip, stun_server_port);
do {
LOG_INFO("GetSignalStatus = {}", GetSignalStatus());
@@ -62,7 +78,18 @@ int PeerConnection::Init(std::string const &uri) {
return 0;
}
int PeerConnection::Init(std::string const &uri, std::string const &id) {
int PeerConnection::Init(Params params, std::string const &id) {
INIReader reader(params.cfg_path);
std::string cfg_signal_server_ip = reader.Get("signal server", "ip", "-1");
std::string cfg_signal_server_port =
reader.Get("signal server", "port", "-1");
std::string cfg_stun_server_ip = reader.Get("stun server", "ip", "-1");
std::string cfg_stun_server_port = reader.Get("stun server", "port", "-1");
std::regex regex("\n");
int signal_server_port = stoi(cfg_signal_server_port);
int stun_server_port = stoi(cfg_signal_server_port);
on_receive_ws_msg_ = [this](const std::string &msg) {
do {
} while (!ice_transport_);
@@ -94,12 +121,13 @@ int PeerConnection::Init(std::string const &uri, std::string const &id) {
transport_id_ = id;
ws_transport_ = new WsTransport(on_receive_ws_msg_);
uri_ = "ws://" + cfg_signal_server_ip + ":" + cfg_signal_server_port;
if (ws_transport_) {
ws_transport_->Connect(uri);
ws_transport_->Connect(uri_);
}
ice_transport_ = new IceTransport(ws_transport_, on_receive_ice_msg_);
ice_transport_->InitIceTransport(id);
ice_transport_->InitIceTransport(cfg_stun_server_ip, stun_server_port, id);
do {
LOG_INFO("GetSignalStatus = {}", GetSignalStatus());

17
src/pc/peer_connection.h
View File

@@ -9,13 +9,25 @@
enum SignalStatus { Connecting = 0, Connected, Closed };
class PeerConnection {
public:
typedef void (*OnReceiveBuffer)(unsigned char *, size_t, const char *,
const size_t);
typedef void (*NetStatusReport)(const unsigned short, const unsigned short);
typedef struct {
const char *cfg_path;
OnReceiveBuffer on_receive_buffer;
NetStatusReport net_status_report;
} Params;
public:
PeerConnection();
~PeerConnection();
public:
int Init(std::string const &uri);
int Init(std::string const &uri, std::string const &id);
int Init(Params params);
int Init(Params params, std::string const &id);
int Destroy();
SignalStatus GetSignalStatus();
@@ -23,6 +35,7 @@ class PeerConnection {
int SendData(const char *data, size_t size);
private:
std::string uri_ = "";
WsTransport *ws_transport_ = nullptr;
IceTransport *ice_transport_ = nullptr;
std::function<void(const std::string &)> on_receive_ws_msg_ = nullptr;