scan_beacon 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f8844b16259f721c6d4f61beebf3864c6414b83
-  data.tar.gz: a39128a6ae36cefc7d6a08fa3acdd544cabaecb6
+  metadata.gz: ea62479acf5f65e19dddfb63fd45bbe502d0df36
+  data.tar.gz: d338df688e255c8361688191ed63129a2f5aefdf
 SHA512:
-  metadata.gz: a18157a020028352344d31b431097a4f9b322c5a382a382098dd6e5ecc62eb406038c052754360d047d170ab1175a4024a07109be862923823c12b5d0f98ed24
-  data.tar.gz: 76db397e4a1c005cbe7f61c393e585cbe3678a6d79070e6d22e064fc8836c4b7376c32f2a07bca8071771a091757479c2541450a1dd2395f9a5d6078999e53b2
+  metadata.gz: 51a2a247e35d654722086b2c70e4ada9249edba07da87b6def8e8f03f7d7af92d7725fa0a400fb6e2208d902689612fe4251371c4a60b181ef1f99e1eb9044d2
+  data.tar.gz: 6b2724b5e74aeb2207017099b130ccd6a21b79a62a0437018e2ee958da438574cf9582418ec62fe0001ad5d02a12190f0e61da7d500f77ab24c52f2ce3c51656

data/ext/core_bluetooth/core_bluetooth.m

@@ -15,6 +15,8 @@ VALUE method_scan();
 VALUE method_new_adverts();
 VALUE new_scan_hash(NSString* device, NSData *data, NSNumber *rssi, NSData *service_uuid);
 
+VALUE method_get_addr();
+VALUE method_set_random_addr();
 VALUE method_set_advertisement_data(VALUE klass, VALUE data);
 VALUE method_start_advertising();
 VALUE method_stop_advertising();
@@ -26,6 +28,8 @@ VALUE method_stop_advertising();
 - (int)BluetoothHCILESetAdvertisingParameters:(unsigned short)arg1 advertisingIntervalMax:(unsigned short)arg2 advertisingType:(unsigned char)arg3 ownAddressType:(unsigned char)arg4 directAddressType:(unsigned char)arg5 directAddress:(struct BluetoothDeviceAddress { unsigned char x1[6]; }*)arg6 advertisingChannelMap:(unsigned char)arg7 advertisingFilterPolicy:(unsigned char)arg8;
 - (int)BluetoothHCILESetScanParameters:(unsigned char)arg1 LEScanInterval:(unsigned short)arg2 LEScanWindow:(unsigned short)arg3 ownAddressType:(unsigned char)arg4 scanningFilterPolicy:(unsigned char)arg5;
 - (int)BluetoothHCILESetScanEnable:(unsigned char)arg1 filterDuplicates:(unsigned char)arg2;
+- (int)getAddress:(struct BluetoothDeviceAddress { unsigned char x1[6]; }*)arg1;
+- (int)BluetoothHCILESetRandomAddress:(const char*)arg1;
 @end
 
 @interface BLEDelegate : NSObject <CBCentralManagerDelegate> {
@@ -113,8 +117,10 @@ void Init_core_bluetooth()
   rb_define_singleton_method(cb_module, "scan", method_scan, 0);
   rb_define_singleton_method(cb_module, "new_adverts", method_new_adverts, 0);
 
+  rb_define_singleton_method(cb_module, "get_addr", method_get_addr, 0);
+  rb_define_singleton_method(cb_module, "set_random_addr", method_set_random_addr, 0);
   rb_define_singleton_method(cb_module, "set_advertisement_data", method_set_advertisement_data, 1);
-  rb_define_singleton_method(cb_module, "start_advertising", method_start_advertising, 0);
+  rb_define_singleton_method(cb_module, "start_advertising", method_start_advertising, 1);
   rb_define_singleton_method(cb_module, "stop_advertising", method_stop_advertising, 0);
 
   sym_device = ID2SYM(rb_intern("device"));
@@ -155,8 +161,6 @@ VALUE method_new_adverts()
 
 VALUE method_scan()
 {
-  VALUE scans = rb_ary_new();
-
   @autoreleasepool {
     @try {
       bleDelegate = [[BLEDelegate alloc] init];
@@ -176,6 +180,32 @@ VALUE method_scan()
   return Qnil;
 }
 
+VALUE addr_to_rbstr(uint8_t* addr)
+{
+  char c_str[20];
+  sprintf(c_str, "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
+		addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
+  return rb_str_new2(c_str);
+}
+
+VALUE method_get_addr()
+{
+  IOBluetoothHostController *device = [IOBluetoothHostController defaultController];
+  uint8_t addr[6];
+  [device getAddress: (void*)addr];
+  return addr_to_rbstr(addr);
+}
+
+VALUE method_set_random_addr()
+{
+  uint8_t addr[6];
+  SecRandomCopyBytes(kSecRandomDefault, 6, addr);
+  addr[0] = addr[0] & 0x7F;
+  IOBluetoothHostController *device = [IOBluetoothHostController defaultController];
+  [device BluetoothHCILESetRandomAddress: (void*)addr];
+  return addr_to_rbstr(addr);
+}
+
 VALUE method_set_advertisement_data(VALUE klass, VALUE data)
 {
   IOBluetoothHostController *device = [IOBluetoothHostController defaultController];
@@ -187,17 +217,24 @@ VALUE method_set_advertisement_data(VALUE klass, VALUE data)
   return Qnil;
 }
 
-VALUE method_start_advertising()
+VALUE method_start_advertising(VALUE klass, VALUE random)
 {
+  unsigned char ownAddrType = 0x00;
+  if (random == Qtrue) {
+    ownAddrType = 0x01;
+  }
   IOBluetoothHostController *device = [IOBluetoothHostController defaultController];
   [device BluetoothHCILESetAdvertisingParameters: 0x00A0
                           advertisingIntervalMax: 0x00A0 // 100ms
                                  advertisingType: 0x03
-                                  ownAddressType: 0x00
+                                  ownAddressType: ownAddrType
                                directAddressType: 0x00
                                    directAddress: (void*)"\x00\x00\x00\x00\x00\x00"
                                    advertisingChannelMap: 0x07 // all 3 channels
                                  advertisingFilterPolicy: 0x00];
+  if (random == Qtrue) {
+    method_set_random_addr();
+  }
   [device BluetoothHCILESetAdvertiseEnable: 1];
   return Qnil;
 }

data/lib/scan_beacon/bluez_advertiser.rb

@@ -22,7 +22,6 @@ module ScanBeacon
         # have to pass nil for addr if we don't want to override it and use the internal
         BlueZ.start_advertising @device_id, nil
       end
-    
       @advertising=true
     end
 
@@ -38,7 +37,7 @@ module ScanBeacon
     def rotate_addr_and_update_ad
       self.update_ad
       self.stop
-      self.start_with_random_addr
+      self.start(true)
     end
 
     def random_addr

data/lib/scan_beacon/core_bluetooth_advertiser.rb

@@ -10,14 +10,20 @@ module ScanBeacon
       CoreBluetooth.set_advertisement_data @ad
     end
 
-    def start
-      CoreBluetooth.start_advertising
+    def start(with_rotation = false)
+      CoreBluetooth.start_advertising(with_rotation)
     end
 
     def stop
       CoreBluetooth.stop_advertising
     end
 
+    def rotate_addr_and_update_ad
+      self.update_ad
+      self.stop
+      self.start(true)
+    end
+
     def inspect
       "<CoreBluetoothAdvertiser ad=#{@ad.inspect}>"
     end

data/lib/scan_beacon/generic_individual_advertiser.rb

@@ -15,13 +15,13 @@ module ScanBeacon
       update_ad
     end
 
-    def update_ad    
+    def update_ad
       self.ad = @parser.generate_ad(@beacon) if @parser && @beacon
     end
-    
+
     def ad=(value)
       @ad = value
       self.start if advertising
     end
   end
-end
+end

data/lib/scan_beacon/version.rb

@@ -1,3 +1,3 @@
 module ScanBeacon
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scan_beacon
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Radius Networks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Provides Beacon scanning functionality