diff options
author | t00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2014-07-11 20:41:28 +0000 |
---|---|---|
committer | t00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2014-07-11 20:41:28 +0000 |
commit | e2828360ea9cf8951730d46f5c14626c9425cb30 (patch) | |
tree | 28df41008a3d8122b6510987b8f2610fcb96ee94 | |
parent | 4ebd24bf249e4dd566cc01e122361ce9681cee49 (diff) | |
download | usrsctplib-e2828360ea9cf8951730d46f5c14626c9425cb30.tar.gz |
Whitespace changes.
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8922 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
-rwxr-xr-x | netinet/sctp_asconf.c | 20 | ||||
-rwxr-xr-x | netinet/sctp_auth.c | 6 | ||||
-rwxr-xr-x | netinet/sctp_indata.c | 10 | ||||
-rwxr-xr-x | netinet/sctp_input.c | 28 | ||||
-rwxr-xr-x | netinet/sctp_output.c | 18 | ||||
-rwxr-xr-x | netinet/sctp_pcb.c | 20 | ||||
-rwxr-xr-x | netinet/sctp_pcb.h | 2 | ||||
-rwxr-xr-x | netinet/sctp_structs.h | 6 | ||||
-rwxr-xr-x | netinet/sctp_timer.c | 12 | ||||
-rwxr-xr-x | netinet/sctp_usrreq.c | 18 | ||||
-rwxr-xr-x | netinet/sctp_var.h | 74 | ||||
-rwxr-xr-x | netinet/sctputil.c | 16 | ||||
-rwxr-xr-x | netinet/sctputil.h | 24 | ||||
-rw-r--r-- | netinet6/sctp6_usrreq.c | 6 |
14 files changed, 130 insertions, 130 deletions
diff --git a/netinet/sctp_asconf.c b/netinet/sctp_asconf.c index 0f35ae1..536ab44 100755 --- a/netinet/sctp_asconf.c +++ b/netinet/sctp_asconf.c @@ -429,7 +429,7 @@ sctp_process_asconf_delete_ip(struct sockaddr *src, aparam_length); } else { if (response_required) { - m_reply = sctp_asconf_success_response(aph->correlation_id); + m_reply = sctp_asconf_success_response(aph->correlation_id); } /* notify upper layer */ sctp_ulp_notify(SCTP_NOTIFY_ASCONF_DELETE_IP, stcb, 0, sa, SCTP_SO_NOT_LOCKED); @@ -552,11 +552,11 @@ sctp_process_asconf_set_primary(struct sockaddr *src, are transmitted to the new primary destination. (by micchie) */ if ((sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_BASE) || + SCTP_MOBILITY_BASE) || sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_FASTHANDOFF)) && + SCTP_MOBILITY_FASTHANDOFF)) && sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_PRIM_DELETED) && + SCTP_MOBILITY_PRIM_DELETED) && (stcb->asoc.primary_destination->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) { @@ -1099,7 +1099,7 @@ sctp_path_check_and_react(struct sctp_tcb *stcb, struct sctp_ifa *newifa) } /* Retransmit unacknowledged DATA chunks immediately */ if (sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_FASTHANDOFF)) { + SCTP_MOBILITY_FASTHANDOFF)) { sctp_net_immediate_retrans(stcb, net); } /* also, SET PRIMARY is maybe already sent */ @@ -1157,7 +1157,7 @@ sctp_path_check_and_react(struct sctp_tcb *stcb, struct sctp_ifa *newifa) continue; /* Retransmit unacknowledged DATA chunks immediately */ if (sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_FASTHANDOFF)) { + SCTP_MOBILITY_FASTHANDOFF)) { sctp_net_immediate_retrans(stcb, net); } /* Send SET PRIMARY for this new address */ @@ -1193,9 +1193,9 @@ sctp_asconf_addr_mgmt_ack(struct sctp_tcb *stcb, struct sctp_ifa *addr, uint32_t #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__Userspace__) if (sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_BASE) || + SCTP_MOBILITY_BASE) || sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_FASTHANDOFF)) { + SCTP_MOBILITY_FASTHANDOFF)) { sctp_path_check_and_react(stcb, addr); return; } @@ -2308,7 +2308,7 @@ sctp_asconf_iterator_end(void *ptr, uint32_t val SCTP_UNUSED) int32_t sctp_set_primary_ip_address_sa(struct sctp_tcb *stcb, struct sockaddr *sa) { - uint32_t vrf_id; + uint32_t vrf_id; struct sctp_ifa *ifa; /* find the ifa for the desired set primary */ @@ -3250,7 +3250,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb *inp, struct sockaddr *sa, #endif if (sctp_ifap) { ifa = sctp_ifap; - } else if (type == SCTP_ADD_IP_ADDRESS) { + } else if (type == SCTP_ADD_IP_ADDRESS) { /* For an add the address MUST be on the system */ ifa = sctp_find_ifa_by_addr(sa, vrf_id, SCTP_ADDR_NOT_LOCKED); } else if (type == SCTP_DEL_IP_ADDRESS) { diff --git a/netinet/sctp_auth.c b/netinet/sctp_auth.c index cb4d7cb..8ee9038 100755 --- a/netinet/sctp_auth.c +++ b/netinet/sctp_auth.c @@ -397,9 +397,9 @@ sctp_compare_key(sctp_key_t *key1, sctp_key_t *key2) val1 = (i < (maxlen - key1len)) ? 0 : *(key_1++); val2 = (i < (maxlen - key2len)) ? 0 : *(key_2++); if (val1 > val2) { - return (1); + return (1); } else if (val1 < val2) { - return (-1); + return (-1); } } /* keys are equal value, so check lengths */ @@ -800,7 +800,7 @@ sctp_verify_hmac_param (struct sctp_auth_hmac_algo *hmacs, uint32_t num_hmacs) for (i = 0; i < num_hmacs; i++) { if (ntohs(hmacs->hmac_ids[i]) == SCTP_AUTH_HMAC_ID_SHA1) { - return (0); + return (0); } } return (-1); diff --git a/netinet/sctp_indata.c b/netinet/sctp_indata.c index 5b9070c..ec37a1c 100755 --- a/netinet/sctp_indata.c +++ b/netinet/sctp_indata.c @@ -416,7 +416,7 @@ sctp_service_reassembly(struct sctp_tcb *stcb, struct sctp_association *asoc) } /* Now free the address and data */ sctp_free_a_chunk(stcb, chk, SCTP_SO_NOT_LOCKED); - /*sa_ignore FREED_MEMORY*/ + /*sa_ignore FREED_MEMORY*/ } return; } @@ -670,8 +670,8 @@ sctp_queue_data_to_stream(struct sctp_tcb *stcb, struct sctp_association *asoc, * Ok, we did not deliver this guy, find the correct place * to put it on the queue. */ - if (SCTP_TSN_GE(asoc->cumulative_tsn, control->sinfo_tsn)) { - goto protocol_error; + if (SCTP_TSN_GE(asoc->cumulative_tsn, control->sinfo_tsn)) { + goto protocol_error; } if (TAILQ_EMPTY(&strm->inqueue)) { /* Empty queue */ @@ -876,7 +876,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc, snprintf(msg, sizeof(msg), "Expected B-bit for TSN=%8.8x, SID=%4.4x, SSN=%4.4x", chk->rec.data.TSN_seq, - chk->rec.data.stream_number, + chk->rec.data.stream_number, chk->rec.data.stream_seq); op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg); stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA+SCTP_LOC_2; @@ -893,7 +893,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc, snprintf(msg, sizeof(msg), "Didn't expect B-bit for TSN=%8.8x, SID=%4.4x, SSN=%4.4x", chk->rec.data.TSN_seq, - chk->rec.data.stream_number, + chk->rec.data.stream_number, chk->rec.data.stream_seq); op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg); stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA+SCTP_LOC_3; diff --git a/netinet/sctp_input.c b/netinet/sctp_input.c index e3a3b0b..ac8e0d3 100755 --- a/netinet/sctp_input.c +++ b/netinet/sctp_input.c @@ -730,11 +730,11 @@ sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk *cp, /* Mobility adaptation */ if (req_prim) { if ((sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_BASE) || - sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_FASTHANDOFF)) && - sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_PRIM_DELETED)) { + SCTP_MOBILITY_BASE) || + sctp_is_mobility_feature_on(stcb->sctp_ep, + SCTP_MOBILITY_FASTHANDOFF)) && + sctp_is_mobility_feature_on(stcb->sctp_ep, + SCTP_MOBILITY_PRIM_DELETED)) { sctp_timer_stop(SCTP_TIMER_TYPE_PRIM_DELETED, stcb->sctp_ep, stcb, NULL, SCTP_FROM_SCTP_TIMER+SCTP_LOC_7); if (sctp_is_mobility_feature_on(stcb->sctp_ep, @@ -1605,7 +1605,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset, return (NULL); } - switch (SCTP_GET_STATE(asoc)) { + switch (SCTP_GET_STATE(asoc)) { case SCTP_STATE_COOKIE_WAIT: case SCTP_STATE_COOKIE_ECHOED: /* @@ -1662,7 +1662,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset, atomic_add_int(&stcb->asoc.refcnt, -1); if (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) { SCTP_SOCKET_UNLOCK(so, 1); - return (NULL); + return (NULL); } #endif soisconnected(stcb->sctp_socket); @@ -2840,7 +2840,7 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset, sctp_ulp_notify(notification, *stcb, 0, NULL, SCTP_SO_NOT_LOCKED); if (send_int_conf) { sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED, - (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED); + (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED); } return (m); } @@ -2918,7 +2918,7 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset, inp->sctp_flags = (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_CONNECTED | SCTP_PCB_FLAGS_IN_TCPPOOL | - SCTP_PCB_FLAGS_UNBOUND | + SCTP_PCB_FLAGS_UNBOUND | (SCTP_PCB_COPY_FLAGS & (*inp_p)->sctp_flags) | SCTP_PCB_FLAGS_DONT_WAKE); inp->sctp_features = (*inp_p)->sctp_features; @@ -4897,7 +4897,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length, SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_INIT-ACK\n"); if (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) { /* We are not interested anymore */ - if ((stcb) && (stcb->asoc.total_output_queue_size)) { + if ((stcb) && (stcb->asoc.total_output_queue_size)) { ; } else { if (locked_tcb != stcb) { @@ -5898,7 +5898,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt * timer is clearing out the assoc, we should * NOT respond to any packet.. its OOTB. */ - SCTP_TCB_UNLOCK(stcb); + SCTP_TCB_UNLOCK(stcb); stcb = NULL; snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s\n", __FILE__, __LINE__, __FUNCTION__); op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), @@ -5907,7 +5907,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt #if defined(__FreeBSD__) use_mflowid, mflowid, #endif - vrf_id, port); + vrf_id, port); goto out; } @@ -5919,14 +5919,14 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt src, dst, sh, ch, inp, stcb, &net, &fwd_tsn_seen, #if defined(__FreeBSD__) - use_mflowid, mflowid, + use_mflowid, mflowid, #endif vrf_id, port); if (stcb) { /* This covers us if the cookie-echo was there * and it changes our INP. */ - inp = stcb->sctp_ep; + inp = stcb->sctp_ep; #if defined(INET) || defined(INET6) if ((net) && (port)) { if (net->port == 0) { diff --git a/netinet/sctp_output.c b/netinet/sctp_output.c index d3d3f79..3138712 100755 --- a/netinet/sctp_output.c +++ b/netinet/sctp_output.c @@ -2103,14 +2103,14 @@ sctp_add_addresses_to_i_ia(struct sctp_inpcb *inp, struct sctp_tcb *stcb, if ((sctp_ifap->address.sa.sa_family == AF_INET) && (prison_check_ip4(inp->ip_inp.inp.inp_cred, &sctp_ifap->address.sin.sin_addr) != 0)) { - continue; + continue; } #endif #ifdef INET6 if ((sctp_ifap->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, &sctp_ifap->address.sin6.sin6_addr) != 0)) { - continue; + continue; } #endif #endif @@ -2153,14 +2153,14 @@ sctp_add_addresses_to_i_ia(struct sctp_inpcb *inp, struct sctp_tcb *stcb, if ((sctp_ifap->address.sa.sa_family == AF_INET) && (prison_check_ip4(inp->ip_inp.inp.inp_cred, &sctp_ifap->address.sin.sin_addr) != 0)) { - continue; + continue; } #endif #ifdef INET6 if ((sctp_ifap->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, &sctp_ifap->address.sin6.sin6_addr) != 0)) { - continue; + continue; } #endif #endif @@ -2210,7 +2210,7 @@ sctp_add_addresses_to_i_ia(struct sctp_inpcb *inp, struct sctp_tcb *stcb, continue; } if (laddr->ifa->localifa_flags & SCTP_BEING_DELETED) - /* Address being deleted by the system, dont + /* Address being deleted by the system, dont * list. */ continue; @@ -2671,7 +2671,7 @@ sctp_choose_boundspecific_stcb(struct sctp_inpcb *inp, sctp_ifn = sctp_find_ifn( ifn, ifn_index); /* - * first question, is the ifn we will emit on in our list? If so, + * first question, is the ifn we will emit on in our list? If so, * we want that one. First we look for a preferred. Second, we go * for an acceptable. */ @@ -6417,7 +6417,7 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb, * address within the stc.. but for now this is a quick * hack to get the address stuff teased apart. */ - scp.ipv4_addr_legal = stc.ipv4_addr_legal; + scp.ipv4_addr_legal = stc.ipv4_addr_legal; scp.ipv6_addr_legal = stc.ipv6_addr_legal; #if defined(__Userspace__) scp.conn_addr_legal = stc.conn_addr_legal; @@ -10443,7 +10443,7 @@ sctp_chunk_output (struct sctp_inpcb *inp, /* Do we have something to send, data or control AND * a sack timer running, if so piggy-back the sack. */ - if (SCTP_OS_TIMER_PENDING(&stcb->asoc.dack_timer.timer)) { + if (SCTP_OS_TIMER_PENDING(&stcb->asoc.dack_timer.timer)) { sctp_send_sack(stcb, so_locked); (void)SCTP_OS_TIMER_STOP(&stcb->asoc.dack_timer.timer); } @@ -10458,7 +10458,7 @@ sctp_chunk_output (struct sctp_inpcb *inp, * by peer that carried data. Send cookie-ack only * and then the next call with get the retran's. */ - (void)sctp_med_chunk_output(inp, stcb, asoc, &num_out, &reason_code, 1, + (void)sctp_med_chunk_output(inp, stcb, asoc, &num_out, &reason_code, 1, from_where, &now, &now_filled, frag_point, so_locked); return; diff --git a/netinet/sctp_pcb.c b/netinet/sctp_pcb.c index 3b71856..a487660 100755 --- a/netinet/sctp_pcb.c +++ b/netinet/sctp_pcb.c @@ -224,8 +224,8 @@ sctp_allocate_vrf(int vrf_id) } SCTP_MALLOC(vrf, struct sctp_vrf *, sizeof(struct sctp_vrf), SCTP_M_VRF); - if (vrf == NULL) { - /* No memory */ + if (vrf == NULL) { + /* No memory */ #ifdef INVARIANTS panic("No memory for VRF:%d", vrf_id); #endif @@ -243,7 +243,7 @@ sctp_allocate_vrf(int vrf_id) vrf->vrf_addr_hash = SCTP_HASH_INIT(SCTP_VRF_ADDR_HASH_SIZE, &vrf->vrf_addr_hashmark); if (vrf->vrf_addr_hash == NULL) { - /* No memory */ + /* No memory */ #ifdef INVARIANTS panic("No memory for VRF:%d", vrf_id); #endif @@ -656,7 +656,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_remove_ifa_from_ifn(sctp_ifap); /* move the address over to the new ifn */ sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap); - goto exit_stage_left; + goto exit_stage_left; } else { /* repair ifnp which was NULL ? */ sctp_ifap->localifa_flags = SCTP_ADDR_VALID; @@ -3583,8 +3583,8 @@ sctp_inpcb_bind(struct socket *so, struct sockaddr *addr, last = MODULE_GLOBAL(ipport_lowlastauto); } else { #endif - first = MODULE_GLOBAL(ipport_firstauto); - last = MODULE_GLOBAL(ipport_lastauto); + first = MODULE_GLOBAL(ipport_firstauto); + last = MODULE_GLOBAL(ipport_lastauto); #if defined(__FreeBSD__) || defined(__APPLE__) } #endif @@ -4615,7 +4615,7 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr, * this means its an initial value */ net->rto_needed = 1; - net->RTO = 0; + net->RTO = 0; net->RTO_measured = 0; stcb->asoc.numnets++; net->ref_count = 1; @@ -5199,9 +5199,9 @@ sctp_remove_net(struct sctp_tcb *stcb, struct sctp_nets *net) (by micchie) */ if (sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_BASE) || + SCTP_MOBILITY_BASE) || sctp_is_mobility_feature_on(stcb->sctp_ep, - SCTP_MOBILITY_FASTHANDOFF)) { + SCTP_MOBILITY_FASTHANDOFF)) { SCTPDBG(SCTP_DEBUG_ASCONF1, "remove_net: primary dst is deleting\n"); if (asoc->deleted_primary != NULL) { SCTPDBG(SCTP_DEBUG_ASCONF1, "remove_net: deleted primary may be already stored\n"); @@ -6955,7 +6955,7 @@ sctp_pcb_finish(void) #endif #if !defined(__FreeBSD__) SCTP_IPI_ITERATOR_WQ_DESTROY(); - SCTP_ITERATOR_LOCK_DESTROY(); + SCTP_ITERATOR_LOCK_DESTROY(); #endif SCTP_OS_TIMER_STOP(&SCTP_BASE_INFO(addr_wq_timer.timer)); SCTP_WQ_ADDR_LOCK(); diff --git a/netinet/sctp_pcb.h b/netinet/sctp_pcb.h index bcd2864..5429a67 100755 --- a/netinet/sctp_pcb.h +++ b/netinet/sctp_pcb.h @@ -110,7 +110,7 @@ struct sctp_ifa { */ union sctp_sockstore address; uint32_t refcount; /* number of folks refering to this */ - uint32_t flags; + uint32_t flags; uint32_t localifa_flags; uint32_t vrf_id; /* vrf_id of this addr (for deleting) */ uint8_t src_is_loop; diff --git a/netinet/sctp_structs.h b/netinet/sctp_structs.h index f333ec8..063259f 100755 --- a/netinet/sctp_structs.h +++ b/netinet/sctp_structs.h @@ -714,8 +714,8 @@ struct sctp_nonpad_sndrcvinfo { struct sctp_cc_functions { void (*sctp_set_initial_cc_param)(struct sctp_tcb *stcb, struct sctp_nets *net); void (*sctp_cwnd_update_after_sack)(struct sctp_tcb *stcb, - struct sctp_association *asoc, - int accum_moved ,int reneged_all, int will_exit); + struct sctp_association *asoc, + int accum_moved ,int reneged_all, int will_exit); void (*sctp_cwnd_update_exit_pf)(struct sctp_tcb *stcb, struct sctp_nets *net); void (*sctp_cwnd_update_after_fr)(struct sctp_tcb *stcb, struct sctp_association *asoc); @@ -1218,7 +1218,7 @@ struct sctp_association { uint8_t peer_supports_strreset; uint8_t local_strreset_support; - uint8_t peer_supports_nat; + uint8_t peer_supports_nat; /* * packet drop's are supported by the peer, we don't really care * about this but we bookkeep it anyway. diff --git a/netinet/sctp_timer.c b/netinet/sctp_timer.c index bbd4e23..29f94f3 100755 --- a/netinet/sctp_timer.c +++ b/netinet/sctp_timer.c @@ -218,7 +218,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, * t3 handler. */ if (mnet == net) { - if (min_errors == -1) { + if (min_errors == -1) { min_errors = mnet->error_count + 1; min_errors_net = mnet; } else if (mnet->error_count + 1 < min_errors) { @@ -231,7 +231,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, } continue; } else { - if (min_errors == -1) { + if (min_errors == -1) { min_errors = mnet->error_count; min_errors_net = mnet; } else if (mnet->error_count < min_errors) { @@ -335,7 +335,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, do { alt = TAILQ_NEXT(mnet, sctp_next); if (alt == NULL) - { + { once++; if (once > 1) { break; @@ -926,9 +926,9 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp, */ if (net->ro._s_addr) { sctp_free_ifa(net->ro._s_addr); - net->ro._s_addr = NULL; + net->ro._s_addr = NULL; } - net->src_addr_selected = 0; + net->src_addr_selected = 0; /* Force a route allocation too */ if (net->ro.ro_rt) { @@ -1479,7 +1479,7 @@ sctp_pathmtu_timer(struct sctp_inpcb *inp, #elif defined(SCTP_KAME) (void)sa6_embedscope(sin6, MODULE_GLOBAL(ip6_use_defzone)); #else - (void)in6_embedscope(&sin6->sin6_addr, sin6); + (void)in6_embedscope(&sin6->sin6_addr, sin6); #endif } #endif diff --git a/netinet/sctp_usrreq.c b/netinet/sctp_usrreq.c index ee0a2a0..54ddaa6 100755 --- a/netinet/sctp_usrreq.c +++ b/netinet/sctp_usrreq.c @@ -4452,7 +4452,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, /* The VRF must be in the VRF list */ if (*default_vrfid == inp->m_vrf_ids[i]) { SCTP_INP_WLOCK(inp); - inp->def_vrf_id = *default_vrfid; + inp->def_vrf_id = *default_vrfid; SCTP_INP_WUNLOCK(inp); goto sctp_done; } @@ -4571,7 +4571,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EOPNOTSUPP); error = EOPNOTSUPP; #endif - break; + break; } case SCTP_DELAYED_SACK: { @@ -5662,7 +5662,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, } if (net->dest_state & SCTP_ADDR_REACHABLE) { if (net->error_count > paddrp->spp_pathmaxrxt) { - net->dest_state &= ~SCTP_ADDR_REACHABLE; + net->dest_state &= ~SCTP_ADDR_REACHABLE; sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_DOWN, stcb, 0, net, SCTP_SO_LOCKED); } } else { @@ -5705,7 +5705,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, } if (net->dest_state & SCTP_ADDR_REACHABLE) { if (net->error_count > paddrp->spp_pathmaxrxt) { - net->dest_state &= ~SCTP_ADDR_REACHABLE; + net->dest_state &= ~SCTP_ADDR_REACHABLE; sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_DOWN, stcb, 0, net, SCTP_SO_LOCKED); } } else { @@ -6204,7 +6204,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, #endif { error = EAFNOSUPPORT; - break; + break; } sctp_bindx_add_address(so, inp, addrs->addr, addrs->sget_assoc_id, vrf_id, @@ -6602,7 +6602,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, } else { if ((net->failure_threshold > thlds->spt_pathpfthld) && (net->failure_threshold <= thlds->spt_pathmaxrxt)) { - net->dest_state |= SCTP_ADDR_PF; + net->dest_state |= SCTP_ADDR_PF; sctp_send_hb(stcb, net, SCTP_SO_LOCKED); sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, net, SCTP_FROM_SCTP_TIMER + SCTP_LOC_3); sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, net); @@ -6631,7 +6631,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, } else { if ((net->failure_threshold > thlds->spt_pathpfthld) && (net->failure_threshold <= thlds->spt_pathmaxrxt)) { - net->dest_state |= SCTP_ADDR_PF; + net->dest_state |= SCTP_ADDR_PF; sctp_send_hb(stcb, net, SCTP_SO_LOCKED); sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, net, SCTP_FROM_SCTP_TIMER + SCTP_LOC_3); sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, net); @@ -6928,7 +6928,7 @@ sctp_connect(struct socket *so, struct mbuf *nam, struct proc *p) #endif default: SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EAFNOSUPPORT); - return (EAFNOSUPPORT); + return (EAFNOSUPPORT); } #endif SCTP_INP_INCR_REF(inp); @@ -7103,7 +7103,7 @@ sctpconn_connect(struct socket *so, struct sockaddr *addr) break; default: SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EAFNOSUPPORT); - return (EAFNOSUPPORT); + return (EAFNOSUPPORT); } SCTP_INP_INCR_REF(inp); SCTP_ASOC_CREATE_LOCK(inp); diff --git a/netinet/sctp_var.h b/netinet/sctp_var.h index f2a0316..883c9fa 100755 --- a/netinet/sctp_var.h +++ b/netinet/sctp_var.h @@ -76,7 +76,7 @@ extern struct pr_usrreqs sctp_usrreqs; ((stcb->asoc.sctp_features & feature) == 0)) || \ ((stcb == NULL) && (inp != NULL) && \ ((inp->sctp_features & feature) == 0)) || \ - ((stcb == NULL) && (inp == NULL))) + ((stcb == NULL) && (inp == NULL))) /* managing mobility_feature in inpcb (by micchie) */ #define sctp_mobility_feature_on(inp, feature) (inp->sctp_mobility_features |= feature) @@ -110,7 +110,7 @@ extern struct pr_usrreqs sctp_usrreqs; #define sctp_alloc_a_readq(_stcb, _readq) { \ (_readq) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_readq), struct sctp_queued_to_read); \ if ((_readq)) { \ - SCTP_INCR_READQ_COUNT(); \ + SCTP_INCR_READQ_COUNT(); \ } \ } @@ -125,11 +125,11 @@ extern struct pr_usrreqs sctp_usrreqs; #define sctp_alloc_a_strmoq(_stcb, _strmoq) { \ (_strmoq) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_strmoq), struct sctp_stream_queue_pending); \ - if ((_strmoq)) { \ + if ((_strmoq)) { \ memset(_strmoq, 0, sizeof(struct sctp_stream_queue_pending)); \ SCTP_INCR_STRMOQ_COUNT(); \ (_strmoq)->holds_key_ref = 0; \ - } \ + } \ } #define sctp_free_a_chunk(_stcb, _chk, _so_locked) { \ @@ -137,22 +137,22 @@ extern struct pr_usrreqs sctp_usrreqs; sctp_auth_key_release((_stcb), (_chk)->auth_keyid, _so_locked); \ (_chk)->holds_key_ref = 0; \ } \ - if (_stcb) { \ - SCTP_TCB_LOCK_ASSERT((_stcb)); \ - if ((_chk)->whoTo) { \ - sctp_free_remote_addr((_chk)->whoTo); \ - (_chk)->whoTo = NULL; \ - } \ - if (((_stcb)->asoc.free_chunk_cnt > SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit)) || \ - (SCTP_BASE_INFO(ipi_free_chunks) > SCTP_BASE_SYSCTL(sctp_system_free_resc_limit))) { \ - SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \ - SCTP_DECR_CHK_COUNT(); \ - } else { \ - TAILQ_INSERT_TAIL(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \ - (_stcb)->asoc.free_chunk_cnt++; \ - atomic_add_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \ - } \ - } else { \ + if (_stcb) { \ + SCTP_TCB_LOCK_ASSERT((_stcb)); \ + if ((_chk)->whoTo) { \ + sctp_free_remote_addr((_chk)->whoTo); \ + (_chk)->whoTo = NULL; \ + } \ + if (((_stcb)->asoc.free_chunk_cnt > SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit)) || \ + (SCTP_BASE_INFO(ipi_free_chunks) > SCTP_BASE_SYSCTL(sctp_system_free_resc_limit))) { \ + SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \ + SCTP_DECR_CHK_COUNT(); \ + } else { \ + TAILQ_INSERT_TAIL(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \ + (_stcb)->asoc.free_chunk_cnt++; \ + atomic_add_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \ + } \ + } else { \ SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \ SCTP_DECR_CHK_COUNT(); \ } \ @@ -163,7 +163,7 @@ extern struct pr_usrreqs sctp_usrreqs; (_chk) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_chunk), struct sctp_tmit_chunk); \ if ((_chk)) { \ SCTP_INCR_CHK_COUNT(); \ - (_chk)->whoTo = NULL; \ + (_chk)->whoTo = NULL; \ (_chk)->holds_key_ref = 0; \ } \ } else { \ @@ -171,7 +171,7 @@ extern struct pr_usrreqs sctp_usrreqs; TAILQ_REMOVE(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \ atomic_subtract_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \ (_chk)->holds_key_ref = 0; \ - SCTP_STAT_INCR(sctps_cached_chk); \ + SCTP_STAT_INCR(sctps_cached_chk); \ (_stcb)->asoc.free_chunk_cnt--; \ } \ } @@ -183,15 +183,15 @@ extern struct pr_usrreqs sctp_usrreqs; if (SCTP_DECREMENT_AND_CHECK_REFCOUNT(&(__net)->ref_count)) { \ (void)SCTP_OS_TIMER_STOP(&(__net)->rxt_timer.timer); \ (void)SCTP_OS_TIMER_STOP(&(__net)->pmtu_timer.timer); \ - if ((__net)->ro.ro_rt) { \ + if ((__net)->ro.ro_rt) { \ RTFREE((__net)->ro.ro_rt); \ (__net)->ro.ro_rt = NULL; \ - } \ + } \ if ((__net)->src_addr_selected) { \ sctp_free_ifa((__net)->ro._s_addr); \ (__net)->ro._s_addr = NULL; \ } \ - (__net)->src_addr_selected = 0; \ + (__net)->src_addr_selected = 0; \ (__net)->dest_state &= ~SCTP_ADDR_REACHABLE; \ SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_net), (__net)); \ SCTP_DECR_RADDR_COUNT(); \ @@ -231,15 +231,15 @@ extern struct pr_usrreqs sctp_usrreqs; (void)SCTP_OS_TIMER_STOP(&(__net)->rxt_timer.timer); \ (void)SCTP_OS_TIMER_STOP(&(__net)->pmtu_timer.timer); \ (void)SCTP_OS_TIMER_STOP(&(__net)->hb_timer.timer); \ - if ((__net)->ro.ro_rt) { \ + if ((__net)->ro.ro_rt) { \ RTFREE((__net)->ro.ro_rt); \ (__net)->ro.ro_rt = NULL; \ - } \ + } \ if ((__net)->src_addr_selected) { \ sctp_free_ifa((__net)->ro._s_addr); \ (__net)->ro._s_addr = NULL; \ } \ - (__net)->src_addr_selected = 0; \ + (__net)->src_addr_selected = 0; \ (__net)->dest_state &=~SCTP_ADDR_REACHABLE; \ SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_net), (__net)); \ SCTP_DECR_RADDR_COUNT(); \ @@ -323,12 +323,12 @@ extern struct pr_usrreqs sctp_usrreqs; } while (0) #define sctp_flight_size_increase(tp1) do { \ - (tp1)->whoTo->flight_size += (tp1)->book_size; \ + (tp1)->whoTo->flight_size += (tp1)->book_size; \ } while (0) #ifdef SCTP_FS_SPEC_LOG #define sctp_total_flight_decrease(stcb, tp1) do { \ - if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \ + if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \ stcb->asoc.fs_index = 0;\ stcb->asoc.fslog[stcb->asoc.fs_index].total_flight = stcb->asoc.total_flight; \ stcb->asoc.fslog[stcb->asoc.fs_index].tsn = tp1->rec.data.TSN_seq; \ @@ -337,7 +337,7 @@ extern struct pr_usrreqs sctp_usrreqs; stcb->asoc.fslog[stcb->asoc.fs_index].incr = 0; \ stcb->asoc.fslog[stcb->asoc.fs_index].decr = 1; \ stcb->asoc.fs_index++; \ - tp1->window_probe = 0; \ + tp1->window_probe = 0; \ if (stcb->asoc.total_flight >= tp1->book_size) { \ stcb->asoc.total_flight -= tp1->book_size; \ if (stcb->asoc.total_flight_count > 0) \ @@ -349,7 +349,7 @@ extern struct pr_usrreqs sctp_usrreqs; } while (0) #define sctp_total_flight_increase(stcb, tp1) do { \ - if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \ + if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \ stcb->asoc.fs_index = 0;\ stcb->asoc.fslog[stcb->asoc.fs_index].total_flight = stcb->asoc.total_flight; \ stcb->asoc.fslog[stcb->asoc.fs_index].tsn = tp1->rec.data.TSN_seq; \ @@ -358,14 +358,14 @@ extern struct pr_usrreqs sctp_usrreqs; stcb->asoc.fslog[stcb->asoc.fs_index].incr = 1; \ stcb->asoc.fslog[stcb->asoc.fs_index].decr = 0; \ stcb->asoc.fs_index++; \ - (stcb)->asoc.total_flight_count++; \ - (stcb)->asoc.total_flight += (tp1)->book_size; \ + (stcb)->asoc.total_flight_count++; \ + (stcb)->asoc.total_flight += (tp1)->book_size; \ } while (0) #else #define sctp_total_flight_decrease(stcb, tp1) do { \ - tp1->window_probe = 0; \ + tp1->window_probe = 0; \ if (stcb->asoc.total_flight >= tp1->book_size) { \ stcb->asoc.total_flight -= tp1->book_size; \ if (stcb->asoc.total_flight_count > 0) \ @@ -377,8 +377,8 @@ extern struct pr_usrreqs sctp_usrreqs; } while (0) #define sctp_total_flight_increase(stcb, tp1) do { \ - (stcb)->asoc.total_flight_count++; \ - (stcb)->asoc.total_flight += (tp1)->book_size; \ + (stcb)->asoc.total_flight_count++; \ + (stcb)->asoc.total_flight += (tp1)->book_size; \ } while (0) #endif diff --git a/netinet/sctputil.c b/netinet/sctputil.c index 476528f..904ebae 100755 --- a/netinet/sctputil.c +++ b/netinet/sctputil.c @@ -1004,7 +1004,7 @@ sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, #ifdef SCTP_ASOCLOG_OF_TSNS asoc->tsn_in_at = 0; - asoc->tsn_out_at = 0; + asoc->tsn_out_at = 0; asoc->tsn_in_wrapped = 0; asoc->tsn_out_wrapped = 0; asoc->cumack_log_at = 0; @@ -1273,7 +1273,7 @@ sctp_iterator_work(struct sctp_iterator *it) SCTP_INP_INFO_RLOCK(); SCTP_ITERATOR_LOCK(); - if (it->inp) { + if (it->inp) { SCTP_INP_RLOCK(it->inp); SCTP_INP_DECR_REF(it->inp); } @@ -1816,7 +1816,7 @@ sctp_timeout_handler(void *t) goto out_decr; } SCTP_STAT_INCR(sctps_timoshutdownack); - stcb->asoc.timoshutdownack++; + stcb->asoc.timoshutdownack++; #ifdef SCTP_AUDITING_ENABLED sctp_auditing(4, inp, stcb, net); #endif @@ -2566,15 +2566,15 @@ sctp_calculate_rto(struct sctp_tcb *stcb, stcb->asoc.sat_network = 0; stcb->asoc.sat_network_lockout = 1; } - /* bound it, per C6/C7 in Section 5.3.1 */ - if (new_rto < stcb->asoc.minrto) { + /* bound it, per C6/C7 in Section 5.3.1 */ + if (new_rto < stcb->asoc.minrto) { new_rto = stcb->asoc.minrto; } if (new_rto > stcb->asoc.maxrto) { new_rto = stcb->asoc.maxrto; } /* we are now returning the RTO */ - return (new_rto); + return (new_rto); } /* @@ -2892,7 +2892,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, if (sin6->sin6_scope_id == 0) { /* recover scope_id for user */ #ifdef SCTP_KAME - (void)sa6_recoverscope(sin6); + (void)sa6_recoverscope(sin6); #else (void)in6_recoverscope(sin6, &sin6->sin6_addr, NULL); @@ -5230,7 +5230,7 @@ sctp_release_pr_sctp_chunk(struct sctp_tcb *stcb, struct sctp_tmit_chunk *tp1, */ TAILQ_FOREACH_SAFE(tp1, &stcb->asoc.send_queue, sctp_next, tp2) { if ((tp1->rec.data.stream_number != stream) || - (tp1->rec.data.stream_seq != seq)) { + (tp1->rec.data.stream_seq != seq)) { break; } /* save to chk in case we have some on stream out diff --git a/netinet/sctputil.h b/netinet/sctputil.h index eec6c80..ca444c3 100755 --- a/netinet/sctputil.h +++ b/netinet/sctputil.h @@ -240,10 +240,10 @@ sctp_recover_scope(struct sockaddr_in6 *, struct sockaddr_in6 *); } while (0) #else #define sctp_recover_scope_mac(addr, store) do { \ - if ((addr->sin6_family == AF_INET6) && \ - (IN6_IS_SCOPE_LINKLOCAL(&addr->sin6_addr))) { \ + if ((addr->sin6_family == AF_INET6) && \ + (IN6_IS_SCOPE_LINKLOCAL(&addr->sin6_addr))) { \ *store = *addr; \ - if (addr->sin6_scope_id == 0) { \ + if (addr->sin6_scope_id == 0) { \ if (!in6_recoverscope(store, &store->sin6_addr, \ NULL)) { \ addr = store; \ @@ -252,7 +252,7 @@ sctp_recover_scope(struct sockaddr_in6 *, struct sockaddr_in6 *); in6_clearscope(&addr->sin6_addr); \ addr = store; \ } \ - } \ + } \ } while (0) #endif #endif @@ -291,42 +291,42 @@ sctp_free_bufspace(struct sctp_tcb *, struct sctp_association *, #define sctp_free_bufspace(stcb, asoc, tp1, chk_cnt) \ do { \ if (tp1->data != NULL) { \ - atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \ + atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \ if ((asoc)->total_output_queue_size >= tp1->book_size) { \ atomic_subtract_int(&((asoc)->total_output_queue_size), tp1->book_size); \ } else { \ (asoc)->total_output_queue_size = 0; \ } \ - if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ + if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ + (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ if (stcb->sctp_socket->so_snd.sb_cc >= tp1->book_size) { \ atomic_subtract_int(&((stcb)->sctp_socket->so_snd.sb_cc), tp1->book_size); \ } else { \ stcb->sctp_socket->so_snd.sb_cc = 0; \ } \ } \ - } \ + } \ } while (0) #endif #define sctp_free_spbufspace(stcb, asoc, sp) \ do { \ - if (sp->data != NULL) { \ + if (sp->data != NULL) { \ if ((asoc)->total_output_queue_size >= sp->length) { \ atomic_subtract_int(&(asoc)->total_output_queue_size, sp->length); \ } else { \ (asoc)->total_output_queue_size = 0; \ } \ - if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ + if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ + (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ if (stcb->sctp_socket->so_snd.sb_cc >= sp->length) { \ atomic_subtract_int(&stcb->sctp_socket->so_snd.sb_cc,sp->length); \ } else { \ stcb->sctp_socket->so_snd.sb_cc = 0; \ } \ } \ - } \ + } \ } while (0) #define sctp_snd_sb_alloc(stcb, sz) \ diff --git a/netinet6/sctp6_usrreq.c b/netinet6/sctp6_usrreq.c index 45a3196..65829d0 100644 --- a/netinet6/sctp6_usrreq.c +++ b/netinet6/sctp6_usrreq.c @@ -246,7 +246,7 @@ sctp6_input(struct mbuf **i_pak, int *offp, int proto) #if defined(__APPLE__) /* XXX: This code should also be used on Apple */ #endif - if (in6_setscope(&src.sin6_addr, m->m_pkthdr.rcvif, NULL) != 0) { + if (in6_setscope(&src.sin6_addr, m->m_pkthdr.rcvif, NULL) != 0) { goto out; } #endif @@ -261,7 +261,7 @@ sctp6_input(struct mbuf **i_pak, int *offp, int proto) #if defined(__APPLE__) /* XXX: This code should also be used on Apple */ #endif - if (in6_setscope(&dst.sin6_addr, m->m_pkthdr.rcvif, NULL) != 0) { + if (in6_setscope(&dst.sin6_addr, m->m_pkthdr.rcvif, NULL) != 0) { goto out; } #endif @@ -1729,7 +1729,7 @@ struct pr_usrreqs sctp6_usrreqs = { .pru_sockaddr = sctp6_in6getaddr, .pru_sosend = sctp_sosend, .pru_soreceive = sctp_soreceive, - .pru_sopoll = sopoll + .pru_sopoll = sopoll #elif defined(__Windows__) sctp6_abort, sctp_accept, |