MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 16:53:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[airplay] Remove rs->session, not used any more

Browse Source
This commit is contained in:
ejurgensen 2021-01-09 00:32:30 +01:00
parent ef0f41dc46
commit 6b91c92bca
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/outputs/airplay.c
View File

@ -73,7 +73,7 @@
#define AIRPLAY_USE_STREAMID 0 #define AIRPLAY_USE_STREAMID 0
#define AIRPLAY_USE_PAIRING_TRANSIENT 1 #define AIRPLAY_USE_PAIRING_TRANSIENT 1
// Full traffic dumps in the log // Full traffic dumps in the log in debug mode
#define AIRPLAY_DUMP_TRAFFIC 1 #define AIRPLAY_DUMP_TRAFFIC 1
@ -249,7 +249,7 @@ struct airplay_session
int reqs_in_flight; int reqs_in_flight;
int cseq; int cseq;
char *session;
uint32_t session_id; uint32_t session_id;
char session_url[128]; char session_url[128];
char session_uuid[37]; char session_uuid[37];
@ -923,9 +923,6 @@ request_headers_add(struct evrtsp_request *req, struct airplay_session *rs, enum
snprintf(buf, sizeof(buf), "%" PRIu32, (uint32_t)rs->device_id); snprintf(buf, sizeof(buf), "%" PRIu32, (uint32_t)rs->device_id);
evrtsp_add_header(req->output_headers, "Active-Remote", buf); evrtsp_add_header(req->output_headers, "Active-Remote", buf);
if (rs->session)
evrtsp_add_header(req->output_headers, "Session", rs->session);
#if AIRPLAY_USE_STREAMID #if AIRPLAY_USE_STREAMID
evrtsp_add_header(req->output_headers, "X-Apple-StreamID", "1"); evrtsp_add_header(req->output_headers, "X-Apple-StreamID", "1");
#endif #endif
@ -1223,7 +1220,6 @@ session_free(struct airplay_session *rs)
free(rs->local_address); free(rs->local_address);
free(rs->realm); free(rs->realm);
free(rs->nonce); free(rs->nonce);
free(rs->session);
free(rs->address); free(rs->address);
free(rs->devname); free(rs->devname);
@ -3159,7 +3155,7 @@ start_retry(struct airplay_session *rs)
int callback_id = rs->callback_id; int callback_id = rs->callback_id;
device = outputs_device_get(rs->device_id); device = outputs_device_get(rs->device_id);
if (!device || !rs->session) if (!device)
{ {
session_failure(rs); session_failure(rs);
return; return;
@ -3251,7 +3247,7 @@ response_handler_setup_stream(struct evrtsp_request *req, struct airplay_session
goto error; goto error;
} }
DPRINTF(E_DBG, L_AIRPLAY, "Negotiated AirTunes v2 UDP streaming session %s; ports d=%u c=%u t=%u e=%u\n", rs->session, rs->data_port, rs->control_port, rs->timing_port, rs->events_port); DPRINTF(E_DBG, L_AIRPLAY, "Negotiated AirTunes v2 UDP streaming session; ports d=%u c=%u t=%u e=%u\n", rs->data_port, rs->control_port, rs->timing_port, rs->events_port);
rs->server_fd = device_connect(rs, rs->data_port, SOCK_DGRAM); rs->server_fd = device_connect(rs, rs->data_port, SOCK_DGRAM);
if (rs->server_fd < 0) if (rs->server_fd < 0)