Changeset f57aebc in mainline

Timestamp:

2010-12-25T22:40:18Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3750c06, 58fe0aa

Parents:

bfe6366

Message:

Address buffers cleanup.

File:

• uspace/app/netecho/netecho.c (modified) (9 diffs)

uspace/app/netecho/netecho.c

@@ -38 +38 @@
  */
 
-#include <malloc.h>
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -221 +221 @@
  * @return              EOK on success or negative error code.
  */
-static int netecho_socket_echo_message(int listening_id)
+static int netecho_socket_process_message(int listening_id)
 {
-        socklen_t max_length = sizeof(struct sockaddr_in6);
-        uint8_t address_data[max_length];
-        struct sockaddr *address = (struct sockaddr *) address_data;
+        uint8_t address_buf[sizeof(struct sockaddr_in6)];
+
         socklen_t addrlen;
         int socket_id;
@@ -231 +230 @@
         size_t length;
         uint8_t *address_start;
-        struct sockaddr_in *address_in = (struct sockaddr_in *) address;
-        struct sockaddr_in6 *address_in6 = (struct sockaddr_in6 *) address;
+
         char address_string[INET6_ADDRSTRLEN];
+        struct sockaddr_in *address_in = (struct sockaddr_in *) address_buf;
+        struct sockaddr_in6 *address_in6 = (struct sockaddr_in6 *) address_buf;
+        struct sockaddr *address = (struct sockaddr *) address_buf;
+
         int rc;
 
-        addrlen = (socklen_t) max_length;
         if (type == SOCK_STREAM) {
-                /* Accept a socket if the stream socket is used */
-                socket_id = accept(listening_id, address, &addrlen);
+                /* Accept a socket if a stream socket is used */
+                addrlen = sizeof(address_buf);
+                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
                 if (socket_id <= 0) {
                         socket_print_error(stderr, socket_id, "Socket accept: ", "\n");
@@ -246 +248 @@
                                 printf("Socket %d accepted\n", socket_id);
                 }
+
+                assert((size_t) addrlen <= sizeof(address_buf));
         } else {
                 socket_id = listening_id;
@@ -254 +258 @@
 
                 /* Receive a message to echo */
-                rcv_size = recvfrom(socket_id, data, size, 0, address, &addrlen);
+                rcv_size = recvfrom(socket_id, data, size, 0, address,
+                    &addrlen);
                 if (rcv_size < 0) {
                         socket_print_error(stderr, rcv_size, "Socket receive: ", "\n");
@@ -312 +317 @@
 int main(int argc, char *argv[])
 {
-        socklen_t max_length = sizeof(struct sockaddr_in6);
-        uint8_t address_data[max_length];
-        struct sockaddr *address = (struct sockaddr *) address_data;
-        struct sockaddr_in *address_in = (struct sockaddr_in *) address;
-        struct sockaddr_in6 *address_in6 = (struct sockaddr_in6 *) address;
+        struct sockaddr *address;;
+        struct sockaddr_in address_in;
+        struct sockaddr_in6 address_in6;
         socklen_t addrlen;
+
         int listening_id;
         int index;
@@ -351 +355 @@
 
         /* Prepare the address buffer */
-        bzero(address_data, max_length);
         switch (family) {
         case PF_INET:
-                address_in->sin_family = AF_INET;
-                address_in->sin_port = htons(port);
-                addrlen = sizeof(struct sockaddr_in);
+                address_in.sin_family = AF_INET;
+                address_in.sin_port = htons(port);
+                address = (struct sockaddr *) &address_in;
+                addrlen = sizeof(address_in);
                 break;
         case PF_INET6:
-                address_in6->sin6_family = AF_INET6;
-                address_in6->sin6_port = htons(port);
-                addrlen = sizeof(struct sockaddr_in6);
+                address_in6.sin6_family = AF_INET6;
+                address_in6.sin6_port = htons(port);
+                address = (struct sockaddr *) &address_in6;
+                addrlen = sizeof(address_in6);
                 break;
         default:
@@ -406 +411 @@
          */
         while (count) {
-                rc = netecho_socket_echo_message(listening_id);
+                rc = netecho_socket_process_message(listening_id);
                 if (rc != EOK)
                         break;
@@ -414 +419 @@
                         count--;
                         if (verbose)
-                                printf("Waiting for next %d packet(s)\n", count);
+                                printf("Waiting for next %d message(s)\n", count);
                 }
         }