aboutsummaryrefslogtreecommitdiff
path: root/client.c
diff options
context:
space:
mode:
Diffstat (limited to 'client.c')
-rw-r--r--client.c182
1 files changed, 91 insertions, 91 deletions
diff --git a/client.c b/client.c
index f39f839..06adbb1 100644
--- a/client.c
+++ b/client.c
@@ -1,8 +1,3 @@
-
-/*
-** client.c -- a stream socket client demo
-*/
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -24,7 +19,9 @@
#define MAX_READ_SIZE 1024
#define LINE_MAX 1024
-void *reply_thread_routine(void *args);
+void *command_line_routine(void *args);
+
+int station_is_set = 0;
// get sockaddr, IPv4 or IPv6:
void *get_in_addr(struct sockaddr *sa)
@@ -45,7 +42,7 @@ int main(int argc, char *argv[])
char s[INET6_ADDRSTRLEN];
if (argc != 4) {
- fprintf(stderr, "usage: <server IP> <server port> <listener port>\n");
+ fprintf(stderr,"<server IP> <server port> <listener port>\n");
exit(1);
}
@@ -89,17 +86,7 @@ int main(int argc, char *argv[])
freeaddrinfo(servinfo); // all done with this structure
- pthread_t reply_thread;
- pthread_create(&reply_thread, NULL, reply_thread_routine, (void*)sockfd);
-
- usleep(100);
-
- struct timeval tv;
- tv.tv_sec = 0;
- tv.tv_usec = TIMEOUT;
- if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
- perror("setsockopt");
- }
+ apply_timeout(sockfd);
struct Hello hello;
hello.commandType = 0;
@@ -111,123 +98,95 @@ int main(int argc, char *argv[])
exit(1);
}
- // CONSIDER: could recieve the welcome message here
+ // recv the first byte of the message to get it's type
+ uint8_t reply_type = -1;
+ // print size of utin8
+ if (recv(sockfd, &reply_type, 1, 0) == -1) {
+ perror("recv");
+ exit(1);
+ }
+ // recv the message, check for errors too
+ int16_t num_stations = -1;
+ int bytes_to_read = sizeof(uint16_t);
+ if (recv_all(sockfd, &num_stations, &bytes_to_read) == -1) {
+ perror("recv_all");
+ exit(1);
+ }
- char input[LINE_MAX];
- while (1) {
- char *line = fgets(input, LINE_MAX, stdin);
+ remove_timeout(sockfd);
- if (line == NULL) {
- continue;
- } else if (strncmp("q\n", input, LINE_MAX) == 0) {
- // end code if type in q
- printf("Exiting.\n");
- break;
- } else {
- // convert input to an int
- int inputInt = atoi(input);
- // printf("Changing to station %d.\n", inputInt);
+ num_stations = ntohs(num_stations);
+ fflush(stdout);
+ printf("Welcome to Snowcast! The server has %d stations.\n", num_stations);
+ fflush(stdout);
+
+ pthread_t command_line_thread;
+ pthread_create(&command_line_thread, NULL, command_line_routine, (void*)sockfd);
- // send the command to change the station
- tv.tv_sec = 0;
- tv.tv_usec = TIMEOUT;
- if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
- perror("setsockopt");
- }
- struct SetStation setStation;
- setStation.commandType = 1;
- setStation.stationNumber = htons(inputInt);
- int bytes_to_send = sizeof(struct SetStation);
- if (send_all(sockfd, &setStation, &bytes_to_send) == -1) {
- perror("send_all");
- exit(1);
- }
- }
- }
- return 0;
-}
-void *reply_thread_routine(void* args) {
- int sockfd = (int)args;
+ // CONSIDER: could recieve the welcome message here
// int recvbytes;
while (1) {
// recv the first byte of the message to get it's type
- int reply_type;
+ uint8_t reply_type = -1;
// print size of utin8
if (recv(sockfd, &reply_type, 1, 0) == -1) {
perror("recv");
exit(1);
}
-
- fprintf(stderr, "reply_type: %d\n", reply_type);
if (reply_type == 2) { // we have a welcome message
- // recv the message, check for errors too
- uint16_t buf_num_stations;
- int bytes_to_read = sizeof(uint16_t);
- if (recv_all(sockfd, &buf_num_stations, &bytes_to_read) == -1) {
- perror("recv_all");
- exit(1);
- }
- uint16_t num_stations = ntohs(buf_num_stations);
- fprintf(stdout, "Welcome to Snowcast! The server has %u stations.\n", num_stations);
- fprintf(stderr, "Welcome to Snowcast! The server has %u stations.\n", num_stations);
- // printf("Click q to end stream.\n");
-
- struct timeval no_tv;
- no_tv.tv_sec = 0;
- no_tv.tv_usec = 0;
- if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &no_tv, sizeof(no_tv)) < 0) {
- perror("setsockopt");
- }
- continue;
+ close(sockfd);
+ exit(1);
}
if (reply_type == 3) { // we have an announce message
+ if (!station_is_set) {
+ fprintf(stderr, "ANNOUNCE received whem station not set.");
+ close(sockfd);
+ exit(1);
+ }
+
// get the string size
- int string_size;
- if (recv(sockfd, &string_size, 1, 0) == -1)
- {
+ u_int8_t string_size = -1;
+ if (recv(sockfd, &string_size, 1, 0) == -1) {
perror("recv");
exit(1);
}
-
char *song_name = malloc(string_size);
if(song_name == NULL) { perror("malloc in song name"); }
- if (recv_all(sockfd, song_name, &string_size) == -1) {
+ int bytes_to_read = string_size;
+ if (recv_all(sockfd, song_name, &bytes_to_read) == -1) {
perror("recv_all");
exit(1);
}
+ remove_timeout(sockfd);
+ // remove_timeout(sockfd);
+ fflush(stdout);
printf("New song announced: %s\n", song_name);
+ fflush(stdout);
free(song_name);
continue;
} else if (reply_type == 4) { // we have an invalid command message
// get the string size
- int string_size;
+ u_int8_t string_size = -1;
if (recv(sockfd, &string_size, 1, 0) == -1) {
perror("recv");
exit(1);
}
-
- printf("string size: %d\n", string_size);
-
char *message = malloc(string_size);
if(message == NULL) { perror("malloc in message"); }
- if (recv_all(sockfd, message, &string_size) == -1) {
+ int bytes_to_read = string_size;
+ if (recv_all(sockfd, message, &bytes_to_read) == -1) {
perror("recv_all");
exit(1);
}
- struct timeval no_tv;
- no_tv.tv_sec = 0;
- no_tv.tv_usec = 0;
- if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &no_tv, sizeof(no_tv)) < 0) {
- perror("setsockopt");
- }
+ fflush(stdout);
printf("Invalid protocol: %s. Exiting.\n", message);
- fprintf(stderr, "Invalid protocol: %s. Exiting.\n", message);
+ fflush(stdout);
free(message);
close(sockfd);
exit(1);
@@ -237,4 +196,45 @@ void *reply_thread_routine(void* args) {
close(sockfd);
exit(1);
}
+ return 0;
+}
+
+void *command_line_routine(void* args) {
+ int sockfd = (int) args;
+
+ char input[LINE_MAX];
+ printf("Enter a number to change to it's station. Click q to end stream.\n");
+ while (1) {
+ char *line = fgets(input, LINE_MAX, stdin);
+
+ if (line == NULL) {
+ continue;
+ } else if (strncmp("q\n", input, LINE_MAX) == 0) {
+ // end code if type in q
+ printf("Exiting.\n");
+ close(sockfd);
+ exit(0);
+ } else {
+ // convert input to an int
+ int inputInt = atoi(input);
+ // printf("Changing to station %d.\n", inputInt);
+
+ // send the command to change the station
+ apply_timeout(sockfd);
+ struct SetStation setStation;
+ setStation.commandType = 1;
+ setStation.stationNumber = htons(inputInt);
+ int bytes_to_send = sizeof(struct SetStation);
+ // apply_timeout(sockfd);
+ if (send_all(sockfd, &setStation, &bytes_to_send) == -1) {
+ perror("send_all");
+ exit(1);
+ }
+ if (!station_is_set) {
+ station_is_set = 1;
+ }
+ }
+ }
+
+ return (NULL);
} \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 05:20:06 +0000