d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addresses Roberts comments on comments. Also adds

Browse Source 
the KASSERT and checks suggested.

Reviewed by:	The udp tunneling was discussed on net@ under the
                thread entitled "Heads up -- Thinking about UDP and tunneling"
This commit is contained in:
Randall Stewart 2009-01-06 13:27:56 +00:00
parent 19cc5aa64b
commit bbb0e3d9d5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=186821
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/netinet/udp_usrreq.c
View File

@ -501,13 +501,8 @@ udp_input(struct mbuf *m, int off)
* Engage the tunneling protocol we
* will have to leave the info_lock
* up, since we are hunting through
* multiple UDP inp's hope we don't
* break.
* multiple UDP's.
*
* XXXML: Maybe add a flag to the
* prototype so that the tunneling
* can defer work that can't be done
* under the info lock?
*/
udp_tun_func_t tunnel_func;
@ -546,9 +541,7 @@ udp_input(struct mbuf *m, int off)
INP_INFO_RUNLOCK(&V_udbinfo);
} else {
/*
* Engage the tunneling protocol we must make sure
* all locks are released when we call the tunneling
* protocol.
* Engage the tunneling protocol.
*/
udp_tun_func_t tunnel_func;
@ -602,8 +595,7 @@ udp_input(struct mbuf *m, int off)
}
if (inp->inp_ppcb != NULL) {
/*
* Engage the tunneling protocol we must make sure all locks
* are released when we call the tunneling protocol.
* Engage the tunneling protocol.
*/
udp_tun_func_t tunnel_func;
@ -1205,6 +1197,8 @@ udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f)
struct inpcb *inp;
inp = (struct inpcb *)so->so_pcb;
KASSERT(so->so_type == SOCK_DGRAM, ("udp_set_kernel_tunneling: !dgram"));
KASSERT(so->so_pcb != NULL, ("udp_set_kernel_tunneling: NULL inp"));
if (so->so_type != SOCK_DGRAM) {
/* Not UDP socket... sorry! */
return (ENOTSUP);
@ -1214,6 +1208,10 @@ udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f)
return (EINVAL);
}
INP_WLOCK(inp);
if (inp->inp_ppcb != NULL) {
INP_WUNLOCK(inp);
return (EBUSY);
}
inp->inp_ppcb = f;
INP_WUNLOCK(inp);
return (0);

10
sys/netinet6/udp6_usrreq.c
View File

@ -293,8 +293,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
* protocol we will have to
* leave the info_lock up,
* since we are hunting
* through multiple UDP
* inp's hope we don't break.
* through multiple UDP's.
*
*/
udp_tun_func_t tunnel_func;
@ -336,9 +335,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
INP_INFO_RUNLOCK(&V_udbinfo);
if (last->inp_ppcb != NULL) {
/*
* Engage the tunneling protocol we must make sure
* all locks are released when we call the tunneling
* protocol.
* Engage the tunneling protocol.
*/
udp_tun_func_t tunnel_func;
@ -386,8 +383,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
INP_INFO_RUNLOCK(&V_udbinfo);
if (inp->inp_ppcb != NULL) {
/*
* Engage the tunneling protocol we must make sure all locks
* are released when we call the tunneling protocol.
* Engage the tunneling protocol.
*/
udp_tun_func_t tunnel_func;