98c98
< __FBSDID("$FreeBSD: head/sys/kern/uipc_socket.c 169375 2007-05-08 12:34:14Z yongari $");
---
> __FBSDID("$FreeBSD: head/sys/kern/uipc_socket.c 169624 2007-05-16 20:41:08Z rwatson $");
330,336c330,331
< socreate(dom, aso, type, proto, cred, td)
< int dom;
< struct socket **aso;
< int type;
< int proto;
< struct ucred *cred;
< struct thread *td;
---
> socreate(int dom, struct socket **aso, int type, int proto,
> struct ucred *cred, struct thread *td)
409,411c404
< sonewconn(head, connstatus)
< register struct socket *head;
< int connstatus;
---
> sonewconn(struct socket *head, int connstatus)
413c406
< register struct socket *so;
---
> struct socket *so;
495,498c488
< sobind(so, nam, td)
< struct socket *so;
< struct sockaddr *nam;
< struct thread *td;
---
> sobind(struct socket *so, struct sockaddr *nam, struct thread *td)
517,520c507
< solisten(so, backlog, td)
< struct socket *so;
< int backlog;
< struct thread *td;
---
> solisten(struct socket *so, int backlog, struct thread *td)
527,528c514
< solisten_proto_check(so)
< struct socket *so;
---
> solisten_proto_check(struct socket *so)
540,542c526
< solisten_proto(so, backlog)
< struct socket *so;
< int backlog;
---
> solisten_proto(struct socket *so, int backlog)
574,575c558
< sofree(so)
< struct socket *so;
---
> sofree(struct socket *so)
650,651c633
< soclose(so)
< struct socket *so;
---
> soclose(struct socket *so)
726,727c708
< soabort(so)
< struct socket *so;
---
> soabort(struct socket *so)
750,752c731
< soaccept(so, nam)
< struct socket *so;
< struct sockaddr **nam;
---
> soaccept(struct socket *so, struct sockaddr **nam)
765,768c744
< soconnect(so, nam, td)
< struct socket *so;
< struct sockaddr *nam;
< struct thread *td;
---
> soconnect(struct socket *so, struct sockaddr *nam, struct thread *td)
796,798c772
< soconnect2(so1, so2)
< struct socket *so1;
< struct socket *so2;
---
> soconnect2(struct socket *so1, struct socket *so2)
805,806c779
< sodisconnect(so)
< struct socket *so;
---
> sodisconnect(struct socket *so)
949,956c922,923
< sosend_dgram(so, addr, uio, top, control, flags, td)
< struct socket *so;
< struct sockaddr *addr;
< struct uio *uio;
< struct mbuf *top;
< struct mbuf *control;
< int flags;
< struct thread *td;
---
> sosend_dgram(struct socket *so, struct sockaddr *addr, struct uio *uio,
> struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
1129,1136c1096,1097
< sosend_generic(so, addr, uio, top, control, flags, td)
< struct socket *so;
< struct sockaddr *addr;
< struct uio *uio;
< struct mbuf *top;
< struct mbuf *control;
< int flags;
< struct thread *td;
---
> sosend_generic(struct socket *so, struct sockaddr *addr, struct uio *uio,
> struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
1317,1324c1278,1279
< sosend(so, addr, uio, top, control, flags, td)
< struct socket *so;
< struct sockaddr *addr;
< struct uio *uio;
< struct mbuf *top;
< struct mbuf *control;
< int flags;
< struct thread *td;
---
> sosend(struct socket *so, struct sockaddr *addr, struct uio *uio,
> struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
1344,1347c1299
< soreceive_rcvoob(so, uio, flags)
< struct socket *so;
< struct uio *uio;
< int flags;
---
> soreceive_rcvoob(struct socket *so, struct uio *uio, int flags)
1440,1446c1392,1393
< soreceive_generic(so, psa, uio, mp0, controlp, flagsp)
< struct socket *so;
< struct sockaddr **psa;
< struct uio *uio;
< struct mbuf **mp0;
< struct mbuf **controlp;
< int *flagsp;
---
> soreceive_generic(struct socket *so, struct sockaddr **psa, struct uio *uio,
> struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
1898,1904c1845,1846
< soreceive(so, psa, uio, mp0, controlp, flagsp)
< struct socket *so;
< struct sockaddr **psa;
< struct uio *uio;
< struct mbuf **mp0;
< struct mbuf **controlp;
< int *flagsp;
---
> soreceive(struct socket *so, struct sockaddr **psa, struct uio *uio,
> struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
1916,1918c1858
< soshutdown(so, how)
< struct socket *so;
< int how;
---
> soshutdown(struct socket *so, int how)
1933,1934c1873
< sorflush(so)
< struct socket *so;
---
> sorflush(struct socket *so)
1980,1984c1919
< sooptcopyin(sopt, buf, len, minlen)
< struct sockopt *sopt;
< void *buf;
< size_t len;
< size_t minlen;
---
> sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen)
2027,2029c1962
< sosetopt(so, sopt)
< struct socket *so;
< struct sockopt *sopt;
---
> sosetopt(struct socket *so, struct sockopt *sopt)
2244,2246c2177
< sogetopt(so, sopt)
< struct socket *so;
< struct sockopt *sopt;
---
> sogetopt(struct socket *so, struct sockopt *sopt)
2510,2511c2441
< sohasoutofband(so)
< struct socket *so;
---
> sohasoutofband(struct socket *so)
2512a2443
>
2610a2542
>
2616a2549
>
2622a2556
>
2628a2563
>
2634a2570
>
2640c2576
< struct ifnet *ifp, struct thread *td)
---
> struct ifnet *ifp, struct thread *td)
2641a2578
>
2647a2585
>
2653a2592
>
2659a2599
>
2665a2606
>
2671a2613
>
2677c2619
< struct sockaddr *addr, struct mbuf *control, struct thread *td)
---
> struct sockaddr *addr, struct mbuf *control, struct thread *td)
2678a2621
>
2688a2632
>
2695a2640
>
2701a2647
>
2707c2653
< struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
---
> struct mbuf *top, struct mbuf *control, int flags, struct thread *td)
2708a2655
>
2714,2715c2661
< struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
< int *flagsp)
---
> struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
2716a2663
>
2722c2669
< struct thread *td)
---
> struct thread *td)
2723a2671
>
2869,2870c2817
< soisconnecting(so)
< register struct socket *so;
---
> soisconnecting(struct socket *so)
2880,2881c2827
< soisconnected(so)
< struct socket *so;
---
> soisconnected(struct socket *so)
2922,2923c2868
< soisdisconnecting(so)
< register struct socket *so;
---
> soisdisconnecting(struct socket *so)
2942,2943c2887
< soisdisconnected(so)
< register struct socket *so;
---
> soisdisconnected(struct socket *so)
2986a2931
>