Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

socket: fixes around camblet_get/setsockopt and recvmsg waiting and other things #209

Merged
merged 22 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
rename user facing type
  • Loading branch information
bonifaido committed Apr 12, 2024
commit fd5b1ee167a1ceea1110aee6ca438ee16d86f4a4
2 changes: 1 addition & 1 deletion include/camblet.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ typedef struct
bool mtls_enabled;
char spiffe_id[256];
char peer_spiffe_id[256];
} tls_info;
} camblet_tls_info;

#endif /* camblet_h */
2 changes: 1 addition & 1 deletion src/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,7 @@ int camblet_getsockopt(struct sock *sk, int level,
return err;
}

tls_info info = {};
camblet_tls_info info = {0};

info.camblet_enabled = s->opa_socket_ctx.allowed;
info.mtls_enabled = s->opa_socket_ctx.mtls;
Expand Down
2 changes: 1 addition & 1 deletion test/sockopt.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main(int argc, char **argv)
}

// Camblet socket options can be read after connect
tls_info tls_info;
camblet_tls_info tls_info;
socklen_t tls_inf_len = sizeof(tls_info);
if (getsockopt(sock, SOL_CAMBLET, CAMBLET_TLS_INFO, &tls_info, &tls_inf_len) < 0)
{
Expand Down