Author: tuexen
Date: Sat Mar 21 16:12:19 2020
New Revision: 359195
URL: https://svnweb.freebsd.org/changeset/base/359195
Log:
More timer cleanups, no functional change.
MFC after: 1 week
Modified:
head/sys/netinet/sctp_asconf.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_timer.c
head/sys/netinet/sctp_timer.h
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_asconf.c
==============================================================================
--- head/sys/netinet/sctp_asconf.c Sat Mar 21 15:51:05 2020
(r359194)
+++ head/sys/netinet/sctp_asconf.c Sat Mar 21 16:12:19 2020
(r359195)
@@ -585,8 +585,7 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
sctp_move_chunks_from_net(stcb,
stcb->asoc.deleted_primary);
}
- sctp_delete_prim_timer(stcb->sctp_ep, stcb,
- stcb->asoc.deleted_primary);
+ sctp_delete_prim_timer(stcb->sctp_ep, stcb);
}
} else {
/* couldn't set the requested primary address! */
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Sat Mar 21 15:51:05 2020
(r359194)
+++ head/sys/netinet/sctp_input.c Sat Mar 21 16:12:19 2020
(r359195)
@@ -703,8 +703,7 @@ sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk
sctp_move_chunks_from_net(stcb,
stcb->asoc.deleted_primary);
}
- sctp_delete_prim_timer(stcb->sctp_ep, stcb,
- stcb->asoc.deleted_primary);
+ sctp_delete_prim_timer(stcb->sctp_ep, stcb);
}
}
}
Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c Sat Mar 21 15:51:05 2020
(r359194)
+++ head/sys/netinet/sctp_timer.c Sat Mar 21 16:12:19 2020
(r359195)
@@ -1264,8 +1264,7 @@ sctp_asconf_timer(struct sctp_inpcb *inp, struct sctp_
/* Mobility adaptation */
void
-sctp_delete_prim_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
- struct sctp_nets *net SCTP_UNUSED)
+sctp_delete_prim_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb)
{
if (stcb->asoc.deleted_primary == NULL) {
SCTPDBG(SCTP_DEBUG_ASCONF1, "delete_prim_timer: deleted_primary
is not stored...\n");
@@ -1521,9 +1520,7 @@ sctp_pathmtu_timer(struct sctp_inpcb *inp,
}
void
-sctp_autoclose_timer(struct sctp_inpcb *inp,
- struct sctp_tcb *stcb,
- struct sctp_nets *net)
+sctp_autoclose_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb)
{
struct timeval tn, *tim_touse;
struct sctp_association *asoc;
@@ -1562,7 +1559,7 @@ sctp_autoclose_timer(struct sctp_inpcb *inp,
*/
if (SCTP_GET_STATE(stcb) !=
SCTP_STATE_SHUTDOWN_SENT) {
/* only send SHUTDOWN 1st time thru */
- struct sctp_nets *netp;
+ struct sctp_nets *net;
if ((SCTP_GET_STATE(stcb) ==
SCTP_STATE_OPEN) ||
(SCTP_GET_STATE(stcb) ==
SCTP_STATE_SHUTDOWN_RECEIVED)) {
@@ -1571,17 +1568,15 @@ sctp_autoclose_timer(struct sctp_inpcb *inp,
SCTP_SET_STATE(stcb,
SCTP_STATE_SHUTDOWN_SENT);
sctp_stop_timers_for_shutdown(stcb);
if (stcb->asoc.alternate) {
- netp = stcb->asoc.alternate;
+ net = stcb->asoc.alternate;
} else {
- netp =
stcb->asoc.primary_destination;
+ net =
stcb->asoc.primary_destination;
}
- sctp_send_shutdown(stcb, netp);
+ sctp_send_shutdown(stcb, net);
sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWN,
- stcb->sctp_ep, stcb,
- netp);
+ stcb->sctp_ep, stcb, net);
sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD,
- stcb->sctp_ep, stcb,
- netp);
+ stcb->sctp_ep, stcb, NULL);
}
}
} else {
@@ -1594,8 +1589,7 @@ sctp_autoclose_timer(struct sctp_inpcb *inp,
/* fool the timer startup to use the time left */
tmp = asoc->sctp_autoclose_ticks;
asoc->sctp_autoclose_ticks -= ticks_gone_by;
- sctp_timer_start(SCTP_TIMER_TYPE_AUTOCLOSE, inp, stcb,
- net);
+ sctp_timer_start(SCTP_TIMER_TYPE_AUTOCLOSE, inp, stcb,
NULL);
/* restore the real tick value */
asoc->sctp_autoclose_ticks = tmp;
}
Modified: head/sys/netinet/sctp_timer.h
==============================================================================
--- head/sys/netinet/sctp_timer.h Sat Mar 21 15:51:05 2020
(r359194)
+++ head/sys/netinet/sctp_timer.h Sat Mar 21 16:12:19 2020
(r359195)
@@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$");
#define SCTP_RTT_SHIFT 3
#define SCTP_RTT_VAR_SHIFT 2
-struct sctp_nets *
-sctp_find_alternate_net(struct sctp_tcb *,
- struct sctp_nets *, int mode);
+struct sctp_nets *sctp_find_alternate_net(struct sctp_tcb *, struct sctp_nets
*, int);
int
sctp_t3rxt_timer(struct sctp_inpcb *, struct sctp_tcb *,
@@ -82,12 +80,10 @@ sctp_asconf_timer(struct sctp_inpcb *, struct sctp_tcb
struct sctp_nets *);
void
-sctp_delete_prim_timer(struct sctp_inpcb *, struct sctp_tcb *,
- struct sctp_nets *);
+ sctp_delete_prim_timer(struct sctp_inpcb *, struct sctp_tcb *);
void
-sctp_autoclose_timer(struct sctp_inpcb *, struct sctp_tcb *,
- struct sctp_nets *net);
+ sctp_autoclose_timer(struct sctp_inpcb *, struct sctp_tcb *);
void sctp_audit_retranmission_queue(struct sctp_association *);
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Sat Mar 21 15:51:05 2020 (r359194)
+++ head/sys/netinet/sctputil.c Sat Mar 21 16:12:19 2020 (r359195)
@@ -1931,7 +1931,7 @@ sctp_timeout_handler(void *t)
break;
}
SCTP_STAT_INCR(sctps_timoautoclose);
- sctp_autoclose_timer(inp, stcb, net);
+ sctp_autoclose_timer(inp, stcb);
sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_AUTOCLOSE_TMR,
SCTP_SO_NOT_LOCKED);
did_output = 0;
break;
@@ -1997,7 +1997,7 @@ sctp_timeout_handler(void *t)
if ((stcb == NULL) || (inp == NULL)) {
break;
}
- sctp_delete_prim_timer(inp, stcb, net);
+ sctp_delete_prim_timer(inp, stcb);
SCTP_STAT_INCR(sctps_timodelprim);
break;
default:
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
