Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.

Commit 25dd5d0

Browse files
edmontedmont
authored
[mac] remove beacons payload (#508)
Thread Specification v1.2.1 removes support for Thread Beacons payload.
1 parent 0fb1f57 commit 25dd5d0

17 files changed

+6
-82
lines changed

‎INSTALL.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Open up a terminal and perform the following commands:
3434

3535
Make sure that your repository is at `origin/master`.
3636

37-
git checkout origin/master
37+
git checkout origin/master
3838

3939
Then *bootstrap* the project by doing the following:
4040

@@ -66,7 +66,7 @@ Once the build above is complete, execute the following command:
6666

6767
This will install `wpantund` onto your computer.
6868

69-
Installing `wpantund` on OS X
69+
Installing `wpantund` on OS X
7070
-----------------------------
7171

7272
**`wpantund` support on OS X is experimenatl.**
@@ -230,7 +230,6 @@ running as root, you *must* use `sudo`)
230230
"XPanId" => 0xD6D8A04025AB3B0C
231231
"PanId" => 0xE3C3
232232
"Channel" => 26
233-
"AllowingJoin" => true
234233
"Prefix" => [FDD6D8A040250000]
235234
"NCPVersion" => "OpenThread/1.0d26-25-gb684c7f; DEBUG; May 9 2016 18:22:04"
236235
"HWAddr" => [18B430000003F202]

‎etc/fuzz-corpus/wpantund-fuzz/config-corpus-seed-0005

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
0TmfProxy:Enabled 1234567890123456789012345678901234567890
22
TmfProxy:Stream 1234567890123456789012345678901234567890
3-
com.nestlabs.internal:Network:AllowingJoin 1234567890123456789012345678901234567890
43
com.nestlabs.internal:Network:PassthruPort 1234567890123456789012345678901234567890
54
com.nestlabs.internal:NCP:TransmitHookActive 1234567890123456789012345678901234567890
65
com.nestlabs.internal:Legacy:PreferInterface 1234567890123456789012345678901234567890

‎src/connman-plugin/wpan-connman-plugin.c

-3
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,6 @@ parse_network_info_from_iter(
489489
dbus_message_iter_get_basic(&value_iter, &network_info->pan_id);
490490
} else if ((strcmp(key, kWPANTUNDProperty_NetworkXPANID) == 0) || strcmp(key, "XPanId") == 0) {
491491
dbus_message_iter_get_basic(&value_iter, &network_info->xpanid);
492-
} else if ((strcmp(key, kWPANTUNDProperty_NestLabs_NetworkAllowingJoin) == 0) || strcmp(key, "AllowingJoin") == 0) {
493-
dbus_message_iter_get_basic(&value_iter,
494-
&network_info->allowing_join);
495492
} else if ((strcmp(key, kWPANTUNDProperty_NCPHardwareAddress) == 0) || strcmp(key, "BeaconHWAddr") == 0) {
496493
DBusMessageIter array_iter;
497494
dbus_message_iter_recurse(&value_iter, &array_iter);

‎src/ipc-dbus/DBusIPCAPI_v0.cpp

-11
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ ipc_append_network_properties(
153153
int8_t rssi = network.rssi;
154154
append_dict_entry(iter, "RSSI", DBUS_TYPE_BYTE, &rssi);
155155
}
156-
157-
dbus_bool_t allowing_join = network.joinable;
158-
append_dict_entry(iter,
159-
"AllowingJoin",
160-
DBUS_TYPE_BOOLEAN,
161-
&allowing_join);
162156
}
163157

164158
if (network.type != 0) {
@@ -340,11 +334,6 @@ DBusIPCAPI_v0::status_response_helper(
340334
append_dict_entry(&dict, kWPANTUNDProperty_NestLabs_LegacyMeshLocalPrefix, value);
341335
}
342336

343-
value = interface->property_get_value(kWPANTUNDProperty_NestLabs_NetworkAllowingJoin);
344-
if (!value.empty()) {
345-
append_dict_entry(&dict, kWPANTUNDProperty_NestLabs_NetworkAllowingJoin, value);
346-
}
347-
348337
value = interface->property_get_value(kWPANTUNDProperty_NetworkNodeType);
349338
if (!value.empty()) {
350339
append_dict_entry(&dict, kWPANTUNDProperty_NetworkNodeType, value);

‎src/ipc-dbus/DBusIPCAPI_v1.cpp

-13
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,6 @@ ipc_append_network_properties(
282282
int8_t rssi = network.rssi;
283283
append_dict_entry(iter, "RSSI", DBUS_TYPE_BYTE, &rssi);
284284
}
285-
286-
dbus_bool_t allowing_join = network.joinable;
287-
append_dict_entry(
288-
iter,
289-
kWPANTUNDProperty_NestLabs_NetworkAllowingJoin,
290-
DBUS_TYPE_BOOLEAN,
291-
&allowing_join
292-
);
293285
}
294286

295287
if (network.get_hwaddr_as_uint64() != 0) {
@@ -577,11 +569,6 @@ DBusIPCAPI_v1::status_response_helper(
577569
if (!value.empty()) {
578570
append_dict_entry(&dict, kWPANTUNDProperty_NestLabs_LegacyMeshLocalPrefix, value);
579571
}
580-
581-
value = interface->property_get_value(kWPANTUNDProperty_NestLabs_NetworkAllowingJoin);
582-
if (!value.empty()) {
583-
append_dict_entry(&dict, kWPANTUNDProperty_NestLabs_NetworkAllowingJoin, value);
584-
}
585572
}
586573

587574
dbus_message_iter_close_container(&iter, &dict);

‎src/ncp-spinel/SpinelNCPInstance.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -5898,11 +5898,6 @@ SpinelNCPInstance::handle_ncp_spinel_value_is(spinel_prop_key_t key, const uint8
58985898
bool is_assisting = (value_data_len != 0);
58995899
uint16_t assisting_port(0);
59005900

5901-
if (is_assisting != get_current_network_instance().joinable) {
5902-
mCurrentNetworkInstance.joinable = is_assisting;
5903-
signal_property_changed(kWPANTUNDProperty_NestLabs_NetworkAllowingJoin, is_assisting);
5904-
}
5905-
59065901
if (is_assisting) {
59075902
int i;
59085903
syslog(LOG_NOTICE, "Network is joinable");

‎src/ncp-spinel/SpinelNCPTaskScan.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ nl::wpantund::SpinelNCPTaskScan::vprocess_event(int event, va_list args)
244244
networkid,
245245
xpanid,
246246
panid,
247-
chan,
248-
(flags & SPINEL_BEACON_THREAD_FLAG_JOINABLE)
247+
chan
249248
);
250249
network.rssi = rssi;
251250
network.type = proto;

‎src/wpanctl/tool-cmd-scan.c

+1-8
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,9 @@ print_scan_header(void)
5555
if (sEnergyScan) {
5656
printf(" Ch | RSSI\n");
5757
printf(" ----+-------\n");
58-
} else if (sMleDiscoverScan) {
58+
} else {
5959
printf( " | NetworkName | PAN ID | Ch | XPanID | HWAddr | RSSI\n");
6060
printf( "---+--------------------+--------+----+------------------+------------------+------\n");
61-
} else {
62-
printf( " | Joinable | NetworkName | PAN ID | Ch | XPanID | HWAddr | RSSI\n");
63-
printf( "---+----------+--------------------+--------+----+------------------+------------------+------\n");
6461
}
6562
}
6663

@@ -95,10 +92,6 @@ dbus_beacon_handler(
9592
printf(" ");
9693
}
9794

98-
if (!sMleDiscoverScan) {
99-
printf(" | %s", network_info.allowing_join ? " YES" : " NO");
100-
}
101-
10295
if (network_info.network_name[0]) {
10396
printf(" | \"%s\"%s",
10497
network_info.network_name,

‎src/wpanctl/wpanctl-utils.c

-3
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,6 @@ int parse_network_info_from_iter(struct wpan_network_info_s *network_info, DBusM
216216
dbus_message_iter_get_basic(&value_iter, &network_info->channel);
217217
} else if (strcmp(key, kWPANTUNDProperty_NetworkPANID) == 0) {
218218
dbus_message_iter_get_basic(&value_iter, &network_info->pan_id);
219-
} else if (strcmp(key, kWPANTUNDProperty_NestLabs_NetworkAllowingJoin) == 0) {
220-
dbus_message_iter_get_basic(&value_iter,
221-
&network_info->allowing_join);
222219
} else if (strcmp(key, "RSSI") == 0) {
223220
dbus_message_iter_get_basic(&value_iter, &network_info->rssi);
224221
} else if (strcmp(key, kWPANTUNDProperty_NetworkXPANID) == 0) {

‎src/wpantund/NCPControlInterface.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ struct SetPropertyHelper {
177177
#define kWPANTUNDPropertyNetworkKey "NetworkKey" // [RW]
178178
#define kWPANTUNDPropertyNetworkKeyIndex "NetworkKeyIndex" // [RW]
179179
#define kWPANTUNDPropertyMeshLocalPrefix "MeshLocalPrefix" // [RO]
180-
#define kWPANTUNDPropertyAllowingJoin "AllowingJoin" // [RO]
181180
#define kWPANTUNDPropertyIsAssociated "IsAssociated" // [RO]
182181

183182
// Power Management Properties
@@ -301,7 +300,6 @@ NCPControlInterface::translate_deprecated_property(std::string& key, boost::any&
301300
prop_map[to_upper(kWPANTUNDPropertyNetworkKey)] = kWPANTUNDProperty_NetworkKey;
302301
prop_map[to_upper(kWPANTUNDPropertyNetworkKeyIndex)] = kWPANTUNDProperty_NetworkKeyIndex;
303302
prop_map[to_upper(kWPANTUNDPropertyMeshLocalPrefix)] = kWPANTUNDProperty_IPv6MeshLocalPrefix;
304-
prop_map[to_upper(kWPANTUNDPropertyAllowingJoin)] = kWPANTUNDProperty_NestLabs_NetworkAllowingJoin;
305303
prop_map[to_upper(kWPANTUNDPropertyIsAssociated)] = kWPANTUNDProperty_NetworkIsCommissioned;
306304
prop_map[to_upper(kWPANTUNDPropertyIsOKToSleep)] = kWPANTUNDProperty_DaemonReadyForHostSleep;
307305
prop_map[to_upper(kWPANTUNDPropertyUseDeepSleepOnLowPower)] = kWPANTUNDProperty_NestLabs_HackUseDeepSleepOnLowPower;

‎src/wpantund/NCPInstanceBase-NetInterface.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ NCPInstanceBase::reset_interface(void)
149149
{
150150
syslog(LOG_NOTICE, "Resetting interface(s). . .");
151151

152-
mCurrentNetworkInstance.joinable = false;
153-
154152
set_commissioniner(0, 0, 0);
155153

156154
mPrimaryInterface->reset();

‎src/wpantund/NCPInstanceBase.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ NCPInstanceBase::get_supported_property_keys(void) const
309309
properties.insert(kWPANTUNDProperty_DaemonTerminateOnFault);
310310
properties.insert(kWPANTUNDProperty_DaemonSetDefRouteForAutoAddedPrefix);
311311

312-
properties.insert(kWPANTUNDProperty_NestLabs_NetworkAllowingJoin);
313-
314312
properties.insert(kWPANTUNDProperty_DaemonVersion);
315313
properties.insert(kWPANTUNDProperty_DaemonTerminateOnFault);
316314

@@ -374,7 +372,6 @@ NCPInstanceBase::regsiter_all_get_handlers(void)
374372
REGISTER_GET_HANDLER(NetworkName);
375373
REGISTER_GET_HANDLER(NetworkIsCommissioned);
376374
REGISTER_GET_HANDLER(NestLabs_LegacyEnabled);
377-
REGISTER_GET_HANDLER(NestLabs_NetworkAllowingJoin);
378375
REGISTER_GET_HANDLER(NetworkPANID);
379376
REGISTER_GET_HANDLER(NetworkXPANID);
380377
REGISTER_GET_HANDLER(NCPChannel);
@@ -499,12 +496,6 @@ NCPInstanceBase::get_prop_NestLabs_LegacyEnabled(CallbackWithStatusArg1 cb)
499496
cb(kWPANTUNDStatus_Ok, boost::any(mLegacyInterfaceEnabled));
500497
}
501498

502-
void
503-
NCPInstanceBase::get_prop_NestLabs_NetworkAllowingJoin(CallbackWithStatusArg1 cb)
504-
{
505-
cb(kWPANTUNDStatus_Ok, boost::any(get_current_network_instance().joinable));
506-
}
507-
508499
void
509500
NCPInstanceBase::get_prop_NetworkPANID(CallbackWithStatusArg1 cb)
510501
{
@@ -1410,7 +1401,6 @@ NCPInstanceBase::handle_ncp_state_change(NCPState new_ncp_state, NCPState old_nc
14101401
// Take the interface offline.
14111402
syslog(LOG_NOTICE, "Taking interface(s) down. . .");
14121403

1413-
mCurrentNetworkInstance.joinable = false;
14141404
set_commissioniner(0, 0, 0);
14151405
set_online(false);
14161406
}

‎src/wpantund/NCPInstanceBase.h

-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ class NCPInstanceBase : public NCPInstance, public EventHandler {
331331
void get_prop_NetworkName(CallbackWithStatusArg1 cb);
332332
void get_prop_NetworkIsCommissioned(CallbackWithStatusArg1 cb);
333333
void get_prop_NestLabs_LegacyEnabled(CallbackWithStatusArg1 cb);
334-
void get_prop_NestLabs_NetworkAllowingJoin(CallbackWithStatusArg1 cb);
335334
void get_prop_NetworkPANID(CallbackWithStatusArg1 cb);
336335
void get_prop_NetworkXPANID(CallbackWithStatusArg1 cb);
337336
void get_prop_NCPChannel(CallbackWithStatusArg1 cb);

‎src/wpantund/NetworkInstance.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ struct NetworkId {
9999
struct NetworkInstance : public NetworkId {
100100
uint16_t panid;
101101
uint8_t channel;
102-
bool joinable;
103102
int8_t rssi;
104103
uint8_t lqi;
105104
uint8_t type;
@@ -111,13 +110,11 @@ struct NetworkInstance : public NetworkId {
111110
NetworkInstance(
112111
const std::string& _name = "",
113112
const uint8_t _xpanid[8] = NULL,
114-
uint16_t _panid = 0xFFFF, int _channel = 0,
115-
bool _joinable = false
113+
uint16_t _panid = 0xFFFF, int _channel = 0
116114
) :
117115
NetworkId(_name, _xpanid),
118116
panid(_panid),
119117
channel(_channel),
120-
joinable(_joinable),
121118
rssi(-128),
122119
type(0),
123120
hwaddr(),
@@ -127,13 +124,11 @@ struct NetworkInstance : public NetworkId {
127124
NetworkInstance(
128125
const std::string& _name,
129126
const uint64_t _xpanid,
130-
uint16_t _panid = 0xFFFF, int _channel = 0,
131-
bool _joinable = false
127+
uint16_t _panid = 0xFFFF, int _channel = 0
132128
) :
133129
NetworkId(_name, _xpanid),
134130
panid(_panid),
135131
channel(_channel),
136-
joinable(_joinable),
137132
rssi(-128),
138133
type(0),
139134
hwaddr(),

‎src/wpantund/StatCollector.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,6 @@ StatCollector::did_rx_net_scan_beacon(const WPAN::NetworkInstance& network)
17111711
"Name:%-17s, "
17121712
"PanId:0x%04X, "
17131713
"Ch:%2d, "
1714-
"Joinable:%-3s, "
17151714
"XPanId:0x%02X%02X%02X%02X%02X%02X%02X%02X, "
17161715
"HwAddr:0x%02X%02X%02X%02X%02X%02X%02X%02X, "
17171716
"RSSI:%-4d, "
@@ -1723,7 +1722,6 @@ StatCollector::did_rx_net_scan_beacon(const WPAN::NetworkInstance& network)
17231722
network.name.c_str(),
17241723
network.panid,
17251724
network.channel,
1726-
network.joinable? "YES" : "NO",
17271725
network.xpanid[0], network.xpanid[1], network.xpanid[2], network.xpanid[3],
17281726
network.xpanid[4], network.xpanid[5], network.xpanid[6], network.xpanid[7],
17291727
network.hwaddr[0], network.hwaddr[1], network.hwaddr[2], network.hwaddr[3],

‎src/wpantund/wpan-properties.h

-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@
317317
#define kWPANTUNDProperty_NCPCounter_IP_TX_FAILURE "NCP:Counter:IP_TX_FAILURE"
318318
#define kWPANTUNDProperty_NCPCounter_IP_RX_FAILURE "NCP:Counter:IP_RX_FAILURE"
319319

320-
#define kWPANTUNDProperty_NestLabs_NetworkAllowingJoin "com.nestlabs.internal:Network:AllowingJoin"
321320
#define kWPANTUNDProperty_NestLabs_NetworkPassthruPort "com.nestlabs.internal:Network:PassthruPort"
322321
#define kWPANTUNDProperty_NestLabs_NCPTransmitHookActive "com.nestlabs.internal:NCP:TransmitHookActive"
323322
#define kWPANTUNDProperty_NestLabs_LegacyPreferInterface "com.nestlabs.internal:Legacy:PreferInterface"

‎third_party/openthread/src/ncp/spinel.h

-8
Original file line numberDiff line numberDiff line change
@@ -4500,14 +4500,6 @@ typedef uint32_t spinel_prop_key_t;
45004500

45014501
#define SPINEL_GET_NEXT_TID(x) (spinel_tid_t)((x) >= 0xF ? 1 : (x) + 1)
45024502

4503-
#define SPINEL_BEACON_THREAD_FLAG_VERSION_SHIFT 4
4504-
4505-
#define SPINEL_BEACON_THREAD_FLAG_VERSION_MASK (0xf << SPINEL_BEACON_THREAD_FLAG_VERSION_SHIFT)
4506-
4507-
#define SPINEL_BEACON_THREAD_FLAG_JOINABLE (1 << 0)
4508-
4509-
#define SPINEL_BEACON_THREAD_FLAG_NATIVE (1 << 3)
4510-
45114503
// ----------------------------------------------------------------------------
45124504

45134505
enum

0 commit comments

Comments
 (0)