Bugfix duplicte transmisstion

closes #24
novastone-media · Apr 19, 2015 · 9f01937 · 9f01937
1 parent d893cd8
commit 9f01937
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 29 deletions.
diff --git a/MQTTClient.podspec b/MQTTClient.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = "MQTTClient"
-  s.version      = "0.1.3"
+  s.version      = "0.1.4"
   s.summary      = "IOS native ObjectiveC MQTT Framework"
   s.homepage     = "https://github.com/ckrey/MQTT-Client-Framework"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Christoph Krey" => "krey.christoph@gmail.com" }
-  s.source       = { :git => "https://github.com/ckrey/MQTT-Client-Framework.git", :tag => "0.1.3" }
+  s.source       = { :git => "https://github.com/ckrey/MQTT-Client-Framework.git", :tag => "0.1.4" }
 
   s.source_files = "MQTTClient/MQTTClient", "MQTTClient/MQTTClient/**/*.{h,m}"
   s.requires_arc = true

diff --git a/MQTTClient/MQTTClient/MQTTPersistence.h b/MQTTClient/MQTTClient/MQTTPersistence.h
@@ -30,7 +30,7 @@
 @property (nonatomic) NSUInteger maxSize;
 
 - (NSUInteger)windowSize:(NSString *)clientId;
-- (BOOL)storeMessageForClientId:(NSString *)clientId
+- (MQTTFlow *)storeMessageForClientId:(NSString *)clientId
                           topic:(NSString *)topic
                            data:(NSData *)data
                      retainFlag:(BOOL)retainFlag

diff --git a/MQTTClient/MQTTClient/MQTTPersistence.m b/MQTTClient/MQTTClient/MQTTPersistence.m
@@ -71,7 +71,7 @@ - (NSUInteger)windowSize:(NSString *)clientId {
     return windowSize;
 }
 
-- (BOOL)storeMessageForClientId:(NSString *)clientId
+- (MQTTFlow *)storeMessageForClientId:(NSString *)clientId
                           topic:(NSString *)topic
                            data:(NSData *)data
                      retainFlag:(BOOL)retainFlag
@@ -94,9 +94,9 @@ - (BOOL)storeMessageForClientId:(NSString *)clientId
         }
         flow.deadline = [NSDate dateWithTimeIntervalSinceNow:0];
         [self sync];
-        return true;
+        return flow;
     } else {
-        return false;
+        return nil;
     }
 }
 

diff --git a/MQTTClient/MQTTClient/MQTTSession.m b/MQTTClient/MQTTClient/MQTTSession.m
@@ -637,19 +637,22 @@ - (UInt16)publishData:(NSData*)data
                                                 retainFlag:retainFlag
                                                    dupFlag:FALSE];
     if (qos) {
-        if (![self.persistence storeMessageForClientId:self.clientId
-                                            topic:topic
-                                             data:data
-                                       retainFlag:retainFlag
-                                              qos:qos
-                                            msgId:msgId
-                                           incomingFlag:NO]) {
+        MQTTFlow *flow = [self.persistence storeMessageForClientId:self.clientId
+                                                             topic:topic
+                                                              data:data
+                                                        retainFlag:retainFlag
+                                                               qos:qos
+                                                             msgId:msgId
+                                                      incomingFlag:NO];
+
+        if (!flow) {
             if (DEBUGSESS) NSLog(@"%@ dropping outgoing messages", self);
             msgId = 0;
         } else {
             [self tell];
             if ([self.persistence windowSize:self.clientId] <= self.persistence.maxWindowSize) {
                 [self send:msg];
+                flow.deadline = [NSDate dateWithTimeIntervalSinceNow:DUPTIMEOUT];
             }
         }
     } else {

diff --git a/MQTTClient/dist/MQTTClient.framework/Versions/A/Headers/MQTTPersistence.h b/MQTTClient/dist/MQTTClient.framework/Versions/A/Headers/MQTTPersistence.h
@@ -30,7 +30,7 @@
 @property (nonatomic) NSUInteger maxSize;
 
 - (NSUInteger)windowSize:(NSString *)clientId;
-- (BOOL)storeMessageForClientId:(NSString *)clientId
+- (MQTTFlow *)storeMessageForClientId:(NSString *)clientId
                           topic:(NSString *)topic
                            data:(NSData *)data
                      retainFlag:(BOOL)retainFlag

diff --git a/MQTTClient/dist/MQTTClient.framework/Versions/A/MQTTClient b/MQTTClient/dist/MQTTClient.framework/Versions/A/MQTTClient
diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_session_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_session_8h_source.html
@@ -356,7 +356,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/annotated.html b/MQTTClient/dist/documentation/html/annotated.html
@@ -96,7 +96,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/class_m_q_t_t_session-members.html b/MQTTClient/dist/documentation/html/class_m_q_t_t_session-members.html
@@ -149,7 +149,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/classes.html b/MQTTClient/dist/documentation/html/classes.html
@@ -99,7 +99,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/files.html b/MQTTClient/dist/documentation/html/files.html
@@ -92,7 +92,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/functions.html b/MQTTClient/dist/documentation/html/functions.html
@@ -384,7 +384,7 @@ <h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/functions_func.html b/MQTTClient/dist/documentation/html/functions_func.html
@@ -312,7 +312,7 @@ <h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/functions_prop.html b/MQTTClient/dist/documentation/html/functions_prop.html
@@ -152,7 +152,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/hierarchy.html b/MQTTClient/dist/documentation/html/hierarchy.html
@@ -97,7 +97,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/index.html b/MQTTClient/dist/documentation/html/index.html
@@ -91,15 +91,24 @@ <h3>License</h3>
 <p>All rights reserved.</p>
 <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
 <p>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</p>
-<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
 <h4>Framework</h4>
 <p>Framework build using instructions and scripts by Jeff Verkoeyen <a href="https://github.com/jverkoey/iOS-Framework">https://github.com/jverkoey/iOS-Framework</a></p>
 <h4>docs</h4>
-<p>Documentation generated with doxygen <a href="http://doxygen.org">http://doxygen.org</a> </p>
+<p>Documentation generated with doxygen <a href="http://doxygen.org">http://doxygen.org</a></p>
+<h4>Comparison MQTT Clients for iOS (incomplete)</h4>
+<table class="doxtable">
+<tr>
+<th>Wrapper</th><th>&mdash;</th><th>-&mdash;</th><th>MQTTKit </th><th>Marquette</th><th>Moscapsule</th><th>Musqueteer</th><th>MQTT-Client</th><th>MqttSDK</th><th>CocoaMQTT  </th></tr>
+<tr>
+<td></td><td></td><td></td><td>Obj-C </td><td>Obj-C </td><td>Swift </td><td>Obj-C </td><td>Obj-C </td><td>Obj-C </td><td>Swift </td></tr>
+<tr>
+<td>Library</td><td>IBM</td><td>Paho</td><td>Mosquitto</td><td>Mosquitto</td><td>Mosquitto </td><td>Mosquitto </td><td>native </td><td>native </td><td>native </td></tr>
+</table>
 </div></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/interface_m_q_t_t_session.html b/MQTTClient/dist/documentation/html/interface_m_q_t_t_session.html
@@ -2324,7 +2324,7 @@ <h2 class="groupheader">Property Documentation</h2>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/protocol_m_q_t_t_session_delegate-p-members.html b/MQTTClient/dist/documentation/html/protocol_m_q_t_t_session_delegate-p-members.html
@@ -111,7 +111,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/protocol_m_q_t_t_session_delegate-p.html b/MQTTClient/dist/documentation/html/protocol_m_q_t_t_session_delegate-p.html
@@ -1042,7 +1042,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Thu Apr 9 2015 11:09:53 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Apr 19 2015 13:58:02 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>