diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2016-04-08 11:14:31 -0300 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2016-04-08 11:14:31 -0300 |
| commit | f4e14ab5e12187cb2cf1ddbdc0ee5555aead3f72 (patch) | |
| tree | 6dab8b329d0e0fc75ec9251ba5f32968b5c955dd | |
| parent | d75dc0cb70b070024d04078ae59ab709c22fa1a0 (diff) | |
| parent | d553a031966e855f068b9dd8aceb5c66518fb4d4 (diff) | |
Merge pull request #68 from sctplab/Issue660.9.3.0
Issue66
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | usrsctplib/netinet/sctp_output.c | 4 | ||||
| -rwxr-xr-x | usrsctplib/netinet/sctp_usrreq.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f3375cc..efe2c31 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ dnl OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF dnl SUCH DAMAGE. dnl -AC_INIT([libusrsctp], [0.9.2.1]) +AC_INIT([libusrsctp], [0.9.3.0]) AM_INIT_AUTOMAKE AC_PROG_CC diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c index 540e2d2..db0c14e 100755 --- a/usrsctplib/netinet/sctp_output.c +++ b/usrsctplib/netinet/sctp_output.c @@ -32,7 +32,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 297312 2016-03-27 10:04:25Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 297497 2016-04-01 20:38:15Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -9410,6 +9410,8 @@ sctp_queue_op_err(struct sctp_tcb *stcb, struct mbuf *op_err) chk->asoc = &stcb->asoc; chk->data = op_err; chk->whoTo = NULL; + chk->rec.chunk_id.id = SCTP_OPERATION_ERROR; + chk->rec.chunk_id.can_take_data = 0; hdr = mtod(op_err, struct sctp_chunkhdr *); hdr->chunk_type = SCTP_OPERATION_ERROR; hdr->chunk_flags = 0; diff --git a/usrsctplib/netinet/sctp_usrreq.c b/usrsctplib/netinet/sctp_usrreq.c index 33a7584..9b4c835 100755 --- a/usrsctplib/netinet/sctp_usrreq.c +++ b/usrsctplib/netinet/sctp_usrreq.c @@ -90,9 +90,9 @@ sctp_init(void) sctp_init_sysctls(); #if defined(__Userspace__) #if defined(__Userspace_os_Windows) || defined(__Userspace_os_NaCl) - srand((unsigned int)time(NULL)); + srandom((unsigned int)GetCurrentProcessId() ^ (unsigned int)time(NULL)); #else - srandom(getpid()); /* so inp->sctp_ep.random_numbers are truly random... */ + srandom((unsigned int)getpid() ^ (unsigned int)time(NULL)); #endif #endif #if defined(__Panda__) |