X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fraop.c;h=10c2f12b687772a9d1ebc86fa9442723e144c4d2;hb=597bc69b0a31b9f1834911aeb34e389f28ea0ae7;hp=fd02edfebfdd1a1534dc3978be98071e089e0ee7;hpb=72fe063cf6771a3645d8cef0ae4426ad72b16917;p=deb_shairplay.git

diff --git a/src/lib/raop.c b/src/lib/raop.c
index fd02edf..10c2f12 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,7 @@ 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);
 			sdp_destroy(sdp);
 		}
 	} else if (!strcmp(method, "SETUP")) {
@@ -349,7 +351,7 @@ conn_destroy(void *ptr)
 }
 
 raop_t *
-raop_init(int max_clients, 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;
@@ -390,7 +392,7 @@ raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey)
 	httpd_cbs.conn_destroy = &conn_destroy;
 
 	/* Initialize the http daemon */
-	httpd = httpd_init(raop->logger, &httpd_cbs, max_clients, 1);
+	httpd = httpd_init(raop->logger, &httpd_cbs, max_clients);
 	if (!httpd) {
 		free(raop);
 		return NULL;
@@ -414,7 +416,7 @@ raop_init(int max_clients, raop_callbacks_t *callbacks, const char *pemkey)
 }
 
 raop_t *
-raop_init_from_keyfile(int max_clients, 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;
@@ -422,7 +424,7 @@ raop_init_from_keyfile(int max_clients, raop_callbacks_t *callbacks, const char
 	if (utils_read_file(&pemstr, keyfile) < 0) {
 		return NULL;
 	}
-	raop = raop_init(max_clients, callbacks, pemstr);
+	raop = raop_init(max_clients, callbacks, pemstr, error);
 	free(pemstr);
 	return raop;
 }
@@ -460,11 +462,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