diff options
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/plugin_transport_http.c | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 11 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 37f7f798d..d55cdb76b 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -620,8 +620,6 @@ create_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target, | |||
620 | s->addr = GNUNET_malloc (addrlen); | 620 | s->addr = GNUNET_malloc (addrlen); |
621 | memcpy (s->addr, addr, addrlen); | 621 | memcpy (s->addr, addr, addrlen); |
622 | s->addrlen = addrlen; | 622 | s->addrlen = addrlen; |
623 | s->next = NULL; | ||
624 | s->next_receive = GNUNET_TIME_absolute_get_zero (); | ||
625 | s->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED); | 623 | s->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED); |
626 | start_session_timeout(s); | 624 | start_session_timeout(s); |
627 | return s; | 625 | return s; |
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index bee885453..fce6bd1a3 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -542,7 +542,7 @@ create: | |||
542 | s->ats_address_network_type = ats.value; | 542 | s->ats_address_network_type = ats.value; |
543 | 543 | ||
544 | s->inbound = GNUNET_YES; | 544 | s->inbound = GNUNET_YES; |
545 | s->next_receive = GNUNET_TIME_absolute_get_zero (); | 545 | s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS; |
546 | s->tag = tag; | 546 | s->tag = tag; |
547 | if (0 == strcmp (MHD_HTTP_METHOD_PUT, method)) | 547 | if (0 == strcmp (MHD_HTTP_METHOD_PUT, method)) |
548 | s->server_recv = s; | 548 | s->server_recv = s; |
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 45387cfc8..474180db5 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -846,16 +846,11 @@ create_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target, | |||
846 | GNUNET_break_op (0); | 846 | GNUNET_break_op (0); |
847 | return NULL; | 847 | return NULL; |
848 | } | 848 | } |
849 | |||
850 | s->addrlen = len; | 849 | s->addrlen = len; |
851 | s->target = *target; | 850 | s->target = *target; |
852 | s->sock_addr = (const struct sockaddr *) &s[1]; | 851 | s->sock_addr = (const struct sockaddr *) &s[1]; |
853 | s->flow_delay_for_other_peer = GNUNET_TIME_relative_get_zero(); | ||
854 | s->flow_delay_from_other_peer = GNUNET_TIME_absolute_get_zero(); | ||
855 | s->last_expected_delay = GNUNET_TIME_UNIT_SECONDS; | 852 | s->last_expected_delay = GNUNET_TIME_UNIT_SECONDS; |
856 | |||
857 | start_session_timeout(s); | 853 | start_session_timeout(s); |
858 | |||
859 | return s; | 854 | return s; |
860 | } | 855 | } |
861 | 856 | ||
@@ -1521,14 +1516,10 @@ ack_proc (void *cls, uint32_t id, const struct GNUNET_MessageHeader *msg) | |||
1521 | sockaddr_in6)), | 1516 | sockaddr_in6)), |
1522 | delay); | 1517 | delay); |
1523 | udpw = GNUNET_malloc (sizeof (struct UDPMessageWrapper) + msize); | 1518 | udpw = GNUNET_malloc (sizeof (struct UDPMessageWrapper) + msize); |
1524 | udpw->cont = NULL; | ||
1525 | udpw->cont_cls = NULL; | ||
1526 | udpw->frag_ctx = NULL; | ||
1527 | udpw->msg_size = msize; | 1519 | udpw->msg_size = msize; |
1528 | udpw->session = s; | 1520 | udpw->session = s; |
1529 | udpw->timeout = GNUNET_TIME_absolute_get_forever(); | 1521 | udpw->timeout = GNUNET_TIME_UNIT_FOREVER_ABS; |
1530 | udpw->udp = (char *)&udpw[1]; | 1522 | udpw->udp = (char *)&udpw[1]; |
1531 | |||
1532 | udp_ack = (struct UDP_ACK_Message *) udpw->udp; | 1523 | udp_ack = (struct UDP_ACK_Message *) udpw->udp; |
1533 | udp_ack->header.size = htons ((uint16_t) msize); | 1524 | udp_ack->header.size = htons ((uint16_t) msize); |
1534 | udp_ack->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK); | 1525 | udp_ack->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK); |