/*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
}
/*
- * compute human readable string containing
- * vss status for given integer value
+ * Compute human readable string containing vss status for given integer value.
+ *
+ * We don't want to use vss_playing() and friends here because we take a
+ * snapshot of the mmd struct and use the copy for computing the state of the
+ * vss. If the real data were used, we would take the mmd lock for a rather
+ * long time or risk to get an inconsistent view.
*/
static char *vss_status_tohuman(unsigned int flags)
{
if (flags & VSS_PLAYING)
return para_strdup("playing");
- else if (flags & VSS_NEXT)
+ if (flags & VSS_NEXT)
return para_strdup("stopped");
- else
- return para_strdup("paused");
+ return para_strdup("paused");
}
/*
case SENDER_ALLOW:
if (argc != 4 && argc != 5)
return -E_COMMAND_SYNTAX;
- if (!inet_pton(AF_INET, argv[3], &scd->addr))
+ if (!is_valid_ipv4_address(argv[3]))
return -E_COMMAND_SYNTAX;
scd->netmask = 32;
if (argc == 5) {
if (scd->netmask < 0 || scd->netmask > 32)
return -E_COMMAND_SYNTAX;
}
+ strncpy(scd->host, argv[3], sizeof(scd->host));
break;
case SENDER_ADD:
case SENDER_DELETE:
- if (argc != 4 && argc != 5)
- return -E_COMMAND_SYNTAX;
- if (!inet_pton(AF_INET, argv[3], &scd->addr))
+ if (argc != 4)
return -E_COMMAND_SYNTAX;
- scd->port = -1;
- if (argc == 5) {
- scd->port = atoi(argv[4]);
- if (scd->port < 0 || scd->port > 65535)
- return -E_COMMAND_SYNTAX;
- }
- break;
+ return parse_fec_url(argv[3], scd);
default:
return -E_COMMAND_SYNTAX;
}
usleep(100 * 1000);
continue;
}
- mmd->sender_cmd_data = scd;
+ memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
mutex_unlock(mmd_mutex);
break;
}
}
ut = uptime_str();
ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
- "pid: %d\n"
+ "server_pid: %d\n"
+ "afs_pid: %d\n"
"connections (active/accepted/total): %u/%u/%u\n"
- "current loglevel: %i\n"
+ "current loglevel: %s\n"
"supported audio formats: %s\n"
"supported senders: %s\n"
"%s",
ut, mmd->num_played,
(int)getppid(),
+ (int)mmd->afs_pid,
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,