Skip to content

Commit

Permalink
Rename state_change to continue_tls_process
Browse files Browse the repository at this point in the history 
The name state_change is more confusing than helpful as it not really
indicates if there was a state change but rather if processing should
be continued. There even some states that are definitively state changes
(setting to_link buffer) that require continue_tls_process to be set
to false.

Change-Id: Ib6d713f2eb08a4c39d97de3e1a4a832cedc09585
Acked-by: Frank Lichtenheld <[email protected]>
Signed-off-by: Arne Schwabe <[email protected]>
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg27571.html
Signed-off-by: Gert Doering <[email protected]>
  • Loading branch information
@schwabe @cron2
schwabe authored and cron2 committed Dec 2, 2023
1 parent a68595a commit 8ba03f9
Showing 1 changed file with 28 additions and 23 deletions.
51 changes: 28 additions & 23 deletions src/openvpn/ssl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2694,7 +2694,7 @@ parse_early_negotiation_tlvs(struct buffer *buf, struct key_state *ks)
*/
static bool
read_incoming_tls_ciphertext(struct buffer *buf, struct key_state *ks,
bool *state_change)
bool *continue_tls_process)
{
int status = 0;
if (buf->len)
Expand All @@ -2714,7 +2714,7 @@ read_incoming_tls_ciphertext(struct buffer *buf, struct key_state *ks,
if (status == 1)
{
reliable_mark_deleted(ks->rec_reliable, buf);
*state_change = true;
*continue_tls_process = true;
dmsg(D_TLS_DEBUG, "Incoming Ciphertext -> TLS");
}
return true;
Expand All @@ -2730,7 +2730,7 @@ control_packet_needs_wkc(const struct key_state *ks)

static bool
read_incoming_tls_plaintext(struct key_state *ks, struct buffer *buf,
interval_t *wakeup, bool *state_change)
interval_t *wakeup, bool *continue_tls_process)
{
ASSERT(buf_init(buf, 0));

Expand All @@ -2744,7 +2744,7 @@ read_incoming_tls_plaintext(struct key_state *ks, struct buffer *buf,
}
if (status == 1)
{
*state_change = true;
*continue_tls_process = true;
dmsg(D_TLS_DEBUG, "TLS -> Incoming Plaintext");

/* More data may be available, wake up again asap to check. */
Expand All @@ -2754,7 +2754,7 @@ read_incoming_tls_plaintext(struct key_state *ks, struct buffer *buf,
}

static bool
write_outgoing_tls_ciphertext(struct tls_session *session, bool *state_change)
write_outgoing_tls_ciphertext(struct tls_session *session, bool *continue_tls_process)
{
struct key_state *ks = &session->key[KS_PRIMARY];

Expand Down Expand Up @@ -2830,7 +2830,7 @@ write_outgoing_tls_ciphertext(struct tls_session *session, bool *state_change)

reliable_mark_active_outgoing(ks->send_reliable, buf, opcode);
INCR_GENERATED;
*state_change = true;
*continue_tls_process = true;
}
dmsg(D_TLS_DEBUG, "Outgoing Ciphertext -> Reliable");
}
Expand All @@ -2839,7 +2839,6 @@ write_outgoing_tls_ciphertext(struct tls_session *session, bool *state_change)
return true;
}


static bool
tls_process_state(struct tls_multi *multi,
struct tls_session *session,
Expand All @@ -2848,13 +2847,19 @@ tls_process_state(struct tls_multi *multi,
struct link_socket_info *to_link_socket_info,
interval_t *wakeup)
{
bool state_change = false;
/* This variable indicates if we should call this method
* again to process more incoming/outgoing TLS state/data
* We want to repeat this until we either determined that there
* is nothing more to process or that further processing
* should only be done after the outer loop (sending packets etc.)
* has run once more */
bool continue_tls_process = false;
struct key_state *ks = &session->key[KS_PRIMARY]; /* primary key */

/* Initial handshake */
if (ks->state == S_INITIAL)
{
state_change = session_move_pre_start(session, ks, false);
continue_tls_process = session_move_pre_start(session, ks, false);
}

/* Are we timed out on receive? */
Expand All @@ -2872,7 +2877,7 @@ tls_process_state(struct tls_multi *multi,
if (ks->state == S_PRE_START && reliable_empty(ks->send_reliable))
{
ks->state = S_START;
state_change = true;
continue_tls_process = true;

/* New connection, remove any old X509 env variables */
tls_x509_clear_env(session->opt->es);
Expand All @@ -2885,7 +2890,7 @@ tls_process_state(struct tls_multi *multi,
&& reliable_empty(ks->send_reliable))
{
session_move_active(multi, session, to_link_socket_info, ks);
state_change = true;
continue_tls_process = true;
}

/* Reliable buffer to outgoing TCP/UDP (send up to CONTROL_SEND_ACK_MAX ACKs
Expand Down Expand Up @@ -2927,7 +2932,7 @@ tls_process_state(struct tls_multi *multi,
}
else
{
if (!read_incoming_tls_ciphertext(&entry->buf, ks, &state_change))
if (!read_incoming_tls_ciphertext(&entry->buf, ks, &continue_tls_process))
{
goto error;
}
Expand All @@ -2938,7 +2943,7 @@ tls_process_state(struct tls_multi *multi,
struct buffer *buf = &ks->plaintext_read_buf;
if (!buf->len)
{
if (!read_incoming_tls_plaintext(ks, buf, wakeup, &state_change))
if (!read_incoming_tls_plaintext(ks, buf, wakeup, &continue_tls_process))
{
goto error;
}
Expand All @@ -2954,7 +2959,7 @@ tls_process_state(struct tls_multi *multi,
goto error;
}

state_change = true;
continue_tls_process = true;
dmsg(D_TLS_DEBUG_MED, "STATE S_SENT_KEY");
ks->state = S_SENT_KEY;
}
Expand All @@ -2970,7 +2975,7 @@ tls_process_state(struct tls_multi *multi,
goto error;
}

state_change = true;
continue_tls_process = true;
dmsg(D_TLS_DEBUG_MED, "STATE S_GOT_KEY");
ks->state = S_GOT_KEY;
}
Expand All @@ -2988,7 +2993,7 @@ tls_process_state(struct tls_multi *multi,
}
if (status == 1)
{
state_change = true;
continue_tls_process = true;
dmsg(D_TLS_DEBUG, "Outgoing Plaintext -> TLS");
}
}
Expand All @@ -2999,14 +3004,14 @@ tls_process_state(struct tls_multi *multi,
buf = reliable_get_buf_output_sequenced(ks->send_reliable);
if (buf)
{
if (!write_outgoing_tls_ciphertext(session, &state_change))
if (!write_outgoing_tls_ciphertext(session, &continue_tls_process))
{
goto error;
}
}
}

return state_change;
return continue_tls_process;
error:
tls_clear_error();
ks->state = S_ERROR;
Expand Down Expand Up @@ -3065,19 +3070,19 @@ tls_process(struct tls_multi *multi,
msg(D_TLS_DEBUG_LOW, "TLS: tls_process: killed expiring key");
}

bool state_change = true;
while (state_change)
bool continue_tls_process = true;
while (continue_tls_process)
{
update_time();

dmsg(D_TLS_DEBUG, "TLS: tls_process: chg=%d ks=%s lame=%s to_link->len=%d wakeup=%d",
state_change,
continue_tls_process,
state_name(ks->state),
state_name(ks_lame->state),
to_link->len,
*wakeup);
state_change = tls_process_state(multi, session, to_link, to_link_addr,
to_link_socket_info, wakeup);
continue_tls_process = tls_process_state(multi, session, to_link, to_link_addr,
to_link_socket_info, wakeup);

if (ks->state == S_ERROR)
{
Expand Down

0 comments on commit 8ba03f9

Please sign in to comment.