Commit 6701f01b authored by Daisy Chang's avatar Daisy Chang Committed by Jon Grimm

Remove excessive spaces.

parent a4cae070
...@@ -889,19 +889,19 @@ sctp_chunk_t *sctp_make_heartbeat_ack(const sctp_association_t *asoc, ...@@ -889,19 +889,19 @@ sctp_chunk_t *sctp_make_heartbeat_ack(const sctp_association_t *asoc,
/* Create an Operation Error chunk with the specified space reserved. /* Create an Operation Error chunk with the specified space reserved.
* This routine can be used for containing multiple causes in the chunk. * This routine can be used for containing multiple causes in the chunk.
*/ */
sctp_chunk_t *sctp_make_op_error_space(const sctp_association_t *asoc, sctp_chunk_t *sctp_make_op_error_space(const sctp_association_t *asoc,
const sctp_chunk_t *chunk, const sctp_chunk_t *chunk,
size_t size) size_t size)
{ {
sctp_chunk_t *retval; sctp_chunk_t *retval;
retval = sctp_make_chunk(asoc, SCTP_CID_ERROR, 0, retval = sctp_make_chunk(asoc, SCTP_CID_ERROR, 0,
sizeof(sctp_errhdr_t) + size); sizeof(sctp_errhdr_t) + size);
if (!retval) if (!retval)
goto nodata; goto nodata;
/* RFC 2960 6.4 Multi-homed SCTP Endpoints /* RFC 2960 6.4 Multi-homed SCTP Endpoints
* *
* An endpoint SHOULD transmit reply chunks (e.g., SACK, * An endpoint SHOULD transmit reply chunks (e.g., SACK,
* HEARTBEAT ACK, etc.) to the same destination transport * HEARTBEAT ACK, etc.) to the same destination transport
* address from which it received the DATA or control chunk * address from which it received the DATA or control chunk
...@@ -911,10 +911,9 @@ sctp_chunk_t *sctp_make_op_error_space(const sctp_association_t *asoc, ...@@ -911,10 +911,9 @@ sctp_chunk_t *sctp_make_op_error_space(const sctp_association_t *asoc,
if (chunk) if (chunk)
retval->transport = chunk->transport; retval->transport = chunk->transport;
nodata: nodata:
return retval; return retval;
}
}
/* Create an Operation Error chunk. */ /* Create an Operation Error chunk. */
sctp_chunk_t *sctp_make_op_error(const sctp_association_t *asoc, sctp_chunk_t *sctp_make_op_error(const sctp_association_t *asoc,
...@@ -1430,62 +1429,59 @@ sctp_association_t *sctp_unpack_cookie(const sctp_endpoint_t *ep, ...@@ -1430,62 +1429,59 @@ sctp_association_t *sctp_unpack_cookie(const sctp_endpoint_t *ep,
/* Verify the INIT packet before we process it. */ /* Verify the INIT packet before we process it. */
int sctp_verify_init(const sctp_association_t *asoc, int sctp_verify_init(const sctp_association_t *asoc,
sctp_cid_t cid, sctp_cid_t cid,
sctp_init_chunk_t *peer_init, sctp_init_chunk_t *peer_init,
sctp_chunk_t *chunk, sctp_chunk_t *chunk,
sctp_chunk_t **err_chk_p) sctp_chunk_t **err_chk_p)
{ {
sctpParam_t param; sctpParam_t param;
uint8_t *end; uint8_t *end;
/* FIXME - Verify the fixed fields of the INIT chunk. Also, verify /* FIXME - Verify the fixed fields of the INIT chunk. Also, verify
* the mandatory parameters somewhere here and generate either the * the mandatory parameters somewhere here and generate either the
* "Missing mandatory parameter" error or the "Invalid mandatory * "Missing mandatory parameter" error or the "Invalid mandatory
* parameter" error. */ * parameter" error. */
/* Find unrecognized parameters. */ /* Find unrecognized parameters. */
end = ((uint8_t *)peer_init + ntohs(peer_init->chunk_hdr.length)); end = ((uint8_t *)peer_init + ntohs(peer_init->chunk_hdr.length));
for (param.v = peer_init->init_hdr.params; for (param.v = peer_init->init_hdr.params;
param.v < end; param.v < end;
param.v += WORD_ROUND(ntohs(param.p->length))) { param.v += WORD_ROUND(ntohs(param.p->length))) {
if (!sctp_verify_param(asoc, param, cid, chunk, err_chk_p)) if (!sctp_verify_param(asoc, param, cid, chunk, err_chk_p))
return 0; return 0;
} /* for (loop through all parameters) */ } /* for (loop through all parameters) */
return 1; return 1;
} }
/* Find unrecognized parameters in the chunk. /* Find unrecognized parameters in the chunk.
* Return values: * Return values:
* 0 - discard the chunk * 0 - discard the chunk
* 1 - continue with the chunk * 1 - continue with the chunk
*/ */
int sctp_verify_param(const sctp_association_t *asoc, int sctp_verify_param(const sctp_association_t *asoc,
sctpParam_t param, sctpParam_t param,
sctp_cid_t cid, sctp_cid_t cid,
sctp_chunk_t *chunk, sctp_chunk_t *chunk,
sctp_chunk_t **err_chk_p) sctp_chunk_t **err_chk_p)
{ {
int retval = 1; int retval = 1;
/* FIXME - This routine is not looking at each parameter per the /* FIXME - This routine is not looking at each parameter per the
* chunk type, i.e., unrecognized parameters should be further * chunk type, i.e., unrecognized parameters should be further
* identified based on the chunk id. * identified based on the chunk id.
*/ */
switch (param.p->type) { switch (param.p->type) {
case SCTP_PARAM_IPV4_ADDRESS: case SCTP_PARAM_IPV4_ADDRESS:
case SCTP_PARAM_IPV6_ADDRESS: case SCTP_PARAM_IPV6_ADDRESS:
case SCTP_PARAM_COOKIE_PRESERVATIVE: case SCTP_PARAM_COOKIE_PRESERVATIVE:
/* FIXME - If we don't support the host name parameter, we should /* FIXME - If we don't support the host name parameter, we should
* generate an error for this - Unresolvable address. * generate an error for this - Unresolvable address.
*/ */
case SCTP_PARAM_HOST_NAME_ADDRESS: case SCTP_PARAM_HOST_NAME_ADDRESS:
...@@ -1503,29 +1499,28 @@ int sctp_verify_param(const sctp_association_t *asoc, ...@@ -1503,29 +1499,28 @@ int sctp_verify_param(const sctp_association_t *asoc,
break; break;
} }
return retval; return retval;
} }
/* RFC 3.2.1 & the Implementers Guide 2.2. /* RFC 3.2.1 & the Implementers Guide 2.2.
* *
* The Parameter Types are encoded such that the * The Parameter Types are encoded such that the
* highest-order two bits specify the action that must be * highest-order two bits specify the action that must be
* taken if the processing endpoint does not recognize the * taken if the processing endpoint does not recognize the
* Parameter Type. * Parameter Type.
* *
* 00 - Stop processing this SCTP chunk and discard it, * 00 - Stop processing this SCTP chunk and discard it,
* do not process any further chunks within it. * do not process any further chunks within it.
* *
* 01 - Stop processing this SCTP chunk and discard it, * 01 - Stop processing this SCTP chunk and discard it,
* do not process any further chunks within it, and report * do not process any further chunks within it, and report
* the unrecognized parameter in an 'Unrecognized * the unrecognized parameter in an 'Unrecognized
* Parameter Type' (in either an ERROR or in the INIT ACK). * Parameter Type' (in either an ERROR or in the INIT ACK).
* *
* 10 - Skip this parameter and continue processing. * 10 - Skip this parameter and continue processing.
* *
* 11 - Skip this parameter and continue processing but * 11 - Skip this parameter and continue processing but
* report the unrecognized parameter in an * report the unrecognized parameter in an
* 'Unrecognized Parameter Type' (in either an ERROR or in * 'Unrecognized Parameter Type' (in either an ERROR or in
* the INIT ACK). * the INIT ACK).
* *
* Return value: * Return value:
...@@ -1533,7 +1528,7 @@ int sctp_verify_param(const sctp_association_t *asoc, ...@@ -1533,7 +1528,7 @@ int sctp_verify_param(const sctp_association_t *asoc,
* 1 - continue with the chunk * 1 - continue with the chunk
*/ */
int sctp_process_unk_param(const sctp_association_t *asoc, int sctp_process_unk_param(const sctp_association_t *asoc,
sctpParam_t param, sctpParam_t param,
sctp_chunk_t *chunk, sctp_chunk_t *chunk,
sctp_chunk_t **err_chk_p) sctp_chunk_t **err_chk_p)
{ {
...@@ -1550,7 +1545,7 @@ int sctp_process_unk_param(const sctp_association_t *asoc, ...@@ -1550,7 +1545,7 @@ int sctp_process_unk_param(const sctp_association_t *asoc,
*/ */
if (NULL == *err_chk_p) if (NULL == *err_chk_p)
*err_chk_p = sctp_make_op_error_space(asoc, chunk, *err_chk_p = sctp_make_op_error_space(asoc, chunk,
ntohs(chunk->chunk_hdr->length)); ntohs(chunk->chunk_hdr->length));
if (*err_chk_p) if (*err_chk_p)
sctp_init_cause(*err_chk_p, SCTP_ERROR_UNKNOWN_PARAM, sctp_init_cause(*err_chk_p, SCTP_ERROR_UNKNOWN_PARAM,
...@@ -1566,15 +1561,15 @@ int sctp_process_unk_param(const sctp_association_t *asoc, ...@@ -1566,15 +1561,15 @@ int sctp_process_unk_param(const sctp_association_t *asoc,
*/ */
if (NULL == *err_chk_p) if (NULL == *err_chk_p)
*err_chk_p = sctp_make_op_error_space(asoc, chunk, *err_chk_p = sctp_make_op_error_space(asoc, chunk,
ntohs(chunk->chunk_hdr->length)); ntohs(chunk->chunk_hdr->length));
if (*err_chk_p) { if (*err_chk_p) {
sctp_init_cause(*err_chk_p, SCTP_ERROR_UNKNOWN_PARAM, sctp_init_cause(*err_chk_p, SCTP_ERROR_UNKNOWN_PARAM,
(const void *)param.p, (const void *)param.p,
WORD_ROUND(ntohs(param.p->length))); WORD_ROUND(ntohs(param.p->length)));
} else { } else {
/* If there is no memory for generating the ERROR /* If there is no memory for generating the ERROR
* report as specified, an ABORT will be triggered * report as specified, an ABORT will be triggered
* to the peer and the association won't be established. * to the peer and the association won't be established.
*/ */
retval = 0; retval = 0;
...@@ -1586,7 +1581,6 @@ int sctp_process_unk_param(const sctp_association_t *asoc, ...@@ -1586,7 +1581,6 @@ int sctp_process_unk_param(const sctp_association_t *asoc,
} }
return retval; return retval;
} }
/* Unpack the parameters in an INIT packet. /* Unpack the parameters in an INIT packet.
...@@ -1812,7 +1806,7 @@ int sctp_process_param(sctp_association_t *asoc, sctpParam_t param, ...@@ -1812,7 +1806,7 @@ int sctp_process_param(sctp_association_t *asoc, sctpParam_t param,
* and handled by sctp_verify_param() which should be * and handled by sctp_verify_param() which should be
* called prior to this routine. Simply log the error * called prior to this routine. Simply log the error
* here. * here.
*/ */
SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n", SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n",
ntohs(param.p->type), asoc); ntohs(param.p->type), asoc);
break; break;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment