Page MenuHomeFreeBSD
Files F136408493

D53621.diff
No OneTemporary
Actions

D53621.diff
View Options

diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c
--- a/usr.sbin/virtual_oss/virtual_oss/main.c
+++ b/usr.sbin/virtual_oss/virtual_oss/main.c
@@ -31,6 +31,7 @@
#include <sys/nv.h>
#include <sys/sndstat.h>
#include <sys/soundcard.h>
+#include <sys/sysctl.h>
#include <dlfcn.h>
#include <errno.h>
@@ -52,6 +53,8 @@
#include "int.h"
#include "virtual_oss.h"
+#define SYSCTL_BASECLONE "hw.snd.basename_clone"
+
pthread_mutex_t atomic_mtx;
pthread_cond_t atomic_cv;
@@ -1617,6 +1620,7 @@
static int voss_dsp_perm = 0666;
static int voss_do_background;
+static int voss_baseclone = 0;
static const char *voss_pid_path;
uint32_t voss_dsp_rx_refresh;
@@ -1739,6 +1743,20 @@
exit(EX_USAGE);
}
+/*
+ * Restore hw.snd.basename_clone if it was disabled by us.
+ */
+static void
+restore_baseclone(void)
+{
+ if (voss_baseclone) {
+ if (sysctlbyname(SYSCTL_BASECLONE, NULL, NULL, &voss_baseclone,
+ sizeof(int)) < 0)
+ warn("Could not enable " SYSCTL_BASECLONE);
+ printf(SYSCTL_BASECLONE ": 0 -> %d\n", voss_baseclone);
+ }
+}
+
static void
init_compressor(struct virtual_profile *pvp)
{
@@ -1883,8 +1901,18 @@
* Detect /dev/dsp creation and try to disable system
* basename cloning automatically:
*/
- if (strcmp(ptr->oss_name, "dsp") == 0)
- system("sysctl hw.snd.basename_clone=0");
+ if (strcmp(ptr->oss_name, "dsp") == 0) {
+ size_t size;
+
+ x = 0;
+ size = sizeof(int);
+ if (sysctlbyname(SYSCTL_BASECLONE, &voss_baseclone,
+ &size, &x, size) < 0)
+ return ("Could not disable " SYSCTL_BASECLONE);
+ printf(SYSCTL_BASECLONE ": %d -> 0\n", voss_baseclone);
+ if (atexit(restore_baseclone) < 0)
+ return ("Could not set atexit callback");
+ }
/* create DSP character device */
pdev = cuse_dev_create(&vclient_oss_methods, ptr, NULL,

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 18, 4:09 PM (19 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25178168
Default Alt Text
D53621.diff (1 KB)

Event Timeline