lifx_dash 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71e8096ab107491a5769ef20a0e57919caca9ee8
-  data.tar.gz: beda3fc02671cae6908888d9bd81ce7bd455c35a
+  metadata.gz: 9c90fc97d3bb2f4215218815b7697a8315026a03
+  data.tar.gz: 71bdddb56b295d00a7757be236caed3cc95a93d3
 SHA512:
-  metadata.gz: 447623c5a5ee31fabf5a4ec727a721173617b3e31e5dd8675400258feeb390cf391c4d824f5ebb99bb36e0b49fdb12da6cca47fbe00c33c4cda553fdf4bb32ca
-  data.tar.gz: 412c16946e1810679813ab21a50ee4286a82c480020cf1883dd077333b272870975b16bb14fcdca8783d2d1581961ec977e8d4be95232a90e4b8418c1c8198a0
+  metadata.gz: ccf8e41e3db5e3bcf6a0e7f8e2449f0139f3de606a3260b066b49aa0cb44c5b0e2d3beaf41e5df839992d18f5bb535405bcd02480039e7c72ed66438cae03837
+  data.tar.gz: 1b0f089fcdabd020fbd60503bdff78b8651220555e056c426a55877aba86a033b68da10301a2d232f057fb4d4e39f90f7b5f2f4888f2cb41d85ed4eec216cac9

data/README.md

@@ -152,10 +152,10 @@ take a moment and check it hasn't already been raised (and possibly closed).
 
 This gem uses the [PacketFu](https://rubygems.org/gems/packetfu) gem (and
 [libpcap](https://sourceforge.net/projects/libpcap/) under the hood) to monitor
-data packets on your network. This packet stream filters
-[ARP](https://en.wikipedia.org/wiki/Address_Resolution_Protocol) packets and
-DHCP packets (sent from 0.0.0.0). Older buttons use the ARP method, while newer
-buttons issue DHCP packets.
+data packets on your network. This packet stream filters for
+[DHCP](https://wiki.wireshark.org/DHCP) packets (sent from 0.0.0.0). Older dash
+buttons sent both DHCP and [ARP](https://wiki.wireshark.org/ARP) packets but
+detecting ARP reliably was problematic.
 
 When a valid packet is detected with a known source MAC address, the LIFX HTTP
 API [toggle-power](https://api.developer.lifx.com/docs/toggle-power) endpoint is

data/lib/lifx_dash/capturer.rb

@@ -5,13 +5,10 @@ module LifxDash
 
     # Berkeley Packet filter for Amazon Dash buttons
     #
-    #  - older dash buttons issue an ARP packet from 0.0.0.0
-    #  - newer buttons broadcast a DHCP request from 0.0.0.0
-    #  - use the following bfp in WireShark to snoop for raw packets
-    #    - (arp or (udp.srcport == 68 and udp.dstport == 67)) and ip.src == 0.0.0.0
+    #  - most dash buttons broadcast a DHCP request from 0.0.0.0
     #  - for more details see https://github.com/ide/dash-button/issues/36
     #
-    PACKET_FILTER = "(arp or (udp and src port 68 and dst port 67)) and src host 0.0.0.0"
+    PACKET_FILTER = "udp and src port 68 and dst port 67 and udp[247:4] == 0x63350103 and src host 0.0.0.0"
 
     attr_reader :iface
 
@@ -22,11 +19,15 @@ module LifxDash
     def listen(&block)
       # examine packets on the stream
       capturer.stream.each do |packet|
-        pkt = PacketFu::IPPacket.parse(packet)
-        # only consider the first packet sent
-        if pkt && pkt.ip_id == 1
-          mac = PacketFu::EthHeader.str2mac(pkt.eth_src)
-          block.call(pkt, mac) if block
+        if PacketFu::IPPacket.can_parse?(packet)
+          pkt = PacketFu::IPPacket.parse(packet)
+          # only consider the first (early ip ids) even packet sent
+          # since dhcp often sends 2 packets in a quick burst
+          if pkt && pkt.ip_id < 5 && (pkt.ip_id % 2) == 0
+            puts pkt.inspect
+            mac = PacketFu::EthHeader.str2mac(pkt.eth_src)
+            block.call(pkt, mac) if block
+          end
         end
       end
     end

data/lib/lifx_dash/version.rb

@@ -1,3 +1,3 @@
 module LifxDash
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifx_dash
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli