/**
* time out of a mac endpoint
*/
-#define MACENDPOINT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 2)
+#define MACENDPOINT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 60)
/**
* We reduce the frequence of HELLO beacons in relation to
* the number of MAC addresses currently visible to us.
* This is the multiplication factor.
*/
-#define HELLO_BEACON_SCALING_FACTOR GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
+#define HELLO_BEACON_SCALING_FACTOR GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
/**
* Maximum number of messages in defragmentation queue per MAC
session->timeout_task = GNUNET_SCHEDULER_NO_TASK;
timeout = GNUNET_TIME_absolute_get_remaining (session->timeout);
- if (0 == timeout.rel_value)
+ if (0 == timeout.rel_value_us)
{
free_session (session);
return;
endpoint->timeout_task = GNUNET_SCHEDULER_NO_TASK;
timeout = GNUNET_TIME_absolute_get_remaining (endpoint->timeout);
- if (0 == timeout.rel_value)
+ if (0 == timeout.rel_value_us)
{
free_macendpoint (endpoint);
return;
bluetooth_plugin_address_to_string (NULL, &mas->endpoint->addr, sizeof (struct WlanAddress)));
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# HELLO messages received via WLAN"), 1,
+ _("# HELLO messages received via Bluetooth"), 1,
GNUNET_NO);
plugin->env->receive (plugin->env->cls,
&tmpsource,
GNUNET_CRYPTO_crc32_n (&wlanheader[1], msize - sizeof (struct WlanHeader)))
{
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# BluetoothDATA messages discarded due to CRC32 error"), 1,
+ _("# Bluetooth DATA messages discarded due to CRC32 error"), 1,
GNUNET_NO);
break;
}
xmas.endpoint = mas->endpoint;
xmas.session = create_session (mas->endpoint, &wlanheader->sender);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing %u bytes of WLAN DATA from peer `%s'\n",
+ "Processing %u bytes of BLUETOOTH DATA from peer `%s'\n",
(unsigned int) msize,
GNUNET_i2s (&wlanheader->sender));
(void) GNUNET_SERVER_mst_receive (plugin->wlan_header_payload_tokenizer,
plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
&wa,
sizeof (wa),
- "wlan");
+ "bluetooth");
}
plugin->mac_address = cm->mac;
plugin->have_mac = GNUNET_YES;
wa.mac = plugin->mac_address;
wa.options = htonl(plugin->options);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received WLAN_HELPER_CONTROL message with MAC address `%s' for peer `%s'\n",
+ "Received BT_HELPER_CONTROL message with MAC address `%s' for peer `%s'\n",
mac_to_string (&cm->mac),
GNUNET_i2s (plugin->env->my_identity));
plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
&wa,
sizeof (struct WlanAddress),
- "wlan");
+ "bluetooth");
break;
case GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER:
LOG (GNUNET_ERROR_TYPE_DEBUG,
plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
&wa,
sizeof (struct WlanAddress),
- "wlan");
+ "bluetooth");
plugin->have_mac = GNUNET_NO;
}
struct WlanAddress *wa;
unsigned int a[6];
unsigned int i;
- char plugin[5];
+ char plugin[10];
uint32_t options;
if ((NULL == addr) || (addrlen == 0))
}
if (8 != SSCANF (addr,
- "%4s.%u.%X:%X:%X:%X:%X:%X",
+ "%9s.%u.%X:%X:%X:%X:%X:%X",
plugin, &options,
&a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
{
(testmode > 2) ) )
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "transport-wlan", "TESTMODE");
+ "transport-bluetooth", "TESTMODE");
return NULL;
}
binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-transport-bluetooth");
(GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) )
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Helper binary `%s' not SUID, cannot run WLAN transport\n"),
+ _("Helper binary `%s' not SUID, cannot run bluetooth transport\n"),
"gnunet-helper-transport-bluetooth");
GNUNET_free (binary);
return NULL;
NULL,
plugin);
break;
+ case 1: /* testmode, peer 1 */
+ plugin->helper_argv[0] = (char *) "gnunet-helper-transport-wlan-dummy";
+ plugin->helper_argv[1] = (char *) "1";
+ plugin->helper_argv[2] = NULL;
+ plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
+ "gnunet-helper-transport-wlan-dummy",
+ plugin->helper_argv,
+ &handle_helper_message,
+ NULL,
+ plugin);
+ break;
+ case 2: /* testmode, peer 2 */
+ plugin->helper_argv[0] = (char *) "gnunet-helper-transport-wlan-dummy";
+ plugin->helper_argv[1] = (char *) "2";
+ plugin->helper_argv[2] = NULL;
+ plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
+ "gnunet-helper-transport-wlan-dummy",
+ plugin->helper_argv,
+ &handle_helper_message,
+ NULL,
+ plugin);
+ break;
default:
GNUNET_assert (0);
}