NAT implementation #15

JaneCX · 2017-08-14T22:08:52Z

nat

codecov · 2017-08-14T22:35:17Z

Codecov Report

Merging #15 into master will decrease coverage by 8.83%.
The diff coverage is 10.22%.

@@            Coverage Diff            @@
##           master     #15      +/-   ##
=========================================
- Coverage   66.73%   57.9%   -8.84%     
=========================================
  Files           5       5              
  Lines         475     563      +88     
=========================================
+ Hits          317     326       +9     
- Misses        158     237      +79

Impacted Files	Coverage Δ
src/network.rs	`50.92% <10.22%> (-15.05%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e16ee70...4fcecdd. Read the comment docs.

codecov-io · 2017-08-14T23:15:15Z

Codecov Report

Merging #15 into master will decrease coverage by 7.24%.
The diff coverage is 12.32%.

@@            Coverage Diff             @@
##           master      #15      +/-   ##
==========================================
- Coverage   66.73%   59.48%   -7.25%     
==========================================
  Files           5        6       +1     
  Lines         475      548      +73     
==========================================
+ Hits          317      326       +9     
- Misses        158      222      +64

Impacted Files	Coverage Δ
src/main.rs	`2.63% <ø> (ø)`	⬆️
src/network.rs	`65.98% <66.66%> (+0.01%)`	⬆️
src/nat.rs	`7.46% <7.46%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e16ee70...e2679f1. Read the comment docs.

changlan

formatting comments

changlan · 2017-08-15T03:38:18Z

src/network.rs

+use std::mem;
+use packet::{Ipv4Header,UdpHeader,TcpHeader, udptcp_cksum};
+use std::str;
+use std::num::ParseIntError;


changlan · 2017-08-15T03:38:33Z

src/network.rs

+use std::collections::HashMap;
+use std::mem;
+use packet::{Ipv4Header,UdpHeader,TcpHeader, udptcp_cksum};
+use std::str;


changlan · 2017-08-15T03:40:52Z

src/network.rs

+	}.unwrap()
+    }
+
+    pub fn handle_backward_packet(&mut self, data:&[u8], iph:&mut Ipv4Header, ex_address:u32){


ex_address is unused

changlan · 2017-08-15T03:41:56Z

src/network.rs

+	}
+    }
+
+    pub fn handle_forward_packet(&mut self, data:&[u8], iph:&mut Ipv4Header, ex_address:u32){


there should be a space after :

changlan · 2017-08-15T03:42:30Z

src/network.rs

+	}.unwrap();
+
+	let key = (iph.protocol, iph.source_address, sc_port);
+        let value = self.forward_table.get(&key).cloned();


indentation

changlan · 2017-08-15T03:42:46Z

src/network.rs

+		Err(String::from("no response"))
+            }
+	}.unwrap();
+	iph.source_address=ex_address; //source_ip -> external_ip


space before and after =

changlan · 2017-08-15T03:43:20Z

src/network.rs

+	let public_ip:Ipv4Addr = public_ip.parse().unwrap();
+	let exadd = public_ip.octets();
+	let ex_address = unsafe {
+		mem::transmute::<[u8;4],u32>(exadd)


space after comma

changlan · 2017-08-15T03:43:42Z

src/network.rs

                                            sent_len +=
                                                tun.write(&decompressed_data[sent_len..data_len])
                                                    .unwrap();
+					let data:&[u8] = decompressed_data.as_ref();


also indentation

changlan · 2017-08-15T03:44:07Z

src/network.rs

                    match client_info.get(&client_id) {
                        None => warn!("Unknown IP packet from TUN for client {}.", client_id),
                        Some(&(token, addr)) => {
+			    let mut iph = unsafe{


indentation

changlan

please run cargo fmt

changlan · 2017-08-15T06:40:23Z

src/network.rs

                        None => warn!("Unknown IP packet from TUN for client {}.", client_id),
                        Some(&(token, addr)) => {
+                            let mut iph = unsafe{
+				mem::transmute::<*const u8, &mut Ipv4Header>(data.as_ptr())


...indentation

changlan · 2017-08-15T06:40:28Z

src/network.rs

                        Some(&(token, addr)) => {
+                            let mut iph = unsafe{
+				mem::transmute::<*const u8, &mut Ipv4Header>(data.as_ptr())
+			    };					


...indentation

changlan · 2017-08-15T06:40:33Z

src/network.rs

+                            let mut iph = unsafe{
+				mem::transmute::<*const u8, &mut Ipv4Header>(data.as_ptr())
+			    };					
+			    NAT::handle_backward_packet(&mut nat, data, iph, ex_address);


...indentation

changlan · 2017-08-15T06:40:41Z

src/network.rs

-                                                    .unwrap();
+                                                    .unwrap()
+                                        let data: &[u8] = decompressed_data.as_ref();
+					let iph = unsafe {


...indentation

changlan · 2017-08-15T06:40:45Z

src/network.rs

+                                                    .unwrap()
+                                        let data: &[u8] = decompressed_data.as_ref();
+					let iph = unsafe {
+					    mem::transmute::<*const u8, &mut Ipv4Header>(data.as_ptr())


...indentation

changlan · 2017-08-15T06:40:49Z

src/network.rs

+                                        let data: &[u8] = decompressed_data.as_ref();
+					let iph = unsafe {
+					    mem::transmute::<*const u8, &mut Ipv4Header>(data.as_ptr())
+					};


...indentation

changlan · 2017-08-15T06:40:52Z

src/network.rs

+					let iph = unsafe {
+					    mem::transmute::<*const u8, &mut Ipv4Header>(data.as_ptr())
+					};
+					NAT::handle_forward_packet(&mut nat, data, iph, ex_address);


...indentation

changlan · 2017-08-15T06:41:14Z

src/network.rs

+		udphd.checksum = cksum;
+		Ok(udphd.destination_port = sc_port)
+	    }
+    	    6  =>{


changlan · 2017-08-15T06:41:17Z

src/network.rs

+	iph.destination_address = sc_address;   	//destination_address -> sc_address
+	match iph.protocol {                        //destination_port -> sc_port & checksum
+    	    1 => Err(String::from("The version is ICMP")),
+    	    17  => {


changlan · 2017-08-15T06:41:36Z

src/network.rs

+
+        let key = (iph.protocol, iph.source_address, sc_port);
+        let value = self.forward_table.get(&key).cloned();
+	let change_port = match value { //use source_port to get change_port


indentation

changlan · 2017-08-15T22:03:47Z

Travis CI build is failing. Please fix the build error. Thanks!

changlan · 2017-08-16T19:32:23Z

src/nat.rs

+	  	} else {
+	       	    Err(String::from("No port to distribute"))
+	   	};		
+		Err(String::from("no response"))


this line is not needed

changlan · 2017-08-16T19:35:41Z

src/nat.rs

+use std::collections::HashMap;
+use std::mem;
+use packet::{Ipv4Header,UdpHeader,TcpHeader, udptcp_cksum};
+use std::net::Ipv4Addr;


changlan · 2017-08-16T19:36:12Z

src/nat.rs

+use utils;
+use std::collections::HashMap;
+use std::mem;
+use packet::{Ipv4Header,UdpHeader,TcpHeader, udptcp_cksum};


space after commas

changlan · 2017-08-16T19:40:06Z

src/nat.rs

+		let udphd = unsafe {
+		    mem::transmute::<*const u8, &mut UdpHeader>(data.as_ptr().offset(len))
+		};
+		let cksum = udptcp_cksum(&iph, &udphd);


You should recompute checksum AFTER changing the port number.

changlan · 2017-08-16T19:40:28Z

src/nat.rs

+	}.unwrap();
+	iph.source_address = ex_address; //source_ip -> external_ip
+	match iph.protocol {           //source_port -> change_port & checksum
+    	    1   => Err(String::from("The version is ICMP")),


For now just use panic!(...)

changlan · 2017-08-16T19:41:02Z

src/nat.rs

+		};
+		let cksum = udptcp_cksum(&iph, &udphd);
+		udphd.source_port = change_port;
+		Ok(udphd.checksum = cksum)


Just use udphd.checksum = udptcp_cksum(&iph, &udphd);

changlan · 2017-08-16T19:41:13Z

src/nat.rs

+		};
+		let cksum = udptcp_cksum(&iph, &tcphd);
+		tcphd.source_port = change_port;
+		Ok(tcphd.checksum = cksum)				


changlan · 2017-08-16T19:41:20Z

src/nat.rs

+		tcphd.source_port = change_port;
+		Ok(tcphd.checksum = cksum)				
+	    }
+    	    _ => Err(String::from("Invalid address!")),


changlan · 2017-08-16T19:41:54Z

src/nat.rs

+		Ok(tcphd.checksum = cksum)				
+	    }
+    	    _ => Err(String::from("Invalid address!")),
+	}.unwrap()


no need to unwrap now that the expression returns ()

changlan · 2017-08-16T19:42:40Z

src/nat.rs

+	        Ok(tcphd.destination_port = sc_port)
+	    }
+    	    _  => Err(String::from("Invalid address!")),
+	}.unwrap()


nat

4fcecdd

nat

6321440

changlan changed the title ~~nat~~ NAT implementation Aug 14, 2017

changlan requested changes Aug 15, 2017

View reviewed changes

nat

f519806

changlan requested changes Aug 15, 2017

View reviewed changes

JaneCX added 2 commits August 15, 2017 14:50

nat

77e144a

nat

c4b8765

nat

f4476bc

changlan reviewed Aug 16, 2017

View reviewed changes

src/nat.rs Outdated

} else {

Err(String::from("No port to distribute"))

};

Err(String::from("no response"))

Copy link

Owner

changlan Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line is not needed

changlan reviewed Aug 16, 2017

View reviewed changes

src/nat.rs Outdated

Ok(tcphd.destination_port = sc_port)

}

_ => Err(String::from("Invalid address!")),

}.unwrap()

Copy link

Owner

changlan Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same above

JaneCX and others added 4 commits August 17, 2017 03:48

nat

81cedcd

Address comments

7def2d2

recompute ipv4 header checksum

beb1e61

More bug fixes

e2679f1

NAT implementation #15

Are you sure you want to change the base?

NAT implementation #15

Uh oh!

Conversation

JaneCX commented Aug 14, 2017

Uh oh!

codecov bot commented Aug 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

codecov-io commented Aug 14, 2017 • edited by codecov bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

changlan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

changlan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

changlan commented Aug 15, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

changlan Aug 16, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

codecov bot commented Aug 14, 2017 •

edited

Loading

codecov-io commented Aug 14, 2017 •

edited by codecov bot

Loading

changlan Aug 16, 2017 •

edited

Loading