nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat using clang-format.

Browse Source
This commit is contained in:
Mke Brady
2015-06-01 23:16:50 +01:00
parent 04e27cfe4f
commit 87a0475c16
25 changed files with 4987 additions and 5001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mdns_external.c
+90 -107
View File
@@ -41,145 +41,128 @@ int mdns_pid = 0;
* Check errno for error details.
*/
static int fork_execvp(const char *file, char *const argv[]) {
int execpipe[2];
int pid = 0;
if (pipe(execpipe) < 0) {
return -1;
}
int execpipe[2];
int pid = 0;
if (pipe(execpipe) < 0) {
return -1;
}
if (fcntl(execpipe[1], F_SETFD, fcntl(execpipe[1], F_GETFD) | FD_CLOEXEC) < 0) {
close(execpipe[0]);
close(execpipe[1]);
return -1;
}
if (fcntl(execpipe[1], F_SETFD, fcntl(execpipe[1], F_GETFD) | FD_CLOEXEC) < 0) {
close(execpipe[0]);
close(execpipe[1]);
return -1;
}
pid = fork();
if (pid < 0) {
close(execpipe[0]);
close(execpipe[1]);
return -1;
}
else if(pid == 0) { // Child
close(execpipe[0]); // Close the read end
execvp(file, argv);
pid = fork();
if (pid < 0) {
close(execpipe[0]);
close(execpipe[1]);
return -1;
} else if (pid == 0) { // Child
close(execpipe[0]); // Close the read end
execvp(file, argv);
// If we reach this point then execve has failed.
// Write erno's value into the pipe and exit.
int ignore = write(execpipe[1], &errno, sizeof(errno));
// If we reach this point then execve has failed.
// Write erno's value into the pipe and exit.
int ignore = write(execpipe[1], &errno, sizeof(errno));
_exit(-1);
return 0; // Just to make the compiler happy.
}
else { // Parent
close(execpipe[1]); // Close the write end
_exit(-1);
return 0; // Just to make the compiler happy.
} else { // Parent
close(execpipe[1]); // Close the write end
int childErrno;
// Block until child closes the pipe or sends errno.
if(read(execpipe[0], &childErrno, sizeof(childErrno)) == sizeof(childErrno)) { // We received errno
errno = childErrno;
return -1;
}
else { // Child closed the pipe. execvp was successful.
return pid;
}
int childErrno;
// Block until child closes the pipe or sends errno.
if (read(execpipe[0], &childErrno, sizeof(childErrno)) ==
sizeof(childErrno)) { // We received errno
errno = childErrno;
return -1;
} else { // Child closed the pipe. execvp was successful.
return pid;
}
}
}
static int mdns_external_avahi_register(char *apname, int port) {
char mdns_port[6];
sprintf(mdns_port, "%d", config.port);
char mdns_port[6];
sprintf(mdns_port, "%d", config.port);
char *argvwithoutmetadata[] = {
NULL, apname, "_raop._tcp", mdns_port, MDNS_RECORD_WITHOUT_METADATA, NULL
};
char *argvwithoutmetadata[] = {NULL, apname, "_raop._tcp", mdns_port,
MDNS_RECORD_WITHOUT_METADATA, NULL};
#ifdef CONFIG_METADATA
char *argvwithmetadata[] = {
NULL, apname, "_raop._tcp", mdns_port, MDNS_RECORD_WITH_METADATA, NULL
};
char *argvwithmetadata[] = {NULL, apname, "_raop._tcp", mdns_port, MDNS_RECORD_WITH_METADATA,
NULL};
#endif
char **argv;
char **argv;
#ifdef CONFIG_METADATA
if (config.metadata_enabled)
argv=argvwithmetadata;
else
if (config.metadata_enabled)
argv = argvwithmetadata;
else
#endif
argv=argvwithoutmetadata;
argv[0] = "avahi-publish-service";
int pid = fork_execvp(argv[0], argv);
if (pid >= 0)
{
mdns_pid = pid;
return 0;
}
else
warn("Calling %s failed !", argv[0]);
argv = argvwithoutmetadata;
argv[0] = "mDNSPublish";
pid = fork_execvp(argv[0], argv);
if (pid >= 0)
{
mdns_pid = pid;
return 0;
}
else
warn("Calling %s failed !", argv[0]);
// If we reach here, both execvp calls failed.
return -1;
argv[0] = "avahi-publish-service";
int pid = fork_execvp(argv[0], argv);
if (pid >= 0) {
mdns_pid = pid;
return 0;
} else
warn("Calling %s failed !", argv[0]);
argv[0] = "mDNSPublish";
pid = fork_execvp(argv[0], argv);
if (pid >= 0) {
mdns_pid = pid;
return 0;
} else
warn("Calling %s failed !", argv[0]);
// If we reach here, both execvp calls failed.
return -1;
}
static int mdns_external_dns_sd_register(char *apname, int port) {
char mdns_port[6];
sprintf(mdns_port, "%d", config.port);
char mdns_port[6];
sprintf(mdns_port, "%d", config.port);
char *argvwithoutmetadata[] = {
NULL, apname, "_raop._tcp", mdns_port, MDNS_RECORD_WITHOUT_METADATA, NULL
};
char *argvwithoutmetadata[] = {NULL, apname, "_raop._tcp", mdns_port,
MDNS_RECORD_WITHOUT_METADATA, NULL};
#ifdef CONFIG_METADATA
char *argvwithmetadata[] = {
NULL, apname, "_raop._tcp", mdns_port, MDNS_RECORD_WITH_METADATA, NULL
};
char *argvwithmetadata[] = {NULL, apname, "_raop._tcp", mdns_port, MDNS_RECORD_WITH_METADATA,
NULL};
#endif
char **argv;
char **argv;
#ifdef CONFIG_METADATA
if (config.metadata_enabled)
argv=argvwithmetadata;
else
if (config.metadata_enabled)
argv = argvwithmetadata;
else
#endif
argv=argvwithoutmetadata;
argv = argvwithoutmetadata;
int pid = fork_execvp(argv[0], argv);
if (pid >= 0)
{
mdns_pid = pid;
return 0;
}
else
warn("Calling %s failed !", argv[0]);
int pid = fork_execvp(argv[0], argv);
if (pid >= 0) {
mdns_pid = pid;
return 0;
} else
warn("Calling %s failed !", argv[0]);
return -1;
return -1;
}
static void kill_mdns_child(void) {
if (mdns_pid)
kill(mdns_pid, SIGTERM);
mdns_pid = 0;
if (mdns_pid)
kill(mdns_pid, SIGTERM);
mdns_pid = 0;
}
mdns_backend mdns_external_avahi = {
.name = "external-avahi",
.mdns_register = mdns_external_avahi_register,
.mdns_unregister = kill_mdns_child
};
mdns_backend mdns_external_dns_sd = {
.name = "external-dns-sd",
.mdns_register = mdns_external_dns_sd_register,
.mdns_unregister = kill_mdns_child
};
mdns_backend mdns_external_avahi = {.name = "external-avahi",
.mdns_register = mdns_external_avahi_register,
.mdns_unregister = kill_mdns_child};
mdns_backend mdns_external_dns_sd = {.name = "external-dns-sd",
.mdns_register = mdns_external_dns_sd_register,
.mdns_unregister = kill_mdns_child};