Send shutdown message on closing connection

Author: coditva

include/core.h

@@ -19,4 +19,6 @@ conn_t connection;
 void    handshake_init      ();
 void    handshake_terminate ();
 
+void    connection_close    ();
+
 #endif /* end of include guard: CORE_H_7KCLGLUV */

progs/client.c

@@ -60,11 +60,14 @@ int main(int argc, char *argv[])
 
         size = 0;
         size = getline(&line, &size, stdin);
+        if (size == 1) break;
         *(line + size - 1) = '\0';
         udt_send(sock, line, size, 0);
         free(line);
     }
 
+    printf("Disconnected\n");
+
     /* close the connection */
     udt_close(sock);
     return 0;

progs/server.c

@@ -80,6 +80,8 @@ int main(int argc, char *argv[])
         printf("Res: %s\n", msg);
     }
 
+    printf("\nClient disconnected\n");
+
     /* close connection */
     if (udt_close(sock) == -1) {
         fprintf(stderr, "Could not close socket\n");

src/api.c

@@ -1,9 +1,5 @@
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
-#include <errno.h>
 #include <unistd.h>
-#include <string.h>
 
 #include "udt.h"
 #include "core.h"
@@ -38,7 +34,7 @@ int udt_bind (socket_t sock, sockaddr_t *addr, int len)
     if (result == -1) return result;
 
     connection.sock = sock;
-    connection.is_open = 0;
+    connection.is_open = 1;
     connection.addrlen = len;
     connection.is_connected = 0;
     connection.is_client = 0;
@@ -87,6 +83,9 @@ int udt_recv(socket_t sock, char *buffer, int len, int flags)
     int num_read;
 
     do {
+        if (connection.is_open == 0 && connection.is_connected == 0)
+            return 0;
+
         num_read = recv_buffer_read(buffer, len);
     } while (num_read == 0);
 
@@ -101,5 +100,7 @@ int udt_send(socket_t sock, char *buffer, int len, int flags)
 
 int udt_close(socket_t sock)
 {
+    connection_close();
+    while (connection.is_open);
     return close(sock);
 }

src/core.c

@@ -16,3 +16,15 @@ void handshake_terminate()
 {
     connection.is_connected = 1;
 }
+
+void connection_close()
+{
+    packet_t packet;
+
+    packet_clear_header (packet);
+    packet_set_ctrl     (packet);
+    packet_set_type     (packet, PACKET_TYPE_SHUTDOWN);
+
+    packet_new(&packet, NULL, 0);
+    send_packet_buffer_write(&packet);
+}

src/packet.c

@@ -1,13 +1,13 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "config.h"
 #include "packet.h"
 #include "buffer.h"
 #include "core.h"
 
+extern conn_t connection;
 
 void packet_deserialize(packet_t *packet)
 {
@@ -98,6 +98,8 @@ void packet_parse(packet_t packet)
             break;
 
         case PACKET_TYPE_SHUTDOWN:              /* shutdown */
+            connection.is_open = 0;
+            connection.is_connected = 0;
             break;
 
         case PACKET_TYPE_ACK2:                  /* ack of ack */
@@ -110,9 +112,7 @@ void packet_parse(packet_t packet)
             break;
 
         default:                                /* unsupported packet type */
-            printf("Unknown type: %x\n", packet_get_type(packet));
-            char msg[] = "Unknown packet";
-            recv_buffer_write(msg, sizeof(msg));
+            recv_buffer_write("Unknown message", 16);
 
         }
     } else {                                            /* data packet */

src/sender.c

@@ -1,10 +1,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <stdio.h>
 
 #include "core.h"
 #include "sender.h"
 #include "buffer.h"
+#include "packet.h"
 
 void sender_start (void *arg)
 {
@@ -16,6 +18,11 @@ void sender_start (void *arg)
             if (sendto(conn -> sock, &packet, sizeof(packet_t), 0,
                        &(conn -> addr), sizeof(sockaddr_t)) <= 0)
                 exit(errno);
+
+            /* shutdown message */
+            if (packet.header._head0 == 1408)
+                conn -> is_open = 0;
+
             memset(&packet, 0, sizeof(packet_t));
         }
     }