-int libcfs_getpeername(int sock_fd, __u32 *ipaddr_p, __u16 *port_p);
-int libcfs_socketpair(int *fdp);
-int libcfs_fcntl_nonblock(int fd);
-int libcfs_sock_set_nagle(int fd, int nagle);
-int libcfs_sock_set_bufsiz(int fd, int bufsiz);
-int libcfs_sock_create(int *fdp);
-int libcfs_sock_bind_to_port(int fd, __u16 port);
-int libcfs_sock_connect(int fd, __u32 ip, __u16 port);
-int libcfs_sock_writev(int fd, const struct iovec *vector, int count);
-int libcfs_sock_readv(int fd, const struct iovec *vector, int count);
+int libcfs_socketpair(cfs_socket_t **sockp);
+int libcfs_fcntl_nonblock(cfs_socket_t *sock);
+int libcfs_sock_set_nagle(cfs_socket_t *sock, int nagle);
+int libcfs_sock_set_bufsiz(cfs_socket_t *sock, int bufsiz);
+int libcfs_sock_connect(cfs_socket_t *sock, __u32 ip, __u16 port);
+int libcfs_sock_writev(cfs_socket_t *sock,
+ const struct iovec *vector, int count);
+int libcfs_sock_readv(cfs_socket_t *sock,
+ const struct iovec *vector, int count);
+int libcfs_sock_create(cfs_socket_t **sockp, int *fatal,
+ __u32 local_ip, int local_port);
+