X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=8c9b48a6e371e27bad84baaa482556a4fda45550;hp=59bc7935645a59907a17f1172500a7f19e38818e;hb=5cbd764b2e3dc5c2e3c974ec528f91a03fca366d;hpb=c29a66c884d0e7f7329a3be2931490e47f0cd9ff

diff --git a/server.c b/server.c
index 59bc7935..8c9b48a6 100644
--- a/server.c
+++ b/server.c
@@ -57,6 +57,7 @@ struct misc_meta_data *mmd;
 */
 struct gengetopt_args_info conf;
 char *user_list = NULL;
+extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
 extern struct audio_format afl[];
@@ -95,6 +96,10 @@ struct sender senders[] = {
 		.name = "http",
 		.init = http_send_init,
 	},
+	{
+		.name = "dccp",
+		.init = dccp_send_init,
+	},
 #ifdef HAVE_ORTP
 	{
 		.name = "ortp",
@@ -118,7 +123,7 @@ static int signal_pipe;
  * \param ll the log level
  * \param fmt the format string describing the log message
  */
-void para_log(int ll, char* fmt,...)
+void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -281,7 +286,7 @@ static void init_selector(void)
 {
 	int i, ret;
 
-	mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
+	mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
 	if (!conf.selector_given)
 		goto random;
 	for (i = 0; dblist[i].name; i++) {
@@ -317,7 +322,7 @@ static void init_random_seed(void)
 	int fd, ret = -1, len = sizeof(unsigned int);
 	unsigned int seed;
 
-	fd = open("/dev/random", O_RDONLY);
+	fd = open("/dev/urandom", O_RDONLY);
 	if (fd < 0)
 		goto out;
 	ret = -2;
@@ -370,13 +375,13 @@ static unsigned do_inits(int argc, char **argv)
 	return sockfd;
 }
 
-static void handle_dbt_change(void)
+static void change_selector(void)
 {
-	int ret, old = mmd->selector_num, new = mmd->dbt_change;
+	int ret, old = mmd->selector_num, new = mmd->selector_change;
 
 	dblist[old].shutdown();
 	ret = dblist[new].init(&dblist[new]);
-	mmd->dbt_change = -1; /* reset */
+	mmd->selector_change = -1; /* reset */
 	if (ret >= 0) {
 		mmd->selector_num = new;
 		return;
@@ -396,8 +401,8 @@ static void handle_sighup(void)
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
 	parse_config(1); /* reopens log */
-	mmd->dbt_change = mmd->selector_num; /* do not change selector */
-	handle_dbt_change(); /* reload selector */
+	mmd->selector_change = mmd->selector_num; /* do not change selector.. */
+	change_selector(); /* .. just reload */
 }
 
 static void status_refresh(void)
@@ -469,8 +474,8 @@ repeat:
 	err = errno;
 	//PARA_DEBUG_LOG("%s: select returned  %i\n", __func__, ret);
 	mmd_lock();
-	if (mmd->dbt_change >= 0)
-		handle_dbt_change();
+	if (mmd->selector_change >= 0)
+		change_selector();
 	if (dblist[mmd->selector_num].post_select)
 		dblist[mmd->selector_num].post_select(&rfds, &wfds);
 	if (ret < 0 && err == EINTR)