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

Fix return from kws_raw_write on fragmented frame sending #214

Merged
merged 4 commits into from
Jul 16, 2024
Merged

Fix return from kws_raw_write on fragmented frame sending #214

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbc3a06
kws_raw_write should return the total number of bytes sent, not just …
Astaelan Jul 16, 2024
5d64957
Adjustment to make sure returns of -1 are captured as well, and fix m…
Astaelan Jul 16, 2024
48f4a8e
Added zero to be inclusive as successful write when using raw sockets…
Astaelan Jul 16, 2024
b3bd249
Adjust the kws_write_frame so that when it sees a return <=0 it retur…
Astaelan Jul 16, 2024
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
6 changes: 3 additions & 3 deletions src/kws.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ KS_DECLARE(ks_ssize_t) kws_raw_write(kws_t *kws, void *data, ks_size_t bytes)
r = ssl_err * -1;
}

return r;
return r > 0 ? wrote : r;
}

do {
Expand Down Expand Up @@ -650,7 +650,7 @@ KS_DECLARE(ks_ssize_t) kws_raw_write(kws_t *kws, void *data, ks_size_t bytes)
//printf("wRITE FAIL: %s\n", strerror(errno));
//}

return r;
return r >= 0 ? wrote : r;
}

static void setup_socket(ks_socket_t sock)
Expand Down Expand Up @@ -1622,7 +1622,7 @@ KS_DECLARE(ks_ssize_t) kws_write_frame(kws_t *kws, kws_opcode_t oc, const void *

raw_ret = kws_raw_write(kws, bp, (hlen + bytes));

if (raw_ret != (ks_ssize_t) (hlen + bytes)) {
if (raw_ret <= 0 || raw_ret != (ks_ssize_t) (hlen + bytes)) {
return raw_ret;
}

Expand Down
Loading