diff options
| author | tuexen <tuexen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2012-04-30 08:49:00 +0000 |
|---|---|---|
| committer | tuexen <tuexen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2012-04-30 08:49:00 +0000 |
| commit | 1a2e446bdbc52cc6178a3f80092943a84706ece9 (patch) | |
| tree | 9fcf91521dfae3a8ecb99cdf14f67abc1145af7c | |
| parent | d6873bb86f13db9f6660207c40e82733d69eeda5 (diff) | |
| download | usrsctplib-1a2e446bdbc52cc6178a3f80092943a84706ece9.tar.gz | |
Sync with main sources.
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@7683 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
| -rwxr-xr-x | netinet/sctp_uio.h | 3 | ||||
| -rwxr-xr-x | netinet/sctp_usrreq.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/netinet/sctp_uio.h b/netinet/sctp_uio.h index c2cfafb..17bc8bd 100755 --- a/netinet/sctp_uio.h +++ b/netinet/sctp_uio.h @@ -33,7 +33,7 @@ /* $KAME: sctp_uio.h,v 1.11 2005/03/06 16:04:18 itojun Exp $ */ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 234731 2012-04-27 13:58:09Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 234832 2012-04-30 08:44:21Z tuexen $"); #endif #ifndef __sctp_uio_h__ @@ -692,6 +692,7 @@ struct sctp_authkeyid { /* SCTP_PEER_AUTH_CHUNKS / SCTP_LOCAL_AUTH_CHUNKS */ struct sctp_authchunks { sctp_assoc_t gauth_assoc_id; + uint32_t gauth_number_of_chunks; uint8_t gauth_chunks[]; }; diff --git a/netinet/sctp_usrreq.c b/netinet/sctp_usrreq.c index 4342af9..dc087f4 100755 --- a/netinet/sctp_usrreq.c +++ b/netinet/sctp_usrreq.c @@ -34,7 +34,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 234762 2012-04-28 16:32:49Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 234832 2012-04-30 08:44:21Z tuexen $"); #endif #include <netinet/sctp_os.h> #ifdef __FreeBSD__ @@ -3327,6 +3327,7 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize, } else { /* copy in the chunks */ (void)sctp_serialize_auth_chunks(chklist, sac->gauth_chunks); + sac->gauth_number_of_chunks = (uint32_t)size; *optsize = sizeof(struct sctp_authchunks) + size; } SCTP_TCB_UNLOCK(stcb); @@ -3345,6 +3346,7 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize, } else { /* copy in the chunks */ (void)sctp_serialize_auth_chunks(chklist, sac->gauth_chunks); + sac->gauth_number_of_chunks = (uint32_t)size; *optsize = sizeof(struct sctp_authchunks) + size; } SCTP_INP_RUNLOCK(inp); @@ -3375,6 +3377,7 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize, } else { /* copy in the chunks */ (void)sctp_serialize_auth_chunks(chklist, sac->gauth_chunks); + sac->gauth_number_of_chunks = (uint32_t)size; *optsize = sizeof(struct sctp_authchunks) + size; } SCTP_TCB_UNLOCK(stcb); |