Forráskód Böngészése

Enrich DeviceList tables

Sasan Torabkheslat 5 éve
szülő
commit
db94970e98

+ 1 - 0
.idea/sshConfigs.xml

@@ -3,6 +3,7 @@
   <component name="SshConfigs">
     <configs>
       <sshConfig authType="PASSWORD" host="192.168.0.155" id="43a89a45-f8e2-452f-947e-bddeebe4243b" port="22" customName="Dev" nameFormat="CUSTOM" />
+      <sshConfig authType="PASSWORD" host="192.168.0.155" id="b0d90799-4eec-4bad-80be-4d31fc44baae" port="22" customName="Dev" nameFormat="CUSTOM" />
     </configs>
   </component>
 </project>

+ 26 - 61
.idea/workspace.xml

@@ -29,30 +29,13 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6938f4e3-b9b8-4c34-bea6-8fc5ace411e6" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/sshConfigs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/other.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/other.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
+    <list default="true" id="6938f4e3-b9b8-4c34-bea6-8fc5ace411e6" name="Default Changelist" comment="Add LAN IP address to Keys">
+      <change beforePath="$PROJECT_DIR$/.idea/sshConfigs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sshConfigs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeError.log" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeError.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/FDIACS.dir/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/FDIACS.dir/DependInfo.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/FDIACS.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/FDIACS.dir/build.make" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/FDIACS.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/FDIACS.dir/depend.make" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/FDIACS.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/FDIACS.cbp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/main.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/stdsoap2.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/stdsoap2.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -63,40 +46,6 @@
     <option name="formatViaClangd" value="false" />
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>No Content</find>
-      <find>soap_code_map</find>
-      <find>h_http_error_codes</find>
-      <find>detec</find>
-      <find>CMAKE_CXX_FLAGS</find>
-      <find>sassan</find>
-      <find>cout</find>
-      <find>DownloadResponse</find>
-      <find>__cwmp__DownloadResponse</find>
-      <find>*CommandKey=&quot;reboot&quot;</find>
-      <find>NO</find>
-      <find>NO_DA</find>
-      <find>NO_BOD</find>
-      <find>No Content Recieved at</find>
-      <find>13</find>
-      <find>SOAP message expected</find>
-      <find>SOAP_NO_TAG</find>
-      <find>NO_DATA</find>
-      <find>host</find>
-      <find>Sassan</find>
-      <find>204</find>
-      <find>CheckQueue...</find>
-      <find>Debug</find>
-      <find>Method :</find>
-      <find>CheckQueue</find>
-      <find>cerr</find>
-      <find>tr069</find>
-      <find>TR069</find>
-      <find>1.3</find>
-      <find>FDIACS</find>
-    </findStrings>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="PUSH_TAGS">
@@ -116,6 +65,7 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="OCFindUsagesOptions.isSearchForTextOccurrences" value="false" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="true" />
     <property name="cf.first.check.clang-format" value="false" />
@@ -123,7 +73,7 @@
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.customizations" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -183,7 +133,8 @@
       <workItem from="1585034698457" duration="1072000" />
       <workItem from="1588627256885" duration="1334000" />
       <workItem from="1591775026411" duration="2463000" />
-      <workItem from="1591957319679" duration="2491000" />
+      <workItem from="1591957319679" duration="3742000" />
+      <workItem from="1593105843144" duration="2976000" />
     </task>
     <task id="LOCAL-00001" summary="Disable InfluxDB">
       <created>1572183659791</created>
@@ -255,7 +206,14 @@
       <option name="project" value="LOCAL" />
       <updated>1581074193456</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="Add LAN IP address to Keys">
+      <created>1592025942513</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1592025942513</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TodoView" selected-index="3">
@@ -280,6 +238,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_CLEANUP_BEFORE_PROJECT_COMMIT" value="true" />
@@ -295,7 +254,8 @@
     <MESSAGE value="Upgrade Procedures completed" />
     <MESSAGE value="Add datetime to Upgrade/Provision Procedures" />
     <MESSAGE value="1: fixing orphaned data in zabbix sender&#10;2: merge json files per second to send to GenieACS&#10;3: add upload/download volume to calculate used valume in zabbix" />
-    <option name="LAST_COMMIT_MESSAGE" value="1: fixing orphaned data in zabbix sender&#10;2: merge json files per second to send to GenieACS&#10;3: add upload/download volume to calculate used valume in zabbix" />
+    <MESSAGE value="Add LAN IP address to Keys" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add LAN IP address to Keys" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
@@ -305,14 +265,19 @@
       <screen x="0" y="0" width="1440" height="900" />
     </state>
     <state x="303" y="102" key="#SSH_Configurations/0.0.1440.900/1440.0.1920.1080@0.0.1440.900" timestamp="1592024694813" />
-    <state x="549" y="172" key="#com.intellij.ide.ui.customization.CustomizableActionsPanel.FindAvailableActionsDialog" timestamp="1592025778787">
+    <state x="549" y="172" key="#com.intellij.ide.ui.customization.CustomizableActionsPanel.FindAvailableActionsDialog" timestamp="1592046586181">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
-    <state x="549" y="172" key="#com.intellij.ide.ui.customization.CustomizableActionsPanel.FindAvailableActionsDialog/0.0.1440.900/1440.0.1920.1080@0.0.1440.900" timestamp="1592025778787" />
-    <state x="221" y="89" key="SettingsEditor" timestamp="1592025907133">
+    <state x="549" y="172" key="#com.intellij.ide.ui.customization.CustomizableActionsPanel.FindAvailableActionsDialog/0.0.1440.900/1440.0.1920.1080@0.0.1440.900" timestamp="1592046586181" />
+    <state x="221" y="87" key="SettingsEditor" timestamp="1593115913111">
+      <screen x="0" y="0" width="1440" height="875" />
+    </state>
+    <state x="221" y="87" key="SettingsEditor/0.0.1440.875@0.0.1440.875" timestamp="1593115913111" />
+    <state x="221" y="89" key="SettingsEditor/0.0.1440.900/1440.0.1920.1080@0.0.1440.900" timestamp="1592046604694" />
+    <state x="320" y="190" key="Vcs.Push.Dialog.v2" timestamp="1592025947173">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
-    <state x="221" y="89" key="SettingsEditor/0.0.1440.900/1440.0.1920.1080@0.0.1440.900" timestamp="1592025907133" />
+    <state x="320" y="190" key="Vcs.Push.Dialog.v2/0.0.1440.900/1440.0.1920.1080@0.0.1440.900" timestamp="1592025947173" />
     <state x="607" y="397" key="com.intellij.ide.ui.customization.CustomizableActionsPanel$EditIconDialog" timestamp="1592025646597">
       <screen x="0" y="0" width="1440" height="900" />
     </state>

+ 34 - 2
cmake-build-debug/CMakeFiles/FDIACS.dir/depend.make

@@ -1,2 +1,34 @@
-# Empty dependencies file for FDIACS.
-# This may be replaced when dependencies are built.
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.13
+
+CMakeFiles/FDIACS.dir/httppost.cpp.o: ../httppost.cpp
+CMakeFiles/FDIACS.dir/httppost.cpp.o: ../httppost.h
+
+CMakeFiles/FDIACS.dir/main.cpp.o: ../cwmp.nsmap
+CMakeFiles/FDIACS.dir/main.cpp.o: ../httppost.h
+CMakeFiles/FDIACS.dir/main.cpp.o: ../json.hpp
+CMakeFiles/FDIACS.dir/main.cpp.o: ../main.cpp
+CMakeFiles/FDIACS.dir/main.cpp.o: ../soapH.h
+CMakeFiles/FDIACS.dir/main.cpp.o: ../soapStub.h
+CMakeFiles/FDIACS.dir/main.cpp.o: ../soapcwmpService.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/Connection.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/ConnectionPool.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/Exception.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/PreparedStatement.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/ResultSet.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/SQLException.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/URL.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/include/zdb/zdb.h
+CMakeFiles/FDIACS.dir/main.cpp.o: /usr/local/share/gsoap/plugin/threads.h
+
+CMakeFiles/FDIACS.dir/soapC.cpp.o: ../soapC.cpp
+CMakeFiles/FDIACS.dir/soapC.cpp.o: ../soapH.h
+CMakeFiles/FDIACS.dir/soapC.cpp.o: ../soapStub.h
+
+CMakeFiles/FDIACS.dir/soapcwmpService.cpp.o: ../soapH.h
+CMakeFiles/FDIACS.dir/soapcwmpService.cpp.o: ../soapStub.h
+CMakeFiles/FDIACS.dir/soapcwmpService.cpp.o: ../soapcwmpService.cpp
+CMakeFiles/FDIACS.dir/soapcwmpService.cpp.o: ../soapcwmpService.h
+
+CMakeFiles/FDIACS.dir/stdsoap2.cpp.o: ../stdsoap2.cpp
+

+ 0 - 75
cmake-build-debug/CMakeFiles/Makefile.cmake

@@ -11,96 +11,26 @@ set(CMAKE_MAKEFILE_DEPENDS
   "CMakeFiles/3.13.2/CMakeCCompiler.cmake"
   "CMakeFiles/3.13.2/CMakeCXXCompiler.cmake"
   "CMakeFiles/3.13.2/CMakeSystem.cmake"
-  "CMakeFiles/feature_tests.c"
-  "CMakeFiles/feature_tests.cxx"
-  "/usr/share/cmake-3.13/Modules/CMakeCCompiler.cmake.in"
-  "/usr/share/cmake-3.13/Modules/CMakeCCompilerABI.c"
   "/usr/share/cmake-3.13/Modules/CMakeCInformation.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeCXXCompiler.cmake.in"
-  "/usr/share/cmake-3.13/Modules/CMakeCXXCompilerABI.cpp"
   "/usr/share/cmake-3.13/Modules/CMakeCXXInformation.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeCommonLanguageInclude.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeCompilerIdDetection.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeConfigurableFile.in"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineCCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineCXXCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineCompileFeatures.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineCompilerABI.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineCompilerId.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeDetermineSystem.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeFindBinUtils.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeFindCodeBlocks.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeGenericSystem.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeInitializeConfigs.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeLanguageInformation.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeParseImplicitLinkInfo.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeSystem.cmake.in"
   "/usr/share/cmake-3.13/Modules/CMakeSystemSpecificInformation.cmake"
   "/usr/share/cmake-3.13/Modules/CMakeSystemSpecificInitialize.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeTestCCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeTestCXXCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeTestCompilerCommon.cmake"
-  "/usr/share/cmake-3.13/Modules/CMakeUnixFindMake.cmake"
-  "/usr/share/cmake-3.13/Modules/CheckFunctionExists.c"
-  "/usr/share/cmake-3.13/Modules/CheckIncludeFile.c.in"
   "/usr/share/cmake-3.13/Modules/CheckIncludeFile.cmake"
   "/usr/share/cmake-3.13/Modules/CheckLibraryExists.cmake"
   "/usr/share/cmake-3.13/Modules/CheckSymbolExists.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/ADSP-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Borland-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
   "/usr/share/cmake-3.13/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Clang-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Cray-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/GHS-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/GNU-C-FeatureTests.cmake"
   "/usr/share/cmake-3.13/Modules/Compiler/GNU-C.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/GNU-CXX-FeatureTests.cmake"
   "/usr/share/cmake-3.13/Modules/Compiler/GNU-CXX.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/GNU-FindBinUtils.cmake"
   "/usr/share/cmake-3.13/Modules/Compiler/GNU.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/HP-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/IAR-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Intel-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/MIPSpro-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/MSVC-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/PGI-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/PathScale-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/SCO-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/TI-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/Watcom-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/XL-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
-  "/usr/share/cmake-3.13/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
   "/usr/share/cmake-3.13/Modules/FindPackageHandleStandardArgs.cmake"
   "/usr/share/cmake-3.13/Modules/FindPackageMessage.cmake"
   "/usr/share/cmake-3.13/Modules/FindThreads.cmake"
-  "/usr/share/cmake-3.13/Modules/Internal/FeatureTesting.cmake"
-  "/usr/share/cmake-3.13/Modules/Platform/Linux-Determine-CXX.cmake"
   "/usr/share/cmake-3.13/Modules/Platform/Linux-GNU-C.cmake"
   "/usr/share/cmake-3.13/Modules/Platform/Linux-GNU-CXX.cmake"
   "/usr/share/cmake-3.13/Modules/Platform/Linux-GNU.cmake"
@@ -117,11 +47,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
 
 # Byproducts of CMake generate step:
 set(CMAKE_MAKEFILE_PRODUCTS
-  "CMakeFiles/3.13.2/CMakeSystem.cmake"
-  "CMakeFiles/3.13.2/CMakeCCompiler.cmake"
-  "CMakeFiles/3.13.2/CMakeCXXCompiler.cmake"
-  "CMakeFiles/3.13.2/CMakeCCompiler.cmake"
-  "CMakeFiles/3.13.2/CMakeCXXCompiler.cmake"
   "CMakeFiles/CMakeDirectoryInformation.cmake"
   )
 

+ 0 - 23
cmake-build-debug/CMakeFiles/clion-log.txt

@@ -1,27 +1,4 @@
 /usr/bin/cmake -DCMAKE_BUILD_TYPE=Debug -G "CodeBlocks - Unix Makefiles" /tmp/tmp.DyQoLadrQF
--- The C compiler identification is GNU 6.3.0
--- The CXX compiler identification is GNU 6.3.0
--- Check for working C compiler: /usr/bin/cc
--- Check for working C compiler: /usr/bin/cc -- works
--- Detecting C compiler ABI info
--- Detecting C compiler ABI info - done
--- Detecting C compile features
--- Detecting C compile features - done
--- Check for working CXX compiler: /usr/bin/c++
--- Check for working CXX compiler: /usr/bin/c++ -- works
--- Detecting CXX compiler ABI info
--- Detecting CXX compiler ABI info - done
--- Detecting CXX compile features
--- Detecting CXX compile features - done
--- Looking for pthread.h
--- Looking for pthread.h - found
--- Looking for pthread_create
--- Looking for pthread_create - not found
--- Looking for pthread_create in pthreads
--- Looking for pthread_create in pthreads - not found
--- Looking for pthread_create in pthread
--- Looking for pthread_create in pthread - found
--- Found Threads: TRUE  
 -- Configuring done
 -- Generating done
 -- Build files have been written to: /tmp/tmp.DyQoLadrQF/cmake-build-debug

+ 20 - 3
main.cpp

@@ -105,6 +105,7 @@ std::string zbx_keys[] = {"InternetGatewayDevice.WANDevice.1.WANConnectionDevice
                           "InternetGatewayDevice.WEB_GUI.Network.LTE_Setting.Status.DL_Frequency",
                           "InternetGatewayDevice.WEB_GUI.Network.LTE_Setting.Status.UL_Frequency",
                           "InternetGatewayDevice.ManagementServer.ConnectionRequestURL",
+                          "InternetGatewayDevice.ManagementServer.PeriodicInformInterval",
                           "InternetGatewayDevice.LANDevice.1.LANHostConfigManagement.IPInterface.1.IPInterfaceIPAddress"
 };
 
@@ -433,6 +434,8 @@ int cwmpService::Inform(struct _cwmp__Inform *cwmp__Inform, struct _cwmp__Inform
                 tr069.insert({"PCILock", _Value});
             else if (std::string(_Name).compare("InternetGatewayDevice.WEB_GUI.Network.Network_Mode.WANIPAddress") == 0)
                 tr069.insert({"WANIPAddress", _Value});
+            else if (std::string(_Name).compare("InternetGatewayDevice.ManagementServer.PeriodicInformInterval") == 0)
+                tr069.insert({"PeriodicInformInterval", _Value});
             else if (std::string(_Name).compare("InternetGatewayDevice.WEB_GUI.Overview.LTEStatus.DnsServer") == 0)
                 tr069.insert({"DnsServer", _Value});
             else if (std::string(_Name).compare("InternetGatewayDevice.WEB_GUI.Overview.DeviceInfo.IMSI") == 0)
@@ -560,6 +563,7 @@ int cwmpService::Inform(struct _cwmp__Inform *cwmp__Inform, struct _cwmp__Inform
     tr069_json["InternetGatewayDevice"]["WEB_GUI"]["Network"]["LTE_Setting"]["Status"]["DL_Frequency"]["_value"] = tr069["DL_Frequency"];
     tr069_json["InternetGatewayDevice"]["WEB_GUI"]["Network"]["LTE_Setting"]["Status"]["UL_Frequency"]["_value"] = tr069["UL_Frequency"];
     tr069_json["InternetGatewayDevice"]["LANDevice"]["1"]["IPInterface"]["1"]["IPInterfaceIPAddress"]["_value"] = tr069["IPInterfaceIPAddress"];
+    tr069_json["InternetGatewayDevice"]["ManagementServer"]["PeriodicInformInterval"]["_value"] = tr069["PeriodicInformInterval"];
 //</editor-fold>
     std::ofstream json_data;
 
@@ -574,7 +578,20 @@ int cwmpService::Inform(struct _cwmp__Inform *cwmp__Inform, struct _cwmp__Inform
     mysqlpp::Query query = conn.query();
     try {
         conn.connect(DATABASE, HOST, USER, PASSWORD, PORT);
-        query << "replace into Device_List values ('" + std::string(ip) + "','" + imsi + "',NOW()" + ")";
+        /*
+         * tr069["SoftwareVersion"]
+         * tr069["EnodeBId"];
+         * tr069["PCILock"]
+         * tr069["CellId"];
+         * tr069["PeriodicInformInterval"]
+         */
+
+        query <<
+              "replace into Device_List (IP,IMSI,`datetime`,update_interval,enodeb_id,cell_id,softwareversion,pcilock) values ('" +
+              std::string(ip) + "','" + imsi + "',NOW()" + "," + tr069["PeriodicInformInterval"] + "," +
+              tr069["EnodeBId"] + "," + tr069["CellId"] +
+              "," + tr069["SoftwareVersion"] + "," + tr069["PCILock"] + ")";
+
         query.execute();
     } catch (mysqlpp::BadQuery er) { // handle any connection or
         std::cerr << "Error on IMSI-" << imsi << " :" << er.what() << std::endl;
@@ -590,7 +607,6 @@ int cwmpService::Reboot(struct _cwmp__Reboot *cwmp__Reboot,
                         struct _cwmp__RebootResponse *cwmp__RebootResponse) { return SOAP_OK; }
 
 
-
 int cwmpService::CheckQueue(struct soap *soap, cwmpService *cwmpService1) {
 
 //    std::cerr << "IP: " << soap->host << std::endl;
@@ -663,7 +679,8 @@ int cwmpService::CheckQueue(struct soap *soap, cwmpService *cwmpService1) {
             char *FailureURL = new char[str.length() + 1];
             strcpy(FailureURL, str.c_str());
 
-            return CustomeDownload(soap, this, DelaySeconds, FileType, URL, Username, Password, FileSize, TargetFileName,
+            return CustomeDownload(soap, this, DelaySeconds, FileType, URL, Username, Password, FileSize,
+                                   TargetFileName,
                                    SuccessURL, FailureURL);
         } catch (std::exception ex) { // handle any connection or
             std::cerr << "Error on CPE with IP: " << soap->host << " :" << ex.what() << std::endl;