TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release

Browse Source 
Change-Id: I1301beacba87281b5818eb5e3f54525919158918
This commit is contained in:
Alexey Polyudov
2020-08-25 11:34:15 -07:00
parent 65ded1d0e0 2994e4f134
commit 01e22ef713
110 changed files with 4758 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core_v2/internal/service_controller.h
+3 -3
View File
@@ -62,7 +62,8 @@ class ServiceController {
virtual Status RequestConnection(ClientProxy* client,
const std::string& endpoint_id,
const ConnectionRequestInfo& info) = 0;
const ConnectionRequestInfo& info,
const ConnectionOptions& options) = 0;
virtual Status AcceptConnection(ClientProxy* client,
const std::string& endpoint_id,
const PayloadListener& listener) = 0;
@@ -76,8 +77,7 @@ class ServiceController {
const std::vector<std::string>& endpoint_ids,
Payload payload) = 0;
virtual Status CancelPayload(ClientProxy* client,
Payload::Id payload_id) = 0;
virtual Status CancelPayload(ClientProxy* client, Payload::Id payload_id) = 0;
virtual void DisconnectFromEndpoint(ClientProxy* client,
const std::string& endpoint_id) = 0;