devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add alternate domain and port to xmpp_client_connect() for when SRV lookups fail.

Browse Source
This commit is contained in:
James Canete
2008-05-14 20:48:48 +00:00
parent d339246a6f
commit 6f9be5ef39
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.h
View File

@@ -171,6 +171,8 @@ struct _xmpp_conn_t {
char *lang; char *lang;
char *domain; char *domain;
char *connectdomain;
char *connectport;
char *jid; char *jid;
char *pass; char *pass;
char *stream_id; char *stream_id;

14
src/conn.c
View File

@@ -67,6 +67,7 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
conn->stream_id = NULL; conn->stream_id = NULL;
conn->tls_support = 0; conn->tls_support = 0;
conn->tls_failed = 0;
conn->sasl_support = 0; conn->sasl_support = 0;
conn->bind_required = 0; conn->bind_required = 0;
@@ -239,6 +240,8 @@ void xmpp_conn_set_pass(xmpp_conn_t * const conn, const char * const pass)
int xmpp_connect_client(xmpp_conn_t * const conn, int xmpp_connect_client(xmpp_conn_t * const conn,
const char * const domain, const char * const domain,
const char * const altdomain,
unsigned short altport,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void * const userdata) void * const userdata)
{ {
@@ -254,9 +257,16 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
} }
if (!conn->domain) return -1; if (!conn->domain) return -1;
sock_srv_lookup("xmpp-client", "tcp", conn->domain, connectdomain, 2048, &connectport); if (!sock_srv_lookup("xmpp-client", "tcp", conn->domain, connectdomain, 2048, &connectport))
{
if (altdomain)
{
strcpy(connectdomain, altdomain);
connectport = altport;
}
}
conn->sock = sock_connect(connectdomain, connectport); conn->sock = sock_connect(connectdomain, connectport);
if (conn->sock < 0) return -1; if (conn->sock == -1) return -1;
/* setup handler */ /* setup handler */
conn->conn_handler = callback; conn->conn_handler = callback;