src/usr.bin/sndiod/sndiod.c - diff

Return to sndiod.c CVS log

Up to [local] / src / usr.bin / sndiod

Diff for /src/usr.bin/sndiod/sndiod.c between version 1.24 and 1.25

version 1.24, 2016/01/08 13:19:34

version 1.25, 2016/01/08 13:32:17

Line 327

{

int c, background, unit;

int pmin, pmax, rmin, rmax;

char base[SOCKPATH_MAX], path[SOCKPATH_MAX], *tcpaddr;

char base[SOCKPATH_MAX], path[SOCKPATH_MAX];

unsigned int mode, dup, mmc, vol;

unsigned int hold, autovol, bufsz, round, rate;

const char *str;

Line 336

struct port *p;

struct listen *l;

struct passwd *pw;

struct tcpaddr {

char *host;

struct tcpaddr *next;

} *tcpaddr_list, *ta;

int s[2];

pid_t pid;

uid_t euid, hpw_uid, wpw_uid;

Line 363

Line 367

rmax = 1;

aparams_init(&par);

mode = MODE_PLAY | MODE_REC;

tcpaddr = NULL;

tcpaddr_list = NULL;

while ((c = getopt(argc, argv, "a:b:c:C:de:f:j:L:m:q:r:s:t:U:v:w:x:z:")) != -1) {

switch (c) {

Line 377

Line 381

errx(1, "%s: unit number is %s", optarg, str);

break;

case 'L':

tcpaddr = optarg;

ta = xmalloc(sizeof(struct tcpaddr));

ta->host = optarg;

ta->next = tcpaddr_list;

tcpaddr_list = ta;

break;

case 'm':

mode = opt_mode();

Line 521

Line 528

base, unit);

if (!listen_new_un(path))

return 1;

if (tcpaddr) {

for (ta = tcpaddr_list; ta != NULL; ta = ta->next) {

if (!listen_new_tcp(tcpaddr, AUCAT_PORT + unit))

if (!listen_new_tcp(ta->host, AUCAT_PORT + unit))

return 1;

}

for (l = listen_list; l != NULL; l = l->next) {

Line 555

Line 562

setresuid(wpw_uid, wpw_uid, wpw_uid))

err(1, "cannot drop privileges");

}

if (tcpaddr) {

if (tcpaddr_list) {

if (pledge("stdio audio recvfd unix inet", NULL) == -1)

err(1, "pledge");

} else {

Line 590

Line 597

dev_del(dev_list);

while (port_list)

port_del(port_list);

while (tcpaddr_list) {

ta = tcpaddr_list;

tcpaddr_list = ta->next;

xfree(ta);

}

filelist_done();

unsetsig();

return 0;