Changeset 25eec4e in mainline for uspace/app/netecho/netecho.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

uspace/app/netecho/netecho.c

@@ -243 +243 @@
                 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");
@@ -312 +312 @@
                                 rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen);
                                 if (rc != EOK)
-                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
+                                        socket_print_error(stderr, rc, "Socket sendto: ", "\n");
                         }
                 }
@@ -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) {
@@ -402 +409 @@
                         backlog = 3;
                 }
-
+                
                 /* Set the backlog */
                 rc = listen(listening_id, backlog);
@@ -409 +416 @@
                         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;
         }