34c34
< __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 179157 2008-05-20 13:47:46Z rrs $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 179783 2008-06-14 07:58:05Z rrs $");
270c270
< if (sctp_logging_level & (SCTP_CWND_MONITOR_ENABLE | SCTP_CWND_LOGGING_ENABLE)) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & (SCTP_CWND_MONITOR_ENABLE | SCTP_CWND_LOGGING_ENABLE)) {
319c319
< if (sctp_logging_level & SCTP_MAP_LOGGING_ENABLE) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MAP_LOGGING_ENABLE) {
449c449
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
599,600c599,601
< if (sctp_cmt_on_off && sctp_cmt_pf && (net->dest_state & SCTP_ADDR_PF) ==
< SCTP_ADDR_PF) {
---
> if (SCTP_BASE_SYSCTL(sctp_cmt_on_off) &&
> SCTP_BASE_SYSCTL(sctp_cmt_pf) &&
> (net->dest_state & SCTP_ADDR_PF) == SCTP_ADDR_PF) {
607c608
< net->cwnd = net->mtu * sctp_cmt_pf;
---
> net->cwnd = net->mtu * SCTP_BASE_SYSCTL(sctp_cmt_pf);
1175c1176
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
1683,1684c1684,1685
< head = &sctppcbinfo.sctp_asochash[SCTP_PCBHASH_ASOC(stcb->asoc.my_vtag,
< sctppcbinfo.hashasocmark)];
---
> head = &SCTP_BASE_INFO(sctp_asochash)[SCTP_PCBHASH_ASOC(stcb->asoc.my_vtag,
> SCTP_BASE_INFO(hashasocmark))];
1694,1695c1695,1696
< head = &sctppcbinfo.sctp_restarthash[SCTP_PCBHASH_ASOC(stcb->asoc.assoc_id,
< sctppcbinfo.hashrestartmark)];
---
> head = &SCTP_BASE_INFO(sctp_restarthash)[SCTP_PCBHASH_ASOC(stcb->asoc.assoc_id,
> SCTP_BASE_INFO(hashrestartmark))];
2210c2211
< if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBUF_LOGGING_ENABLE) {
2970c2971
< if (sctp_logging_level & SCTP_FLIGHT_LOGGING_ENABLE) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_FLIGHT_LOGGING_ENABLE) {
3287a3289,3291
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MAP_LOGGING_ENABLE) {
> sctp_log_map(0, 7, asoc->highest_tsn_inside_map, SCTP_MAP_SLIDE_RESULT);
> }
3390a3395,3397
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MAP_LOGGING_ENABLE) {
> sctp_log_map(0, 10, asoc->highest_tsn_inside_map, SCTP_MAP_SLIDE_RESULT);
> }
3884c3891,3892
< (stcb == NULL) && !sctp_auth_disable) {
---
> (stcb == NULL) &&
> !SCTP_BASE_SYSCTL(sctp_auth_disable)) {
4037c4045
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4136,4138c4144,4146
< if ((stcb != NULL) && !sctp_auth_disable &&
< sctp_auth_is_required_chunk(ch->chunk_type,
< stcb->asoc.local_auth_chunks) &&
---
> if ((stcb != NULL) &&
> !SCTP_BASE_SYSCTL(sctp_auth_disable) &&
> sctp_auth_is_required_chunk(ch->chunk_type, stcb->asoc.local_auth_chunks) &&
4166c4174
< (sctp_strict_init && (length - *offset > (int)SCTP_SIZE32(chk_length)))) {
---
> (SCTP_BASE_SYSCTL(sctp_strict_init) && (length - *offset > (int)SCTP_SIZE32(chk_length)))) {
4231c4239
< (sctp_strict_init && (length - *offset > (int)SCTP_SIZE32(chk_length)))) {
---
> (SCTP_BASE_SYSCTL(sctp_strict_init) && (length - *offset > (int)SCTP_SIZE32(chk_length)))) {
4335c4343
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4356c4364
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4437c4445
< (sctp_abort_if_one_2_one_hits_limit)) {
---
> (SCTP_BASE_SYSCTL(sctp_abort_if_one_2_one_hits_limit))) {
4551c4559
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4574c4582
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4598c4606
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4631c4639
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4656c4664
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4685c4693
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4716c4724
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
4790c4798
< if (sctp_auth_disable)
---
> if (SCTP_BASE_SYSCTL(sctp_auth_disable))
4854c4862
< if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBUF_LOGGING_ENABLE) {
5008,5009c5016,5017
< SCTPDBG(SCTP_DEBUG_INPUT1, "Ok, Common input processing called, m:%p iphlen:%d offset:%d stcb:%p\n",
< m, iphlen, offset, stcb);
---
> SCTPDBG(SCTP_DEBUG_INPUT1, "Ok, Common input processing called, m:%p iphlen:%d offset:%d length:%d stcb:%p\n",
> m, iphlen, offset, length, stcb);
5041a5050,5055
> if ((net) && (port)) {
> if (net->port == 0) {
> sctp_pathmtu_adjustment(inp, stcb, net, net->mtu - sizeof(struct udphdr));
> }
> net->port = port;
> }
5054,5056c5068,5070
< if ((stcb != NULL) && !sctp_auth_disable &&
< sctp_auth_is_required_chunk(SCTP_DATA,
< stcb->asoc.local_auth_chunks)) {
---
> if ((stcb != NULL) &&
> !SCTP_BASE_SYSCTL(sctp_auth_disable) &&
> sctp_auth_is_required_chunk(SCTP_DATA, stcb->asoc.local_auth_chunks)) {
5093,5095c5107,5110
< if ((length > offset) && (stcb != NULL) && !sctp_auth_disable &&
< sctp_auth_is_required_chunk(SCTP_DATA,
< stcb->asoc.local_auth_chunks) &&
---
> if ((length > offset) &&
> (stcb != NULL) &&
> !SCTP_BASE_SYSCTL(sctp_auth_disable) &&
> sctp_auth_is_required_chunk(SCTP_DATA, stcb->asoc.local_auth_chunks) &&
5118c5133
< if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
5269c5284
< if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) {
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBUF_LOGGING_ENABLE) {
5280c5295
< if (sctp_logging_level & SCTP_LAST_PACKET_TRACING)
---
> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LAST_PACKET_TRACING)
5319c5334
< if ((check == 0) && (sctp_no_csum_on_loopback) &&
---
> if ((check == 0) && (SCTP_BASE_SYSCTL(sctp_no_csum_on_loopback)) &&