/** the file containing user information (public key, permissions) */
char *user_list_file = NULL;
-extern void dccp_send_init(struct sender *);
-extern void http_send_init(struct sender *);
-extern void ortp_send_init(struct sender *);
-
-/** the list of supported senders */
-struct sender senders[] = {
- {
- .name = "http",
- .init = http_send_init,
- },
- {
- .name = "dccp",
- .init = dccp_send_init,
- },
-#ifdef HAVE_ORTP
- {
- .name = "ortp",
- .init = ortp_send_init,
- },
-#endif
- {
- .name = NULL,
- }
-};
-
-
/* global variables for server-internal use */
static FILE *logfile;
static int mmd_mutex, mmd_shm_id;
static int signal_pipe;
+static int listen_fd;
/**
* para_server's log function
mmd->active_connections = 0;
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\n", para_strerror(-ret));
exit(EXIT_FAILURE);
}
struct server_cmdline_parser_params params = {
.override = override,
.initialize = 0,
- .check_required = 0,
- .check_ambiguity = 0
+ .check_required = 1,
+ .check_ambiguity = 0,
+ .print_errors = 1
};
server_cmdline_parser_config_file(cf, &conf, ¶ms);
conf.daemon_given = tmp;
}
- /* logfile */
- if (!conf.logfile_given && conf.daemon_given) {
- ret = -1;
- PARA_EMERG_LOG("%s", "daemon, but no log file\n");
- goto out;
- }
if (conf.logfile_given)
logfile = open_log(conf.logfile_arg);
ret = 1;
exit(EXIT_FAILURE);
}
-static unsigned init_network(void)
+static void init_network(void)
{
- int fd, ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg);
+ int ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg);
if (ret < 0)
goto err;
- fd = ret;
- ret = mark_fd_nonblocking(fd);
+ listen_fd = ret;
+ ret = mark_fd_nonblocking(listen_fd);
if (ret < 0)
goto err;
- add_close_on_fork_list(fd); /* child doesn't need the listener */
- return fd;
+ add_close_on_fork_list(listen_fd); /* child doesn't need the listener */
+ return;
err:
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
(unsigned) afs_socket_cookie);
}
-static unsigned server_init(int argc, char **argv)
+static void server_init(int argc, char **argv)
{
/* connector's address information */
- int sockfd;
-
+ struct server_cmdline_parser_params params = {
+ .override = 0,
+ .initialize = 1,
+ .check_required = 0,
+ .check_ambiguity = 0,
+ .print_errors = 1
+ };
init_random_seed();
/* parse command line options */
- server_cmdline_parser(argc, argv, &conf);
+ server_cmdline_parser_ext(argc, argv, &conf, ¶ms);
HANDLE_VERSION_FLAG("server", conf);
para_drop_privileges(conf.user_arg, conf.group_arg);
/* parse config file, open log and set defaults */
mmd_lock();
/* init network socket */
PARA_NOTICE_LOG("initializing tcp command socket\n");
- sockfd = init_network();
+ init_network();
PARA_NOTICE_LOG("server init complete\n");
- return sockfd;
}
/*
*/
static void handle_sighup(void)
{
- PARA_NOTICE_LOG("%s", "SIGHUP\n");
+ PARA_NOTICE_LOG("SIGHUP\n");
close_log(logfile); /* gets reopened if necessary by parse_config */
logfile = NULL;
parse_config(1); /* reopens log */
}
}
+static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,
+ struct timeval *timeout_tv)
+{
+ int ret;
+
+ status_refresh();
+ mmd_unlock();
+ ret = para_select(max_fileno + 1, readfds, writefds, timeout_tv);
+ mmd_lock();
+ return ret;
+}
+
+static void command_pre_select(int *max_fileno, fd_set *rfds)
+{
+ para_fd_set(listen_fd, rfds, max_fileno);
+}
+
+static void command_post_select(fd_set *rfds)
+{
+ int new_fd, ret;
+ char *peer_name;
+ pid_t child_pid;
+
+ if (!FD_ISSET(listen_fd, rfds))
+ return;
+ ret = para_accept(listen_fd, NULL, 0);
+ if (ret < 0)
+ goto out;
+ new_fd = ret;
+ peer_name = remote_name(new_fd);
+ PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
+ mmd->num_connects++;
+ mmd->active_connections++;
+ random();
+ child_pid = fork();
+ if (child_pid < 0) {
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ goto out;
+ }
+ if (child_pid) {
+ close(new_fd);
+ /* parent keeps accepting connections */
+ return;
+ }
+ alarm(ALARM_TIMEOUT);
+ close_listed_fds();
+ 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)", peer_name);
+ return handle_connect(new_fd, peer_name);
+out:
+ if (ret < 0)
+ PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+}
+
/**
* the main function of para_server
*
*/
int main(int argc, char *argv[])
{
- /* listen on sock_fd, new connection on new_fd */
- int sockfd, new_fd;
- char *peer_name;
- int i, max_fileno, ret;
- pid_t chld_pid;
+ int max_fileno, ret;
fd_set rfds, wfds;
struct timeval *timeout;
valid_fd_012();
- sockfd = server_init(argc, argv);
+ server_init(argc, argv);
repeat:
FD_ZERO(&rfds);
FD_ZERO(&wfds);
max_fileno = -1;
- /* check socket and signal pipe in any case */
- para_fd_set(sockfd, &rfds, &max_fileno);
+ command_pre_select(&max_fileno, &rfds);
para_fd_set(signal_pipe, &rfds, &max_fileno);
timeout = vss_preselect(&rfds, &wfds, &max_fileno);
- status_refresh();
- for (i = 0; senders[i].name; i++) {
- if (!senders[i].pre_select)
- continue;
- senders[i].pre_select(&max_fileno, &rfds, &wfds);
- }
- mmd_unlock();
- ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
- mmd_lock();
+ server_select(max_fileno + 1, &rfds, &wfds, timeout);
vss_post_select(&rfds, &wfds);
- if (ret < 0)
- goto repeat;
- for (i = 0; senders[i].name; i++) {
- if (!senders[i].post_select)
- continue;
- senders[i].post_select(&rfds, &wfds);
- }
- vss_send_chunk();
- status_refresh();
if (FD_ISSET(signal_pipe, &rfds)) {
int sig;
pid_t pid;
exit(EXIT_FAILURE);
}
}
- if (mmd->sender_cmd_data.cmd_num >= 0) {
- int num = mmd->sender_cmd_data.cmd_num,
- s = mmd->sender_cmd_data.sender_num;
-
- if (senders[s].client_cmds[num])
- senders[s].client_cmds[num](&mmd->sender_cmd_data);
- mmd->sender_cmd_data.cmd_num = -1;
- }
- if (!FD_ISSET(sockfd, &rfds))
- goto repeat;
-
- new_fd = para_accept(sockfd, NULL, 0);
- if (new_fd < 0)
- goto repeat;
- peer_name = remote_name(new_fd);
- PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
- mmd->num_connects++;
- mmd->active_connections++;
- random();
- chld_pid = fork();
- if (chld_pid < 0) {
- PARA_CRIT_LOG("%s", "fork failed\n");
- goto repeat;
- }
- if (chld_pid) {
- close(new_fd);
- /* parent keeps accepting connections */
- goto repeat;
- }
- alarm(ALARM_TIMEOUT);
- close_listed_fds();
- 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)", peer_name);
- return handle_connect(new_fd, peer_name);
+ command_post_select(&rfds);
+ goto repeat;
}
projects / paraslash.git / blobdiff