projects
/
crypto_lab1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Begining of some test cases.
[crypto_lab1.git]
/
src
/
main.rs
diff --git
a/src/main.rs
b/src/main.rs
index
fbffa21
..
5f2fdf9
100644
(file)
--- a/
src/main.rs
+++ b/
src/main.rs
@@
-1,14
+1,16
@@
#![feature(macro_rules)]
extern crate openssl;
#![feature(macro_rules)]
extern crate openssl;
+extern crate serialize;
use std::io;
use std::os;
use std::io;
use std::os;
+use end_point::{ Client, Server };
+
mod crypto;
mod packet;
mod crypto;
mod packet;
-mod client;
-mod server;
+mod end_point;
/*
TODO
/*
TODO
@@
-32,28
+34,18
@@
fn main() {
Ok(key) => println!("key: {}", key),
Err(e) => println!("Unable to generate a key. Error: {}", e)
}
Ok(key) => println!("key: {}", key),
Err(e) => println!("Unable to generate a key. Error: {}", e)
}
- } else {
- println!("Starting server.., Press any key to quit");
+ } else {
+ println!("Starting server..
.
, Press any key to quit");
- match
server::Server::new(
PORT) {
+ match
Server::new("::1",
PORT) {
Ok(mut server) => {
println!("Server started");
Ok(mut server) => {
println!("Server started");
-
- match client::Client::new("127.0.0.1", PORT) {
- Ok(mut client) => {
- client.start_tests();
- let _ = client.close();
- },
- Err(e) => {
- println!("Unable to create a client. Error: {}", e);
- return
- }
- }
-
+ Client::start_tests("::1", PORT);
io::stdin().read_line().ok().expect("Failed to read line");
server.close().ok().expect("Failed to close the server");
},
io::stdin().read_line().ok().expect("Failed to read line");
server.close().ok().expect("Failed to close the server");
},
- Err(e) => println!("Unable to create a new server. Error: {}", e)
+ Err(e) =>
+ println!("Unable to create a new server. Error: {}", e)
}
}
}
}
}
}