svn commit: r319402 - in stable/11/sys: netinet netinet6

[Michael Tuexen]

Author: tuexen
Date: Thu Jun  1 08:48:16 2017
New Revision: 319402
URL: https://svnweb.freebsd.org/changeset/base/319402

Log:
  MFC r317457:
  
  Use consistently uint32_t for mtu values.
  
  This does not change functionality, but this cleanup is need for further
  improvements of ICMP handling.

Modified:
  stable/11/sys/netinet/sctp_usrreq.c
  stable/11/sys/netinet/sctp_var.h
  stable/11/sys/netinet/sctputil.c
  stable/11/sys/netinet6/sctp6_usrreq.c
  stable/11/sys/netinet6/sctp6_var.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/11/sys/netinet/sctp_usrreq.c	Thu Jun  1 08:42:53 2017	(r319401)
+++ stable/11/sys/netinet/sctp_usrreq.c	Thu Jun  1 08:48:16 2017	(r319402)
@@ -152,7 +152,7 @@ sctp_notify(struct sctp_inpcb *inp,
     uint8_t icmp_type,
     uint8_t icmp_code,
     uint16_t ip_len,
-    uint16_t next_mtu)
+    uint32_t next_mtu)
 {
 #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
 	struct socket *so;
@@ -328,7 +328,7 @@ sctp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
 			    icmp->icmp_type,
 			    icmp->icmp_code,
 			    ntohs(inner_ip->ip_len),
-			    ntohs(icmp->icmp_nextmtu));
+			    (uint32_t)ntohs(icmp->icmp_nextmtu));
 		} else {
 			if ((stcb == NULL) && (inp != NULL)) {
 				/* reduce ref-count */

Modified: stable/11/sys/netinet/sctp_var.h
==============================================================================
--- stable/11/sys/netinet/sctp_var.h	Thu Jun  1 08:42:53 2017	(r319401)
+++ stable/11/sys/netinet/sctp_var.h	Thu Jun  1 08:48:16 2017	(r319402)
@@ -341,7 +341,7 @@ void sctp_drain(void);
 void sctp_init(void);
 void 
 sctp_notify(struct sctp_inpcb *, struct sctp_tcb *, struct sctp_nets *,
-    uint8_t, uint8_t, uint16_t, uint16_t);
+    uint8_t, uint8_t, uint16_t, uint32_t);
 int sctp_flush(struct socket *, int);
 int sctp_shutdown(struct socket *);
 int 

Modified: stable/11/sys/netinet/sctputil.c
==============================================================================
--- stable/11/sys/netinet/sctputil.c	Thu Jun  1 08:42:53 2017	(r319401)
+++ stable/11/sys/netinet/sctputil.c	Thu Jun  1 08:48:16 2017	(r319402)
@@ -6971,7 +6971,7 @@ sctp_recv_icmp_tunneled_packet(int cmd, struct sockadd
 		}
 		sctp_notify(inp, stcb, net, type, code,
 		    ntohs(inner_ip->ip_len),
-		    ntohs(icmp->icmp_nextmtu));
+		    (uint32_t)ntohs(icmp->icmp_nextmtu));
 	} else {
 		if ((stcb == NULL) && (inp != NULL)) {
 			/* reduce ref-count */
@@ -7113,7 +7113,7 @@ sctp_recv_icmp6_tunneled_packet(int cmd, struct sockad
 			code = ICMP6_PARAMPROB_NEXTHEADER;
 		}
 		sctp6_notify(inp, stcb, net, type, code,
-		    (uint16_t)ntohl(ip6cp->ip6c_icmp6->icmp6_mtu));
+		    ntohl(ip6cp->ip6c_icmp6->icmp6_mtu));
 	} else {
 		if ((stcb == NULL) && (inp != NULL)) {
 			/* reduce inp's ref-count */

Modified: stable/11/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- stable/11/sys/netinet6/sctp6_usrreq.c	Thu Jun  1 08:42:53 2017	(r319401)
+++ stable/11/sys/netinet6/sctp6_usrreq.c	Thu Jun  1 08:48:16 2017	(r319402)
@@ -183,7 +183,7 @@ sctp6_notify(struct sctp_inpcb *inp,
     struct sctp_nets *net,
     uint8_t icmp6_type,
     uint8_t icmp6_code,
-    uint16_t next_mtu)
+    uint32_t next_mtu)
 {
 #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
 	struct socket *so;
@@ -383,7 +383,7 @@ sctp6_ctlinput(int cmd, struct sockaddr *pktdst, void 
 			sctp6_notify(inp, stcb, net,
 			    ip6cp->ip6c_icmp6->icmp6_type,
 			    ip6cp->ip6c_icmp6->icmp6_code,
-			    (uint16_t)ntohl(ip6cp->ip6c_icmp6->icmp6_mtu));
+			    ntohl(ip6cp->ip6c_icmp6->icmp6_mtu));
 		} else {
 			if ((stcb == NULL) && (inp != NULL)) {
 				/* reduce inp's ref-count */

Modified: stable/11/sys/netinet6/sctp6_var.h
==============================================================================
--- stable/11/sys/netinet6/sctp6_var.h	Thu Jun  1 08:42:53 2017	(r319401)
+++ stable/11/sys/netinet6/sctp6_var.h	Thu Jun  1 08:48:16 2017	(r319402)
@@ -49,6 +49,6 @@ sctp6_output(struct sctp_inpcb *, struct mbuf *, struc
 void sctp6_ctlinput(int, struct sockaddr *, void *);
 void 
 sctp6_notify(struct sctp_inpcb *, struct sctp_tcb *, struct sctp_nets *,
-    uint8_t, uint8_t, uint16_t);
+    uint8_t, uint8_t, uint32_t);
 #endif
 #endif