Skip to content

Commit 596c8ae

Browse files
authored
Adapt to minor breaking change in websocket API (#79)
Adapt to changes from awslabs/aws-c-http#409
1 parent 193eb9f commit 596c8ae

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

source/secure_tunneling.c

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,7 @@ static void s_ping_task(struct aws_task *task, void *user_data, enum aws_task_st
173173
aws_event_loop_schedule_task_future(ping_task_context->event_loop, task, now + PING_TASK_INTERVAL);
174174
}
175175

176-
static void s_on_websocket_setup(
177-
struct aws_websocket *websocket,
178-
int error_code,
179-
int handshake_response_status,
180-
const struct aws_http_header *handshake_response_header_array,
181-
size_t num_handshake_response_headers,
182-
void *user_data) {
183-
184-
UNUSED(error_code);
185-
UNUSED(handshake_response_status);
186-
UNUSED(handshake_response_header_array);
187-
UNUSED(num_handshake_response_headers);
176+
static void s_on_websocket_setup(const struct aws_websocket_on_connection_setup_data *setup, void *user_data) {
188177

189178
/* TODO: Handle error
190179
* https://github.com/aws-samples/aws-iot-securetunneling-localproxy/blob/master/WebsocketProtocolGuide.md#handshake-error-responses
@@ -194,7 +183,7 @@ static void s_on_websocket_setup(
194183
aws_http_message_release(secure_tunnel->handshake_request);
195184
secure_tunnel->handshake_request = NULL;
196185

197-
secure_tunnel->websocket = websocket;
186+
secure_tunnel->websocket = setup->websocket;
198187
secure_tunnel->options->on_connection_complete(secure_tunnel->options->user_data);
199188

200189
struct ping_task_context *ping_task_context =
@@ -205,7 +194,7 @@ static void s_on_websocket_setup(
205194
ping_task_context->event_loop =
206195
aws_event_loop_group_get_next_loop(secure_tunnel->options->bootstrap->event_loop_group);
207196
aws_atomic_store_int(&ping_task_context->task_cancelled, 0);
208-
ping_task_context->websocket = websocket;
197+
ping_task_context->websocket = setup->websocket;
209198
ping_task_context->send_frame = secure_tunnel->websocket_vtable.send_frame;
210199

211200
aws_task_init(&ping_task_context->ping_task, s_ping_task, ping_task_context, "SecureTunnelingPingTask");

0 commit comments

Comments
 (0)