diff --git a/.gitignore b/.gitignore index 0fc3af8..fd14ad5 100755 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,6 @@ cmake-build-debug/ # IDE .vs/ -.vscode/ .idea/ .kdev/ .kdev4/ diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100755 index 0000000..b103a74 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "netex server (gdbserver)", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/debug/bin/netex_srv", + "args": [], + "miDebuggerServerAddress": "localhost:2345", + "miDebuggerPath": "/usr/bin/gdb", + "stopAtEntry": false, + "cwd": "${fileDirname}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "preLaunchTask": "netex_srv-gdbserver", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Set Disassembly Flavor to Intel", + "text": "-gdb-set disassembly-flavor intel", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0876307 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "task.problemMatchers.neverPrompt": true +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100755 index 0000000..aaf55e1 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,17 @@ +{ + "tasks": [ + { + "label": "build_start_server", + "dependsOn": [ + "CMake: clean rebuild", + "netex_srv-gdbserver" + ] + }, + { + "type": "shell", + "label": "netex_srv-gdbserver", + "command": "setsid konsole -e 'gdbserver :2345 ${workspaceFolder}/build/debug/bin/netex_srv'" + } + ], + "version": "2.0.0" +} \ No newline at end of file diff --git a/script/.gdbinit b/script/.gdbinit deleted file mode 100644 index e950b24..0000000 --- a/script/.gdbinit +++ /dev/null @@ -1,2 +0,0 @@ -set debuginfod enabled on -set disassembly intel \ No newline at end of file diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 18913d3..438491e 100755 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,11 +1,11 @@ -add_executable(netex_svr +add_executable(netex_srv "main.c" "server.c" "srv_ui.c" "server.h") -target_include_directories(netex_svr PRIVATE ${CMAKE_SOURCE_DIR}/src/net/include) -target_link_libraries(netex_svr netex) +target_include_directories(netex_srv PRIVATE ${CMAKE_SOURCE_DIR}/src/net/include) +target_link_libraries(netex_srv netex) #add_custom_command(TARGET netex_svr POST_BUILD # COMMAND ${CMAKE_COMMAND} -E copy diff --git a/srv_config.json b/srv_config.json new file mode 100644 index 0000000..4e78661 --- /dev/null +++ b/srv_config.json @@ -0,0 +1,10 @@ +{ + "Connection": { + "Port": 6920, + "BindIP": "0.0.0.0", + "IPv": "Double", + "Crypto": { + "CertPath": "cert.pem" + } + } +} \ No newline at end of file