X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=8f20763fb44ed01327514b92837dceb8b0f66021;hb=f2a7b00cf72104a38733b7bf3add9fb19dd71c93;hp=69643208beea484ea067cac2f09b8ad1fe6c24f5;hpb=974c531493fb3c36243f266fb72e2cba561aafd6;p=paraslash.git

diff --git a/server.c b/server.c
index 69643208..8f20763f 100644
--- a/server.c
+++ b/server.c
@@ -57,12 +57,13 @@ 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[];
 
 /** the list of supported audio file selectors */
-struct audio_file_selector dblist[] = {
+struct audio_file_selector selectors[] = {
 	{
 		.name = "random",
 		.init = random_selector_init,
@@ -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;
@@ -284,12 +289,12 @@ static void init_selector(void)
 	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++) {
-		if (strcmp(dblist[i].name, conf.selector_arg))
+	for (i = 0; selectors[i].name; i++) {
+		if (strcmp(selectors[i].name, conf.selector_arg))
 			continue;
 		PARA_NOTICE_LOG("initializing %s audio file selector\n",
-			dblist[i].name);
-		ret = dblist[i].init(&dblist[i]);
+			selectors[i].name);
+		ret = selectors[i].init(&selectors[i]);
 		if (ret < 0) {
 			PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
 			break;
@@ -300,7 +305,7 @@ static void init_selector(void)
 	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
 	mmd->selector_num = 0;
-	dblist[0].init(&dblist[0]); /* always successful */
+	selectors[0].init(&selectors[0]); /* always successful */
 }
 
 static unsigned init_network(void)
@@ -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;
@@ -374,8 +379,8 @@ static void change_selector(void)
 {
 	int ret, old = mmd->selector_num, new = mmd->selector_change;
 
-	dblist[old].shutdown();
-	ret = dblist[new].init(&dblist[new]);
+	selectors[old].shutdown();
+	ret = selectors[new].init(&selectors[new]);
 	mmd->selector_change = -1; /* reset */
 	if (ret >= 0) {
 		mmd->selector_num = new;
@@ -383,7 +388,7 @@ static void change_selector(void)
 	}
 	/* init failed */
 	PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
-	dblist[0].init(&dblist[0]);
+	selectors[0].init(&selectors[0]);
 	mmd->selector_num = 0;
 }
 
@@ -459,8 +464,8 @@ repeat:
 			&max_fileno,
 			&rfds, &wfds);
 	}
-	if (dblist[mmd->selector_num].pre_select) {
-		ret = dblist[mmd->selector_num].pre_select(&rfds, &wfds);
+	if (selectors[mmd->selector_num].pre_select) {
+		ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
 		max_fileno = MAX(max_fileno, ret);
 	}
 	mmd_unlock();
@@ -471,8 +476,8 @@ repeat:
 	mmd_lock();
 	if (mmd->selector_change >= 0)
 		change_selector();
-	if (dblist[mmd->selector_num].post_select)
-		dblist[mmd->selector_num].post_select(&rfds, &wfds);
+	if (selectors[mmd->selector_num].post_select)
+		selectors[mmd->selector_num].post_select(&rfds, &wfds);
 	if (ret < 0 && err == EINTR)
 		goto repeat;
 	if (ret < 0) {
@@ -507,7 +512,7 @@ repeat:
 		case SIGTERM:
 			PARA_EMERG_LOG("terminating on signal %d\n", sig);
 			kill(0, SIGTERM);
-			dblist[mmd->selector_num].shutdown();
+			selectors[mmd->selector_num].shutdown();
 			mutex_destroy(mmd_mutex);
 			shm_detach(mmd);
 			shm_destroy(mmd_shm_id);