Author: tuexen
Date: Sun May 6 11:37:41 2012
New Revision: 235077
URL: http://svn.freebsd.org/changeset/base/235077
Log:
Remove debug code.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_usrreq.c
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Sun May 6 11:32:36 2012
(r235076)
+++ head/sys/netinet/sctp_input.c Sun May 6 11:37:41 2012
(r235077)
@@ -785,15 +785,6 @@ sctp_handle_abort(struct sctp_abort_chun
/* notify user of the abort and clean up... */
sctp_abort_notification(stcb, 0, SCTP_SO_NOT_LOCKED);
/* free the tcb */
-#if defined(SCTP_PANIC_ON_ABORT)
- SCTP_PRINTF("stcb:%p state:%d rport:%d net:%p\n",
- stcb, stcb->asoc.state, stcb->rport, net);
- if (!(stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) {
- panic("Received an ABORT");
- } else {
- SCTP_PRINTF("No panic its in state %x closed\n",
stcb->asoc.state);
- }
-#endif
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
if ((SCTP_GET_STATE(&stcb->asoc) == SCTP_STATE_OPEN) ||
(SCTP_GET_STATE(&stcb->asoc) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Sun May 6 11:32:36 2012 (r235076)
+++ head/sys/netinet/sctp_pcb.c Sun May 6 11:37:41 2012 (r235077)
@@ -3426,9 +3426,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp,
*ippp = htonl(SCTP_FROM_SCTP_PCB +
SCTP_LOC_3);
}
asoc->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_PCB + SCTP_LOC_3;
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("inpcb_free does an abort");
-#endif
sctp_send_abort_tcb(asoc, op_err,
SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
if ((SCTP_GET_STATE(&asoc->asoc) ==
SCTP_STATE_OPEN) ||
@@ -3520,10 +3517,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp,
*ippp =
htonl(SCTP_FROM_SCTP_PCB + SCTP_LOC_5);
}
asoc->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_PCB + SCTP_LOC_5;
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("inpcb_free does an abort");
-#endif
-
sctp_send_abort_tcb(asoc, op_err,
SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
if ((SCTP_GET_STATE(&asoc->asoc) ==
SCTP_STATE_OPEN) ||
@@ -3604,9 +3597,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp,
}
asoc->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB +
SCTP_LOC_7;
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("inpcb_free does an abort");
-#endif
sctp_send_abort_tcb(asoc, op_err, SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
} else if (asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c Sun May 6 11:32:36 2012
(r235076)
+++ head/sys/netinet/sctp_usrreq.c Sun May 6 11:37:41 2012
(r235077)
@@ -780,9 +780,6 @@ sctp_disconnect(struct socket *so)
ph->param_type =
htons(SCTP_CAUSE_USER_INITIATED_ABT);
ph->param_length =
htons(SCTP_BUF_LEN(err));
}
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("disconnect does an abort");
-#endif
sctp_send_abort_tcb(stcb, err,
SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
}
@@ -888,10 +885,6 @@ sctp_disconnect(struct socket *so)
ippp = (uint32_t *) (ph + 1);
*ippp =
htonl(SCTP_FROM_SCTP_USRREQ + SCTP_LOC_4);
}
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("disconnect does an abort");
-#endif
-
stcb->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_USRREQ + SCTP_LOC_4;
sctp_send_abort_tcb(stcb, op_err,
SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
@@ -1103,9 +1096,6 @@ sctp_shutdown(struct socket *so)
ippp = (uint32_t *) (ph + 1);
*ippp = htonl(SCTP_FROM_SCTP_USRREQ +
SCTP_LOC_6);
}
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("shutdown does an abort");
-#endif
stcb->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6;
sctp_abort_an_association(stcb->sctp_ep, stcb,
SCTP_RESPONSE_TO_USER_REQ,
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Sun May 6 11:32:36 2012 (r235076)
+++ head/sys/netinet/sctputil.c Sun May 6 11:37:41 2012 (r235077)
@@ -3881,9 +3881,6 @@ sctp_abort_an_association(struct sctp_in
if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0)
sctp_abort_notification(stcb, error, so_locked);
/* notify the peer */
-#if defined(SCTP_PANIC_ON_ABORT)
- panic("aborting an association");
-#endif
sctp_send_abort_tcb(stcb, op_err, so_locked);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
if ((SCTP_GET_STATE(&stcb->asoc) == SCTP_STATE_OPEN) ||
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
