Remove the number of addresses restriction from sctp_connectx().

Remove unused code.
While there, do some cleanup of the code.

MFC after: 1 week

1 files changed, 94 insertions, 202 deletions

diff --git a/lib/libc/net/sctp_sys_calls.c b/lib/libc/net/sctp_sys_calls.c
index f5fc5bc..6b938a4 100644
--- a/lib/libc/net/sctp_sys_calls.c
+++ b/lib/libc/net/sctp_sys_calls.c
@@ -48,8 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp_uio.h>
 #include <netinet/sctp.h>
 
-#include <net/if_dl.h>
-
 #ifndef IN6_IS_ADDR_V4MAPPED
 #define IN6_IS_ADDR_V4MAPPED(a)		      \
 	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
@@ -57,77 +55,8 @@ __FBSDID("$FreeBSD$");
 	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
-
-#define SCTP_CONTROL_VEC_SIZE_SND   8192
 #define SCTP_CONTROL_VEC_SIZE_RCV  16384
-#define SCTP_STACK_BUF_SIZE         2048
-
-#ifdef SCTP_DEBUG_PRINT_ADDRESS
 
-#define SCTP_STRING_BUF_SZ 256
-
-static void
-SCTPPrintAnAddress(struct sockaddr *a)
-{
-	char stringToPrint[SCTP_STRING_BUF_SZ];
-	u_short prt;
-	char *srcaddr, *txt;
-
-	if (a == NULL) {
-		printf("NULL\n");
-		return;
-	}
-	if (a->sa_family == AF_INET) {
-		srcaddr = (char *)&((struct sockaddr_in *)a)->sin_addr;
-		txt = "IPv4 Address: ";
-		prt = ntohs(((struct sockaddr_in *)a)->sin_port);
-	} else if (a->sa_family == AF_INET6) {
-		srcaddr = (char *)&((struct sockaddr_in6 *)a)->sin6_addr;
-		prt = ntohs(((struct sockaddr_in6 *)a)->sin6_port);
-		txt = "IPv6 Address: ";
-	} else if (a->sa_family == AF_LINK) {
-		int i;
-		char tbuf[SCTP_STRING_BUF_SZ];
-		u_char adbuf[SCTP_STRING_BUF_SZ];
-		struct sockaddr_dl *dl;
-
-		dl = (struct sockaddr_dl *)a;
-		strncpy(tbuf, dl->sdl_data, dl->sdl_nlen);
-		tbuf[dl->sdl_nlen] = 0;
-		printf("Intf:%s (len:%d)Interface index:%d type:%x(%d) ll-len:%d ",
-		    tbuf,
-		    dl->sdl_nlen,
-		    dl->sdl_index,
-		    dl->sdl_type,
-		    dl->sdl_type,
-		    dl->sdl_alen
-		    );
-		memcpy(adbuf, LLADDR(dl), dl->sdl_alen);
-		for (i = 0; i < dl->sdl_alen; i++) {
-			printf("%2.2x", adbuf[i]);
-			if (i < (dl->sdl_alen - 1))
-				printf(":");
-		}
-		printf("\n");
-		return;
-	} else {
-		return;
-	}
-	if (inet_ntop(a->sa_family, srcaddr, stringToPrint, sizeof(stringToPrint))) {
-		if (a->sa_family == AF_INET6) {
-			printf("%s%s:%d scope:%d\n",
-			    txt, stringToPrint, prt,
-			    ((struct sockaddr_in6 *)a)->sin6_scope_id);
-		} else {
-			printf("%s%s:%d\n", txt, stringToPrint, prt);
-		}
-
-	} else {
-		printf("%s unprintable?\n", txt);
-	}
-}
-
-#endif				/* SCTP_DEBUG_PRINT_ADDRESS */
 
 static void
 in6_sin6_2_sin(struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
@@ -171,11 +100,10 @@ int
 sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
     sctp_assoc_t * id)
 {
-	char buf[SCTP_STACK_BUF_SIZE];
+	char *buf;
 	int i, ret, cnt, *aa;
 	char *cpto;
 	const struct sockaddr *at;
-	sctp_assoc_t *p_id;
 	size_t len = sizeof(int);
 
 	/* validate the address count and list */
@@ -183,24 +111,29 @@ sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
 		errno = EINVAL;
 		return (-1);
 	}
+	if ((buf = malloc(sizeof(int) + (size_t)addrcnt * sizeof(struct sockaddr_in6))) == NULL) {
+		errno = E2BIG;
+		return (-1);
+	}
 	at = addrs;
 	cnt = 0;
-	cpto = ((caddr_t)buf + sizeof(int));
+	cpto = buf + sizeof(int);
 	/* validate all the addresses and get the size */
 	for (i = 0; i < addrcnt; i++) {
 		switch (at->sa_family) {
 		case AF_INET:
 			if (at->sa_len != sizeof(struct sockaddr_in)) {
+				free(buf);
 				errno = EINVAL;
 				return (-1);
 			}
 			memcpy(cpto, at, sizeof(struct sockaddr_in));
 			cpto = ((caddr_t)cpto + sizeof(struct sockaddr_in));
 			len += sizeof(struct sockaddr_in);
-			at = (struct sockaddr *)((caddr_t)at + sizeof(struct sockaddr_in));
 			break;
 		case AF_INET6:
 			if (at->sa_len != sizeof(struct sockaddr_in6)) {
+				free(buf);
 				errno = EINVAL;
 				return (-1);
 			}
@@ -213,31 +146,20 @@ sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
 				cpto = ((caddr_t)cpto + sizeof(struct sockaddr_in6));
 				len += sizeof(struct sockaddr_in6);
 			}
-			at = (struct sockaddr *)((caddr_t)at + sizeof(struct sockaddr_in6));
 			break;
 		default:
+			free(buf);
 			errno = EINVAL;
 			return (-1);
 		}
-		if (len > (sizeof(buf) - sizeof(int))) {
-			/* Never enough memory */
-			errno = E2BIG;
-			return (-1);
-		}
-		cnt++;
-	}
-	/* do we have any? */
-	if (cnt == 0) {
-		errno = EINVAL;
-		return (-1);
+		at = (struct sockaddr *)((caddr_t)at + at->sa_len);
 	}
 	aa = (int *)buf;
-	*aa = cnt;
+	*aa = addrcnt;
 	ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X, (void *)buf,
 	    (socklen_t) len);
-	if ((ret == 0) && id) {
-		p_id = (sctp_assoc_t *) buf;
-		*id = *p_id;
+	if ((ret == 0) && (id != NULL)) {
+		*id = *(sctp_assoc_t *) buf;
 	}
 	return (ret);
 }
@@ -345,7 +267,6 @@ sctp_bindx(int sd, struct sockaddr *addrs, int addrcnt, int flags)
 	return (0);
 }
 
-
 int
 sctp_opt_info(int sd, sctp_assoc_t id, int opt, void *arg, socklen_t * size)
 {
@@ -471,9 +392,9 @@ sctp_getpaddrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
 void
 sctp_freepaddrs(struct sockaddr *addrs)
 {
-	/* Take away the hidden association id */
 	void *fr_addr;
 
+	/* Take away the hidden association id */
 	fr_addr = (void *)((caddr_t)addrs - sizeof(sctp_assoc_t));
 	/* Now free it */
 	free(fr_addr);
@@ -534,15 +455,14 @@ sctp_getladdrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
 void
 sctp_freeladdrs(struct sockaddr *addrs)
 {
-	/* Take away the hidden association id */
 	void *fr_addr;
 
+	/* Take away the hidden association id */
 	fr_addr = (void *)((caddr_t)addrs - sizeof(sctp_assoc_t));
 	/* Now free it */
 	free(fr_addr);
 }
 
-
 ssize_t
 sctp_sendmsg(int s,
     const void *data,
@@ -568,11 +488,10 @@ sctp_sendmsg(int s,
 	return (syscall(SYS_sctp_generic_sendmsg, s,
 	    data, len, to, tolen, &sinfo, 0));
 #else
-	ssize_t sz;
 	struct msghdr msg;
-	struct sctp_sndrcvinfo *s_info;
+	struct sctp_sndrcvinfo *sinfo;
 	struct iovec iov;
-	char controlVector[SCTP_CONTROL_VEC_SIZE_RCV];
+	char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
 	struct cmsghdr *cmsg;
 	struct sockaddr *who = NULL;
 	union {
@@ -585,8 +504,9 @@ sctp_sendmsg(int s,
 		errno = EINVAL;
 		return (-1);
 	}
-	if (to && (tolen > 0)) {
-		if (to->sa_family == AF_INET) {
+	if ((to != NULL) && (tolen > 0)) {
+		switch (to->sa_family) {
+		case AF_INET:
 			if (tolen != sizeof(struct sockaddr_in)) {
 				errno = EINVAL;
 				return (-1);
@@ -598,7 +518,8 @@ sctp_sendmsg(int s,
 			}
 			memcpy(&addr, to, sizeof(struct sockaddr_in));
 			addr.in.sin_len = sizeof(struct sockaddr_in);
-		} else if (to->sa_family == AF_INET6) {
+			break;
+		case AF_INET6:
 			if (tolen != sizeof(struct sockaddr_in6)) {
 				errno = EINVAL;
 				return (-1);
@@ -610,7 +531,8 @@ sctp_sendmsg(int s,
 			}
 			memcpy(&addr, to, sizeof(struct sockaddr_in6));
 			addr.in6.sin6_len = sizeof(struct sockaddr_in6);
-		} else {
+			break;
+		default:
 			errno = EAFNOSUPPORT;
 			return (-1);
 		}
@@ -628,26 +550,21 @@ sctp_sendmsg(int s,
 	}
 	msg.msg_iov = &iov;
 	msg.msg_iovlen = 1;
-	msg.msg_control = (caddr_t)controlVector;
-
-	cmsg = (struct cmsghdr *)controlVector;
-
+	msg.msg_control = cmsgbuf;
+	msg.msg_controllen = CMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
+	cmsg = (struct cmsghdr *)cmsgbuf;
 	cmsg->cmsg_level = IPPROTO_SCTP;
 	cmsg->cmsg_type = SCTP_SNDRCV;
 	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-	s_info = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-
-	s_info->sinfo_stream = stream_no;
-	s_info->sinfo_ssn = 0;
-	s_info->sinfo_flags = flags;
-	s_info->sinfo_ppid = ppid;
-	s_info->sinfo_context = context;
-	s_info->sinfo_assoc_id = 0;
-	s_info->sinfo_timetolive = timetolive;
-	errno = 0;
-	msg.msg_controllen = cmsg->cmsg_len;
-	sz = sendmsg(s, &msg, 0);
-	return (sz);
+	sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+	sinfo->sinfo_stream = stream_no;
+	sinfo->sinfo_ssn = 0;
+	sinfo->sinfo_flags = flags;
+	sinfo->sinfo_ppid = ppid;
+	sinfo->sinfo_context = context;
+	sinfo->sinfo_assoc_id = 0;
+	sinfo->sinfo_timetolive = timetolive;
+	return (sendmsg(s, &msg, 0));
 #endif
 }
 
@@ -662,12 +579,11 @@ sctp_getassocid(int sd, struct sockaddr *sa)
 	siz = sizeof(sp);
 	memset(&sp, 0, sizeof(sp));
 	memcpy((caddr_t)&sp.spinfo_address, sa, sa->sa_len);
-	errno = 0;
 	if (getsockopt(sd, IPPROTO_SCTP,
 	    SCTP_GET_PEER_ADDR_INFO, &sp, &siz) != 0) {
+		/* We depend on the fact that 0 can never be returned */
 		return ((sctp_assoc_t) 0);
 	}
-	/* We depend on the fact that 0 can never be returned */
 	return (sp.spinfo_assoc_id);
 }
 
@@ -683,11 +599,9 @@ sctp_send(int sd, const void *data, size_t len,
 	return (syscall(SYS_sctp_generic_sendmsg, sd,
 	    data, len, to, 0, sinfo, flags));
 #else
-	ssize_t sz;
 	struct msghdr msg;
 	struct iovec iov;
-	struct sctp_sndrcvinfo *s_info;
-	char controlVector[SCTP_CONTROL_VEC_SIZE_SND];
+	char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
 	struct cmsghdr *cmsg;
 
 	if (sinfo == NULL) {
@@ -697,24 +611,18 @@ sctp_send(int sd, const void *data, size_t len,
 	iov.iov_base = (char *)data;
 	iov.iov_len = len;
 
-	msg.msg_name = 0;
+	msg.msg_name = NULL;
 	msg.msg_namelen = 0;
 	msg.msg_iov = &iov;
 	msg.msg_iovlen = 1;
-	msg.msg_control = (caddr_t)controlVector;
-
-	cmsg = (struct cmsghdr *)controlVector;
-
+	msg.msg_control = cmsgbuf;
+	msg.msg_controllen = CMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
+	cmsg = (struct cmsghdr *)cmsgbuf;
 	cmsg->cmsg_level = IPPROTO_SCTP;
 	cmsg->cmsg_type = SCTP_SNDRCV;
 	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-	s_info = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-	/* copy in the data */
-	*s_info = *sinfo;
-	errno = 0;
-	msg.msg_controllen = cmsg->cmsg_len;
-	sz = sendmsg(sd, &msg, flags);
-	return (sz);
+	memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo));
+	return (sendmsg(sd, &msg, flags));
 #endif
 }
 
@@ -856,11 +764,10 @@ sctp_recvmsg(int s,
 	return (syscall(SYS_sctp_generic_recvmsg, s,
 	    &iov, 1, from, fromlen, sinfo, msg_flags));
 #else
-	struct sctp_sndrcvinfo *s_info;
 	ssize_t sz;
 	struct msghdr msg;
 	struct iovec iov;
-	char controlVector[SCTP_CONTROL_VEC_SIZE_RCV];
+	char cmsgbuf[SCTP_CONTROL_VEC_SIZE_RCV];
 	struct cmsghdr *cmsg;
 
 	if (msg_flags == NULL) {
@@ -877,52 +784,38 @@ sctp_recvmsg(int s,
 		msg.msg_namelen = *fromlen;
 	msg.msg_iov = &iov;
 	msg.msg_iovlen = 1;
-	msg.msg_control = (caddr_t)controlVector;
-	msg.msg_controllen = sizeof(controlVector);
-	errno = 0;
+	msg.msg_control = cmsgbuf;
+	msg.msg_controllen = sizeof(cmsgbuf);
 	sz = recvmsg(s, &msg, *msg_flags);
 	*msg_flags = msg.msg_flags;
 	if (sz <= 0) {
 		return (sz);
 	}
-	s_info = NULL;
 	if (sinfo) {
 		sinfo->sinfo_assoc_id = 0;
 	}
-	if ((msg.msg_controllen) && sinfo) {
+	if ((msg.msg_controllen > 0) && (sinfo != NULL)) {
 		/*
 		 * parse through and see if we find the sctp_sndrcvinfo (if
 		 * the user wants it).
 		 */
-		cmsg = (struct cmsghdr *)controlVector;
-		while (cmsg) {
-			if ((cmsg->cmsg_len == 0) || (cmsg->cmsg_len > msg.msg_controllen)) {
+		for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+			if (cmsg->cmsg_level != IPPROTO_SCTP) {
+				continue;
+			}
+			if (cmsg->cmsg_type == SCTP_SNDRCV) {
+				memcpy(sinfo, CMSG_DATA(cmsg), sizeof(struct sctp_sndrcvinfo));
 				break;
 			}
-			if (cmsg->cmsg_level == IPPROTO_SCTP) {
-				if (cmsg->cmsg_type == SCTP_SNDRCV) {
-					/* Got it */
-					s_info = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-					/* Copy it to the user */
-					if (sinfo)
-						*sinfo = *s_info;
-					break;
-				} else if (cmsg->cmsg_type == SCTP_EXTRCV) {
-					/*
-					 * Got it, presumably the user has
-					 * asked for this extra info, so the
-					 * structure holds more room :-D
-					 */
-					s_info = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-					/* Copy it to the user */
-					if (sinfo) {
-						memcpy(sinfo, s_info, sizeof(struct sctp_extrcvinfo));
-					}
-					break;
-
-				}
+			if (cmsg->cmsg_type == SCTP_EXTRCV) {
+				/*
+				 * Let's hope that the user provided enough
+				 * enough memory. At least he asked for more
+				 * information.
+				 */
+				memcpy(sinfo, CMSG_DATA(cmsg), sizeof(struct sctp_extrcvinfo));
+				break;
 			}
-			cmsg = CMSG_NXTHDR(&msg, cmsg);
 		}
 	}
 	return (sz);
@@ -940,10 +833,10 @@ sctp_recvv(int sd,
     unsigned int *infotype,
     int *flags)
 {
-	char ctlbuf[SCTP_CONTROL_VEC_SIZE_RCV];
+	char cmsgbuf[SCTP_CONTROL_VEC_SIZE_RCV];
 	struct msghdr msg;
 	struct cmsghdr *cmsg;
-	ssize_t n;
+	ssize_t ret;
 	struct sctp_rcvinfo *rcvinfo;
 	struct sctp_nxtinfo *nxtinfo;
 
@@ -964,12 +857,11 @@ sctp_recvv(int sd,
 	}
 	msg.msg_iov = (struct iovec *)iov;
 	msg.msg_iovlen = iovlen;
-	msg.msg_control = ctlbuf;
-	msg.msg_controllen = sizeof(ctlbuf);
-	errno = 0;
-	n = recvmsg(sd, &msg, *flags);
+	msg.msg_control = cmsgbuf;
+	msg.msg_controllen = sizeof(cmsgbuf);
+	ret = recvmsg(sd, &msg, *flags);
 	*flags = msg.msg_flags;
-	if ((n > 0) &&
+	if ((ret > 0) &&
 	    (msg.msg_controllen > 0) &&
 	    (infotype != NULL) &&
 	    (infolen != NULL) &&
@@ -982,41 +874,44 @@ sctp_recvv(int sd,
 			}
 			if (cmsg->cmsg_type == SCTP_RCVINFO) {
 				rcvinfo = (struct sctp_rcvinfo *)CMSG_DATA(cmsg);
+				if (nxtinfo != NULL) {
+					break;
+				} else {
+					continue;
+				}
 			}
 			if (cmsg->cmsg_type == SCTP_NXTINFO) {
 				nxtinfo = (struct sctp_nxtinfo *)CMSG_DATA(cmsg);
-			}
-			if (rcvinfo && nxtinfo) {
-				break;
+				if (rcvinfo != NULL) {
+					break;
+				} else {
+					continue;
+				}
 			}
 		}
-		if (rcvinfo) {
-			if (nxtinfo) {
-				if (*infolen >= sizeof(struct sctp_recvv_rn)) {
-					struct sctp_recvv_rn *rn_info;
-
-					rn_info = (struct sctp_recvv_rn *)info;
-					rn_info->recvv_rcvinfo = *rcvinfo;
-					rn_info->recvv_nxtinfo = *nxtinfo;
-					*infolen = (socklen_t) sizeof(struct sctp_recvv_rn);
-					*infotype = SCTP_RECVV_RN;
-				}
-			} else {
-				if (*infolen >= sizeof(struct sctp_rcvinfo)) {
-					memcpy(info, rcvinfo, sizeof(struct sctp_rcvinfo));
-					*infolen = (socklen_t) sizeof(struct sctp_rcvinfo);
-					*infotype = SCTP_RECVV_RCVINFO;
-				}
+		if (rcvinfo != NULL) {
+			if ((nxtinfo != NULL) && (*infolen >= sizeof(struct sctp_recvv_rn))) {
+				struct sctp_recvv_rn *rn_info;
+
+				rn_info = (struct sctp_recvv_rn *)info;
+				rn_info->recvv_rcvinfo = *rcvinfo;
+				rn_info->recvv_nxtinfo = *nxtinfo;
+				*infolen = (socklen_t) sizeof(struct sctp_recvv_rn);
+				*infotype = SCTP_RECVV_RN;
+			} else if (*infolen >= sizeof(struct sctp_rcvinfo)) {
+				memcpy(info, rcvinfo, sizeof(struct sctp_rcvinfo));
+				*infolen = (socklen_t) sizeof(struct sctp_rcvinfo);
+				*infotype = SCTP_RECVV_RCVINFO;
 			}
-		} else if (nxtinfo) {
-			if (*infolen >= sizeof(struct sctp_rcvinfo)) {
+		} else if (nxtinfo != NULL) {
+			if (*infolen >= sizeof(struct sctp_nxtinfo)) {
 				memcpy(info, nxtinfo, sizeof(struct sctp_nxtinfo));
 				*infolen = (socklen_t) sizeof(struct sctp_nxtinfo);
 				*infotype = SCTP_RECVV_NXTINFO;
 			}
 		}
 	}
-	return (n);
+	return (ret);
 }
 
 ssize_t
@@ -1241,7 +1136,4 @@ sctp_peeloff(int sd, sctp_assoc_t assoc_id)
 
 #endif
 
-
-#undef SCTP_CONTROL_VEC_SIZE_SND
 #undef SCTP_CONTROL_VEC_SIZE_RCV
-#undef SCTP_STACK_BUF_SIZE