diff options
| author | Michael Tuexen <tuexen@fh-muenster.de> | 2020-01-28 11:23:11 +0100 |
|---|---|---|
| committer | Michael Tuexen <tuexen@fh-muenster.de> | 2020-01-28 11:23:11 +0100 |
| commit | aa10d60bc209028b7dd0370b2d5af9f14051fd23 (patch) | |
| tree | 0322db693548b2b377ac5f1d508ae9316dedcf2a | |
| parent | 17983b032c3f0e33523972e534b18df832922800 (diff) | |
| download | usrsctp-aa10d60bc209028b7dd0370b2d5af9f14051fd23.tar.gz | |
Fix build issues.
Thanks to Felix Weinrank for reporting the issues and suggesting
fixes.
| -rwxr-xr-x | usrsctplib/netinet/sctp_asconf.c | 4 | ||||
| -rwxr-xr-x | usrsctplib/netinet/sctp_cc_functions.c | 8 | ||||
| -rwxr-xr-x | usrsctplib/netinet/sctp_output.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usrsctplib/netinet/sctp_asconf.c b/usrsctplib/netinet/sctp_asconf.c index fbcec7cd..19f6fe61 100755 --- a/usrsctplib/netinet/sctp_asconf.c +++ b/usrsctplib/netinet/sctp_asconf.c @@ -34,7 +34,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 353303 2019-10-08 11:07:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 357197 2020-01-28 10:09:05Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -110,7 +110,7 @@ sctp_asconf_error_response(uint32_t id, uint16_t cause, uint8_t *error_tlv, struct mbuf *m_reply = NULL; struct sctp_asconf_paramhdr *aph; struct sctp_error_cause *error; - size_t buf_len; + uint32_t buf_len; uint16_t i, param_length, cause_length, padding_length; uint8_t *tlv; diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c index 08e96d6f..01390579 100755 --- a/usrsctplib/netinet/sctp_cc_functions.c +++ b/usrsctplib/netinet/sctp_cc_functions.c @@ -2410,7 +2410,7 @@ sctp_htcp_cwnd_update_after_ecn_echo(struct sctp_tcb *stcb, const struct sctp_cc_functions sctp_cc_functions[] = { { -#if defined(__Windows__) || defined(__Userspace_os_Windows) +#if defined(__Windows__) || (defined(__Userspace_os_Windows) && !defined(__MINGW32__)) sctp_set_initial_cc_param, sctp_cwnd_update_after_sack, sctp_cwnd_update_exit_pf_common, @@ -2431,7 +2431,7 @@ const struct sctp_cc_functions sctp_cc_functions[] = { #endif }, { -#if defined(__Windows__) || defined(__Userspace_os_Windows) +#if defined(__Windows__) || (defined(__Userspace_os_Windows) && !defined(__MINGW32__)) sctp_set_initial_cc_param, sctp_hs_cwnd_update_after_sack, sctp_cwnd_update_exit_pf_common, @@ -2452,7 +2452,7 @@ const struct sctp_cc_functions sctp_cc_functions[] = { #endif }, { -#if defined(__Windows__) || defined(__Userspace_os_Windows) +#if defined(__Windows__) || (defined(__Userspace_os_Windows) && !defined(__MINGW32__)) sctp_htcp_set_initial_cc_param, sctp_htcp_cwnd_update_after_sack, sctp_cwnd_update_exit_pf_common, @@ -2473,7 +2473,7 @@ const struct sctp_cc_functions sctp_cc_functions[] = { #endif }, { -#if defined(__Windows__) || defined(__Userspace_os_Windows) +#if defined(__Windows__) || (defined(__Userspace_os_Windows) && !defined(__MINGW32__)) sctp_set_rtcc_initial_cc_param, sctp_cwnd_update_rtcc_after_sack, sctp_cwnd_update_exit_pf_common, diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c index fc14d10e..acc7307b 100755 --- a/usrsctplib/netinet/sctp_output.c +++ b/usrsctplib/netinet/sctp_output.c @@ -34,7 +34,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 356378 2020-01-05 14:08:01Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 357197 2020-01-28 10:09:05Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -7379,7 +7379,7 @@ sctp_sendall(struct sctp_inpcb *inp, struct uio *uio, struct mbuf *m, if (uio_resid(uio) > SCTP_BASE_SYSCTL(sctp_sendall_limit)) { #endif #else - if (uio->uio_resid > SCTP_BASE_SYSCTL(sctp_sendall_limit)) { + if (uio->uio_resid > (ssize_t)SCTP_BASE_SYSCTL(sctp_sendall_limit)) { #endif /* You must not be larger than the limit! */ return (EMSGSIZE); |