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

Rename, rearrange and make more use of the AIRTUNES_V2_* #defines

Browse Source
This commit is contained in:
Julien BLACHE 2010-07-30 18:34:59 +02:00
parent 27b44dfe09
commit e106beb631
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/raop.c
View File

@ -66,13 +66,14 @@
# define MIN(a, b) ((a < b) ? a : b) # define MIN(a, b) ((a < b) ? a : b)
#endif #endif
#define AIRTUNES_V2_HEADER 12 #define AIRTUNES_V2_HDR_LEN 12
#define ALAC_HEADER 3 #define ALAC_HDR_LEN 3
#define AIRTUNES_V2_PKT_LEN (AIRTUNES_V2_HDR_LEN + ALAC_HDR_LEN + STOB(AIRTUNES_V2_PACKET_SAMPLES))
struct raop_v2_packet struct raop_v2_packet
{ {
uint8_t data[AIRTUNES_V2_HEADER + ALAC_HEADER + STOB(AIRTUNES_V2_PACKET_SAMPLES)]; uint8_t data[AIRTUNES_V2_PKT_LEN];
}; };
struct raop_session struct raop_session
@ -2260,7 +2261,7 @@ raop_v2_make_packet(struct raop_v2_packet *pkt, uint8_t *rawbuf, uint64_t rtptim
memset(pkt, 0, sizeof(struct raop_v2_packet)); memset(pkt, 0, sizeof(struct raop_v2_packet));
alac_encode(rawbuf, pkt->data + AIRTUNES_V2_HEADER, STOB(AIRTUNES_V2_PACKET_SAMPLES)); alac_encode(rawbuf, pkt->data + AIRTUNES_V2_HDR_LEN, STOB(AIRTUNES_V2_PACKET_SAMPLES));
stream_seq++; stream_seq++;
@ -2295,8 +2296,10 @@ raop_v2_make_packet(struct raop_v2_packet *pkt, uint8_t *rawbuf, uint64_t rtptim
return -1; return -1;
} }
/* Encrypt in place, in blocks of 16 bytes */ /* Encrypt in blocks of 16 bytes */
gc_err = gcry_cipher_encrypt(raop_aes_ctx, pkt->data + 12, ((sizeof(pkt->data) - 12) / 16) * 16, NULL, 0); gc_err = gcry_cipher_encrypt(raop_aes_ctx,
pkt->data + AIRTUNES_V2_HDR_LEN, ((AIRTUNES_V2_PKT_LEN - AIRTUNES_V2_HDR_LEN) / 16) * 16,
NULL, 0); /* Encrypt in place */
if (gc_err != GPG_ERR_NO_ERROR) if (gc_err != GPG_ERR_NO_ERROR)
{ {
gpg_strerror_r(gc_err, ebuf, sizeof(ebuf)); gpg_strerror_r(gc_err, ebuf, sizeof(ebuf));
@ -2337,14 +2340,14 @@ raop_v2_write(uint8_t *buf, uint64_t rtptime)
if (rs->state != RAOP_STREAMING) if (rs->state != RAOP_STREAMING)
continue; continue;
ret = send(rs->server_fd, pkt.data, sizeof(pkt.data), 0); ret = send(rs->server_fd, pkt.data, AIRTUNES_V2_PKT_LEN, 0);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_RAOP, "Send error for %s: %s\n", rs->devname, strerror(errno)); DPRINTF(E_LOG, L_RAOP, "Send error for %s: %s\n", rs->devname, strerror(errno));
raop_session_failure(rs); raop_session_failure(rs);
} }
else if (ret != sizeof(pkt.data)) else if (ret != AIRTUNES_V2_PKT_LEN)
DPRINTF(E_WARN, L_RAOP, "Partial send (%d) for %s\n", ret, rs->devname); DPRINTF(E_WARN, L_RAOP, "Partial send (%d) for %s\n", ret, rs->devname);
} }