Changeset 3f0a7971 in mainline for uspace/app/nettest2/nettest2.c

Timestamp:

2010-11-18T22:34:23Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63b4f90

Parents:

c7137738 (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

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:

• uspace/app/nettest2/nettest2.c (modified) (3 diffs)

uspace/app/nettest2/nettest2.c

@@ -223 +223 @@
 int main(int argc, char *argv[])
 {
-        socklen_t max_length;
-        uint8_t address_data[sizeof(struct sockaddr_in6)];
         struct sockaddr *address;
-        struct sockaddr_in *address_in;
-        struct sockaddr_in6 *address_in6;
+        struct sockaddr_in address_in;
+        struct sockaddr_in6 address_in6;
         socklen_t addrlen;
         uint8_t *address_start;
@@ -247 +245 @@
         port = 7;
 
-        max_length = sizeof(address_data);
-        address = (struct sockaddr *) address_data;
-        address_in = (struct sockaddr_in *) address;
-        address_in6 = (struct sockaddr_in6 *) address;
-
         /*
          * Parse the command line arguments.
@@ -279 +272 @@
 
         /* 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: