From: rtrimana Date: Thu, 22 Feb 2018 17:20:49 +0000 (-0800) Subject: Adjusting setup files to the most up-to-date. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7de6013839a457b5735d7961b994cce0976747f3;p=lede.git Adjusting setup files to the most up-to-date. --- diff --git a/sentinel_setup/config/dhcp b/sentinel_setup/config/dhcp index 83cab8c3f1..687a8f71cf 100644 --- a/sentinel_setup/config/dhcp +++ b/sentinel_setup/config/dhcp @@ -19,8 +19,8 @@ config dnsmasq config dhcp 'wifi' option interface 'wifi' - option start '100' - option limit '150' + option start '2' + option limit '254' option leasetime '48h' #option dhcpv6 'server' #option ra 'server' @@ -56,13 +56,23 @@ config host # Amcrest Camera 1 #config host -# option ip '192.168.1.235' -# option mac '3c:ef:8c:7f:c0:19' + option ip '192.168.1.133' + option mac '3c:ef:8c:7f:c0:19' # Amcrest Camera 2 #config host -# option ip '192.168.1.241' -# option mac '3c:ef:8c:6f:79:5a' + option ip '192.168.1.134' + option mac '3c:ef:8c:6f:79:5a' + +# Amcrest Camera 3 +config host + option ip '192.168.1.91' + option mac '9c:8e:cd:0f:e9:d8' + +# Amcrest Camera 4 +config host + option ip '192.168.1.83' + option mac '9c:8e:cd:0f:f1:60' # iHome Speaker 1 config host @@ -74,10 +84,10 @@ config host option ip '192.168.1.234' option mac 'c8:d5:fe:e6:a2:d8' -# ESP board -config host - option ip '192.168.1.222' - option mac '18:fe:34:db:59:72' +# Blossom Sprinkler +config host + option ip '192.168.1.129' + option mac '28:c2:dd:47:17:b6' # Lifx light bulb 1 config host @@ -89,8 +99,8 @@ config host option ip '192.168.1.232' option mac 'd0:73:d5:02:41:da' -# WeMo -config host - option ip '192.168.1.145' - option mac '94:10:3e:36:60:09' +# Dlink alarm +config host + option ip '192.168.1.4' + option mac 'c4:12:f5:de:38:20' diff --git a/sentinel_setup/config/hostapd-psk b/sentinel_setup/config/hostapd-psk index 18a3b9d94c..2acc9c4db6 100644 --- a/sentinel_setup/config/hostapd-psk +++ b/sentinel_setup/config/hostapd-psk @@ -4,9 +4,13 @@ 64:bc:0c:43:3f:40 1qaz2wsx3edcPhone 3c:ef:8c:7f:c0:19 1qaz2wsx3edcCam1 3c:ef:8c:6f:79:5a 1qaz2wsx3edcCam2 +9c:8e:cd:0f:e9:d8 1qaz2wsx3edcCam3 +9c:8e:cd:0f:f1:60 1qaz2wsx3edcCam4 c8:d5:fe:e6:ad:96 1qaz2wsx3edcSpk1 c8:d5:fe:e6:a2:d8 1qaz2wsx3edcSpk2 +28:c2:dd:47:17:b6 1qaz2wsx3edcBlsm 18:fe:34:db:59:72 1qaz2wsx3edcEsp d0:73:d5:12:8e:30 1qaz2wsx3edcLight1 d0:73:d5:02:41:da 1qaz2wsx3edcLight2 94:10:3e:36:60:09 1qaz2wsx3edc +c4:12:f5:de:38:20 1qaz2wsx3edcAlarm diff --git a/sentinel_setup/config/network b/sentinel_setup/config/network index 3ed1b20858..3da312e63f 100644 --- a/sentinel_setup/config/network +++ b/sentinel_setup/config/network @@ -11,7 +11,7 @@ config globals 'globals' config interface 'lan' option ifname 'eth0' option proto 'static' - option ipaddr '128.195.204.115' + option ipaddr '128.195.204.94' option netmask '255.255.254.0' option gateway '128.195.204.1' option dns '128.200.192.202 128.200.1.201' diff --git a/sentinel_setup/setup/startup.sh b/sentinel_setup/setup/startup.sh index 82ef2eb3cf..e9a41d1ff1 100755 --- a/sentinel_setup/setup/startup.sh +++ b/sentinel_setup/setup/startup.sh @@ -3,23 +3,18 @@ # Do IP mangling for checksum error issue after disable_dgaf=1 iptables -A POSTROUTING -t mangle -p udp --dport 68 -j CHECKSUM --checksum-fill -# Do block ARP from ESP8266 to itself to avoid DHCPDECLINE -arptables -A INPUT -j DROP --source-mac 18:fe:34:db:59:72 --destination-mac 18:fe:34:db:59:72 -arptables -A OUTPUT -j DROP --source-mac 18:fe:34:db:59:72 --destination-mac 18:fe:34:db:59:72 -arptables -A FORWARD -j DROP --source-mac 18:fe:34:db:59:72 --destination-mac 18:fe:34:db:59:72 - # block everything except ssh, icmp, http, and dhcp # Configure NAT iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE # Protocol ICMP iptables -A FORWARD -j ACCEPT -p icmp; -iptables -A INPUT -j ACCEPT -s 192.168.1.198 -d 192.168.1.1 -p icmp; -iptables -A INPUT -j ACCEPT -s 192.168.1.1 -d 192.168.1.198 -p icmp; -iptables -A OUTPUT -j ACCEPT -s 192.168.1.198 -d 192.168.1.1 -p icmp; -iptables -A OUTPUT -j ACCEPT -s 192.168.1.1 -d 192.168.1.198 -p icmp; +iptables -A INPUT -j ACCEPT -p icmp; +iptables -A OUTPUT -j ACCEPT -p icmp; # SSH port 22 +# Note: 192.168.1.198 is the address of the master Raspberry Pi. +# So, please adjust it to your own setup if needed. #iptables -A INPUT -j ACCEPT -s 192.168.1.198 -d 192.168.1.1 -p tcp --dport ssh; #iptables -A INPUT -j ACCEPT -s 192.168.1.198 -d 192.168.1.1 -p tcp --sport ssh; #iptables -A INPUT -j ACCEPT -s 192.168.1.1 -d 192.168.1.198 -p tcp --dport ssh;