X-Git-Url: https://git.piment-noir.org/?p=deb_shairplay.git;a=blobdiff_plain;f=src%2Flib%2Fraop.c;h=0c640b5bb67d85535607f078b148ce0dcb2f0358;hp=fc57feec22f74041159e2f3a1263ddd3e14ac831;hb=8c3f8f7a7c12c3dbd1da30dc37bab2797024c3b3;hpb=566c9bf8bfcc08b60c3cb9ae2edce8b516128203 diff --git a/src/lib/raop.c b/src/lib/raop.c index fc57fee..0c640b5 100644 --- a/src/lib/raop.c +++ b/src/lib/raop.c @@ -44,7 +44,7 @@ struct raop_s { raop_callbacks_t callbacks; /* Logger instance */ - logger_t logger; + logger_t *logger; /* HTTP daemon and RSA key */ httpd_t *httpd; @@ -85,21 +85,21 @@ conn_init(void *opaque, unsigned char *local, int locallen, unsigned char *remot 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]); @@ -123,6 +123,7 @@ conn_init(void *opaque, unsigned char *local, int locallen, unsigned char *remot 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; @@ -139,25 +140,29 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) } 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, "\""); @@ -167,8 +172,9 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) 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!"); } } @@ -184,8 +190,8 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) 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) { @@ -203,30 +209,36 @@ 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, "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")) { @@ -239,7 +251,7 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) 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; @@ -252,19 +264,24 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) 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) { @@ -276,38 +293,60 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) "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")) { + const char *content_type; const char *data; int datalen; - char *datastr; + content_type = http_request_get_header(request, "Content-Type"); data = http_request_get_data(request, &datalen); - datastr = calloc(1, datalen+1); - if (data && datastr && conn->raop_rtp) { - memcpy(datastr, data, datalen); - if (!strncmp(datastr, "volume: ", 8)) { - float vol = 0.0; - sscanf(datastr+8, "%f", &vol); - raop_rtp_set_volume(conn->raop_rtp, vol); + if (!strcmp(content_type, "text/parameters")) { + char *datastr; + datastr = calloc(1, datalen+1); + if (data && datastr && conn->raop_rtp) { + memcpy(datastr, data, datalen); + if (!strncmp(datastr, "volume: ", 8)) { + float vol = 0.0; + 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); + 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); + 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"); } } - free(datastr); } else if (!strcmp(method, "FLUSH")) { const char *rtpinfo; int next_seq = -1; 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"); @@ -320,7 +359,7 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) } 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; } @@ -339,7 +378,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; @@ -347,6 +386,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 */ @@ -355,8 +396,8 @@ raop_init(raop_callbacks_t *callbacks, const char *pemkey) } /* Validate the callbacks structure */ - if (!callbacks->audio_init || !callbacks->audio_set_volume || - !callbacks->audio_process || !callbacks->audio_flush || + if (!callbacks->audio_init || + !callbacks->audio_process || !callbacks->audio_destroy) { return NULL; } @@ -368,7 +409,7 @@ raop_init(raop_callbacks_t *callbacks, const char *pemkey) } /* Initialize the logger */ - logger_init(&raop->logger); + raop->logger = logger_init(); /* Set HTTP callbacks to our handlers */ memset(&httpd_cbs, 0, sizeof(httpd_cbs)); @@ -378,7 +419,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; @@ -402,7 +443,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; @@ -410,7 +451,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; } @@ -423,6 +464,7 @@ raop_destroy(raop_t *raop) httpd_destroy(raop->httpd); rsakey_destroy(raop->rsakey); + logger_destroy(raop->logger); free(raop); /* Cleanup the network */ @@ -438,6 +480,22 @@ raop_is_running(raop_t *raop) 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) {