TeaSpeak/TeaSpeak-Client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.did.science/WolverinDEV/TeaSpeak-Client

Browse Source
This commit is contained in:
WolverinDEV
2019-10-19 11:59:49 +02:00
parent bd8798490b a3a142aec3
commit 566006f8ca
15 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/serverconnection/src/connection/ServerConnection.cpp
+11 -11
View File
@@ -126,7 +126,7 @@ void ServerConnection::initialize() {
argv[0] = Nan::New<v8::Number>(error_id);
if(this->callback_connect)
this->callback_connect->Call(1, argv);
Nan::Call(*this->callback_connect, 1, argv);
this->callback_connect = nullptr;
}
});
@@ -138,7 +138,7 @@ void ServerConnection::initialize() {
argv[0] = Nan::New<v8::Number>(error_id);
if(this->callback_disconnect)
this->callback_disconnect->Call(1, argv);
Nan::Call(*this->callback_disconnect, 1, argv);
this->callback_disconnect = nullptr;
});
@@ -253,7 +253,7 @@ NAN_METHOD(ServerConnection::connect) {
if(identity_key->IsString()) {
auto& identity = this->protocol_handler->get_identity_key();
auto key = base64::decode(*Nan::Utf8String(identity_key->ToString(Nan::GetCurrentContext()).ToLocalChecked()));
if(ecc_import((u_char*) key.data(), key.length(), &identity) != CRYPT_OK) {
if(ecc_import((u_char*) key.data(), (unsigned long) key.length(), &identity) != CRYPT_OK) {
Nan::ThrowError(tr("failed to import identity"));
return;
}
@@ -272,7 +272,7 @@ NAN_METHOD(ServerConnection::connect) {
sockaddr_storage remote_address{};
/* resolve address */
{
addrinfo hints{}, *result, *p;
addrinfo hints{}, *result;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
@@ -355,7 +355,7 @@ NAN_METHOD(ServerConnection::error_message) {
return;
}
auto error = this->errors.get_message(info[0]->IntegerValue(Nan::GetCurrentContext()).FromMaybe(0));
auto error = this->errors.get_message((ErrorHandler::error_id) info[0]->IntegerValue(Nan::GetCurrentContext()).FromMaybe(0));
info.GetReturnValue().Set(Nan::New<v8::String>(error).ToLocalChecked());
}
@@ -404,7 +404,7 @@ NAN_METHOD(ServerConnection::send_command) {
ts::Command cmd(*Nan::Utf8String(command));
for(size_t index = 0; index < arguments->Length(); index++) {
auto object = arguments->Get(index);
auto object = arguments->Get((uint32_t) index);
if(!object->IsObject()) {
Nan::ThrowError(Nan::New<v8::String>("invalid parameter (" + to_string(index) + ")").ToLocalChecked());
return;
@@ -435,7 +435,7 @@ NAN_METHOD(ServerConnection::send_command) {
for(size_t index = 0; index < switches->Length(); index++) {
auto object = switches->Get(index);
auto object = switches->Get((uint32_t) index);
if(!object->IsString()) {
Nan::ThrowError(Nan::New<v8::String>("invalid switch (" + to_string(index) + ")").ToLocalChecked());
return;
@@ -638,7 +638,7 @@ void ServerConnection::_execute_callback_commands() {
v8::Local<v8::Value> arguments[3];
arguments[0] = Nan::New<v8::String>(next_command->command()).ToLocalChecked();
auto parameters = Nan::New<v8::Array>(next_command->bulkCount());
auto parameters = Nan::New<v8::Array>((int) next_command->bulkCount());
for(size_t index = 0; index < next_command->bulkCount(); index++) {
auto object = Nan::New<v8::Object>();
auto& bulk = next_command->operator[](index);
@@ -646,15 +646,15 @@ void ServerConnection::_execute_callback_commands() {
for(const auto& key : bulk.keys())
Nan::Set(object, Nan::New<v8::String>(key).ToLocalChecked(), Nan::New<v8::String>(bulk[key].string()).ToLocalChecked());
parameters->Set(index, object);
parameters->Set((uint32_t) index, object);
}
arguments[1] = parameters;
auto switched = Nan::New<v8::Array>(next_command->parms().size());
auto switched = Nan::New<v8::Array>((int) next_command->parms().size());
for(size_t index = 0; index < next_command->parms().size(); index++) {
auto& key = next_command->parms()[index];
parameters->Set(index, Nan::New<v8::String>(key).ToLocalChecked());
parameters->Set((uint32_t) index, Nan::New<v8::String>(key).ToLocalChecked());
}
arguments[2] = switched;