scan_beacon 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4548af4b44814857639f741b16b0b350d30ebd0
-  data.tar.gz: 42ca418ee1c526ea7286906ecd62e454cb1b6c63
+  metadata.gz: e6b201d622b5ea2c016eef5c4ce64e007908cfe7
+  data.tar.gz: 291a61d545e72091f8a5ea1dea06767dc25f49fd
 SHA512:
-  metadata.gz: da7aa4e68e45f42a7ec38b7502bc3ec955e8503ad22d62f97fe5d5c2797f59375a8c2c8825f3274091ed0deb5b305f86ee5a7a4b71e7aff47dfeb970f80c383f
-  data.tar.gz: 06b74ba91b756f475503143049b205d897ad785358811ea8878863e764b6110fc361dee6a7c7e35a125cf4dbe1cc464b131221ceed45341b5659c4f950b8c095
+  metadata.gz: ac1658d5da26b236bce3d41ecca2e42b81be196d417013fbd42d52129902c1e22a02e166a54f9037cff7627d99994235a12722658697f284647667db3f6f8e05
+  data.tar.gz: 129517c9ab08a69f95fec722450f85be1cd9c64f3fa245ca02fd32afc2b420836a7fe2cd8257da0b0256e9299fd015bc5713cc4eb18b18df9d32a524ec9c3ce9

data/ext/bluez/addr_rotation.c

@@ -23,7 +23,6 @@
  */
 
 #ifdef linux
-#include "ruby.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -32,6 +31,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include "ruby.h"
 
 #include "utils.h"
 

data/ext/bluez/advertising.c

@@ -1,5 +1,4 @@
 #ifdef linux
-#include "ruby.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -8,6 +7,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include "ruby.h"
 #pragma pack(1)
 
 
@@ -75,13 +75,15 @@ VALUE method_start_advertising(VALUE klass, VALUE rb_device_id, VALUE random_add
   struct hci_request rq;
   le_set_advertising_parameters_cp adv_params_cp;
   uint8_t status;
+  int device_handle;
+  uint16_t interval_100ms = htobs(0x00A0); // 0xA0 * 0.625ms = 100ms
 
   // open connection to the device
   int device_id = FIX2INT(rb_device_id);
   if (device_id < 0) {
     rb_raise(rb_eException, "Could not find device");
   }
-  int device_handle = hci_open_dev(device_id);
+  device_handle = hci_open_dev(device_id);
   if (device_handle < 0) {
     rb_raise(rb_eException, "Could not open device");
   }
@@ -97,7 +99,6 @@ VALUE method_start_advertising(VALUE klass, VALUE rb_device_id, VALUE random_add
 
   // set advertising params
   memset(&adv_params_cp, 0, sizeof(adv_params_cp));
-  uint16_t interval_100ms = htobs(0x00A0); // 0xA0 * 0.625ms = 100ms
   adv_params_cp.min_interval = interval_100ms;
   adv_params_cp.max_interval = interval_100ms;
   adv_params_cp.advtype = 0x03; // non-connectable undirected advertising

data/ext/bluez/bluez.c

@@ -1,5 +1,4 @@
 #ifdef linux
-#include "ruby.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -8,6 +7,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include "ruby.h"
 
 VALUE bluez_module = Qnil;
 

data/ext/bluez/devices.c

@@ -1,5 +1,4 @@
 #ifdef linux
-#include "ruby.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -8,6 +7,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include "ruby.h"
 
 #include "utils.h"
 
@@ -67,6 +67,8 @@ VALUE method_devices()
   struct hci_dev_req *dr;
   struct hci_dev_info di;
   int i;
+  int ctl;
+  VALUE devices;
 
   if (!(dl = malloc(HCI_MAX_DEV * sizeof(struct hci_dev_req) + sizeof(uint16_t)))) {
     rb_raise(rb_eException, "Can't allocate memory");    
@@ -75,13 +77,13 @@ VALUE method_devices()
   dl->dev_num = HCI_MAX_DEV;
   dr = dl->dev_req;
 
-  int ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
+  ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
   if (ioctl(ctl, HCIGETDEVLIST, (void *) dl) < 0) {
     rb_raise(rb_eException, "Can't get device list");    
     return Qnil;
   }
 
-  VALUE devices = rb_ary_new();
+  devices = rb_ary_new();
 
   for (i = 0; i< dl->dev_num; i++) {
     di.dev_id = (dr+i)->dev_id;

data/ext/bluez/scanning.c

@@ -1,5 +1,4 @@
 #ifdef linux
-#include "ruby.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -9,6 +8,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include "ruby.h"
 
 #include "utils.h"
 
@@ -34,6 +34,7 @@ VALUE method_scan(int argc, VALUE *argv, VALUE klass)
   uint16_t window = htobs(0x0005);
 
   struct hci_filter new_filter;
+  socklen_t filter_size;
 
   // which device was specified?
   rb_scan_args(argc, argv, "01", &rb_device_id);
@@ -49,7 +50,7 @@ VALUE method_scan(int argc, VALUE *argv, VALUE klass)
   device_handles[device_id] = device_handle;
  
   // save the old filter so we can restore it later
-  socklen_t filter_size = sizeof(stored_filters[0]);
+  filter_size = sizeof(stored_filters[0]);
   if (getsockopt(device_handle, SOL_HCI, HCI_FILTER, &stored_filters[device_id], &filter_size) < 0) {
     rb_raise(rb_eException, "Could not get socket options");
   }
@@ -82,15 +83,16 @@ VALUE perform_scan(VALUE device_id_in)
   while (keep_scanning) {
     evt_le_meta_event *meta;
     le_advertising_info *info;
+    int ret;
 
     // wait for data with a timeout
     fd_set set;
+    struct timeval timeout;
     FD_ZERO(&set);
     FD_SET(device_handle, &set);
-    struct timeval timeout;
     timeout.tv_sec = 0;
     timeout.tv_usec = 200000; // 200ms
-    int ret = select(device_handle + 1, &set, NULL, NULL, &timeout);
+    ret = select(device_handle + 1, &set, NULL, NULL, &timeout);
     if (ret < 0) {
       rb_raise(rb_eException, "Error waiting for data");
     } else if (ret == 0) {
@@ -109,6 +111,7 @@ VALUE perform_scan(VALUE device_id_in)
     }
 
     if (len > 0) {
+      VALUE rssi, ad_data, addr;
       ptr = buf + (1 + HCI_EVENT_HDR_SIZE);
       len -= (1 + HCI_EVENT_HDR_SIZE);
       meta = (void *) ptr;
@@ -118,9 +121,9 @@ VALUE perform_scan(VALUE device_id_in)
       }
       // parse out the ad data, the mac, and the rssi
       info = (le_advertising_info *) (meta->data + 1);
-      VALUE rssi = INT2FIX( (int8_t)info->data[info->length] );
-      VALUE ad_data = rb_str_new((void *)info->data, info->length);
-      VALUE addr = ba2value(&info->bdaddr);
+      rssi = INT2FIX( (int8_t)info->data[info->length] );
+      ad_data = rb_str_new((void *)info->data, info->length);
+      addr = ba2value(&info->bdaddr);
       keep_scanning = rb_yield_values(3, addr, ad_data, rssi) != Qfalse;
     }
   }

data/ext/bluez/utils.c

@@ -1,5 +1,4 @@
 #ifdef linux
-#include "ruby.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -8,6 +7,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include "ruby.h"
 
 #include "utils.h"
 

data/ext/core_bluetooth/extconf.rb

@@ -7,17 +7,19 @@ extension_name = 'scan_beacon/core_bluetooth'
 # The destination
 dir_config(extension_name)
 
-$DLDFLAGS << " -framework Foundation"
-$DLDFLAGS << " -framework CoreBluetooth"
-
-unless RUBY_PLATFORM =~ /darwin/
+if RUBY_PLATFORM =~ /darwin/
+  $DLDFLAGS << " -framework Foundation"
+  $DLDFLAGS << " -framework CoreBluetooth"
+else
   # don't compile the code on non-mac platforms because
   # CoreBluetooth wont be there, and we may not even have
   # the ability to compile ObjC code.
   COMPILE_C = "echo"
+  CONFIG['CC'] = "echo" # this is for Ruby 2.x mkmf
   # create a dummy .so file so RubyGems thinks everything
   # was successful.  We wont try to load it anyway.
   LINK_SO = "touch $@"
+  CONFIG['LDSHARED'] = "touch $@; echo" # for Ruby 2.x mkmf
 end
 
 create_makefile(extension_name)

data/lib/scan_beacon/version.rb

@@ -1,3 +1,3 @@
 module ScanBeacon
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scan_beacon
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Radius Networks