From d225f06201839b7d80704cdd34336bed810f046d Mon Sep 17 00:00:00 2001 From: rwatson Date: Mon, 7 May 2007 13:51:24 +0000 Subject: Since udp_peeraddr() and udp_sockaddr() directly wrap in_setpeeraddr() and in_setsockaddr(), containing only stale comments on why they exist, remove them and initialize the protosw for UDP to directly reference in_setpeeraddr() and in_setsockaddr(). --- sys/netinet/udp_usrreq.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'sys/netinet/udp_usrreq.c') diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 193dd65..4e853ca 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1135,29 +1135,6 @@ udp_shutdown(struct socket *so) return (0); } -/* - * This is the wrapper function for in_setsockaddr. We just pass down the - * pcbinfo for in_setsockaddr() to lock. We don't want to do the locking - * here because in_setsockaddr() will call malloc and might block. - */ -static int -udp_sockaddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setsockaddr(so, nam)); -} - -/* - * This is the wrapper function for in_setpeeraddr(). We just pass down the - * pcbinfo for in_setpeeraddr() to lock. - */ -static int -udp_peeraddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setpeeraddr(so, nam)); -} - struct pr_usrreqs udp_usrreqs = { .pru_abort = udp_abort, .pru_attach = udp_attach, @@ -1166,11 +1143,11 @@ struct pr_usrreqs udp_usrreqs = { .pru_control = in_control, .pru_detach = udp_detach, .pru_disconnect = udp_disconnect, - .pru_peeraddr = udp_peeraddr, + .pru_peeraddr = in_setpeeraddr, .pru_send = udp_send, .pru_sosend = sosend_dgram, .pru_shutdown = udp_shutdown, - .pru_sockaddr = udp_sockaddr, + .pru_sockaddr = in_setsockaddr, .pru_sosetlabel = in_pcbsosetlabel, .pru_close = udp_close, }; -- cgit v1.1