Author: tuexen
Date: Sat May  4 10:56:57 2019
New Revision: 347098
URL: https://svnweb.freebsd.org/changeset/base/347098

Log:
  MFC r344704:
  Improve consistency, no functional change.

Modified:
  stable/12/sys/netinet/sctp_usrreq.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/12/sys/netinet/sctp_usrreq.c Sat May  4 10:48:44 2019        
(r347097)
+++ stable/12/sys/netinet/sctp_usrreq.c Sat May  4 10:56:57 2019        
(r347098)
@@ -1128,10 +1128,10 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
                                                        actual += sizeof(struct 
sockaddr_in6);
                                                } else {
 #endif
-                                                       memcpy(sas, sin, 
sizeof(*sin));
+                                                       memcpy(sas, sin, 
sizeof(struct sockaddr_in));
                                                        ((struct sockaddr_in 
*)sas)->sin_port = inp->sctp_lport;
-                                                       sas = (struct 
sockaddr_storage *)((caddr_t)sas + sizeof(*sin));
-                                                       actual += sizeof(*sin);
+                                                       sas = (struct 
sockaddr_storage *)((caddr_t)sas + sizeof(struct sockaddr_in));
+                                                       actual += sizeof(struct 
sockaddr_in);
 #ifdef INET6
                                                }
 #endif
@@ -1182,10 +1182,10 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
                                                    
(IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr))) {
                                                        continue;
                                                }
-                                               memcpy(sas, sin6, 
sizeof(*sin6));
+                                               memcpy(sas, sin6, sizeof(struct 
sockaddr_in6));
                                                ((struct sockaddr_in6 
*)sas)->sin6_port = inp->sctp_lport;
-                                               sas = (struct sockaddr_storage 
*)((caddr_t)sas + sizeof(*sin6));
-                                               actual += sizeof(*sin6);
+                                               sas = (struct sockaddr_storage 
*)((caddr_t)sas + sizeof(struct sockaddr_in6));
+                                               actual += sizeof(struct 
sockaddr_in6);
                                                if (actual >= limit) {
                                                        return (actual);
                                                }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to