Skip to content

Use stored incoming event entries instead of using ones from new message #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
z-dule wants to merge 2 commits into
base: release-10.3
Choose a base branch
from
+31 −16
Open

Use stored incoming event entries instead of using ones from new message #166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26622ef
Use stored incoming event entries instead of using ones from new message
May 20, 2026
82f4fe2
move order so we don't unlink prev_ie if new ie is not allocated
May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions src/wcall/wcall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,29 +600,44 @@ static void icall_start_handler(struct icall *icall,
}

if (inst->processing_notifications && inst->incomingh) {
struct incoming_event *prev_ie;
struct incoming_event *ie;

ie = find_pending_event(&inst->pending_eventl, userid_sender);
if (ie) {
list_unlink(&ie->le);
}
ie = mem_zalloc(sizeof(*ie), ie_destructor);
if (ie) {
str_dup(&ie->convid, wcall->convid);
ie->msg_time = msg_time;
str_dup(&ie->userid, userid_sender);
str_dup(&ie->clientid, clientid_sender);
ie->video_call = video;
ie->should_ring = should_ring;
ie->conv_type = conv_type;
ie->arg = inst;

list_append(&inst->pending_eventl, &ie->le, ie);
if (!ie) {
warning("wcall(%p): incomingh: cannot allocate ie\n",
wcall);
Comment thread
z-dule marked this conversation as resolved.
return;
}

prev_ie = find_pending_event(&inst->pending_eventl,
userid_sender);
if (prev_ie) {
list_unlink(&prev_ie->le);
}

str_dup(&ie->convid, wcall->convid);
ie->msg_time = msg_time;
str_dup(&ie->userid,
prev_ie ? prev_ie->userid : userid_sender);
str_dup(&ie->clientid,
prev_ie ? prev_ie->clientid : clientid_sender);
ie->video_call = prev_ie ? prev_ie->video_call : video;
ie->should_ring =
prev_ie ? prev_ie->should_ring : should_ring;
ie->conv_type =
prev_ie ? prev_ie->conv_type : conv_type;
ie->arg = inst;

list_append(&inst->pending_eventl, &ie->le, ie);

if (prev_ie) {
mem_deref(prev_ie);
}

return;
}

if (inst->incomingh) {
if (inst->mm) {
mediamgr_invoke_incomingh(inst->mm,
Expand Down