From: rtrimana Date: Wed, 29 Nov 2017 21:22:29 +0000 (-0800) Subject: Integrating D-Link alarm into Home Security benchmark X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7795a76d57478a23ee40dd8717b005e18891ca1;p=iot2.git Integrating D-Link alarm into Home Security benchmark --- diff --git a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java index 3b7cf53..09c0527 100644 --- a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java +++ b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java @@ -43,7 +43,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt private static final int MOTION_TIME_THRESHOLD = 60; // in seconds private static final int CAMERA_FPS = 15; private static final int CHECK_TIME_WAIT = 1; // in seconds - private static final int SECOND_TO_TURN_ON = 60; // in seconds + private static final int SECOND_TO_TURN_ON = -1; // in seconds private static final int SECOND_TO_TURN_OFF = 1; // in seconds private static final int LOCK_DOOR = 0; private static final int UNLOCK_DOOR = 1; @@ -477,7 +477,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt // Get and init the alarm (this single alarm set can serve multiple zones / rooms) Iterator alarmIt = alarmSet.iterator(); AlarmSmart alm = (AlarmSmart) alarmIt.next(); - alm.setZone(zoneId, true, SECOND_TO_TURN_OFF); + alm.setZone(zoneId, true, SECOND_TO_TURN_ON); updateIoTCloud("alarm", ACTIVE); } @@ -492,7 +492,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt Iterator alarmIt = alarmSet.iterator(); AlarmSmart alm = (AlarmSmart) alarmIt.next(); // Turn this alarm off indefinitely - alm.setZone(zoneId, false, SECOND_TO_TURN_ON); + alm.setZone(zoneId, false, SECOND_TO_TURN_OFF); updateIoTCloud("alarm", NOT_ACTIVE); } diff --git a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java index 6b0ee18..e19b375 100644 --- a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java +++ b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java @@ -454,27 +454,6 @@ public class DlinkAlarm implements Alarm { // Return time since January 1, 1970 00:00:00 UTC in seconds return System.currentTimeMillis()/1000; } - - /*public static void main(String[] args) throws Exception { - - String ipAddress = "192.168.1.183"; - String devicePin = "215530"; - IoTDeviceAddress iotAddress = new IoTDeviceAddress(ipAddress, 12345, 80, false, false); - Set setAddress = new HashSet(); - setAddress.add(iotAddress); - IoTSet iotSetAddress = new IoTSet(setAddress); - - DlinkAlarm alarm = new DlinkAlarm(iotSetAddress, devicePin); - alarm.init(); - // Set alarm - alarm.setZone(0, true, -1); - // Set alarm - alarm.setZone(0, false, 0); - // Set alarm - alarm.setZone(0, true, -1); - // Set alarm - alarm.setZone(0, false, 0); - }*/ } diff --git a/iotjava/iotruntime/master/IoTMaster.java b/iotjava/iotruntime/master/IoTMaster.java index 7dc41d7..3ce672d 100644 --- a/iotjava/iotruntime/master/IoTMaster.java +++ b/iotjava/iotruntime/master/IoTMaster.java @@ -740,7 +740,7 @@ public final class IoTMaster { routerConfig.configureHostHTTPPolicies(strIoTSlaveObjectHostAdd, strIoTSlaveObjectHostAdd, strDeviceAddress); // Configure MAC policies if (STR_ACTIVATE_SANDBOXING.equals("Yes")) - processJailConfig.configureProcessJailGWDevicePolicies(strIoTSlaveObjectHostAdd, STR_ROUTER_ADD, INT_DNS_PORT); + processJailConfig.configureProcessJailGWDevicePolicies(strIoTSlaveObjectHostAdd, STR_ROUTER_ADD, strDeviceAddress, INT_DNS_PORT); } else { // Other port numbers... commHan.addDevicePort(iDestDeviceDriverPort); diff --git a/iotjava/iotruntime/master/ProcessJailConfig.java b/iotjava/iotruntime/master/ProcessJailConfig.java index 757313a..e19ee15 100644 --- a/iotjava/iotruntime/master/ProcessJailConfig.java +++ b/iotjava/iotruntime/master/ProcessJailConfig.java @@ -46,6 +46,9 @@ public final class ProcessJailConfig { private static final String STR_DEV_IP_ADDRESS = ""; private static final String STR_DEV_COM_PORT = ""; private static final String STR_DEV_PORT = ""; + + private static final int INT_HTTP_PORT = 80; + private static final int INT_DNS_PORT = 53; /** @@ -326,12 +329,13 @@ public final class ProcessJailConfig { * @param iPort Integer port * @return void */ - public void configureProcessJailGWDevicePolicies(String strConfigHost, String strRouterAddress, int iPort) { + public void configureProcessJailGWDevicePolicies(String strConfigHost, String strRouterAddress, String strDeviceIPAddress, int iPort) { PrintWriter pwConfig = getPrintWriter(strConfigHost); pwConfig.println("file read /home/iotuser/iot2/iotjava/iotruntime/\\*.jks"); pwConfig.println("file read /etc/resolv.conf"); pwConfig.println("file read /etc/hosts"); + pwConfig.println("network inet stream connect ::ffff:" + strDeviceIPAddress + " " + String.valueOf(INT_HTTP_PORT)); // HTTP access for this address pwConfig.println("network inet dgram send " + strRouterAddress + " " + String.valueOf(iPort)); } @@ -351,8 +355,8 @@ public final class ProcessJailConfig { pwConfig.println("file read /etc/resolv.conf"); pwConfig.println("file read /etc/hosts"); pwConfig.println("file read /etc/host.conf"); - pwConfig.println("network inet dgram send " + strRouterAddress + " " + String.valueOf(53)); // TCP/UDP access through router - pwConfig.println("network inet stream connect ::ffff:" + strAddress + " " + String.valueOf(80)); // HTTP access for this address + pwConfig.println("network inet dgram send " + strRouterAddress + " " + String.valueOf(INT_DNS_PORT)); // TCP/UDP access through router + pwConfig.println("network inet stream connect ::ffff:" + strAddress + " " + String.valueOf(INT_HTTP_PORT)); // HTTP access for this address } diff --git a/localconfig/mysql/alarmSet.config b/localconfig/mysql/alarmSet.config index 40e745a..c1d125a 100644 --- a/localconfig/mysql/alarmSet.config +++ b/localconfig/mysql/alarmSet.config @@ -1,3 +1,5 @@ SELECT * FROM AlarmSmart +WHERE +ID='AL2' ; diff --git a/localconfig/mysql/alm_Addresses.config b/localconfig/mysql/alm_Addresses.config index 2564492..8ab9893 100644 --- a/localconfig/mysql/alm_Addresses.config +++ b/localconfig/mysql/alm_Addresses.config @@ -1,5 +1,5 @@ SELECT * FROM IoTDeviceAddress WHERE -TYPE='EspAlarmAdd' +TYPE='DlinkAlarmAdd' ; diff --git a/localconfig/mysql/camSet.config b/localconfig/mysql/camSet.config index 083ca82..9b21ecd 100644 --- a/localconfig/mysql/camSet.config +++ b/localconfig/mysql/camSet.config @@ -1,3 +1,5 @@ SELECT * FROM CameraSmart +WHERE +ID='CM4' ; diff --git a/localconfig/mysql/cameraSet.config b/localconfig/mysql/cameraSet.config index a061abc..4233b23 100644 --- a/localconfig/mysql/cameraSet.config +++ b/localconfig/mysql/cameraSet.config @@ -1,5 +1,5 @@ SELECT * FROM CameraSmart WHERE -ID='CM1' +ID='CM3' ; diff --git a/others/Mysql/IoTMain.gz b/others/Mysql/IoTMain.gz index 5f0d373..123e17b 100644 Binary files a/others/Mysql/IoTMain.gz and b/others/Mysql/IoTMain.gz differ