Mercurial > ~mikael > mcabber > hg
diff mcabber/libjabber/jconn.c @ 403:17aa60c6dc63
Allow a different server name than the jid domain name
Sync libjabber with upstream (centericq). The libjabber patch is from
Ian Johannesen.
This allows connecting to Google Talk, for example.
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 27 Aug 2005 11:21:27 +0200 |
| parents | bd5638c21834 |
| children | ec86d759ed54 |
line wrap: on
line diff
--- a/mcabber/libjabber/jconn.c Mon Aug 22 20:33:11 2005 +0200 +++ b/mcabber/libjabber/jconn.c Sat Aug 27 11:21:27 2005 +0200 @@ -41,7 +41,7 @@ * a pointer to the connection structure * or NULL if allocations failed */ -jconn jab_new(char *user, char *pass, int port, int ssl) +jconn jab_new(char *user, char *pass, char *server, int port, int ssl) { pool p; jconn j; @@ -57,6 +57,7 @@ j->user = jid_new(p, user); j->pass = pstrdup(p, pass); j->port = port; + j->server = server; j->state = JCONN_STATE_OFF; j->cw_state = 0; @@ -139,10 +140,10 @@ XML_SetCharacterDataHandler(j->parser, charData); if (j->cw_state & CW_CONNECT_BLOCKING) - j->fd = make_netsocket(j->port, j->user->server, NETSOCKET_CLIENT, j->ssl); + j->fd = make_netsocket(j->port, j->server, NETSOCKET_CLIENT, j->ssl); else - j->fd = make_nb_netsocket(j->port, j->user->server, NETSOCKET_CLIENT, j->ssl, &j->cw_state); - + j->fd = make_nb_netsocket(j->port, j->server, NETSOCKET_CLIENT, j->ssl, &j->cw_state); + if(j->fd < 0) { STATE_EVT(JCONN_STATE_OFF); return;