GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-03-13 14:58:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

FreeBSD tun(4)

Browse Source 
FreeBSD has a mechanism by which a tunnel has a single controlling process,
and only that one process may close the tunnel.

Kyle Evans of the FreeBSD Project authored these changes.

See issue 213.

Signed-off-by: Trond Endrestøl <trond.endrestol@ximalas.info>
This commit is contained in:
Trond Endrestøl
2019-10-02 14:00:26 +00:00
parent 994dfa0981
commit aa07f183f2
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/tun.c
View File

@@ -895,3 +895,22 @@ ssize_t tun_read(int sockfd, void *buf, size_t len)
return read(sockfd, buf, len); return read(sockfd, buf, len);
} }
#endif #endif
#ifndef __FreeBSD__
int tun_claim(int sockfd)
{
return (0);
}
#else
/*
* FreeBSD has a mechanism by which a tunnel has a single controlling process,
* and only that one process may close it. When the controlling process closes
* the tunnel, the state is torn down.
*/
int tun_claim(int sockfd)
{
return (ioctl(sockfd, TUNSIFPID, 0));
}
#endif /* !__FreeBSD__ */

1
src/tun.h
View File

@@ -35,5 +35,6 @@ struct tun_lease_st {
ssize_t tun_write(int sockfd, const void *buf, size_t len); ssize_t tun_write(int sockfd, const void *buf, size_t len);
ssize_t tun_read(int sockfd, void *buf, size_t len); ssize_t tun_read(int sockfd, void *buf, size_t len);
int tun_claim(int sockfd);
#endif #endif

5
src/worker-auth.c
View File

@@ -605,7 +605,10 @@ static int recv_cookie_auth_reply(worker_st * ws)
case AUTH__REP__OK: case AUTH__REP__OK:
if (socketfd != -1) { if (socketfd != -1) {
ws->tun_fd = socketfd; ws->tun_fd = socketfd;
if (tun_claim(ws->tun_fd) != 0) {
ret = ERR_AUTH_FAIL;
goto cleanup;
}
if (msg->vname == NULL || msg->config == NULL || msg->user_name == NULL || msg->sid.len != sizeof(ws->sid)) { if (msg->vname == NULL || msg->config == NULL || msg->user_name == NULL || msg->sid.len != sizeof(ws->sid)) {
ret = ERR_AUTH_FAIL; ret = ERR_AUTH_FAIL;
goto cleanup; goto cleanup;