Author: tuexen
Date: Fri Jul 11 06:52:48 2014
New Revision: 268526
URL: http://svnweb.freebsd.org/changeset/base/268526
Log:
Integrate upstream changes.
MFC after: 1 week
Modified:
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_timer.c
head/sys/netinet/sctp_usrreq.c
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Fri Jul 11 06:34:15 2014
(r268525)
+++ head/sys/netinet/sctp_input.c Fri Jul 11 06:52:48 2014
(r268526)
@@ -47,7 +47,9 @@ __FBSDID("$FreeBSD$");
#include <netinet/sctp_bsd_addr.h>
#include <netinet/sctp_timer.h>
#include <netinet/sctp_crc32.h>
+#if defined(INET) || defined(INET6)
#include <netinet/udp.h>
+#endif
#include <sys/smp.h>
@@ -5603,12 +5605,14 @@ sctp_common_input_processing(struct mbuf
calc_check, check, (void *)m, length, iphlen);
stcb = sctp_findassociation_addr(m, offset, src, dst,
sh, ch, &inp, &net, vrf_id);
+#if defined(INET) || defined(INET6)
if ((net != NULL) && (port != 0)) {
if (net->port == 0) {
sctp_pathmtu_adjustment(stcb, net->mtu
- sizeof(struct udphdr));
}
net->port = port;
}
+#endif
if ((net != NULL) && (use_mflowid != 0)) {
net->flowid = mflowid;
#ifdef INVARIANTS
@@ -5634,12 +5638,14 @@ sctp_common_input_processing(struct mbuf
}
stcb = sctp_findassociation_addr(m, offset, src, dst,
sh, ch, &inp, &net, vrf_id);
+#if defined(INET) || defined(INET6)
if ((net != NULL) && (port != 0)) {
if (net->port == 0) {
sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct
udphdr));
}
net->port = port;
}
+#endif
if ((net != NULL) && (use_mflowid != 0)) {
net->flowid = mflowid;
#ifdef INVARIANTS
@@ -5748,12 +5754,14 @@ sctp_common_input_processing(struct mbuf
* it changes our INP.
*/
inp = stcb->sctp_ep;
+#if defined(INET) || defined(INET6)
if ((net) && (port)) {
if (net->port == 0) {
sctp_pathmtu_adjustment(stcb, net->mtu
- sizeof(struct udphdr));
}
net->port = port;
}
+#endif
}
} else {
/*
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Fri Jul 11 06:34:15 2014
(r268525)
+++ head/sys/netinet/sctp_output.c Fri Jul 11 06:52:48 2014
(r268526)
@@ -50,7 +50,9 @@ __FBSDID("$FreeBSD$");
#include <netinet/sctp_bsd_addr.h>
#include <netinet/sctp_input.h>
#include <netinet/sctp_crc32.h>
+#if defined(INET) || defined(INET6)
#include <netinet/udp.h>
+#endif
#include <netinet/udp_var.h>
#include <machine/in_cksum.h>
@@ -10964,13 +10966,14 @@ sctp_send_resp_msg(struct sockaddr *src,
struct mbuf *mout;
struct sctphdr *shout;
struct sctp_chunkhdr *ch;
- struct udphdr *udp;
- int len, cause_len, padding_len;
#if defined(INET) || defined(INET6)
+ struct udphdr *udp;
int ret;
#endif
+ int len, cause_len, padding_len;
+
#ifdef INET
struct sockaddr_in *src_sin, *dst_sin;
struct ip *ip;
@@ -11021,9 +11024,11 @@ sctp_send_resp_msg(struct sockaddr *src,
default:
break;
}
+#if defined(INET) || defined(INET6)
if (port) {
len += sizeof(struct udphdr);
}
+#endif
mout = sctp_get_mbuf_for_msg(len + max_linkhdr, 1, M_NOWAIT, 1,
MT_DATA);
if (mout == NULL) {
if (cause) {
@@ -11094,6 +11099,7 @@ sctp_send_resp_msg(struct sockaddr *src,
shout = mtod(mout, struct sctphdr *);
break;
}
+#if defined(INET) || defined(INET6)
if (port) {
if (htons(SCTP_BASE_SYSCTL(sctp_udp_tunneling_port)) == 0) {
sctp_m_freem(mout);
@@ -11112,6 +11118,7 @@ sctp_send_resp_msg(struct sockaddr *src,
} else {
udp = NULL;
}
+#endif
shout->src_port = sh->dest_port;
shout->dest_port = sh->src_port;
shout->checksum = 0;
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Fri Jul 11 06:34:15 2014 (r268525)
+++ head/sys/netinet/sctp_pcb.c Fri Jul 11 06:52:48 2014 (r268526)
@@ -46,7 +46,9 @@ __FBSDID("$FreeBSD$");
#include <netinet/sctp_timer.h>
#include <netinet/sctp_bsd_addr.h>
#include <netinet/sctp_dtrace_define.h>
+#if defined(INET) || defined(INET6)
#include <netinet/udp.h>
+#endif
#ifdef INET6
#include <netinet6/ip6_var.h>
#endif
@@ -4007,9 +4009,11 @@ sctp_add_remote_addr(struct sctp_tcb *st
break;
}
}
+#if defined(INET) || defined(INET6)
if (net->port) {
net->mtu -= (uint32_t) sizeof(struct udphdr);
}
+#endif
if (from == SCTP_ALLOC_ASOC) {
stcb->asoc.smallest_mtu = net->mtu;
}
Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c Fri Jul 11 06:34:15 2014
(r268525)
+++ head/sys/netinet/sctp_timer.c Fri Jul 11 06:52:48 2014
(r268526)
@@ -49,7 +49,9 @@ __FBSDID("$FreeBSD$");
#include <netinet/sctp_input.h>
#include <netinet/sctp.h>
#include <netinet/sctp_uio.h>
+#if defined(INET) || defined(INET6)
#include <netinet/udp.h>
+#endif
void
@@ -1480,9 +1482,11 @@ sctp_pathmtu_timer(struct sctp_inpcb *in
}
if (net->ro._s_addr) {
mtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr,
&net->ro._s_addr.sa, net->ro.ro_rt);
+#if defined(INET) || defined(INET6)
if (net->port) {
mtu -= sizeof(struct udphdr);
}
+#endif
if (mtu > next_mtu) {
net->mtu = next_mtu;
}
Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c Fri Jul 11 06:34:15 2014
(r268525)
+++ head/sys/netinet/sctp_usrreq.c Fri Jul 11 06:52:48 2014
(r268526)
@@ -214,8 +214,6 @@ sctp_notify_mbuf(struct sctp_inpcb *inp,
SCTP_TCB_UNLOCK(stcb);
}
-#endif
-
void
sctp_notify(struct sctp_inpcb *inp,
struct ip *ip,
@@ -302,6 +300,8 @@ sctp_notify(struct sctp_inpcb *inp,
}
}
+#endif
+
#ifdef INET
void
sctp_ctlinput(cmd, sa, vip)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
