void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 04:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ZSSP API updates.

Browse source
This commit is contained in:
Adam Ierymenko 2023-03-03 11:08:12 -05:00
parent 781b5eb270
commit 4360e0b487
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zssp/src/main.rs
View file

@ -18,7 +18,7 @@ struct TestApplication {
} }
impl zssp::ApplicationLayer for TestApplication { impl zssp::ApplicationLayer for TestApplication {
const REKEY_AFTER_USES: u64 = 350000; const REKEY_AFTER_USES: u64 = 300000;
const EXPIRE_AFTER_USES: u64 = 2147483648; const EXPIRE_AFTER_USES: u64 = 2147483648;
const REKEY_AFTER_TIME_MS: i64 = 1000 * 60 * 60 * 2; const REKEY_AFTER_TIME_MS: i64 = 1000 * 60 * 60 * 2;
const REKEY_AFTER_TIME_MS_MAX_JITTER: u32 = 1000 * 60 * 10; const REKEY_AFTER_TIME_MS_MAX_JITTER: u32 = 1000 * 60 * 10;
@ -90,7 +90,7 @@ fn alice_main(
TEST_MTU, TEST_MTU,
current_time, current_time,
) { ) {
Ok(zssp::ReceiveResult::Ok) => { Ok(zssp::ReceiveResult::Ok(_)) => {
//println!("[alice] ok"); //println!("[alice] ok");
} }
Ok(zssp::ReceiveResult::OkData(_, _)) => { Ok(zssp::ReceiveResult::OkData(_, _)) => {
@ -188,7 +188,7 @@ fn bob_main(
TEST_MTU, TEST_MTU,
current_time, current_time,
) { ) {
Ok(zssp::ReceiveResult::Ok) => { Ok(zssp::ReceiveResult::Ok(_)) => {
//println!("[bob] ok"); //println!("[bob] ok");
} }
Ok(zssp::ReceiveResult::OkData(s, data)) => { Ok(zssp::ReceiveResult::OkData(s, data)) => {

28
zssp/src/zssp.rs
View file

@ -57,8 +57,8 @@ struct SessionsById<Application: ApplicationLayer> {
/// Result generated by the context packet receive function, with possible payloads. /// Result generated by the context packet receive function, with possible payloads.
pub enum ReceiveResult<'b, Application: ApplicationLayer> { pub enum ReceiveResult<'b, Application: ApplicationLayer> {
/// Packet was valid, but no action needs to be taken. /// Packet was valid, but no action needs to be taken and no payload was delivered.
Ok, Ok(Option<Arc<Session<Application>>>),
/// Packet was valid and a data payload was decoded and authenticated. /// Packet was valid and a data payload was decoded and authenticated.
OkData(Arc<Session<Application>>, &'b mut [u8]), OkData(Arc<Session<Application>>, &'b mut [u8]),
@ -173,7 +173,6 @@ impl<Application: ApplicationLayer> Context<Application> {
{ {
let sessions = self.sessions.read().unwrap(); let sessions = self.sessions.read().unwrap();
for (id, s) in sessions.active.iter() { for (id, s) in sessions.active.iter() {
if let Some(session) = s.upgrade() { if let Some(session) = s.upgrade() {
let state = session.state.read().unwrap(); let state = session.state.read().unwrap();
@ -390,7 +389,11 @@ impl<Application: ApplicationLayer> Context<Application> {
/// ///
/// Note that if check_accept_session accepts and returns Some() the session could still fail with /// Note that if check_accept_session accepts and returns Some() the session could still fail with
/// receive() returning an error. A Some() return from check_accept_sesion doesn't guarantee /// receive() returning an error. A Some() return from check_accept_sesion doesn't guarantee
/// successful new session init. /// successful new session init, only that the application has authorized it.
///
/// Finally, note that the check_X() functions can end up getting called more than once for a given
/// incoming attempt from a given node if the network quality is poor. That's because the caller may
/// have to retransmit init packets causing repetition of parts of the exchange.
/// ///
/// * `app` - Interface to application using ZSSP /// * `app` - Interface to application using ZSSP
/// * `check_allow_incoming_session` - Function to call to check whether an unidentified new session should be accepted /// * `check_allow_incoming_session` - Function to call to check whether an unidentified new session should be accepted
@ -453,7 +456,8 @@ impl<Application: ApplicationLayer> Context<Application> {
current_time, current_time,
); );
} else { } else {
return Ok(ReceiveResult::Ok); drop(fragged);
return Ok(ReceiveResult::Ok(Some(session)));
} }
} else { } else {
return self.process_complete_incoming_packet( return self.process_complete_incoming_packet(
@ -556,7 +560,7 @@ impl<Application: ApplicationLayer> Context<Application> {
); );
} }
return Ok(ReceiveResult::Ok); return Ok(ReceiveResult::Ok(None));
} }
fn process_complete_incoming_packet< fn process_complete_incoming_packet<
@ -661,7 +665,7 @@ impl<Application: ApplicationLayer> Context<Application> {
if packet_type == PACKET_TYPE_DATA { if packet_type == PACKET_TYPE_DATA {
return Ok(ReceiveResult::OkData(session, &mut data_buf[..data_len])); return Ok(ReceiveResult::OkData(session, &mut data_buf[..data_len]));
} else { } else {
return Ok(ReceiveResult::Ok); return Ok(ReceiveResult::Ok(Some(session)));
} }
} else { } else {
return Err(Error::OutOfSequence); return Err(Error::OutOfSequence);
@ -835,7 +839,7 @@ impl<Application: ApplicationLayer> Context<Application> {
Some(&Aes::new(header_protection_key.as_bytes())), Some(&Aes::new(header_protection_key.as_bytes())),
)?; )?;
return Ok(ReceiveResult::Ok); return Ok(ReceiveResult::Ok(session));
} }
PACKET_TYPE_BOB_NOISE_XK_ACK => { PACKET_TYPE_BOB_NOISE_XK_ACK => {
@ -995,7 +999,7 @@ impl<Application: ApplicationLayer> Context<Application> {
Some(&session.header_protection_cipher), Some(&session.header_protection_cipher),
)?; )?;
return Ok(ReceiveResult::Ok); return Ok(ReceiveResult::Ok(Some(session)));
} else { } else {
return Err(Error::InvalidPacket); return Err(Error::InvalidPacket);
} }
@ -1220,7 +1224,8 @@ impl<Application: ApplicationLayer> Context<Application> {
false, false,
)); ));
return Ok(ReceiveResult::Ok); drop(state);
return Ok(ReceiveResult::Ok(Some(session)));
} }
} }
return Err(Error::FailedAuthentication); return Err(Error::FailedAuthentication);
@ -1280,7 +1285,8 @@ impl<Application: ApplicationLayer> Context<Application> {
state.current_key = next_key_index; // this is an ACK so it's confirmed state.current_key = next_key_index; // this is an ACK so it's confirmed
state.current_offer = Offer::None; state.current_offer = Offer::None;
return Ok(ReceiveResult::Ok); drop(state);
return Ok(ReceiveResult::Ok(Some(session)));
} }
} }
} }