bumped version

TinyFrame.c

@@ -372,6 +372,12 @@ static void _TF_FN TF_HandleReceivedMessage(TinyFrame *tf)
                 if (res == TF_RENEW) {
                     renew_id_listener(ilst);
                 }
+                else if (res == TF_CLOSE) {
+                    // Set userdata to NULL to avoid calling user for cleanup
+                    ilst->userdata = NULL;
+                    ilst->userdata2 = NULL;
+                    cleanup_id_listener(tf, i, ilst);
+                }
                 return;
             }
         }
@@ -389,8 +395,12 @@ static void _TF_FN TF_HandleReceivedMessage(TinyFrame *tf)
             res = tlst->fn(tf, &msg);
 
             if (res != TF_NEXT) {
-                // if it's TF_CLOSE, we assume user already cleaned up userdata
+                // type listeners don't have userdata.
-                // TF_RENEW doesn't make sense here because type listeners don't expire
+                // TF_RENEW doesn't make sense here because type listeners don't expire = same as TF_STAY
+
+                if (res == TF_CLOSE) {
+                    cleanup_type_listener(tf, i, tlst);
+                }
                 return;
             }
         }
@@ -404,8 +414,16 @@ static void _TF_FN TF_HandleReceivedMessage(TinyFrame *tf)
             res = glst->fn(tf, &msg);
 
             if (res != TF_NEXT) {
-                // if it's TF_CLOSE, we assume user already cleaned up userdata
+                // generic listeners don't have userdata.
-                // TF_RENEW doesn't make sense here because generic listeners don't expire
+                // TF_RENEW doesn't make sense here because generic listeners don't expire = same as TF_STAY
+
+                // note: It's not expected that user will have multiple generic listeners, or
+                // ever actually remove them. They're most useful as default callbacks if no other listener
+                // handled the message.
+
+                if (res == TF_CLOSE) {
+                    cleanup_generic_listener(tf, i, glst);
+                }
                 return;
             }
         }
@@ -463,10 +481,11 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
 
 #if !TF_USE_SOF_BYTE
     if (tf->state == TFState_SOF) {
-            TF_ParsBeginFrame();
+        TF_ParsBeginFrame();
-        }
+    }
 #endif
 
+    //@formatter:off
     switch (tf->state) {
         case TFState_SOF:
             if (c == TF_SOF_BYTE) {
@@ -495,15 +514,15 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
         case TFState_TYPE:
             CKSUM_ADD(tf->cksum, c);
             COLLECT_NUMBER(tf->type, TF_TYPE) {
-#if TF_CKSUM_TYPE == TF_CKSUM_NONE
+                #if TF_CKSUM_TYPE == TF_CKSUM_NONE
-                tf->state = TFState_DATA;
+                    tf->state = TFState_DATA;
-                tf->rxi = 0;
+                    tf->rxi = 0;
-#else
+                #else
-                // enter HEAD_CKSUM state
+                    // enter HEAD_CKSUM state
-                tf->state = TFState_HEAD_CKSUM;
+                    tf->state = TFState_HEAD_CKSUM;
-                tf->rxi = 0;
+                    tf->rxi = 0;
-                tf->ref_cksum = 0;
+                    tf->ref_cksum = 0;
-#endif
+                #endif
             }
             break;
 
@@ -518,6 +537,7 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
                 }
 
                 if (tf->len == 0) {
+                    // if the message has no body, we're done.
                     TF_HandleReceivedMessage(tf);
                     TF_ResetParser(tf);
                     break;
@@ -545,16 +565,16 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
             }
 
             if (tf->rxi == tf->len) {
-#if TF_CKSUM_TYPE == TF_CKSUM_NONE
+                #if TF_CKSUM_TYPE == TF_CKSUM_NONE
-                // All done
+                    // All done
-                TF_HandleReceivedMessage();
+                    TF_HandleReceivedMessage();
-                TF_ResetParser();
+                    TF_ResetParser();
-#else
+                #else
-                // Enter DATA_CKSUM state
+                    // Enter DATA_CKSUM state
-                tf->state = TFState_DATA_CKSUM;
+                    tf->state = TFState_DATA_CKSUM;
-                tf->rxi = 0;
+                    tf->rxi = 0;
-                tf->ref_cksum = 0;
+                    tf->ref_cksum = 0;
-#endif
+                #endif
             }
             break;
 
@@ -570,6 +590,7 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
             }
             break;
     }
+    //@formatter:on
 
     // we get here after finishing HEAD, if no data are to be received - handle and clear
     if (tf->len == 0 && tf->state == TFState_DATA) {
@@ -753,16 +774,19 @@ static bool _TF_FN TF_SendFrame(TinyFrame *tf, TF_Msg *msg, TF_Listener listener
         }
     }
 
-    // Flush if checksum wouldn't fit in the buffer
+    // Checksum only if message had a body
-    if (TF_SENDBUF_LEN - len < sizeof(TF_CKSUM)) {
+    if (msg->len > 0) {
-        TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
+        // Flush if checksum wouldn't fit in the buffer
-        len = 0;
+        if (TF_SENDBUF_LEN - len < sizeof(TF_CKSUM)) {
+            TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
+            len = 0;
+        }
+
+        // Add checksum, flush what remains to be sent
+        len += TF_ComposeTail(tf->sendbuf + len, &cksum);
     }
 
-    // Add checksum, flush what remains to be sent
-    len += TF_ComposeTail(tf->sendbuf+len, &cksum);
     TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
-
     TF_ReleaseTx(tf);
 
     return true;

TinyFrame.h

@@ -3,14 +3,14 @@
 
 /**
  * TinyFrame protocol library
- * 
+ *
- * (c) Ondřej Hruška 2017, MIT License 
+ * (c) Ondřej Hruška 2017, MIT License
  * no liability/warranty, free for any use, must retain this notice & license
- * 
+ *
  * Upstream URL: https://github.com/MightyPork/TinyFrame
  */
 
-#define TF_VERSION "2.0.1"
+#define TF_VERSION "2.0.3"
 
 //---------------------------------------------------------------------------
 #include <stdint.h>  // for uint8_t etc