DESERT Release 3.3.2

signetlabdei · May 9, 2023 · 57a14fe · 57a14fe
1 parent 31b7e05
commit 57a14fe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+3.3.2 - 2023-05-09
+	* Fixes on uw-csma-aloha
 3.3.1 - 2023-03-30
 	* Fixes on MAC protocols (uw-aloha and uw-csma-aloha)
 	* Fixes on AHOI SIR csv DB

diff --git a/DESERT_Framework/DESERT/data_link/uw-csma-aloha/uw-csma-aloha.cpp b/DESERT_Framework/DESERT/data_link/uw-csma-aloha/uw-csma-aloha.cpp
@@ -514,6 +514,13 @@ CsmaAloha::Phy2MacEndTx(const Packet *p)
 						 << status_info[CSMA_STATE_IDLE] << endl;
 
 				stateIdle();
+			} else if (prev_prev_state == CSMA_STATE_RX_WAIT_ACK) {
+				if (debug_)
+					cout << NOW << "  CsmaAloha(" << addr
+						<< ")::Phy2MacEndTx() ack sent, from "
+						<< status_info[curr_state] << " to "
+						<< status_info[CSMA_STATE_IDLE] << endl;
+				stateCheckAckExpired();
 			} else {
 
 				cout << NOW << "  CsmaAloha(" << addr

diff --git a/DESERT_Framework/DESERT/samples/desert_with_woss_samples/test_desert_woss_dbs.tcl b/DESERT_Framework/DESERT/samples/desert_with_woss_samples/test_desert_woss_dbs.tcl
@@ -135,7 +135,7 @@ set opt(nn_in_row)      2       ;# Number of a nodes in m
 set opt(ack_mode)       "setNoAckMode"
 set opt(rngstream)    1
 set opt(cbr_period) 100
-set opt(db_path)   "/home/federico/work/uwsignet/dbs/"
+set opt(db_path)   "/usr/share/woss/dbs/"
 
 
 if {$opt(bash_parameters)} {