From: scipio <scipio>
Date: Thu, 5 Feb 2009 22:45:41 +0000 (+0000)
Subject: Acks should still work if a node sets its AM address.
X-Git-Tag: rc_6_tinyos_2_1_1~502
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=b33b490271a59663a9363e47ef64f3ba0d39390f;hp=a502f8b43dfae5ebbc7a3f2b3f72cd71152beef0;p=tinyos-2.x.git

Acks should still work if a node sets its AM address.
---

diff --git a/tos/lib/tossim/CpmModelC.nc b/tos/lib/tossim/CpmModelC.nc
index 167b6a85..f28895ef 100644
--- a/tos/lib/tossim/CpmModelC.nc
+++ b/tos/lib/tossim/CpmModelC.nc
@@ -426,7 +426,7 @@ implementation {
 
     while (neighborEntry != NULL) {
       int other = neighborEntry->mote;
-      sim_gain_put(other, msg, endTime, ack && (other == dest), power + sim_gain_value(sim_node(), other), reversePower + sim_gain_value(other, sim_node()));
+      sim_gain_put(other, msg, endTime, ack, power + sim_gain_value(sim_node(), other), reversePower + sim_gain_value(other, sim_node()));
       neighborEntry = sim_gain_next(neighborEntry);
     }
   }