devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Fix reconnect when no account has been set up yet.

Browse Source 
e.g. if one connects with an account for the first time and the server
returns a `see-other-host` error.

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2025-11-14 14:43:05 +01:00
parent c61c72f2f0
commit f19acc2156
1 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/xmpp/session.c
View File

@@ -73,7 +73,7 @@ static struct
char* passwd; char* passwd;
} saved_account; } saved_account;
static struct static struct session_details
{ {
char* name; char* name;
char* jid; char* jid;
@@ -159,6 +159,18 @@ session_connect_with_account(const ProfAccount* const account)
return result; return result;
} }
static jabber_conn_status_t
_session_connect(struct session_details* details)
{
return connection_connect(
details->jid,
details->passwd,
details->altdomain,
details->port,
details->tls_policy,
details->auth_policy);
}
jabber_conn_status_t jabber_conn_status_t
session_connect_with_details(const char* const jid, const char* const passwd, const char* const altdomain, session_connect_with_details(const char* const jid, const char* const passwd, const char* const altdomain,
const int port, const char* const tls_policy, const char* const auth_policy) const int port, const char* const tls_policy, const char* const auth_policy)
@@ -206,13 +218,7 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
// connect with fulljid // connect with fulljid
log_info("Connecting without account, JID: %s", saved_details.jid); log_info("Connecting without account, JID: %s", saved_details.jid);
return connection_connect( return _session_connect(&saved_details);
saved_details.jid,
passwd,
saved_details.altdomain,
saved_details.port,
saved_details.tls_policy,
saved_details.auth_policy);
} }
void void
@@ -552,31 +558,35 @@ void
session_reconnect_now(void) session_reconnect_now(void)
{ {
// reconnect with account. // reconnect with account.
ProfAccount* account = accounts_get_account(saved_account.name); if (saved_account.name) {
if (account == NULL) { ProfAccount* account = accounts_get_account(saved_account.name);
log_error("Unable to reconnect, account no longer exists: %s", saved_account.name); if (account == NULL) {
return; log_error("Unable to reconnect, account no longer exists: %s", saved_account.name);
} return;
}
auto_char char* jid = NULL; auto_char char* jid = NULL;
if (account->resource) { if (account->resource) {
jid = create_fulljid(account->jid, account->resource); jid = create_fulljid(account->jid, account->resource);
} else { } else {
jid = strdup(account->jid); jid = strdup(account->jid);
} }
const char* server; const char* server;
unsigned short port; unsigned short port;
if (reconnect.altdomain) { if (reconnect.altdomain) {
server = reconnect.altdomain; server = reconnect.altdomain;
port = reconnect.altport; port = reconnect.altport;
} else { } else {
server = account->server; server = account->server;
port = account->port; port = account->port;
} }
log_debug("Attempting reconnect with account %s", account->name); log_debug("Attempting reconnect with account %s", account->name);
connection_connect(jid, saved_account.passwd, server, port, account->tls_policy, account->auth_policy); connection_connect(jid, saved_account.passwd, server, port, account->tls_policy, account->auth_policy);
account_free(account); account_free(account);
} else {
_session_connect(&saved_details);
}
if (reconnect_timer) if (reconnect_timer)
g_timer_start(reconnect_timer); g_timer_start(reconnect_timer);
} }