Skip to content

Commit

Permalink
Sync Latest - 11/22/2019 (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
nibanks authored Nov 22, 2019
1 parent 1cba2c3 commit 69a2cf9
Show file tree
Hide file tree
Showing 42 changed files with 908 additions and 382 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
DEPENDS ${CMAKE_SOURCE_DIR}/bld/inc/MsQuicEtw.rc)

# Custom build flags.
set(QUIC_C_FLAGS "-DWIN32_LEAN_AND_MEAN -DSECURITY_WIN32 -DQUIC_EVENTS_MANIFEST_ETW -DQUIC_LOGS_STUB -DQUIC_NO_TAEF -DQUIC_0RTT_UNSUPPORTED /W4 /wd4100 /wd4101 /wd4189 /wd4458 /wd4459 /wd4702 /wd26451 /wd26812 /sdl /MP")
set(QUIC_C_FLAGS "-DWIN32_LEAN_AND_MEAN -DSECURITY_WIN32 -DQUIC_EVENTS_MANIFEST_ETW -DQUIC_LOGS_MANIFEST_ETW -DQUIC_0RTT_UNSUPPORTED /W4 /wd4100 /wd4101 /wd4189 /wd4458 /wd4459 /wd4702 /wd26451 /wd26812 /sdl /MP")
set(QUIC_CXX_FLAGS "${QUIC_C_FLAGS} /std:c++17")
else()
# Custom build flags.
Expand Down
37 changes: 19 additions & 18 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

set(SOURCES
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

set(SOURCES
ack_tracker.c
api.c
binding.c
Expand All @@ -18,6 +18,7 @@ set(SOURCES
packet.c
packet_builder.c
packet_space.c
path.c
range.c
recv_buffer.c
registration.c
Expand All @@ -32,17 +33,17 @@ set(SOURCES
stream_set.c
timer_wheel.c
utils.c
worker.c
)

if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(SOURCES ${SOURCES} inline.c)
endif()

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${QUIC_C_FLAGS}")

add_library(core STATIC ${SOURCES})

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
add_dependencies(core MsQuicEtw)
endif()
worker.c
)

if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(SOURCES ${SOURCES} inline.c)
endif()

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${QUIC_C_FLAGS}")

add_library(core STATIC ${SOURCES})

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
add_dependencies(core MsQuicEtw)
endif()
7 changes: 7 additions & 0 deletions core/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,13 @@ MsQuicStreamSend(
Oper->API_CALL.Context->Type = QUIC_API_TYPE_STRM_SEND;
Oper->API_CALL.Context->STRM_SEND.Stream = Stream;

//
// Async stream operations need to hold a ref on the stream so that the
// stream isn't freed before the operation can be processed. The ref is
// released after the operation is processed.
//
QuicStreamAddRef(Stream, QUIC_STREAM_REF_OPERATION);

//
// Queue the operation but don't wait for the completion.
//
Expand Down
5 changes: 5 additions & 0 deletions core/binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ typedef struct _QUIC_RECV_PACKET {
//
BOOLEAN NewLargestPacketNumber : 1;

//
// Flag indicating the packet contained a non-probing frame.
//
BOOLEAN HasNonProbingFrame : 1;

} QUIC_RECV_PACKET;

typedef enum _QUIC_BINDING_LOOKUP_TYPE {
Expand Down
Loading

0 comments on commit 69a2cf9

Please sign in to comment.