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);
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");
+ http_response_set_disconnect(res, 1);
+ }
sdp_destroy(sdp);
}
} else if (!strcmp(method, "SETUP")) {
}
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_ERR, "RAOP not initialized at SETUP, playing will fail!");
+ http_response_set_disconnect(res, 1);
+ }
memset(buffer, 0, sizeof(buffer));
if (use_udp) {
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;
}
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");
}
http_response_finish(res, NULL, 0);
- logger_log(conn->raop->logger, LOGGER_DEBUG, "Got request %s with URL %s", method, http_request_get_url(request));
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Handled request %s with URL %s", method, http_request_get_url(request));
*response = res;
}
}
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;
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;
}
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;
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;
}
}
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