/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* The gory details, listed by topic:
*
- * - Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c,
- * - Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c,
+ * - Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
* - Volume normalizer: \ref compress.c,
* - Output: \ref alsa_write.c, \ref osx_write.c,
* - http: \ref http_recv.c, \ref http_send.c,
fprintf(outfd, "%i: ", ll);
mypid = getpid();
if (conf.loglevel_arg <= INFO)
- fprintf(outfd, "(%d) ", mypid);
+ fprintf(outfd, "(%d) ", (int)mypid);
va_start(argp, fmt);
vfprintf(outfd, fmt, argp);
va_end(argp);
mmd->events = 0;
mmd->num_connects = 0;
mmd->active_connections = 0;
- strcpy(mmd->afd.path, "(none)");
mmd->vss_status_flags = VSS_NEXT;
mmd->new_vss_status_flags = VSS_NEXT;
mmd->sender_cmd_data.cmd_num = -1;
return;
err_out:
- PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s", para_strerror(-ret));
exit(EXIT_FAILURE);
}
static void setup_signal_handling(void)
{
- int ret = 0;
-
- signal_pipe = para_signal_init();
- PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
- ret += para_install_sighandler(SIGINT);
- ret += para_install_sighandler(SIGTERM);
- ret += para_install_sighandler(SIGHUP);
- ret += para_install_sighandler(SIGCHLD);
- ret += para_install_sighandler(SIGUSR1);
- signal(SIGPIPE, SIG_IGN);
- if (ret != 5) {
- PARA_EMERG_LOG("%s", "could not install signal handlers\n");
- exit(EXIT_FAILURE);
- }
+ signal_pipe = para_signal_init(); /* always successful */
+
+ PARA_NOTICE_LOG("setting up signal handlers\n");
+ if (para_install_sighandler(SIGINT) < 0)
+ goto err;
+ if (para_install_sighandler(SIGTERM) < 0)
+ goto err;
+ if (para_install_sighandler(SIGHUP) < 0)
+ goto err;
+ if (para_install_sighandler(SIGCHLD) < 0)
+ goto err;
+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+ goto err;
+ if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
+ goto err;
+ add_close_on_fork_list(signal_pipe);
+ return;
+err:
+ PARA_EMERG_LOG("could not install signal handlers\n");
+ exit(EXIT_FAILURE);
}
static unsigned init_network(void)
{
- int fd, ret = init_tcp_socket(conf.port_arg);
+ int fd, ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg);
if (ret < 0)
goto err;
fd = ret;
- ret = mark_fd_nonblock(fd);
+ ret = mark_fd_nonblocking(fd);
if (ret < 0)
goto err;
+ add_close_on_fork_list(fd); /* child doesn't need the listener */
return fd;
err:
- PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
}
}
close(afs_server_socket[1]);
afs_socket = afs_server_socket[0];
- ret = mark_fd_nonblock(afs_socket);
+ ret = mark_fd_nonblocking(afs_socket);
if (ret < 0)
exit(EXIT_FAILURE);
add_close_on_fork_list(afs_socket);
{
/* listen on sock_fd, new connection on new_fd */
int sockfd, new_fd;
- struct sockaddr_in their_addr;
+ char *peer_name;
int i, max_fileno, ret;
pid_t chld_pid;
fd_set rfds, wfds;
if (!FD_ISSET(sockfd, &rfds))
goto repeat;
- new_fd = para_accept(sockfd, &their_addr, sizeof(struct sockaddr_in));
+ new_fd = para_accept(sockfd, NULL, 0);
if (new_fd < 0)
goto repeat;
- PARA_INFO_LOG("got connection from %s, forking\n",
- inet_ntoa(their_addr.sin_addr));
+ peer_name = remote_name(new_fd);
+ PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
mmd->num_connects++;
mmd->active_connections++;
random();
}
alarm(ALARM_TIMEOUT);
close_listed_fds();
- close(sockfd); /* child doesn't need the listener */
+ para_signal_shutdown();
/*
* put info on who we are serving into argv[0] to make
* client ip visible in top/ps
*/
for (i = argc - 1; i >= 0; i--)
memset(argv[i], 0, strlen(argv[i]));
- sprintf(argv[0], "para_server (serving %s)",
- inet_ntoa(their_addr.sin_addr));
- return handle_connect(new_fd, &their_addr);
+ sprintf(argv[0], "para_server (serving %s)", peer_name);
+ return handle_connect(new_fd, peer_name);
}