فهرست منبع

Add Download Response (completed)

Sasan Torabkheslat 5 سال پیش
والد
کامیت
3a3f8127e8
4فایلهای تغییر یافته به همراه376 افزوده شده و 144 حذف شده
  1. 358 131
      .idea/workspace.xml
  2. 12 11
      soapcwmpService.cpp
  3. 2 1
      soapcwmpService.h
  4. 4 1
      stdsoap2.cpp

+ 358 - 131
.idea/workspace.xml

@@ -16,20 +16,9 @@
   <component name="ChangeListManager">
     <list default="true" id="6938f4e3-b9b8-4c34-bea6-8fc5ace411e6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cwmp.Download.res.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cwmp.Download.res.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cwmp.Inform.req.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cwmp.Inform.req.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cwmp.Upload.res.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cwmp.Upload.res.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cwmp.wsdl" beforeDir="false" afterPath="$PROJECT_DIR$/cwmp.wsdl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cwmp.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/cwmp.xsd" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/main.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/soapC.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/soapC.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/soapH.h" beforeDir="false" afterPath="$PROJECT_DIR$/soapH.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/soapReadme.md" beforeDir="false" afterPath="$PROJECT_DIR$/soapReadme.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/soapStub.h" beforeDir="false" afterPath="$PROJECT_DIR$/soapStub.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/soapcwmpService.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/soapcwmpService.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/soapcwmpService.h" beforeDir="false" afterPath="$PROJECT_DIR$/soapcwmpService.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/stdsoap2.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/stdsoap2.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/trapi.h" beforeDir="false" afterPath="$PROJECT_DIR$/trapi.h" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -44,8 +33,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="154" column="11" selection-start-line="154" selection-start-column="11" selection-end-line="154" selection-end-column="11" />
+            <state relative-caret-position="159">
+              <caret line="463" selection-start-line="463" selection-end-line="463" />
               <folding>
                 <element signature="e#464#648#0" />
                 <element signature="e#649#715#0" />
@@ -53,11 +42,7 @@
                 <element signature="e#968#999#0" />
                 <element signature="e#5581#6601#0" />
                 <element signature="e#6603#7289#0" />
-                <element signature="e#7291#8323#0" />
-                <element signature="e#8326#10694#0" />
-                <element signature="e#12859#31996#0" />
-                <element signature="e#15761#15794#0" />
-                <element signature="e#24629#24656#0" />
+                <element signature="e#24655#24682#0" />
               </folding>
             </state>
           </provider>
@@ -66,8 +51,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/soapcwmpService.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="292" column="31" lean-forward="true" selection-start-line="292" selection-start-column="31" selection-end-line="292" selection-end-column="31" />
+            <state relative-caret-position="150">
+              <caret line="860" lean-forward="true" selection-start-line="860" selection-end-line="860" />
               <folding>
                 <element signature="e#0#614#0" />
                 <element signature="e#646#784#0" />
@@ -78,7 +63,6 @@
                 <element signature="e#1329#1440#0" />
                 <element signature="e#1442#2236#0" />
                 <element signature="e#2238#2321#0" />
-                <element signature="e#2323#2485#0" />
                 <element signature="e#2513#2714#0" />
                 <element signature="e#2723#2962#0" />
                 <element signature="e#2964#3039#0" />
@@ -96,37 +80,291 @@
                 <element signature="e#4953#5424#0" />
                 <element signature="e#5921#6035#0" />
                 <element signature="e#6048#6106#0" />
-                <element signature="e#6243#7179#0" />
+                <element signature="e#6915#6943#0" expanded="true" />
                 <element signature="e#8147#8207#0" />
-                <element signature="e#13297#15315#0" />
-                <element signature="e#15317#17359#0" />
-                <element signature="e#17361#18169#0" />
-                <element signature="e#18171#20213#0" />
-                <element signature="e#20215#22353#0" />
-                <element signature="e#22355#24493#0" />
-                <element signature="e#24495#26297#0" />
-                <element signature="e#26299#28053#0" />
-                <element signature="e#28055#29881#0" />
-                <element signature="e#29883#31781#0" />
-                <element signature="e#31783#33705#0" />
-                <element signature="e#33707#35461#0" />
-                <element signature="e#35463#37407#0" />
-                <element signature="e#37409#39387#0" />
-                <element signature="e#36241#36561#0" />
-                <element signature="e#36562#38307#0" />
-                <element signature="e#38309#39421#0" />
+                <element signature="e#10264#12282#0" />
+                <element signature="e#14328#15136#0" />
+                <element signature="e#15138#17180#0" />
+                <element signature="e#17182#19320#0" />
+                <element signature="e#19322#21460#0" />
+                <element signature="e#21462#23264#0" />
+                <element signature="e#23266#25020#0" />
+                <element signature="e#25022#26848#0" />
+                <element signature="e#26850#28748#0" />
+                <element signature="e#28750#30672#0" />
+                <element signature="e#32430#34374#0" />
+                <element signature="e#34376#36354#0" />
+                <element signature="e#36676#38421#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/soapcwmpService.h">
+        <entry file="file://$PROJECT_DIR$/stdsoap2.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="145" column="39" selection-start-line="145" selection-start-column="39" selection-end-line="145" selection-end-column="39" />
+            <state relative-caret-position="216">
+              <caret line="16845" column="23" selection-start-line="16845" selection-start-column="23" selection-end-line="16845" selection-end-column="23" />
               <folding>
-                <element signature="e#0#612#0" />
+                <element signature="e#2635#2680#0" expanded="true" />
+                <element signature="e#2741#2763#0" expanded="true" />
+                <element signature="e#2834#2903#0" expanded="true" />
+                <element signature="e#2967#3018#0" expanded="true" />
+                <element signature="e#3047#3066#0" expanded="true" />
+                <element signature="e#3207#3400#0" expanded="true" />
+                <element signature="e#3529#3600#0" expanded="true" />
+                <element signature="e#4002#4089#0" expanded="true" />
+                <element signature="e#4497#4582#0" expanded="true" />
+                <element signature="e#5915#6028#0" expanded="true" />
+                <element signature="e#7921#7962#0" expanded="true" />
+                <element signature="e#8111#8437#0" expanded="true" />
+                <element signature="e#8585#9114#0" expanded="true" />
+                <element signature="e#9265#9418#0" expanded="true" />
+                <element signature="e#11522#11750#0" expanded="true" />
+                <element signature="e#11894#12124#0" expanded="true" />
+                <element signature="e#12266#12476#0" expanded="true" />
+                <element signature="e#12620#12842#0" expanded="true" />
+                <element signature="e#20324#20680#0" expanded="true" />
+                <element signature="e#21229#21253#0" expanded="true" />
+                <element signature="e#21473#21515#0" expanded="true" />
+                <element signature="e#22356#23204#0" expanded="true" />
+                <element signature="e#23371#23479#0" expanded="true" />
+                <element signature="e#23646#23758#0" expanded="true" />
+                <element signature="e#23928#24036#0" expanded="true" />
+                <element signature="e#25166#25321#0" expanded="true" />
+                <element signature="e#25480#25569#0" expanded="true" />
+                <element signature="e#25731#25897#0" expanded="true" />
+                <element signature="e#28124#28177#0" expanded="true" />
+                <element signature="e#28446#28656#0" expanded="true" />
+                <element signature="e#28819#29013#0" expanded="true" />
+                <element signature="e#29256#29444#0" expanded="true" />
+                <element signature="e#29612#29823#0" expanded="true" />
+                <element signature="e#30560#30624#0" expanded="true" />
+                <element signature="e#30659#30700#0" expanded="true" />
+                <element signature="e#30857#30996#0" expanded="true" />
+                <element signature="e#31029#31081#0" expanded="true" />
+                <element signature="e#31284#31294#0" expanded="true" />
+                <element signature="e#33603#34526#0" expanded="true" />
+                <element signature="e#40460#40659#0" expanded="true" />
+                <element signature="e#40866#40878#0" expanded="true" />
+                <element signature="e#40918#41014#0" expanded="true" />
+                <element signature="e#41267#41587#0" expanded="true" />
+                <element signature="e#42615#43057#0" expanded="true" />
+                <element signature="e#43216#43367#0" expanded="true" />
+                <element signature="e#43529#43798#0" expanded="true" />
+                <element signature="e#44527#44652#0" expanded="true" />
+                <element signature="e#45569#45747#0" expanded="true" />
+                <element signature="e#45907#46104#0" expanded="true" />
+                <element signature="e#46267#46446#0" expanded="true" />
+                <element signature="e#46939#46968#0" expanded="true" />
+                <element signature="e#46995#47031#0" expanded="true" />
+                <element signature="e#47180#47251#0" expanded="true" />
+                <element signature="e#47276#47320#0" expanded="true" />
+                <element signature="e#48711#51458#0" expanded="true" />
+                <element signature="e#55553#57750#0" expanded="true" />
+                <element signature="e#57838#57872#0" expanded="true" />
+                <element signature="e#64095#64122#0" expanded="true" />
+                <element signature="e#68550#68616#0" expanded="true" />
+                <element signature="e#68846#69009#0" expanded="true" />
+                <element signature="e#69237#69402#0" expanded="true" />
+                <element signature="e#74768#74943#0" expanded="true" />
+                <element signature="e#76220#76245#0" expanded="true" />
+                <element signature="e#76646#77370#0" expanded="true" />
+                <element signature="e#78855#79032#0" expanded="true" />
+                <element signature="e#79804#79992#0" expanded="true" />
+                <element signature="e#81712#83004#0" expanded="true" />
+                <element signature="e#83410#83590#0" expanded="true" />
+                <element signature="e#84919#85110#0" expanded="true" />
+                <element signature="e#88102#90201#0" expanded="true" />
+                <element signature="e#99913#99970#0" expanded="true" />
+                <element signature="e#127254#127519#0" expanded="true" />
+                <element signature="e#127807#130586#0" expanded="true" />
+                <element signature="e#130874#132211#0" expanded="true" />
+                <element signature="e#132472#133729#0" expanded="true" />
+                <element signature="e#258582#258695#0" expanded="true" />
+                <element signature="e#260502#260536#0" expanded="true" />
+                <element signature="e#260660#260691#0" expanded="true" />
+                <element signature="e#260892#261262#0" expanded="true" />
+                <element signature="e#261864#261974#0" expanded="true" />
+                <element signature="e#262779#262877#0" expanded="true" />
+                <element signature="e#264361#264569#0" expanded="true" />
+                <element signature="e#270788#270849#0" expanded="true" />
+                <element signature="e#271034#271181#0" expanded="true" />
+                <element signature="e#271432#271570#0" expanded="true" />
+                <element signature="e#272821#273002#0" expanded="true" />
+                <element signature="e#273464#273957#0" expanded="true" />
+                <element signature="e#275370#275554#0" expanded="true" />
+                <element signature="e#277187#277440#0" expanded="true" />
+                <element signature="e#277635#277688#0" expanded="true" />
+                <element signature="e#281138#281218#0" expanded="true" />
+                <element signature="e#286714#313340#0" expanded="true" />
+                <element signature="e#314137#314201#0" expanded="true" />
+                <element signature="e#314522#314548#0" expanded="true" />
+                <element signature="e#319523#319802#0" expanded="true" />
+                <element signature="e#321607#321618#0" expanded="true" />
+                <element signature="e#322489#322692#0" expanded="true" />
+                <element signature="e#322874#322982#0" expanded="true" />
+                <element signature="e#323948#324254#0" expanded="true" />
+                <element signature="e#324790#326488#0" expanded="true" />
+                <element signature="e#326640#326677#0" expanded="true" />
+                <element signature="e#327459#327487#0" expanded="true" />
+                <element signature="e#345088#345116#0" expanded="true" />
+                <element signature="e#364121#364330#0" expanded="true" />
+                <element signature="e#364521#366506#0" expanded="true" />
+                <element signature="e#366751#366964#0" expanded="true" />
+                <element signature="e#369491#369744#0" expanded="true" />
+                <element signature="e#371814#373746#0" expanded="true" />
+                <element signature="e#376244#376404#0" expanded="true" />
+                <element signature="e#376633#376798#0" expanded="true" />
+                <element signature="e#377027#377175#0" expanded="true" />
+                <element signature="e#377404#377552#0" expanded="true" />
+                <element signature="e#377781#378185#0" expanded="true" />
+                <element signature="e#378426#378475#0" expanded="true" />
+                <element signature="e#378718#378767#0" expanded="true" />
+                <element signature="e#379010#379059#0" expanded="true" />
+                <element signature="e#380119#380147#0" expanded="true" />
+                <element signature="e#380585#380801#0" expanded="true" />
+                <element signature="e#381258#381387#0" expanded="true" />
+                <element signature="e#381422#381443#0" expanded="true" />
+                <element signature="e#381596#381642#0" expanded="true" />
+                <element signature="e#381868#381914#0" expanded="true" />
+                <element signature="e#383045#383141#0" expanded="true" />
+                <element signature="e#385705#385777#0" expanded="true" />
+                <element signature="e#385808#385838#0" expanded="true" />
+                <element signature="e#385992#386039#0" expanded="true" />
+                <element signature="e#386188#387120#0" expanded="true" />
+                <element signature="e#390138#390195#0" expanded="true" />
+                <element signature="e#390346#390486#0" expanded="true" />
+                <element signature="e#390640#390701#0" expanded="true" />
+                <element signature="e#390850#390922#0" expanded="true" />
+                <element signature="e#391464#391485#0" expanded="true" />
+                <element signature="e#391639#391762#0" expanded="true" />
+                <element signature="e#392057#392153#0" expanded="true" />
+                <element signature="e#392528#392556#0" expanded="true" />
+                <element signature="e#393460#393482#0" expanded="true" />
+                <element signature="e#393887#393951#0" expanded="true" />
+                <element signature="e#395687#395733#0" expanded="true" />
+                <element signature="e#395965#396069#0" expanded="true" />
+                <element signature="e#396937#396961#0" expanded="true" />
+                <element signature="e#397896#397942#0" expanded="true" />
+                <element signature="e#399280#399302#0" expanded="true" />
+                <element signature="e#399532#400009#0" expanded="true" />
+                <element signature="e#400160#400588#0" expanded="true" />
+                <element signature="e#400742#401135#0" expanded="true" />
+                <element signature="e#402790#402816#0" expanded="true" />
+                <element signature="e#411544#411849#0" expanded="true" />
+                <element signature="e#412095#413828#0" expanded="true" />
+                <element signature="e#419313#419398#0" expanded="true" />
+                <element signature="e#420701#420853#0" expanded="true" />
+                <element signature="e#421084#422119#0" expanded="true" />
+                <element signature="e#422351#423212#0" expanded="true" />
+                <element signature="e#423444#424586#0" expanded="true" />
+                <element signature="e#424819#425668#0" expanded="true" />
+                <element signature="e#429285#430017#0" expanded="true" />
+                <element signature="e#431503#431578#0" expanded="true" />
+                <element signature="e#432050#432183#0" expanded="true" />
+                <element signature="e#436574#436619#0" expanded="true" />
+                <element signature="e#440538#441057#0" expanded="true" />
+                <element signature="e#443803#444408#0" expanded="true" />
+                <element signature="e#445727#445951#0" expanded="true" />
+                <element signature="e#453865#454009#0" expanded="true" />
+                <element signature="e#459007#459067#0" expanded="true" />
+                <element signature="e#467361#468503#0" expanded="true" />
+                <element signature="e#469063#469221#0" expanded="true" />
+                <element signature="e#469465#469500#0" expanded="true" />
+                <element signature="e#469795#470007#0" expanded="true" />
+                <element signature="e#470361#470476#0" expanded="true" />
+                <element signature="e#471753#471946#0" expanded="true" />
+                <element signature="e#475901#475980#0" expanded="true" />
+                <element signature="e#477007#477142#0" expanded="true" />
+                <element signature="e#478321#478501#0" expanded="true" />
+                <element signature="e#481637#481649#0" expanded="true" />
+                <element signature="e#483612#483666#0" expanded="true" />
+                <element signature="e#484230#484337#0" expanded="true" />
+                <element signature="e#485420#485568#0" expanded="true" />
+                <element signature="e#492539#492616#0" expanded="true" />
+                <element signature="e#493702#493754#0" expanded="true" />
+                <element signature="e#494286#494387#0" expanded="true" />
+                <element signature="e#494730#494787#0" expanded="true" />
+                <element signature="e#495378#495526#0" expanded="true" />
+                <element signature="e#500278#500605#0" expanded="true" />
+                <element signature="e#500969#501044#0" expanded="true" />
+                <element signature="e#502090#502169#0" expanded="true" />
+                <element signature="e#502540#502680#0" expanded="true" />
+                <element signature="e#503469#503587#0" expanded="true" />
+                <element signature="e#505321#505415#0" expanded="true" />
+                <element signature="e#511352#511442#0" expanded="true" />
+                <element signature="e#513423#513434#0" expanded="true" />
+                <element signature="e#515851#515862#0" expanded="true" />
+                <element signature="e#518687#518698#0" expanded="true" />
+                <element signature="e#520828#520839#0" expanded="true" />
+                <element signature="e#523027#523038#0" expanded="true" />
+                <element signature="e#523824#523832#0" expanded="true" />
+                <element signature="e#524034#524127#0" expanded="true" />
+                <element signature="e#524423#524599#0" expanded="true" />
+                <element signature="e#525809#525857#0" expanded="true" />
+                <element signature="e#526159#527104#0" expanded="true" />
+                <element signature="e#527272#527653#0" expanded="true" />
+                <element signature="e#529357#529368#0" expanded="true" />
+                <element signature="e#530156#530164#0" expanded="true" />
+                <element signature="e#530357#530451#0" expanded="true" />
+                <element signature="e#530748#530925#0" expanded="true" />
+                <element signature="e#532047#532088#0" expanded="true" />
+                <element signature="e#532380#532787#0" expanded="true" />
+                <element signature="e#532955#533169#0" expanded="true" />
+                <element signature="e#533601#533612#0" expanded="true" />
+                <element signature="e#535867#535878#0" expanded="true" />
+                <element signature="e#538241#538252#0" expanded="true" />
+                <element signature="e#540925#540936#0" expanded="true" />
+                <element signature="e#543616#543627#0" expanded="true" />
+                <element signature="e#546435#546446#0" expanded="true" />
+                <element signature="e#548878#548892#0" expanded="true" />
+                <element signature="e#552446#552500#0" expanded="true" />
+                <element signature="e#552892#552905#0" expanded="true" />
+                <element signature="e#555878#556501#0" expanded="true" />
+                <element signature="e#556788#556797#0" expanded="true" />
+                <element signature="e#557083#557224#0" expanded="true" />
+                <element signature="e#557439#557453#0" expanded="true" />
+                <element signature="e#557934#558008#0" expanded="true" />
+                <element signature="e#558181#558194#0" expanded="true" />
+                <element signature="e#558569#558658#0" expanded="true" />
+                <element signature="e#561009#561524#0" expanded="true" />
+                <element signature="e#561724#561772#0" expanded="true" />
+                <element signature="e#563803#565084#0" expanded="true" />
+                <element signature="e#571410#571417#0" expanded="true" />
+                <element signature="e#572285#572379#0" expanded="true" />
+                <element signature="e#572699#572843#0" expanded="true" />
+                <element signature="e#578385#579169#0" expanded="true" />
+                <element signature="e#579421#580307#0" expanded="true" />
+                <element signature="e#580559#581130#0" expanded="true" />
+                <element signature="e#581511#581930#0" expanded="true" />
+                <element signature="e#582532#585675#0" expanded="true" />
+                <element signature="e#595356#595509#0" expanded="true" />
+                <element signature="e#599485#599504#0" expanded="true" />
+                <element signature="e#624002#624039#0" expanded="true" />
+                <element signature="e#624418#624505#0" expanded="true" />
+                <element signature="e#639162#640138#0" expanded="true" />
+                <element signature="e#640437#640529#0" expanded="true" />
+                <element signature="e#640773#640801#0" expanded="true" />
+                <element signature="e#642925#643230#0" expanded="true" />
+                <element signature="e#643379#643943#0" expanded="true" />
+                <element signature="e#644095#644132#0" expanded="true" />
+                <element signature="e#644520#645696#0" expanded="true" />
+                <element signature="e#647578#649249#0" expanded="true" />
+                <element signature="e#663313#663374#0" expanded="true" />
+                <element signature="e#664538#664870#0" expanded="true" />
+                <element signature="e#671465#671563#0" expanded="true" />
+                <element signature="e#672997#676510#0" expanded="true" />
+                <element signature="e#684215#684266#0" expanded="true" />
+                <element signature="e#684851#685139#0" expanded="true" />
+                <element signature="e#692646#692667#0" expanded="true" />
+                <element signature="e#693808#694066#0" expanded="true" />
+                <element signature="e#696204#696311#0" expanded="true" />
+                <element signature="e#696686#696730#0" expanded="true" />
+                <element signature="e#707039#707117#0" expanded="true" />
+                <element signature="e#707142#707163#0" expanded="true" />
+                <element signature="e#707306#707976#0" expanded="true" />
+                <element signature="e#717811#717834#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -136,10 +374,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>DHCPServerEnable</find>
-      <find>LAN1Enable</find>
-      <find>ConnectionRequestURL</find>
-      <find>imsi</find>
       <find>BytesSent</find>
       <find>compare</find>
       <find>wanEtehrnetinterface</find>
@@ -158,7 +392,6 @@
       <find>CMAKE_CXX_FLAGS</find>
       <find>sassan</find>
       <find>cout</find>
-      <find>cerr</find>
       <find>DownloadResponse</find>
       <find>__cwmp__DownloadResponse</find>
       <find>*CommandKey=&quot;reboot&quot;</find>
@@ -166,6 +399,11 @@
       <find>NO_DA</find>
       <find>NO_BOD</find>
       <find>204</find>
+      <find>cerr</find>
+      <find>No Content Recieved at</find>
+      <find>13</find>
+      <find>SOAP message expected</find>
+      <find>SOAP_NO_TAG</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -186,18 +424,20 @@
         <option value="$PROJECT_DIR$/zbx.cpp" />
         <option value="$PROJECT_DIR$/influxdb.h" />
         <option value="$PROJECT_DIR$/CMakeLists.txt" />
-        <option value="$PROJECT_DIR$/stdsoap2.cpp" />
         <option value="$PROJECT_DIR$/trapi.h" />
         <option value="$PROJECT_DIR$/main.cpp" />
         <option value="$PROJECT_DIR$/soapcwmpService.h" />
+        <option value="$PROJECT_DIR$/stdsoap2.cpp" />
         <option value="$PROJECT_DIR$/soapcwmpService.cpp" />
       </list>
     </option>
   </component>
   <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
   <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
-    <option name="width" value="1280" />
-    <option name="height" value="800" />
+    <option name="x" value="1280" />
+    <option name="y" value="-181" />
+    <option name="width" value="1920" />
+    <option name="height" value="1080" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -286,6 +526,7 @@
       <workItem from="1575470455404" duration="18124000" />
       <workItem from="1575747610607" duration="1922000" />
       <workItem from="1577522322161" duration="6073000" />
+      <workItem from="1577559948661" duration="9408000" />
     </task>
     <task id="LOCAL-00001" summary="Disable InfluxDB">
       <created>1572183659791</created>
@@ -312,7 +553,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="230448000" />
+    <option name="totallyTimeSpent" value="239856000" />
   </component>
   <component name="TodoView" selected-index="3">
     <todo-panel id="selected-file">
@@ -324,13 +565,14 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1280" height="800" extended-state="6" />
+    <frame x="1280" y="-181" width="1920" height="1080" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.47285068" visible="true" weight="0.25767368" />
-      <window_info id="Structure" order="1" sideWeight="0.5271493" side_tool="true" visible="true" weight="0.25767368" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.47058824" visible="true" weight="0.17252396" />
+      <window_info id="Structure" order="1" sideWeight="0.5294118" side_tool="true" visible="true" weight="0.17252396" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32739726" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32673267" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.45148516" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -338,8 +580,8 @@
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32876712" />
       <window_info anchor="bottom" id="File Transfer" order="7" weight="0.31506848" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
-      <window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.39452055" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.3260274" />
+      <window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.39405942" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32574257" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="12" weight="0.32876712" />
       <window_info anchor="bottom" id="CMake" order="13" weight="0.42739725" />
@@ -571,13 +813,6 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/influxdb.h" />
-    <entry file="file://$USER_HOME$/Library/Caches/CLion2018.3/.remote/192.168.0.154_22/e9dd1ecb-683b-455d-93f3-bda676ea4f16/usr/local/include/stdsoap2.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="2894" column="6" selection-start-line="2894" selection-start-column="6" selection-end-line="2894" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Library/Caches/CLion2018.3/.remote/192.168.0.154_22/e9dd1ecb-683b-455d-93f3-bda676ea4f16/usr/include/time.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="235">
@@ -613,10 +848,50 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/soapC.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170490">
+          <caret line="11366" column="27" selection-start-line="11366" selection-start-column="27" selection-end-line="11366" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="463" selection-start-line="463" selection-end-line="463" />
+          <folding>
+            <element signature="e#464#648#0" />
+            <element signature="e#649#715#0" />
+            <element signature="e#717#966#0" />
+            <element signature="e#968#999#0" />
+            <element signature="e#5581#6601#0" />
+            <element signature="e#6603#7289#0" />
+            <element signature="e#24655#24682#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Library/Caches/CLion2018.3/.remote/192.168.0.154_22/e9dd1ecb-683b-455d-93f3-bda676ea4f16/usr/local/include/stdsoap2.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4425">
+          <caret line="2703" column="17" selection-start-line="2703" selection-start-column="17" selection-end-line="2703" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/soapcwmpService.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#612#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/stdsoap2.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="19060" column="36" selection-start-line="19060" selection-start-column="36" selection-end-line="19060" selection-end-column="36" />
+        <state relative-caret-position="216">
+          <caret line="16845" column="23" selection-start-line="16845" selection-start-column="23" selection-end-line="16845" selection-end-column="23" />
           <folding>
             <element signature="e#2635#2680#0" expanded="true" />
             <element signature="e#2741#2763#0" expanded="true" />
@@ -705,7 +980,6 @@
             <element signature="e#271432#271570#0" expanded="true" />
             <element signature="e#272821#273002#0" expanded="true" />
             <element signature="e#273464#273957#0" expanded="true" />
-            <element signature="e#275210#275211#0" expanded="true" />
             <element signature="e#275370#275554#0" expanded="true" />
             <element signature="e#277187#277440#0" expanded="true" />
             <element signature="e#277635#277688#0" expanded="true" />
@@ -767,7 +1041,6 @@
             <element signature="e#402790#402816#0" expanded="true" />
             <element signature="e#411544#411849#0" expanded="true" />
             <element signature="e#412095#413828#0" expanded="true" />
-            <element signature="e#415617#415618#0" expanded="true" />
             <element signature="e#419313#419398#0" expanded="true" />
             <element signature="e#420701#420853#0" expanded="true" />
             <element signature="e#421084#422119#0" expanded="true" />
@@ -783,10 +1056,6 @@
             <element signature="e#445727#445951#0" expanded="true" />
             <element signature="e#453865#454009#0" expanded="true" />
             <element signature="e#459007#459067#0" expanded="true" />
-            <element signature="e#460334#460890#0" expanded="true" />
-            <element signature="e#461280#461586#0" expanded="true" />
-            <element signature="e#462144#463075#0" expanded="true" />
-            <element signature="e#463771#464202#0" expanded="true" />
             <element signature="e#467361#468503#0" expanded="true" />
             <element signature="e#469063#469221#0" expanded="true" />
             <element signature="e#469465#469500#0" expanded="true" />
@@ -887,47 +1156,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/soapC.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170490">
-          <caret line="11366" column="27" selection-start-line="11366" selection-start-column="27" selection-end-line="11366" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/main.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="154" column="11" selection-start-line="154" selection-start-column="11" selection-end-line="154" selection-end-column="11" />
-          <folding>
-            <element signature="e#464#648#0" />
-            <element signature="e#649#715#0" />
-            <element signature="e#717#966#0" />
-            <element signature="e#968#999#0" />
-            <element signature="e#5581#6601#0" />
-            <element signature="e#6603#7289#0" />
-            <element signature="e#7291#8323#0" />
-            <element signature="e#8326#10694#0" />
-            <element signature="e#12859#31996#0" />
-            <element signature="e#15761#15794#0" />
-            <element signature="e#24629#24656#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/soapcwmpService.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="145" column="39" selection-start-line="145" selection-start-column="39" selection-end-line="145" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#612#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/soapcwmpService.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="292" column="31" lean-forward="true" selection-start-line="292" selection-start-column="31" selection-end-line="292" selection-end-column="31" />
+        <state relative-caret-position="150">
+          <caret line="860" lean-forward="true" selection-start-line="860" selection-end-line="860" />
           <folding>
             <element signature="e#0#614#0" />
             <element signature="e#646#784#0" />
@@ -938,7 +1170,6 @@
             <element signature="e#1329#1440#0" />
             <element signature="e#1442#2236#0" />
             <element signature="e#2238#2321#0" />
-            <element signature="e#2323#2485#0" />
             <element signature="e#2513#2714#0" />
             <element signature="e#2723#2962#0" />
             <element signature="e#2964#3039#0" />
@@ -956,25 +1187,21 @@
             <element signature="e#4953#5424#0" />
             <element signature="e#5921#6035#0" />
             <element signature="e#6048#6106#0" />
-            <element signature="e#6243#7179#0" />
+            <element signature="e#6915#6943#0" expanded="true" />
             <element signature="e#8147#8207#0" />
-            <element signature="e#13297#15315#0" />
-            <element signature="e#15317#17359#0" />
-            <element signature="e#17361#18169#0" />
-            <element signature="e#18171#20213#0" />
-            <element signature="e#20215#22353#0" />
-            <element signature="e#22355#24493#0" />
-            <element signature="e#24495#26297#0" />
-            <element signature="e#26299#28053#0" />
-            <element signature="e#28055#29881#0" />
-            <element signature="e#29883#31781#0" />
-            <element signature="e#31783#33705#0" />
-            <element signature="e#33707#35461#0" />
-            <element signature="e#35463#37407#0" />
-            <element signature="e#37409#39387#0" />
-            <element signature="e#36241#36561#0" />
-            <element signature="e#36562#38307#0" />
-            <element signature="e#38309#39421#0" />
+            <element signature="e#10264#12282#0" />
+            <element signature="e#14328#15136#0" />
+            <element signature="e#15138#17180#0" />
+            <element signature="e#17182#19320#0" />
+            <element signature="e#19322#21460#0" />
+            <element signature="e#21462#23264#0" />
+            <element signature="e#23266#25020#0" />
+            <element signature="e#25022#26848#0" />
+            <element signature="e#26850#28748#0" />
+            <element signature="e#28750#30672#0" />
+            <element signature="e#32430#34374#0" />
+            <element signature="e#34376#36354#0" />
+            <element signature="e#36676#38421#0" />
           </folding>
         </state>
       </provider>

+ 12 - 11
soapcwmpService.cpp

@@ -260,9 +260,17 @@ int cwmpService::dispatch()
 
 int cwmpService::dispatch(struct soap* soap)
 {
+    int _check = 0;
+
     cwmpService_init(soap->imode, soap->omode);
     if (soap->error==20400){
-        ChechQueue(soap, this);
+        _check = 1;
+        soap->error = 0;
+    }
+    if (_check == 1) {
+        _check = 0;
+        soap->error = 0;
+        return CheckQueue(soap, this);
     }
     soap_peek_element(soap);
     if (!soap_match_tag(soap, soap->tag, "cwmp:GetParameterNames"))
@@ -853,12 +861,8 @@ static int serve___cwmp__FactoryReset(struct soap *soap, cwmpService *service)
 
 
 
-int cwmpService::ChechQueue(struct soap *soap , cwmpService *cwmpService1) {
-//	auto res=cwmpService::CustomeFactoryReset(soap, this);
-//	std::cerr<<"Final Result is: "<<res<<std::endl;
-//	CustomeFactoryReset(soap,this);
-    CustomeReboot(soap,this);
-    return soap_closesock(soap);
+int cwmpService::CheckQueue(struct soap *soap, cwmpService *cwmpService1) {
+    return CustomeReboot(soap, this);
 }
 int cwmpService::CustomeFactoryReset(struct soap *pSoap, cwmpService *pService) {
 
@@ -903,11 +907,8 @@ int cwmpService::CustomeFactoryReset(struct soap *pSoap, cwmpService *pService)
 
 int cwmpService::CustomeReboot(struct soap *pSoap, cwmpService *pService) {
 
-//	struct __cwmp__Reboot soap_tmp___cwmp__Reboot;
     soap->error=0;
-//	struct _cwmp__RebootResponse cwmp__RebootResponse;
     struct _cwmp__Reboot cwmp__reboot;
-//	soap_default___cwmp__Reboot(soap, &cwmp__reboot);
     cwmp__reboot.CommandKey="reboot";
     if ((soap->mode & SOAP_IO_LENGTH))
     {	if (soap_envelope_begin_out(soap)
@@ -935,5 +936,5 @@ int cwmpService::CustomeRebootResonse(struct soap *pSoap, cwmpService *pService)
 
     std::cerr<<"Recieve Reboot Response in Service.cpp"<<std::endl;
 
-    return SOAP_OK;
+    return soap_closesock(soap);
 }

+ 2 - 1
soapcwmpService.h

@@ -140,7 +140,8 @@ A commercial use license is available from Genivia Inc., contact@genivia.com
         //
         /// Web service operation 'FactoryReset' implementation, should return SOAP_OK or error code
         virtual int FactoryReset(struct _cwmp__FactoryReset *cwmp__FactoryReset, struct _cwmp__FactoryResetResponse *cwmp__FactoryResetResponse) SOAP_PURE_VIRTUAL;
-        virtual int ChechQueue(struct soap *soap , cwmpService *cwmpService1) SOAP_PURE_VIRTUAL;
+
+    virtual int CheckQueue(struct soap *soap, cwmpService *cwmpService1) SOAP_PURE_VIRTUAL;
         virtual int CustomeFactoryReset(struct soap *soap , cwmpService *cwmpService1) SOAP_PURE_VIRTUAL;
         virtual int CustomeReboot(struct soap *soap , cwmpService *cwmpService1) SOAP_PURE_VIRTUAL;
         virtual int CustomeRebootResonse(struct soap *soap , cwmpService *cwmpService1) SOAP_PURE_VIRTUAL;

+ 4 - 1
stdsoap2.cpp

@@ -6746,6 +6746,8 @@ soap_closesock(struct soap *soap) {
     soap->zlib_state = SOAP_ZLIB_NONE;
   }
 #endif
+    soap->error = status;
+    std::cerr << "soap_closesock: " << status << std::endl;
     return soap->error = status;
 }
 
@@ -13496,8 +13498,9 @@ soap_peek_element(struct soap *soap) {
   }
 #else
     /* skip space */
-    while (soap_coblank(c))
+    while (soap_coblank(c)) {
         c = soap_get(soap);
+    }
 #endif
     if (c != SOAP_LT) {
         *soap->tag = '\0';