@@ -47,7 +47,7 @@ void *receive(void *socketfd_void_p) {
4747 fprintf (stdout , "Successfully created and joined session %s.\n" , packet .data );
4848 insession = true;
4949 } else if (packet .type == QU_ACK ) {
50- fprintf (stdout , "Session #\tUser_ids \n%s" , packet .data );
50+ fprintf (stdout , "User id\t\tSession ids \n%s" , packet .data );
5151 } else if (packet .type == MESSAGE ){
5252 fprintf (stdout , "%s: %s\n" , packet .source , packet .data );
5353 } else {
@@ -112,7 +112,9 @@ void login(char *pch, int *socketfd_p, pthread_t *receive_thread_p) {
112112}
113113if (p == NULL ) {
114114fprintf (stderr , "client: failed to connect from addrinfo\n" );
115- return ;
115+ close (* socketfd_p );
116+ * socketfd_p = INVALID_SOCKET ;
117+ return ;
116118}
117119inet_ntop (p -> ai_family , get_in_addr ((struct sockaddr * )p -> ai_addr ), s , sizeof s );
118120printf ("client: connecting to %s\n" , s );
@@ -311,19 +313,19 @@ int main() {
311313 }
312314pch = strtok (buf , " " );
313315toklen = strlen (pch );
314- if (strncmp (pch , LOGIN_CMD , toklen ) == 0 ) {
316+ if (strcmp (pch , LOGIN_CMD ) == 0 ) {
315317login (pch , & socketfd , & receive_thread );
316- } else if (strncmp (pch , LOGOUT_CMD , toklen ) == 0 ) {
318+ } else if (strcmp (pch , LOGOUT_CMD ) == 0 ) {
317319logout (& socketfd , & receive_thread );
318- } else if (strncmp (pch , JOINSESSION_CMD , toklen ) == 0 ) {
320+ } else if (strcmp (pch , JOINSESSION_CMD ) == 0 ) {
319321joinsession (pch , & socketfd );
320- } else if (strncmp (pch , LEAVESESSION_CMD , toklen ) == 0 ) {
322+ } else if (strcmp (pch , LEAVESESSION_CMD ) == 0 ) {
321323leavesession (socketfd );
322- } else if (strncmp (pch , CREATESESSION_CMD , toklen ) == 0 ) {
324+ } else if (strcmp (pch , CREATESESSION_CMD ) == 0 ) {
323325createsession (socketfd );
324- } else if (strncmp (pch , LIST_CMD , toklen ) == 0 ) {
326+ } else if (strcmp (pch , LIST_CMD ) == 0 ) {
325327list (socketfd );
326- } else if (strncmp (pch , QUIT_CMD , toklen ) == 0 ) {
328+ } else if (strcmp (pch , QUIT_CMD ) == 0 ) {
327329logout (& socketfd , & receive_thread );
328330break ;
329331} else {
0 commit comments