Author: rrs
Date: Sat Oct 18 15:54:25 2008
New Revision: 184028
URL: http://svn.freebsd.org/changeset/base/184028
Log:
- Adapt layer indication was always being given (it should only
be given when the user has enabled it). (Michael Tuexen)
- Sack Immediately was not being set properly on the actual chunk, it
was only put in the rcvd_flags which is incorrect. (Michael Tuexen)
- added an ifndef userspace to one of the already present macro's for
inet (Brad Penoff)
Obtained from: Michael Tuexen and Brad Penoff
MFC after: 4 weeks
Modified:
head/sys/netinet/sctp_output.c
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Sat Oct 18 15:53:31 2008
(r184027)
+++ head/sys/netinet/sctp_output.c Sat Oct 18 15:54:25 2008
(r184028)
@@ -4096,6 +4096,7 @@ sctp_send_initiate(struct sctp_inpcb *in
struct sctp_nets *net;
struct sctp_init_msg *initm;
struct sctp_supported_addr_param *sup_addr;
+ struct sctp_adaptation_layer_indication *ali;
struct sctp_ecn_supported_param *ecn;
struct sctp_prsctp_supported_param *prsctp;
struct sctp_ecn_nonce_supported_param *ecn_nonce;
@@ -4193,21 +4194,13 @@ sctp_send_initiate(struct sctp_inpcb *in
#endif
SCTP_BUF_LEN(m) += sizeof(*sup_addr) + sizeof(uint16_t);
- if (inp->sctp_ep.adaptation_layer_indicator) {
- struct sctp_adaptation_layer_indication *ali;
-
- ali = (struct sctp_adaptation_layer_indication *)(
- (caddr_t)sup_addr + sizeof(*sup_addr) + sizeof(uint16_t));
- ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
- ali->ph.param_length = htons(sizeof(*ali));
- ali->indication =
ntohl(inp->sctp_ep.adaptation_layer_indicator);
- SCTP_BUF_LEN(m) += sizeof(*ali);
- ecn = (struct sctp_ecn_supported_param *)((caddr_t)ali +
- sizeof(*ali));
- } else {
- ecn = (struct sctp_ecn_supported_param *)((caddr_t)sup_addr +
- sizeof(*sup_addr) + sizeof(uint16_t));
- }
+ /* adaptation layer indication parameter */
+ ali = (struct sctp_adaptation_layer_indication *)((caddr_t)sup_addr +
sizeof(*sup_addr) + sizeof(uint16_t));
+ ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
+ ali->ph.param_length = htons(sizeof(*ali));
+ ali->indication = ntohl(inp->sctp_ep.adaptation_layer_indicator);
+ SCTP_BUF_LEN(m) += sizeof(*ali);
+ ecn = (struct sctp_ecn_supported_param *)((caddr_t)ali + sizeof(*ali));
/* now any cookie time extensions */
if (stcb->asoc.cookie_preserve_req) {
@@ -4889,6 +4882,7 @@ sctp_send_initiate_ack(struct sctp_inpcb
struct sctp_association *asoc;
struct mbuf *m, *m_at, *m_tmp, *m_cookie, *op_err, *mp_last;
struct sctp_init_msg *initackm_out;
+ struct sctp_adaptation_layer_indication *ali;
struct sctp_ecn_supported_param *ecn;
struct sctp_prsctp_supported_param *prsctp;
struct sctp_ecn_nonce_supported_param *ecn_nonce;
@@ -5319,23 +5313,14 @@ do_a_abort:
/* tell him his limt. */
initackm_out->msg.init.num_inbound_streams =
htons(inp->sctp_ep.max_open_streams_intome);
- /* setup the ECN pointer */
- if (inp->sctp_ep.adaptation_layer_indicator) {
- struct sctp_adaptation_layer_indication *ali;
-
- ali = (struct sctp_adaptation_layer_indication *)(
- (caddr_t)initackm_out + sizeof(*initackm_out));
- ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
- ali->ph.param_length = htons(sizeof(*ali));
- ali->indication =
ntohl(inp->sctp_ep.adaptation_layer_indicator);
- SCTP_BUF_LEN(m) += sizeof(*ali);
- ecn = (struct sctp_ecn_supported_param *)((caddr_t)ali +
- sizeof(*ali));
- } else {
- ecn = (struct sctp_ecn_supported_param *)(
- (caddr_t)initackm_out + sizeof(*initackm_out));
- }
+ /* adaptation layer indication parameter */
+ ali = (struct sctp_adaptation_layer_indication *)((caddr_t)initackm_out
+ sizeof(*initackm_out));
+ ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
+ ali->ph.param_length = htons(sizeof(*ali));
+ ali->indication = ntohl(inp->sctp_ep.adaptation_layer_indicator);
+ SCTP_BUF_LEN(m) += sizeof(*ali);
+ ecn = (struct sctp_ecn_supported_param *)((caddr_t)ali + sizeof(*ali));
/* ECN parameter */
if (SCTP_BASE_SYSCTL(sctp_ecn_enable) == 1) {
@@ -6816,6 +6801,9 @@ re_look:
if (sp->sinfo_flags & SCTP_UNORDERED) {
rcv_flags |= SCTP_DATA_UNORDERED;
}
+ if (SCTP_BASE_SYSCTL(sctp_enable_sack_immediately) && ((sp->sinfo_flags
& SCTP_EOF) == SCTP_EOF)) {
+ rcv_flags |= SCTP_DATA_SACK_IMMEDIATELY;
+ }
/* clear out the chunk before setting up */
memset(chk, 0, sizeof(*chk));
chk->rec.data.rcv_flags = rcv_flags;
@@ -8062,6 +8050,13 @@ again_one_more_time:
chk->send_size, mtu);
chk->flags |= CHUNK_FLAGS_FRAGMENT_OK;
}
+ if
(SCTP_BASE_SYSCTL(sctp_enable_sack_immediately) &&
+ ((asoc->state &
SCTP_STATE_SHUTDOWN_PENDING) == SCTP_STATE_SHUTDOWN_PENDING)) {
+ struct sctp_data_chunk *dchkh;
+
+ dchkh = mtod(chk->data, struct
sctp_data_chunk *);
+ dchkh->ch.chunk_flags |=
SCTP_DATA_SACK_IMMEDIATELY;
+ }
if (((chk->send_size <= mtu) && (chk->send_size
<= r_mtu)) ||
((chk->flags & CHUNK_FLAGS_FRAGMENT_OK) &&
(chk->send_size <= asoc->peers_rwnd))) {
/* ok we will add this one */
@@ -11737,7 +11732,7 @@ sctp_sosend(struct socket *so,
}
}
addr_to_use = addr;
-#ifdef INET6
+#if defined(INET6) && !defined(__Userspace__) /* TODO port in6_sin6_2_sin */
if ((addr) && (addr->sa_family == AF_INET6)) {
struct sockaddr_in6 *sin6;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
