diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-04-25 19:57:23 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-04-25 19:57:23 +0200 |
| commit | 3edaed94d464210dd64e0d337a95287e3f12bb2d (patch) | |
| tree | 6c55361d3b0a0a5447886326ae46d8ea48506187 /protocols/ssl_nss.c | |
| parent | 85616c361bf152a10f774ad65068103d0724e42b (diff) | |
| parent | 79c6f9f8fff2b4c4627353e8a8eeb591d99a2098 (diff) | |
Misc. things (mainly code cleanup, better quoting for root commands)
Diffstat (limited to 'protocols/ssl_nss.c')
| -rw-r--r-- | protocols/ssl_nss.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/protocols/ssl_nss.c b/protocols/ssl_nss.c index dfd32622..00d32834 100644 --- a/protocols/ssl_nss.c +++ b/protocols/ssl_nss.c @@ -121,10 +121,10 @@ static void ssl_connected( gpointer data, gint source, GaimInputCondition cond ) if( source == -1 ) goto ssl_connected_failure; - - - + /* Until we find out how to handle non-blocking I/O with NSS... */ + sock_make_blocking( conn->fd ); + conn->prfd = SSL_ImportFD(NULL, PR_ImportTCPSocket(source)); SSL_OptionSet(conn->prfd, SSL_SECURITY, PR_TRUE); SSL_OptionSet(conn->prfd, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE); @@ -180,3 +180,9 @@ int ssl_getfd( void *conn ) { return( ((struct scd*)conn)->fd ); } + +GaimInputCondition ssl_getdirection( void *conn ) +{ + /* Just in case someone calls us, let's return the most likely case: */ + return GAIM_INPUT_READ; +} |