Skip to content

Commit f4e14ab

Browse files
committed
Merge pull request #68 from sctplab/Issue66
Issue66
2 parents d75dc0c + d553a03 commit f4e14ab

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dnl OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2828
dnl SUCH DAMAGE.
2929
dnl
3030

31-
AC_INIT([libusrsctp], [0.9.2.1])
31+
AC_INIT([libusrsctp], [0.9.3.0])
3232
AM_INIT_AUTOMAKE
3333

3434
AC_PROG_CC

usrsctplib/netinet/sctp_output.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#ifdef __FreeBSD__
3434
#include <sys/cdefs.h>
35-
__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 297312 2016-03-27 10:04:25Z tuexen $");
35+
__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 297497 2016-04-01 20:38:15Z tuexen $");
3636
#endif
3737

3838
#include <netinet/sctp_os.h>
@@ -9410,6 +9410,8 @@ sctp_queue_op_err(struct sctp_tcb *stcb, struct mbuf *op_err)
94109410
chk->asoc = &stcb->asoc;
94119411
chk->data = op_err;
94129412
chk->whoTo = NULL;
9413+
chk->rec.chunk_id.id = SCTP_OPERATION_ERROR;
9414+
chk->rec.chunk_id.can_take_data = 0;
94139415
hdr = mtod(op_err, struct sctp_chunkhdr *);
94149416
hdr->chunk_type = SCTP_OPERATION_ERROR;
94159417
hdr->chunk_flags = 0;

usrsctplib/netinet/sctp_usrreq.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ sctp_init(void)
9090
sctp_init_sysctls();
9191
#if defined(__Userspace__)
9292
#if defined(__Userspace_os_Windows) || defined(__Userspace_os_NaCl)
93-
srand((unsigned int)time(NULL));
93+
srandom((unsigned int)GetCurrentProcessId() ^ (unsigned int)time(NULL));
9494
#else
95-
srandom(getpid()); /* so inp->sctp_ep.random_numbers are truly random... */
95+
srandom((unsigned int)getpid() ^ (unsigned int)time(NULL));
9696
#endif
9797
#endif
9898
#if defined(__Panda__)

0 commit comments

Comments
 (0)