xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / bsd / netinet6 / in6_pcb.h

diff --git a/bsd/netinet6/in6_pcb.h b/bsd/netinet6/in6_pcb.h
index 093cef2f0241b0aa4dce2ed80e347dfa2459eb5c..73444845a92808a2cc8f2ae920790281b9105855 100644 (file)
--- a/bsd/netinet6/in6_pcb.h
+++ b/bsd/netinet6/in6_pcb.h
@@ -91,7 +91,7 @@
  */
 
 #ifndef _NETINET6_IN6_PCB_H_
  */
 
 #ifndef _NETINET6_IN6_PCB_H_

-#define        _NETINET6_IN6_PCB_H_
+#define _NETINET6_IN6_PCB_H_

 #include <sys/appleapiopts.h>
 
 #ifdef BSD_KERNEL_PRIVATE
 #include <sys/appleapiopts.h>
 
 #ifdef BSD_KERNEL_PRIVATE


@@ -114,12 +114,11 @@ extern void in6_rtchange(struct inpcb *, int);
 extern struct sockaddr *in6_sockaddr(in_port_t port, struct in6_addr *addr_p);
 extern void in6_sockaddr_s(in_port_t, struct in6_addr *, struct sockaddr_in6 *);
 extern int in6_getpeeraddr(struct socket *, struct sockaddr **);
 extern struct sockaddr *in6_sockaddr(in_port_t port, struct in6_addr *addr_p);
 extern void in6_sockaddr_s(in_port_t, struct in6_addr *, struct sockaddr_in6 *);
 extern int in6_getpeeraddr(struct socket *, struct sockaddr **);

-extern int in6_getpeeraddr_s(struct socket *, struct sockaddr_storage *);

 extern int in6_getsockaddr(struct socket *, struct sockaddr **);
 extern int in6_getsockaddr(struct socket *, struct sockaddr **);

-extern int in6_getsockaddr_s(struct socket *, struct sockaddr_storage *);
+extern int in6_getsockaddr_s(struct socket *, struct sockaddr_in6 *);

 extern int in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam);
 extern int in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam);
 extern int in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam);
 extern int in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam);

-extern int in6_selecthlim(struct in6pcb *, struct ifnet *);
+extern uint8_t in6_selecthlim(struct in6pcb *, struct ifnet *);

 extern int in6_pcbsetport(struct in6_addr *, struct inpcb *,
     struct proc *, int);
 extern void init_sin6(struct sockaddr_in6 *sin6, struct mbuf *m);
 extern int in6_pcbsetport(struct in6_addr *, struct inpcb *,
     struct proc *, int);
 extern void init_sin6(struct sockaddr_in6 *sin6, struct mbuf *m);