Skip to content
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

Jump to bottom

ctlr -> ctrl to be consistent #571

Merged
merged 3 commits into from
Nov 14, 2023
Merged

ctlr -> ctrl to be consistent #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec80d23
ctlr -> ctrl to be consistent
dovholuknf Nov 13, 2023
c4d4c45
fix cmake version
ekoby Nov 14, 2023
7e71c3a
fix run-cmake version
ekoby Nov 14, 2023
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
4 changes: 2 additions & 2 deletions .github/actions/build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ runs:
run: echo "target = ${{ inputs.target }}"
shell: bash

- uses: lukka/get-cmake@latest
- uses: lukka/get-cmake@v3.27.6

- uses: lukka/run-vcpkg@v10
with:
vcpkgGitCommitId: '19af97cba8ca48474e4ad15a24ed50271a9ecdac'

- uses: lukka/run-cmake@v10
- uses: lukka/run-cmake@v10.6
name: Configure CMake
with:
configurePreset: ci-${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion inc_internal/ziti_ctrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ typedef struct ziti_controller_s {
void *redirect_ctx;
} ziti_controller;

int ziti_ctrl_init(uv_loop_t *loop, ziti_controller *ctlr, const char *url, tls_context *tls);
int ziti_ctrl_init(uv_loop_t *loop, ziti_controller *ctrl, const char *url, tls_context *tls);

int ziti_ctrl_cancel(ziti_controller *ctrl);

Expand Down
2 changes: 1 addition & 1 deletion library/ziti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@
ziti_context ctx = NULL;
PREPF(ziti, ziti_errorstr);

if (options->config == NULL) {

Check warning on line 209 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 209 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]
ZITI_LOG(ERROR, "config or controller/tls has to be set");
return ZITI_INVALID_CONFIG;
}
ctx = calloc(1, sizeof(*ctx));

if (options->config != NULL) {

Check warning on line 215 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 215 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]
TRY(ziti, ziti_load_config(&ctx->config, options->config));

Check warning on line 216 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 216 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]
}

if (ctx->config.id.ca && strncmp(ctx->config.id.ca, "file://", strlen("file://")) == 0) {
Expand Down Expand Up @@ -909,7 +909,7 @@
void ziti_re_auth_with_cb(ziti_context ztx, void(*cb)(ziti_api_session *, const ziti_error *, void *), void *ctx) {
bool is_expired = is_api_session_expired(ztx);

ZTX_LOG(INFO, "starting to re-auth with ctlr[%s] api_session_status[%d] api_session_expired[%s]",
ZTX_LOG(INFO, "starting to re-auth with ctrl[%s] api_session_status[%d] api_session_expired[%s]",
ztx_controller(ztx), ztx->api_session_state, is_expired ? "TRUE" : "FALSE");

bool is_auth_started = ztx->api_session_state == ZitiApiSessionStateAuthStarted;
Expand Down
Loading