svn commit: r247977 - in stable/8: sys/netinet sys/netinet6 usr.bin/netstat
Michael Tuexen
tuexen at FreeBSD.org
Thu Mar 7 23:48:31 UTC 2013
Author: tuexen
Date: Thu Mar 7 23:48:29 2013
New Revision: 247977
URL: http://svnweb.freebsd.org/changeset/base/247977
Log:
MFC r238501,r238514:
Changes which improve compilation if neither INET nor INET6 is defined.
Modified:
stable/8/sys/netinet/sctp_asconf.c
stable/8/sys/netinet/sctp_output.c
stable/8/sys/netinet/sctp_uio.h
stable/8/sys/netinet/sctp_usrreq.c
stable/8/sys/netinet6/sctp6_usrreq.c
stable/8/usr.bin/netstat/Makefile (contents, props changed)
stable/8/usr.bin/netstat/sctp.c (contents, props changed)
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/netinet/ (props changed)
stable/8/sys/netinet6/ (props changed)
stable/8/usr.bin/ (props changed)
stable/8/usr.bin/netstat/ (props changed)
Modified: stable/8/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/8/sys/netinet/sctp_asconf.c Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/sys/netinet/sctp_asconf.c Thu Mar 7 23:48:29 2013 (r247977)
@@ -2747,13 +2747,14 @@ sctp_process_initack_addresses(struct sc
struct sctp_paramhdr tmp_param, *ph;
uint16_t plen, ptype;
struct sctp_ifa *sctp_ifa;
- struct sctp_ipv6addr_param addr_store;
#ifdef INET6
+ struct sctp_ipv6addr_param addr6_store;
struct sockaddr_in6 sin6;
#endif
#ifdef INET
+ struct sctp_ipv4addr_param addr4_store;
struct sockaddr_in sin;
#endif
@@ -2802,7 +2803,7 @@ sctp_process_initack_addresses(struct sc
a6p = (struct sctp_ipv6addr_param *)
sctp_m_getptr(m, offset,
sizeof(struct sctp_ipv6addr_param),
- (uint8_t *) & addr_store);
+ (uint8_t *) & addr6_store);
if (plen != sizeof(struct sctp_ipv6addr_param) ||
a6p == NULL) {
return;
@@ -2821,7 +2822,7 @@ sctp_process_initack_addresses(struct sc
/* get the entire IPv4 address param */
a4p = (struct sctp_ipv4addr_param *)sctp_m_getptr(m, offset,
sizeof(struct sctp_ipv4addr_param),
- (uint8_t *) & addr_store);
+ (uint8_t *) & addr4_store);
if (plen != sizeof(struct sctp_ipv4addr_param) ||
a4p == NULL) {
return;
@@ -2899,16 +2900,17 @@ sctp_addr_in_initack(struct mbuf *m, uin
{
struct sctp_paramhdr tmp_param, *ph;
uint16_t plen, ptype;
- struct sctp_ipv6addr_param addr_store;
#ifdef INET
struct sockaddr_in *sin;
struct sctp_ipv4addr_param *a4p;
+ struct sctp_ipv6addr_param addr4_store;
#endif
#ifdef INET6
struct sockaddr_in6 *sin6;
struct sctp_ipv6addr_param *a6p;
+ struct sctp_ipv6addr_param addr6_store;
struct sockaddr_in6 sin6_tmp;
#endif
@@ -2954,7 +2956,7 @@ sctp_addr_in_initack(struct mbuf *m, uin
a6p = (struct sctp_ipv6addr_param *)
sctp_m_getptr(m, offset,
sizeof(struct sctp_ipv6addr_param),
- (uint8_t *) & addr_store);
+ (uint8_t *) & addr6_store);
if (a6p == NULL) {
return (0);
}
@@ -2984,7 +2986,7 @@ sctp_addr_in_initack(struct mbuf *m, uin
a4p = (struct sctp_ipv4addr_param *)
sctp_m_getptr(m, offset,
sizeof(struct sctp_ipv4addr_param),
- (uint8_t *) & addr_store);
+ (uint8_t *) & addr4_store);
if (a4p == NULL) {
return (0);
}
Modified: stable/8/sys/netinet/sctp_output.c
==============================================================================
--- stable/8/sys/netinet/sctp_output.c Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/sys/netinet/sctp_output.c Thu Mar 7 23:48:29 2013 (r247977)
@@ -3799,6 +3799,7 @@ sctp_get_ect(struct sctp_tcb *stcb)
}
}
+#if defined(INET) || defined(INET6)
static void
sctp_handle_no_route(struct sctp_tcb *stcb,
struct sctp_nets *net,
@@ -3843,6 +3844,8 @@ sctp_handle_no_route(struct sctp_tcb *st
}
}
+#endif
+
static int
sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
struct sctp_tcb *stcb, /* may be NULL */
@@ -3882,14 +3885,18 @@ sctp_lowlevel_chunk_output(struct sctp_i
* interface and smallest_mtu size as well.
*/
/* Will need ifdefs around this */
- struct mbuf *o_pak;
struct mbuf *newm;
struct sctphdr *sctphdr;
int packet_length;
int ret;
uint32_t vrf_id;
+
+#if defined(INET) || defined(INET6)
+ struct mbuf *o_pak;
sctp_route_t *ro = NULL;
struct udphdr *udp = NULL;
+
+#endif
uint8_t tos_value;
#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
Modified: stable/8/sys/netinet/sctp_uio.h
==============================================================================
--- stable/8/sys/netinet/sctp_uio.h Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/sys/netinet/sctp_uio.h Thu Mar 7 23:48:29 2013 (r247977)
@@ -1124,10 +1124,10 @@ struct sctpstat {
#define SCTP_STAT_DECR_GAUGE32(_x) SCTP_STAT_DECR(_x)
union sctp_sockstore {
-#if defined(INET) || !defined(_KERNEL)
+#if defined(INET)
struct sockaddr_in sin;
#endif
-#if defined(INET6) || !defined(_KERNEL)
+#if defined(INET6)
struct sockaddr_in6 sin6;
#endif
struct sockaddr sa;
Modified: stable/8/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/8/sys/netinet/sctp_usrreq.c Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/sys/netinet/sctp_usrreq.c Thu Mar 7 23:48:29 2013 (r247977)
@@ -5226,7 +5226,6 @@ sctp_setopt(struct socket *so, int optna
case SCTP_BINDX_ADD_ADDR:
{
struct sctp_getaddresses *addrs;
- size_t sz;
struct thread *td;
td = (struct thread *)p;
@@ -5234,8 +5233,7 @@ sctp_setopt(struct socket *so, int optna
optsize);
#ifdef INET
if (addrs->addr->sa_family == AF_INET) {
- sz = sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in);
- if (optsize < sz) {
+ if (optsize < sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in)) {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
break;
@@ -5248,8 +5246,7 @@ sctp_setopt(struct socket *so, int optna
#endif
#ifdef INET6
if (addrs->addr->sa_family == AF_INET6) {
- sz = sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in6);
- if (optsize < sz) {
+ if (optsize < sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in6)) {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
break;
@@ -5273,7 +5270,6 @@ sctp_setopt(struct socket *so, int optna
case SCTP_BINDX_REM_ADDR:
{
struct sctp_getaddresses *addrs;
- size_t sz;
struct thread *td;
td = (struct thread *)p;
@@ -5281,8 +5277,7 @@ sctp_setopt(struct socket *so, int optna
SCTP_CHECK_AND_CAST(addrs, optval, struct sctp_getaddresses, optsize);
#ifdef INET
if (addrs->addr->sa_family == AF_INET) {
- sz = sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in);
- if (optsize < sz) {
+ if (optsize < sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in)) {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
break;
@@ -5295,8 +5290,7 @@ sctp_setopt(struct socket *so, int optna
#endif
#ifdef INET6
if (addrs->addr->sa_family == AF_INET6) {
- sz = sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in6);
- if (optsize < sz) {
+ if (optsize < sizeof(struct sctp_getaddresses) - sizeof(struct sockaddr) + sizeof(struct sockaddr_in6)) {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
break;
Modified: stable/8/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- stable/8/sys/netinet6/sctp6_usrreq.c Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/sys/netinet6/sctp6_usrreq.c Thu Mar 7 23:48:29 2013 (r247977)
@@ -34,6 +34,7 @@
__FBSDID("$FreeBSD$");
#include <netinet/sctp_os.h>
+#ifdef INET6
#include <sys/proc.h>
#include <netinet/sctp_pcb.h>
#include <netinet/sctp_header.h>
@@ -1240,3 +1241,5 @@ struct pr_usrreqs sctp6_usrreqs = {
.pru_sosend = sctp_sosend,
.pru_soreceive = sctp_soreceive
};
+
+#endif
Modified: stable/8/usr.bin/netstat/Makefile
==============================================================================
--- stable/8/usr.bin/netstat/Makefile Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/usr.bin/netstat/Makefile Thu Mar 7 23:48:29 2013 (r247977)
@@ -13,6 +13,10 @@ CFLAGS+=-fno-strict-aliasing
CFLAGS+=-DIPSEC
CFLAGS+=-DSCTP
+.if ${MK_INET_SUPPORT} != "no"
+CFLAGS+=-DINET
+.endif
+
.if ${MK_INET6_SUPPORT} != "no"
SRCS+= inet6.c
CFLAGS+=-DINET6
Modified: stable/8/usr.bin/netstat/sctp.c
==============================================================================
--- stable/8/usr.bin/netstat/sctp.c Thu Mar 7 23:45:16 2013 (r247976)
+++ stable/8/usr.bin/netstat/sctp.c Thu Mar 7 23:48:29 2013 (r247977)
@@ -107,6 +107,7 @@ struct xraddr_entry {
* If numeric_addr has been supplied, give
* numeric value, otherwise try for symbolic name.
*/
+#ifdef INET
static char *
inetname(struct in_addr *inp)
{
@@ -146,6 +147,7 @@ inetname(struct in_addr *inp)
}
return (line);
}
+#endif
#ifdef INET6
static char ntop_buf[INET6_ADDRSTRLEN];
@@ -197,9 +199,11 @@ sctp_print_address(union sctp_sockstore
int width;
switch (address->sa.sa_family) {
+#ifdef INET
case AF_INET:
sprintf(line, "%.*s.", Wflag ? 39 : 16, inetname(&address->sin.sin_addr));
break;
+#endif
#ifdef INET6
case AF_INET6:
sprintf(line, "%.*s.", Wflag ? 39 : 16, inet6name(&address->sin6.sin6_addr));
More information about the svn-src-all
mailing list