raop_callbacks_t callbacks;
/* Logger instance */
- logger_t logger;
+ logger_t *logger;
/* HTTP daemon and RSA key */
httpd_t *httpd;
conn->raop_rtp = NULL;
if (locallen == 4) {
- logger_log(&conn->raop->logger, LOGGER_INFO,
+ logger_log(conn->raop->logger, LOGGER_INFO,
"Local: %d.%d.%d.%d",
local[0], local[1], local[2], local[3]);
} else if (locallen == 16) {
- logger_log(&conn->raop->logger, LOGGER_INFO,
+ logger_log(conn->raop->logger, LOGGER_INFO,
"Local: %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
local[0], local[1], local[2], local[3], local[4], local[5], local[6], local[7],
local[8], local[9], local[10], local[11], local[12], local[13], local[14], local[15]);
}
if (remotelen == 4) {
- logger_log(&conn->raop->logger, LOGGER_INFO,
+ logger_log(conn->raop->logger, LOGGER_INFO,
"Remote: %d.%d.%d.%d",
remote[0], remote[1], remote[2], remote[3]);
} else if (remotelen == 16) {
- logger_log(&conn->raop->logger, LOGGER_INFO,
+ logger_log(conn->raop->logger, LOGGER_INFO,
"Remote: %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
remote[0], remote[1], remote[2], remote[3], remote[4], remote[5], remote[6], remote[7],
remote[8], remote[9], remote[10], remote[11], remote[12], remote[13], remote[14], remote[15]);
static void
conn_request(void *ptr, http_request_t *request, http_response_t **response)
{
+ const char realm[] = "airplay";
raop_conn_t *conn = ptr;
raop_t *raop = conn->raop;
}
res = http_response_init("RTSP/1.0", 200, "OK");
- if (strlen(raop->password)) {
+
+ /* We need authorization for everything else than OPTIONS request */
+ if (strcmp(method, "OPTIONS") != 0 && strlen(raop->password)) {
const char *authorization;
authorization = http_request_get_header(request, "Authorization");
if (authorization) {
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Our nonce: %s", conn->nonce);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Authorization: %s", authorization);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Our nonce: %s", conn->nonce);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Authorization: %s", authorization);
}
- if (!digest_is_valid("AppleTV", raop->password, conn->nonce, method, http_request_get_url(request), authorization)) {
+ if (!digest_is_valid(realm, raop->password, conn->nonce, method, http_request_get_url(request), authorization)) {
char *authstr;
int authstrlen;
/* Allocate the authenticate string */
- authstrlen = sizeof("Digest realm=\"AppleTV\", nonce=\"\"") + sizeof(conn->nonce) + 1;
+ authstrlen = sizeof("Digest realm=\"\", nonce=\"\"") + sizeof(realm) + sizeof(conn->nonce) + 1;
authstr = malloc(authstrlen);
/* Concatenate the authenticate string */
memset(authstr, 0, authstrlen);
- strcat(authstr, "Digest realm=\"AppleTV\", nonce=\"");
+ strcat(authstr, "Digest realm=\"");
+ strcat(authstr, realm);
+ strcat(authstr, "\", nonce=\"");
strcat(authstr, conn->nonce);
strcat(authstr, "\"");
res = http_response_init("RTSP/1.0", 401, "Unauthorized");
http_response_add_header(res, "WWW-Authenticate", authstr);
free(authstr);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Authentication unsuccessful, sending Unauthorized");
} else {
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "AUTHENTICATION SUCCESS!");
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Authentication successful!");
}
}
conn->local, conn->locallen, raop->hwaddr, raop->hwaddrlen);
http_response_add_header(res, "Apple-Response", signature);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Got challenge: %s", challenge);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Got response: %s", signature);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Got challenge: %s", challenge);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Got response: %s", signature);
}
if (require_auth) {
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, "fmtp: %s", fmtpstr);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "rsaaeskey: %s", aeskeystr);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "aesiv: %s", aesivstr);
+ 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);
aeskeylen = rsakey_decrypt(raop->rsakey, aeskey, sizeof(aeskey), aeskeystr);
aesivlen = rsakey_parseiv(raop->rsakey, aesiv, sizeof(aesiv), aesivstr);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "aeskeylen: %d", aeskeylen);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "aesivlen: %d", aesivlen);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "aeskeylen: %d", aeskeylen);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "aesivlen: %d", aesivlen);
if (conn->raop_rtp) {
/* This should never happen */
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")) {
transport = http_request_get_header(request, "Transport");
assert(transport);
- logger_log(&conn->raop->logger, LOGGER_INFO, "Transport: %s", transport);
+ logger_log(conn->raop->logger, LOGGER_INFO, "Transport: %s", transport);
use_udp = strncmp(transport, "RTP/AVP/TCP", 11);
if (use_udp) {
char *original, *current, *tmpstr;
ret = sscanf(tmpstr, "control_port=%hu", &value);
if (ret == 1) {
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Found remote control port: %hu", value);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Found remote control port: %hu", value);
remote_cport = value;
}
ret = sscanf(tmpstr, "timing_port=%hu", &value);
if (ret == 1) {
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Found remote timing port: %hu", value);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Found remote timing port: %hu", value);
remote_tport = value;
}
}
}
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) {
"RTP/AVP/TCP;unicast;interleaved=0-1;mode=record;server_port=%u",
dport);
}
- logger_log(&conn->raop->logger, LOGGER_INFO, "Responding with %s", buffer);
+ logger_log(conn->raop->logger, LOGGER_INFO, "Responding with %s", buffer);
http_response_add_header(res, "Transport", buffer);
http_response_add_header(res, "Session", "DEADBEEF");
} else if (!strcmp(method, "SET_PARAMETER")) {
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);
+ logger_log(conn->raop->logger, LOGGER_INFO, "Got image data of %d bytes", 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);
+ logger_log(conn->raop->logger, LOGGER_INFO, "Got metadata of %d bytes", 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;
rtpinfo = http_request_get_header(request, "RTP-Info");
if (rtpinfo) {
- logger_log(&conn->raop->logger, LOGGER_INFO, "Flush with RTP-Info: %s", rtpinfo);
+ logger_log(conn->raop->logger, LOGGER_INFO, "Flush with RTP-Info: %s", rtpinfo);
if (!strncmp(rtpinfo, "seq=", 4)) {
next_seq = strtol(rtpinfo+4, NULL, 10);
}
}
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(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_callbacks_t httpd_cbs;
assert(callbacks);
+ assert(max_clients > 0);
+ assert(max_clients < 100);
assert(pemkey);
/* Initialize the network */
}
/* Initialize the logger */
- logger_init(&raop->logger);
+ raop->logger = logger_init();
/* Set HTTP callbacks to our handlers */
memset(&httpd_cbs, 0, sizeof(httpd_cbs));
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;
}
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;
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;
}
httpd_destroy(raop->httpd);
rsakey_destroy(raop->rsakey);
+ logger_destroy(raop->logger);
free(raop);
/* Cleanup the network */
return httpd_is_running(raop->httpd);
}
+void
+raop_set_log_level(raop_t *raop, int level)
+{
+ assert(raop);
+
+ logger_set_level(raop->logger, level);
+}
+
+void
+raop_set_log_callback(raop_t *raop, raop_log_callback_t callback, void *cls)
+{
+ assert(raop);
+
+ logger_set_callback(raop->logger, callback, cls);
+}
+
int
raop_start(raop_t *raop, unsigned short *port, const char *hwaddr, int hwaddrlen, const char *password)
{
repositories / deb_shairplay.git / blobdiff