diff options
Diffstat (limited to 'src/transport/plugin_transport_unix.c')
-rw-r--r-- | src/transport/plugin_transport_unix.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index 160aaddaf..ddb5f747c 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c | |||
@@ -318,11 +318,6 @@ struct Plugin | |||
318 | uint32_t myoptions; | 318 | uint32_t myoptions; |
319 | 319 | ||
320 | /** | 320 | /** |
321 | * ATS network | ||
322 | */ | ||
323 | struct GNUNET_ATS_Information ats_network; | ||
324 | |||
325 | /** | ||
326 | * Are we using an abstract UNIX domain socket? | 321 | * Are we using an abstract UNIX domain socket? |
327 | */ | 322 | */ |
328 | int is_abstract; | 323 | int is_abstract; |
@@ -947,12 +942,12 @@ static void | |||
947 | unix_demultiplexer (struct Plugin *plugin, | 942 | unix_demultiplexer (struct Plugin *plugin, |
948 | struct GNUNET_PeerIdentity *sender, | 943 | struct GNUNET_PeerIdentity *sender, |
949 | const struct GNUNET_MessageHeader *currhdr, | 944 | const struct GNUNET_MessageHeader *currhdr, |
950 | const struct UnixAddress *ua, size_t ua_len) | 945 | const struct UnixAddress *ua, |
946 | size_t ua_len) | ||
951 | { | 947 | { |
952 | struct Session *session; | 948 | struct Session *session; |
953 | struct GNUNET_HELLO_Address *address; | 949 | struct GNUNET_HELLO_Address *address; |
954 | 950 | ||
955 | GNUNET_break (ntohl(plugin->ats_network.value) != GNUNET_ATS_NET_UNSPECIFIED); | ||
956 | GNUNET_assert (ua_len >= sizeof (struct UnixAddress)); | 951 | GNUNET_assert (ua_len >= sizeof (struct UnixAddress)); |
957 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 952 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
958 | "Received message from %s\n", | 953 | "Received message from %s\n", |
@@ -975,7 +970,7 @@ unix_demultiplexer (struct Plugin *plugin, | |||
975 | plugin->env->session_start (NULL, | 970 | plugin->env->session_start (NULL, |
976 | session->address, | 971 | session->address, |
977 | session, | 972 | session, |
978 | &plugin->ats_network, 1); | 973 | GNUNET_ATS_NET_LOOPBACK); |
979 | } | 974 | } |
980 | else | 975 | else |
981 | { | 976 | { |
@@ -986,10 +981,6 @@ unix_demultiplexer (struct Plugin *plugin, | |||
986 | session->address, | 981 | session->address, |
987 | session, | 982 | session, |
988 | currhdr); | 983 | currhdr); |
989 | plugin->env->update_address_metrics (plugin->env->cls, | ||
990 | session->address, | ||
991 | session, | ||
992 | &plugin->ats_network, 1); | ||
993 | } | 984 | } |
994 | 985 | ||
995 | 986 | ||
@@ -1387,10 +1378,6 @@ unix_transport_server_start (void *cls) | |||
1387 | plugin->unix_socket_path[0] = '@'; | 1378 | plugin->unix_socket_path[0] = '@'; |
1388 | un->sun_path[0] = '\0'; | 1379 | un->sun_path[0] = '\0'; |
1389 | } | 1380 | } |
1390 | plugin->ats_network.type = htonl (GNUNET_ATS_NETWORK_TYPE); | ||
1391 | plugin->ats_network.value = htonl (plugin->env->get_address_type (plugin->env->cls, | ||
1392 | (const struct sockaddr *) un, | ||
1393 | un_len)); | ||
1394 | plugin->unix_sock.desc = | 1381 | plugin->unix_sock.desc = |
1395 | GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0); | 1382 | GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0); |
1396 | if (NULL == plugin->unix_sock.desc) | 1383 | if (NULL == plugin->unix_sock.desc) |