summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-09-01 08:21:52 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-09-01 08:21:52 +0000
commit48529094fd68b612d38616bbf2e16fd022ba8a72 (patch)
tree272f76962eab409270024e2dde8aecb9a4413b9f /src
parent6e0e7e09552af05a229cad2686d73e2d2ca18925 (diff)
remove PORT related information from unix
add unix perf cfgs
Diffstat (limited to 'src')
-rw-r--r--src/transport/perf_unix_peer1.conf53
-rw-r--r--src/transport/perf_unix_peer2.conf57
-rw-r--r--src/transport/plugin_transport_unix.c11
3 files changed, 113 insertions, 8 deletions
diff --git a/src/transport/perf_unix_peer1.conf b/src/transport/perf_unix_peer1.conf
new file mode 100644
index 000000000..297ae4cbc
--- /dev/null
+++ b/src/transport/perf_unix_peer1.conf
@@ -0,0 +1,53 @@
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+
+[transport]
+PORT = 12001
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
+PLUGINS = unix
+
+[transport-unix]
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-unix.sock
+
+[arm]
+PORT = 12005
+DEFAULTSERVICES = transport hostlist
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12004
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12003
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12002
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
+
+[hostlist]
+OPTIONS = -b
+SERVERS = http://localhost:9080/
+
+[ats]
+# Network specific inbound/outbound quotas
+UNSPECIFIED_QUOTA_IN = unlimited
+UNSPECIFIED_QUOTA_OUT = unlimited
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+# WAN
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited
+# WLAN
+WLAN_QUOTA_IN = unlimited
+WLAN_QUOTA_OUT = unlimited
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = unlimited
+BLUETOOTH_QUOTA_OUT = unlimited
+# ATS options
diff --git a/src/transport/perf_unix_peer2.conf b/src/transport/perf_unix_peer2.conf
new file mode 100644
index 000000000..587b47b68
--- /dev/null
+++ b/src/transport/perf_unix_peer2.conf
@@ -0,0 +1,57 @@
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+
+[transport]
+PORT = 12010
+PLUGINS = unix
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
+
+
+[transport-unix]
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-unix.sock
+
+[arm]
+PORT = 12014
+DEFAULTSERVICES = transport hostlist
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12013
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12012
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12011
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
+
+[hostlist]
+HTTPPORT = 9080
+OPTIONS = -p
+BINDTOIPV4 = YES
+BINDTOIP = 127.0.0.1
+
+[ats]
+# Network specific inbound/outbound quotas
+UNSPECIFIED_QUOTA_IN = unlimited
+UNSPECIFIED_QUOTA_OUT = unlimited
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+# WAN
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited
+# WLAN
+WLAN_QUOTA_IN = unlimited
+WLAN_QUOTA_OUT = unlimited
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = unlimited
+BLUETOOTH_QUOTA_OUT = unlimited
+# ATS options
+
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index 947ec5d71..8a0aa72a0 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -243,13 +243,6 @@ struct UNIX_Sock_Info
* The network handle
*/
struct GNUNET_NETWORK_Handle *desc;
-
- /**
- * The port we bound to (not an actual PORT, as UNIX domain sockets
- * don't have ports, but rather a number in the path name to make this
- * one unique).
- */
- uint16_t port;
};
@@ -300,7 +293,7 @@ struct Plugin
struct UNIXMessageWrapper *msg_tail;
/**
- * Path of our unix domain socket (/tmp/unix-plugin-PORT)
+ * Path of our unix domain socket (/tmp/unix-plugin)
*/
char *unix_socket_path;
@@ -1420,6 +1413,8 @@ unix_transport_server_start (void *cls)
(const struct sockaddr *) un, un_len))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
+ LOG (GNUNET_ERROR_TYPE_ERROR, _("Cannot bind to `%s'\n"),
+ un->sun_path);
GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
plugin->unix_sock.desc = NULL;
GNUNET_free (un);