Skip to content

20230521-wolfsentry-mt-usage-fixes #6431

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
dgarske merged 1 commit into from
May 22, 2023
Merged

20230521-wolfsentry-mt-usage-fixes #6431

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
40 changes: 40 additions & 0 deletions wolfssl/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,13 +1684,28 @@ static int wolfsentry_setup(
{
struct wolfsentry_route_table *table;

#ifdef WOLFSENTRY_THREADSAFE
ret = WOLFSENTRY_SHARED_EX(*_wolfsentry);
if (ret < 0) {
fprintf(stderr, "wolfsentry shared lock op failed: "
WOLFSENTRY_ERROR_FMT ".\n",
WOLFSENTRY_ERROR_FMT_ARGS(ret));
return ret;
}
#endif

if ((ret = wolfsentry_route_get_main_table(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry),
&table)) < 0)
{
fprintf(stderr, "wolfsentry_route_get_main_table() returned "
WOLFSENTRY_ERROR_FMT "\n",
WOLFSENTRY_ERROR_FMT_ARGS(ret));
#ifdef WOLFSENTRY_THREADSAFE
WOLFSENTRY_WARN_ON_FAILURE(
wolfsentry_context_unlock(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry)));
#endif
return ret;
}

Expand All @@ -1708,6 +1723,11 @@ static int wolfsentry_setup(
"wolfsentry_route_table_default_policy_set() returned "
WOLFSENTRY_ERROR_FMT "\n",
WOLFSENTRY_ERROR_FMT_ARGS(ret));
#ifdef WOLFSENTRY_THREADSAFE
WOLFSENTRY_WARN_ON_FAILURE(
wolfsentry_context_unlock(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry)));
#endif
return ret;
}

Expand Down Expand Up @@ -1742,6 +1762,11 @@ static int wolfsentry_setup(
fprintf(stderr, "wolfsentry_route_insert() returned "
WOLFSENTRY_ERROR_FMT "\n",
WOLFSENTRY_ERROR_FMT_ARGS(ret));
#ifdef WOLFSENTRY_THREADSAFE
WOLFSENTRY_WARN_ON_FAILURE(
wolfsentry_context_unlock(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry)));
#endif
return ret;
}
} else if (WOLFSENTRY_MASKIN_BITS(route_flags, WOLFSENTRY_ROUTE_FLAG_DIRECTION_IN)) {
Expand All @@ -1757,6 +1782,11 @@ static int wolfsentry_setup(
"wolfsentry_route_table_default_policy_set() returned "
WOLFSENTRY_ERROR_FMT "\n",
WOLFSENTRY_ERROR_FMT_ARGS(ret));
#ifdef WOLFSENTRY_THREADSAFE
WOLFSENTRY_WARN_ON_FAILURE(
wolfsentry_context_unlock(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry)));
#endif
return ret;
}

Expand Down Expand Up @@ -1791,9 +1821,19 @@ static int wolfsentry_setup(
fprintf(stderr, "wolfsentry_route_insert() returned "
WOLFSENTRY_ERROR_FMT "\n",
WOLFSENTRY_ERROR_FMT_ARGS(ret));
#ifdef WOLFSENTRY_THREADSAFE
WOLFSENTRY_WARN_ON_FAILURE(
wolfsentry_context_unlock(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry)));
#endif
return ret;
}
}
#ifdef WOLFSENTRY_THREADSAFE
WOLFSENTRY_WARN_ON_FAILURE(
wolfsentry_context_unlock(
WOLFSENTRY_CONTEXT_ARGS_OUT_EX(*_wolfsentry)));
#endif
}

#if defined(WOLFSENTRY_THREADSAFE) && defined(HAVE_WOLFSENTRY_API_0v8)
Expand Down