Skip to content

Commit 8c51a0f

Browse files
abeltranoabeltrano
authored
Merge pull request #297 from microsoft/release/v0.3.0
Release v0.3.0
2 parents cc54b8c + 69162f3 commit 8c51a0f

File tree

68 files changed

+2158
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2158
-247
lines changed

‎.docker/netremote-dev/vcpkg.json‎

Lines changed: 69 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,70 @@
1-
{
2-
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3-
"name": "netremote",
4-
"version-string": "1",
5-
"dependencies": [
6-
{
7-
"name": "sdbus-cpp",
8-
"platform": "linux"
9-
},
10-
"grpc",
11-
"cli11",
12-
"protobuf",
13-
"catch2",
14-
"plog",
15-
"magic-enum",
16-
{
17-
"name": "wil",
18-
"platform": "windows"
19-
}
20-
]
1+
{
2+
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3+
"name": "netremote",
4+
"version-string": "0.3.0",
5+
"dependencies": [
6+
{
7+
"name": "sdbus-cpp",
8+
"platform": "linux"
9+
},
10+
{
11+
"name": "libsystemd",
12+
"platform": "linux"
13+
},
14+
{
15+
"name": "vcpkg-cmake",
16+
"host": true
17+
},
18+
{
19+
"name": "vcpkg-cmake-config",
20+
"host": true
21+
},
22+
{
23+
"name": "wil",
24+
"platform": "windows"
25+
},
26+
"catch2",
27+
"cli11",
28+
"grpc",
29+
"magic-enum",
30+
"plog",
31+
"protobuf"
32+
],
33+
"overrides": [
34+
{
35+
"name": "cli11",
36+
"version": "2.3.1"
37+
}
38+
],
39+
"features": {
40+
"protocol": {
41+
"description": "Enable building the client protocol",
42+
"dependencies": [
43+
"grpc",
44+
"protobuf"
45+
]
46+
},
47+
"server":{
48+
"description": "Enable building the server",
49+
"dependencies": [
50+
"netremote"
51+
]
52+
},
53+
"tests":{
54+
"description": "Enable building the tests",
55+
"dependencies": [
56+
"netremote"
57+
]
58+
},
59+
"tools":{
60+
"description": "Enable building the tools",
61+
"dependencies": [
62+
"netremote"
63+
]
64+
}
65+
},
66+
"default-features": [
67+
"protocol"
68+
],
69+
"builtin-baseline": "9224b3bbd8df24999d85720b1d005dd6f969ade0"
2170
}

‎cmake/version.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Default version values in case we can't get them from git.
33
set(VERSION_MAJOR 0)
4-
set(VERSION_MINOR 2)
4+
set(VERSION_MINOR 3)
55
set(VERSION_PATCH 0)
66

77
if (NOT GIT_EXECUTABLE)

‎packaging/vcpkg/ports/netremote/vcpkg.json‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎protocol/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_PREFIX ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE
66
set(PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/protos)
77
set(PROTO_DIR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX})
88
set(PROTO_FILES
9-
${PROTO_DIR}/NetRemote.proto
109
${PROTO_DIR}/NetRemoteDataStream.proto
1110
${PROTO_DIR}/NetRemoteDataStreamingService.proto
1211
${PROTO_DIR}/NetRemoteNetwork.proto
1312
${PROTO_DIR}/NetRemoteService.proto
1413
${PROTO_DIR}/NetRemoteWifi.proto
14+
${PROTO_DIR}/Network8021x.proto
1515
${PROTO_DIR}/NetworkCore.proto
1616
${PROTO_DIR}/WifiCore.proto
1717
)
@@ -27,23 +27,23 @@ set(PROTO_FILES
2727
# string(REGEX REPLACE "[.]proto$" ".pb.grpc.h" PROTO_HEADERS_GENERATED_GRPC "${PROTO_FILES_GENERATED}")
2828
#
2929
set(PROTO_HEADERS_GENERATED
30-
${PROTO_DIR_BINARY}/NetRemote.pb.h
3130
${PROTO_DIR_BINARY}/NetRemoteDataStream.pb.h
3231
${PROTO_DIR_BINARY}/NetRemoteDataStreamingService.pb.h
3332
${PROTO_DIR_BINARY}/NetRemoteNetwork.pb.h
3433
${PROTO_DIR_BINARY}/NetRemoteService.pb.h
3534
${PROTO_DIR_BINARY}/NetRemoteWifi.pb.h
35+
${PROTO_DIR_BINARY}/Network8021x.pb.h
3636
${PROTO_DIR_BINARY}/NetworkCore.pb.h
3737
${PROTO_DIR_BINARY}/WifiCore.pb.h
3838
)
3939

4040
set(PROTO_HEADERS_GENERATED_GRPC
41-
${PROTO_DIR_BINARY}/NetRemote.grpc.pb.h
4241
${PROTO_DIR_BINARY}/NetRemoteDataStream.grpc.pb.h
4342
${PROTO_DIR_BINARY}/NetRemoteDataStreamingService.grpc.pb.h
4443
${PROTO_DIR_BINARY}/NetRemoteNetwork.grpc.pb.h
4544
${PROTO_DIR_BINARY}/NetRemoteService.grpc.pb.h
4645
${PROTO_DIR_BINARY}/NetRemoteWifi.grpc.pb.h
46+
${PROTO_DIR_BINARY}/Network8021x.grpc.pb.h
4747
${PROTO_DIR_BINARY}/NetworkCore.grpc.pb.h
4848
${PROTO_DIR_BINARY}/WifiCore.grpc.pb.h
4949
)

‎protocol/protos/NetRemote.proto‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎protocol/protos/NetRemoteDataStreamingService.proto‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package Microsoft.Net.Remote.Service;
55

66
import "google/protobuf/empty.proto";
77

8-
import "NetRemote.proto";
98
import "NetRemoteDataStream.proto";
109

1110
service NetRemoteDataStreaming

‎protocol/protos/NetRemoteService.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ syntax = "proto3";
33

44
package Microsoft.Net.Remote.Service;
55

6-
import "NetRemote.proto";
76
import "NetRemoteNetwork.proto";
87
import "NetRemoteWifi.proto";
98

@@ -20,4 +19,5 @@ service NetRemote
2019
rpc WifiAccessPointSetFrequencyBands (Microsoft.Net.Remote.Wifi.WifiAccessPointSetFrequencyBandsRequest) returns (Microsoft.Net.Remote.Wifi.WifiAccessPointSetFrequencyBandsResult);
2120
rpc WifiAccessPointSetSsid (Microsoft.Net.Remote.Wifi.WifiAccessPointSetSsidRequest) returns (Microsoft.Net.Remote.Wifi.WifiAccessPointSetSsidResult);
2221
rpc WifiAccessPointSetNetworkBridge (Microsoft.Net.Remote.Wifi.WifiAccessPointSetNetworkBridgeRequest) returns (Microsoft.Net.Remote.Wifi.WifiAccessPointSetNetworkBridgeResult);
22+
rpc WifiAccessPointSetAuthenticationDot1x (Microsoft.Net.Remote.Wifi.WifiAccessPointSetAuthenticationDot1xRequest) returns (Microsoft.Net.Remote.Wifi.WifiAccessPointSetAuthenticationDot1xResult);
2323
}

‎protocol/protos/NetRemoteWifi.proto‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,15 @@ message WifiAccessPointSetSsidResult
112112
string AccessPointId = 1;
113113
WifiAccessPointOperationStatus Status = 2;
114114
}
115+
116+
message WifiAccessPointSetAuthenticationDot1xRequest
117+
{
118+
string AccessPointId = 1;
119+
Microsoft.Net.Wifi.Dot11AuthenticationDot1x AuthenticationDot1x = 2;
120+
}
121+
122+
message WifiAccessPointSetAuthenticationDot1xResult
123+
{
124+
string AccessPointId = 1;
125+
WifiAccessPointOperationStatus Status = 2;
126+
}

‎protocol/protos/Network8021x.proto‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
2+
syntax = "proto3";
3+
4+
package Microsoft.Net;
5+
6+
enum Dot1xRadiusServerEndpoint
7+
{
8+
Dot1xRadiusServerEndpointUnknown = 0;
9+
Dot1xRadiusServerEndpointAuthentication = 1;
10+
Dot1xRadiusServerEndpointAccounting = 2;
11+
}
12+
13+
message Dot1xRadiusServerEndpointConfiguration
14+
{
15+
Dot1xRadiusServerEndpoint Endpoint = 1;
16+
string Address = 2;
17+
uint32 Port = 3;
18+
string SharedSecret = 4;
19+
}
20+
21+
message Dot1xRadiusConfiguration
22+
{
23+
Dot1xRadiusServerEndpointConfiguration AuthenticationServer = 1;
24+
Dot1xRadiusServerEndpointConfiguration AccountingServer = 2;
25+
repeated Dot1xRadiusServerEndpointConfiguration FallbackServers = 3;
26+
}

‎protocol/protos/WifiCore.proto‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ syntax = "proto3";
33

44
package Microsoft.Net.Wifi;
55

6+
import "Network8021x.proto";
7+
68
enum Dot11FrequencyBand
79
{
810
option allow_alias = true;
@@ -188,6 +190,12 @@ message Dot11AuthenticationData
188190
Dot11AuthenticationDataSae Sae = 2;
189191
}
190192

193+
// IEEE 802.1X EAP over LAN (EAPOL) configuration per IEEE 802.1X-2004.
194+
message Dot11AuthenticationDot1x
195+
{
196+
Dot1xRadiusConfiguration Radius = 1;
197+
}
198+
191199
message Dot11CipherSuiteConfiguration
192200
{
193201
Dot11SecurityProtocol SecurityProtocol = 1;
@@ -200,6 +208,7 @@ message Dot11AccessPointConfiguration
200208
Dot11MacAddress Bssid = 2;
201209
Dot11PhyType PhyType = 3;
202210
Dot11AuthenticationData AuthenticationData = 4;
211+
Dot11AuthenticationDot1x AuthenticationDot1x = 9;
203212
repeated Dot11AuthenticationAlgorithm AuthenticationAlgorithms = 5;
204213
repeated Dot11CipherSuiteConfiguration PairwiseCipherSuites = 6;
205214
repeated Dot11AkmSuite AkmSuites = 7;

0 commit comments

Comments
 (0)