[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33850 - in gnunet: po src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33850 - in gnunet: po src/transport |
|
Date: |
Wed, 25 Jun 2014 22:22:58 +0200 |
Author: grothoff
Date: 2014-06-25 22:22:58 +0200 (Wed, 25 Jun 2014)
New Revision: 33850
Removed:
gnunet/src/transport/plugin_transport_bluetooth.c
Modified:
gnunet/po/POTFILES.in
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_wlan.c
Log:
combine sources for wlan and bluetooth plugin logic into one file
Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in 2014-06-25 19:29:54 UTC (rev 33849)
+++ gnunet/po/POTFILES.in 2014-06-25 20:22:58 UTC (rev 33850)
@@ -3,19 +3,11 @@
src/arm/gnunet-arm.c
src/arm/gnunet-service-arm.c
src/arm/mockup-service.c
-src/ats-tests/ats-testing-experiment.c
-src/ats-tests/ats-testing-log.c
-src/ats-tests/ats-testing-preferences.c
-src/ats-tests/ats-testing-traffic.c
-src/ats-tests/ats-testing.c
-src/ats-tests/gnunet-ats-sim.c
-src/ats-tests/gnunet-solver-eval.c
-src/ats-tool/gnunet-ats.c
src/ats/ats_api_performance.c
src/ats/ats_api_scheduling.c
src/ats/gnunet-ats-solver-eval.c
+src/ats/gnunet-service-ats_addresses.c
src/ats/gnunet-service-ats.c
-src/ats/gnunet-service-ats_addresses.c
src/ats/gnunet-service-ats_normalization.c
src/ats/gnunet-service-ats_performance.c
src/ats/gnunet-service-ats_reservations.c
@@ -23,6 +15,14 @@
src/ats/plugin_ats_mlp.c
src/ats/plugin_ats_proportional.c
src/ats/plugin_ats_ril.c
+src/ats-tests/ats-testing.c
+src/ats-tests/ats-testing-experiment.c
+src/ats-tests/ats-testing-log.c
+src/ats-tests/ats-testing-preferences.c
+src/ats-tests/ats-testing-traffic.c
+src/ats-tests/gnunet-ats-sim.c
+src/ats-tests/gnunet-solver-eval.c
+src/ats-tool/gnunet-ats.c
src/block/block.c
src/block/plugin_block_template.c
src/block/plugin_block_test.c
@@ -31,8 +31,8 @@
src/cadet/cadet_path.c
src/cadet/cadet_test_lib.c
src/cadet/cadet_tunnel_tree.c
+src/cadet/gnunet-cadet.c
src/cadet/gnunet-cadet-profiler.c
-src/cadet/gnunet-cadet.c
src/cadet/gnunet-service-cadet.c
src/cadet/gnunet-service-cadet_channel.c
src/cadet/gnunet-service-cadet_connection.c
@@ -46,12 +46,12 @@
src/consensus/gnunet-service-consensus.c
src/conversation/conversation_api.c
src/conversation/conversation_api_call.c
+src/conversation/gnunet-conversation.c
src/conversation/gnunet-conversation-test.c
-src/conversation/gnunet-conversation.c
+src/conversation/gnunet-helper-audio-playback.c
src/conversation/gnunet-helper-audio-playback-gst.c
-src/conversation/gnunet-helper-audio-playback.c
+src/conversation/gnunet-helper-audio-record.c
src/conversation/gnunet-helper-audio-record-gst.c
-src/conversation/gnunet-helper-audio-record.c
src/conversation/gnunet-service-conversation.c
src/conversation/microphone.c
src/conversation/plugin_gnsrecord_conversation.c
@@ -82,6 +82,7 @@
src/dht/dht_test_lib.c
src/dht/gnunet-dht-get.c
src/dht/gnunet-dht-monitor.c
+src/dht/gnunet_dht_profiler.c
src/dht/gnunet-dht-put.c
src/dht/gnunet-service-dht.c
src/dht/gnunet-service-dht_clients.c
@@ -112,8 +113,8 @@
src/dv/plugin_transport_dv.c
src/env/env.c
src/exit/gnunet-daemon-exit.c
+src/exit/gnunet-helper-exit.c
src/exit/gnunet-helper-exit-windows.c
-src/exit/gnunet-helper-exit.c
src/experimentation/gnunet-daemon-experimentation.c
src/experimentation/gnunet-daemon-experimentation_capabilities.c
src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -144,8 +145,8 @@
src/fs/gnunet-daemon-fsprofiler.c
src/fs/gnunet-directory.c
src/fs/gnunet-download.c
+src/fs/gnunet-fs.c
src/fs/gnunet-fs-profiler.c
-src/fs/gnunet-fs.c
src/fs/gnunet-helper-fs-publish.c
src/fs/gnunet-publish.c
src/fs/gnunet-search.c
@@ -164,10 +165,10 @@
src/gns/gns_api.c
src/gns/gnunet-bcd.c
src/gns/gnunet-dns2gns.c
+src/gns/gnunet-gns.c
src/gns/gnunet-gns-helper-service-w32.c
src/gns/gnunet-gns-import.c
src/gns/gnunet-gns-proxy.c
-src/gns/gnunet-gns.c
src/gns/gnunet-service-gns.c
src/gns/gnunet-service-gns_interceptor.c
src/gns/gnunet-service-gns_resolver.c
@@ -176,15 +177,15 @@
src/gns/nss/nss_gns_query.c
src/gns/plugin_block_gns.c
src/gns/plugin_gnsrecord_gns.c
-src/gns/w32nsp-install.c
-src/gns/w32nsp-resolve.c
-src/gns/w32nsp-uninstall.c
-src/gns/w32nsp.c
src/gnsrecord/gnsrecord.c
src/gnsrecord/gnsrecord_crypto.c
src/gnsrecord/gnsrecord_misc.c
src/gnsrecord/gnsrecord_serialization.c
src/gnsrecord/plugin_gnsrecord_dns.c
+src/gns/w32nsp.c
+src/gns/w32nsp-install.c
+src/gns/w32nsp-resolve.c
+src/gns/w32nsp-uninstall.c
src/hello/address.c
src/hello/gnunet-hello.c
src/hello/hello.c
@@ -204,31 +205,31 @@
src/namecache/namecache_api.c
src/namecache/plugin_namecache_postgres.c
src/namecache/plugin_namecache_sqlite.c
+src/namestore/gnunet-namestore.c
src/namestore/gnunet-namestore-fcfsd.c
-src/namestore/gnunet-namestore.c
src/namestore/gnunet-service-namestore.c
src/namestore/namestore_api.c
src/namestore/namestore_api_monitor.c
src/namestore/plugin_namestore_postgres.c
src/namestore/plugin_namestore_sqlite.c
+src/nat/gnunet-helper-nat-client.c
src/nat/gnunet-helper-nat-client-windows.c
-src/nat/gnunet-helper-nat-client.c
+src/nat/gnunet-helper-nat-server.c
src/nat/gnunet-helper-nat-server-windows.c
-src/nat/gnunet-helper-nat-server.c
src/nat/gnunet-nat-server.c
+src/nat/nat_auto.c
src/nat/nat.c
-src/nat/nat_auto.c
src/nat/nat_mini.c
src/nat/nat_test.c
+src/nse/gnunet-nse.c
src/nse/gnunet-nse-profiler.c
-src/nse/gnunet-nse.c
src/nse/gnunet-service-nse.c
src/nse/nse_api.c
-src/peerinfo-tool/gnunet-peerinfo.c
-src/peerinfo-tool/gnunet-peerinfo_plugins.c
src/peerinfo/gnunet-service-peerinfo.c
src/peerinfo/peerinfo_api.c
src/peerinfo/peerinfo_api_notify.c
+src/peerinfo-tool/gnunet-peerinfo.c
+src/peerinfo-tool/gnunet-peerinfo_plugins.c
src/peerstore/gnunet-peerstore.c
src/peerstore/gnunet-service-peerstore.c
src/peerstore/peerstore_api.c
@@ -288,30 +289,30 @@
src/testbed/gnunet-daemon-testbed-blacklist.c
src/testbed/gnunet-daemon-testbed-underlay.c
src/testbed/gnunet-helper-testbed.c
+src/testbed/gnunet_mpi_test.c
src/testbed/gnunet-service-test-barriers.c
-src/testbed/gnunet-service-testbed-logger.c
+src/testbed/gnunet-service-testbed_barriers.c
src/testbed/gnunet-service-testbed.c
-src/testbed/gnunet-service-testbed_barriers.c
src/testbed/gnunet-service-testbed_cache.c
src/testbed/gnunet-service-testbed_connectionpool.c
src/testbed/gnunet-service-testbed_cpustatus.c
src/testbed/gnunet-service-testbed_links.c
+src/testbed/gnunet-service-testbed-logger.c
src/testbed/gnunet-service-testbed_meminfo.c
src/testbed/gnunet-service-testbed_oc.c
src/testbed/gnunet-service-testbed_peers.c
+src/testbed/gnunet_testbed_mpi_spawn.c
src/testbed/gnunet-testbed-profiler.c
-src/testbed/gnunet_mpi_test.c
-src/testbed/gnunet_testbed_mpi_spawn.c
+src/testbed/testbed_api_barriers.c
src/testbed/testbed_api.c
-src/testbed/testbed_api_barriers.c
src/testbed/testbed_api_hosts.c
src/testbed/testbed_api_operations.c
src/testbed/testbed_api_peers.c
src/testbed/testbed_api_sd.c
src/testbed/testbed_api_services.c
src/testbed/testbed_api_statistics.c
+src/testbed/testbed_api_testbed.c
src/testbed/testbed_api_test.c
-src/testbed/testbed_api_testbed.c
src/testbed/testbed_api_topology.c
src/testbed/testbed_api_underlay.c
src/testbed/testbed_logger_api.c
@@ -321,36 +322,36 @@
src/topology/friends.c
src/topology/gnunet-daemon-topology.c
src/transport/gnunet-helper-transport-bluetooth.c
+src/transport/gnunet-helper-transport-wlan.c
src/transport/gnunet-helper-transport-wlan-dummy.c
-src/transport/gnunet-helper-transport-wlan.c
+src/transport/gnunet-service-transport_blacklist.c
src/transport/gnunet-service-transport.c
-src/transport/gnunet-service-transport_blacklist.c
src/transport/gnunet-service-transport_clients.c
src/transport/gnunet-service-transport_hello.c
src/transport/gnunet-service-transport_manipulation.c
src/transport/gnunet-service-transport_neighbours.c
src/transport/gnunet-service-transport_plugins.c
src/transport/gnunet-service-transport_validation.c
+src/transport/gnunet-transport.c
src/transport/gnunet-transport-certificate-creation.c
src/transport/gnunet-transport-wlan-receiver.c
src/transport/gnunet-transport-wlan-sender.c
-src/transport/gnunet-transport.c
-src/transport/plugin_transport_bluetooth.c
src/transport/plugin_transport_http_client.c
src/transport/plugin_transport_http_common.c
src/transport/plugin_transport_http_server.c
src/transport/plugin_transport_smtp.c
src/transport/plugin_transport_tcp.c
src/transport/plugin_transport_template.c
+src/transport/plugin_transport_udp_broadcasting.c
src/transport/plugin_transport_udp.c
-src/transport/plugin_transport_udp_broadcasting.c
src/transport/plugin_transport_unix.c
src/transport/plugin_transport_wlan.c
-src/transport/transport-testing.c
-src/transport/transport_api.c
src/transport/transport_api_address_to_string.c
src/transport/transport_api_blacklist.c
-src/transport/transport_api_monitoring.c
+src/transport/transport_api.c
+src/transport/transport_api_monitor_peers.c
+src/transport/transport_api_monitor_validation.c
+src/transport/transport-testing.c
src/tun/regex.c
src/tun/tun.c
src/util/bandwidth.c
@@ -365,8 +366,8 @@
src/util/container_bloomfilter.c
src/util/container_heap.c
src/util/container_meta_data.c
+src/util/container_multihashmap32.c
src/util/container_multihashmap.c
-src/util/container_multihashmap32.c
src/util/container_multipeermap.c
src/util/container_slist.c
src/util/crypto_crc.c
@@ -381,8 +382,8 @@
src/util/disk.c
src/util/getopt.c
src/util/getopt_helpers.c
+src/util/gnunet-config.c
src/util/gnunet-config-diff.c
-src/util/gnunet-config.c
src/util/gnunet-ecc.c
src/util/gnunet-helper-w32-console.c
src/util/gnunet-resolver.c
@@ -413,8 +414,8 @@
src/util/w32cat.c
src/util/win.c
src/util/winproc.c
+src/vpn/gnunet-helper-vpn.c
src/vpn/gnunet-helper-vpn-windows.c
-src/vpn/gnunet-helper-vpn.c
src/vpn/gnunet-service-vpn.c
src/vpn/gnunet-vpn.c
src/vpn/vpn_api.c
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2014-06-25 19:29:54 UTC (rev 33849)
+++ gnunet/src/transport/Makefile.am 2014-06-25 20:22:58 UTC (rev 33850)
@@ -276,9 +276,11 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_wlan_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_wlan_la_CFLAGS = \
+ $(CFLAGS) -DBUILD_WLAN
libgnunet_plugin_transport_bluetooth_la_SOURCES = \
- plugin_transport_bluetooth.c plugin_transport_wlan.h
+ plugin_transport_wlan.c plugin_transport_wlan.h
libgnunet_plugin_transport_bluetooth_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -287,6 +289,8 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_bluetooth_la_CFLAGS = \
+ $(CFLAGS) -DBUILD_BLUETOOTH
libgnunet_plugin_transport_udp_la_SOURCES = \
plugin_transport_udp.c plugin_transport_udp.h \
Deleted: gnunet/src/transport/plugin_transport_bluetooth.c
===================================================================
--- gnunet/src/transport/plugin_transport_bluetooth.c 2014-06-25 19:29:54 UTC
(rev 33849)
+++ gnunet/src/transport/plugin_transport_bluetooth.c 2014-06-25 20:22:58 UTC
(rev 33850)
@@ -1,2052 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file transport/plugin_transport_bluetooth.c
- * @brief transport plugin for bluetooth
- * @author David Brodski
- * @author Christian Grothoff
- *
- * THIS IS A COPY OF plugin_transport_wlan.c
- */
-#include "platform.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "plugin_transport_wlan.h"
-#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_fragmentation_lib.h"
-#include "gnunet_constants.h"
-
-#ifdef MINGW
- #undef interface
-#endif
-
-#define LOG(kind,...) GNUNET_log_from (kind, "transport-bluetooth",__VA_ARGS__)
-
-#define PLUGIN_NAME "bluetooth"
-
-/**
- * Max size of packet (that we give to the WLAN driver for transmission)
- */
-#define WLAN_MTU 1430
-
-/**
- * time out of a mac endpoint
- */
-#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, 60)
-
-/**
- * Maximum number of messages in defragmentation queue per MAC
- */
-#define MESSAGES_IN_DEFRAG_QUEUE_PER_MAC 2
-
-/**
- * Link layer control fields for better compatibility
- * (i.e. GNUnet over WLAN is not IP-over-WLAN).
- */
-#define WLAN_LLC_DSAP_FIELD 0x1f
-#define WLAN_LLC_SSAP_FIELD 0x1f
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * Header for messages which need fragmentation. This is the format of
- * a message we obtain AFTER defragmentation. We then need to check
- * the CRC and then tokenize the payload and pass it to the
- * 'receive' callback.
- */
-struct WlanHeader
-{
-
- /**
- * Message type is #GNUNET_MESSAGE_TYPE_WLAN_DATA.
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * CRC32 checksum (only over the payload), in NBO.
- */
- uint32_t crc GNUNET_PACKED;
-
- /**
- * Sender of the message.
- */
- struct GNUNET_PeerIdentity sender;
-
- /**
- * Target of the message.
- */
- struct GNUNET_PeerIdentity target;
-
- /* followed by payload, possibly including
- multiple messages! */
-
-};
-
-
-struct WlanAddress
-{
- uint32_t options GNUNET_PACKED;
-
- struct GNUNET_TRANSPORT_WLAN_MacAddress mac;
-};
-
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Information kept for each message that is yet to be fragmented and
- * transmitted.
- */
-struct PendingMessage
-{
- /**
- * next entry in the DLL
- */
- struct PendingMessage *next;
-
- /**
- * previous entry in the DLL
- */
- struct PendingMessage *prev;
-
- /**
- * The pending message
- */
- struct WlanHeader *msg;
-
- /**
- * Continuation function to call once the message
- * has been sent. Can be NULL if there is no
- * continuation to call.
- */
- GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
- /**
- * Cls for transmit_cont
- */
- void *transmit_cont_cls;
-
- /**
- * Timeout task (for this message).
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
-};
-
-
-/**
- * Session handle for connections with other peers.
- */
-struct Session
-{
- /**
- * To whom are we talking to (set to our identity
- * if we are still waiting for the welcome message)
- */
- struct GNUNET_PeerIdentity target;
-
- /**
- * We keep all sessions in a DLL at their respective
- * `struct MACEndpoint *`.
- */
- struct Session *next;
-
- /**
- * We keep all sessions in a DLL at their respective
- * 'struct MACEndpoint'.
- */
- struct Session *prev;
-
- /**
- * MAC endpoint with the address of this peer.
- */
- struct MacEndpoint *mac;
-
- /**
- * The address for this session
- */
- struct GNUNET_HELLO_Address *address;
-
- /**
- * Head of messages currently pending for transmission to this peer.
- */
- struct PendingMessage *pending_message_head;
-
- /**
- * Tail of messages currently pending for transmission to this peer.
- */
- struct PendingMessage *pending_message_tail;
-
- /**
- * When should this session time out?
- */
- struct GNUNET_TIME_Absolute timeout;
-
- /**
- * Timeout task (for the session).
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
-};
-
-
-/**
- * Struct for messages that are being fragmented in a MAC's transmission queue.
- */
-struct FragmentMessage
-{
-
- /**
- * This is a doubly-linked list.
- */
- struct FragmentMessage *next;
-
- /**
- * This is a doubly-linked list.
- */
- struct FragmentMessage *prev;
-
- /**
- * MAC endpoint this message belongs to
- */
- struct MacEndpoint *macendpoint;
-
- /**
- * Fragmentation context
- */
- struct GNUNET_FRAGMENT_Context *fragcontext;
-
- /**
- * Transmission handle to helper (to cancel if the frag context
- * is destroyed early for some reason).
- */
- struct GNUNET_HELPER_SendHandle *sh;
-
- /**
- * Intended recipient.
- */
- struct GNUNET_PeerIdentity target;
-
- /**
- * Timeout value for the message.
- */
- struct GNUNET_TIME_Absolute timeout;
-
- /**
- * Timeout task.
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * Continuation to call when we're done with this message.
- */
- GNUNET_TRANSPORT_TransmitContinuation cont;
-
- /**
- * Closure for @e cont.
- */
- void *cont_cls;
-
- /**
- * Size of original message
- */
- size_t size_payload;
-
- /**
- * Number of bytes used to transmit message
- */
- size_t size_on_wire;
-
-};
-
-
-/**
- * Struct to represent one network card connection
- */
-struct MacEndpoint
-{
-
- /**
- * We keep all MACs in a DLL in the plugin.
- */
- struct MacEndpoint *next;
-
- /**
- * We keep all MACs in a DLL in the plugin.
- */
- struct MacEndpoint *prev;
-
- /**
- * Pointer to the global plugin struct.
- */
- struct Plugin *plugin;
-
- /**
- * Head of sessions that use this MAC.
- */
- struct Session *sessions_head;
-
- /**
- * Tail of sessions that use this MAC.
- */
- struct Session *sessions_tail;
-
- /**
- * Head of messages we are currently sending to this MAC.
- */
- struct FragmentMessage *sending_messages_head;
-
- /**
- * Tail of messages we are currently sending to this MAC.
- */
- struct FragmentMessage *sending_messages_tail;
-
- /**
- * Defrag context for this MAC
- */
- struct GNUNET_DEFRAGMENT_Context *defrag;
-
- /**
- * When should this endpoint time out?
- */
- struct GNUNET_TIME_Absolute timeout;
-
- /**
- * Timeout task.
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * peer mac address
- */
- struct WlanAddress addr;
-
- /**
- * Message delay for fragmentation context
- */
- struct GNUNET_TIME_Relative msg_delay;
-
- /**
- * ACK delay for fragmentation context
- */
- struct GNUNET_TIME_Relative ack_delay;
-
- /**
- * count of messages in the fragment out queue for this mac endpoint
- */
- unsigned int fragment_messages_out_count;
-
- /**
- * Desired transmission power for this MAC
- */
- uint16_t tx_power;
-
- /**
- * Desired transmission rate for this MAC
- */
- uint8_t rate;
-
- /**
- * Antenna we should use for this MAC
- */
- uint8_t antenna;
-
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
- /**
- * Our environment.
- */
- struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
- /**
- * Handle to helper process for priviledged operations.
- */
- struct GNUNET_HELPER_Handle *suid_helper;
-
- /**
- * ARGV-vector for the helper (all helpers take only the binary
- * name, one actual argument, plus the NULL terminator for 'argv').
- */
- char *helper_argv[3];
-
- /**
- * The interface of the wlan card given to us by the user.
- */
- char *interface;
-
- /**
- * Tokenizer for demultiplexing of data packets resulting from
defragmentation.
- */
- struct GNUNET_SERVER_MessageStreamTokenizer *fragment_data_tokenizer;
-
- /**
- * Tokenizer for demultiplexing of data packets received from the suid helper
- */
- struct GNUNET_SERVER_MessageStreamTokenizer *helper_payload_tokenizer;
-
- /**
- * Tokenizer for demultiplexing of data packets that follow the WLAN Header
- */
- struct GNUNET_SERVER_MessageStreamTokenizer *wlan_header_payload_tokenizer;
-
- /**
- * Head of list of open connections.
- */
- struct MacEndpoint *mac_head;
-
- /**
- * Tail of list of open connections.
- */
- struct MacEndpoint *mac_tail;
-
- /**
- * Number of connections
- */
- unsigned int mac_count;
-
- /**
- * Task that periodically sends a HELLO beacon via the helper.
- */
- GNUNET_SCHEDULER_TaskIdentifier beacon_task;
-
- /**
- * Tracker for bandwidth limit
- */
- struct GNUNET_BANDWIDTH_Tracker tracker;
-
- /**
- * The mac_address of the wlan card given to us by the helper.
- */
- struct GNUNET_TRANSPORT_WLAN_MacAddress mac_address;
-
- /**
- * Have we received a control message with our MAC address yet?
- */
- int have_mac;
-
- /**
- * Options for addresses
- */
- uint32_t options;
-
-};
-
-
-/**
- * Information associated with a message. Can contain
- * the session or the MAC endpoint associated with the
- * message (or both).
- */
-struct MacAndSession
-{
- /**
- * NULL if the identity of the other peer is not known.
- */
- struct Session *session;
-
- /**
- * MAC address of the other peer, NULL if not known.
- */
- struct MacEndpoint *endpoint;
-};
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address. Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the @a addr
- * @return string representing the same address
- */
-static const char *
-bluetooth_plugin_address_to_string (void *cls,
- const void *addr,
- size_t addrlen);
-
-/**
- * Print MAC addresses nicely.
- *
- * @param mac the mac address
- * @return string to a static buffer with
- * the human-readable mac, will be overwritten during the next call to
- * this function
- */
-static const char *
-mac_to_string (const struct GNUNET_TRANSPORT_WLAN_MacAddress * mac)
-{
- static char macstr[20];
-
- GNUNET_snprintf (macstr,
- sizeof (macstr),
- "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
- mac->mac[0], mac->mac[1],
- mac->mac[2], mac->mac[3],
- mac->mac[4], mac->mac[5]);
- return macstr;
-}
-
-
-/**
- * Fill the radiotap header
- *
- * @param endpoint pointer to the endpoint, can be NULL
- * @param header pointer to the radiotap header
- * @param size total message size
- */
-static void
-get_radiotap_header (struct MacEndpoint *endpoint,
- struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *header,
- uint16_t size)
-{
- header->header.type = ntohs (GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER);
- header->header.size = ntohs (size);
- if (NULL != endpoint)
- {
- header->rate = endpoint->rate;
- header->tx_power = endpoint->tx_power;
- header->antenna = endpoint->antenna;
- }
- else
- {
- header->rate = 255;
- header->tx_power = 0;
- header->antenna = 0;
- }
-}
-
-
-/**
- * Generate the WLAN hardware header for one packet
- *
- * @param plugin the plugin handle
- * @param header address to write the header to
- * @param to_mac_addr address of the recipient
- * @param size size of the whole packet, needed to calculate the time to send
the packet
- */
-static void
-get_wlan_header (struct Plugin *plugin,
- struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *header,
- const struct GNUNET_TRANSPORT_WLAN_MacAddress *to_mac_addr,
- unsigned int size)
-{
- const int rate = 11000000;
-
- header->frame_control = htons (IEEE80211_FC0_TYPE_DATA);
- header->addr1 = *to_mac_addr;
- header->addr2 = plugin->mac_address;
- header->addr3 = mac_bssid_gnunet;
- header->duration = GNUNET_htole16 ((size * 1000000) / rate + 290);
- header->sequence_control = 0; // FIXME?
- header->llc[0] = WLAN_LLC_DSAP_FIELD;
- header->llc[1] = WLAN_LLC_SSAP_FIELD;
- header->llc[2] = 0; // FIXME?
- header->llc[3] = 0; // FIXME?
-}
-
-
-/**
- * Send an ACK for a fragment we received.
- *
- * @param cls the 'struct MacEndpoint' the ACK must be sent to
- * @param msg_id id of the message
- * @param hdr pointer to the hdr where the ack is stored
- */
-static void
-send_ack (void *cls, uint32_t msg_id,
- const struct GNUNET_MessageHeader *hdr)
-{
- struct MacEndpoint *endpoint = cls;
- struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage* radio_header;
- uint16_t msize = ntohs (hdr->size);
- size_t size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) +
msize;
- char buf[size];
-
- if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- GNUNET_break (0);
- return;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending ACK to helper\n");
- radio_header = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) buf;
- get_radiotap_header (endpoint, radio_header, size);
- get_wlan_header (endpoint->plugin,
- &radio_header->frame,
- &endpoint->addr.mac,
- sizeof (endpoint->addr.mac));
- memcpy (&radio_header[1], hdr, msize);
- if (NULL !=
- GNUNET_HELPER_send (endpoint->plugin->suid_helper,
- &radio_header->header,
- GNUNET_NO /* dropping ACKs is bad */,
- NULL, NULL))
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# Bluetooth ACKs sent"),
- 1, GNUNET_NO);
-}
-
-
-/**
- * Handles the data after all fragments are put together
- *
- * @param cls macendpoint this messages belongs to
- * @param hdr pointer to the data
- */
-static void
-bluetooth_data_message_handler (void *cls,
- const struct GNUNET_MessageHeader *hdr)
-{
- struct MacEndpoint *endpoint = cls;
- struct Plugin *plugin = endpoint->plugin;
- struct MacAndSession mas;
-
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# Bluetooth messages defragmented"), 1,
- GNUNET_NO);
- mas.session = NULL;
- mas.endpoint = endpoint;
- (void) GNUNET_SERVER_mst_receive (plugin->fragment_data_tokenizer,
- &mas,
- (const char *) hdr,
- ntohs (hdr->size),
- GNUNET_YES, GNUNET_NO);
-}
-
-
-/**
- * Free a session
- *
- * @param session the session free
- */
-static void
-free_session (struct Session *session)
-{
- struct MacEndpoint *endpoint = session->mac;
- struct PendingMessage *pm;
-
- endpoint->plugin->env->session_end (endpoint->plugin->env->cls,
- session->address,
- session);
- while (NULL != (pm = session->pending_message_head))
- {
- GNUNET_CONTAINER_DLL_remove (session->pending_message_head,
- session->pending_message_tail, pm);
- if (GNUNET_SCHEDULER_NO_TASK != pm->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (pm->timeout_task);
- pm->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_free (pm->msg);
- GNUNET_free (pm);
- }
- GNUNET_CONTAINER_DLL_remove (endpoint->sessions_head,
- endpoint->sessions_tail,
- session);
- if (session->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (session->timeout_task);
- session->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats, _("# Bluetooth
sessions allocated"), -1,
- GNUNET_NO);
- GNUNET_HELLO_address_free (session->address);
- GNUNET_free (session);
-}
-
-
-/**
- * A session is timing out. Clean up.
- *
- * @param cls pointer to the Session
- * @param tc unused
- */
-static void
-session_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct Session * session = cls;
- struct GNUNET_TIME_Relative timeout;
-
- session->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- timeout = GNUNET_TIME_absolute_get_remaining (session->timeout);
- if (0 == timeout.rel_value_us)
- {
- free_session (session);
- return;
- }
- session->timeout_task =
- GNUNET_SCHEDULER_add_delayed (timeout, &session_timeout, session);
-}
-
-
-/**
- * Create a new session
- *
- * @param endpoint pointer to the mac endpoint of the peer
- * @param peer peer identity to use for this session
- * @return returns the session
- */
-static struct Session *
-create_session (struct MacEndpoint *endpoint,
- const struct GNUNET_PeerIdentity *peer)
-{
- struct Session *session;
-
- for (session = endpoint->sessions_head; NULL != session; session =
session->next)
- if (0 == memcmp (peer, &session->target,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- session->timeout = GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- return session;
- }
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats, _("# Bluetooth
sessions allocated"), 1,
- GNUNET_NO);
- session = GNUNET_new (struct Session);
- GNUNET_CONTAINER_DLL_insert_tail (endpoint->sessions_head,
- endpoint->sessions_tail,
- session);
- session->address = GNUNET_HELLO_address_allocate (peer, PLUGIN_NAME,
- &endpoint->addr, sizeof (endpoint->addr), GNUNET_HELLO_ADDRESS_INFO_NONE);
- session->mac = endpoint;
- session->target = *peer;
- session->timeout = GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- session->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&session_timeout, session);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Created new session for peer `%s' with endpoint %s\n",
- GNUNET_i2s (peer),
- mac_to_string (&endpoint->addr.mac));
- return session;
-}
-
-
-/**
- * Lookup a new session
- *
- * @param endpoint pointer to the mac endpoint of the peer
- * @param peer peer identity to use for this session
- * @return returns the session or NULL
- */
-static struct Session *
-lookup_session (struct MacEndpoint *endpoint,
- const struct GNUNET_PeerIdentity *peer)
-{
- struct Session *session;
-
- for (session = endpoint->sessions_head; NULL != session; session =
session->next)
- if (0 == memcmp (peer, &session->target, sizeof (struct
GNUNET_PeerIdentity)))
- {
- session->timeout = GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- return session;
- }
- return NULL;
-}
-
-
-/**
- * Function called once we have successfully given the fragment
- * message to the SUID helper process and we are thus ready for
- * the next fragment.
- *
- * @param cls the 'struct FragmentMessage'
- * @param result result of the operation (GNUNET_OK on success, GNUNET_NO if
the helper died, GNUNET_SYSERR
- * if the helper was stopped)
- */
-static void
-fragment_transmission_done (void *cls,
- int result)
-{
- struct FragmentMessage *fm = cls;
-
- fm->sh = NULL;
- GNUNET_FRAGMENT_context_transmission_done (fm->fragcontext);
-}
-
-
-/**
- * Transmit a fragment of a message.
- *
- * @param cls `struct FragmentMessage *` this fragment message belongs to
- * @param hdr pointer to the start of the fragment message
- */
-static void
-transmit_fragment (void *cls,
- const struct GNUNET_MessageHeader *hdr)
-{
- struct FragmentMessage *fm = cls;
- struct MacEndpoint *endpoint = fm->macendpoint;
- size_t size;
- uint16_t msize;
-
- msize = ntohs (hdr->size);
- size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) + msize;
- {
- char buf[size];
- struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *radio_header;
-
- radio_header = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) buf;
- get_radiotap_header (endpoint, radio_header, size);
- get_wlan_header (endpoint->plugin,
- &radio_header->frame,
- &endpoint->addr.mac,
- sizeof (endpoint->addr.mac));
- memcpy (&radio_header[1], hdr, msize);
- GNUNET_assert (NULL == fm->sh);
- fm->sh = GNUNET_HELPER_send (endpoint->plugin->suid_helper,
- &radio_header->header,
- GNUNET_NO,
- &fragment_transmission_done, fm);
- fm->size_on_wire += size;
- if (NULL != fm->sh)
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# Bluetooth message fragments sent"),
- 1, GNUNET_NO);
- else
- GNUNET_FRAGMENT_context_transmission_done (fm->fragcontext);
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- "# bytes currently in Bluetooth buffers",
- -msize, GNUNET_NO);
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- "# bytes transmitted via Bluetooth",
- msize, GNUNET_NO);
- }
-}
-
-
-/**
- * Frees the space of a message in the fragment queue (send queue)
- *
- * @param fm message to free
- */
-static void
-free_fragment_message (struct FragmentMessage *fm)
-{
- struct MacEndpoint *endpoint = fm->macendpoint;
-
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# Bluetooth messages pending (with
fragmentation)"),
- -1, GNUNET_NO);
- GNUNET_CONTAINER_DLL_remove (endpoint->sending_messages_head,
- endpoint->sending_messages_tail, fm);
- if (NULL != fm->sh)
- {
- GNUNET_HELPER_send_cancel (fm->sh);
- fm->sh = NULL;
- }
- GNUNET_FRAGMENT_context_destroy (fm->fragcontext,
- &endpoint->msg_delay,
- &endpoint->ack_delay);
- if (fm->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (fm->timeout_task);
- fm->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_free (fm);
-}
-
-
-/**
- * A FragmentMessage has timed out. Remove it.
- *
- * @param cls pointer to the 'struct FragmentMessage'
- * @param tc pointer to the GNUNET_SCHEDULER_TaskContext
- */
-static void
-fragmentmessage_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct FragmentMessage *fm = cls;
-
- fm->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- if (NULL != fm->cont)
- {
- fm->cont (fm->cont_cls,
- &fm->target,
- GNUNET_SYSERR,
- fm->size_payload,
- fm->size_on_wire);
- fm->cont = NULL;
- }
- free_fragment_message (fm);
-}
-
-
-/**
- * Transmit a message to the given destination with fragmentation.
- *
- * @param endpoint desired destination
- * @param timeout how long can the message wait?
- * @param target peer that should receive the message
- * @param msg message to transmit
- * @param payload_size bytes of payload
- * @param cont continuation to call once the message has
- * been transmitted (or if the transport is ready
- * for the next transmission call; or if the
- * peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- */
-static void
-send_with_fragmentation (struct MacEndpoint *endpoint,
- struct GNUNET_TIME_Relative timeout,
- const struct GNUNET_PeerIdentity *target,
- const struct GNUNET_MessageHeader *msg,
- size_t payload_size,
- GNUNET_TRANSPORT_TransmitContinuation cont,
- void *cont_cls)
-
-{
- struct FragmentMessage *fm;
- struct Plugin *plugin;
-
- plugin = endpoint->plugin;
- fm = GNUNET_new (struct FragmentMessage);
- fm->macendpoint = endpoint;
- fm->target = *target;
- fm->size_payload = payload_size;
- fm->size_on_wire = 0;
- fm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- fm->cont = cont;
- fm->cont_cls = cont_cls;
- /* 1 MBit/s typical data rate, 1430 byte fragments => ~100 ms per message */
- fm->fragcontext =
- GNUNET_FRAGMENT_context_create (plugin->env->stats, WLAN_MTU,
- &plugin->tracker,
- endpoint->msg_delay,
- endpoint->ack_delay,
- msg,
- &transmit_fragment, fm);
- fm->timeout_task =
- GNUNET_SCHEDULER_add_delayed (timeout,
- &fragmentmessage_timeout, fm);
- GNUNET_CONTAINER_DLL_insert_tail (endpoint->sending_messages_head,
- endpoint->sending_messages_tail,
- fm);
-}
-
-
-/**
- * Free a MAC endpoint.
- *
- * @param endpoint pointer to the MacEndpoint to free
- */
-static void
-free_macendpoint (struct MacEndpoint *endpoint)
-{
- struct Plugin *plugin = endpoint->plugin;
- struct FragmentMessage *fm;
- struct Session *session;
-
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# Bluetooth MAC endpoints allocated"), -1,
GNUNET_NO);
- while (NULL != (session = endpoint->sessions_head))
- free_session (session);
- while (NULL != (fm = endpoint->sending_messages_head))
- free_fragment_message (fm);
- GNUNET_CONTAINER_DLL_remove (plugin->mac_head,
- plugin->mac_tail,
- endpoint);
-
- if (NULL != endpoint->defrag)
- {
- GNUNET_DEFRAGMENT_context_destroy(endpoint->defrag);
- endpoint->defrag = NULL;
- }
-
- plugin->mac_count--;
- if (GNUNET_SCHEDULER_NO_TASK != endpoint->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (endpoint->timeout_task);
- endpoint->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_free (endpoint);
-}
-
-
-/**
- * A MAC endpoint is timing out. Clean up.
- *
- * @param cls pointer to the MacEndpoint
- * @param tc pointer to the GNUNET_SCHEDULER_TaskContext
- */
-static void
-macendpoint_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct MacEndpoint *endpoint = cls;
- struct GNUNET_TIME_Relative timeout;
-
- endpoint->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- timeout = GNUNET_TIME_absolute_get_remaining (endpoint->timeout);
- if (0 == timeout.rel_value_us)
- {
- free_macendpoint (endpoint);
- return;
- }
- endpoint->timeout_task =
- GNUNET_SCHEDULER_add_delayed (timeout, &macendpoint_timeout,
- endpoint);
-}
-
-
-/**
- * Find (or create) a MacEndpoint with a specific MAC address
- *
- * @param plugin pointer to the plugin struct
- * @param addr the MAC address of the endpoint
- * @return handle to our data structure for this MAC
- */
-static struct MacEndpoint *
-create_macendpoint (struct Plugin *plugin,
- struct WlanAddress *addr)
-{
- struct MacEndpoint *pos;
-
- for (pos = plugin->mac_head; NULL != pos; pos = pos->next)
- if (0 == memcmp (addr, &pos->addr, sizeof (struct WlanAddress)))
- return pos;
- pos = GNUNET_new (struct MacEndpoint);
- pos->addr = (*addr);
- pos->plugin = plugin;
- pos->defrag =
- GNUNET_DEFRAGMENT_context_create (plugin->env->stats, WLAN_MTU,
- MESSAGES_IN_DEFRAG_QUEUE_PER_MAC,
- pos,
- &bluetooth_data_message_handler,
- &send_ack);
-
- pos->msg_delay = GNUNET_TIME_UNIT_MILLISECONDS;
- pos->ack_delay = GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS,
- 100);
- pos->timeout = GNUNET_TIME_relative_to_absolute (MACENDPOINT_TIMEOUT);
- pos->timeout_task =
- GNUNET_SCHEDULER_add_delayed (MACENDPOINT_TIMEOUT, &macendpoint_timeout,
- pos);
- GNUNET_CONTAINER_DLL_insert (plugin->mac_head, plugin->mac_tail, pos);
- plugin->mac_count++;
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# Bluetooth MAC endpoints allocated"),
- 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "New MAC endpoint `%s'\n",
- bluetooth_plugin_address_to_string(NULL,
- addr,
- sizeof (struct WlanAddress)));
- return pos;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure ('struct Plugin*')
- * @param session the session
- * @return the network type in HBO or GNUNET_SYSERR
- */
-static enum GNUNET_ATS_Network_Type
-bluetooth_get_network (void *cls,
- struct Session *session)
-{
- GNUNET_assert (NULL != session);
- return GNUNET_ATS_NET_BT;
-}
-
-
-/**
- * Look up a session for a peer and create a new session if none is found
- *
- * @param endpoint pointer to the mac endpoint of the peer
- * @param peer peer identity to use for this session
- * @return returns the session
- */
-static struct Session *
-get_session (struct MacEndpoint *endpoint,
- const struct GNUNET_PeerIdentity *peer)
-{
- struct Session *session;
- if (NULL != (session = lookup_session (endpoint, peer)))
- return session;
- return create_session (endpoint, peer);
-}
-
-
-/**
- * Creates a new outbound session the transport service will use to send data
to the
- * peer
- *
- * @param cls the plugin
- * @param address the address
- * @return the session or NULL of max connections exceeded
- */
-static struct Session *
-bluetooth_plugin_get_session (void *cls,
- const struct GNUNET_HELLO_Address *address)
-{
- struct Plugin *plugin = cls;
- struct MacEndpoint *endpoint;
-
- if (NULL == address)
- return NULL;
- if (sizeof (struct WlanAddress) != address->address_length)
- {
- GNUNET_break (0);
- return NULL;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Service asked to create session for peer `%s' with MAC `%s'\n",
- GNUNET_i2s (&address->peer),
- bluetooth_plugin_address_to_string(NULL,
- address->address,
- address->address_length));
- endpoint = create_macendpoint (plugin,
- (struct WlanAddress *) address->address);
- return get_session (endpoint, &address->peer);
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuation).
- *
- * @param cls closure
- * @param target peer from which to disconnect
- */
-static void
-bluetooth_plugin_disconnect_peer (void *cls, const struct GNUNET_PeerIdentity
*target)
-{
- struct Plugin *plugin = cls;
- struct Session *session;
- struct MacEndpoint *endpoint;
-
- for (endpoint = plugin->mac_head; NULL != endpoint; endpoint =
endpoint->next)
- for (session = endpoint->sessions_head; NULL != session; session =
session->next)
- if (0 == memcmp (target, &session->target,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- free_session (session);
- break; /* inner-loop only (in case peer has another MAC as well!) */
- }
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuation).
- *
- * @param cls closure
- * @param session session to disconnect
- */
-static int
-bluetooth_plugin_disconnect_session (void *cls,
- struct Session *session)
-{
- free_session (session);
- return GNUNET_OK;
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-bluetooth_query_keepalive_factor (void *cls)
-{
- return 3;
-}
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin. Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself. This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param session which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in 'msgbuf'
- * @param priority how important is the message (most plugins will
- * ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- * require plugins to discard the message after the timeout,
- * just advisory for the desired delay; most plugins will ignore
- * this as well)
- * @param cont continuation to call once the message has
- * been transmitted (or if the transport is ready
- * for the next transmission call; or if the
- * peer disconnected...); can be NULL
- * @param cont_cls closure for cont
- * @return number of bytes used (on the physical network, with overheads);
- * -1 on hard errors (i.e. address invalid); 0 is a legal value
- * and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-bluetooth_plugin_send (void *cls,
- struct Session *session,
- const char *msgbuf,
- size_t msgbuf_size,
- unsigned int priority,
- struct GNUNET_TIME_Relative to,
- GNUNET_TRANSPORT_TransmitContinuation cont,
- void *cont_cls)
-{
- struct Plugin *plugin = cls;
- struct WlanHeader *wlanheader;
- size_t size = msgbuf_size + sizeof (struct WlanHeader);
- char buf[size] GNUNET_ALIGN;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting %u bytes of payload to peer `%s' (starting with %u byte
message of type %u)\n",
- msgbuf_size,
- GNUNET_i2s (&session->target),
- (unsigned int) ntohs (((struct GNUNET_MessageHeader*)msgbuf)->size),
- (unsigned int) ntohs (((struct GNUNET_MessageHeader*)msgbuf)->type));
- wlanheader = (struct WlanHeader *) buf;
- wlanheader->header.size = htons (msgbuf_size + sizeof (struct WlanHeader));
- wlanheader->header.type = htons (GNUNET_MESSAGE_TYPE_WLAN_DATA);
- wlanheader->sender = *plugin->env->my_identity;
- wlanheader->target = session->target;
- wlanheader->crc = htonl (GNUNET_CRYPTO_crc32_n (msgbuf, msgbuf_size));
- memcpy (&wlanheader[1], msgbuf, msgbuf_size);
-
- GNUNET_STATISTICS_update (plugin->env->stats,
- "# bytes currently in Bluetooth buffers",
- msgbuf_size, GNUNET_NO);
-
- send_with_fragmentation (session->mac,
- to,
- &session->target,
- &wlanheader->header,
- msgbuf_size,
- cont, cont_cls);
- return size;
-}
-
-
-/**
- * We have received data from the WLAN via some session. Process depending
- * on the message type (HELLO, DATA, FRAGMENTATION or FRAGMENTATION-ACK).
- *
- * @param cls pointer to the plugin
- * @param client pointer to the session this message belongs to
- * @param hdr start of the message
- */
-static int
-process_data (void *cls, void *client, const struct GNUNET_MessageHeader *hdr)
-{
- struct Plugin *plugin = cls;
- struct GNUNET_HELLO_Address *address;
- struct MacAndSession *mas = client;
- struct MacAndSession xmas;
- struct GNUNET_ATS_Information ats;
- struct FragmentMessage *fm;
- struct GNUNET_PeerIdentity tmpsource;
- const struct WlanHeader *wlanheader;
- int ret;
- uint16_t msize;
-
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl (GNUNET_ATS_NET_BT);
- msize = ntohs (hdr->size);
-
- GNUNET_STATISTICS_update (plugin->env->stats,
- "# bytes received via Bluetooth",
- msize, GNUNET_NO);
-
- switch (ntohs (hdr->type))
- {
- case GNUNET_MESSAGE_TYPE_HELLO:
- if (GNUNET_OK !=
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hdr,
&tmpsource))
- {
- GNUNET_break_op (0);
- break;
- }
- if (NULL == mas->endpoint)
- {
- GNUNET_break (0);
- break;
- }
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing %u bytes of HELLO from peer `%s' at MAC %s\n",
- (unsigned int) msize,
- GNUNET_i2s (&tmpsource),
- bluetooth_plugin_address_to_string (NULL,
- &mas->endpoint->addr,
- sizeof (mas->endpoint->addr)));
-
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# HELLO messages received via Bluetooth"), 1,
- GNUNET_NO);
-
- address = GNUNET_HELLO_address_allocate (&tmpsource, PLUGIN_NAME,
- &mas->endpoint->addr, sizeof (mas->endpoint->addr),
- GNUNET_HELLO_ADDRESS_INFO_INBOUND);
- plugin->env->receive (plugin->env->cls,
- address, mas->session, hdr);
- plugin->env->update_address_metrics (plugin->env->cls,
- address, mas->session, &ats, 1);
- GNUNET_HELLO_address_free (address);
- break;
- case GNUNET_MESSAGE_TYPE_FRAGMENT:
- if (NULL == mas->endpoint)
- {
- GNUNET_break (0);
- break;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing %u bytes of FRAGMENT from MAC %s\n",
- (unsigned int) msize,
- bluetooth_plugin_address_to_string (NULL,
- &mas->endpoint->addr,
- sizeof (mas->endpoint->addr)));
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# fragments received via Bluetooth"),
- 1,
- GNUNET_NO);
- (void) GNUNET_DEFRAGMENT_process_fragment (mas->endpoint->defrag,
- hdr);
- break;
- case GNUNET_MESSAGE_TYPE_FRAGMENT_ACK:
- if (NULL == mas->endpoint)
- {
- GNUNET_break (0);
- break;
- }
- GNUNET_STATISTICS_update (plugin->env->stats, _("# ACKs received via
Bluetooth"),
- 1, GNUNET_NO);
- for (fm = mas->endpoint->sending_messages_head; NULL != fm; fm = fm->next)
- {
- ret = GNUNET_FRAGMENT_process_ack (fm->fragcontext, hdr);
- if (GNUNET_OK == ret)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Got last ACK, finished message transmission to `%s' (%p)\n",
- bluetooth_plugin_address_to_string (NULL,
- &mas->endpoint->addr,
- sizeof (mas->endpoint->addr)),
- fm);
- mas->endpoint->timeout = GNUNET_TIME_relative_to_absolute
(MACENDPOINT_TIMEOUT);
- if (NULL != fm->cont)
- {
- fm->cont (fm->cont_cls, &fm->target, GNUNET_OK, fm->size_payload,
fm->size_on_wire);
- fm->cont = NULL;
- }
- free_fragment_message (fm);
- break;
- }
- if (GNUNET_NO == ret)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Got an ACK, message transmission to `%s' not yet finished\n",
- bluetooth_plugin_address_to_string (NULL,
- &mas->endpoint->addr,
- sizeof
(mas->endpoint->addr)));
- break;
- }
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "ACK not matched against any active fragmentation with MAC `%s'\n",
- bluetooth_plugin_address_to_string (NULL,
- &mas->endpoint->addr,
- sizeof (mas->endpoint->addr)));
- break;
- case GNUNET_MESSAGE_TYPE_WLAN_DATA:
- if (NULL == mas->endpoint)
- {
- GNUNET_break (0);
- break;
- }
- if (msize < sizeof (struct WlanHeader))
- {
- GNUNET_break (0);
- break;
- }
- wlanheader = (const struct WlanHeader *) hdr;
- if (0 != memcmp (&wlanheader->target,
- plugin->env->my_identity,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Bluetooth data for `%s', not for me, ignoring\n",
- GNUNET_i2s (&wlanheader->target));
- break;
- }
- if (ntohl (wlanheader->crc) !=
- GNUNET_CRYPTO_crc32_n (&wlanheader[1], msize - sizeof (struct
WlanHeader)))
- {
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# 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 BLUETOOTH DATA from peer `%s'\n",
- (unsigned int) msize,
- GNUNET_i2s (&wlanheader->sender));
- (void) GNUNET_SERVER_mst_receive (plugin->wlan_header_payload_tokenizer,
- &xmas,
- (const char *) &wlanheader[1],
- msize - sizeof (struct WlanHeader),
- GNUNET_YES, GNUNET_NO);
- break;
- default:
- if (NULL == mas->endpoint)
- {
- GNUNET_break (0);
- break;
- }
- if (NULL == mas->session)
- {
- GNUNET_break (0);
- break;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received packet with %u bytes of type %u from peer %s\n",
- (unsigned int) msize,
- (unsigned int) ntohs (hdr->type),
- GNUNET_i2s (&mas->session->target));
- plugin->env->receive (plugin->env->cls,
- mas->session->address,
- mas->session,
- hdr);
- plugin->env->update_address_metrics (plugin->env->cls,
- mas->session->address,
- mas->session,
- &ats, 1);
- break;
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Function used for to process the data from the suid process
- *
- * @param cls the plugin handle
- * @param client client that send the data (not used)
- * @param hdr header of the GNUNET_MessageHeader
- */
-static int
-handle_helper_message (void *cls, void *client,
- const struct GNUNET_MessageHeader *hdr)
-{
- struct Plugin *plugin = cls;
- struct GNUNET_HELLO_Address *address;
- const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *rxinfo;
- const struct GNUNET_TRANSPORT_WLAN_HelperControlMessage *cm;
- struct WlanAddress wa;
- struct MacAndSession mas;
- uint16_t msize;
-
- msize = ntohs (hdr->size);
- switch (ntohs (hdr->type))
- {
- case GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL:
- if (msize != sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage))
- {
- GNUNET_break (0);
- break;
- }
- cm = (const struct GNUNET_TRANSPORT_WLAN_HelperControlMessage *) hdr;
- if (GNUNET_YES == plugin->have_mac)
- {
- if (0 == memcmp (&plugin->mac_address,
- &cm->mac,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)))
- break; /* no change */
- /* remove old address */
- memset (&wa, 0, sizeof (struct WlanAddress));
- wa.mac = plugin->mac_address;
- wa.options = htonl(plugin->options);
- address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
- PLUGIN_NAME, &wa, sizeof (wa), GNUNET_HELLO_ADDRESS_INFO_NONE);
- plugin->env->notify_address (plugin->env->cls, GNUNET_NO, address);
- GNUNET_HELLO_address_free (address);
- }
- plugin->mac_address = cm->mac;
- plugin->have_mac = GNUNET_YES;
- memset (&wa, 0, sizeof (struct WlanAddress));
- wa.mac = plugin->mac_address;
- wa.options = htonl(plugin->options);
- address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
- PLUGIN_NAME, &wa, sizeof (wa), GNUNET_HELLO_ADDRESS_INFO_NONE);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "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, address);
- GNUNET_HELLO_address_free (address);
-
- break;
- case GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER:
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Got data message from helper with %u bytes\n",
- msize);
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# DATA messages received via Bluetooth"), 1,
- GNUNET_NO);
- if (msize < sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage))
- {
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Size of packet is too small (%u bytes)\n",
- msize);
- break;
- }
- rxinfo = (const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) hdr;
-
- /* check if message is actually for us */
- if (0 != memcmp (&rxinfo->frame.addr3, &mac_bssid_gnunet,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)))
- {
- /* Not the GNUnet BSSID */
- break;
- }
- if ( (0 != memcmp (&rxinfo->frame.addr1, &bc_all_mac,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress))) &&
- (0 != memcmp (&rxinfo->frame.addr1, &plugin->mac_address,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress))) )
- {
- /* Neither broadcast nor specifically for us */
- break;
- }
- if (0 == memcmp (&rxinfo->frame.addr2, &plugin->mac_address,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)))
- {
- /* packet is FROM us, thus not FOR us */
- break;
- }
-
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# Bluetooth DATA messages processed"),
- 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving %u bytes of data from MAC `%s'\n",
- (unsigned int) (msize - sizeof (struct
GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)),
- mac_to_string (&rxinfo->frame.addr2));
- wa.mac = rxinfo->frame.addr2;
- wa.options = htonl (0);
- mas.endpoint = create_macendpoint (plugin, &wa);
- mas.session = NULL;
- (void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer,
- &mas,
- (const char*) &rxinfo[1],
- msize - sizeof (struct
GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage),
- GNUNET_YES, GNUNET_NO);
- break;
- default:
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Unexpected message of type %u (%u bytes)",
- ntohs (hdr->type), ntohs (hdr->size));
- break;
- }
- return GNUNET_OK;
-}
-
-
-
-/**
- * Task to (periodically) send a HELLO beacon
- *
- * @param cls pointer to the plugin struct
- * @param tc scheduler context
- */
-static void
-send_hello_beacon (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct Plugin *plugin = cls;
- uint16_t size;
- uint16_t hello_size;
- struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *radioHeader;
- const struct GNUNET_MessageHeader *hello;
-
- hello = plugin->env->get_our_hello ();
- hello_size = GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *) hello);
- GNUNET_assert (sizeof (struct WlanHeader) + hello_size <= WLAN_MTU);
- size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) +
hello_size;
- {
- char buf[size] GNUNET_ALIGN;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending %u byte HELLO beacon\n",
- (unsigned int) size);
- radioHeader = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage*) buf;
- get_radiotap_header (NULL, radioHeader, size);
- get_wlan_header (plugin, &radioHeader->frame, &bc_all_mac, size);
- memcpy (&radioHeader[1], hello, hello_size);
- if (NULL !=
- GNUNET_HELPER_send (plugin->suid_helper,
- &radioHeader->header,
- GNUNET_YES /* can drop */,
- NULL, NULL))
- GNUNET_STATISTICS_update (plugin->env->stats,
- _("# HELLO beacons sent via Bluetooth"),
- 1, GNUNET_NO);
- }
- plugin->beacon_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (HELLO_BEACON_SCALING_FACTOR,
- plugin->mac_count + 1),
- &send_hello_beacon,
- plugin);
-
-}
-
-
-/**
- * Another peer has suggested an address for this
- * peer and transport plugin. Check that this could be a valid
- * address. If so, consider adding it to the list
- * of addresses.
- *
- * @param cls closure
- * @param addr pointer to the address
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- * and transport
- */
-static int
-bluetooth_plugin_address_suggested (void *cls,
- const void *addr,
- size_t addrlen)
-{
- struct Plugin *plugin = cls;
- struct WlanAddress *wa = (struct WlanAddress *) addr;
-
- if (addrlen != sizeof (struct WlanAddress))
- {
- GNUNET_break_op (0);
- return GNUNET_SYSERR;
- }
- if (GNUNET_YES != plugin->have_mac)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Rejecting MAC `%s': I don't know my MAC!\n",
- mac_to_string (addr));
- return GNUNET_NO; /* don't know my MAC */
- }
- if (0 != memcmp (&wa->mac,
- &plugin->mac_address,
- sizeof (wa->mac)))
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Rejecting MAC `%s': not my MAC!\n",
- mac_to_string (addr));
- return GNUNET_NO; /* not my MAC */
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address. Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the @a addr
- * @return string representing the same address
- */
-static const char *
-bluetooth_plugin_address_to_string (void *cls,
- const void *addr,
- size_t addrlen)
-{
- const struct GNUNET_TRANSPORT_WLAN_MacAddress *mac;
- static char macstr[36];
-
- if (sizeof (struct WlanAddress) != addrlen)
- {
- GNUNET_break (0);
- return NULL;
- }
- mac = &((struct WlanAddress *) addr)->mac;
- GNUNET_snprintf (macstr,
- sizeof (macstr),
- "%s.%u.%s",
- PLUGIN_NAME,
- ntohl (((struct WlanAddress *) addr)->options),
- mac_to_string (mac));
- return macstr;
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- * the specific address format depends on the transport
- * @param addrlen length of the @a addr
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-static void
-bluetooth_plugin_address_pretty_printer (void *cls,
- const char *type,
- const void *addr,
- size_t addrlen,
- int numeric,
- struct GNUNET_TIME_Relative timeout,
-
GNUNET_TRANSPORT_AddressStringCallback asc,
- void *asc_cls)
-{
- const char *ret;
-
- if (sizeof (struct WlanAddress) == addrlen)
- ret = bluetooth_plugin_address_to_string(NULL, addr, addrlen);
- else
- ret = NULL;
- asc (asc_cls,
- ret,
- (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
- asc (asc_cls, NULL, GNUNET_OK);
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls pointer to the api struct
- */
-void *
-libgnunet_plugin_transport_bluetooth_done (void *cls)
-{
- struct WlanAddress wa;
- struct GNUNET_HELLO_Address *address;
- struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
- struct Plugin *plugin = api->cls;
- struct MacEndpoint *endpoint;
- struct MacEndpoint *endpoint_next;
-
- if (NULL == plugin)
- {
- GNUNET_free (api);
- return NULL;
- }
-
- if (GNUNET_YES == plugin->have_mac)
- {
- memset (&wa, 0, sizeof(wa));
- wa.options = htonl (plugin->options);
- wa.mac = plugin->mac_address;
- address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
- PLUGIN_NAME, &wa, sizeof (struct WlanAddress),
- GNUNET_HELLO_ADDRESS_INFO_NONE);
-
- plugin->env->notify_address (plugin->env->cls, GNUNET_NO, address);
- plugin->have_mac = GNUNET_NO;
-
- GNUNET_HELLO_address_free (address);
- }
-
- if (GNUNET_SCHEDULER_NO_TASK != plugin->beacon_task)
- {
- GNUNET_SCHEDULER_cancel (plugin->beacon_task);
- plugin->beacon_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != plugin->suid_helper)
- {
- GNUNET_HELPER_stop (plugin->suid_helper, GNUNET_NO);
- plugin->suid_helper = NULL;
- }
- endpoint_next = plugin->mac_head;
- while (NULL != (endpoint = endpoint_next))
- {
- endpoint_next = endpoint->next;
- free_macendpoint (endpoint);
- }
- if (NULL != plugin->fragment_data_tokenizer)
- {
- GNUNET_SERVER_mst_destroy (plugin->fragment_data_tokenizer);
- plugin->fragment_data_tokenizer = NULL;
- }
- if (NULL != plugin->wlan_header_payload_tokenizer)
- {
- GNUNET_SERVER_mst_destroy (plugin->wlan_header_payload_tokenizer);
- plugin->wlan_header_payload_tokenizer = NULL;
- }
- if (NULL != plugin->helper_payload_tokenizer)
- {
- GNUNET_SERVER_mst_destroy (plugin->helper_payload_tokenizer);
- plugin->helper_payload_tokenizer = NULL;
- }
- GNUNET_free_non_null (plugin->interface);
- GNUNET_free (plugin);
- GNUNET_free (api);
- return NULL;
-}
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param addr string address
- * @param addrlen length of the @a addr
- * @param buf location to store the buffer
- * @param added location to store the number of bytes in the buffer.
- * If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-bluetooth_string_to_address (void *cls,
- const char *addr,
- uint16_t addrlen,
- void **buf,
- size_t *added)
-{
- struct WlanAddress *wa;
- unsigned int a[6];
- unsigned int i;
- char plugin[10];
- uint32_t options;
-
- if ((NULL == addr) || (addrlen == 0))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- if ('\0' != addr[addrlen - 1])
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- if (strlen (addr) != addrlen - 1)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
-
- if (8 != SSCANF (addr,
- "%9s.%u.%X:%X:%X:%X:%X:%X",
- plugin, &options,
- &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- wa = GNUNET_new (struct WlanAddress);
- for (i=0;i<6;i++)
- wa->mac.mac[i] = a[i];
- wa->options = htonl (0);
- *buf = wa;
- *added = sizeof (struct WlanAddress);
- return GNUNET_OK;
-}
-
-
-static void
-bluetooth_plugin_update_session_timeout (void *cls,
- const struct GNUNET_PeerIdentity
*peer,
- struct Session *session)
-{
- if (GNUNET_SCHEDULER_NO_TASK != session->timeout_task)
- GNUNET_SCHEDULER_cancel (session->timeout_task);
- session->timeout_task
- = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
- &session_timeout,
- session);
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls closure, the `struct GNUNET_TRANSPORT_PluginEnvironment *`
- * @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error
- */
-void *
-libgnunet_plugin_transport_bluetooth_init (void *cls)
-{
- struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
- struct GNUNET_TRANSPORT_PluginFunctions *api;
- struct Plugin *plugin;
- char *interface;
- unsigned long long testmode;
- char *binary;
-
- /* check for 'special' mode */
- if (NULL == env->receive)
- {
- /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
- initialze the plugin or the API */
- api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
- api->cls = NULL;
- api->address_pretty_printer = &bluetooth_plugin_address_pretty_printer;
- api->address_to_string = &bluetooth_plugin_address_to_string;
- api->string_to_address = &bluetooth_string_to_address;
- return api;
- }
-
- testmode = 0;
- /* check configuration */
- if ( (GNUNET_YES ==
- GNUNET_CONFIGURATION_have_value (env->cfg, "transport-bluetooth",
"TESTMODE")) &&
- ( (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_number (env->cfg,
"transport-bluetooth",
- "TESTMODE", &testmode)) ||
- (testmode > 2) ) )
- {
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "transport-bluetooth", "TESTMODE");
- return NULL;
- }
- binary = GNUNET_OS_get_libexec_binary_path
("gnunet-helper-transport-bluetooth");
- if ( (0 == testmode) &&
- (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES,
NULL)) )
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Helper binary `%s' not SUID, cannot run bluetooth transport\n"),
- "gnunet-helper-transport-bluetooth");
- GNUNET_free (binary);
- return NULL;
- }
- GNUNET_free (binary);
- if (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_string
- (env->cfg, "transport-bluetooth", "INTERFACE",
- &interface))
- {
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "transport-bluetooth", "INTERFACE");
- return NULL;
- }
-
- plugin = GNUNET_new (struct Plugin);
- plugin->interface = interface;
- plugin->env = env;
- GNUNET_STATISTICS_set (plugin->env->stats, _("# Bluetooth sessions
allocated"),
- 0, GNUNET_NO);
- GNUNET_STATISTICS_set (plugin->env->stats, _("# Bluetooth MAC endpoints
allocated"),
- 0, 0);
- GNUNET_BANDWIDTH_tracker_init (&plugin->tracker, NULL, NULL,
- GNUNET_BANDWIDTH_value_init (100 * 1024 *
- 1024 / 8), 100);
- plugin->fragment_data_tokenizer = GNUNET_SERVER_mst_create (&process_data,
plugin);
- plugin->wlan_header_payload_tokenizer = GNUNET_SERVER_mst_create
(&process_data, plugin);
- plugin->helper_payload_tokenizer = GNUNET_SERVER_mst_create (&process_data,
plugin);
- plugin->beacon_task = GNUNET_SCHEDULER_add_now (&send_hello_beacon,
- plugin);
-
- plugin->options = 0;
-
- /* some compilers do not like switch on 'long long'... */
- switch ((unsigned int) testmode)
- {
- case 0: /* normal */
- plugin->helper_argv[0] = (char *) "gnunet-helper-transport-bluetooth";
- plugin->helper_argv[1] = interface;
- plugin->helper_argv[2] = NULL;
- plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-
"gnunet-helper-transport-bluetooth",
- plugin->helper_argv,
- &handle_helper_message,
- 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);
- }
-
- api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
- api->cls = plugin;
- api->send = &bluetooth_plugin_send;
- api->get_session = &bluetooth_plugin_get_session;
- api->disconnect_peer = &bluetooth_plugin_disconnect_peer;
- api->disconnect_session = &bluetooth_plugin_disconnect_session;
- api->query_keepalive_factor = &bluetooth_query_keepalive_factor;
- api->address_pretty_printer = &bluetooth_plugin_address_pretty_printer;
- api->check_address = &bluetooth_plugin_address_suggested;
- api->address_to_string = &bluetooth_plugin_address_to_string;;
- api->string_to_address = &bluetooth_string_to_address;
- api->get_network = &bluetooth_get_network;
- api->update_session_timeout = &bluetooth_plugin_update_session_timeout;
-
- return api;
-}
-
-
-/* end of plugin_transport_bluetooth.c */
Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c 2014-06-25 19:29:54 UTC
(rev 33849)
+++ gnunet/src/transport/plugin_transport_wlan.c 2014-06-25 20:22:58 UTC
(rev 33850)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2010-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -20,45 +20,86 @@
/**
* @file transport/plugin_transport_wlan.c
- * @brief transport plugin for wlan
+ * @brief transport plugin for wlan and/or bluetooth
* @author David Brodski
* @author Christian Grothoff
+ *
+ * BUILD_WLAN or BUILD_BLUETOOTH must be defined such that the respective
+ * variant of this code is compiled.
*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_hello_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
#include "gnunet_transport_plugin.h"
#include "plugin_transport_wlan.h"
-#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
#include "gnunet_fragmentation_lib.h"
#include "gnunet_constants.h"
+#if BUILD_WLAN
+/* begin case wlan */
+#define PLUGIN_NAME "wlan"
+#define CONFIG_NAME "transport-wlan"
+#define HELPER_NAME "gnunet-helper-transport-wlan"
+#define DUMMY_HELPER_NAME "gnunet-helper-transport-wlan-dummy"
+#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_wlan_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_wlan_done
#define LOG(kind,...) GNUNET_log_from (kind, "transport-wlan",__VA_ARGS__)
-#define PLUGIN_NAME "wlan"
+/**
+ * time out of a mac endpoint
+ */
+#define MACENDPOINT_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 2)
/**
- * Max size of packet (that we give to the WLAN driver for transmission)
+ * 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 WLAN_MTU 1430
+#define HELLO_BEACON_SCALING_FACTOR GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 2)
+
+/* end case wlan */
+#elif BUILD_BLUETOOTH
+/* begin case bluetooth */
+
+#define PLUGIN_NAME "bluetooth"
+#define CONFIG_NAME "transport-bluetooth"
+#define HELPER_NAME "gnunet-helper-transport-bluetooth"
+/* yes, this is correct, we use the same dummy driver as 'wlan' */
+#define DUMMY_HELPER_NAME "gnunet-helper-transport-wlan-dummy"
+#define LIBGNUNET_PLUGIN_TRANSPORT_INIT
libgnunet_plugin_transport_bluetooth_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE
libgnunet_plugin_transport_bluetooth_done
+#define LOG(kind,...) GNUNET_log_from (kind, "transport-bluetooth",__VA_ARGS__)
+
/**
* 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)
+/* end case bluetooth */
+#else
+#error need to build wlan or bluetooth
+#endif
+
/**
+ * Max size of packet (that we give to the WLAN driver for transmission)
+ */
+#define WLAN_MTU 1430
+
+
+
+/**
* Maximum number of messages in defragmentation queue per MAC
*/
#define MESSAGES_IN_DEFRAG_QUEUE_PER_MAC 2
@@ -661,7 +702,6 @@
GNUNET_break (0);
return;
}
-
if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
@@ -682,7 +722,7 @@
GNUNET_NO /* dropping ACKs is bad */,
NULL, NULL))
GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# WLAN ACKs sent"),
+ _("# ACKs sent"),
1, GNUNET_NO);
}
@@ -702,7 +742,7 @@
struct MacAndSession mas;
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# WLAN messages defragmented"),
+ _("# Messages defragmented"),
1,
GNUNET_NO);
mas.session = NULL;
@@ -743,7 +783,7 @@
session->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# WLAN sessions allocated"),
+ _("# Sessions allocated"),
-1,
GNUNET_NO);
GNUNET_HELLO_address_free (session->address);
@@ -771,7 +811,7 @@
* A session is timing out. Clean up.
*
* @param cls pointer to the Session
- * @param tc pointer to the GNUNET_SCHEDULER_TaskContext
+ * @param tc unused
*/
static void
session_timeout (void *cls,
@@ -830,7 +870,7 @@
struct Session *session;
GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# WLAN sessions allocated"),
+ _("# Sessions allocated"),
1,
GNUNET_NO);
session = GNUNET_new (struct Session);
@@ -848,7 +888,7 @@
session->timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&session_timeout,
session);
- notify_session_monitor (plugin,
+ notify_session_monitor (endpoint->plugin,
session,
GNUNET_TRANSPORT_SS_UP);
LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -919,10 +959,9 @@
if (NULL == endpoint)
{
- GNUNET_break (0);
- return;
+ GNUNET_break (0);
+ return;
}
-
msize = ntohs (hdr->size);
size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) + msize;
{
@@ -944,16 +983,16 @@
fm->size_on_wire += size;
if (NULL != fm->sh)
GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# WLAN message fragments sent"),
+ _("# message fragments sent"),
1,
GNUNET_NO);
else
GNUNET_FRAGMENT_context_transmission_done (fm->fragcontext);
GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- "# bytes currently in WLAN buffers",
+ "# bytes currently in buffers",
-msize, GNUNET_NO);
GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- "# bytes transmitted via WLAN",
+ "# bytes transmitted",
msize, GNUNET_NO);
}
}
@@ -970,7 +1009,7 @@
struct MacEndpoint *endpoint = fm->macendpoint;
GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
- _("# WLAN messages pending (with fragmentation)"),
+ _("# messages pending (with fragmentation)"),
-1, GNUNET_NO);
GNUNET_CONTAINER_DLL_remove (endpoint->sending_messages_head,
endpoint->sending_messages_tail,
@@ -1050,7 +1089,6 @@
fm->macendpoint = endpoint;
fm->target = *target;
fm->size_payload = payload_size;
- fm->size_on_wire = 0;
fm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
fm->cont = cont;
fm->cont_cls = cont_cls;
@@ -1085,7 +1123,7 @@
struct Session *session;
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# WLAN MAC endpoints allocated"),
+ _("# MAC endpoints allocated"),
-1,
GNUNET_NO);
while (NULL != (session = endpoint->sessions_head))
@@ -1154,16 +1192,8 @@
struct MacEndpoint *pos;
for (pos = plugin->mac_head; NULL != pos; pos = pos->next)
- {
if (0 == memcmp (mac, &pos->wlan_addr, sizeof (pos->wlan_addr)))
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Found existing MAC endpoint `%s'\n",
- wlan_plugin_address_to_string (NULL,
- &pos->wlan_addr.mac,
- sizeof (pos->wlan_addr)));
return pos;
- }
- }
pos = GNUNET_new (struct MacEndpoint);
pos->wlan_addr = (*mac);
pos->plugin = plugin;
@@ -1186,7 +1216,7 @@
pos);
plugin->mac_count++;
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# WLAN MAC endpoints allocated"),
+ _("# MAC endpoints allocated"),
1, GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"New MAC endpoint `%s'\n",
@@ -1208,7 +1238,11 @@
wlan_plugin_get_network (void *cls,
struct Session *session)
{
+#if BUILD_WLAN
return GNUNET_ATS_NET_WLAN;
+#else
+ return GNUNET_ATS_NET_BT;
+#endif
}
@@ -1240,7 +1274,8 @@
wlan_plugin_address_to_string (NULL,
address->address,
address->address_length));
- endpoint = create_macendpoint (plugin, (struct WlanAddress *)
address->address);
+ endpoint = create_macendpoint (plugin,
+ (struct WlanAddress *) address->address);
return get_session (endpoint, &address->peer);
}
@@ -1327,8 +1362,9 @@
memcpy (&wlanheader[1], msgbuf, msgbuf_size);
GNUNET_STATISTICS_update (plugin->env->stats,
- "# bytes currently in WLAN buffers",
- msgbuf_size, GNUNET_NO);
+ "# bytes currently in buffers",
+ msgbuf_size,
+ GNUNET_NO);
send_with_fragmentation (session->mac,
to,
@@ -1365,11 +1401,15 @@
uint16_t msize;
ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+#if BUILD_WLAN
ats.value = htonl (GNUNET_ATS_NET_WLAN);
+#else
+ ats.value = htonl (GNUNET_ATS_NET_BT);
+#endif
msize = ntohs (hdr->size);
GNUNET_STATISTICS_update (plugin->env->stats,
- "# bytes received via WLAN",
+ "# bytes received",
msize, GNUNET_NO);
switch (ntohs (hdr->type))
@@ -1398,7 +1438,7 @@
sizeof (mas->endpoint->wlan_addr)));
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# HELLO messages received via WLAN"), 1,
+ _("# HELLO messages received"), 1,
GNUNET_NO);
address = GNUNET_HELLO_address_allocate (&tmpsource,
PLUGIN_NAME,
@@ -1428,7 +1468,7 @@
&mas->endpoint->wlan_addr,
sizeof (mas->endpoint->wlan_addr)));
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# fragments received via WLAN"),
+ _("# fragments received"),
1,
GNUNET_NO);
(void) GNUNET_DEFRAGMENT_process_fragment (mas->endpoint->defrag,
@@ -1441,7 +1481,7 @@
break;
}
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# ACKs received via WLAN"),
+ _("# ACKs received"),
1, GNUNET_NO);
for (fm = mas->endpoint->sending_messages_head; NULL != fm; fm = fm->next)
{
@@ -1500,7 +1540,7 @@
sizeof (struct GNUNET_PeerIdentity)))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "WLAN data for `%s', not for me, ignoring\n",
+ "Data for `%s', not for me, ignoring\n",
GNUNET_i2s (&wlanheader->target));
break;
}
@@ -1509,7 +1549,7 @@
msize - sizeof (struct WlanHeader)))
{
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# WLAN DATA messages discarded due to CRC32
error"),
+ _("# DATA messages discarded due to CRC32
error"),
1,
GNUNET_NO);
break;
@@ -1536,7 +1576,7 @@
GNUNET_HELLO_address_free (address);
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing %u bytes of WLAN DATA from peer `%s'\n",
+ "Processing %u bytes of DATA from peer `%s'\n",
(unsigned int) msize,
GNUNET_i2s (&wlanheader->sender));
xmas.session->timeout = GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
@@ -1650,7 +1690,7 @@
"Got data message from helper with %u bytes\n",
msize);
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# DATA messages received via WLAN"), 1,
+ _("# DATA messages received"), 1,
GNUNET_NO);
if (msize < sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage))
{
@@ -1685,7 +1725,7 @@
}
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# WLAN DATA messages processed"),
+ _("# DATA messages processed"),
1, GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Receiving %u bytes of data from MAC `%s'\n",
@@ -1748,7 +1788,7 @@
GNUNET_YES /* can drop */,
NULL, NULL))
GNUNET_STATISTICS_update (plugin->env->stats,
- _("# HELLO beacons sent via WLAN"),
+ _("# HELLO beacons sent"),
1, GNUNET_NO);
}
plugin->beacon_task =
@@ -1850,7 +1890,7 @@
* @param cls pointer to the api struct
*/
void *
-libgnunet_plugin_transport_wlan_done (void *cls)
+LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
{
struct WlanAddress wa;
struct GNUNET_HELLO_Address *address;
@@ -1864,7 +1904,6 @@
GNUNET_free (api);
return NULL;
}
-
if (GNUNET_YES == plugin->have_mac)
{
memset (&wa, 0, sizeof(wa));
@@ -2063,7 +2102,7 @@
* @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error
*/
void *
-libgnunet_plugin_transport_wlan_init (void *cls)
+LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
{
struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
struct GNUNET_TRANSPORT_PluginFunctions *api;
@@ -2088,36 +2127,44 @@
testmode = 0;
/* check configuration */
if ( (GNUNET_YES ==
- GNUNET_CONFIGURATION_have_value (env->cfg, "transport-wlan",
"TESTMODE")) &&
+ GNUNET_CONFIGURATION_have_value (env->cfg,
+ CONFIG_NAME,
+ "TESTMODE")) &&
( (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-wlan",
- "TESTMODE", &testmode)) ||
+ GNUNET_CONFIGURATION_get_value_number (env->cfg,
+ CONFIG_NAME,
+ "TESTMODE",
+ &testmode)) ||
(testmode > 2) ) )
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "transport-wlan", "TESTMODE");
+ CONFIG_NAME,
+ "TESTMODE");
return NULL;
}
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-transport-wlan");
+ binary = GNUNET_OS_get_libexec_binary_path (HELPER_NAME);
if ( (0 == testmode) &&
(GNUNET_YES !=
- GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) )
+ GNUNET_OS_check_helper_binary (binary,
+ GNUNET_YES,
+ NULL)) )
{
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Helper binary `%s' not SUID, cannot run WLAN transport\n"),
- "gnunet-helper-transport-wlan");
+ HELPER_NAME);
GNUNET_free (binary);
return NULL;
}
GNUNET_free (binary);
if (GNUNET_YES !=
GNUNET_CONFIGURATION_get_value_string (env->cfg,
- "transport-wlan",
+ CONFIG_NAME,
"INTERFACE",
&interface))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "transport-wlan", "INTERFACE");
+ CONFIG_NAME,
+ "INTERFACE");
return NULL;
}
@@ -2125,10 +2172,10 @@
plugin->interface = interface;
plugin->env = env;
GNUNET_STATISTICS_set (plugin->env->stats,
- _("# WLAN sessions allocated"),
+ _("# sessions allocated"),
0, GNUNET_NO);
GNUNET_STATISTICS_set (plugin->env->stats,
- _("# WLAN MAC endpoints allocated"),
+ _("# MAC endpoints allocated"),
0, 0);
GNUNET_BANDWIDTH_tracker_init (&plugin->tracker, NULL, NULL,
GNUNET_BANDWIDTH_value_init (100 * 1024 *
@@ -2146,33 +2193,33 @@
switch ((unsigned int) testmode)
{
case 0: /* normal */
- plugin->helper_argv[0] = (char *) "gnunet-helper-transport-wlan";
+ plugin->helper_argv[0] = (char *) HELPER_NAME;
plugin->helper_argv[1] = interface;
plugin->helper_argv[2] = NULL;
plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
- "gnunet-helper-transport-wlan",
+ HELPER_NAME,
plugin->helper_argv,
&handle_helper_message,
NULL,
plugin);
break;
case 1: /* testmode, peer 1 */
- plugin->helper_argv[0] = (char *) "gnunet-helper-transport-wlan-dummy";
+ plugin->helper_argv[0] = (char *) DUMMY_HELPER_NAME;
plugin->helper_argv[1] = (char *) "1";
plugin->helper_argv[2] = NULL;
plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-
"gnunet-helper-transport-wlan-dummy",
+ DUMMY_HELPER_NAME,
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[0] = (char *) DUMMY_HELPER_NAME;
plugin->helper_argv[1] = (char *) "2";
plugin->helper_argv[2] = NULL;
plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-
"gnunet-helper-transport-wlan-dummy",
+ DUMMY_HELPER_NAME,
plugin->helper_argv,
&handle_helper_message,
NULL,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33850 - in gnunet: po src/transport,
gnunet <=