X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fraop.c;h=57de71fd880967bc7b3472d8698a4315d130aa1b;hb=fd7070e236b4cbca69e9bdf7152fef1429b6f8d0;hp=9ede243911c58bdd9876751085e63d136925a864;hpb=fda63ad40b874933e2342a1f2f3d6f4b642d12ff;p=deb_shairplay.git

diff --git a/src/lib/raop.c b/src/lib/raop.c
index 9ede243..57de71f 100644
--- a/src/lib/raop.c
+++ b/src/lib/raop.c
@@ -203,15 +203,17 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response)
 		data = http_request_get_data(request, &datalen);
 		if (data) {
 			sdp_t *sdp;
-			const char *remotestr, *fmtpstr, *aeskeystr, *aesivstr;
+			const char *remotestr, *rtpmapstr, *fmtpstr, *aeskeystr, *aesivstr;
 
 			sdp = sdp_init(data, datalen);
 			remotestr = sdp_get_connection(sdp);
+			rtpmapstr = sdp_get_rtpmap(sdp);
 			fmtpstr = sdp_get_fmtp(sdp);
 			aeskeystr = sdp_get_rsaaeskey(sdp);
 			aesivstr = sdp_get_aesiv(sdp);
 
 			logger_log(conn->raop->logger, LOGGER_DEBUG, "connection: %s", remotestr);
+			logger_log(conn->raop->logger, LOGGER_DEBUG, "rtpmap: %s", rtpmapstr);
 			logger_log(conn->raop->logger, LOGGER_DEBUG, "fmtp: %s", fmtpstr);
 			logger_log(conn->raop->logger, LOGGER_DEBUG, "rsaaeskey: %s", aeskeystr);
 			logger_log(conn->raop->logger, LOGGER_DEBUG, "aesiv: %s", aesivstr);
@@ -226,7 +228,10 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response)
 				raop_rtp_destroy(conn->raop_rtp);
 				conn->raop_rtp = NULL;
 			}
-			conn->raop_rtp = raop_rtp_init(raop->logger, &raop->callbacks, remotestr, fmtpstr, aeskey, aesiv);
+			conn->raop_rtp = raop_rtp_init(raop->logger, &raop->callbacks, remotestr, rtpmapstr, fmtpstr, aeskey, aesiv);
+			if (!conn->raop_rtp) {
+				logger_log(conn->raop->logger, LOGGER_ERR, "Error initializing the audio decoder");
+			}
 			sdp_destroy(sdp);
 		}
 	} else if (!strcmp(method, "SETUP")) {
@@ -264,7 +269,11 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response)
 			}
 			free(original);
 		}
-		raop_rtp_start(conn->raop_rtp, use_udp, remote_cport, remote_tport, &cport, &tport, &dport);
+		if (conn->raop_rtp) {
+			raop_rtp_start(conn->raop_rtp, use_udp, remote_cport, remote_tport, &cport, &tport, &dport);
+		} else {
+			logger_log(conn->raop->logger, LOGGER_CRIT, "RAOP not initialized at SETUP, playing will fail!");
+		}
 
 		memset(buffer, 0, sizeof(buffer));
 		if (use_udp) {
@@ -296,14 +305,24 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response)
 					sscanf(datastr+8, "%f", &vol);
 					raop_rtp_set_volume(conn->raop_rtp, vol);
 				}
+			} else if (!conn->raop_rtp) {
+				logger_log(conn->raop->logger, LOGGER_WARNING, "RAOP not initialized at SET_PARAMETER volume");
 			}
 			free(datastr);
 		} else if (!strcmp(content_type, "image/jpeg")) {
 			logger_log(conn->raop->logger, LOGGER_INFO, "Got image data of %d bytes", datalen);
-			raop_rtp_set_coverart(conn->raop_rtp, data, datalen);
+			if (conn->raop_rtp) {
+				raop_rtp_set_coverart(conn->raop_rtp, data, datalen);
+			} else {
+				logger_log(conn->raop->logger, LOGGER_WARNING, "RAOP not initialized at SET_PARAMETER coverart");
+			}
 		} else if (!strcmp(content_type, "application/x-dmap-tagged")) {
 			logger_log(conn->raop->logger, LOGGER_INFO, "Got metadata of %d bytes", datalen);
-			raop_rtp_set_metadata(conn->raop_rtp, data, datalen);
+			if (conn->raop_rtp) {
+				raop_rtp_set_metadata(conn->raop_rtp, data, datalen);
+			} else {
+				logger_log(conn->raop->logger, LOGGER_WARNING, "RAOP not initialized at SET_PARAMETER metadata");
+			}
 		}
 	} else if (!strcmp(method, "FLUSH")) {
 		const char *rtpinfo;
@@ -318,6 +337,8 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response)
 		}
 		if (conn->raop_rtp) {
 			raop_rtp_flush(conn->raop_rtp, next_seq);
+		} else {
+			logger_log(conn->raop->logger, LOGGER_WARNING, "RAOP not initialized at FLUSH");
 		}
 	} else if (!strcmp(method, "TEARDOWN")) {
 		http_response_add_header(res, "Connection", "close");
@@ -349,7 +370,7 @@ conn_destroy(void *ptr)
 }
 
 raop_t *
-raop_init(raop_callbacks_t *callbacks, const char *pemkey)
+raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey, int *error)
 {
 	raop_t *raop;
 	httpd_t *httpd;
@@ -357,6 +378,8 @@ raop_init(raop_callbacks_t *callbacks, const char *pemkey)
 	httpd_callbacks_t httpd_cbs;
 
 	assert(callbacks);
+	assert(max_clients > 0);
+	assert(max_clients < 100);
 	assert(pemkey);
 
 	/* Initialize the network */
@@ -388,7 +411,7 @@ raop_init(raop_callbacks_t *callbacks, const char *pemkey)
 	httpd_cbs.conn_destroy = &conn_destroy;
 
 	/* Initialize the http daemon */
-	httpd = httpd_init(raop->logger, &httpd_cbs, 10, 1);
+	httpd = httpd_init(raop->logger, &httpd_cbs, max_clients);
 	if (!httpd) {
 		free(raop);
 		return NULL;
@@ -412,7 +435,7 @@ raop_init(raop_callbacks_t *callbacks, const char *pemkey)
 }
 
 raop_t *
-raop_init_from_keyfile(raop_callbacks_t *callbacks, const char *keyfile)
+raop_init_from_keyfile(int max_clients, raop_callbacks_t *callbacks, const char *keyfile, int *error)
 {
 	raop_t *raop;
 	char *pemstr;
@@ -420,7 +443,7 @@ raop_init_from_keyfile(raop_callbacks_t *callbacks, const char *keyfile)
 	if (utils_read_file(&pemstr, keyfile) < 0) {
 		return NULL;
 	}
-	raop = raop_init(callbacks, pemstr);
+	raop = raop_init(max_clients, callbacks, pemstr, error);
 	free(pemstr);
 	return raop;
 }
@@ -458,11 +481,11 @@ raop_set_log_level(raop_t *raop, int level)
 }
 
 void
-raop_set_log_callback(raop_t *raop, raop_log_callback_t callback)
+raop_set_log_callback(raop_t *raop, raop_log_callback_t callback, void *cls)
 {
 	assert(raop);
 
-	logger_set_callback(raop->logger, callback);
+	logger_set_callback(raop->logger, callback, cls);
 }
 
 int