projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ortp_recv: Set remote address
[paraslash.git]
/
server.c
diff --git
a/server.c
b/server.c
index 2391e07c360d93f68e85a76c99bc783e1f2d4bc0..ce56494f4fce68d0ce3f1499b8e00ee609d9b05e 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-56,7
+56,7
@@
struct misc_meta_data *mmd;
* It also contains the options for all audio file selectors and all supported
* senders.
*/
* It also contains the options for all audio file selectors and all supported
* senders.
*/
-struct
gengetopt
_args_info conf;
+struct
server
_args_info conf;
char *user_list = NULL;
extern void dccp_send_init(struct sender *);
extern void http_send_init(struct sender *);
char *user_list = NULL;
extern void dccp_send_init(struct sender *);
extern void http_send_init(struct sender *);
@@
-234,7
+234,7
@@
static void parse_config(int override)
}
if (!ret) {
int tmp = conf.daemon_given;
}
if (!ret) {
int tmp = conf.daemon_given;
- cmdline_parser_configfile(cf, &conf, override, 0, 0);
+
server_
cmdline_parser_configfile(cf, &conf, override, 0, 0);
conf.daemon_given = tmp;
}
/* logfile */
conf.daemon_given = tmp;
}
/* logfile */
@@
-339,7
+339,7
@@
static unsigned do_inits(int argc, char **argv)
init_random_seed();
/* parse command line options */
init_random_seed();
/* parse command line options */
- cmdline_parser(argc, argv, &conf);
+
server_
cmdline_parser(argc, argv, &conf);
para_drop_privileges(conf.user_arg, conf.group_arg);
/* parse config file, open log and set defaults */
parse_config(0);
para_drop_privileges(conf.user_arg, conf.group_arg);
/* parse config file, open log and set defaults */
parse_config(0);