xnu-1504.9.26.tar.gz

[apple/xnu.git] / bsd / kern / socket_info.c

diff --git a/bsd/kern/socket_info.c b/bsd/kern/socket_info.c
index b4171b5076e8f5ee27c77fb7adbba0a8304e2b79..9d489e1225e0f17e49bfbd4734899d261bc7249d 100644 (file)
--- a/bsd/kern/socket_info.c
+++ b/bsd/kern/socket_info.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #include <sys/types.h>
@@ -61,7 +59,7 @@ fill_sockbuf_info(struct sockbuf *sb, struct sockbuf_info *sbi)
        sbi->sbi_mbmax = sb->sb_mbmax;
        sbi->sbi_lowat = sb->sb_lowat;
        sbi->sbi_flags = sb->sb_flags;
-       sbi->sbi_timeo = (u_long)(sb->sb_timeo.tv_sec * hz) + sb->sb_timeo.tv_usec / tick;
+       sbi->sbi_timeo = (u_int32_t)(sb->sb_timeo.tv_sec * hz) + sb->sb_timeo.tv_usec / tick;
        if (sbi->sbi_timeo == 0 && sb->sb_timeo.tv_usec != 0)
                sbi->sbi_timeo = 1;
 }
@@ -134,7 +132,7 @@ fill_socketinfo(struct socket *so, struct socket_info *si)
                        insi->insi_v4.in4_tos = inp->inp_depend4.inp4_ip_tos;
                        insi->insi_v6.in6_hlim = inp->inp_depend6.inp6_hlim;
                        insi->insi_v6.in6_cksum = inp->inp_depend6.inp6_cksum;
-                       insi->insi_v6.in6_ifindex = inp->inp6_ifindex;
+                       insi->insi_v6.in6_ifindex = inp->inp_depend6.inp6_ifindex;
                        insi->insi_v6.in6_hops = inp->inp_depend6.inp6_hops;
 
                        if (type == SOCK_STREAM && (protocol == 0 || protocol == IPPROTO_TCP) && inp->inp_ppcb != 0) {
@@ -193,7 +191,7 @@ fill_socketinfo(struct socket *so, struct socket_info *si)
                                
                                ndrvsi->ndrvsi_if_family = ifp->if_family;
                                ndrvsi->ndrvsi_if_unit = ifp->if_unit;
-                               strncpy(ndrvsi->ndrvsi_if_name, ifp->if_name, IFNAMSIZ);
+                               strlcpy(ndrvsi->ndrvsi_if_name, ifp->if_name, IFNAMSIZ);
                        }
 
                        break;
@@ -225,7 +223,7 @@ fill_socketinfo(struct socket *so, struct socket_info *si)
                                kcsi->kcsi_recvbufsize = kctl->recvbufsize;
                                kcsi->kcsi_sendbufsize = kctl->sendbufsize;
                                kcsi->kcsi_unit = kcb->unit;
-                               strncpy(kcsi->kcsi_name, kctl->name, MAX_KCTL_NAME);
+                               strlcpy(kcsi->kcsi_name, kctl->name, MAX_KCTL_NAME);
                        }
                        break;