diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-05-31 12:59:22 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-05-31 12:59:22 +0000 |
| commit | 3a8e5cd397a1aa44765c9621ed9f8235509ebb22 (patch) | |
| tree | eaf319976e686605343ba04ed39ce5db04fadc8b | |
| parent | f2a969c70cb7a9a70cd182f15d51cd4bc81e5d69 (diff) | |
| download | FreeBSD-src-3a8e5cd397a1aa44765c9621ed9f8235509ebb22.zip FreeBSD-src-3a8e5cd397a1aa44765c9621ed9f8235509ebb22.tar.gz | |
MFC r283664:
Retire SCTP_DONT_DO_PRIVADDR_SCOPE which was never defined.
| -rw-r--r-- | sys/netinet/sctp_output.c | 8 | ||||
| -rw-r--r-- | sys/netinet/sctp_pcb.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 665b233..1e4a843 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -5591,11 +5591,7 @@ do_a_abort: stc.ipv6_addr_legal = 0; stc.ipv4_addr_legal = 1; } -#ifdef SCTP_DONT_DO_PRIVADDR_SCOPE - stc.ipv4_scope = 1; -#else stc.ipv4_scope = 0; -#endif if (net == NULL) { to = src; switch (dst->sa_family) { @@ -5616,13 +5612,9 @@ do_a_abort: stc.laddr_type = SCTP_IPV4_ADDRESS; /* scope_id is only for v6 */ stc.scope_id = 0; -#ifndef SCTP_DONT_DO_PRIVADDR_SCOPE if (IN4_ISPRIVATE_ADDRESS(&src4->sin_addr)) { stc.ipv4_scope = 1; } -#else - stc.ipv4_scope = 1; -#endif /* SCTP_DONT_DO_PRIVADDR_SCOPE */ /* Must use the address in this case */ if (sctp_is_address_on_local_host(src, vrf_id)) { stc.loopback_scope = 1; diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 36e0462..1d79f02 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -3796,13 +3796,9 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr, /* assure len is set */ sin->sin_len = sizeof(struct sockaddr_in); if (set_scope) { -#ifdef SCTP_DONT_DO_PRIVADDR_SCOPE - stcb->asoc.scope.ipv4_local_scope = 1; -#else if (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)) { stcb->asoc.scope.ipv4_local_scope = 1; } -#endif /* SCTP_DONT_DO_PRIVADDR_SCOPE */ } else { /* Validate the address is in scope */ if ((IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)) && |
