diff options
| author | t00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2014-05-06 16:54:04 +0000 |
|---|---|---|
| committer | t00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2014-05-06 16:54:04 +0000 |
| commit | e074d600abe59f030e890771bb80470b9147022a (patch) | |
| tree | f579e8a7dff50afd4f9ace25376ca5106edbc64c | |
| parent | 699cf36232a54435c0fe7e3457ab7912547698e4 (diff) | |
| download | usrsctplib-e074d600abe59f030e890771bb80470b9147022a.tar.gz | |
Address the bugs reported by Sylvestre Ledru in
https://bugzilla.mozilla.org/show_bug.cgi?id=1003929
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8868 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
| -rwxr-xr-x | netinet/sctp_pcb.c | 12 | ||||
| -rwxr-xr-x | netinet/sctp_sha1.c | 1 | ||||
| -rwxr-xr-x | user_socket.c | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/netinet/sctp_pcb.c b/netinet/sctp_pcb.c index f8f98b4..fcacdac 100755 --- a/netinet/sctp_pcb.c +++ b/netinet/sctp_pcb.c @@ -32,7 +32,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 263922 2014-03-29 21:26:45Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 265455 2014-05-06 16:51:07Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -3177,7 +3177,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__) @@ -3375,15 +3374,6 @@ sctp_inpcb_bind(struct socket *so, struct sockaddr *addr, } #endif } -#if !defined(__Panda__) && !defined(__Userspace__) - if (p == NULL) { - SCTP_INP_DECR_REF(inp); - SCTP_INP_WUNLOCK(inp); - SCTP_INP_INFO_WUNLOCK(); - SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, error); - return (error); - } -#endif #endif /* __Windows__ */ SCTP_INP_WUNLOCK(inp); if (bindall) { diff --git a/netinet/sctp_sha1.c b/netinet/sctp_sha1.c index 95e4721..c86517f 100755 --- a/netinet/sctp_sha1.c +++ b/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/user_socket.c b/user_socket.c index e4e886f..adb798c 100755 --- a/user_socket.c +++ b/user_socket.c @@ -2784,7 +2784,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; @@ -2940,7 +2939,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; |