Changeset 92e717c in mainline

Timestamp:

2011-11-30T20:23:09Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23fe06c

Parents:

8fcf74f

Message:

Add nettest3 for more trivial testing. Netecho should use send() for stream sockets.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/netecho/netecho.c (modified) (1 diff)
• uspace/app/nettest3/Makefile (added)
• uspace/app/nettest3/nettest3.c (added)

boot/Makefile.common

@@ -175 +175 @@
         $(USPACE_PATH)/app/nettest1/nettest1 \
         $(USPACE_PATH)/app/nettest2/nettest2 \
+        $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
         $(USPACE_PATH)/app/ping/ping \

uspace/Makefile

@@ -64 +64 @@
         app/nettest1 \
         app/nettest2 \
+        app/nettest3 \
         app/ping \
         app/websrv \

uspace/app/netecho/netecho.c

@@ -297 +297 @@
 
                         /* 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) {
+                                rc = send(socket_id, reply ? reply : data, reply ? reply_length : length, 0);
+                                if (rc != EOK)
+                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
+                        } else {
+                                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");
+                        }
                 }