mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-16 21:34:10 +00:00
Use always LIST_EMPTY instead of sometime SCTP_LIST_EMPTY,
which is defined as LIST_EMPTY. Approved by: rrs (mentor) MFC after: 1 month
This commit is contained in:
parent
1511301cd8
commit
83fc1165c5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=199437
|
@ -573,7 +573,7 @@ sctp_insert_sharedkey(struct sctp_keyhead *shared_keys,
|
|||
return (EINVAL);
|
||||
|
||||
/* insert into an empty list? */
|
||||
if (SCTP_LIST_EMPTY(shared_keys)) {
|
||||
if (LIST_EMPTY(shared_keys)) {
|
||||
LIST_INSERT_HEAD(shared_keys, new_skey, next);
|
||||
return (0);
|
||||
}
|
||||
|
|
|
@ -153,7 +153,6 @@ MALLOC_DECLARE(SCTP_M_SOCKOPT);
|
|||
*
|
||||
*/
|
||||
#define USER_ADDR_NULL (NULL) /* FIX ME: temp */
|
||||
#define SCTP_LIST_EMPTY(list) LIST_EMPTY(list)
|
||||
|
||||
#if defined(SCTP_DEBUG)
|
||||
#define SCTPDBG(level, params...) \
|
||||
|
|
|
@ -452,7 +452,7 @@ sctp_remove_ifa_from_ifn(struct sctp_ifa *sctp_ifap)
|
|||
sctp_ifap->ifn_p->num_v4--;
|
||||
|
||||
ifn_index = sctp_ifap->ifn_p->ifn_index;
|
||||
if (SCTP_LIST_EMPTY(&sctp_ifap->ifn_p->ifalist)) {
|
||||
if (LIST_EMPTY(&sctp_ifap->ifn_p->ifalist)) {
|
||||
/* remove the ifn, possibly freeing it */
|
||||
sctp_delete_ifn(sctp_ifap->ifn_p, SCTP_ADDR_LOCKED);
|
||||
} else {
|
||||
|
@ -4262,7 +4262,7 @@ sctp_delete_from_timewait(uint32_t tag, uint16_t lport, uint16_t rport)
|
|||
int i;
|
||||
|
||||
chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
|
||||
if (!SCTP_LIST_EMPTY(chain)) {
|
||||
if (!LIST_EMPTY(chain)) {
|
||||
LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) {
|
||||
for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) {
|
||||
if ((twait_block->vtag_block[i].v_tag == tag) &&
|
||||
|
@ -4292,7 +4292,7 @@ sctp_is_in_timewait(uint32_t tag, uint16_t lport, uint16_t rport)
|
|||
|
||||
SCTP_INP_INFO_WLOCK();
|
||||
chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
|
||||
if (!SCTP_LIST_EMPTY(chain)) {
|
||||
if (!LIST_EMPTY(chain)) {
|
||||
LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) {
|
||||
for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) {
|
||||
if ((twait_block->vtag_block[i].v_tag == tag) &&
|
||||
|
@ -4326,7 +4326,7 @@ sctp_add_vtag_to_timewait(uint32_t tag, uint32_t time, uint16_t lport, uint16_t
|
|||
(void)SCTP_GETTIME_TIMEVAL(&now);
|
||||
chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
|
||||
set = 0;
|
||||
if (!SCTP_LIST_EMPTY(chain)) {
|
||||
if (!LIST_EMPTY(chain)) {
|
||||
/* Block(s) present, lets find space, and expire on the fly */
|
||||
LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) {
|
||||
for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) {
|
||||
|
@ -4953,7 +4953,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre
|
|||
sctp_free_remote_addr(net);
|
||||
}
|
||||
|
||||
while (!SCTP_LIST_EMPTY(&asoc->sctp_restricted_addrs)) {
|
||||
while (!LIST_EMPTY(&asoc->sctp_restricted_addrs)) {
|
||||
/* sa_ignore FREED_MEMORY */
|
||||
laddr = LIST_FIRST(&asoc->sctp_restricted_addrs);
|
||||
sctp_remove_laddr(laddr);
|
||||
|
@ -5617,7 +5617,7 @@ sctp_pcb_finish(void)
|
|||
*/
|
||||
for (i = 0; i < SCTP_STACK_VTAG_HASH_SIZE; i++) {
|
||||
chain = &SCTP_BASE_INFO(vtag_timewait)[i];
|
||||
if (!SCTP_LIST_EMPTY(chain)) {
|
||||
if (!LIST_EMPTY(chain)) {
|
||||
prev_twait_block = NULL;
|
||||
LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) {
|
||||
if (prev_twait_block) {
|
||||
|
@ -6387,7 +6387,7 @@ sctp_is_vtag_good(struct sctp_inpcb *inp, uint32_t tag, uint16_t lport, uint16_t
|
|||
|
||||
chain = &SCTP_BASE_INFO(vtag_timewait[(tag % SCTP_STACK_VTAG_HASH_SIZE))];
|
||||
/* Now what about timed wait ? */
|
||||
if (!SCTP_LIST_EMPTY(chain)) {
|
||||
if (!LIST_EMPTY(chain)) {
|
||||
/*
|
||||
* Block(s) are present, lets see if we have this tag in the
|
||||
* list
|
||||
|
|
|
@ -759,7 +759,7 @@ sctp_disconnect(struct socket *so)
|
|||
SCTP_INP_RLOCK(inp);
|
||||
if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
|
||||
(inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
|
||||
if (SCTP_LIST_EMPTY(&inp->sctp_asoc_list)) {
|
||||
if (LIST_EMPTY(&inp->sctp_asoc_list)) {
|
||||
/* No connection */
|
||||
SCTP_INP_RUNLOCK(inp);
|
||||
return (0);
|
||||
|
|
Loading…
Reference in a new issue