Skip to content

Commit

Permalink
ccall: only send props on initial confpart
Browse files Browse the repository at this point in the history
  • Loading branch information
c-g-owen committed Apr 19, 2024
1 parent eaec47a commit 1da7334
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
19 changes: 12 additions & 7 deletions src/ccall/ccall.c
Original file line number Diff line number Diff line change
Expand Up @@ -1610,18 +1610,22 @@ static void ecall_confpart_handler(struct ecall *ecall,
{
struct ccall *ccall = arg;
bool list_changed = false;
bool first_confpart = false;
bool missing_parts = false;
int err = 0;

uint64_t timestamp = msg->u.confpart.timestamp;
uint32_t seqno = msg->u.confpart.seqno;
bool should_start = msg->u.confpart.should_start;
const struct list *partlist = &msg->u.confpart.partl;
first_confpart = !ccall->received_confpart;

info("ccall(%p): ecall_confpart_handler ecall: %p "\
"should_start %s partl: %u members ts: %llu sn: %u\n",
"should_start %s partl: %u members ts: %llu sn: %u "\
"first: %s\n",
ccall, ecall, should_start ? "YES" : "NO",
list_count(partlist), timestamp, seqno);
list_count(partlist), timestamp, seqno,
first_confpart ? "YES" : "NO");

if (!ccall || ecall != ccall->ecall) {
return;
Expand Down Expand Up @@ -1693,11 +1697,12 @@ static void ecall_confpart_handler(struct ecall *ecall,
}
}

if (ccall->ecall) {
err = ccall_sync_props(ccall);
if (err) {
warning("ccall(%p): sync_props failed\n", ccall);
}
}

if (first_confpart && ccall->ecall) {
err = ccall_sync_props(ccall);
if (err) {
warning("ccall(%p): sync_props failed\n", ccall);
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/userlist/userlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,12 @@ int userlist_update_from_sftlist(struct userlist *list,
if (u) {
bool muted;

info("userlist(%p): update_from_sftlist found user %s.%s "
info("userlist(%p): update_from_sftlist found user %s.%s %s"
"ssrca: %u ssrcv:%u incall_prev: %s\n",
list,
anon_id(userid_anon, u->userid_real),
anon_client(clientid_anon, u->clientid_real),
u->userid_hash,
p->ssrca, p->ssrcv,
u->incall_prev ? "YES" : "NO");
if (le == first_approved) {
Expand Down

0 comments on commit 1da7334

Please sign in to comment.