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

Merge branch 'openbsd-devname' into 'master'

Browse Source 
OpenBSD Devname changes

Closes #399

See merge request openconnect/ocserv!256
This commit is contained in:
Nikos Mavrogiannopoulos
2021-02-11 10:24:31 +00:00
parent 7c81ba20f4 a2775715ec
commit 3e47d192ed
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tun.c
View File

@@ -555,15 +555,22 @@ static int os_open_tun(main_server_st * s, struct proc_st *proc)
if (fd < 0)
return fd;
/* get tun name */
ret = fstat(fd, &st);
if (ret < 0) {
e = errno;
mslog(s, NULL, LOG_ERR, "tun fd %d: stat: %s\n", fd, strerror(e));
close(fd);
return -1;
}
strlcpy(proc->tun_lease.name, devname(st.st_rdev, S_IFCHR), sizeof(proc->tun_lease.name));
#if defined(__OpenBSD__)
/* OpenBSD's devname does not return the correct name if unit_nr>=4.
* See https://gitlab.com/openconnect/ocserv/-/issues/399
*/
snprintf(proc->tun_lease.name, sizeof(proc->tun_lease.name), "tun%d", unit_nr);
#else
/* get tun name */
ret = fstat(fd, &st);
if (ret < 0) {
e = errno;
mslog(s, NULL, LOG_ERR, "tun fd %d: stat: %s\n", fd, strerror(e));
close(fd);
return -1;
}
strlcpy(proc->tun_lease.name, devname(st.st_rdev, S_IFCHR), sizeof(proc->tun_lease.name));
#endif
if (fd >= 0) {
int i, e, ret;