DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Updated for language changes.

Browse source
This commit is contained in:
Aaron Weiss 2014-12-04 12:57:07 -05:00
parent 4cd500d892
commit 3b5bf55d0c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "irc" name = "irc"
version = "0.4.1" version = "0.4.2"
description = "A simple, thread-safe IRC client library." description = "A simple, thread-safe IRC client library."
authors = ["Aaron Weiss <aaronweiss74@gmail.com>"] authors = ["Aaron Weiss <aaronweiss74@gmail.com>"]
license = "Unlicense" license = "Unlicense"

4
src/conn.rs
View file

@ -7,7 +7,7 @@ use std::io::{BufferedReader, BufferedWriter, IoResult, TcpStream};
#[cfg(feature = "encode")] use encoding::label::encoding_from_whatwg_label; #[cfg(feature = "encode")] use encoding::label::encoding_from_whatwg_label;
use data::kinds::{IrcReader, IrcWriter}; use data::kinds::{IrcReader, IrcWriter};
use data::message::Message; use data::message::Message;
#[cfg(feature = "ssl")] use openssl::ssl::{SslContext, SslStream, Tlsv1}; #[cfg(feature = "ssl")] use openssl::ssl::{SslContext, SslMethod, SslStream};
#[cfg(feature = "ssl")] use openssl::ssl::error::SslError; #[cfg(feature = "ssl")] use openssl::ssl::error::SslError;
/// A thread-safe connection. /// A thread-safe connection.
@ -77,7 +77,7 @@ impl Connection<BufferedReader<NetStream>, BufferedWriter<NetStream>> {
-> IoResult<NetConnection> { -> IoResult<NetConnection> {
let mut socket = try!(TcpStream::connect(format!("{}:{}", host, port)[])); let mut socket = try!(TcpStream::connect(format!("{}:{}", host, port)[]));
socket.set_timeout(timeout_ms); socket.set_timeout(timeout_ms);
let ssl = try!(ssl_to_io(SslContext::new(Tlsv1))); let ssl = try!(ssl_to_io(SslContext::new(SslMethod::Tlsv1)));
let ssl_socket = try!(ssl_to_io(SslStream::new(&ssl, socket))); let ssl_socket = try!(ssl_to_io(SslStream::new(&ssl, socket)));
Ok(Connection::new( Ok(Connection::new(
BufferedReader::new(NetStream::SslTcpStream(ssl_socket.clone())), BufferedReader::new(NetStream::SslTcpStream(ssl_socket.clone())),