Browse Source

Rename ServerConnection to Client.

wip
Titouan Rigoudy 9 years ago
parent
commit
87108ae0f7
2 changed files with 8 additions and 8 deletions
  1. +4
    -4
      src/client.rs
  2. +4
    -4
      src/main.rs

src/server.rs → src/client.rs View File

@ -15,7 +15,7 @@ enum State {
} }
#[derive(Debug)] #[derive(Debug)]
pub struct ServerConnection {
pub struct Client {
state: State, state: State,
token_counter: usize, token_counter: usize,
@ -25,10 +25,10 @@ pub struct ServerConnection {
server_interest: EventSet, server_interest: EventSet,
} }
impl ServerConnection {
impl Client {
pub fn new(server_stream: PacketStream<TcpStream>) -> Self { pub fn new(server_stream: PacketStream<TcpStream>) -> Self {
let token_counter = 0; let token_counter = 0;
ServerConnection {
Client {
state: State::NotLoggedIn, state: State::NotLoggedIn,
token_counter: token_counter, token_counter: token_counter,
server_token: Token(token_counter), server_token: Token(token_counter),
@ -151,7 +151,7 @@ impl ServerConnection {
} }
} }
impl Handler for ServerConnection {
impl Handler for Client {
type Timeout = (); type Timeout = ();
type Message = (); type Message = ();

+ 4
- 4
src/main.rs View File

@ -1,6 +1,6 @@
mod server;
mod proto;
mod client;
mod config; mod config;
mod proto;
extern crate byteorder; extern crate byteorder;
extern crate crypto; extern crate crypto;
@ -15,7 +15,7 @@ use mio::EventLoop;
use mio::tcp::TcpStream; use mio::tcp::TcpStream;
use proto::PacketStream; use proto::PacketStream;
use server::ServerConnection;
use client::Client;
fn connect(hostname: &str, port: u16) -> io::Result<TcpStream> { fn connect(hostname: &str, port: u16) -> io::Result<TcpStream> {
for sock_addr in try!((hostname, port).to_socket_addrs()) { for sock_addr in try!((hostname, port).to_socket_addrs()) {
@ -38,7 +38,7 @@ fn main() {
let mut event_loop = EventLoop::new().unwrap(); let mut event_loop = EventLoop::new().unwrap();
let packet_stream = PacketStream::new(stream); let packet_stream = PacketStream::new(stream);
let mut server_conn = ServerConnection::new(packet_stream);
let mut server_conn = Client::new(packet_stream);
server_conn.register_all(&mut event_loop).unwrap(); server_conn.register_all(&mut event_loop).unwrap();
event_loop.run(&mut server_conn).unwrap(); event_loop.run(&mut server_conn).unwrap();


Loading…
Cancel
Save