diff options
| author | rrs <rrs@FreeBSD.org> | 2008-07-09 16:45:30 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2008-07-09 16:45:30 +0000 |
| commit | a51aa927fad5ab9ebbb294340935d462f68ee19b (patch) | |
| tree | 4a87f4aa4fe465871cb0aabaa4a65bf4595791b3 /sys/netinet/sctp_usrreq.c | |
| parent | c0ef832fd278f80304905d075e4657c1a92b196b (diff) | |
| download | FreeBSD-src-a51aa927fad5ab9ebbb294340935d462f68ee19b.zip FreeBSD-src-a51aa927fad5ab9ebbb294340935d462f68ee19b.tar.gz | |
1) Adds the rest of the VIMAGE change macros
2) Adds some __UserSpace__ on some of the common defines that
the user space code needs
3) Fixes a bug when we send up data to a user that failed. We
need to a) trim off the data chunk headers, if present, and
b) make sure the frag bit is communicated properly for the
msgs coming off the stream queues... i.e. we see if some
of the msg has been taken.
Obtained from: jeli contributed the VIMAGE changes on this pass Thanks Julain!
Diffstat (limited to 'sys/netinet/sctp_usrreq.c')
| -rw-r--r-- | sys/netinet/sctp_usrreq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 7d92968..6c34d47 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/sctp_header.h> #include <netinet/sctp_var.h> #if defined(INET6) -#include <netinet6/sctp6_var.h> #endif #include <netinet/sctp_sysctl.h> #include <netinet/sctp_output.h> @@ -63,7 +62,6 @@ sctp_init(void) /* Initialize and modify the sysctled variables */ sctp_init_sysctls(); - if ((nmbclusters / 8) > SCTP_ASOC_MAX_CHUNKS_ON_QUEUE) SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) = (nmbclusters / 8); /* @@ -532,7 +530,7 @@ sctp_attach(struct socket *so, int proto, struct thread *p) inp->sctp_flags &= ~SCTP_PCB_FLAGS_BOUND_V6; /* I'm not v6! */ ip_inp = &inp->ip_inp.inp; ip_inp->inp_vflag |= INP_IPV4; - ip_inp->inp_ip_ttl = ip_defttl; + ip_inp->inp_ip_ttl = MODULE_GLOBAL(MOD_INET, ip_defttl); #ifdef IPSEC error = ipsec_init_policy(so, &ip_inp->inp_sp); #ifdef SCTP_LOG_CLOSING @@ -3986,7 +3984,6 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, return (error); } - int sctp_ctloutput(struct socket *so, struct sockopt *sopt) { |
