Changeset cb569e6 in mainline for uspace/app/nettest1/nettest1.c

Timestamp:

2010-11-18T21:58:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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/nettest1/nettest1.c (modified) (3 diffs)

uspace/app/nettest1/nettest1.c

@@ -287 +287 @@
 int main(int argc, char *argv[])
 {
-
-        socklen_t max_length;
-        uint8_t *address_data[sizeof(struct sockaddr_in6)];
-        struct sockaddr_in *address_in;
-        struct sockaddr_in6 *address_in6;
+        struct sockaddr_in address_in;
+        struct sockaddr_in6 address_in6;
         uint8_t *address_start;
 
@@ -300 +297 @@
 
         int rc;
-
-        max_length = sizeof(address_data);
-        address = (struct sockaddr *) address_data;
-        address_in = (struct sockaddr_in *) address;
-        address_in6 = (struct sockaddr_in6 *) address;
 
         sockets = 10;
@@ -334 +326 @@
 
         /* 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);
-                address_start = (uint8_t *) &address_in->sin_addr.s_addr;
-                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);
+                address_start = (uint8_t *) &address_in.sin_addr.s_addr;
                 break;
         case PF_INET6:
-                address_in6->sin6_family = AF_INET6;
-                address_in6->sin6_port = htons(port);
-                address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
-                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);
+                address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr;
                 break;
         default: