Changeset 7aaed09 in mainline for uspace/app/netecho/netecho.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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) (3 diffs)

uspace/app/netecho/netecho.c

@@ -241 +241 @@
                 /* 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);
                 if (socket_id <= 0) {
@@ -258 +260 @@
 
                 /* Receive a message to echo */
+                if (verbose)
+                        printf("recvfrom()\n");
                 rcv_size = recvfrom(socket_id, data, size, 0, address,
                     &addrlen);
@@ -297 +301 @@
 
                         /* Answer the request either with the static reply or the original data */
-                        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");
+                        if (type == SOCK_STREAM) {
+                                if (verbose)
+                                        printf("send()\n");
+                                rc = send(socket_id, reply ? reply : data, reply ? reply_length : length, 0);
+                                if (rc != EOK)
+                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
+                        } else {
+                                if (verbose)
+                                        printf("sendto()\n");
+                                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");
+                        }
                 }