Changeset dd0c8a0 in mainline for uspace/app/netecho/netecho.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/app/netecho/netecho.c

@@ -225 +225 @@
         uint8_t address_buf[sizeof(struct sockaddr_in6)];
 
-        socklen_t addrlen;
+        socklen_t addrlen = sizeof(struct sockaddr_in6);
         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");
@@ -280 +279 @@
                                 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:
@@ -380 +379 @@
                 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);