Options should be parsed even if there is no token

src/packet.rs

@@ -199,23 +199,21 @@ impl Packet {
 		match header_result {
 			Ok(header) => {
 				let token_length = header.get_token_length();
-				let (mut token, mut payload) = (Vec::new(), Vec::new());
-				let mut options: BTreeMap<usize, LinkedList<Vec<u8>>> = BTreeMap::new();
+				let options_start: usize = 4 + token_length as usize;
 
-				if token_length > 0 {
 				if token_length > 8 {
 					return Err(ParseError::InvalidTokenLength);
 				}
 
-					let options_start: usize = 4 + token_length as usize;
 				if options_start > buf.len() {
 					return Err(ParseError::InvalidTokenLength);
 				}
 
-					token = buf[4..options_start].to_vec();
+				let token = buf[4..options_start].to_vec();
 
 				let mut idx = options_start;
 				let mut options_number = 0;
+				let mut options: BTreeMap<usize, LinkedList<Vec<u8>>> = BTreeMap::new();
 				while idx < buf.len() {
 					let byte = buf[idx];
 
@@ -283,10 +281,11 @@ impl Packet {
 					idx += length;
 				}
 
+				let mut payload = Vec::new();
 				if idx < buf.len() {
 					payload = buf[(idx + 1)..buf.len()].to_vec();
 				}
-				}
+
 
 				Ok(Packet {
 					header: header,