From d9366a26d6ef1a82eeccd7d7523db25d91e4efc1 Mon Sep 17 00:00:00 2001 From: swirl Date: Thu, 1 Jul 2021 19:30:30 -0400 Subject: initial register command test --- src/xmpp/xmpp.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/xmpp/xmpp.h') diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 61c7a642..686a0dc8 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -266,6 +266,7 @@ void iq_command_list(const char* const target); void iq_command_exec(const char* const target, const char* const command); void iq_mam_request(ProfChatWin* win); void iq_register_change_password(const char* const user, const char* const password); +void iq_register_new_account(const char* const user, const char* const password); void iq_muc_register_nick(const char* const roomjid); EntityCapabilities* caps_lookup(const char* const jid); @@ -313,3 +314,4 @@ Autocomplete form_get_value_ac(DataForm* form, const char* const tag); void form_reset_autocompleters(DataForm* form); #endif + -- cgit 1.4.1-2-gfad0 From 2cc354b6aef2f54b3f4dacc81f257c0625d5c734 Mon Sep 17 00:00:00 2001 From: swirl Date: Sun, 4 Jul 2021 19:02:38 -0400 Subject: fixed some bugs, added some more - Added JABBER_RAW_CONNECT[ING/ED] connection states - Added cl_ev_connect_raw and session_connect_raw to conform to normal connection functions - Fixed SIGABRT during registration - Added a check in cmd_register to ensure it's actually connected before registering--but this will always fail atm --- src/command/cmd_funcs.c | 29 ++++++++++++++++++----------- src/event/client_events.c | 8 ++++++++ src/event/client_events.h | 2 ++ src/profanity.c | 1 + src/xmpp/connection.c | 17 ++++++++++++++++- src/xmpp/iq.c | 5 +++-- src/xmpp/session.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/xmpp/stanza.c | 3 +++ src/xmpp/xmpp.h | 6 +++++- 9 files changed, 96 insertions(+), 15 deletions(-) (limited to 'src/xmpp/xmpp.h') diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 68eec91b..07acd266 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -9589,7 +9589,7 @@ cmd_register(ProfWin* window, const char* const command, gchar** args) char* server = args[1]; - jabber_conn_status_t conn_status = connection_connect_raw(server, port, tls_policy, auth_policy); + jabber_conn_status_t conn_status = cl_ev_connect_raw(server, port, tls_policy, auth_policy); if (conn_status == JABBER_DISCONNECTED) { cons_show_error("Connection attempt to server %s port %d failed.", server, port); @@ -9598,19 +9598,26 @@ cmd_register(ProfWin* window, const char* const command, gchar** args) } char* username = args[0]; - char* passwd = ui_ask_password(false); - char* confirm_passwd = ui_ask_password(true); + if (connection_get_status() != JABBER_RAW_CONNECTED) { // FIXME: this is ALWAYS the case, as the connection doesn't finish by this time. + cons_show_error("Raw connection attempt failed or not yet completed."); + log_info("Raw connection attempt failed or not yet completed."); + } //else { + char* passwd = ui_ask_password(false); + char* confirm_passwd = ui_ask_password(true); - if (g_strcmp0(passwd, confirm_passwd) == 0) { - iq_register_new_account(username, passwd); - } else { - cons_show("The two passwords do not match."); - } + if (g_strcmp0(passwd, confirm_passwd) == 0) { + log_info("Attempting to register account %s on server %s.", username, server); + iq_register_new_account(username, passwd); + } else { + cons_show("The two passwords do not match."); + } + free(passwd); + free(confirm_passwd); + //} - free(username); - free(passwd); - free(confirm_passwd); + options_destroy(options); + log_info("we are leaving the registration process"); return TRUE; } diff --git a/src/event/client_events.c b/src/event/client_events.c index bf519feb..14b5b8c4 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -81,6 +81,13 @@ cl_ev_connect_account(ProfAccount* account) return session_connect_with_account(account); } +jabber_conn_status_t +cl_ev_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy) +{ + cons_show("Raw connecting to %s", altdomain); + return session_connect_raw(altdomain, port, tls_policy, auth_policy); +} + void cl_ev_disconnect(void) { @@ -262,3 +269,4 @@ cl_ev_send_priv_msg(ProfPrivateWin* privwin, const char* const msg, const char* jid_destroy(jidp); } } + diff --git a/src/event/client_events.h b/src/event/client_events.h index fed2bb37..8fbc7a05 100644 --- a/src/event/client_events.h +++ b/src/event/client_events.h @@ -40,6 +40,7 @@ jabber_conn_status_t cl_ev_connect_jid(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); jabber_conn_status_t cl_ev_connect_account(ProfAccount* account); +jabber_conn_status_t cl_ev_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy); void cl_ev_disconnect(void); @@ -52,3 +53,4 @@ void cl_ev_send_muc_msg(ProfMucWin* mucwin, const char* const msg, const char* c void cl_ev_send_priv_msg(ProfPrivateWin* privwin, const char* const msg, const char* const oob_url); #endif + diff --git a/src/profanity.c b/src/profanity.c index eb829bad..a74f26d2 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -268,3 +268,4 @@ _shutdown(void) ui_close(); prefs_close(); } + diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 43833205..49da1dc3 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -342,7 +342,7 @@ connection_connect_raw(const char* const altdomain, int port, #endif if (connect_status == 0) { - conn.conn_status = JABBER_CONNECTING; + conn.conn_status = JABBER_RAW_CONNECTING; } else { conn.conn_status = JABBER_DISCONNECTED; } @@ -686,6 +686,21 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status break; + // raw connection success + case XMPP_CONN_RAW_CONNECT: + log_debug("Connection handler: XMPP_CONN_RAW_CONNECT"); + conn.conn_status = JABBER_RAW_CONNECTED; + + Jid* my_raw_jid = jid_create(xmpp_conn_get_jid(conn.xmpp_conn)); + log_debug("jid: %s", xmpp_conn_get_jid(conn.xmpp_conn)); + conn.domain = strdup(my_raw_jid->domainpart); + jid_destroy(my_raw_jid); + + conn.features_by_jid = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)g_hash_table_destroy); + g_hash_table_insert(conn.features_by_jid, strdup(conn.domain), g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL)); + + break; + // disconnected case XMPP_CONN_DISCONNECT: log_debug("Connection handler: XMPP_CONN_DISCONNECT"); diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index a35144ff..2490fd9c 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -2658,14 +2658,15 @@ _mam_rsm_id_handler(xmpp_stanza_t* const stanza, void* const userdata) void iq_register_new_account(const char* const user, const char* const password) { - //char* id = connection_create_stanza_id(); xmpp_ctx_t* const ctx = connection_get_ctx(); xmpp_stanza_t* iq = stanza_register_new_account(ctx, user, password); const char* id = xmpp_stanza_get_id(iq); - iq_id_handler_add(id, _register_new_account_result_id_handler, NULL, NULL); + iq_id_handler_add(id, _register_new_account_result_id_handler, NULL, NULL); // FIXME: function doesn't seem to ever run? + log_debug("HI hi sending registration stanza"); iq_send_stanza(iq); + log_debug("registration stanza has been sent"); xmpp_stanza_release(iq); } diff --git a/src/xmpp/session.c b/src/xmpp/session.c index e81d55ae..ccd36865 100644 --- a/src/xmpp/session.c +++ b/src/xmpp/session.c @@ -204,6 +204,43 @@ session_connect_with_details(const char* const jid, const char* const passwd, co saved_details.auth_policy); } +jabber_conn_status_t +session_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, + const char* const auth_policy) +{ + assert(altdomain != NULL); + + _session_free_saved_account(); + _session_free_saved_details(); + + // save details for reconnect + saved_details.altdomain = strdup(altdomain); + if (port != 0) { + saved_details.port = port; + } else { + saved_details.port = 0; + } + if (tls_policy) { + saved_details.tls_policy = strdup(tls_policy); + } else { + saved_details.tls_policy = NULL; + } + if (auth_policy) { + saved_details.auth_policy = strdup(auth_policy); + } else { + saved_details.auth_policy = NULL; + } + + // raw connect + log_info("Raw connecting to server: %s", altdomain); + + return connection_connect_raw( + saved_details.altdomain, + saved_details.port, + saved_details.tls_policy, + saved_details.auth_policy); +} + void session_autoping_fail(void) { @@ -261,6 +298,8 @@ session_process_events(void) switch (conn_status) { case JABBER_CONNECTED: case JABBER_CONNECTING: + case JABBER_RAW_CONNECTED: + case JABBER_RAW_CONNECTING: case JABBER_DISCONNECTING: connection_check_events(); break; @@ -543,3 +582,4 @@ _session_free_saved_details(void) FREE_SET_NULL(saved_details.tls_policy); FREE_SET_NULL(saved_details.auth_policy); } + diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index b1958799..4849f3e1 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -2782,6 +2782,9 @@ stanza_register_new_account(xmpp_ctx_t* ctx, const char* const user, const char* xmpp_stanza_add_child(register_new_account, password_st); xmpp_stanza_release(password_st); + xmpp_stanza_add_child(iq, register_new_account); + xmpp_stanza_release(register_new_account); + return iq; } diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 686a0dc8..0bdf6934 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -76,7 +76,9 @@ typedef enum { JABBER_CONNECTING, JABBER_CONNECTED, JABBER_DISCONNECTING, - JABBER_DISCONNECTED + JABBER_DISCONNECTED, + JABBER_RAW_CONNECTING, + JABBER_RAW_CONNECTED } jabber_conn_status_t; typedef enum { @@ -183,6 +185,8 @@ void session_init(void); jabber_conn_status_t 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); jabber_conn_status_t session_connect_with_account(const ProfAccount* const account); + +jabber_conn_status_t session_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy); void session_disconnect(void); void session_shutdown(void); void session_process_events(void); -- cgit 1.4.1-2-gfad0 From 87d2c95c870d697822c7d25f4c734e259a893d85 Mon Sep 17 00:00:00 2001 From: swirl Date: Tue, 17 Aug 2021 14:09:32 -0400 Subject: registration: remove auth param and excess functions --- src/command/cmd_defs.c | 6 +-- src/command/cmd_funcs.c | 10 +--- src/event/client_events.c | 7 --- src/event/client_events.h | 1 - src/xmpp/connection.c | 115 +--------------------------------------------- src/xmpp/connection.h | 5 +- src/xmpp/iq.c | 32 ------------- src/xmpp/session.c | 37 --------------- src/xmpp/xmpp.h | 2 - 9 files changed, 5 insertions(+), 210 deletions(-) (limited to 'src/xmpp/xmpp.h') diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 80d98827..09523bd7 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2649,7 +2649,7 @@ static struct cmd_t command_defs[] = { CMD_TAGS( CMD_TAG_CONNECTION) CMD_SYN( - "/register [port ] [tls force|allow|trust|legacy|disable] [auth default|legacy]") + "/register [port ] [tls force|allow|trust|legacy|disable]") CMD_DESC( "Register an account on a server.") CMD_ARGS( @@ -2660,9 +2660,7 @@ static struct cmd_t command_defs[] = { { "tls allow", "Use TLS for the connection if it is available." }, { "tls trust", "Force TLS connection and trust the server's certificate." }, { "tls legacy", "Use legacy TLS for the connection. This forces TLS just after the TCP connection is established. Use when a server doesn't support STARTTLS." }, - { "tls disable", "Disable TLS for the connection." }, - { "auth default", "Default authentication process." }, - { "auth legacy", "Allow legacy authentication." }) + { "tls disable", "Disable TLS for the connection." }) CMD_EXAMPLES( "/register odin valhalla.edda ", "/register freyr vanaheimr.edda port 5678", diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index b7c6afad..8b4dc3fa 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -9579,14 +9579,6 @@ cmd_register(ProfWin* window, const char* const command, gchar** args) } } - char* auth_policy = g_hash_table_lookup(options, "auth"); - if (auth_policy && (g_strcmp0(auth_policy, "default") != 0) && (g_strcmp0(auth_policy, "legacy") != 0)) { - cons_bad_cmd_usage(command); - cons_show(""); - options_destroy(options); - return TRUE; - } - char* username = args[0]; char* server = args[1]; @@ -9595,7 +9587,7 @@ cmd_register(ProfWin* window, const char* const command, gchar** args) if (g_strcmp0(passwd, confirm_passwd) == 0) { log_info("Attempting to register account %s on server %s.", username, server); - connection_register(server, port, tls_policy, auth_policy, username, passwd); + connection_register(server, port, tls_policy, username, passwd); } else { cons_show("The two passwords do not match."); } diff --git a/src/event/client_events.c b/src/event/client_events.c index 14b5b8c4..a25ce106 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -81,13 +81,6 @@ cl_ev_connect_account(ProfAccount* account) return session_connect_with_account(account); } -jabber_conn_status_t -cl_ev_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy) -{ - cons_show("Raw connecting to %s", altdomain); - return session_connect_raw(altdomain, port, tls_policy, auth_policy); -} - void cl_ev_disconnect(void) { diff --git a/src/event/client_events.h b/src/event/client_events.h index 8fbc7a05..de180d21 100644 --- a/src/event/client_events.h +++ b/src/event/client_events.h @@ -40,7 +40,6 @@ jabber_conn_status_t cl_ev_connect_jid(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); jabber_conn_status_t cl_ev_connect_account(ProfAccount* account); -jabber_conn_status_t cl_ev_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy); void cl_ev_disconnect(void); diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 2d2df7c2..038fbb51 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -251,111 +251,6 @@ connection_connect(const char* const jid, const char* const passwd, const char* return conn.conn_status; } -jabber_conn_status_t -connection_connect_raw(const char* const altdomain, int port, - const char* const tls_policy, const char* const auth_policy) -{ - long flags; - - Jid* jidp = jid_create(altdomain); - if (jidp == NULL) { - log_error("Malformed JID not able to connect: %s", altdomain); - conn.conn_status = JABBER_DISCONNECTED; - return conn.conn_status; - } - - _compute_identifier(jidp->barejid); - jid_destroy(jidp); - - if (conn.xmpp_log) { - free(conn.xmpp_log); - } - conn.xmpp_log = _xmpp_get_file_logger(); - - if (conn.xmpp_conn) { - xmpp_conn_release(conn.xmpp_conn); - } - if (conn.xmpp_ctx) { - xmpp_ctx_free(conn.xmpp_ctx); - } - conn.xmpp_ctx = xmpp_ctx_new(NULL, conn.xmpp_log); - if (conn.xmpp_ctx == NULL) { - log_warning("Failed to get libstrophe ctx during connect"); - return JABBER_DISCONNECTED; - } - conn.xmpp_conn = xmpp_conn_new(conn.xmpp_ctx); - if (conn.xmpp_conn == NULL) { - log_warning("Failed to get libstrophe conn during connect"); - return JABBER_DISCONNECTED; - } - xmpp_conn_set_jid(conn.xmpp_conn, altdomain); - - flags = xmpp_conn_get_flags(conn.xmpp_conn); - - if (!tls_policy || (g_strcmp0(tls_policy, "force") == 0)) { - flags |= XMPP_CONN_FLAG_MANDATORY_TLS; - } else if (g_strcmp0(tls_policy, "trust") == 0) { - flags |= XMPP_CONN_FLAG_MANDATORY_TLS; - flags |= XMPP_CONN_FLAG_TRUST_TLS; - } else if (g_strcmp0(tls_policy, "disable") == 0) { - flags |= XMPP_CONN_FLAG_DISABLE_TLS; - } else if (g_strcmp0(tls_policy, "legacy") == 0) { - flags |= XMPP_CONN_FLAG_LEGACY_SSL; - } - - if (auth_policy && (g_strcmp0(auth_policy, "legacy") == 0)) { - flags |= XMPP_CONN_FLAG_LEGACY_AUTH; - } - - xmpp_conn_set_flags(conn.xmpp_conn, flags); - - /* Print debug logs that can help when users share the logs */ - if (flags != 0) { - log_debug("Connecting with flags (0x%lx):", flags); -#define LOG_FLAG_IF_SET(name) \ - if (flags & name) { \ - log_debug(" " #name); \ - } - LOG_FLAG_IF_SET(XMPP_CONN_FLAG_MANDATORY_TLS); - LOG_FLAG_IF_SET(XMPP_CONN_FLAG_TRUST_TLS); - LOG_FLAG_IF_SET(XMPP_CONN_FLAG_DISABLE_TLS); - LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_SSL); - LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_AUTH); -#undef LOG_FLAG_IF_SET - } - -#ifdef HAVE_LIBMESODE - char* cert_path = prefs_get_tls_certpath(); - if (cert_path) { - xmpp_conn_tlscert_path(conn.xmpp_conn, cert_path); - free(cert_path); - } - - int connect_status = xmpp_connect_raw( - conn.xmpp_conn, - altdomain, - port, - _connection_certfail_cb, - _connection_handler, - conn.xmpp_ctx); -#else - int connect_status = xmpp_connect_raw( - conn.xmpp_conn, - altdomain, - port, - _connection_handler, - conn.xmpp_ctx); -#endif - - if (connect_status == 0) { - conn.conn_status = JABBER_RAW_CONNECTING; - } else { - conn.conn_status = JABBER_DISCONNECTED; - } - - return conn.conn_status; -} - static int iq_reg2_cb(xmpp_conn_t *xmpp_conn, xmpp_stanza_t *stanza, void *userdata) { const char *type; @@ -578,8 +473,7 @@ _register_handler(xmpp_conn_t *xmpp_conn, } jabber_conn_status_t -connection_register(const char* const altdomain, int port, - const char* const tls_policy, const char* const auth_policy, +connection_register(const char* const altdomain, int port, const char* const tls_policy, const char* const username, const char* const password) { long flags; @@ -630,10 +524,6 @@ connection_register(const char* const altdomain, int port, flags |= XMPP_CONN_FLAG_LEGACY_SSL; } - if (auth_policy && (g_strcmp0(auth_policy, "legacy") == 0)) { - flags |= XMPP_CONN_FLAG_LEGACY_AUTH; - } - xmpp_conn_set_flags(conn.xmpp_conn, flags); /* Print debug logs that can help when users share the logs */ @@ -647,7 +537,6 @@ connection_register(const char* const altdomain, int port, LOG_FLAG_IF_SET(XMPP_CONN_FLAG_TRUST_TLS); LOG_FLAG_IF_SET(XMPP_CONN_FLAG_DISABLE_TLS); LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_SSL); - LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_AUTH); #undef LOG_FLAG_IF_SET } @@ -670,7 +559,6 @@ connection_register(const char* const altdomain, int port, int connect_status = xmpp_connect_raw( conn.xmpp_conn, - //strdup(altdomain), altdomain, port, _connection_certfail_cb, @@ -679,7 +567,6 @@ connection_register(const char* const altdomain, int port, #else int connect_status = xmpp_connect_raw( conn.xmpp_conn, - //strdup(altdomain), altdomain, port, _register_handler, diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h index 0c8669c6..0f0c2c10 100644 --- a/src/xmpp/connection.h +++ b/src/xmpp/connection.h @@ -46,10 +46,7 @@ void connection_check_events(void); jabber_conn_status_t connection_connect(const char* const fulljid, const char* const passwd, const char* const altdomain, int port, const char* const tls_policy, const char* const auth_policy); -jabber_conn_status_t connection_connect_raw(const char* const altdomain, int port, - const char* const tls_policy, const char* const auth_policy); -jabber_conn_status_t connection_register(const char* const altdomain, int port, - const char* const tls_policy, const char* const auth_policy, +jabber_conn_status_t connection_register(const char* const altdomain, int port, const char* const tls_policy, const char* const username, const char* const password); void connection_disconnect(void); void connection_set_disconnected(void); diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 2490fd9c..2118b6ba 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -150,7 +150,6 @@ static int _command_list_result_handler(xmpp_stanza_t* const stanza, void* const static int _command_exec_response_handler(xmpp_stanza_t* const stanza, void* const userdata); static int _mam_rsm_id_handler(xmpp_stanza_t* const stanza, void* const userdata); static int _register_change_password_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); -static int _register_new_account_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); static void _iq_free_room_data(ProfRoomInfoData* roominfo); static void _iq_free_affiliation_set(ProfPrivilegeSet* affiliation_set); @@ -2655,37 +2654,6 @@ _mam_rsm_id_handler(xmpp_stanza_t* const stanza, void* const userdata) return 0; } -void -iq_register_new_account(const char* const user, const char* const password) -{ - xmpp_ctx_t* const ctx = connection_get_ctx(); - xmpp_stanza_t* iq = stanza_register_new_account(ctx, user, password); - - const char* id = xmpp_stanza_get_id(iq); - iq_id_handler_add(id, _register_new_account_result_id_handler, NULL, NULL); // FIXME: function doesn't seem to ever run? - - log_debug("HI hi sending registration stanza"); - iq_send_stanza(iq); - log_debug("registration stanza has been sent"); - xmpp_stanza_release(iq); -} - -static int -_register_new_account_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) -{ - const char* type = xmpp_stanza_get_type(stanza); - if (g_strcmp0(type, "error") == 0) { - char* error_message = stanza_get_error_message(stanza); - cons_show_error("Server error: %s", error_message); - log_debug("Registration error: %s", error_message); - free(error_message); - } else { - cons_show("Registration successful."); - log_debug("Registration successful."); - } - return 0; -} - void iq_register_change_password(const char* const user, const char* const password) { diff --git a/src/xmpp/session.c b/src/xmpp/session.c index ccd36865..de255116 100644 --- a/src/xmpp/session.c +++ b/src/xmpp/session.c @@ -204,43 +204,6 @@ session_connect_with_details(const char* const jid, const char* const passwd, co saved_details.auth_policy); } -jabber_conn_status_t -session_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, - const char* const auth_policy) -{ - assert(altdomain != NULL); - - _session_free_saved_account(); - _session_free_saved_details(); - - // save details for reconnect - saved_details.altdomain = strdup(altdomain); - if (port != 0) { - saved_details.port = port; - } else { - saved_details.port = 0; - } - if (tls_policy) { - saved_details.tls_policy = strdup(tls_policy); - } else { - saved_details.tls_policy = NULL; - } - if (auth_policy) { - saved_details.auth_policy = strdup(auth_policy); - } else { - saved_details.auth_policy = NULL; - } - - // raw connect - log_info("Raw connecting to server: %s", altdomain); - - return connection_connect_raw( - saved_details.altdomain, - saved_details.port, - saved_details.tls_policy, - saved_details.auth_policy); -} - void session_autoping_fail(void) { diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 0bdf6934..b961afe9 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -186,7 +186,6 @@ jabber_conn_status_t session_connect_with_details(const char* const jid, const c const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy); jabber_conn_status_t session_connect_with_account(const ProfAccount* const account); -jabber_conn_status_t session_connect_raw(const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy); void session_disconnect(void); void session_shutdown(void); void session_process_events(void); @@ -270,7 +269,6 @@ void iq_command_list(const char* const target); void iq_command_exec(const char* const target, const char* const command); void iq_mam_request(ProfChatWin* win); void iq_register_change_password(const char* const user, const char* const password); -void iq_register_new_account(const char* const user, const char* const password); void iq_muc_register_nick(const char* const roomjid); EntityCapabilities* caps_lookup(const char* const jid); -- cgit 1.4.1-2-gfad0