commit 287284c28d690373ba167874d979998f86c3d9e1
author Michael Tuexen <tuexen@fh-muenster.de> Sun Jan 12 14:34:21 2020 +0100
committer Michael Tuexen <tuexen@fh-muenster.de> Sun Jan 12 14:34:21 2020 +0100
tree a4cfbfca5e8da5bd60094b43a5b3bd9a54d8f57f
parent 26e7c0e4d5b5e3e309a1b9387f7e173989db1dee

Sync with FreeBSD.

usrsctplib/netinet/sctp_output.c

diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c
index eaafc71..fc14d10 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 356357 2020-01-04 20:33:12Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 356378 2020-01-05 14:08:01Z tuexen $");
 #endif
 
 #include <netinet/sctp_os.h>
@@ -7441,7 +7441,7 @@
 				     (void *)ca, 0,
 				     sctp_sendall_completes, inp, 1);
 	if (ret) {
-		SCTP_PRINTF("Failed to initiate iterator for sendall\n");
+		inp->sctp_flags &= ~SCTP_PCB_FLAGS_SND_ITERATOR_UP;
 		SCTP_FREE(ca, SCTP_M_COPYAL);
 		SCTP_LTRACE_ERR_RET_PKT(m, inp, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EFAULT);
 		return (EFAULT);

usrsctplib/netinet/sctp_pcb.c

diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c
index 142d92e..2220862 100755
--- a/usrsctplib/netinet/sctp_pcb.c
+++ b/usrsctplib/netinet/sctp_pcb.c
@@ -34,7 +34,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 355931 2019-12-20 15:25:08Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 356377 2020-01-05 14:06:40Z tuexen $");
 #endif
 
 #include <netinet/sctp_os.h>
@@ -8180,7 +8180,7 @@
 		    SCTP_M_ITER);
 	if (it == NULL) {
 		SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_PCB, ENOMEM);
-		return (ENOMEM);
+		return (-1);
 	}
 	memset(it, 0, sizeof(*it));
 	it->function_assoc = af;

usrsctplib/netinet/sctp_pcb.h

diff --git a/usrsctplib/netinet/sctp_pcb.h b/usrsctplib/netinet/sctp_pcb.h
index 761c18a..551bbfb 100755
--- a/usrsctplib/netinet/sctp_pcb.h
+++ b/usrsctplib/netinet/sctp_pcb.h
@@ -34,7 +34,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.h 349986 2019-07-14 12:04:39Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.h 354018 2019-10-24 09:22:23Z tuexen $");
 #endif
 
 #ifndef _NETINET_SCTP_PCB_H_
@@ -305,6 +305,9 @@
 	int packet_log_end;
 	uint8_t packet_log_buffer[SCTP_PACKET_LOG_SIZE];
 #endif
+#if defined(__FreeBSD__)
+	eventhandler_tag eh_tag;
+#endif
 #if defined(__APPLE__)
 	int sctp_main_timer_ticks;
 #endif