#include "gnunet_protocols.h"
#include "gnunet_resolver_service.h"
#include "gnunet_server_lib.h"
-#include "gnunet_service_lib.h"
#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"
#include "transport.h"
#define DEBUG_UDP GNUNET_YES
*/
struct GNUNET_TRANSPORT_PluginEnvironment *env;
- /**
- * Handle to the network service.
- */
- struct GNUNET_SERVICE_Context *service;
-
/*
* Session of peers with whom we are currently connected
*/
GNUNET_NETWORK_socket_sendto (send_handle, message, ssize,
sb,
sbs);
+ if (GNUNET_SYSERR == sent)
+ GNUNET_log_strerror(GNUNET_ERROR_TYPE_DEBUG, "sendto");
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"UDP transmit %u-byte message to %s (%d: %s)\n",
(unsigned int) ssize,
#endif
/* Start the server process */
- proc = GNUNET_OS_start_process(NULL, NULL, "gnunet-nat-client", "gnunet-nat-client", plugin->external_address, address_as_string, port_as_string, NULL);
+ proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-nat-client", "gnunet-nat-client", plugin->external_address, address_as_string, port_as_string, NULL);
GNUNET_free(address_as_string);
GNUNET_free(port_as_string);
- GNUNET_OS_process_wait (proc);
- GNUNET_OS_process_close (proc);
- proc = NULL;
+ if (proc != NULL)
+ {
+ GNUNET_OS_process_wait (proc);
+ GNUNET_OS_process_close (proc);
+ proc = NULL;
+ }
}
/**
char *port_start;
struct IPv4UdpAddress a4;
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
bytes = GNUNET_DISK_file_read(plugin->server_stdout_handle, &mybuf, sizeof(mybuf));
* @param sockinfo which socket did we receive the message on
*/
static void
-udp_demultiplexer(struct Plugin *plugin, struct GNUNET_PeerIdentity *sender,
+udp_demultiplexer(struct Plugin *plugin,
+ struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *currhdr,
const void *sender_addr,
size_t fromlen, struct UDP_Sock_Info *sockinfo)
{
struct UDP_NAT_ProbeMessageReply *outgoing_probe_reply;
struct UDP_NAT_ProbeMessageConfirmation *outgoing_probe_confirmation;
-
char addr_buf[INET_ADDRSTRLEN];
struct UDP_NAT_Probes *outgoing_probe;
struct PeerSession *peer_session;
"Sending message type %d to transport!\n",
ntohs(currhdr->type));
#endif
- plugin->env->receive (plugin->env->cls, sender, currhdr, UDP_DIRECT_DISTANCE,
+ struct GNUNET_TRANSPORT_ATS_Information distance[2];
+ distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE);
+ distance[0].value = htonl (UDP_DIRECT_DISTANCE);
+ distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+ distance[1].value = htonl (0);
+
+ plugin->env->receive (plugin->env->cls, sender, currhdr,
+ (const struct GNUNET_TRANSPORT_ATS_Information *) &distance, 2,
NULL, sender_addr, fromlen);
}
char addr[32];
ssize_t ret;
int offset;
- int count;
int tsize;
char *msgbuf;
const struct GNUNET_MessageHeader *currhdr;
const void *ca;
size_t calen;
struct UDP_Sock_Info *udp_sock;
+ uint16_t csize;
plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
udp_sock = NULL;
if (GNUNET_NETWORK_fdset_isset (tc->read_ready,
return;
}
msg = (struct UDPMessage *) buf;
- if (ntohs (msg->header.size) < sizeof (struct UDPMessage))
+ csize = ntohs (msg->header.size);
+ if ( (csize < sizeof (struct UDPMessage)) ||
+ (csize > ret) )
{
GNUNET_break_op (0);
plugin->select_task =
msgbuf = (char *)&msg[1];
memcpy (&sender, &msg->sender, sizeof (struct GNUNET_PeerIdentity));
offset = 0;
- count = 0;
- tsize = ntohs (msg->header.size) - sizeof(struct UDPMessage);
- while (offset < tsize)
+ tsize = csize - sizeof (struct UDPMessage);
+ while (offset + sizeof (struct GNUNET_MessageHeader) <= tsize)
{
currhdr = (struct GNUNET_MessageHeader *)&msgbuf[offset];
- udp_demultiplexer(plugin, &sender, currhdr, ca, calen, udp_sock);
- offset += ntohs(currhdr->size);
- count++;
+ csize = ntohs (currhdr->size);
+ if ( (csize < sizeof (struct GNUNET_MessageHeader)) ||
+ (csize > tsize - offset) )
+ {
+ GNUNET_break_op (0);
+ break;
+ }
+ udp_demultiplexer(plugin, &sender, currhdr,
+ ca, calen, udp_sock);
+ offset += csize;
}
plugin->select_task =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
unsigned long long port;
struct GNUNET_TRANSPORT_PluginFunctions *api;
struct Plugin *plugin;
- struct GNUNET_SERVICE_Context *service;
int sockets_created;
int behind_nat;
int allow_nat;
char *external_address;
struct IPv4UdpAddress v4_address;
- service = GNUNET_SERVICE_start ("transport-udp", env->cfg);
- if (service == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _
- ("Failed to start service for `%s' transport plugin.\n"),
- "udp");
- return NULL;
- }
-
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
"transport-udp",
"BEHIND_NAT"))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Require EXTERNAL_ADDRESS for service `%s' in configuration (either BEHIND_NAT or ALLOW_NAT set to YES)!\n"),
"transport-udp");
- GNUNET_SERVICE_stop (service);
return NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
"transport-udp");
- GNUNET_SERVICE_stop (service);
GNUNET_free_non_null(external_address);
return NULL;
}
"PORT",
port,
65535);
- GNUNET_SERVICE_stop (service);
GNUNET_free_non_null(external_address);
GNUNET_free_non_null(internal_address);
return NULL;
api->address_to_string = &udp_address_to_string;
api->check_address = &udp_check_address;
- plugin->service = service;
-
- GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-udp", "BINDTO", &plugin->bind_address);
-
- GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-udp", "BINDTO6", &plugin->bind6_address);
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-udp", "BINDTO", &plugin->bind_address))
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Binding udp plugin to specific address: `%s'\n", plugin->bind_address);
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-udp", "BINDTO6", &plugin->bind6_address))
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Binding udp plugin to specific address: `%s'\n", plugin->bind6_address);
if (plugin->behind_nat == GNUNET_NO)
{
plugin->hostname_dns = NULL;
}
- GNUNET_SERVICE_stop (plugin->service);
-
GNUNET_NETWORK_fdset_destroy (plugin->rs);
while (NULL != (lal = plugin->lal_head))
{
projects / oweals / gnunet.git / blobdiff