From 28d4aacf00d6b7389dd2440060541a623ec25f1d Mon Sep 17 00:00:00 2001 From: sotech117 Date: Sun, 24 Sep 2023 03:54:54 -0400 Subject: important small things --- client.c | 2 +- mp3/mgk/ChipOffTheBlock.mp3 | Bin 0 -> 6777187 bytes server.c | 10 +++++++--- snowcast_control | Bin 18808 -> 35245 bytes snowcast_listener | Bin 13656 -> 34270 bytes snowcast_server | Bin 37568 -> 71596 bytes 6 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 mp3/mgk/ChipOffTheBlock.mp3 diff --git a/client.c b/client.c index 6773c86..4ab7457 100644 --- a/client.c +++ b/client.c @@ -203,7 +203,7 @@ int main(int argc, char *argv[]) waiting = 0; remove_timeout(sockfd); fflush(stdout); - printf("This station has shut down. Please select different station.\n"); + printf("This station has shut down. Please select a different station.\n"); printf("snowcast_control> "); fflush(stdout); continue; diff --git a/mp3/mgk/ChipOffTheBlock.mp3 b/mp3/mgk/ChipOffTheBlock.mp3 new file mode 100644 index 0000000..351fc99 Binary files /dev/null and b/mp3/mgk/ChipOffTheBlock.mp3 differ diff --git a/server.c b/server.c index e6b4867..dd08599 100644 --- a/server.c +++ b/server.c @@ -807,8 +807,10 @@ void *send_stationsinfo_reply(void * arg) { if (l) printf("sending STATIONSINFO reply to socket %d\n", fd); uint8_t reply_size = 0; - for (int i = 0; i < num_stations; i++) - reply_size += snprintf(NULL, 0, "%d,%s\n", i, stations[i].filePath); + for (int i = 0; i < num_stations; i++) { + if (stations[i].readfd != -1) + reply_size += snprintf(NULL, 0, "%d,%s\n", i, stations[i].filePath); + } reply_size--; // don't want final \n // send type @@ -821,8 +823,10 @@ void *send_stationsinfo_reply(void * arg) { char send_buffer[reply_size]; int ptr = 0; - for (int i = 0; i < num_stations; i++) + for (int i = 0; i < num_stations; i++) { + if (stations[i].readfd != -1) ptr += sprintf(send_buffer + ptr, (i == num_stations - 1) ? "%d,%s" : "%d,%s\n", i, stations[i].filePath); + } int bytes_to_send = reply_size; // don't want final \n if (send_all(fd, &send_buffer, &bytes_to_send) == -1) diff --git a/snowcast_control b/snowcast_control index 5cab9dd..163b0f5 100755 Binary files a/snowcast_control and b/snowcast_control differ diff --git a/snowcast_listener b/snowcast_listener index f27a5c1..d15c2ac 100755 Binary files a/snowcast_listener and b/snowcast_listener differ diff --git a/snowcast_server b/snowcast_server index e217218..0f39e68 100755 Binary files a/snowcast_server and b/snowcast_server differ -- cgit v1.2.3-70-g09d2