andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Better handling of notification_id overflow.

Browse Source 
GitOrigin-RevId: 3992facb365b43874420d2cdc2b966286ba59cf3
This commit is contained in:
levlam 2018-12-24 22:45:42 +03:00
parent 8940d955bc
commit c4903da286
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
td/telegram/MessagesManager.cpp
View File

@ -5661,9 +5661,10 @@ void MessagesManager::on_message_edited(FullMessageId full_message_id) {
if (m->notification_id.is_valid() && is_message_notification_active(d, m)) { if (m->notification_id.is_valid() && is_message_notification_active(d, m)) {
auto &group_info = get_notification_group_info(d, m); auto &group_info = get_notification_group_info(d, m);
send_closure_later(G()->notification_manager(), &NotificationManager::edit_notification, if (group_info.group_id.is_valid()) {
get_dialog_notification_group_id(dialog_id, group_info), m->notification_id, send_closure_later(G()->notification_manager(), &NotificationManager::edit_notification, group_info.group_id,
create_new_message_notification(m->message_id)); m->notification_id, create_new_message_notification(m->message_id));
}
} }
} }
} }
@ -17576,6 +17577,9 @@ NotificationGroupId MessagesManager::get_dialog_notification_group_id(DialogId d
NotificationGroupId next_notification_group_id; NotificationGroupId next_notification_group_id;
do { do {
next_notification_group_id = td_->notification_manager_->get_next_notification_group_id(); next_notification_group_id = td_->notification_manager_->get_next_notification_group_id();
if (!next_notification_group_id.is_valid()) {
return next_notification_group_id;
}
} while (get_message_notification_group_force(next_notification_group_id).dialog_id.is_valid()); } while (get_message_notification_group_force(next_notification_group_id).dialog_id.is_valid());
group_info.group_id = next_notification_group_id; group_info.group_id = next_notification_group_id;
group_info.is_changed = true; group_info.is_changed = true;
@ -17604,6 +17608,9 @@ NotificationId MessagesManager::get_next_notification_id(Dialog *d, Notification
NotificationId notification_id; NotificationId notification_id;
do { do {
notification_id = td_->notification_manager_->get_next_notification_id(); notification_id = td_->notification_manager_->get_next_notification_id();
if (!notification_id.is_valid()) {
return notification_id;
}
} while (d->notification_id_to_message_id.count(notification_id) != 0 || } while (d->notification_id_to_message_id.count(notification_id) != 0 ||
d->new_secret_chat_notification_id == notification_id); // just in case d->new_secret_chat_notification_id == notification_id); // just in case
if (message_id.is_valid()) { if (message_id.is_valid()) {
@ -18141,8 +18148,14 @@ bool MessagesManager::add_new_message_notification(Dialog *d, Message *m, bool f
<< d->dialog_id; << d->dialog_id;
auto &group_info = get_notification_group_info(d, m); auto &group_info = get_notification_group_info(d, m);
auto notification_group_id = get_dialog_notification_group_id(d->dialog_id, group_info); auto notification_group_id = get_dialog_notification_group_id(d->dialog_id, group_info);
if (!notification_group_id.is_valid()) {
return false;
}
// if !force, then add_message_to_dialog will add the correspondence // if !force, then add_message_to_dialog will add the correspondence
m->notification_id = get_next_notification_id(d, notification_group_id, force ? m->message_id : MessageId()); m->notification_id = get_next_notification_id(d, notification_group_id, force ? m->message_id : MessageId());
if (!m->notification_id.is_valid()) {
return false;
}
bool is_changed = set_dialog_last_notification(d->dialog_id, group_info, m->date, m->notification_id, bool is_changed = set_dialog_last_notification(d->dialog_id, group_info, m->date, m->notification_id,
"add_new_message_notification"); "add_new_message_notification");
CHECK(is_changed); CHECK(is_changed);
@ -21859,15 +21872,19 @@ void MessagesManager::force_create_dialog(DialogId dialog_id, const char *source
if (G()->parameters().use_message_db && !td_->auth_manager_->is_bot() && if (G()->parameters().use_message_db && !td_->auth_manager_->is_bot() &&
!td_->contacts_manager_->get_secret_chat_is_outbound(secret_chat_id)) { !td_->contacts_manager_->get_secret_chat_is_outbound(secret_chat_id)) {
auto notification_group_id = get_dialog_notification_group_id(dialog_id, d->message_notification_group); auto notification_group_id = get_dialog_notification_group_id(dialog_id, d->message_notification_group);
d->new_secret_chat_notification_id = get_next_notification_id(d, notification_group_id, MessageId()); if (notification_group_id.is_valid()) {
auto date = td_->contacts_manager_->get_secret_chat_date(secret_chat_id); d->new_secret_chat_notification_id = get_next_notification_id(d, notification_group_id, MessageId());
bool is_changed = set_dialog_last_notification(dialog_id, d->message_notification_group, date, if (d->new_secret_chat_notification_id.is_valid()) {
d->new_secret_chat_notification_id, "add_new_secret_chat"); auto date = td_->contacts_manager_->get_secret_chat_date(secret_chat_id);
CHECK(is_changed); bool is_changed = set_dialog_last_notification(dialog_id, d->message_notification_group, date,
VLOG(notifications) << "Create " << d->new_secret_chat_notification_id << " with " << secret_chat_id; d->new_secret_chat_notification_id, "add_new_secret_chat");
send_closure_later(G()->notification_manager(), &NotificationManager::add_notification, notification_group_id, CHECK(is_changed);
NotificationGroupType::SecretChat, dialog_id, date, dialog_id, false, VLOG(notifications) << "Create " << d->new_secret_chat_notification_id << " with " << secret_chat_id;
d->new_secret_chat_notification_id, create_new_secret_chat_notification()); send_closure_later(G()->notification_manager(), &NotificationManager::add_notification,
notification_group_id, NotificationGroupType::SecretChat, dialog_id, date, dialog_id,
false, d->new_secret_chat_notification_id, create_new_secret_chat_notification());
}
}
} }
} }
if (!have_input_peer(dialog_id, AccessRights::Read)) { if (!have_input_peer(dialog_id, AccessRights::Read)) {

21
td/telegram/NotificationManager.cpp
View File

@ -485,8 +485,12 @@ NotificationId NotificationManager::get_next_notification_id() {
if (is_disabled()) { if (is_disabled()) {
return NotificationId(); return NotificationId();
} }
if (current_notification_id_.get() == std::numeric_limits<int32>::max()) {
LOG(ERROR) << "Notification id overflowed";
return NotificationId();
}
current_notification_id_ = NotificationId(current_notification_id_.get() % 0x7FFFFFFF + 1); current_notification_id_ = NotificationId(current_notification_id_.get() + 1);
G()->td_db()->get_binlog_pmc()->set("notification_id_current", to_string(current_notification_id_.get())); G()->td_db()->get_binlog_pmc()->set("notification_id_current", to_string(current_notification_id_.get()));
return current_notification_id_; return current_notification_id_;
} }
@ -495,8 +499,12 @@ NotificationGroupId NotificationManager::get_next_notification_group_id() {
if (is_disabled()) { if (is_disabled()) {
return NotificationGroupId(); return NotificationGroupId();
} }
if (current_notification_group_id_.get() == std::numeric_limits<int32>::max()) {
LOG(ERROR) << "Notification group id overflowed";
return NotificationGroupId();
}
current_notification_group_id_ = NotificationGroupId(current_notification_group_id_.get() % 0x7FFFFFFF + 1); current_notification_group_id_ = NotificationGroupId(current_notification_group_id_.get() + 1);
G()->td_db()->get_binlog_pmc()->set("notification_group_id_current", to_string(current_notification_group_id_.get())); G()->td_db()->get_binlog_pmc()->set("notification_group_id_current", to_string(current_notification_group_id_.get()));
return current_notification_group_id_; return current_notification_group_id_;
} }
@ -1261,6 +1269,9 @@ void NotificationManager::edit_notification(NotificationGroupId group_id, Notifi
if (is_disabled() || max_notification_group_count_ == 0) { if (is_disabled() || max_notification_group_count_ == 0) {
return; return;
} }
if (!group_id.is_valid()) {
return;
}
CHECK(notification_id.is_valid()); CHECK(notification_id.is_valid());
CHECK(type != nullptr); CHECK(type != nullptr);
@ -1624,6 +1635,9 @@ NotificationGroupId NotificationManager::get_call_notification_group_id(DialogId
NotificationGroupId next_notification_group_id; NotificationGroupId next_notification_group_id;
do { do {
next_notification_group_id = get_next_notification_group_id(); next_notification_group_id = get_next_notification_group_id();
if (!next_notification_group_id.is_valid()) {
return {};
}
} while (last_group_id.get() >= next_notification_group_id.get()); // just in case } while (last_group_id.get() >= next_notification_group_id.get()); // just in case
VLOG(notifications) << "Add call " << next_notification_group_id; VLOG(notifications) << "Add call " << next_notification_group_id;
@ -1664,6 +1678,9 @@ void NotificationManager::add_call_notification(DialogId dialog_id, CallId call_
} }
auto notification_id = get_next_notification_id(); auto notification_id = get_next_notification_id();
if (!notification_id.is_valid()) {
return;
}
active_notifications.push_back(ActiveCallNotification{call_id, notification_id}); active_notifications.push_back(ActiveCallNotification{call_id, notification_id});
add_notification(group_id, NotificationGroupType::Calls, dialog_id, G()->unix_time() + 120, dialog_id, false, add_notification(group_id, NotificationGroupType::Calls, dialog_id, G()->unix_time() + 120, dialog_id, false,