Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ademco_hb
Project
Project
Details
Activity
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
captainwong
ademco_hb
Commits
abff9349
Commit
abff9349
authored
May 25, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug & warnings
parent
5264fd3a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
871 deletions
+9
-871
.gitignore
.gitignore
+1
-0
bench.cpp
bench/bench.cpp
+1
-1
csharp_dll_demo.csproj.nuget.cache
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.cache
+0
-5
csharp_dll_demo.csproj.nuget.dgspec.json
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.dgspec.json
+0
-66
csharp_dll_demo.csproj.nuget.g.props
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.g.props
+0
-18
csharp_dll_demo.csproj.nuget.g.targets
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.g.targets
+0
-10
project.assets.json
csharp_dll_demo/obj/project.assets.json
+0
-752
project.nuget.cache
csharp_dll_demo/obj/project.nuget.cache
+0
-16
server_demo.cpp
server_demo/server_demo.cpp
+7
-3
No files found.
.gitignore
View file @
abff9349
...
...
@@ -34,6 +34,7 @@ Debug/
Release/
ReleaseD/
build/
obj/
# vc6
...
...
bench/bench.cpp
View file @
abff9349
...
...
@@ -65,7 +65,7 @@ void ademcoPacketBench()
auto
ms
=
duration_cast
<
milliseconds
>
(
duration
).
count
();
auto
us
=
duration_cast
<
microseconds
>
(
duration
).
count
();
double
avg
=
us
*
1.0
/
TIMES
;
printf
(
"
\n
done
\n
duration=%l
ldms
\n
avg parse time=%.2lfus
\n
"
,
ms
,
avg
);
printf
(
"
\n
done
\n
duration=%l
dms
\n
avg parse time=%.2lfus
\n
"
,
(
long
)
ms
,
avg
);
double
avgpps
=
1000.0
*
TIMES
/
ms
;
printf
(
"average packets per second=%.2lf
\n
"
,
avgpps
);
double
avgbps
=
total_len
*
1000.0
/
ms
;
...
...
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.cache
deleted
100644 → 0
View file @
5264fd3a
{
"version": 1,
"dgSpecHash": "enqVYK58B2u+2zXHcESUbbLfk1x9+SUeE5dBaKx3jo0y9wl25Y8qyh28+gy/13OunxXdkTy8P4sF7NOBzYf5HA==",
"success": true
}
\ No newline at end of file
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.dgspec.json
deleted
100644 → 0
View file @
5264fd3a
{
"format"
:
1
,
"restore"
:
{
"G:
\\
dev_libs
\\
ademco_hb
\\
csharp_dll_demo
\\
csharp_dll_demo.csproj"
:
{}
},
"projects"
:
{
"G:
\\
dev_libs
\\
ademco_hb
\\
csharp_dll_demo
\\
csharp_dll_demo.csproj"
:
{
"version"
:
"1.0.0"
,
"restore"
:
{
"projectUniqueName"
:
"G:
\\
dev_libs
\\
ademco_hb
\\
csharp_dll_demo
\\
csharp_dll_demo.csproj"
,
"projectName"
:
"csharp_dll_demo"
,
"projectPath"
:
"G:
\\
dev_libs
\\
ademco_hb
\\
csharp_dll_demo
\\
csharp_dll_demo.csproj"
,
"packagesPath"
:
"C:
\\
Users
\\
Jack
\\
.nuget
\\
packages
\\
"
,
"outputPath"
:
"G:
\\
dev_libs
\\
ademco_hb
\\
csharp_dll_demo
\\
obj
\\
"
,
"projectStyle"
:
"PackageReference"
,
"fallbackFolders"
:
[
"C:
\\
Program Files
\\
dotnet
\\
sdk
\\
NuGetFallbackFolder"
],
"configFilePaths"
:
[
"C:
\\
Users
\\
Jack
\\
AppData
\\
Roaming
\\
NuGet
\\
NuGet.Config"
,
"C:
\\
Program Files (x86)
\\
NuGet
\\
Config
\\
Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks"
:
[
"netcoreapp2.1"
],
"sources"
:
{
"C:
\\
Program Files (x86)
\\
Microsoft SDKs
\\
NuGetPackages
\\
"
:
{},
"https://api.nuget.org/v3/index.json"
:
{}
},
"frameworks"
:
{
"netcoreapp2.1"
:
{
"projectReferences"
:
{}
}
},
"warningProperties"
:
{
"warnAsError"
:
[
"NU1605"
]
}
},
"frameworks"
:
{
"netcoreapp2.1"
:
{
"dependencies"
:
{
"Microsoft.NETCore.App"
:
{
"suppressParent"
:
"All"
,
"target"
:
"Package"
,
"version"
:
"[2.1.0, )"
,
"autoReferenced"
:
true
}
},
"imports"
:
[
"net461"
,
"net462"
,
"net47"
,
"net471"
,
"net472"
,
"net48"
],
"assetTargetFallback"
:
true
,
"warn"
:
true
,
"runtimeIdentifierGraphPath"
:
"C:
\\
Program Files
\\
dotnet
\\
sdk
\\
3.1.201
\\
RuntimeIdentifierGraph.json"
}
}
}
}
}
\ No newline at end of file
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.g.props
deleted
100644 → 0
View file @
5264fd3a
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project
ToolsVersion=
"14.0"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<PropertyGroup
Condition=
" '$(ExcludeRestorePackageImports)' != 'true' "
>
<RestoreSuccess
Condition=
" '$(RestoreSuccess)' == '' "
>
True
</RestoreSuccess>
<RestoreTool
Condition=
" '$(RestoreTool)' == '' "
>
NuGet
</RestoreTool>
<ProjectAssetsFile
Condition=
" '$(ProjectAssetsFile)' == '' "
>
$(MSBuildThisFileDirectory)project.assets.json
</ProjectAssetsFile>
<NuGetPackageRoot
Condition=
" '$(NuGetPackageRoot)' == '' "
>
$(UserProfile)\.nuget\packages\
</NuGetPackageRoot>
<NuGetPackageFolders
Condition=
" '$(NuGetPackageFolders)' == '' "
>
C:\Users\Jack\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder
</NuGetPackageFolders>
<NuGetProjectStyle
Condition=
" '$(NuGetProjectStyle)' == '' "
>
PackageReference
</NuGetProjectStyle>
<NuGetToolVersion
Condition=
" '$(NuGetToolVersion)' == '' "
>
5.5.0
</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup
Condition=
" '$(ExcludeRestorePackageImports)' != 'true' "
>
<Import
Project=
"C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\build\netcoreapp2.1\Microsoft.NETCore.App.props"
Condition=
"Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\build\netcoreapp2.1\Microsoft.NETCore.App.props')"
/>
</ImportGroup>
</Project>
\ No newline at end of file
csharp_dll_demo/obj/csharp_dll_demo.csproj.nuget.g.targets
deleted
100644 → 0
View file @
5264fd3a
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project
ToolsVersion=
"14.0"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<PropertyGroup>
<MSBuildAllProjects>
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup
Condition=
" '$(ExcludeRestorePackageImports)' != 'true' "
>
<Import
Project=
"C:\Program Files\dotnet\sdk\NuGetFallbackFolder\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets"
Condition=
"Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')"
/>
<Import
Project=
"C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\build\netcoreapp2.1\Microsoft.NETCore.App.targets"
Condition=
"Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\build\netcoreapp2.1\Microsoft.NETCore.App.targets')"
/>
</ImportGroup>
</Project>
\ No newline at end of file
csharp_dll_demo/obj/project.assets.json
deleted
100644 → 0
View file @
5264fd3a
This diff is collapsed.
Click to expand it.
csharp_dll_demo/obj/project.nuget.cache
deleted
100644 → 0
View file @
5264fd3a
{
"version": 2,
"dgSpecHash": "5fWA6VL5RRF+dZVpegr9f+8PcSNdaUFlqWcUPc1/H/maycXBLdoj6N/XH4jB0EIufFT+HlomH7vJMQMtmAC0/Q==",
"success": true,
"projectFilePath": "G:\\dev_libs\\ademco_hb\\csharp_dll_demo\\csharp_dll_demo.csproj",
"expectedPackageFiles": [
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.app\\2.1.0\\microsoft.netcore.app.2.1.0.nupkg.sha512",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.dotnetapphost\\2.1.0\\microsoft.netcore.dotnetapphost.2.1.0.nupkg.sha512",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.dotnethostpolicy\\2.1.0\\microsoft.netcore.dotnethostpolicy.2.1.0.nupkg.sha512",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.dotnethostresolver\\2.1.0\\microsoft.netcore.dotnethostresolver.2.1.0.nupkg.sha512",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\2.1.0\\microsoft.netcore.platforms.2.1.0.nupkg.sha512",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.targets\\2.1.0\\microsoft.netcore.targets.2.1.0.nupkg.sha512",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
server_demo/server_demo.cpp
View file @
abff9349
...
...
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
if
(
ret
!=
0
)
{
exit
(
0
);
}
printf
(
"Got connection from %s:%d, fd=%
ll
d
\n
"
,
inet_ntoa
(
sForeignAddrIn
.
sin_addr
),
sForeignAddrIn
.
sin_port
,
clientSock
);
printf
(
"Got connection from %s:%d, fd=%d
\n
"
,
inet_ntoa
(
sForeignAddrIn
.
sin_addr
),
sForeignAddrIn
.
sin_port
,
clientSock
);
}
};
...
...
@@ -201,10 +201,14 @@ int main(int argc, char** argv)
auto
do_read
=
[
&
do_handle
]()
{
if
(
clientSock
==
INVALID_SOCKET
)
return
;
timeval
tv
=
{
0
,
0
};
timeval
tv
=
{
0
,
100000
0
};
fd_set
fd_read
;
FD_ZERO
(
&
fd_read
);
FD_SET
(
clientSock
,
&
fd_read
);
int
nfds
=
select
(
clientSock
+
1
,
&
fd_read
,
(
fd_set
*
)
0
,
(
fd_set
*
)
0
,
&
tv
);
if
(
nfds
<=
0
)
{
return
;
}
int
bRead
=
FD_ISSET
(
clientSock
,
&
fd_read
);
if
(
!
bRead
)
{
return
;
}
...
...
@@ -290,7 +294,7 @@ int main(int argc, char** argv)
}
else
if
(
cmd
==
'd'
||
cmd
==
'D'
)
{
do
{
printf
(
"Input 6 digit password:"
);
scanf
(
"%s"
,
&
pwd
);
scanf
(
"%s"
,
pwd
);
}
while
(
strlen
(
pwd
)
!=
6
);
std
::
lock_guard
<
std
::
mutex
>
lg
(
mutex
);
evntsWaiting4Send
.
push_back
(
EVENT_DISARM
);
...
...
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