From 36a14836e08e5b3c327198e52d6cb86b4bcdf95b Mon Sep 17 00:00:00 2001
From: zonyitoo <zonyitoo@gmail.com>
Date: Sat, 8 Aug 2020 01:48:43 +0800
Subject: [PATCH] fix #283, build regression because of flow-stat with usize

---
 src/relay/local.rs                 | 2 +-
 src/relay/tcprelay/proxy_stream.rs | 4 ++--
 src/relay/udprelay/association.rs  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/relay/local.rs b/src/relay/local.rs
index d76a84c1..af09a56f 100644
--- a/src/relay/local.rs
+++ b/src/relay/local.rs
@@ -176,7 +176,7 @@ async fn flow_report_task(context: SharedContext) -> io::Result<()> {
         let tx = flow_stat.tcp().tx() + flow_stat.udp().tx();
         let rx = flow_stat.tcp().rx() + flow_stat.udp().rx();
 
-        let buf: [u64; 2] = [tx, rx];
+        let buf: [u64; 2] = [tx as u64, rx as u64];
         let buf = unsafe { slice::from_raw_parts(buf.as_ptr() as *const _, 16) };
 
         match time::timeout(timeout, stream.write_all(buf)).await {
diff --git a/src/relay/tcprelay/proxy_stream.rs b/src/relay/tcprelay/proxy_stream.rs
index 55d845cd..4b146ae2 100644
--- a/src/relay/tcprelay/proxy_stream.rs
+++ b/src/relay/tcprelay/proxy_stream.rs
@@ -374,7 +374,7 @@ impl AsyncRead for ProxyStream {
         {
             if self.is_proxied() {
                 if let Poll::Ready(Ok(n)) = p {
-                    self.context().local_flow_statistic().tcp().incr_rx(n as u64);
+                    self.context().local_flow_statistic().tcp().incr_rx(n);
                 }
             }
         }
@@ -392,7 +392,7 @@ impl AsyncWrite for ProxyStream {
         {
             if self.is_proxied() {
                 if let Poll::Ready(Ok(n)) = p {
-                    self.context().local_flow_statistic().tcp().incr_tx(n as u64);
+                    self.context().local_flow_statistic().tcp().incr_tx(n);
                 }
             }
         }
diff --git a/src/relay/udprelay/association.rs b/src/relay/udprelay/association.rs
index 529b7119..e708a61a 100644
--- a/src/relay/udprelay/association.rs
+++ b/src/relay/udprelay/association.rs
@@ -346,7 +346,7 @@ impl ProxyAssociation {
 
         #[cfg(feature = "local-flow-stat")]
         {
-            context.local_flow_statistic().udp().incr_tx(send_len as u64);
+            context.local_flow_statistic().udp().incr_tx(send_len);
         }
 
         Ok(())
@@ -482,7 +482,7 @@ impl ProxyAssociation {
 
         #[cfg(feature = "local-flow-stat")]
         {
-            context.local_flow_statistic().udp().incr_rx(recv_n as u64);
+            context.local_flow_statistic().udp().incr_rx(recv_n);
         }
 
         Ok((addr, payload))