summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2014-03-29 20:21:36 +0000
committertuexen <tuexen@FreeBSD.org>2014-03-29 20:21:36 +0000
commite3da2350c9b23383e3ce589a12d2b67fa7c07ce4 (patch)
tree841f20632a59f80928e9119cecf388641f517377
parent8c08adf4bde0dcdda5489664a2e79bee8defe69c (diff)
downloadFreeBSD-src-e3da2350c9b23383e3ce589a12d2b67fa7c07ce4.zip
FreeBSD-src-e3da2350c9b23383e3ce589a12d2b67fa7c07ce4.tar.gz
Use SCTP_OVER_UDP_TUNNELING_PORT more consistently.
MFC after: 3 days
-rw-r--r--sys/netinet/sctp_constants.h12
-rw-r--r--sys/netinet/sctp_sysctl.h2
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h
index bb01eec..0ede04c 100644
--- a/sys/netinet/sctp_constants.h
+++ b/sys/netinet/sctp_constants.h
@@ -36,16 +36,10 @@ __FBSDID("$FreeBSD$");
#ifndef _NETINET_SCTP_CONSTANTS_H_
#define _NETINET_SCTP_CONSTANTS_H_
+
/* IANA assigned port number for SCTP over UDP encapsulation */
-/* For freebsd we cannot bind the port at
- * startup. Otherwise what will happen is
- * we really won't be bound. The user must
- * put it into the sysctl... or we need
- * to build a special timer for this to allow
- * us to wait 1 second or so after the system
- * comes up.
- */
-#define SCTP_OVER_UDP_TUNNELING_PORT 0
+#define SCTP_OVER_UDP_TUNNELING_PORT 9899
+
/* Number of packets to get before sack sent by default */
#define SCTP_DEFAULT_SACK_FREQ 2
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 064f6bd..432d36a 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -466,7 +466,7 @@ struct sctp_sysctl {
#define SCTPCTL_UDP_TUNNELING_PORT_DESC "Set the SCTP/UDP tunneling port"
#define SCTPCTL_UDP_TUNNELING_PORT_MIN 0
#define SCTPCTL_UDP_TUNNELING_PORT_MAX 65535
-#define SCTPCTL_UDP_TUNNELING_PORT_DEFAULT SCTP_OVER_UDP_TUNNELING_PORT
+#define SCTPCTL_UDP_TUNNELING_PORT_DEFAULT 0
/* Enable sending of the SACK-IMMEDIATELY bit */
#define SCTPCTL_SACK_IMMEDIATELY_ENABLE_DESC "Enable sending of the SACK-IMMEDIATELY-bit."
OpenPOWER on IntegriCloud