adding uhf_dissector

Dissector/eps_dissector.lua

@@ -1,3 +1,9 @@
+
+
+-- frame formate is not clearly give ,code needs some changes
+
+
+
 -- Define the dissector function
 function dissect_power_system_data(buffer, pinfo, tree,HM_TM_dissector, offset, len,data3)
 

Dissector/hm_dissector.lua

@@ -1,6 +1,6 @@
 
 
-function HM_TC_dissector(buffer, pinfo, subtree, TC_TM_PROTOCOL, offset)
+function HM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
 
   local f_sub_mod_id = ProtoField.uint8("TC_TM_PROTOCOL.sub_mod_id", "SUB MODULE ID", base.DEC)
 local f_Queue_id = ProtoField.uint8("TC_TM_PROTOCOL.Queue_id", "QUEUE ID", base.DEC)
@@ -11,34 +11,34 @@ local f_opt_sel_sin_mul_que = ProtoField.uint8("TC_TM_PROTOCOL.opt_sel_sin_mul_q
 TC_TM_PROTOCOL.fields = { f_sub_mod_id, f_Queue_id, f_priority, f_opt_sel_sin_mul_que }
 
     --local info_display
-    subtree1 = subtree:add(TC_TM_PROTOCOL, buffer(), "HEALTH_METRIC_DATA")
+  local subtree = tree:add(TC_TM_PROTOCOL, buffer(), "HEALTH_METRIC_DATA")
   
      --dissect submodule_id
      local data1 = buffer(offset,1):le_uint()
-     subtree1:add(f_sub_mod_id , data1)
+     subtree:add(f_sub_mod_id , data1)
      offset = offset + 1
      
      --dissect queue_id
      local data2 = buffer(offset,1):le_uint()
-     subtree1:add(f_Queue_id, data2)
+     subtree:add(f_Queue_id, data2)
      offset = offset + 1
      
      --dissect f_priority
      local data3 = buffer(offset,1):le_uint()
-     subtree1:add(f_priority, data3)
+     subtree:add(f_priority, data3)
       offset = offset + 1     
      --dissect option to select_single or multiple queue
      local data4 = buffer(offset,1):le_uint()
-     subtree1:add(f_opt_sel_sin_mul_que, data4)
+     subtree:add(f_opt_sel_sin_mul_que, data4)
      
      --info_display= {data1} --- for info display in wireshark
      --pinfo.cols.info ="sub_mod_id" ..info_display[1]
   
     return data1     
 end 
+--------------------------------------------------------------------------------------------------------------------------------
 
-
-function HM_TM_dissector(buffer, pinfo, subtree, TC_TM_PROTOCOL, offset, len)
+function HM_TM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset, len)
 
 local f_sub_mod_id = ProtoField.uint8("TC_TM_PROTOCOL.sub_mod_id", "SUB MODULE ID", base.DEC)
 local f_Queue_id = ProtoField.uint8("TC_TM_PROTOCOL.Queue_id", "QUEUE ID", base.DEC)
@@ -48,45 +48,38 @@ local f_Health_Data = ProtoField.uint8("TC_TM_PROTOCOL.Health_Data", "Health Dat
 -- Add the fields to the protocol
 TC_TM_PROTOCOL.fields = { f_sub_mod_id, f_Queue_id, f_num_of_instance, f_Health_Data }
 
-local len1 = 0
+
    --local info_display
-   local subtree1 = subtree:add(TC_TM_PROTOCOL, buffer(), "HEALTH_METRIC_DATA")
+  local subtree = tree:add(TC_TM_PROTOCOL, buffer(), "HEALTH_METRIC_DATA")
   
      --dissect submodule_id
      local data1 = buffer(offset,1):le_uint()
-     subtree1:add(f_sub_mod_id , data1)
+     subtree:add(f_sub_mod_id , data1)
      offset = offset + 1
      
      --dissect queue_id
      local data2 = buffer(offset,1):le_uint()
-     subtree1:add(f_Queue_id, data2)
+     subtree:add(f_Queue_id, data2)
      offset = offset + 1
      
      --dissect f_num_of_instance
      local data3 = buffer(offset,2):le_uint()
-     subtree1:add(f_num_of_instance, data3)
-      offset = offset + 2  
+     subtree:add(f_num_of_instance, data3)
+      offset = offset + 2    
       
+	local array1
      --dissect Health_Data
-     len =len - 3
-     if data1 == 5 then
-       require("obc_dissector")
-       
-        --for i=0, data3-1 do
-        
-         obc_dissector(buffer, pinfo, subtree1, TC_TM_PROTOCOL, offset, data3)
-     
-     else
-       
-         for i=0, len-1 do
-         local data4 = buffer(offset,1):le_uint()
-         subtree1:add(f_Health_Data, data4)
-         offset = offset + 1
-         end
+    if data1 == 0  then
+        require("eps_dissector")
+      dissect_power_system_data(buffer, pinfo, tree, TC_TM_PROTOCOL, offset, tm_len,data3)
      end
-       
-     
-     local array = {data1, data2, data3}
+
+     if data1 == 3  then
+        require("uhf_dissector")
+      UHF_DISSECTOR(buffer, pinfo, tree, TC_TM_PROTOCOL, offset, tm_len,data3)
+     end
+
+     local array = {data1, data2, data3,array1}
      
      return array
 

Dissector/tc_tm_protocols.lua

@@ -14,7 +14,7 @@ local f_da_id = ProtoField.uint16("TC_TM_PROTOCOL.da_id", "DA Id", base.DEC)
 local f_rm_id = ProtoField.uint8("TC_TM_PROTOCOL.rm_id", "RM Id", base.DEC)
 local f_tm_id = ProtoField.uint16("TC_TM_PROTOCOL.tm_id", "TM Id", base.DEC)
 local f_co_id = ProtoField.uint16("TC_TM_PROTOCOL.co_id", "Co Id", base.DEC)
-local f_tm_len = ProtoField.uint16("TC_TM_PROTOCOL.tm_len", "TM Len", base.DEC)
+local f_tm_len = ProtoField.uint16("TC_TM_PROTOCOL.tm_len", "TM Len", base.HEX)
 local f_tm_data = ProtoField.uint8("TC_TM_PROTOCOL.tm_data", "TM Data", base.DEC)
 local f_ext_header_len = ProtoField.uint8("TC_TM_PROTOCOL.ext_header_len", "Ext Header Len", base.DEC)
 local f_ext_header_data = ProtoField.uint8("TC_TM_PROTOCOL.ext_header_data", "Ext Header Data", base.DEC)
@@ -234,7 +234,7 @@ end
               
                  require("hm_dissector")
 
-                data = HM_TC_dissector(buffer, pinfo, subtree, TC_TM_PROTOCOL, offset)
+                data = HM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
                 offset = offset + tc_len   
               else
 	              for i=0,tc_len - 1 do
@@ -291,17 +291,19 @@ end
     [27] = function() return "OBC" end
     }
     string = (switch[data] or function() return "All Module" end)()
-    
-    end
+    info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tc_id, string} --- for info display in wireshark
+    pinfo.cols.info ="seq_no = " ..info_display[1] .." TS = " ..info_display[2].." TC_ID = "..info_display[3].." Module = " ..info_display[4] -- for info display in wireshark
+   
+    else
   
   
               
     
-    info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tc_id, string} --- for info display in wireshark
+    info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tc_id} --- for info display in wireshark
 
     
-    pinfo.cols.info ="seq_no = " ..info_display[1] ..", TS = " ..info_display[2]..", TC_ID = "..info_display[3]..", Module = " ..info_display[4] -- for info display in wireshark
-
+    pinfo.cols.info ="seq_no = " ..info_display[1] .." TS = " ..info_display[2].." TC_ID = "..info_display[3] -- for info display in wireshark
+    end
 end
 
 -----------------------------------------------------------------------------------------------------------------------------------
@@ -431,7 +433,7 @@ function TM_dissector(buffer, pinfo, tree)  -- OBC to GS
       if tm_id == 621  then
       
         require("hm_dissector")
-        array = HM_TM_dissector(buffer, pinfo, subtree, TC_TM_PROTOCOL, add, tm_len)
+        array = HM_TM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add, tm_len)
         add = add + tm_len
       
       else
@@ -473,24 +475,29 @@ function TM_dissector(buffer, pinfo, tree)  -- OBC to GS
     local string
     if tm_id == 621 then
     
-    local switch = {
-    [0] = function() return "EPS" end, 
-    [1] = function() return "ADCS" end,
-    [2] = function() return "COMMS SBAND CNTRL" end,
-    [3] = function() return "COMMS_UHF_CNTRL" end,
-    [4] = function() return "SENSOR" end,
-    [5] = function() return "OBC" end,
-    [6] = function() return "ERROR HANDLER" end
-    }
-    string = (switch[array[1]] or function() return "All Module" end)()
+    	local switch = {
+    	[0] = function() return "EPS" end, 
+    	[1] = function() return "ADCS" end,
+    	[2] = function() return "COMMS SBAND CNTRL" end,
+    	[3] = function() return "COMMS_UHF_CNTRL" end,
+    	[4] = function() return "SENSOR" end,
+    	[5] = function() return "OBC" end,
+    	[6] = function() return "ERROR HANDLER" end
+    	}
+    	string = (switch[array[1]] or function() return "All Module" end)()
+    
     
-    end
     
-    info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tm_id, string, array[2], array[3]} --- for info display in wireshark
+    	info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tm_id, string, array[2], array[3]} --- for info display in wireshark
 
 	 
-	pinfo.cols.info ="Seq_no = " ..info_display[1] ..", TS = " ..info_display[2]..", TM ID = "..info_display[3]..", Module = "..info_display[4]..", Queue id = "..info_display[5]..", Number of instance = "..info_display[6] -- for info display in wireshark
+	pinfo.cols.info ="Seq_no = " ..info_display[1] .." TS = " ..info_display[2].." TM ID = "..info_display[3].." Module = "..info_display[4].." Queue id = "..info_display[5].." Number of instance = "..info_display[6] -- for info display in wireshark
+    else
+        info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tm_id} --- for info display in wireshark
 
+	 
+	pinfo.cols.info ="Seq_no = " ..info_display[1] .." TS = " ..info_display[2].." TM ID = "..info_display[3] -- for info display in wireshark
+    end
     -- Check if the buffer contains enough data for the expected total length
    --if buffer:len() < 38 + buffer(21, 2):uint() then
      --   subtree:add_expert_info(PI_MALFORMED, PI_WARN, "Incomplete data")
@@ -525,7 +532,7 @@ end
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- Add a preference for the port number
-TC_TM_PROTOCOL.prefs.port = Pref.uint("UDP Port", 6767, "UDP port for TC_TM protocol")
+TC_TM_PROTOCOL.prefs.port = Pref.uint("UDP Port", 6779, "UDP port for TC_TM protocol")
 
 -- Register the dissector based on the preference
 function TC_TM_PROTOCOL.init()

Dissector/uhf_dissector.lua

@@ -0,0 +1,164 @@
+function UHF_DISSECTOR(buffer, pinfo, tree, HM_TM_dissector, offset, tm_len,data3)
+        -- UHF_DISSECTOR(buffer, pinfo, tree, TC_TM_PROTOCOL, offset, tm_len,data3)
+
+-- Define ProtoFields for each element of the structure (like in your original example)
+local f_cnt_hk_str = ProtoField.uint8("TC_TM_PROTOCOL.cnt_hk_str", "cnt_hk_str", base.DEC)
+local f_timestamp = ProtoField.uint32("TC_TM_PROTOCOL.timestamp", "timestamp", base.DEC)
+local f_uptime = ProtoField.uint32("TC_TM_PROTOCOL.uptime", "Uptime", base.DEC)
+local f_uarto_rx_count = ProtoField.uint32("TC_TM_PROTOCOL.uarto_rx_count", "UART0 RX Count", base.DEC)
+local f_uart1_rx_count = ProtoField.uint32("TC_TM_PROTOCOL.uart1_rx_count", "UART1 RX Count", base.DEC)
+local f_rx_mode = ProtoField.uint8("TC_TM_PROTOCOL.rx_mode", "RX Mode", base.DEC)
+local f_tx_mode = ProtoField.uint8("TC_TM_PROTOCOL.tx_mode", "TX Mode", base.DEC)
+local f_adc = ProtoField.uint16("TC_TM_PROTOCOL.adc", "ADC", base.DEC) -- array of int16_t[10]
+local f_last_rssi = ProtoField.uint8("TC_TM_PROTOCOL.last_rssi", "Last RSSI", base.DEC)
+local f_last_lqi = ProtoField.uint8("TC_TM_PROTOCOL.last_lqi", "Last LQI", base.DEC)
+local f_last_freqest = ProtoField.uint8("TC_TM_PROTOCOL.last_freqest", "Last Frequency Estimate", base.DEC)
+local f_pkt_sent = ProtoField.uint32("TC_TM_PROTOCOL.Pkt_sent", "Packets Sent", base.DEC)
+local f_cs_count = ProtoField.uint32("TC_TM_PROTOCOL.cs_count", "CS Count", base.DEC)
+local f_pkt_good = ProtoField.uint32("TC_TM_PROTOCOL.Pkt_good", "Packets Good", base.DEC)
+local f_pkt_rejected_checksum = ProtoField.uint32("TC_TM_PROTOCOL.Pkt_rejected_checksum", "Packets Rejected (Checksum)", base.DEC)
+local f_pkt_rejected_reserved = ProtoField.uint32("TC_TM_PROTOCOL.Pkt_rejected_reserved", "Packets Rejected (Reserved)", base.DEC)
+local f_pkt_rejected_other = ProtoField.uint32("TC_TM_PROTOCOL.Pkt_rejected_other", "Packets Rejected (Other)", base.DEC)
+local f_reserved0 = ProtoField.uint32("TC_TM_PROTOCOL.reserved0", "Reserved0", base.DEC)
+-- local f_reserved1 = ProtoField.uint32("TC_TM_PROTOCOL.reserved1", "Reserved1", base.DEC) -- Uncomment if needed
+local f_customo = ProtoField.uint32("TC_TM_PROTOCOL.customo", "Custom 0", base.DEC)
+local f_custom1 = ProtoField.uint32("TC_TM_PROTOCOL.custom1", "Custom 1", base.DEC)
+
+-- Add the fields to the protocol
+HM_TM_dissector.fields = {
+    f_timestamp,
+    f_cnt_hk_str,
+    f_uptime,
+    f_uarto_rx_count,
+    f_uart1_rx_count,
+    f_rx_mode,
+    f_tx_mode,
+    f_adc,
+    f_last_rssi,
+    f_last_lqi,
+    f_last_freqest,
+    f_pkt_sent,
+    f_cs_count,
+    f_pkt_good,
+    f_pkt_rejected_checksum,
+    f_pkt_rejected_reserved,
+    f_pkt_rejected_other,
+    f_reserved0,
+    -- f_reserved1, -- Uncomment if you want to include reserved1
+    f_customo,
+    f_custom1
+}
+
+-- For your dissection function (within a loop structure)
+for i=1, data3 do
+    --offset = offset + 8
+    local subtree = tree:add(TC_TM_PROTOCOL, buffer(), "UHF")
+	
+    local a = buffer(offset, 1):le_uint()
+    subtree:add(f_cnt_hk_str, a)
+    offset = offset + 1
+    
+    local b = buffer(offset, 4):le_uint()
+    subtree:add(f_timestamp, b)
+    offset = offset + 4
+    b = buffer(offset, 4):le_uint()
+    subtree:add(f_timestamp, b)
+    offset = offset + 4
+
+    -- dissect uptime
+    local uptime = buffer(offset, 4):le_uint()
+    subtree:add(f_uptime, uptime)
+    offset = offset + 4
+
+    -- dissect uarto_rx_count
+    local uarto_rx_count = buffer(offset, 4):le_uint()
+    subtree:add(f_uarto_rx_count, uarto_rx_count)
+    offset = offset + 4
+
+    -- dissect uart1_rx_count
+    local uart1_rx_count = buffer(offset, 4):le_uint()
+    subtree:add(f_uart1_rx_count, uart1_rx_count)
+    offset = offset + 4
+
+    -- dissect rx_mode
+    local rx_mode = buffer(offset, 1):le_uint()
+    subtree:add(f_rx_mode, rx_mode)
+    offset = offset + 1
+
+    -- dissect tx_mode
+    local tx_mode = buffer(offset, 1):le_uint()
+    subtree:add(f_tx_mode, tx_mode)
+    offset = offset + 1
+
+    -- dissect adc (array of int16, loop through based on 10 elements)
+    for j = 1, 10 do
+        local adc_value = buffer(offset, 2):le_int()
+        subtree:add(f_adc, adc_value)
+        offset = offset + 2
+    end
+
+    -- dissect last_rssi
+    local last_rssi = buffer(offset, 1):le_int()
+    subtree:add(f_last_rssi, last_rssi)
+    offset = offset + 1
+
+    -- dissect last_lqi
+    local last_lqi = buffer(offset, 1):le_uint()
+    subtree:add(f_last_lqi, last_lqi)
+    offset = offset + 1
+
+    -- dissect last_freqest
+    local last_freqest = buffer(offset, 1):le_int()
+    subtree:add(f_last_freqest, last_freqest)
+    offset = offset + 1
+
+    -- dissect Pkt_sent
+    local pkt_sent = buffer(offset, 4):le_uint()
+    subtree:add(f_pkt_sent, pkt_sent)
+    offset = offset + 4
+
+    -- dissect cs_count
+    local cs_count = buffer(offset, 4):le_uint()
+    subtree:add(f_cs_count, cs_count)
+    offset = offset + 4
+
+    -- dissect Pkt_good
+    local pkt_good = buffer(offset, 4):le_uint()
+    subtree:add(f_pkt_good, pkt_good)
+    offset = offset + 4
+
+    -- dissect Pkt_rejected_checksum
+    local pkt_rejected_checksum = buffer(offset, 4):le_uint()
+    subtree:add(f_pkt_rejected_checksum, pkt_rejected_checksum)
+    offset = offset + 4
+
+    -- dissect Pkt_rejected_reserved
+    local pkt_rejected_reserved = buffer(offset, 4):le_uint()
+    subtree:add(f_pkt_rejected_reserved, pkt_rejected_reserved)
+    offset = offset + 4
+
+    -- dissect Pkt_rejected_other
+    local pkt_rejected_other = buffer(offset, 4):le_uint()
+    subtree:add(f_pkt_rejected_other, pkt_rejected_other)
+    offset = offset + 4
+
+    -- dissect reserved0
+    local reserved0 = buffer(offset, 4):le_uint()
+    subtree:add(f_reserved0, reserved0)
+    offset = offset + 4
+
+    -- dissect customo
+    --local customo = buffer(offset, 4):le_uint()
+    --subtree:add(f_customo, customo)
+    --offset = offset + 4
+
+    -- dissect custom1
+    --local custom1 = buffer(offset, 4):le_uint()
+    --subtree:add(f_custom1, custom1)
+    --offset = offset + 4
+
+    -- (continue for any other fields you want to dissect, e.g., reserved1 if needed)
+end
+
+
+end