From 99e5ada54adfe8cb96472e2fdf64aa828aa93e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=98=95?= Date: Thu, 15 Jun 2023 14:16:52 +0800 Subject: [PATCH] =?UTF-8?q?OCT=201.=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .clang-format | 220 ------------------ .gitignore | 7 +- NetTunnelApp/App.xaml | 4 +- NetTunnelApp/App.xaml.cs | 4 +- NetTunnelApp/AssemblyInfo.cs | 10 +- NetTunnelApp/MainWindow.xaml | 8 +- NetTunnelApp/MainWindow.xaml.cs | 11 +- NetTunnelApp/NetTunnelApp.csproj | 19 +- NetTunnelDemo/NetTunnelDemo.cpp | 22 -- NetTunnelDemo/NetTunnelDemo.vcxproj | 140 ----------- NetTunnelDemo/NetTunnelDemo.vcxproj.filters | 22 -- NetTunnelDemo/NetTunnelDemo.vcxproj.user | 4 - NetTunnelSDK/NetTunnelSDK.vcxproj | 10 +- NetTunnelSDK/NetTunnelSDK.vcxproj.filters | 36 +-- NetTunnelSDK/dllmain.cpp | 21 +- NetTunnelSDK/framework.h | 4 +- NetTunnelSDK/pch.cpp | 2 +- NetTunnelSDK/pch.h | 2 +- NetTunnelSDK/tunnel.cpp | 17 +- NetTunnelSDK/tunnel.h | 3 +- NetworkTunnel.sln | 100 -------- UTNetTunnelSDK/UTNetTunnelSDK.cpp | 18 -- UTNetTunnelSDK/UTNetTunnelSDK.vcxproj | 178 -------------- UTNetTunnelSDK/UTNetTunnelSDK.vcxproj.filters | 30 --- UTNetTunnelSDK/UTNetTunnelSDK.vcxproj.user | 4 - UTNetTunnelSDK/pch.cpp | 5 - UTNetTunnelSDK/pch.h | 12 - tunnel_windows.sln | 54 +++++ 28 files changed, 140 insertions(+), 827 deletions(-) delete mode 100644 .clang-format delete mode 100644 NetTunnelDemo/NetTunnelDemo.cpp delete mode 100644 NetTunnelDemo/NetTunnelDemo.vcxproj delete mode 100644 NetTunnelDemo/NetTunnelDemo.vcxproj.filters delete mode 100644 NetTunnelDemo/NetTunnelDemo.vcxproj.user delete mode 100644 NetworkTunnel.sln delete mode 100644 UTNetTunnelSDK/UTNetTunnelSDK.cpp delete mode 100644 UTNetTunnelSDK/UTNetTunnelSDK.vcxproj delete mode 100644 UTNetTunnelSDK/UTNetTunnelSDK.vcxproj.filters delete mode 100644 UTNetTunnelSDK/UTNetTunnelSDK.vcxproj.user delete mode 100644 UTNetTunnelSDK/pch.cpp delete mode 100644 UTNetTunnelSDK/pch.h create mode 100644 tunnel_windows.sln diff --git a/.clang-format b/.clang-format deleted file mode 100644 index dcc8922..0000000 --- a/.clang-format +++ /dev/null @@ -1,220 +0,0 @@ -# ClangFormatConfigureSource: 'clang-format-file://D:/development/c/daemon_agent/.clang-format' -Language: Cpp -AccessModifierOffset: -4 -InsertBraces: true -AlignArrayOfStructures: Left -AlignAfterOpenBracket: Align -AlignConsecutiveMacros: - Enabled: true - AcrossEmptyLines: true - AcrossComments: true -AlignConsecutiveAssignments: - Enabled: true - AcrossEmptyLines: false - AcrossComments: true - PadOperators: true - AlignCompound: true -AlignConsecutiveBitFields: None -AlignConsecutiveDeclarations: - Enabled: true - AcrossEmptyLines: false - AcrossComments: true - PadOperators: true - AlignCompound: true -AlignEscapedNewlines: Left -AlignOperands: DontAlign -AlignTrailingComments: true -AllowAllArgumentsOnNextLine: false -AllowAllConstructorInitializersOnNextLine: false -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortEnumsOnASingleLine: false -AllowShortBlocksOnASingleLine: Always -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AllowShortLambdasOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Never -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: MultiLine -AttributeMacros: - - __capability - - __unused -BinPackArguments: true -BinPackParameters: false -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: Never - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: true - BeforeElse: false - BeforeLambdaBody: false - BeforeWhile: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true -BreakBeforeBinaryOperators: None -BreakBeforeConceptDeclarations: true -BreakBeforeBraces: Custom -BreakBeforeInheritanceComma: false -BreakInheritanceList: BeforeColon -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BreakConstructorInitializers: BeforeColon -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true -ColumnLimit: 120 -CommentPragmas: '^ IWYU pragma:' -CompactNamespaces: true -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DeriveLineEnding: true -DerivePointerAlignment: false -DisableFormat: false -EmptyLineBeforeAccessModifier: LogicalBlock -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: true -ForEachMacros: - - foreach - - Q_FOREACH - - BOOST_FOREACH -StatementAttributeLikeMacros: - - Q_EMIT -IncludeBlocks: Regroup -IncludeCategories: - - Regex: '^' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '^<.*\.h>' - Priority: 1 - SortPriority: 0 - CaseSensitive: false - - Regex: '^<.*' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '.*' - Priority: 3 - SortPriority: 0 - CaseSensitive: false -IncludeIsMainRegex: '([-_](test|unittest))?$' -IncludeIsMainSourceRegex: '' -IndentCaseLabels: true -IndentCaseBlocks: false -IndentGotoLabels: true -IndentPPDirectives: None -IndentExternBlock: AfterExternBlock -IndentRequiresClause: false -IndentWidth: 4 -IndentWrappedFunctionNames: false -InsertTrailingCommas: None -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: true -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBinPackProtocolList: Never -ObjCBlockIndentWidth: 4 -ObjCBreakBeforeNestedBlockParam: true -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakAssignment: 1000 -PenaltyBreakBeforeFirstCallParameter: 1 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 140 -PenaltyBreakString: 1000 -PenaltyBreakTemplateDeclaration: 10 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 -PenaltyIndentedWhitespace: 0 -PointerAlignment: Right -RawStringFormats: - - Language: Cpp - Delimiters: - - cc - - CC - - cpp - - Cpp - - CPP - - 'c++' - - 'C++' - CanonicalDelimiter: '' - BasedOnStyle: google - - Language: TextProto - Delimiters: - - pb - - PB - - proto - - PROTO - EnclosingFunctions: - - EqualsProto - - EquivToProto - - PARSE_PARTIAL_TEXT_PROTO - - PARSE_TEST_PROTO - - PARSE_TEXT_PROTO - - ParseTextOrDie - - ParseTextProtoOrDie - - ParseTestProto - - ParsePartialTestProto - CanonicalDelimiter: '' - BasedOnStyle: google -ReflowComments: false -SortIncludes: Never -SortJavaStaticImport: Before -SortUsingDeclarations: true -SpaceAfterCStyleCast: false -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeCaseColon: false -SpaceBeforeCpp11BracedList: true -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeParens: ControlStatements -SpaceAroundPointerQualifiers: Default -SpaceBeforeRangeBasedForLoopColon: true -SpaceInEmptyBlock: false -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 4 -SpacesInAngles: false -SpacesInConditionalStatement: false -SpacesInContainerLiterals: false -SpacesInCStyleCastParentheses: false -SpacesInLineCommentPrefix: - Minimum: 1 - Maximum: -1 -SpacesInParentheses: false -SpacesInSquareBrackets: false -SpaceBeforeSquareBrackets: false -BitFieldColonSpacing: Both -Standard: Auto -StatementMacros: - - Q_UNUSED - - QT_REQUIRE_VERSION -TabWidth: 4 -UseCRLF: false -UseTab: Never -SeparateDefinitionBlocks: Always -WhitespaceSensitiveMacros: - - STRINGIZE - - PP_STRINGIZE - - BOOST_PP_STRINGIZE - - NS_SWIFT_NAME - - CF_SWIFT_NAME -TypenameMacros: - - CONFIG_ITEM - - PCONFIG_ITEM diff --git a/.gitignore b/.gitignore index 703c293..0b777f9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ ################################################################################ /.vs -/NetTunnelApp/bin/Debug/net6.0-windows -/NetTunnelSDK/x64/Debug -/x64/Debug +/NetTunnelApp/bin +/NetTunnelApp/obj/ +/NetTunnelSDK/x64/ +/x64/ diff --git a/NetTunnelApp/App.xaml b/NetTunnelApp/App.xaml index 65800f4..2018b11 100644 --- a/NetTunnelApp/App.xaml +++ b/NetTunnelApp/App.xaml @@ -4,6 +4,6 @@ xmlns:local="clr-namespace:NetTunnelApp" StartupUri="MainWindow.xaml"> - + - \ No newline at end of file + diff --git a/NetTunnelApp/App.xaml.cs b/NetTunnelApp/App.xaml.cs index 1859602..f042c44 100644 --- a/NetTunnelApp/App.xaml.cs +++ b/NetTunnelApp/App.xaml.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Configuration; +using System.Data; +using System.Linq; using System.Threading.Tasks; using System.Windows; @@ -12,4 +14,4 @@ namespace NetTunnelApp public partial class App : Application { } -} \ No newline at end of file +} diff --git a/NetTunnelApp/AssemblyInfo.cs b/NetTunnelApp/AssemblyInfo.cs index 4a05c7d..8b5504e 100644 --- a/NetTunnelApp/AssemblyInfo.cs +++ b/NetTunnelApp/AssemblyInfo.cs @@ -2,9 +2,9 @@ using System.Windows; [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] \ No newline at end of file + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/NetTunnelApp/MainWindow.xaml b/NetTunnelApp/MainWindow.xaml index 0461ad9..0cfc087 100644 --- a/NetTunnelApp/MainWindow.xaml +++ b/NetTunnelApp/MainWindow.xaml @@ -5,9 +5,9 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:NetTunnelApp" mc:Ignorable="d" - Title="NetTunnel" Height="450" Width="800" WindowStyle="ThreeDBorderWindow"> + Title="MainWindow" Height="450" Width="800"> -