Skip to content

Change switch fallthrough #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 1 commit into from
Jul 10, 2025
Merged

Change switch fallthrough #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8286,7 +8286,7 @@ static int DoChannelOpen(WOLFSSH* ssh,
#ifdef WOLFSSH_FWD
case ID_CHANTYPE_TCPIP_DIRECT:
isDirect = 1;
NO_BREAK;
FALL_THROUGH;
case ID_CHANTYPE_TCPIP_FORWARD:
ret = DoChannelOpenForward(ssh,
&host, &hostPort, &origin, &originPort,
Expand Down Expand Up @@ -9973,7 +9973,7 @@ int DoReceive(WOLFSSH* ssh)
break;
}
}
NO_BREAK;
FALL_THROUGH;

case PROCESS_PACKET_LENGTH:
if (ssh->inputBuffer.idx + UINT32_SZ > ssh->inputBuffer.bufferSz) {
Expand All @@ -9990,7 +9990,7 @@ int DoReceive(WOLFSSH* ssh)
return WS_FATAL_ERROR;
}
ssh->processReplyState = PROCESS_PACKET_FINISH;
NO_BREAK;
FALL_THROUGH;

case PROCESS_PACKET_FINISH:
/* readSz is the full packet size */
Expand Down Expand Up @@ -10064,7 +10064,7 @@ int DoReceive(WOLFSSH* ssh)
ret = WS_FATAL_ERROR;
break;
}
NO_BREAK;
FALL_THROUGH;

case PROCESS_PACKET:
ret = DoPacket(ssh, &bufferConsumed);
Expand Down Expand Up @@ -10818,7 +10818,7 @@ static int SendKexGetSigningKey(WOLFSSH* ssh,
#ifdef WOLFSSH_CERTS
case ID_X509V3_SSH_RSA:
isCert = 1;
NO_BREAK;
FALL_THROUGH;
#endif
case ID_SSH_RSA:
case ID_RSA_SHA2_256:
Expand Down Expand Up @@ -10922,7 +10922,7 @@ static int SendKexGetSigningKey(WOLFSSH* ssh,
case ID_X509V3_ECDSA_SHA2_NISTP384:
case ID_X509V3_ECDSA_SHA2_NISTP521:
isCert = 1;
NO_BREAK;
FALL_THROUGH;
#endif
case ID_ECDSA_SHA2_NISTP256:
case ID_ECDSA_SHA2_NISTP384:
Expand Down
50 changes: 25 additions & 25 deletions src/ssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_SERVER_VERSION_SENT;
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_VERSION_SENT");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_SERVER_VERSION_SENT:
while (ssh->clientState < CLIENT_VERSION_DONE) {
Expand All @@ -527,7 +527,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_CLIENT_VERSION_DONE;
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_VERSION_DONE");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_CLIENT_VERSION_DONE:
if ( (ssh->error = SendKexInit(ssh)) < WS_SUCCESS) {
Expand All @@ -537,7 +537,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_SERVER_KEXINIT_SENT;
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_KEXINIT_SENT");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_SERVER_KEXINIT_SENT:
while (ssh->isKeying) {
Expand All @@ -549,7 +549,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_KEYED;
WLOG(WS_LOG_DEBUG, acceptState, "KEYED");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_KEYED:
while (ssh->clientState < CLIENT_USERAUTH_REQUEST_DONE) {
Expand All @@ -561,7 +561,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_CLIENT_USERAUTH_REQUEST_DONE;
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_USERAUTH_REQUEST_DONE");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_CLIENT_USERAUTH_REQUEST_DONE:
if ( (ssh->error = SendServiceAccept(ssh,
Expand All @@ -573,7 +573,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
ssh->acceptState = ACCEPT_SERVER_USERAUTH_ACCEPT_SENT;
WLOG(WS_LOG_DEBUG, acceptState,
"ACCEPT_SERVER_USERAUTH_ACCEPT_SENT");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_SERVER_USERAUTH_ACCEPT_SENT:
while (ssh->clientState < CLIENT_USERAUTH_DONE) {
Expand All @@ -585,7 +585,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_CLIENT_USERAUTH_DONE;
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_USERAUTH_DONE");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_CLIENT_USERAUTH_DONE:
if ( (ssh->error = SendUserAuthSuccess(ssh)) < WS_SUCCESS) {
Expand All @@ -595,7 +595,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_SERVER_USERAUTH_SENT;
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_USERAUTH_SENT");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_SERVER_USERAUTH_SENT:
while (ssh->clientState < CLIENT_CHANNEL_OPEN_DONE) {
Expand All @@ -607,7 +607,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
}
ssh->acceptState = ACCEPT_SERVER_CHANNEL_ACCEPT_SENT;
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_CHANNEL_ACCEPT_SENT");
NO_BREAK;
FALL_THROUGH;

case ACCEPT_SERVER_CHANNEL_ACCEPT_SENT:
while (ssh->clientState < CLIENT_DONE) {
Expand Down Expand Up @@ -770,7 +770,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_CLIENT_VERSION_SENT;
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_VERSION_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_VERSION_SENT:
while (ssh->serverState < SERVER_VERSION_DONE) {
Expand All @@ -782,7 +782,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_SERVER_VERSION_DONE;
WLOG(WS_LOG_DEBUG, connectState, "SERVER_VERSION_DONE");
NO_BREAK;
FALL_THROUGH;

case CONNECT_SERVER_VERSION_DONE:
if ( (ssh->error = SendKexInit(ssh)) < WS_SUCCESS) {
Expand All @@ -792,7 +792,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_CLIENT_KEXINIT_SENT;
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_KEXINIT_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_KEXINIT_SENT:
while (ssh->serverState < SERVER_KEXINIT_DONE) {
Expand All @@ -804,7 +804,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_SERVER_KEXINIT_DONE;
WLOG(WS_LOG_DEBUG, connectState, "SERVER_KEXINIT_DONE");
NO_BREAK;
FALL_THROUGH;

case CONNECT_SERVER_KEXINIT_DONE:
if (ssh->handshake == NULL) {
Expand All @@ -825,7 +825,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_CLIENT_KEXDH_INIT_SENT;
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_KEXDH_INIT_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_KEXDH_INIT_SENT:
while (ssh->isKeying) {
Expand All @@ -837,7 +837,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_KEYED;
WLOG(WS_LOG_DEBUG, connectState, "KEYED");
NO_BREAK;
FALL_THROUGH;

case CONNECT_KEYED:
if ( (ssh->error = SendServiceRequest(ssh, ID_SERVICE_USERAUTH)) <
Expand All @@ -847,7 +847,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_CLIENT_USERAUTH_REQUEST_SENT;
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_USERAUTH_REQUEST_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_USERAUTH_REQUEST_SENT:
while (ssh->serverState < SERVER_USERAUTH_REQUEST_DONE) {
Expand All @@ -859,7 +859,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_SERVER_USERAUTH_REQUEST_DONE;
WLOG(WS_LOG_DEBUG, connectState, "SERVER_USERAUTH_REQUEST_DONE");
NO_BREAK;
FALL_THROUGH;

case CONNECT_SERVER_USERAUTH_REQUEST_DONE:
#ifdef WOLFSSH_AGENT
Expand All @@ -880,7 +880,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_CLIENT_USERAUTH_SENT;
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_USERAUTH_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_USERAUTH_SENT:
while (ssh->serverState < SERVER_USERAUTH_ACCEPT_DONE) {
Expand All @@ -892,7 +892,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
}
ssh->connectState = CONNECT_SERVER_USERAUTH_ACCEPT_DONE;
WLOG(WS_LOG_DEBUG, connectState, "SERVER_USERAUTH_ACCEPT_DONE");
NO_BREAK;
FALL_THROUGH;

case CONNECT_SERVER_USERAUTH_ACCEPT_DONE:
{
Expand Down Expand Up @@ -924,7 +924,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
ssh->connectState = CONNECT_CLIENT_CHANNEL_OPEN_SESSION_SENT;
WLOG(WS_LOG_DEBUG, connectState,
"CLIENT_CHANNEL_OPEN_SESSION_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_CHANNEL_OPEN_SESSION_SENT:
while (ssh->serverState < SERVER_CHANNEL_OPEN_DONE) {
Expand All @@ -937,7 +937,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
ssh->connectState = CONNECT_SERVER_CHANNEL_OPEN_SESSION_DONE;
WLOG(WS_LOG_DEBUG, connectState,
"SERVER_CHANNEL_OPEN_SESSION_DONE");
NO_BREAK;
FALL_THROUGH;

case CONNECT_SERVER_CHANNEL_OPEN_SESSION_DONE:
#ifdef WOLFSSH_AGENT
Expand All @@ -953,7 +953,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
WLOG(WS_LOG_DEBUG, connectState,
"CLIENT_CHANNEL_AGENT_REQUEST_SENT");
ssh->connectState = CONNECT_CLIENT_CHANNEL_AGENT_REQUEST_SENT;
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_CHANNEL_AGENT_REQUEST_SENT:
#if defined(WOLFSSH_TERM) && !defined(NO_FILESYSTEM)
Expand All @@ -969,7 +969,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
WLOG(WS_LOG_DEBUG, connectState,
"CLIENT_CHANNEL_TERMINAL_REQUEST_SENT");
ssh->connectState = CONNECT_CLIENT_CHANNEL_TERMINAL_REQUEST_SENT;
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_CHANNEL_TERMINAL_REQUEST_SENT:
if ( (ssh->error = SendChannelRequest(ssh, ssh->channelName,
Expand All @@ -981,7 +981,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
ssh->connectState = CONNECT_CLIENT_CHANNEL_REQUEST_SENT;
WLOG(WS_LOG_DEBUG, connectState,
"CLIENT_CHANNEL_REQUEST_SENT");
NO_BREAK;
FALL_THROUGH;

case CONNECT_CLIENT_CHANNEL_REQUEST_SENT:
while (ssh->serverState < SERVER_DONE) {
Expand Down Expand Up @@ -1530,7 +1530,7 @@ int wolfSSH_SetChannelType(WOLFSSH* ssh, byte type, byte* name, word32 nameSz)
WLOG(WS_LOG_DEBUG, "Server side exec unsupported");
return WS_BAD_ARGUMENT;
}
NO_BREAK;
FALL_THROUGH;

case WOLFSSH_SESSION_SUBSYSTEM:
ssh->connectChannelId = type;
Expand Down
8 changes: 4 additions & 4 deletions src/wolfscp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,7 @@ int ReceiveScpMessage(WOLFSSH* ssh)

switch (buf[0]) {
case 'C':
NO_BREAK;
FALL_THROUGH;

case 'D':
if (buf[0] == 'C') {
Expand Down Expand Up @@ -1512,7 +1512,7 @@ int SendScpConfirmation(WOLFSSH* ssh)

case WS_SCP_CONTINUE:
/* default to ok confirmation */
NO_BREAK;
FALL_THROUGH;

default:
msg[0] = SCP_CONFIRM_OK;
Expand Down Expand Up @@ -1566,9 +1566,9 @@ int ReceiveScpConfirmation(WOLFSSH* ssh)
case SCP_CONFIRM_OK:
break;
case SCP_CONFIRM_ERR:
NO_BREAK;
FALL_THROUGH;
case SCP_CONFIRM_FATAL:
NO_BREAK;
FALL_THROUGH;
default:
WLOG(WS_LOG_ERROR,
"scp error: peer sent error confirmation (code: %d)",
Expand Down
Loading