tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass const call to do_update_call.

Browse Source
This commit is contained in:
levlam 2023-07-01 13:19:46 +03:00
parent d67d93e5af
commit 25e6e576e8
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
td/telegram/CallActor.cpp
View File

@ -477,17 +477,17 @@ void CallActor::update_call(tl_object_ptr<telegram_api::PhoneCall> call) {
auto status = [&] { auto status = [&] {
switch (call->get_id()) { switch (call->get_id()) {
case telegram_api::phoneCallEmpty::ID: case telegram_api::phoneCallEmpty::ID:
return do_update_call(static_cast<telegram_api::phoneCallEmpty &>(*call)); return do_update_call(static_cast<const telegram_api::phoneCallEmpty &>(*call));
case telegram_api::phoneCallWaiting::ID: case telegram_api::phoneCallWaiting::ID:
return do_update_call(static_cast<telegram_api::phoneCallWaiting &>(*call)); return do_update_call(static_cast<const telegram_api::phoneCallWaiting &>(*call));
case telegram_api::phoneCallRequested::ID: case telegram_api::phoneCallRequested::ID:
return do_update_call(static_cast<telegram_api::phoneCallRequested &>(*call)); return do_update_call(static_cast<const telegram_api::phoneCallRequested &>(*call));
case telegram_api::phoneCallAccepted::ID: case telegram_api::phoneCallAccepted::ID:
return do_update_call(static_cast<telegram_api::phoneCallAccepted &>(*call)); return do_update_call(static_cast<const telegram_api::phoneCallAccepted &>(*call));
case telegram_api::phoneCall::ID: case telegram_api::phoneCall::ID:
return do_update_call(static_cast<telegram_api::phoneCall &>(*call)); return do_update_call(static_cast<const telegram_api::phoneCall &>(*call));
case telegram_api::phoneCallDiscarded::ID: case telegram_api::phoneCallDiscarded::ID:
return do_update_call(static_cast<telegram_api::phoneCallDiscarded &>(*call)); return do_update_call(static_cast<const telegram_api::phoneCallDiscarded &>(*call));
default: default:
UNREACHABLE(); UNREACHABLE();
return Status::OK(); return Status::OK();
@ -506,11 +506,11 @@ void CallActor::update_call_inner(tl_object_ptr<telegram_api::phone_phoneCall> c
update_call(std::move(call->phone_call_)); update_call(std::move(call->phone_call_));
} }
Status CallActor::do_update_call(telegram_api::phoneCallEmpty &call) { Status CallActor::do_update_call(const telegram_api::phoneCallEmpty &call) {
return Status::Error(400, "Call is finished"); return Status::Error(400, "Call is finished");
} }
Status CallActor::do_update_call(telegram_api::phoneCallWaiting &call) { Status CallActor::do_update_call(const telegram_api::phoneCallWaiting &call) {
if (state_ != State::WaitRequestResult && state_ != State::WaitAcceptResult) { if (state_ != State::WaitRequestResult && state_ != State::WaitAcceptResult) {
return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call)); return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call));
} }
@ -534,9 +534,7 @@ Status CallActor::do_update_call(telegram_api::phoneCallWaiting &call) {
is_video_ |= call.video_; is_video_ |= call.video_;
call_admin_user_id_ = UserId(call.admin_id_); call_admin_user_id_ = UserId(call.admin_id_);
// call_participant_user_id_ = UserId(call.participant_id_); // call_participant_user_id_ = UserId(call.participant_id_);
if (call_id_promise_) { on_get_call_id();
call_id_promise_.set_value(std::move(call.id_));
}
if (!call_state_.is_created) { if (!call_state_.is_created) {
call_state_.is_created = true; call_state_.is_created = true;
@ -546,7 +544,7 @@ Status CallActor::do_update_call(telegram_api::phoneCallWaiting &call) {
return Status::OK(); return Status::OK();
} }
Status CallActor::do_update_call(telegram_api::phoneCallRequested &call) { Status CallActor::do_update_call(const telegram_api::phoneCallRequested &call) {
if (state_ != State::Empty) { if (state_ != State::Empty) {
return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call)); return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call));
} }
@ -557,9 +555,7 @@ Status CallActor::do_update_call(telegram_api::phoneCallRequested &call) {
is_video_ |= call.video_; is_video_ |= call.video_;
call_admin_user_id_ = UserId(call.admin_id_); call_admin_user_id_ = UserId(call.admin_id_);
// call_participant_user_id_ = UserId(call.participant_id_); // call_participant_user_id_ = UserId(call.participant_id_);
if (call_id_promise_) { on_get_call_id();
call_id_promise_.set_value(std::move(call.id_));
}
dh_handshake_.set_g_a_hash(call.g_a_hash_.as_slice()); dh_handshake_.set_g_a_hash(call.g_a_hash_.as_slice());
state_ = State::SendAcceptQuery; state_ = State::SendAcceptQuery;
@ -578,7 +574,7 @@ tl_object_ptr<telegram_api::inputPhoneCall> CallActor::get_input_phone_call(cons
return make_tl_object<telegram_api::inputPhoneCall>(call_id_, call_access_hash_); return make_tl_object<telegram_api::inputPhoneCall>(call_id_, call_access_hash_);
} }
Status CallActor::do_update_call(telegram_api::phoneCallAccepted &call) { Status CallActor::do_update_call(const telegram_api::phoneCallAccepted &call) {
if (state_ != State::WaitRequestResult) { if (state_ != State::WaitRequestResult) {
return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call)); return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call));
} }
@ -590,9 +586,7 @@ Status CallActor::do_update_call(telegram_api::phoneCallAccepted &call) {
is_call_id_inited_ = true; is_call_id_inited_ = true;
call_admin_user_id_ = UserId(call.admin_id_); call_admin_user_id_ = UserId(call.admin_id_);
// call_participant_user_id_ = UserId(call.participant_id_); // call_participant_user_id_ = UserId(call.participant_id_);
if (call_id_promise_) { on_get_call_id();
call_id_promise_.set_value(std::move(call.id_));
}
} }
is_video_ |= call.video_; is_video_ |= call.video_;
dh_handshake_.set_g_a(call.g_b_.as_slice()); dh_handshake_.set_g_a(call.g_b_.as_slice());
@ -612,7 +606,7 @@ void CallActor::on_begin_exchanging_key() {
set_timeout_in(timeout); set_timeout_in(timeout);
} }
Status CallActor::do_update_call(telegram_api::phoneCall &call) { Status CallActor::do_update_call(const telegram_api::phoneCall &call) {
if (state_ != State::WaitAcceptResult && state_ != State::WaitConfirmResult) { if (state_ != State::WaitAcceptResult && state_ != State::WaitConfirmResult) {
return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call)); return Status::Error(500, PSLICE() << "Drop unexpected " << to_string(call));
} }
@ -644,12 +638,20 @@ Status CallActor::do_update_call(telegram_api::phoneCall &call) {
return Status::OK(); return Status::OK();
} }
Status CallActor::do_update_call(telegram_api::phoneCallDiscarded &call) { Status CallActor::do_update_call(const telegram_api::phoneCallDiscarded &call) {
LOG(DEBUG) << "Do update call to Discarded"; LOG(DEBUG) << "Do update call to Discarded";
on_call_discarded(get_call_discard_reason(call.reason_), call.need_rating_, call.need_debug_, call.video_); on_call_discarded(get_call_discard_reason(call.reason_), call.need_rating_, call.need_debug_, call.video_);
return Status::OK(); return Status::OK();
} }
void CallActor::on_get_call_id() {
if (call_id_promise_) {
int64 call_id = call_id_;
call_id_promise_.set_value(std::move(call_id));
call_id_promise_ = {};
}
}
void CallActor::on_call_discarded(CallDiscardReason reason, bool need_rating, bool need_debug, bool is_video) { void CallActor::on_call_discarded(CallDiscardReason reason, bool need_rating, bool need_debug, bool is_video) {
state_ = State::Discarded; state_ = State::Discarded;
is_video_ |= is_video; is_video_ |= is_video;

14
td/telegram/CallActor.h
View File

@ -160,12 +160,14 @@ class CallActor final : public NetQueryCallback {
void on_dh_config(Result<std::shared_ptr<DhConfig>> r_dh_config, bool dummy); void on_dh_config(Result<std::shared_ptr<DhConfig>> r_dh_config, bool dummy);
void do_load_dh_config(Promise<std::shared_ptr<DhConfig>> promise); void do_load_dh_config(Promise<std::shared_ptr<DhConfig>> promise);
Status do_update_call(telegram_api::phoneCallEmpty &call); Status do_update_call(const telegram_api::phoneCallEmpty &call);
Status do_update_call(telegram_api::phoneCallWaiting &call); Status do_update_call(const telegram_api::phoneCallWaiting &call);
Status do_update_call(telegram_api::phoneCallRequested &call); Status do_update_call(const telegram_api::phoneCallRequested &call);
Status do_update_call(telegram_api::phoneCallAccepted &call); Status do_update_call(const telegram_api::phoneCallAccepted &call);
Status do_update_call(telegram_api::phoneCall &call); Status do_update_call(const telegram_api::phoneCall &call);
Status do_update_call(telegram_api::phoneCallDiscarded &call); Status do_update_call(const telegram_api::phoneCallDiscarded &call);
void on_get_call_id();
void send_received_query(); void send_received_query();
void on_received_query_result(Result<NetQueryPtr> r_net_query); void on_received_query_result(Result<NetQueryPtr> r_net_query);