Skip to content

Commit 6e33a37

Browse files
loggerheadloggerhead
committed
format with rustfmt
1 parent a3df46f commit 6e33a37

12 files changed

Lines changed: 225 additions & 141 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ target
22
*.log
33
*.pid
44
.#*
5+
*.bk

‎.rustfmt.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
fn_empty_single_line = false
2+
closure_block_indent_threshould = 0
3+
# TODO: change to `true` when stable
4+
use_try_shorthand = false

‎src/asyncdns.rs‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ macro_rules! err {
7979

8080
pub trait Caller {
8181
fn get_id(&self) -> Token;
82-
fn handle_dns_resolved(&mut self, event_loop: &mut EventLoop<Relay>, res: Result<Option<HostIpPair>>);
82+
fn handle_dns_resolved(&mut self,
83+
event_loop: &mut EventLoop<Relay>,
84+
res: Result<Option<HostIpPair>>);
8385
}
8486

8587
struct DNSResponse {
@@ -126,7 +128,10 @@ pub struct DNSResolver {
126128
}
127129

128130
impl DNSResolver {
129-
pub fn new(token: Token, server_list: Option<Vec<String>>, prefer_ipv6: bool) -> Result<DNSResolver> {
131+
pub fn new(token: Token,
132+
server_list: Option<Vec<String>>,
133+
prefer_ipv6: bool)
134+
-> Result<DNSResolver> {
130135
let sock = try!(UdpSocket::v4().map_err(|_| err!(InitSocketFailed)));
131136
// pre-define DNS server list
132137
let servers = match server_list {
@@ -185,9 +190,8 @@ impl DNSResolver {
185190
for server in &self.servers {
186191
let server = format!("{}:53", server);
187192
let addr = str2addr4(&server).unwrap();
188-
try!(build_request(&hostname, qtype).map_or(Err(err!(BuildRequestFailed)), |req| {
189-
self.sock.send_to(&req, &addr)
190-
}));
193+
try!(build_request(&hostname, qtype).map_or(Err(err!(BuildRequestFailed)),
194+
|req| self.sock.send_to(&req, &addr)));
191195
}
192196
Ok(())
193197
}
@@ -198,10 +202,10 @@ impl DNSResolver {
198202

199203
new_fat_slice_from_vec!(buf_slice, buf);
200204
match self.sock.recv_from(buf_slice) {
201-
Ok(None) => {},
202-
Ok(Some((nread, _addr))) => {
203-
unsafe { buf.set_len(nread); }
204-
}
205+
Ok(None) => {}
206+
Ok(Some((nread, _addr))) => unsafe {
207+
buf.set_len(nread);
208+
},
205209
Err(e) => res = Err(e),
206210
}
207211
self.receive_buf = Some(buf);
@@ -249,7 +253,7 @@ impl DNSResolver {
249253
}
250254
Ok(None)
251255
}
252-
res => res
256+
res => res,
253257
}
254258
}
255259

@@ -268,7 +272,7 @@ impl DNSResolver {
268272
try!(self.send_request(hostname, self.qtypes[0]));
269273
Ok(None)
270274
}
271-
res => res
275+
res => res,
272276
}
273277
}
274278

@@ -280,12 +284,11 @@ impl DNSResolver {
280284

281285
let caller = self.callers.get_mut(token).unwrap();
282286
if ip.is_empty() {
283-
caller.borrow_mut().handle_dns_resolved(event_loop,
284-
Err(err!(UnknownHost, hostname)));
287+
caller.borrow_mut()
288+
.handle_dns_resolved(event_loop, Err(err!(UnknownHost, hostname)));
285289
} else {
286290
let hostname_ip = (hostname.clone(), ip.clone());
287-
caller.borrow_mut().handle_dns_resolved(event_loop,
288-
Ok(Some(hostname_ip)));
291+
caller.borrow_mut().handle_dns_resolved(event_loop, Ok(Some(hostname_ip)));
289292
}
290293
}
291294
}
@@ -340,7 +343,10 @@ impl DNSResolver {
340343
res
341344
}
342345

343-
fn do_register(&mut self, event_loop: &mut EventLoop<Relay>, is_reregister: bool) -> Result<()> {
346+
fn do_register(&mut self,
347+
event_loop: &mut EventLoop<Relay>,
348+
is_reregister: bool)
349+
-> Result<()> {
344350
let events = EventSet::readable();
345351
let pollopts = PollOpt::edge() | PollOpt::oneshot();
346352

@@ -359,10 +365,7 @@ impl DNSResolver {
359365
self.do_register(event_loop, true)
360366
}
361367

362-
pub fn process(&mut self,
363-
event_loop: &mut EventLoop<Relay>,
364-
events: EventSet)
365-
-> Result<()> {
368+
pub fn process(&mut self, event_loop: &mut EventLoop<Relay>, events: EventSet) -> Result<()> {
366369
if events.is_error() {
367370
error!("events error on DNS socket");
368371
let _ = event_loop.deregister(&self.sock);
@@ -730,16 +733,17 @@ mod test {
730733
#[test]
731734
fn block_resolve() {
732735
let tests = vec![
733-
("114.114.114.114", "114.114.114.114"),
736+
("8.8.8.8", "8.8.8.8"),
734737
("localhost", "127.0.0.1"),
735738
("localhost.loggerhead.me", "127.0.0.1"),
736739
];
737740

738741
let mut resolver = asyncdns::DNSResolver::new(Token(0), None, false).unwrap();
739742
for (hostname, ip) in tests {
740743
resolver.block_resolve(hostname.to_string()).ok().map_or_else(|| {
741-
assert!(false);
742-
}, |r| {
744+
assert!(false);
745+
},
746+
|r| {
743747
assert!(r.is_some());
744748
let (_hostname, resolved_ip) = r.unwrap();
745749
assert!(resolved_ip == ip);

‎src/config.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ pub fn gen_config() -> Result<Config, ConfigError> {
164164

165165
if cfg!(feature = "sslocal") {
166166
args = args.arg(Arg::with_name("server")
167-
.short("s")
168-
.value_name("ip:port")
169-
.help("server address and port")
170-
.takes_value(true))
171-
.arg(Arg::with_name("mode")
172-
.long("mode")
173-
.help("the way to choose server")
174-
.default_value(DEFAULT_VALUE["mode"]));
167+
.short("s")
168+
.value_name("ip:port")
169+
.help("server address and port")
170+
.takes_value(true))
171+
.arg(Arg::with_name("mode")
172+
.long("mode")
173+
.help("the way to choose server")
174+
.default_value(DEFAULT_VALUE["mode"]));
175175
}
176176

177177
let matches = args.get_matches();

‎src/encrypt.rs‎

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ impl Encryptor {
5656
}
5757

5858
#[cfg(feature = "sslocal")]
59-
pub fn enable_ota(&mut self, addr_type: u8, header_length: usize, data: &[u8]) -> Option<Vec<u8>> {
59+
pub fn enable_ota(&mut self,
60+
addr_type: u8,
61+
header_length: usize,
62+
data: &[u8])
63+
-> Option<Vec<u8>> {
6064
let mut ota = OtaHelper::new();
6165
// OTA header
6266
let mut header = Vec::with_capacity(header_length + 10);
@@ -89,7 +93,11 @@ impl Encryptor {
8993
}
9094

9195
#[cfg(not(feature = "sslocal"))]
92-
pub fn enable_ota(&mut self, _addr_type: u8, header_length: usize, data: &[u8]) -> Option<Vec<u8>> {
96+
pub fn enable_ota(&mut self,
97+
_addr_type: u8,
98+
header_length: usize,
99+
data: &[u8])
100+
-> Option<Vec<u8>> {
93101
let mut ota = OtaHelper::new();
94102
// verify OTA header
95103
let header = &data[..header_length];
@@ -190,7 +198,11 @@ impl Encryptor {
190198
(cipher, res)
191199
}
192200

193-
fn raw_decrypt_udp(&self, iv_len: usize, key: &[u8], data: &[u8]) -> (Vec<u8>, Cipher, Vec<u8>) {
201+
fn raw_decrypt_udp(&self,
202+
iv_len: usize,
203+
key: &[u8],
204+
data: &[u8])
205+
-> (Vec<u8>, Cipher, Vec<u8>) {
194206
let iv = data[..iv_len].to_vec();
195207

196208
let mut decipher = create_cipher(key, &iv);
@@ -255,8 +267,8 @@ impl Encryptor {
255267
ota_key.extend_from_slice(&self.decipher_iv);
256268
ota_key.extend_from_slice(&self.key);
257269

258-
let sha1 = &data[data.len()-10..];
259-
let data = &data[..data.len()-10];
270+
let sha1 = &data[data.len() - 10..];
271+
let data = &data[..data.len() - 10];
260272

261273
if ota.verify_sha1(data, &ota_key, sha1) {
262274
self.ota_helper = Some(ota);
@@ -288,10 +300,14 @@ impl OtaHelper {
288300
let mut hmac = Hmac::new(Sha1::new(), key);
289301
let len = hmac.output_bytes();
290302
let mut res = Vec::with_capacity(len);
291-
unsafe { res.set_len(len); }
303+
unsafe {
304+
res.set_len(len);
305+
}
292306
hmac.input(data);
293307
hmac.raw_result(&mut res);
294-
unsafe { res.set_len(10); }
308+
unsafe {
309+
res.set_len(10);
310+
}
295311
res
296312
}
297313

@@ -329,17 +345,21 @@ impl OtaHelper {
329345
let offset = 12 - self.chunk_buf.len();
330346
self.chunk_buf.extend_from_slice(&data[..offset]);
331347
self.chunk_len = unpack!(u16, &self.chunk_buf[..2]);
332-
unsafe { self.chunk_sha1.set_len(0); }
348+
unsafe {
349+
self.chunk_sha1.set_len(0);
350+
}
333351
self.chunk_sha1.extend_from_slice(&self.chunk_buf[2..]);
334-
unsafe { self.chunk_buf.set_len(0); }
352+
unsafe {
353+
self.chunk_buf.set_len(0);
354+
}
335355
data = &data[offset..];
336356
}
337357
}
338358

339359
if data.len() + self.chunk_buf.len() < self.chunk_len as usize {
340360
self.chunk_buf.extend_from_slice(data);
341361
break;
342-
// if there are one or more chunks
362+
// if there are one or more chunks
343363
} else {
344364
let offset = self.chunk_len as usize - self.chunk_buf.len();
345365
// make sure there is a chunk data in chunk_buf
@@ -354,10 +374,14 @@ impl OtaHelper {
354374
if self.verify_sha1(&self.chunk_buf, &key, &self.chunk_sha1) {
355375
unpacked.extend_from_slice(&self.chunk_buf);
356376
self.chunk_len = 0;
357-
unsafe { self.chunk_buf.set_len(0); }
377+
unsafe {
378+
self.chunk_buf.set_len(0);
379+
}
358380
} else {
359381
self.chunk_len = 0;
360-
unsafe { self.chunk_buf.set_len(0); }
382+
unsafe {
383+
self.chunk_buf.set_len(0);
384+
}
361385
break;
362386
}
363387
}
@@ -375,7 +399,9 @@ fn create_cipher(key: &[u8], iv: &[u8]) -> Cipher {
375399
fn gen_key_iv(password: &str) -> (Vec<u8>, Vec<u8>) {
376400
let (key, _iv) = evp_bytes_to_key(password, 32, 16);
377401
let mut cipher_iv = Vec::with_capacity(16);
378-
unsafe { cipher_iv.set_len(16); }
402+
unsafe {
403+
cipher_iv.set_len(16);
404+
}
379405
let _ = OsRng::new().map(|mut rng| rng.fill_bytes(&mut cipher_iv));
380406
(key, cipher_iv)
381407
}
@@ -389,7 +415,9 @@ fn evp_bytes_to_key(password: &str, key_len: usize, iv_len: usize) -> (Vec<u8>,
389415
let mut cnt = 0;
390416

391417
while cnt < key_len + iv_len {
392-
unsafe { data.set_len(0); }
418+
unsafe {
419+
data.set_len(0);
420+
}
393421
if i > 0 {
394422
data.extend_from_slice(&*m[i - 1]);
395423
}

‎src/mode/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,5 @@ impl RttRecord {
9595
}
9696

9797
fn update(&mut self) {
98-
9998
}
10099
}

‎src/my_logger.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ pub fn init(conf: &Config) -> Result<(), LoggerInitError> {
6060
}
6161
}
6262
} else {
63-
let drain = slog_term::StreamerBuilder::new().use_custom_timestamp(move |io| {
64-
write!(io, "{}", now!())
65-
}).build();
63+
let drain = slog_term::StreamerBuilder::new()
64+
.use_custom_timestamp(move |io| write!(io, "{}", now!()))
65+
.build();
6666
setup_global_logger!(log_level, drain);
6767
}
6868

0 commit comments

Comments
 (0)