Changes in uspace/app/netecho/netecho.c [c442f63:92b42442] in mainline

File:

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

uspace/app/netecho/netecho.c

@@ -225 +225 @@
         uint8_t address_buf[sizeof(struct sockaddr_in6)];
 
-        socklen_t addrlen = sizeof(struct sockaddr_in6);
+        socklen_t addrlen;
         int socket_id;
         ssize_t rcv_size;
@@ -240 +240 @@
         if (type == SOCK_STREAM) {
                 /* Accept a socket if a stream socket is used */
+                addrlen = sizeof(address_buf);
                 if (verbose)
                         printf("accept()\n");
-                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
+                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
                 if (socket_id <= 0) {
                         socket_print_error(stderr, socket_id, "Socket accept: ", "\n");
@@ -279 +280 @@
                                 case AF_INET6:
                                         port = ntohs(address_in6->sin6_port);
-                                        address_start = (uint8_t *) address_in6->sin6_addr.s6_addr;
+                                        address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
                                         break;
                                 default:
@@ -311 +312 @@
                                 rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen);
                                 if (rc != EOK)
-                                        socket_print_error(stderr, rc, "Socket sendto: ", "\n");
+                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
                         }
                 }
@@ -379 +380 @@
                 address_in6.sin6_family = AF_INET6;
                 address_in6.sin6_port = htons(port);
-                address_in6.sin6_addr = in6addr_any;
                 address = (struct sockaddr *) &address_in6;
                 addrlen = sizeof(address_in6);
@@ -394 +394 @@
                 return listening_id;
         }
-        
-        /* Bind the listening socket */
-        rc = bind(listening_id, address, addrlen);
-        if (rc != EOK) {
-                socket_print_error(stderr, rc, "Socket bind: ", "\n");
-                return rc;
-        }
-        
+
         /* if the stream socket is used */
         if (type == SOCK_STREAM) {
@@ -409 +402 @@
                         backlog = 3;
                 }
-                
+
                 /* Set the backlog */
                 rc = listen(listening_id, backlog);
@@ -416 +409 @@
                         return rc;
                 }
+        }
+
+        /* Bind the listening socket */
+        rc = bind(listening_id, address, addrlen);
+        if (rc != EOK) {
+                socket_print_error(stderr, rc, "Socket bind: ", "\n");
+                return rc;
         }