danog/php-libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/php-libtgvoip.git synced 2024-11-30 04:19:26 +01:00
Code Issues Projects Releases Wiki Activity

Refactoring and simplification

Browse Source
This commit is contained in:
Daniil Gentili 2019-03-29 14:07:22 +01:00
parent a1ed35bdad
commit 6fe1626822
4 changed files with 111 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

File diff suppressed because one or more lines are too long

2
libtgvoip

@ -1 +1 @@
Subproject commit 9bc966c64feecd45b468590e025c1a739c8fb7dd
Subproject commit 29fd5772894f1938e75717f1aa66282dac5751b9

79
main.cpp
View File

@ -31,19 +31,30 @@ void VoIP::__construct(Php::Parameters &params)
Php::Array empty;
self["configuration"]["endpoints"] = empty;
self["configuration"]["shared_config"] = empty;
self["storage"] = empty;
self["internalStorage"] = empty;
self["internalStorage"]["creator"] = params[0];
otherID = (int)params[1];
self["internalStorage"]["callID"] = params[2];
self["madeline"] = params[3];
callState = (int)params[4];
self["internalStorage"]["protocol"] = params[5];
self["madeline"] = params[2];
callState = (int)params[3];
initVoIPController();
}
void VoIP::setCall(Php::Parameters &params)
{
Php::Array empty;
Php::Value self(this);
Php::Value call = params[0];
Php::Value callId = call["id"];
Php::Value callAccessHash = call["access_hash"];
Php::Value protocol = params[0]["protocol"];
self["internalStorage"]["callID"] = empty;
self["internalStorage"]["callID"]["_"] = "inputPhoneCall";
self["internalStorage"]["callID"]["id"] = callId;
self["internalStorage"]["callID"]["access_hash"] = callAccessHash;
self["internalStorage"]["protocol"] = protocol;
}
void VoIP::initVoIPController()
{
inst = new VoIPController();
@ -65,7 +76,6 @@ void VoIP::initVoIPController()
callbacks.upgradeToGroupCallRequested = NULL;
inst->SetCallbacks(callbacks);
inst->SetAudioDataCallbacks([this](int16_t *buffer, size_t size) { this->sendAudioFrame(buffer, size); }, [this](int16_t *buffer, size_t size) { this->recvAudioFrame(buffer, size); });
}
void VoIP::deinitVoIPController()
@ -77,7 +87,7 @@ void VoIP::deinitVoIPController()
{
inst->Stop();
delete inst;
inst=NULL;
inst = NULL;
}
while (holdFiles.size())
@ -332,9 +342,11 @@ void VoIP::parseConfig()
cfg.statsDumpFilePath = statsDumpFilePath;
}
Php::Value shared_config = self["configuration"]["shared_config"];
std::map<std::string, std::string> copyconfig(shared_config);
ServerConfig::GetSharedInstance()->Update(copyconfig);
if (self["configuration"]["shared_config"])
{
Php::Value shared_config = self["configuration"]["shared_config"];
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", VoIPServerConfig::getDefault(), shared_config)));
}
inst->SetConfig(cfg);
char *key = (char *)malloc(256);
@ -363,9 +375,7 @@ void VoIP::parseConfig()
{
memcpy(pTag, peer_tag.c_str(), 16);
}
eps.push_back(Endpoint(endpoints[i]["id"], (int32_t)endpoints[i]["port"], v4addr, v6addr, Endpoint::TYPE_UDP_RELAY, pTag));
eps.push_back(Endpoint(endpoints[i]["id"], (int32_t)endpoints[i]["port"], v4addr, v6addr, Endpoint::TYPE_TCP_RELAY, pTag));
eps.push_back(Endpoint(endpoints[i]["id"], (int32_t)endpoints[i]["port"], v4addr, v6addr, Endpoint::Type::UDP_RELAY, pTag));
free(pTag);
}
@ -513,7 +523,11 @@ Php::Value VoIP::getStats()
Php::Value VoIP::getPeerCapabilities()
{
return (int64_t) inst->GetPeerCapabilities();
return (int64_t)inst->GetPeerCapabilities();
}
Php::Value VoIP::getConnectionMaxLayer()
{
return VoIPController::GetConnectionMaxLayer();
}
void VoIP::requestCallUpgrade()
{
@ -537,6 +551,31 @@ Php::Value VoIP::isPlaying()
return playing;
}
void VoIPServerConfig::update(Php::Parameters &params)
{
Php::Value copyCustom = params[0];
config = copyCustom;
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", configDefault, config)));
}
Php::Value VoIPServerConfig::get()
{
return config;
}
void VoIPServerConfig::updateDefault(Php::Parameters &params)
{
Php::Value copyDefault = params[0];
configDefault = copyDefault;
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", configDefault, config)));
}
Php::Value VoIPServerConfig::getDefault()
{
return configDefault;
}
extern "C"
{
@ -554,6 +593,13 @@ extern "C"
// for the entire duration of the process (that's why it's static)
static Php::Extension extension("php-libtgvoip", "1.1.2");
Php::Class<VoIP> voipServerConfig("VoIPServerConfig");
voipServerConfig.method<&VoIPServerConfig::update>("update", Php::Public);
voipServerConfig.method<&VoIPServerConfig::get>("get", Php::Public);
voipServerConfig.method<&VoIPServerConfig::updateDefault>("updateDefault", Php::Public);
voipServerConfig.method<&VoIPServerConfig::getDefault>("getDefault", Php::Public);
// description of the class so that PHP knows which methods are accessible
Php::Class<VoIP> voip("VoIP");
@ -573,7 +619,8 @@ extern "C"
voip.method<&VoIP::discard>("discard", Php::Public | Php::Final, {Php::ByVal("reason", Php::Type::Array, false), Php::ByVal("rating", Php::Type::Array, false), Php::ByVal("debug", Php::Type::Bool, false)});
voip.method<&VoIP::accept>("accept", Php::Public | Php::Final);
voip.method<&VoIP::close>("close", Php::Public | Php::Final);
voip.method<&VoIP::__construct>("__construct", Php::Public | Php::Final, {Php::ByVal("creator", Php::Type::Bool), Php::ByVal("otherID", Php::Type::Numeric), Php::ByVal("InputPhoneCall", Php::Type::Array), Php::ByRef("madeline", Php::Type::Object), Php::ByVal("callState", Php::Type::Numeric), Php::ByVal("protocol", Php::Type::Array)});
voip.method<&VoIP::setCall>("setCall", Php::Public | Php::Final, {Php::ByVal("phoneCall", Php::Type::Array)});
voip.method<&VoIP::__construct>("__construct", Php::Public | Php::Final, {Php::ByVal("creator", Php::Type::Bool), Php::ByVal("otherID", Php::Type::Numeric), Php::ByRef("madeline", Php::Type::Object), Php::ByVal("callState", Php::Type::Numeric)});
voip.method<&VoIP::__wakeup>("__wakeup", Php::Public | Php::Final);
voip.method<&VoIP::__sleep>("__sleep", Php::Public | Php::Final);
voip.method<&VoIP::setMicMute>("setMicMute", Php::Public | Php::Final, {
@ -592,6 +639,7 @@ extern "C"
voip.method<&VoIP::getDebugString>("getDebugString", Php::Public | Php::Final);
voip.method<&VoIP::getStats>("getStats", Php::Public | Php::Final);
voip.method<&VoIP::getPeerCapabilities>("getPeerCapabilities", Php::Public | Php::Final);
voip.method<&VoIP::getConnectionMaxLayer>("getConnectionMaxLayer", Php::Public);
voip.method<&VoIP::sendGroupCallKey>("sendGroupCallKey", Php::Public | Php::Final, {Php::ByVal("key", Php::Type::String)});
voip.method<&VoIP::requestCallUpgrade>("requestCallUpgrade", Php::Public | Php::Final);
voip.method<&VoIP::startTheMagic>("startTheMagic", Php::Public | Php::Final);
@ -662,6 +710,7 @@ extern "C"
Php::Namespace danog("danog");
Php::Namespace MadelineProto("MadelineProto");
MadelineProto.add(move(voipServerConfig));
MadelineProto.add(move(voip));
danog.add(move(MadelineProto));
extension.add(move(danog));

43
main.h
View File

@ -12,6 +12,30 @@ If not, see <http://www.gnu.org/licenses/>.
#ifndef PHPLIBTGVOIP_H
#define PHPLIBTGVOIP_H
#ifndef TGVOIP_USE_CALLBACK_AUDIO_IO
#define TGVOIP_USE_CALLBACK_AUDIO_IO
#endif
#ifndef WEBRTC_LINUX
#define WEBRTC_LINUX
#endif
#ifndef WEBRTC_POSIX
#define WEBRTC_POSIX
#endif
#ifndef TGVOIP_USE_DESKTOP_DSP
#define TGVOIP_USE_DESKTOP_DSP
#endif
#ifndef WEBRTC_APM_DEBUG_DUMP
#define WEBRTC_APM_DEBUG_DUMP 0
#endif
#ifndef WEBRTC_NS_FLOAT
#define WEBRTC_NS_FLOAT
#endif
#include "libtgvoip/VoIPController.h"
/*
#include <php.h>
@ -35,9 +59,6 @@ If not, see <http://www.gnu.org/licenses/>.
#define CALL_STATE_READY 4
#define CALL_STATE_ENDED 5
#ifndef TGVOIP_USE_CALLBACK_AUDIO_IO
#define TGVOIP_USE_CALLBACK_AUDIO_IO
#endif
using namespace tgvoip;
using namespace tgvoip::audio;
@ -50,10 +71,25 @@ class AudioInputModule;
class AudioOutputModule;
}
}
class VoIPServerConfig : public Php::Base
{
public:
static void update(Php::Parameters &params);
static Php::Value get();
static void updateDefault(Php::Parameters &params);
static Php::Value getDefault();
private:
static Php::Array config;
static Php::Array configDefault;
};
class VoIP : public Php::Base
{
public:
void __construct(Php::Parameters &params);
void setCall(Php::Parameters &params);
void initVoIPController();
Php::Value discard(Php::Parameters &params);
Php::Value accept();
@ -82,6 +118,7 @@ public:
Php::Value getDebugString();
Php::Value getSignalBarsCount();
Php::Value getPeerCapabilities();
static Php::Value getConnectionMaxLayer();
void requestCallUpgrade();
void sendGroupCallKey(Php::Parameters &params);
Php::Value debugCtl(Php::Parameters &params);