diff options
| author | Maciej Zenczykowski <maze@google.com> | 2019-08-21 18:09:03 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-21 18:09:03 -0700 |
| commit | 3138633e5464f1f5969617536f3a34928581b591 (patch) | |
| tree | 65807391c77c27fe3aa4da927b3256cdbe8364b1 | |
| parent | 6c9181a004ef6bd5c0734498b26f22f92326eaa3 (diff) | |
| parent | 86301dddcd094e882da5801c1000b840ca27b38e (diff) | |
| download | cts-3138633e5464f1f5969617536f3a34928581b591.tar.gz | |
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev
am: 86301dddcd
Change-Id: Ie40c609af50bb2718f8a7771201fcd6d9e28be25
| -rw-r--r-- | tests/tests/net/jni/NativeMultinetworkJni.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/tests/net/jni/NativeMultinetworkJni.cpp b/tests/tests/net/jni/NativeMultinetworkJni.cpp index a6b5e90b1da..5bd3013819d 100644 --- a/tests/tests/net/jni/NativeMultinetworkJni.cpp +++ b/tests/tests/net/jni/NativeMultinetworkJni.cpp @@ -455,13 +455,17 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runDatagramCheck( setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo)); // For reference see: - // https://tools.ietf.org/html/draft-tsvwg-quic-protocol-01#section-6.1 - uint8_t quic_packet[] = { - 0x0c, // public flags: 64bit conn ID, 8bit sequence number + // https://tools.ietf.org/html/draft-tsvwg-quic-protocol#section-6.1 + uint8_t quic_packet[1200] = { + 0x0d, // public flags: + // - version present (0x01), + // - 64bit connection ID (0x0c), + // - 1 byte packet number (0x00) 0, 0, 0, 0, 0, 0, 0, 0, // 64bit connection ID - 0x01, // sequence number + 0xaa, 0xda, 0xca, 0xaa, // reserved-space version number + 1, // 1 byte packet number 0x00, // private flags - 0x07, // type: regular frame type "PING" + 0x07, // PING frame (cuz why not) }; arc4random_buf(quic_packet + 1, 8); // random connection ID @@ -489,7 +493,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runDatagramCheck( i + 1, MAX_RETRIES, rcvd, errnum); } } - if (rcvd < sent) { + if (rcvd < 9) { ALOGD("QUIC UDP %s: sent=%zd but rcvd=%zd, errno=%d", kPort, sent, rcvd, errnum); if (rcvd <= 0) { ALOGD("Does this network block UDP port %s?", kPort); @@ -505,8 +509,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runDatagramCheck( return -EPROTO; } - // TODO: log, and compare to the IP address encoded in the - // response, since this should be a public reset packet. + // TODO: Replace this quick 'n' dirty test with proper QUIC-capable code. close(fd); return 0; |