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

Ekr interop #84

Merged
merged 2 commits into from
Jan 21, 2018
Merged

Ekr interop #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823af67
Fix compilation
ekr Jan 20, 2018
162cadd
Fix over-large mininum transport parameter size
ekr Jan 20, 2018
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 Logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ Log::DoLog(unsigned int cat, unsigned int level, MozQuic *m, uint64_t cid, const
}

if (!m || !m->mAppHandlesLogging) {
fprintf(stderr,"%06ld:%016lx ", MozQuic::Timestamp() % 1000000, useCid);
fprintf(stderr,"%06lld:%016llx ", MozQuic::Timestamp() % 1000000, useCid);
vfprintf(stderr, fmt, paramList);
}
else if (m && m->mConnEventCB && m->mClosure) {
char buffer[2048];
int used = snprintf(buffer, 2048, "%06ld: ", MozQuic::Timestamp() % 1000000);
int used = snprintf(buffer, 2048, "%06lld: ", MozQuic::Timestamp() % 1000000);
if (used >= 2047) {
return MOZQUIC_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion TransportExtension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ TransportExtension::DecodeClientTransportParameters(unsigned char *input, uint16
Decode4ByteObject(input, offset, inputSize, _initialVersion);
Decode2ByteObject(input, offset, inputSize, paramSize);
assert(offset == 6);
if (paramSize < 30 || (offset + paramSize) > inputSize) {
if (paramSize < 22 || (offset + paramSize) > inputSize) {
return MOZQUIC_ERR_GENERAL;
}
input = input + offset;
Expand Down
8 changes: 4 additions & 4 deletions tests/qdrive/qdrive-client-test007.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ int testEvent7(void *closure, uint32_t event, void *param)
state.state++;
state.time0 = Timestamp();
}

if (event == MOZQUIC_EVENT_CONNECTED) {
test_assert(state.state == 1);
state.state++;
Expand Down Expand Up @@ -92,7 +92,7 @@ int testEvent7(void *closure, uint32_t event, void *param)
}
return MOZQUIC_OK;
}

if (state.state == 4) {
test_assert(state.ctr == 16000);
test_assert(state.time1 > state.time0);
Expand Down Expand Up @@ -124,12 +124,12 @@ int testEvent7(void *closure, uint32_t event, void *param)

if (state.state == 7) {
test_assert(1);
fprintf(stderr,"test7 client timing1 %ld timing2 %ld\n",
fprintf(stderr,"test7 client timing1 %lld timing2 %lld\n",
state.time1 - state.time0, state.time2 - state.time1);
// assert that the backpressure version was at least 500ms slower
// than the non backpressure version
test_assert((state.time2 - state.time1) - (state.time1 - state.time0) > 500);

mozquic_destroy_connection(parentConnection);
fprintf(stderr,"exit ok\n");
exit(0);
Expand Down