Whitespace changes, not functional change intended.
MFC after: 1 week
This commit is contained in:
parent
a8ca275b7d
commit
df2fca7ba8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=362332
@ -100,7 +100,7 @@ sctp_getaddrlen(sa_family_t family)
|
|||||||
|
|
||||||
int
|
int
|
||||||
sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
|
sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
|
||||||
sctp_assoc_t * id)
|
sctp_assoc_t *id)
|
||||||
{
|
{
|
||||||
char *buf;
|
char *buf;
|
||||||
int i, ret, *aa;
|
int i, ret, *aa;
|
||||||
@ -159,9 +159,9 @@ sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
|
|||||||
aa = (int *)buf;
|
aa = (int *)buf;
|
||||||
*aa = addrcnt;
|
*aa = addrcnt;
|
||||||
ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X, (void *)buf,
|
ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X, (void *)buf,
|
||||||
(socklen_t) len);
|
(socklen_t)len);
|
||||||
if ((ret == 0) && (id != NULL)) {
|
if ((ret == 0) && (id != NULL)) {
|
||||||
*id = *(sctp_assoc_t *) buf;
|
*id = *(sctp_assoc_t *)buf;
|
||||||
}
|
}
|
||||||
free(buf);
|
free(buf);
|
||||||
return (ret);
|
return (ret);
|
||||||
@ -269,7 +269,7 @@ sctp_bindx(int sd, struct sockaddr *addrs, int addrcnt, int flags)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs,
|
if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs,
|
||||||
(socklen_t) argsz) != 0) {
|
(socklen_t)argsz) != 0) {
|
||||||
free(gaddrs);
|
free(gaddrs);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
@ -280,7 +280,7 @@ sctp_bindx(int sd, struct sockaddr *addrs, int addrcnt, int flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
sctp_opt_info(int sd, sctp_assoc_t id, int opt, void *arg, socklen_t * size)
|
sctp_opt_info(int sd, sctp_assoc_t id, int opt, void *arg, socklen_t *size)
|
||||||
{
|
{
|
||||||
if (arg == NULL) {
|
if (arg == NULL) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
@ -409,13 +409,13 @@ sctp_getpaddrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
|
|||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
asoc = id;
|
asoc = id;
|
||||||
opt_len = (socklen_t) sizeof(sctp_assoc_t);
|
opt_len = (socklen_t)sizeof(sctp_assoc_t);
|
||||||
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE,
|
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE,
|
||||||
&asoc, &opt_len) != 0) {
|
&asoc, &opt_len) != 0) {
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
/* size required is returned in 'asoc' */
|
/* size required is returned in 'asoc' */
|
||||||
opt_len = (socklen_t) ((size_t)asoc + sizeof(sctp_assoc_t));
|
opt_len = (socklen_t)((size_t)asoc + sizeof(sctp_assoc_t));
|
||||||
addrs = calloc(1, (size_t)opt_len);
|
addrs = calloc(1, (size_t)opt_len);
|
||||||
if (addrs == NULL) {
|
if (addrs == NULL) {
|
||||||
errno = ENOMEM;
|
errno = ENOMEM;
|
||||||
@ -465,7 +465,7 @@ sctp_getladdrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
|
|||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
size_of_addresses = 0;
|
size_of_addresses = 0;
|
||||||
opt_len = (socklen_t) sizeof(int);
|
opt_len = (socklen_t)sizeof(int);
|
||||||
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDR_SIZE,
|
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDR_SIZE,
|
||||||
&size_of_addresses, &opt_len) != 0) {
|
&size_of_addresses, &opt_len) != 0) {
|
||||||
errno = ENOMEM;
|
errno = ENOMEM;
|
||||||
@ -475,7 +475,7 @@ sctp_getladdrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
|
|||||||
errno = ENOTCONN;
|
errno = ENOTCONN;
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
opt_len = (socklen_t) (size_of_addresses + sizeof(sctp_assoc_t));
|
opt_len = (socklen_t)(size_of_addresses + sizeof(sctp_assoc_t));
|
||||||
addrs = calloc(1, (size_t)opt_len);
|
addrs = calloc(1, (size_t)opt_len);
|
||||||
if (addrs == NULL) {
|
if (addrs == NULL) {
|
||||||
errno = ENOMEM;
|
errno = ENOMEM;
|
||||||
@ -586,6 +586,7 @@ sctp_sendmsg(int s,
|
|||||||
}
|
}
|
||||||
who = (struct sockaddr *)&addr;
|
who = (struct sockaddr *)&addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
iov.iov_base = (char *)data;
|
iov.iov_base = (char *)data;
|
||||||
iov.iov_len = len;
|
iov.iov_len = len;
|
||||||
|
|
||||||
@ -632,7 +633,7 @@ sctp_getassocid(int sd, struct sockaddr *sa)
|
|||||||
if (getsockopt(sd, IPPROTO_SCTP,
|
if (getsockopt(sd, IPPROTO_SCTP,
|
||||||
SCTP_GET_PEER_ADDR_INFO, &sp, &siz) != 0) {
|
SCTP_GET_PEER_ADDR_INFO, &sp, &siz) != 0) {
|
||||||
/* We depend on the fact that 0 can never be returned */
|
/* We depend on the fact that 0 can never be returned */
|
||||||
return ((sctp_assoc_t) 0);
|
return ((sctp_assoc_t)0);
|
||||||
}
|
}
|
||||||
return (sp.spinfo_assoc_id);
|
return (sp.spinfo_assoc_id);
|
||||||
}
|
}
|
||||||
@ -748,7 +749,7 @@ sctp_sendx(int sd, const void *msg, size_t msg_len,
|
|||||||
aa++;
|
aa++;
|
||||||
memcpy((caddr_t)aa, addrs, (size_t)(len - sizeof(int)));
|
memcpy((caddr_t)aa, addrs, (size_t)(len - sizeof(int)));
|
||||||
ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_DELAYED, (void *)buf,
|
ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_DELAYED, (void *)buf,
|
||||||
(socklen_t) len);
|
(socklen_t)len);
|
||||||
|
|
||||||
free(buf);
|
free(buf);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
@ -766,7 +767,7 @@ sctp_sendx(int sd, const void *msg, size_t msg_len,
|
|||||||
sinfo->sinfo_assoc_id = sctp_getassocid(sd, addrs);
|
sinfo->sinfo_assoc_id = sctp_getassocid(sd, addrs);
|
||||||
if (sinfo->sinfo_assoc_id == 0) {
|
if (sinfo->sinfo_assoc_id == 0) {
|
||||||
(void)setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_COMPLETE, (void *)addrs,
|
(void)setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_COMPLETE, (void *)addrs,
|
||||||
(socklen_t) addrs->sa_len);
|
(socklen_t)addrs->sa_len);
|
||||||
errno = ENOENT;
|
errno = ENOENT;
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
@ -774,7 +775,7 @@ sctp_sendx(int sd, const void *msg, size_t msg_len,
|
|||||||
saved_errno = errno;
|
saved_errno = errno;
|
||||||
if (no_end_cx == 0)
|
if (no_end_cx == 0)
|
||||||
(void)setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_COMPLETE, (void *)addrs,
|
(void)setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_COMPLETE, (void *)addrs,
|
||||||
(socklen_t) addrs->sa_len);
|
(socklen_t)addrs->sa_len);
|
||||||
|
|
||||||
errno = saved_errno;
|
errno = saved_errno;
|
||||||
return (ret);
|
return (ret);
|
||||||
@ -808,7 +809,7 @@ sctp_recvmsg(int s,
|
|||||||
void *dbuf,
|
void *dbuf,
|
||||||
size_t len,
|
size_t len,
|
||||||
struct sockaddr *from,
|
struct sockaddr *from,
|
||||||
socklen_t * fromlen,
|
socklen_t *fromlen,
|
||||||
struct sctp_sndrcvinfo *sinfo,
|
struct sctp_sndrcvinfo *sinfo,
|
||||||
int *msg_flags)
|
int *msg_flags)
|
||||||
{
|
{
|
||||||
@ -878,14 +879,14 @@ sctp_recvmsg(int s,
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t
|
ssize_t
|
||||||
sctp_recvv(int sd,
|
sctp_recvv(int sd,
|
||||||
const struct iovec *iov,
|
const struct iovec *iov,
|
||||||
int iovlen,
|
int iovlen,
|
||||||
struct sockaddr *from,
|
struct sockaddr *from,
|
||||||
socklen_t * fromlen,
|
socklen_t *fromlen,
|
||||||
void *info,
|
void *info,
|
||||||
socklen_t * infolen,
|
socklen_t *infolen,
|
||||||
unsigned int *infotype,
|
unsigned int *infotype,
|
||||||
int *flags)
|
int *flags)
|
||||||
{
|
{
|
||||||
@ -953,17 +954,17 @@ sctp_recvv(int sd,
|
|||||||
rn_info = (struct sctp_recvv_rn *)info;
|
rn_info = (struct sctp_recvv_rn *)info;
|
||||||
rn_info->recvv_rcvinfo = *rcvinfo;
|
rn_info->recvv_rcvinfo = *rcvinfo;
|
||||||
rn_info->recvv_nxtinfo = *nxtinfo;
|
rn_info->recvv_nxtinfo = *nxtinfo;
|
||||||
*infolen = (socklen_t) sizeof(struct sctp_recvv_rn);
|
*infolen = (socklen_t)sizeof(struct sctp_recvv_rn);
|
||||||
*infotype = SCTP_RECVV_RN;
|
*infotype = SCTP_RECVV_RN;
|
||||||
} else if (*infolen >= sizeof(struct sctp_rcvinfo)) {
|
} else if (*infolen >= sizeof(struct sctp_rcvinfo)) {
|
||||||
memcpy(info, rcvinfo, sizeof(struct sctp_rcvinfo));
|
memcpy(info, rcvinfo, sizeof(struct sctp_rcvinfo));
|
||||||
*infolen = (socklen_t) sizeof(struct sctp_rcvinfo);
|
*infolen = (socklen_t)sizeof(struct sctp_rcvinfo);
|
||||||
*infotype = SCTP_RECVV_RCVINFO;
|
*infotype = SCTP_RECVV_RCVINFO;
|
||||||
}
|
}
|
||||||
} else if (nxtinfo != NULL) {
|
} else if (nxtinfo != NULL) {
|
||||||
if (*infolen >= sizeof(struct sctp_nxtinfo)) {
|
if (*infolen >= sizeof(struct sctp_nxtinfo)) {
|
||||||
memcpy(info, nxtinfo, sizeof(struct sctp_nxtinfo));
|
memcpy(info, nxtinfo, sizeof(struct sctp_nxtinfo));
|
||||||
*infolen = (socklen_t) sizeof(struct sctp_nxtinfo);
|
*infolen = (socklen_t)sizeof(struct sctp_nxtinfo);
|
||||||
*infotype = SCTP_RECVV_NXTINFO;
|
*infotype = SCTP_RECVV_NXTINFO;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1105,7 +1106,7 @@ sctp_sendv(int sd,
|
|||||||
for (i = 0; i < addrcnt; i++) {
|
for (i = 0; i < addrcnt; i++) {
|
||||||
switch (addr->sa_family) {
|
switch (addr->sa_family) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
addr_len = (socklen_t) sizeof(struct sockaddr_in);
|
addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||||
addr_in = (struct sockaddr_in *)addr;
|
addr_in = (struct sockaddr_in *)addr;
|
||||||
if (addr_in->sin_len != addr_len) {
|
if (addr_in->sin_len != addr_len) {
|
||||||
free(cmsgbuf);
|
free(cmsgbuf);
|
||||||
@ -1130,7 +1131,7 @@ sctp_sendv(int sd,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case AF_INET6:
|
case AF_INET6:
|
||||||
addr_len = (socklen_t) sizeof(struct sockaddr_in6);
|
addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||||
addr_in6 = (struct sockaddr_in6 *)addr;
|
addr_in6 = (struct sockaddr_in6 *)addr;
|
||||||
if (addr_in6->sin6_len != addr_len) {
|
if (addr_in6->sin6_len != addr_len) {
|
||||||
free(cmsgbuf);
|
free(cmsgbuf);
|
||||||
|
Loading…
Reference in New Issue
Block a user