[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery NeighborListM.nc, 1.31.2.1, 1.31.2.2

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22015

Modified Files:
      Tag: GroupComm
	NeighborListM.nc 
Log Message:
Debugged, got basic test to work.

Index: NeighborListM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery/NeighborListM.nc,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -C2 -d -r1.31.2.1 -r1.31.2.2
*** NeighborListM.nc	15 Nov 2006 04:29:34 -0000	1.31.2.1
--- NeighborListM.nc	15 Nov 2006 09:40:13 -0000	1.31.2.2
***************
*** 231,235 ****
      if (myBeacon != NULL)
      {
!       if (call LocationMgrI.isProxy()) {
          AgillaBeaconMsg* bmsg = (AgillaBeaconMsg *)myBeacon->data;
          uint16_t nbrToGW;
--- 231,235 ----
      if (myBeacon != NULL)
      {
!       if (!call LocationMgrI.isProxy()) {
          AgillaBeaconMsg* bmsg = (AgillaBeaconMsg *)myBeacon->data;
          uint16_t nbrToGW;
***************
*** 374,377 ****
--- 374,378 ----
      AgillaBeaconMsg* bmsg = (AgillaBeaconMsg *)m->data;
      
+     
      #if DEBUG_NEIGHBORLIST
        dbg(DBG_USR1, "NeighborListM: processBeacon(): ID = %i, hopsToGW = %i\n", bmsg->id, bmsg->hopsToGW);
***************
*** 380,384 ****
      #if ENABLE_NEIGHBOR_LIST_FILTER
        // Reject beacons if it comes from a node that is not a grid neighbor.
!       if (!isGridNbr(bmsg->id))
        {
          #if DEBUG_NEIGHBORLIST
--- 381,385 ----
      #if ENABLE_NEIGHBOR_LIST_FILTER
        // Reject beacons if it comes from a node that is not a grid neighbor.
!       if ((call LocationMgrI.isProxy() && bmsg->id != call AddressMgrI.getVID()) || !isGridNbr(bmsg->id))
        {
          #if DEBUG_NEIGHBORLIST