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,
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,