conn_init(void *opaque, unsigned char *local, int locallen, unsigned char *remote, int remotelen)
{
raop_conn_t *conn;
- int i;
conn = calloc(1, sizeof(raop_conn_t));
if (!conn) {
conn->raop = opaque;
conn->raop_rtp = NULL;
- logger_log(&conn->raop->logger, LOGGER_INFO, "Local: ");
- for (i=0; i<locallen; i++) {
- logger_log(&conn->raop->logger, LOGGER_INFO, "%02x", local[i]);
+ if (locallen == 4) {
+ logger_log(&conn->raop->logger, LOGGER_INFO,
+ "Local: %d.%d.%d.%d\n",
+ local[0], local[1], local[2], local[3]);
+ } else if (locallen == 16) {
+ logger_log(&conn->raop->logger, LOGGER_INFO,
+ "Local: %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\n",
+ 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]);
}
- logger_log(&conn->raop->logger, LOGGER_INFO, "\n");
- logger_log(&conn->raop->logger, LOGGER_INFO, "Remote: ");
- for (i=0; i<remotelen; i++) {
- logger_log(&conn->raop->logger, LOGGER_INFO, "%02x", remote[i]);
+ if (remotelen == 4) {
+ logger_log(&conn->raop->logger, LOGGER_INFO,
+ "Remote: %d.%d.%d.%d\n",
+ remote[0], remote[1], remote[2], remote[3]);
+ } else if (remotelen == 16) {
+ logger_log(&conn->raop->logger, LOGGER_INFO,
+ "Remote: %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\n",
+ 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]);
}
- logger_log(&conn->raop->logger, LOGGER_INFO, "\n");
conn->local = malloc(locallen);
assert(conn->local);
memset(signature, 0, sizeof(signature));
rsakey_sign(raop->rsakey, signature, sizeof(signature), challenge,
conn->local, conn->locallen, raop->hwaddr, raop->hwaddrlen);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "Got signature: %s\n", signature);
http_response_add_header(res, "Apple-Response", signature);
+
+ logger_log(&conn->raop->logger, LOGGER_DEBUG, "Got challenge: %s\n", challenge);
+ logger_log(&conn->raop->logger, LOGGER_DEBUG, "Got response: %s\n", signature);
}
if (!strcmp(method, "OPTIONS")) {
http_response_add_header(res, "Public", "ANNOUNCE, SETUP, RECORD, PAUSE, FLUSH, TEARDOWN, OPTIONS, GET_PARAMETER, SET_PARAMETER");
data = http_request_get_data(request, &datalen);
if (data) {
- sdp_t *sdp = sdp_init(data, datalen);
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "rsaaeskey: %s\n", sdp_get_rsaaeskey(sdp));
- logger_log(&conn->raop->logger, LOGGER_DEBUG, "aesiv: %s\n", sdp_get_aesiv(sdp));
-
- aeskeylen = rsakey_decrypt(raop->rsakey, aeskey, sizeof(aeskey),
- sdp_get_rsaaeskey(sdp));
- aesivlen = rsakey_parseiv(raop->rsakey, aesiv, sizeof(aesiv),
- sdp_get_aesiv(sdp));
+ sdp_t *sdp;
+ const char *remotestr, *fmtpstr, *aeskeystr, *aesivstr;
+
+ sdp = sdp_init(data, datalen);
+ remotestr = sdp_get_connection(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\n", remotestr);
+ logger_log(&conn->raop->logger, LOGGER_DEBUG, "fmtp: %s\n", fmtpstr);
+ logger_log(&conn->raop->logger, LOGGER_DEBUG, "rsaaeskey: %s\n", aeskeystr);
+ logger_log(&conn->raop->logger, LOGGER_DEBUG, "aesiv: %s\n", 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\n", aeskeylen);
logger_log(&conn->raop->logger, LOGGER_DEBUG, "aesivlen: %d\n", aesivlen);
- conn->raop_rtp = raop_rtp_init(&raop->logger, &raop->callbacks, sdp_get_fmtp(sdp), aeskey, aesiv);
+ 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);
sdp_destroy(sdp);
}
} else if (!strcmp(method, "SETUP")) {
+ unsigned short remote_cport=0, remote_tport=0;
unsigned short cport=0, tport=0, dport=0;
const char *transport;
char buffer[1024];
logger_log(&conn->raop->logger, LOGGER_INFO, "Transport: %s\n", transport);
use_udp = strncmp(transport, "RTP/AVP/TCP", 11);
-
- /* FIXME: Should use the parsed ports for resend */
- raop_rtp_start(conn->raop_rtp, use_udp, 1234, 1234, &cport, &tport, &dport);
+ if (use_udp) {
+ char *original, *current, *tmpstr;
+
+ current = original = strdup(transport);
+ if (original) {
+ while ((tmpstr = utils_strsep(¤t, ";")) != NULL) {
+ unsigned short value;
+ int ret;
+
+ ret = sscanf(tmpstr, "control_port=%hu", &value);
+ if (ret == 1) {
+ logger_log(&conn->raop->logger, LOGGER_DEBUG, "Found remote control port: %hu\n", 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\n", value);
+ remote_tport = value;
+ }
+ }
+ }
+ free(original);
+ }
+ raop_rtp_start(conn->raop_rtp, use_udp, remote_cport, remote_tport, &cport, &tport, &dport);
memset(buffer, 0, sizeof(buffer));
if (use_udp) {
snprintf(buffer, sizeof(buffer)-1,
- "RTP/AVP/UDP;unicast;mode=record;timing_port=%u;events;control_port=%u;server_port=%u",
+ "RTP/AVP/UDP;unicast;mode=record;timing_port=%hu;events;control_port=%hu;server_port=%hu",
tport, cport, dport);
} else {
snprintf(buffer, sizeof(buffer)-1,
data = http_request_get_data(request, &datalen);
datastr = calloc(1, datalen+1);
- if (datastr) {
+ if (data && datastr && conn->raop_rtp) {
memcpy(datastr, data, datalen);
if (!strncmp(datastr, "volume: ", 8)) {
float vol = 0.0;
int next_seq = -1;
rtpinfo = http_request_get_header(request, "RTP-Info");
- assert(rtpinfo);
-
- logger_log(&conn->raop->logger, LOGGER_INFO, "RTP-Info: %s\n", rtpinfo);
- if (!strncmp(rtpinfo, "seq=", 4)) {
- next_seq = strtol(rtpinfo+4, NULL, 10);
+ if (rtpinfo) {
+ logger_log(&conn->raop->logger, LOGGER_INFO, "Flush with RTP-Info: %s\n", 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);
}
- raop_rtp_flush(conn->raop_rtp, next_seq);
} else if (!strcmp(method, "TEARDOWN")) {
http_response_add_header(res, "Connection", "close");
- raop_rtp_stop(conn->raop_rtp);
- raop_rtp_destroy(conn->raop_rtp);
- conn->raop_rtp = NULL;
+ if (conn->raop_rtp) {
+ /* Destroy our RTP session */
+ raop_rtp_stop(conn->raop_rtp);
+ raop_rtp_destroy(conn->raop_rtp);
+ conn->raop_rtp = NULL;
+ }
}
http_response_finish(res, NULL, 0);
raop_conn_t *conn = ptr;
if (conn->raop_rtp) {
+ /* This is done in case TEARDOWN was not called */
raop_rtp_destroy(conn->raop_rtp);
}
free(conn->local);
repositories / deb_shairplay.git / blobdiff