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

Avoid proxy issues for localhost only communication #377

Merged
merged 11 commits into from
Sep 12, 2024
Merged

Avoid proxy issues for localhost only communication #377

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0468418
Simplify logic and make diagrams more readable.
jasonmreding Nov 30, 2023
0eac5e9
Mark as source only VIs to prevent dirty dots from recompiles.
jasonmreding Nov 30, 2023
ef5dd29
Add VI back to library.
jasonmreding Nov 30, 2023
a06209b
Update scripting of enum typedefs so multiple top level enum controls…
jasonmreding Nov 30, 2023
ff2faf2
Update UI so path controls for importing proto files accept directori…
jasonmreding Nov 30, 2023
0261c9e
Updating library to include newly added VI.
jasonmreding Nov 30, 2023
6d98d9e
Merge branch 'ni:master' into master
jasonmreding Aug 13, 2024
216d82d
Disable http proxy when communicating with loopback addresses.
jasonmreding Aug 21, 2024
479f855
Attempting to fix build
jasonmreding Aug 27, 2024
f3f9e1e
Brad's feedback.
jasonmreding Aug 30, 2024
f4a434e
Pin grpcio_tools to version 1.66.0 when running tests for the New_ATS.
jasonmreding Sep 12, 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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "third_party/grpc"]
path = third_party/grpc
url = https://github.com/grpc/grpc.git
[submodule "third_party/asio"]
path = third_party/asio
url = https://github.com/chriskohlhoff/asio.git
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ endif()

find_package(Threads REQUIRED)

# Setup ASIO
set(ASIO_ROOT "${CMAKE_SOURCE_DIR}/third_party/asio")
set(ASIO_INCLUDE_DIRS "${ASIO_ROOT}/asio/include")

#----------------------------------------------------------------------
#----------------------------------------------------------------------
message( ${CMAKE_SIZEOF_VOID_P} )
Expand Down Expand Up @@ -55,7 +59,7 @@ endif()
#----------------------------------------------------------------------
# Include generated *.pb.h files
#----------------------------------------------------------------------
include_directories("${CMAKE_CURRENT_BINARY_DIR}" "./src" "./third_party/grpc" "${CMAKE_CURRENT_BINARY_DIR}/gens")
include_directories("${CMAKE_CURRENT_BINARY_DIR}" "./src" "./third_party/grpc" "${CMAKE_CURRENT_BINARY_DIR}/gens" "${ASIO_INCLUDE_DIRS}")

#----------------------------------------------------------------------
# LabVIEW support for grpc and protobuf
Expand Down
Loading
Loading