RSDK-10366 - rust utils for windows #416
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| #include <algorithm> | ||
|
There was a problem hiding this comment. This should be down with the other C++ standard library includes around line 4-5 |
||
| #include <viam/sdk/rpc/dial.hpp> | ||
|
|
||
| #include <istream> | ||
|
|
@@ -148,20 +149,27 @@ std::shared_ptr<ViamChannel> ViamChannel::dial(const char* uri, | |
| if (opts.entity()) { | ||
| entity = opts.entity()->c_str(); | ||
| } | ||
| char* proxy_path = ::dial( | ||
| uri, entity, type, payload, opts.allows_insecure_downgrade(), float_timeout.count(), ptr); | ||
| if (proxy_path == NULL) { | ||
|
There was a problem hiding this comment.
|
||
| free_rust_runtime(ptr); | ||
| throw Exception(ErrorCondition::k_connection, "Unable to establish connecting path"); | ||
| } | ||
|
|
||
| std::string localhost_prefix("127.0.0.1"); | ||
|
There was a problem hiding this comment. There are other forms of localhost, like There was a problem hiding this comment. Yeah, the address we get back from |
||
| auto tcp_check = std::mismatch(localhost_prefix.begin(), localhost_prefix.end(), proxy_path); | ||
|
There was a problem hiding this comment. Why There was a problem hiding this comment. no good reason why! I asked the internet how to find a substring in C++ and somehow the first thing I landed on was an SO post recommending |
||
| std::string address; | ||
| if (tcp_check.first != localhost_prefix.end()) { | ||
| // proxy path is not a localhost address and is therefore a UDS socket | ||
|
There was a problem hiding this comment.
|
||
| address += "unix://"; | ||
|
There was a problem hiding this comment. In 62d40eb#diff-03661151ee3ff17fde17964451d2ea2fbd2322f2bd21f4851eade22a2aaad233R254, I found that using It might be worth considering just making the switch to There was a problem hiding this comment. Yeah good call, I'm happy to change this to fwiw this PR is actually enabling windows client usage! The restriction was UDS support in tokio, but now that |
||
| } | ||
| address += proxy_path; | ||
|
|
||
| const std::shared_ptr<grpc::Channel> channel = | ||
| impl::create_viam_channel(address, grpc::InsecureChannelCredentials()); | ||
| const std::unique_ptr<viam::robot::v1::RobotService::Stub> st = | ||
| viam::robot::v1::RobotService::NewStub(channel); | ||
| return std::make_shared<ViamChannel>(channel, proxy_path, ptr); | ||
| }; | ||
|
|
||
| unsigned int Options::refresh_interval() const { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is supporting cygwin something important?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not that I'm aware of, I wasn't sure so I was trying to be conservative.