EnvSim: correct bug in encodign/decoding of Pkt41

jokaICS · jokaICS · commit 9a0430bbd41a · 2015-12-01T12:44:47.000+01:00
diff --git a/test/EnvSim/tools/tcl/lib/packets.tcl b/test/EnvSim/tools/tcl/lib/packets.tcl
@@ -319,8 +319,8 @@ proc pkts::readP041 {data} {
     incr npos
     if {$m_leveltr==1} {
       dict append d "nid_ntc($i)" [lindex $data $npos]
-      incr npos
     }
+    incr npos
     dict append d "l_ackleveltr($i)" [lindex $data $npos]
     incr npos
   }
@@ -642,6 +642,8 @@ proc pkts::encodeP041 {values} {
     lappend pkt $m_leveltr
     if {$m_leveltr == 1} {
       lappend pkt [dict get $values nid_ntc($i)]
+    } else {
+      lappend pkt 0
     }
     lappend pkt [dict get $values l_ackleveltr($i)]
   }
diff --git a/test/EnvSim/track/mktesttrk.tcl b/test/EnvSim/track/mktesttrk.tcl
@@ -7,8 +7,7 @@ edit::addBG 5 1 900 0 {nid_packet 45 q_dir 1 nid_nm 2114079}
 edit::addBG 10 1 901 1 {nid_packet 42 q_dir 1 q_rbc 1 nid_c 426 nid_rbc 1 nid_radio 500 q_sleepsession 0}
 
 # BG 902 (conditional leveltrans + national values)
-#edit::addBG 15 1 902 1 {nid_packet 46 q_dir 1 n_iter 1 m_leveltr(0) 1 nid_ntc(0) 1 m_leveltr(1) 3} {
-edit::addBG 15 1 902 1 {
+edit::addBG 15 1 902 1 {nid_packet 46 q_dir 1 n_iter 1 m_leveltr(0) 1 nid_ntc(0) 1 m_leveltr(1) 3} {
   nid_packet     3
   q_dir          1
   q_scale        1
diff --git a/test/EnvSim/track/test.trk b/test/EnvSim/track/test.trk

Original file line number	Diff line number	Diff line change
`@@ -319,8 +319,8 @@ proc pkts::readP041 {data} {`
`319`	`319`	`incr npos`
`320`	`320`	`if {$m_leveltr==1} {`
`321`	`321`	`dict append d "nid_ntc($i)" [lindex $data $npos]`
`322`		`- incr npos`
`323`	`322`	`}`
	`323`	`+ incr npos`
`324`	`324`	`dict append d "l_ackleveltr($i)" [lindex $data $npos]`
`325`	`325`	`incr npos`
`326`	`326`	`}`
`@@ -642,6 +642,8 @@ proc pkts::encodeP041 {values} {`
`642`	`642`	`lappend pkt $m_leveltr`
`643`	`643`	`if {$m_leveltr == 1} {`
`644`	`644`	`lappend pkt [dict get $values nid_ntc($i)]`
	`645`	`+ } else {`
	`646`	`+ lappend pkt 0`
`645`	`647`	`}`
`646`	`648`	`lappend pkt [dict get $values l_ackleveltr($i)]`
`647`	`649`	`}`