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

[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-serv10912

Modified Files:
      Tag: GroupComm
	NeighborListM.nc 
Log Message:
Supports proxy agent.

Index: NeighborListM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery/NeighborListM.nc,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -C2 -d -r1.31.2.2 -r1.31.2.3
*** NeighborListM.nc	15 Nov 2006 09:40:13 -0000	1.31.2.2
--- NeighborListM.nc	21 Nov 2006 00:27:40 -0000	1.31.2.3
***************
*** 521,525 ****
        for (i = 0; i < numNbrs; i++)
        {
!         if(nbrs[i].hopsToGW < closest)
          {
            *addr = nbrs[i].addr;
--- 521,527 ----
        for (i = 0; i < numNbrs; i++)
        {
!         AgillaLocation nbrLoc;
!         call LocationMgrI.getLocation(nbrs[i].addr, &nbrLoc);
!         if(!call LocationUtilI.isProxy(&nbrLoc) && nbrs[i].hopsToGW < closest)  // proxies may never be gateways
          {
            *addr = nbrs[i].addr;