diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp index 5b077f493c73..667cf9158a6e 100644 --- a/netwerk/sctp/datachannel/DataChannel.cpp +++ b/netwerk/sctp/datachannel/DataChannel.cpp @@ -715,7 +715,9 @@ DataChannelConnection::SctpDtlsOutput(void *addr, void *buffer, size_t length, } else { unsigned char *data = new unsigned char[length]; memcpy(data, buffer, length); - res = -1; + // Commented out since we have to Dispatch SendPacket to avoid deadlock" + // res = -1; + // XXX It might be worthwhile to add an assertion against the thread // somehow getting into the DataChannel/SCTP code again, as // DISPATCH_SYNC is not fully blocking. This may be tricky, as it diff --git a/netwerk/sctp/src/netinet/sctp_pcb.c b/netwerk/sctp/src/netinet/sctp_pcb.c index 052b7bb30b9b..cb15bcf8431d 100755 --- a/netwerk/sctp/src/netinet/sctp_pcb.c +++ b/netwerk/sctp/src/netinet/sctp_pcb.c @@ -3171,7 +3171,6 @@ sctp_inpcb_bind(struct socket *so, struct sockaddr *addr, uint32_t vrf_id; lport = 0; - error = 0; bindall = 1; inp = (struct sctp_inpcb *)so->so_pcb; #if defined(INET) || (defined(INET6) && defined(__APPLE__)) || defined(__FreeBSD__) || defined(__APPLE__) diff --git a/netwerk/sctp/src/netinet/sctp_sha1.c b/netwerk/sctp/src/netinet/sctp_sha1.c index 95e47218a892..c86517f91cc7 100755 --- a/netwerk/sctp/src/netinet/sctp_sha1.c +++ b/netwerk/sctp/src/netinet/sctp_sha1.c @@ -206,7 +206,6 @@ sctp_sha1_update(struct sctp_sha1_context *ctx, const unsigned char *ptr, unsign ptr, number_left); ctx->how_many_in_block += number_left; ctx->running_total += number_left; - number_left = 0; break; } else { /* block is now full, process it */ diff --git a/netwerk/sctp/src/user_socket.c b/netwerk/sctp/src/user_socket.c index d6bbd46278bc..cad347ce2605 100755 --- a/netwerk/sctp/src/user_socket.c +++ b/netwerk/sctp/src/user_socket.c @@ -2782,7 +2782,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, int use_udp_tunneling; *result = 0; - send_count = 0; m = SCTP_HEADER_TO_CHAIN(o_pak); m_orig = m; @@ -2938,7 +2937,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, int use_udp_tunneling; *result = 0; - send_count = 0; m = SCTP_HEADER_TO_CHAIN(o_pak); m_orig = m;