Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rustdesk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李朝发
rustdesk
Commits
f0208c75
Commit
f0208c75
authored
Sep 18, 2022
by
rustdesk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
https://github.com/rustdesk/rustdesk/pull/1562
parent
49491823
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
26 deletions
+8
-26
Cargo.lock
Cargo.lock
+0
-23
build.rs
build.rs
+1
-0
Cargo.toml
libs/hbb_common/Cargo.toml
+0
-1
config.rs
libs/hbb_common/src/config.rs
+7
-2
No files found.
Cargo.lock
View file @
f0208c75
...
...
@@ -2302,7 +2302,6 @@ dependencies = [
"serde 1.0.144",
"serde_derive",
"serde_json 1.0.85",
"serde_with",
"socket2 0.3.19",
"sodiumoxide",
"tokio",
...
...
@@ -4588,28 +4587,6 @@ dependencies = [
"serde 1.0.144",
]
[[package]]
name = "serde_with"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
dependencies = [
"serde 1.0.144",
"serde_with_macros",
]
[[package]]
name = "serde_with_macros"
version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
"darling",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_yaml"
version = "0.8.26"
...
...
build.rs
View file @
f0208c75
...
...
@@ -76,6 +76,7 @@ fn install_oboe() {
//cc::Build::new().file("oboe.cc").include(include).compile("oboe_wrapper");
}
#[cfg(feature
=
"flutter"
)]
fn
gen_flutter_rust_bridge
()
{
let
llvm_path
=
match
std
::
env
::
var
(
"LLVM_HOME"
)
{
Ok
(
path
)
=>
Some
(
vec!
[
path
]),
...
...
libs/hbb_common/Cargo.toml
View file @
f0208c75
...
...
@@ -23,7 +23,6 @@ directories-next = "2.0"
rand
=
"0.8"
serde_derive
=
"1.0"
serde
=
"1.0"
serde_with
=
"1.14.0"
lazy_static
=
"1.4"
confy
=
{
git
=
"https://github.com/open-trade/confy"
}
dirs-next
=
"2.0"
...
...
libs/hbb_common/src/config.rs
View file @
f0208c75
...
...
@@ -956,13 +956,18 @@ impl LocalConfig {
#[derive(Debug,
Default,
Serialize,
Deserialize,
Clone)]
pub
struct
DiscoveryPeer
{
#[serde(default)]
pub
id
:
String
,
#[serde(with
=
"serde_with::rust::map_as_tuple_list"
)]
pub
ip_mac
:
HashMap
<
String
,
String
>
,
#[serde(default)]
pub
username
:
String
,
#[serde(default)]
pub
hostname
:
String
,
#[serde(default)]
pub
platform
:
String
,
#[serde(default)]
pub
online
:
bool
,
#[serde(default)]
pub
ip_mac
:
HashMap
<
String
,
String
>
,
}
impl
DiscoveryPeer
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment