Author: tuexen
Date: Fri May 4 09:27:00 2012
New Revision: 234995
URL: http://svn.freebsd.org/changeset/base/234995
Log:
Use SCTP_PRINTF() instead of printf() in all SCTP sources.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_auth.c
head/sys/netinet/sctp_bsd_addr.c
head/sys/netinet/sctp_cc_functions.c
head/sys/netinet/sctp_crc32.c
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_os_bsd.h
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_auth.c
==============================================================================
--- head/sys/netinet/sctp_auth.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_auth.c Fri May 4 09:27:00 2012
(r234995)
@@ -284,16 +284,16 @@ sctp_print_key(sctp_key_t * key, const c
uint32_t i;
if (key == NULL) {
- printf("%s: [Null key]\n", str);
+ SCTP_PRINTF("%s: [Null key]\n", str);
return;
}
- printf("%s: len %u, ", str, key->keylen);
+ SCTP_PRINTF("%s: len %u, ", str, key->keylen);
if (key->keylen) {
for (i = 0; i < key->keylen; i++)
- printf("%02x", key->key[i]);
- printf("\n");
+ SCTP_PRINTF("%02x", key->key[i]);
+ SCTP_PRINTF("\n");
} else {
- printf("[Null key]\n");
+ SCTP_PRINTF("[Null key]\n");
}
}
@@ -303,16 +303,16 @@ sctp_show_key(sctp_key_t * key, const ch
uint32_t i;
if (key == NULL) {
- printf("%s: [Null key]\n", str);
+ SCTP_PRINTF("%s: [Null key]\n", str);
return;
}
- printf("%s: len %u, ", str, key->keylen);
+ SCTP_PRINTF("%s: len %u, ", str, key->keylen);
if (key->keylen) {
for (i = 0; i < key->keylen; i++)
- printf("%02x", key->key[i]);
- printf("\n");
+ SCTP_PRINTF("%02x", key->key[i]);
+ SCTP_PRINTF("\n");
} else {
- printf("[Null key]\n");
+ SCTP_PRINTF("[Null key]\n");
}
}
Modified: head/sys/netinet/sctp_bsd_addr.c
==============================================================================
--- head/sys/netinet/sctp_bsd_addr.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_bsd_addr.c Fri May 4 09:27:00 2012
(r234995)
@@ -483,7 +483,7 @@ again_locked:
}
/* Sanity check */
if (thisend >= SCTP_PACKET_LOG_SIZE) {
- printf("Insanity stops a log thisbegin:%d thisend:%d writers:%d
lock:%d end:%d\n",
+ SCTP_PRINTF("Insanity stops a log thisbegin:%d thisend:%d
writers:%d lock:%d end:%d\n",
thisbegin,
thisend,
SCTP_BASE_VAR(packet_log_writers),
Modified: head/sys/netinet/sctp_cc_functions.c
==============================================================================
--- head/sys/netinet/sctp_cc_functions.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_cc_functions.c Fri May 4 09:27:00 2012
(r234995)
@@ -1594,9 +1594,7 @@ sctp_hs_cwnd_increase(struct sctp_tcb *s
cur_val = net->cwnd >> 10;
indx = SCTP_HS_TABLE_SIZE - 1;
-#ifdef SCTP_DEBUG
- printf("HS CC CAlled.\n");
-#endif
+
if (cur_val < sctp_cwnd_adjust[0].cwnd) {
/* normal mode */
if (net->net_ack > net->mtu) {
Modified: head/sys/netinet/sctp_crc32.c
==============================================================================
--- head/sys/netinet/sctp_crc32.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_crc32.c Fri May 4 09:27:00 2012
(r234995)
@@ -134,7 +134,7 @@ sctp_delayed_cksum(struct mbuf *m, uint3
offset += offsetof(struct sctphdr, checksum);
if (offset + sizeof(uint32_t) > (uint32_t) (m->m_len)) {
- printf("sctp_delayed_cksum(): m->len: %d, off: %d.\n",
+ SCTP_PRINTF("sctp_delayed_cksum(): m->len: %d, off: %d.\n",
(uint32_t) m->m_len, offset);
/*
* XXX this shouldn't happen, but if it does, the correct
Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_indata.c Fri May 4 09:27:00 2012
(r234995)
@@ -328,7 +328,7 @@ sctp_mark_non_revokable(struct sctp_asso
}
SCTP_CALC_TSN_TO_GAP(gap, tsn, asoc->mapping_array_base_tsn);
if (!SCTP_IS_TSN_PRESENT(asoc->mapping_array, gap)) {
- printf("gap:%x tsn:%x\n", gap, tsn);
+ SCTP_PRINTF("gap:%x tsn:%x\n", gap, tsn);
sctp_print_mapping_array(asoc);
#ifdef INVARIANTS
panic("Things are really messed up now!!");
@@ -2308,7 +2308,7 @@ sctp_slide_mapping_arrays(struct sctp_tc
#ifdef INVARIANTS
for (i = 0; i < asoc->mapping_array_size; i++) {
if ((asoc->mapping_array[i]) ||
(asoc->nr_mapping_array[i])) {
- printf("Error Mapping array's not clean at
clear\n");
+ SCTP_PRINTF("Error Mapping array's not clean at
clear\n");
sctp_print_mapping_array(asoc);
}
}
@@ -2330,7 +2330,7 @@ sctp_slide_mapping_arrays(struct sctp_tc
#ifdef INVARIANTS
panic("impossible slide");
#else
- printf("impossible slide lgap:%x slide_end:%x
slide_from:%x? at:%d\n",
+ SCTP_PRINTF("impossible slide lgap:%x slide_end:%x
slide_from:%x? at:%d\n",
lgap, slide_end, slide_from, at);
return;
#endif
@@ -2339,7 +2339,7 @@ sctp_slide_mapping_arrays(struct sctp_tc
#ifdef INVARIANTS
panic("would overrun buffer");
#else
- printf("Gak, would have overrun map end:%d
slide_end:%d\n",
+ SCTP_PRINTF("Gak, would have overrun map end:%d
slide_end:%d\n",
asoc->mapping_array_size, slide_end);
slide_end = asoc->mapping_array_size;
#endif
@@ -3489,7 +3489,10 @@ sctp_strike_gap_ack_chunks(struct sctp_t
continue;
}
}
- /* printf("OK, we are now ready to FR this guy\n"); */
+ /*
+ * SCTP_PRINTF("OK, we are now ready to FR this
+ * guy\n");
+ */
if (SCTP_BASE_SYSCTL(sctp_logging_level) &
SCTP_FR_LOGGING_ENABLE) {
sctp_log_fr(tp1->rec.data.TSN_seq,
tp1->snd_count,
0, SCTP_FR_MARKED);
@@ -3557,7 +3560,7 @@ sctp_strike_gap_ack_chunks(struct sctp_t
tot_retrans++;
/* mark the sending seq for possible subsequent FR's */
/*
- * printf("Marking TSN for FR new value %x\n",
+ * SCTP_PRINTF("Marking TSN for FR new value %x\n",
* (uint32_t)tpi->rec.data.TSN_seq);
*/
if (TAILQ_EMPTY(&asoc->send_queue)) {
@@ -3709,11 +3712,10 @@ sctp_fs_audit(struct sctp_association *a
TAILQ_FOREACH(chk, &asoc->sent_queue, sctp_next) {
if (chk->sent < SCTP_DATAGRAM_RESEND) {
- printf("Chk TSN:%u size:%d inflight cnt:%d\n",
+ SCTP_PRINTF("Chk TSN:%u size:%d inflight cnt:%d\n",
chk->rec.data.TSN_seq,
chk->send_size,
- chk->snd_count
- );
+ chk->snd_count);
inflight++;
} else if (chk->sent == SCTP_DATAGRAM_RESEND) {
resend++;
@@ -3730,7 +3732,7 @@ sctp_fs_audit(struct sctp_association *a
#ifdef INVARIANTS
panic("Flight size-express incorrect? \n");
#else
- printf("asoc->total_flight:%d cnt:%d\n",
+ SCTP_PRINTF("asoc->total_flight:%d cnt:%d\n",
entry_flight, entry_cnt);
SCTP_PRINTF("Flight size-express incorrect F:%d I:%d R:%d Ab:%d
ACK:%d\n",
@@ -3895,7 +3897,7 @@ sctp_express_handle_sack(struct sctp_tcb
TAILQ_FOREACH_SAFE(tp1, &asoc->sent_queue, sctp_next, tp2) {
if (SCTP_TSN_GE(cumack, tp1->rec.data.TSN_seq)) {
if (tp1->sent == SCTP_DATAGRAM_UNSENT) {
- printf("Warning, an unsent is now
acked?\n");
+ SCTP_PRINTF("Warning, an unsent is now
acked?\n");
}
if (tp1->sent < SCTP_DATAGRAM_ACKED) {
/*
@@ -4437,10 +4439,10 @@ sctp_handle_sack(struct mbuf *m, int off
* no way, we have not even sent this TSN out yet.
* Peer is hopelessly messed up with us.
*/
- printf("NEW cum_ack:%x send_s:%x is smaller or equal\n",
+ SCTP_PRINTF("NEW cum_ack:%x send_s:%x is smaller or
equal\n",
cum_ack, send_s);
if (tp1) {
- printf("Got send_s from tsn:%x + 1 of tp1:%p\n",
+ SCTP_PRINTF("Got send_s from tsn:%x + 1 of
tp1:%p\n",
tp1->rec.data.TSN_seq, tp1);
}
hopeless_peer:
@@ -4681,10 +4683,8 @@ sctp_handle_sack(struct mbuf *m, int off
* peer is either confused or we are under
* attack. We must abort.
*/
- printf("Hopeless peer! biggest_tsn_acked:%x
largest seq:%x\n",
- biggest_tsn_acked,
- send_s);
-
+ SCTP_PRINTF("Hopeless peer!
biggest_tsn_acked:%x largest seq:%x\n",
+ biggest_tsn_acked, send_s);
goto hopeless_peer;
}
}
@@ -4719,7 +4719,7 @@ sctp_handle_sack(struct mbuf *m, int off
}
if (tp1->sent == SCTP_DATAGRAM_UNSENT) {
/* no more sent on list */
- printf("Warning, tp1->sent == %d and its now acked?\n",
+ SCTP_PRINTF("Warning, tp1->sent == %d and its now
acked?\n",
tp1->sent);
}
TAILQ_REMOVE(&asoc->sent_queue, tp1, sctp_next);
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_input.c Fri May 4 09:27:00 2012
(r234995)
@@ -786,12 +786,12 @@ sctp_handle_abort(struct sctp_abort_chun
sctp_abort_notification(stcb, 0, SCTP_SO_NOT_LOCKED);
/* free the tcb */
#if defined(SCTP_PANIC_ON_ABORT)
- printf("stcb:%p state:%d rport:%d net:%p\n",
+ 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 {
- printf("No panic its in state %x closed\n", stcb->asoc.state);
+ SCTP_PRINTF("No panic its in state %x closed\n",
stcb->asoc.state);
}
#endif
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
@@ -5792,9 +5792,9 @@ static void
sctp_print_mbuf_chain(struct mbuf *m)
{
for (; m; m = SCTP_BUF_NEXT(m)) {
- printf("%p: m_len = %ld\n", m, SCTP_BUF_LEN(m));
+ SCTP_PRINTF("%p: m_len = %ld\n", m, SCTP_BUF_LEN(m));
if (SCTP_BUF_IS_EXTENDED(m))
- printf("%p: extend_size = %d\n", m,
SCTP_BUF_EXTEND_SIZE(m));
+ SCTP_PRINTF("%p: extend_size = %d\n", m,
SCTP_BUF_EXTEND_SIZE(m));
}
}
Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_os_bsd.h Fri May 4 09:27:00 2012
(r234995)
@@ -157,12 +157,13 @@ MALLOC_DECLARE(SCTP_M_MCORE);
*/
#define USER_ADDR_NULL (NULL) /* FIX ME: temp */
+#define SCTP_PRINTF(params...) printf(params)
#if defined(SCTP_DEBUG)
#define SCTPDBG(level, params...) \
{ \
do { \
if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) { \
- printf(params); \
+ SCTP_PRINTF(params);
\
} \
} while (0); \
}
@@ -187,7 +188,6 @@ MALLOC_DECLARE(SCTP_M_MCORE);
#define SCTPDBG_ADDR(level, addr)
#define SCTPDBG_PKT(level, iph, sh)
#endif
-#define SCTP_PRINTF(params...) printf(params)
#ifdef SCTP_LTRACE_CHUNKS
#define SCTP_LTRACE_CHK(a, b, c, d) if(SCTP_BASE_SYSCTL(sctp_logging_level) &
SCTP_LTRACE_CHUNK_ENABLE) SCTP_CTR6(KTR_SUBSYS, "SCTP:%d[%d]:%x-%x-%x-%x",
SCTP_LOG_CHUNK_PROC, 0, a, b, c, d)
@@ -196,12 +196,14 @@ MALLOC_DECLARE(SCTP_M_MCORE);
#endif
#ifdef SCTP_LTRACE_ERRORS
-#define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err)
if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
- printf("mbuf:%p
inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
- m, inp,
stcb, net, file, __LINE__, err);
-#define SCTP_LTRACE_ERR_RET(inp, stcb, net, file, err)
if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
- printf("inp:%p
stcb:%p net:%p file:%x line:%d error:%d\n", \
- inp, stcb,
net, file, __LINE__, err);
+#define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err) \
+ if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
+ SCTP_PRINTF("mbuf:%p inp:%p stcb:%p net:%p file:%x line:%d
error:%d\n", \
+ m, inp, stcb, net, file, __LINE__, err);
+#define SCTP_LTRACE_ERR_RET(inp, stcb, net, file, err) \
+ if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
+ SCTP_PRINTF("inp:%p stcb:%p net:%p file:%x line:%d error:%d\n",
\
+ inp, stcb, net, file, __LINE__, err);
#else
#define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err)
#define SCTP_LTRACE_ERR_RET(inp, stcb, net, file, err)
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Fri May 4 08:59:19 2012
(r234994)
+++ head/sys/netinet/sctp_output.c Fri May 4 09:27:00 2012
(r234995)
@@ -3062,7 +3062,7 @@ again_with_private_addresses_allowed:
continue;
}
} else {
- printf("Stcb is null - no print\n");
+ SCTP_PRINTF("Stcb is null - no print\n");
}
atomic_add_int(&sifa->refcount, 1);
goto out;
@@ -9493,7 +9493,7 @@ sctp_chunk_retransmission(struct sctp_in
continue;
}
if (chk->data == NULL) {
- printf("TSN:%x chk->snd_count:%d chk->sent:%d can't
retran - no data\n",
+ SCTP_PRINTF("TSN:%x chk->snd_count:%d chk->sent:%d
can't retran - no data\n",
chk->rec.data.TSN_seq, chk->snd_count, chk->sent);
continue;
}
@@ -13840,7 +13840,7 @@ out_unlocked:
if (inp) {
sctp_validate_no_locks(inp);
} else {
- printf("Warning - inp is NULL so cant validate locks\n");
+ SCTP_PRINTF("Warning - inp is NULL so cant validate locks\n");
}
#endif
if (top) {
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Fri May 4 08:59:19 2012 (r234994)
+++ head/sys/netinet/sctp_pcb.c Fri May 4 09:27:00 2012 (r234995)
@@ -2426,8 +2426,8 @@ sctp_findassociation_ep_asconf(struct mb
stcb = sctp_findassoc_by_vtag(NULL, to, ntohl(sh->v_tag), inp_p,
netp, sh->src_port, sh->dest_port, 1, vrf_id, 0);
/*
- * printf("findassociation_ep_asconf: zero lookup address
- * finds stcb 0x%x\n", (uint32_t)stcb);
+ * SCTP_PRINTF("findassociation_ep_asconf: zero lookup
+ * address finds stcb 0x%x\n", (uint32_t)stcb);
*/
} else {
stcb = sctp_findassociation_ep_addr(inp_p,
@@ -5745,7 +5745,7 @@ skip_sleep:
if (v6 == 0) {
sctp_input_with_port(m, off, 0);
} else {
- printf("V6 not yet supported\n");
+ SCTP_PRINTF("V6 not yet supported\n");
sctp_m_freem(m);
}
CURVNET_RESTORE();
@@ -6276,8 +6276,8 @@ sctp_load_addresses_from_init(struct sct
ptype = ntohs(phdr->param_type);
plen = ntohs(phdr->param_length);
/*
- * printf("ptype => %0x, plen => %d\n", (uint32_t)ptype,
- * (int)plen);
+ * SCTP_PRINTF("ptype => %0x, plen => %d\n",
+ * (uint32_t)ptype, (int)plen);
*/
if (offset + plen > limit) {
break;
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Fri May 4 08:59:19 2012 (r234994)
+++ head/sys/netinet/sctputil.c Fri May 4 09:27:00 2012 (r234995)
@@ -1127,7 +1127,7 @@ sctp_print_mapping_array(struct sctp_ass
{
unsigned int i, limit;
- printf("Mapping array size: %d, baseTSN: %8.8x, cumAck: %8.8x,
highestTSN: (%8.8x, %8.8x).\n",
+ SCTP_PRINTF("Mapping array size: %d, baseTSN: %8.8x, cumAck: %8.8x,
highestTSN: (%8.8x, %8.8x).\n",
asoc->mapping_array_size,
asoc->mapping_array_base_tsn,
asoc->cumulative_tsn,
@@ -1138,23 +1138,23 @@ sctp_print_mapping_array(struct sctp_ass
break;
}
}
- printf("Renegable mapping array (last %d entries are zero):\n",
asoc->mapping_array_size - limit);
+ SCTP_PRINTF("Renegable mapping array (last %d entries are zero):\n",
asoc->mapping_array_size - limit);
for (i = 0; i < limit; i++) {
- printf("%2.2x%c", asoc->mapping_array[i], ((i + 1) % 16) ? ' '
: '\n');
+ SCTP_PRINTF("%2.2x%c", asoc->mapping_array[i], ((i + 1) % 16) ?
' ' : '\n');
}
if (limit % 16)
- printf("\n");
+ SCTP_PRINTF("\n");
for (limit = asoc->mapping_array_size; limit > 1; limit--) {
if (asoc->nr_mapping_array[limit - 1]) {
break;
}
}
- printf("Non renegable mapping array (last %d entries are zero):\n",
asoc->mapping_array_size - limit);
+ SCTP_PRINTF("Non renegable mapping array (last %d entries are
zero):\n", asoc->mapping_array_size - limit);
for (i = 0; i < limit; i++) {
- printf("%2.2x%c", asoc->nr_mapping_array[i], ((i + 1) % 16) ? '
' : '\n');
+ SCTP_PRINTF("%2.2x%c", asoc->nr_mapping_array[i], ((i + 1) %
16) ? ' ' : '\n');
}
if (limit % 16)
- printf("\n");
+ SCTP_PRINTF("\n");
}
int
@@ -1292,7 +1292,7 @@ select_a_new_ep:
goto no_stcb;
}
/* If we reach here huh? */
- printf("Unknown it ctl flag %x\n",
+ SCTP_PRINTF("Unknown it ctl flag %x\n",
sctp_it_ctl.iterator_flags);
sctp_it_ctl.iterator_flags = 0;
}
@@ -5392,7 +5392,7 @@ found_one:
#ifdef INVARIANTS
panic("refcnt already incremented");
#else
- printf("refcnt already incremented?\n");
+ SCTP_PRINTF("refcnt already incremented?\n");
#endif
} else {
atomic_add_int(&stcb->asoc.refcnt, 1);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
