svn commit: r212714 - head/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Wed Sep 15 23:56:26 UTC 2010
Author: tuexen
Date: Wed Sep 15 23:56:25 2010
New Revision: 212714
URL: http://svn.freebsd.org/changeset/base/212714
Log:
Remove old debug code.
MFC after: 2 weeks.
Modified:
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_usrreq.c
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Wed Sep 15 23:40:36 2010 (r212713)
+++ head/sys/netinet/sctp_output.c Wed Sep 15 23:56:25 2010 (r212714)
@@ -3803,9 +3803,6 @@ sctp_lowlevel_chunk_output(struct sctp_i
mtu -= sizeof(struct udphdr);
}
if (mtu && (stcb->asoc.smallest_mtu > mtu)) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("sctp_mtu_size_reset called after ip_output mtu-change:%d\n", mtu);
-#endif
sctp_mtu_size_reset(inp, &stcb->asoc, mtu);
net->mtu = mtu;
}
@@ -4134,10 +4131,6 @@ sctp_lowlevel_chunk_output(struct sctp_i
mtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr, &net->ro._l_addr.sa, ro->ro_rt);
if (mtu &&
(stcb->asoc.smallest_mtu > mtu)) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("sctp_mtu_size_reset called after ip6_output mtu-change:%d\n",
- mtu);
-#endif
sctp_mtu_size_reset(inp, &stcb->asoc, mtu);
net->mtu = mtu;
if (net->port) {
@@ -4147,10 +4140,6 @@ sctp_lowlevel_chunk_output(struct sctp_i
} else if (ifp) {
if (ND_IFINFO(ifp)->linkmtu &&
(stcb->asoc.smallest_mtu > ND_IFINFO(ifp)->linkmtu)) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("sctp_mtu_size_reset called via ifp ND_IFINFO() linkmtu:%d\n",
- ND_IFINFO(ifp)->linkmtu);
-#endif
sctp_mtu_size_reset(inp,
&stcb->asoc,
ND_IFINFO(ifp)->linkmtu);
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Wed Sep 15 23:40:36 2010 (r212713)
+++ head/sys/netinet/sctp_pcb.c Wed Sep 15 23:56:25 2010 (r212714)
@@ -3916,9 +3916,6 @@ sctp_add_remote_addr(struct sctp_tcb *st
} else {
net->mtu = 0;
}
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("We have found an interface mtu of %d\n", net->mtu);
-#endif
if (net->mtu == 0) {
/* Huh ?? */
net->mtu = SCTP_DEFAULT_MTU;
@@ -3926,9 +3923,6 @@ sctp_add_remote_addr(struct sctp_tcb *st
uint32_t rmtu;
rmtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr, &net->ro._l_addr.sa, net->ro.ro_rt);
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("The route mtu is %d\n", rmtu);
-#endif
if (rmtu == 0) {
/*
* Start things off to match mtu of
@@ -3946,9 +3940,6 @@ sctp_add_remote_addr(struct sctp_tcb *st
}
}
if (from == SCTP_ALLOC_ASOC) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("New assoc sets mtu to :%d\n", net->mtu);
-#endif
stcb->asoc.smallest_mtu = net->mtu;
}
} else {
@@ -3966,10 +3957,6 @@ sctp_add_remote_addr(struct sctp_tcb *st
net->mtu -= sizeof(struct udphdr);
}
if (stcb->asoc.smallest_mtu > net->mtu) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("new address mtu:%d smaller than smallest:%d\n",
- net->mtu, stcb->asoc.smallest_mtu);
-#endif
stcb->asoc.smallest_mtu = net->mtu;
}
/* JRS - Use the congestion control given in the CC module */
Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c Wed Sep 15 23:40:36 2010 (r212713)
+++ head/sys/netinet/sctp_usrreq.c Wed Sep 15 23:56:25 2010 (r212714)
@@ -111,10 +111,6 @@ sctp_pathmtu_adjustment(struct sctp_inpc
/* Adjust that too */
stcb->asoc.smallest_mtu = nxtsz;
/* now off to subtract IP_DF flag if needed */
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("sctp_pathmtu_adjust called inp:%p stcb:%p net:%p nxtsz:%d\n",
- inp, stcb, net, nxtsz);
-#endif
overhead = IP_HDR_SIZE;
if (sctp_auth_is_required_chunk(SCTP_DATA, stcb->asoc.peer_auth_chunks)) {
overhead += sctp_get_auth_chunk_len(stcb->asoc.peer_hmac_id);
@@ -215,10 +211,6 @@ sctp_notify_mbuf(struct sctp_inpcb *inp,
}
/* now what about the ep? */
if (stcb->asoc.smallest_mtu > nxtsz) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("notify_mbuf (ICMP) calls sctp_pathmtu_adjust mtu:%d\n",
- nxtsz);
-#endif
sctp_pathmtu_adjustment(inp, stcb, net, nxtsz);
}
if (tmr_stopped)
@@ -3806,10 +3798,6 @@ sctp_setopt(struct socket *so, int optna
if (paddrp->spp_pathmtu > SCTP_DEFAULT_MINSEGMENT) {
net->mtu = paddrp->spp_pathmtu + ovh;
if (net->mtu < stcb->asoc.smallest_mtu) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("SCTP_PMTU_DISABLE calls sctp_pathmtu_adjustment:%d\n",
- net->mtu);
-#endif
sctp_pathmtu_adjustment(inp, stcb, net, net->mtu);
}
}
@@ -3854,10 +3842,6 @@ sctp_setopt(struct socket *so, int optna
if (paddrp->spp_pathmtu > SCTP_DEFAULT_MINSEGMENT) {
net->mtu = paddrp->spp_pathmtu + ovh;
if (net->mtu < stcb->asoc.smallest_mtu) {
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("SCTP_PMTU_DISABLE calls sctp_pathmtu_adjustment:%d\n",
- net->mtu);
-#endif
sctp_pathmtu_adjustment(inp, stcb, net, net->mtu);
}
}
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Wed Sep 15 23:40:36 2010 (r212713)
+++ head/sys/netinet/sctputil.c Wed Sep 15 23:56:25 2010 (r212714)
@@ -1004,10 +1004,6 @@ sctp_init_asoc(struct sctp_inpcb *m, str
asoc->peers_rwnd = SCTP_SB_LIMIT_RCV(m->sctp_socket);
asoc->smallest_mtu = m->sctp_frag_point;
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("smallest_mtu init'd with asoc to :%d\n",
- asoc->smallest_mtu);
-#endif
asoc->minrto = m->sctp_ep.sctp_minrto;
asoc->maxrto = m->sctp_ep.sctp_maxrto;
@@ -2488,10 +2484,6 @@ sctp_mtu_size_reset(struct sctp_inpcb *i
struct sctp_tmit_chunk *chk;
unsigned int eff_mtu, ovh;
-#ifdef SCTP_PRINT_FOR_B_AND_M
- SCTP_PRINTF("sctp_mtu_size_reset(%p, asoc:%p mtu:%d\n",
- inp, asoc, mtu);
-#endif
asoc->smallest_mtu = mtu;
if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
ovh = SCTP_MIN_OVERHEAD;
More information about the svn-src-all
mailing list