Author: tuexen
Date: Sat Jul 20 13:14:59 2013
New Revision: 253493
URL: http://svnweb.freebsd.org/changeset/base/253493
Log:
Allow the code to be compiled without warnings for any combination
of INET, INET6 and SCTP_DEBUG defines.
The issue was reported by Lally Singh.
MFC after: 2 weeks
Modified:
head/sys/netinet/sctp_asconf.c
Modified: head/sys/netinet/sctp_asconf.c
==============================================================================
--- head/sys/netinet/sctp_asconf.c Sat Jul 20 13:13:28 2013
(r253492)
+++ head/sys/netinet/sctp_asconf.c Sat Jul 20 13:14:59 2013
(r253493)
@@ -1191,7 +1191,6 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
uint16_t type)
{
struct sctp_asconf_addr *aa, *aa_next;
- struct sockaddr *sa;
/* make sure the request isn't already in the queue */
TAILQ_FOREACH_SAFE(aa, &stcb->asoc.asconf_queue, next, aa_next) {
@@ -1255,7 +1254,6 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
struct sockaddr_in6 *sin6;
sin6 = (struct sockaddr_in6 *)&ifa->address.sa;
- sa = (struct sockaddr *)sin6;
aa->ap.addrp.ph.param_type = SCTP_IPV6_ADDRESS;
aa->ap.addrp.ph.param_length = (sizeof(struct
sctp_ipv6addr_param));
aa->ap.aph.ph.param_length = sizeof(struct
sctp_asconf_paramhdr) +
@@ -1271,7 +1269,6 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
struct sockaddr_in *sin;
sin = (struct sockaddr_in *)&ifa->address.sa;
- sa = (struct sockaddr *)sin;
aa->ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS;
aa->ap.addrp.ph.param_length = (sizeof(struct
sctp_ipv4addr_param));
aa->ap.aph.ph.param_length = sizeof(struct
sctp_asconf_paramhdr) +
@@ -1294,13 +1291,13 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
if (SCTP_BASE_SYSCTL(sctp_debug_on) & SCTP_DEBUG_ASCONF2) {
if (type == SCTP_ADD_IP_ADDRESS) {
SCTP_PRINTF("asconf_queue_mgmt: inserted asconf
ADD_IP_ADDRESS: ");
- SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa);
+ SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa);
} else if (type == SCTP_DEL_IP_ADDRESS) {
SCTP_PRINTF("asconf_queue_mgmt: appended asconf
DEL_IP_ADDRESS: ");
- SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa);
+ SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa);
} else {
SCTP_PRINTF("asconf_queue_mgmt: appended asconf
SET_PRIM_ADDR: ");
- SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa);
+ SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa);
}
}
#endif
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
