[2.101417.143] 10/14/17 at 05:44 PM | by DashBot

Author: bradennapier

cluster/utils/packet.tcl

@@ -26,78 +26,97 @@ proc ::cluster::packet::encode { payload } {
   return $encoded
 }
 
-# validate a given field once it is parsed.  allows us to cancel
-# decoding a packet if needed.
-proc ::cluster::packet::validate {field} {
+proc ::cluster::packet::decode { packet {cluster {}} } {
 
-}
+  set decoded [io decode $packet \
+    -validate [::apply {
+      {cluster field} {
+        # break        - stop parsing, return packet as is
+        # continue     - do not include field
+        # return false - stop parsing, return empty packet
+        # error        - throw given error
+        # else         - add field to packet by name and id
+        # notes:
+        #   - modify field with   upvar field   if needed
+        #   - modify results with upvar results if needed
+        switch -- [dict get $field id] {
+          14 {
+            # check the filter and only continue if we match
+            if {$cluster ne {} && ! [$cluster check_filter $data]} {
+              return false
+            }
+          }
+        }
+      }
+    } $cluster]
+  ]
 
-proc ::cluster::packet::decode { packet {cluster {}} } {
-  set decoded [io decode $packet -while ::cluster::bpacket::validate]
 
-  # try {
-  #   # ~! "Decode Packet" "Decoding a Packet [string bytelength $packet]"
-  #   set reader  [::bpacket::reader new $packet]
-  #   set result  [dict create]
-  #   set results [list]
-  #   set active 1
-  #   while {$active} {
-  #     lassign [$reader next] active id type data
-  #     switch -- $active {
-  #       0 {
-  #         # We are done parsing the packet!
-  #         lappend results $result
-  #         break
-  #       }
-  #       1 {
-  #           # We have more to parse!
-  #           switch -- $id {
-  #           1  {
-  #             lassign $data type channel
-  #             dict set result type $type
-  #             dict set result channel $channel
-  #           }
-  #           2  { dict set result hid $data }
-  #           3  { dict set result sid $data }
-  #           4  { dict set result flags $data }
-  #           5  { dict set result timestamp $data }
-  #           6  { dict set result protocols $data }
-  #           7  { dict set result ruid $data }
-  #           8  { dict set result op $data }
-  #           9  { dict set result data $data }
-  #           10 { dict set result raw $data }
-  #           11 { dict set result tags $data }
-  #           12 { dict set result keepalive $data }
-  #           13 {
-  #             # When we receive a filter we will immediately try to check with the
-  #             # cluster if our service matches and quit decoding immediately if we
-  #             # dont.
-  #             if { $cluster ne {} && ! [$cluster check_filter $data] } {
-  #               break
-  #             }
-  #             dict set result filter $data
-  #           }
-  #           14 {
-  #             dict set result error $data
-  #           }
-  #         }
-  #       }
-  #       2 {
-  #         # We are done with a packet -- but another might still be
-  #         # available!
-  #         lappend results $result
-  #         set result [dict create]
-  #       }
-  #     }
-  #   }
-  #   $reader destroy
-  # } on error {result options} {
-  #   puts stderr "Malformed Packet! $result"
-  #   catch { ::onError $result $options "Malformed Packet!" }
-  #   catch { $reader destroy }
-  # }
-  # if { $active } {
-  #   set result {}
-  # }
-  return $results
+  return $decoded
 }
+
+# TODO: trash this once we confirm the above rewrite is working
+# try {
+#   # ~! "Decode Packet" "Decoding a Packet [string bytelength $packet]"
+#   set reader  [::bpacket::reader new $packet]
+#   set result  [dict create]
+#   set results [list]
+#   set active 1
+#   while {$active} {
+#     lassign [$reader next] active id type data
+#     switch -- $active {
+#       0 {
+#         # We are done parsing the packet!
+#         lappend results $result
+#         break
+#       }
+#       1 {
+#           # We have more to parse!
+#           switch -- $id {
+#           1  {
+#             lassign $data type channel
+#             dict set result type $type
+#             dict set result channel $channel
+#           }
+#           2  { dict set result hid $data }
+#           3  { dict set result sid $data }
+#           4  { dict set result flags $data }
+#           5  { dict set result timestamp $data }
+#           6  { dict set result protocols $data }
+#           7  { dict set result ruid $data }
+#           8  { dict set result op $data }
+#           9  { dict set result data $data }
+#           10 { dict set result raw $data }
+#           11 { dict set result tags $data }
+#           12 { dict set result keepalive $data }
+#           13 {
+#             # When we receive a filter we will immediately try to check with the
+#             # cluster if our service matches and quit decoding immediately if we
+#             # dont.
+#             if { $cluster ne {} && ! [$cluster check_filter $data] } {
+#               break
+#             }
+#             dict set result filter $data
+#           }
+#           14 {
+#             dict set result error $data
+#           }
+#         }
+#       }
+#       2 {
+#         # We are done with a packet -- but another might still be
+#         # available!
+#         lappend results $result
+#         set result [dict create]
+#       }
+#     }
+#   }
+#   $reader destroy
+# } on error {result options} {
+#   puts stderr "Malformed Packet! $result"
+#   catch { ::onError $result $options "Malformed Packet!" }
+#   catch { $reader destroy }
+# }
+# if { $active } {
+#   set result {}
+# }