[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r1101 - in /projects/zb4osgi/trunk: zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/ zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/api/impl/ zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/impl/

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Fri Nov 14 19:25:45 2014
New Revision: 1101

Log:
Reviewing code of ZigBeeDeviceImpl with respect to filtering out broadcast message ( refs #269 )
Cleaned up source code by removing commented code


Modified:
    projects/zb4osgi/trunk/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java
    projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/api/impl/ZigBeeDeviceImpl.java
    projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/impl/DriverEZ430_RF2480.java

Modified: projects/zb4osgi/trunk/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java	(original)
+++ projects/zb4osgi/trunk/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java	Fri Nov 14 19:25:45 2014
@@ -259,13 +259,7 @@
                     localCopy = new ArrayList<AFMessageListner>(listners);
                 }
                 for (AFMessageListner l : localCopy) {
-                    // if( l.match(
-                    // msg.getClusterId(), msg.getSrcAddr(),
-                    // msg.getSrcEndpoint(), msg.getDstEndpoint(),
-                    // msg.getTransId()
-                    // ) ) {
                     l.notify(msg);
-                    // }
                 }
             }
         }

Modified: projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/api/impl/ZigBeeDeviceImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/api/impl/ZigBeeDeviceImpl.java	(original)
+++ projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/api/impl/ZigBeeDeviceImpl.java	Fri Nov 14 19:25:45 2014
@@ -48,6 +48,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.itaca.ztool.api.ZToolAddress16;
 import com.itaca.ztool.api.af.AF_DATA_CONFIRM;
 import com.itaca.ztool.api.af.AF_DATA_REQUEST;
 import com.itaca.ztool.api.af.AF_INCOMING_MSG;
@@ -540,16 +541,18 @@
         	logger.debug("AF_INCOMING_MSG arrived but it is an error packet so IGNORING it");
             return;        	
         }
-        /*
-         *  //XXX BE AWARE:
-         *  The following two check must be in case that we find a cluster that answer by means of
-         *  broadcast or groupcast response to unicast request 
-         */
-        if ( ( msg.getSrcAddr() & 0xFFFF ) != node.getNetworkAddress()) {
+        
+        if ( ( msg.getSrcAddr() & 0xFFFF ) != node.getNetworkAddress() ) {
+        	/*
+        	 * The source address must always match the node.getNetworkAddress() regardless if the message is sent
+        	 * as unicast, groupcast, or broadcast. In fact, in case of broadcast and groupcast message, only the
+        	 * destination Network Address would not match the Network Address of the dongle
+        	 */
         	logger.debug("AF_INCOMING_MSG arrived but NETWORK ADDRESS does not match so IGNORING it: "
         			+ "recieved {} but expecting {} ", msg.getSrcAddr() & 0xFFFF, node.getNetworkAddress());
             return;
         }
+        
         if (msg.getSrcEndpoint() != endPointAddress) {
         	logger.debug("AF_INCOMING_MSG arrived ENDPOINT does not match so IGNORING it: "
         			+ "received {} but expecting {}", msg.getSrcEndpoint(), endPointAddress);

Modified: projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/impl/DriverEZ430_RF2480.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/impl/DriverEZ430_RF2480.java	(original)
+++ projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/impl/DriverEZ430_RF2480.java	Fri Nov 14 19:25:45 2014
@@ -182,13 +182,7 @@
                     localCopy = new ArrayList<AFMessageListner>(listners);
                 }
                 for ( AFMessageListner l : localCopy){
-                    //					if( l.match(
-                    //							msg.getClusterId(), msg.getSrcAddr(),
-                    //							msg.getSrcEndpoint(), msg.getDstEndpoint(),
-                    //							msg.getTransId()
-                    //					) ) {
                     l.notify(msg);
-                    //					}
                 }
             }
         }