Mercurial > pidgin
changeset 17339:3939bfca572e
merge of '63c69ee29386e7f15e24deaf98c667102057dd4b'
and '75c57b7e6ba659cb3ad1d5b080c7ab0d4f02b640'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 25 May 2007 18:50:03 +0000 |
| parents | c155b0496161 (current diff) d5f07d1e37e6 (diff) |
| children | 403fd23569de |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/ssl/ssl-gnutls.c Fri May 25 18:31:16 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Fri May 25 18:50:03 2007 +0000 @@ -123,6 +123,18 @@ gnutls_data->handshake_handler = purple_input_add(gsc->fd, PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc); + /* Orborde asks: Why are we configuring a callback, then + immediately calling it? + + Answer: gnutls_handshake (up in handshake_cb) needs to be called + once in order to get the ball rolling on the SSL connection. + Once it has done so, only then will the server reply, triggering + the callback. + + Since the logic driving gnutls_handshake is the same with the first + and subsequent calls, we'll just fire the callback immediately to + accomplish this. + */ ssl_gnutls_handshake_cb(gsc, gsc->fd, PURPLE_INPUT_READ); }
--- a/libpurple/sslconn.h Fri May 25 18:31:16 2007 +0000 +++ b/libpurple/sslconn.h Fri May 25 18:50:03 2007 +0000 @@ -170,6 +170,7 @@ /** * Adds an input watcher for the specified SSL connection. + * Once the SSL handshake is complete, use this to watch for actual data across it. * * @param gsc The SSL connection handle. * @param func The callback function.