Index: uspace/app/klog/klog.c =================================================================== --- uspace/app/klog/klog.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/klog/klog.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -205,13 +205,6 @@ klog_length = size / sizeof(wchar_t); - klog = (wchar_t *) as_get_mappable_page(size); - if (klog == NULL) { - fprintf(stderr, "%s: Unable to allocate virtual memory area\n", - NAME); - return ENOMEM; - } - - rc = physmem_map((void *) faddr, (void *) klog, pages, - AS_AREA_READ | AS_AREA_CACHEABLE); + rc = physmem_map((void *) faddr, pages, + AS_AREA_READ | AS_AREA_CACHEABLE, (void *) &klog); if (rc != EOK) { fprintf(stderr, "%s: Unable to map klog\n", NAME); Index: uspace/app/mkbd/main.c =================================================================== --- uspace/app/mkbd/main.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/mkbd/main.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -48,4 +48,5 @@ #include #include +#include #include #include Index: uspace/app/netecho/netecho.c =================================================================== --- uspace/app/netecho/netecho.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/netecho/netecho.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -241,4 +241,6 @@ /* 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,4 +260,6 @@ /* Receive a message to echo */ + if (verbose) + printf("recvfrom()\n"); rcv_size = recvfrom(socket_id, data, size, 0, address, &addrlen); @@ -297,7 +301,17 @@ /* 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"); + } } Index: uspace/app/nettest3/Makefile =================================================================== --- uspace/app/nettest3/Makefile (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) +++ uspace/app/nettest3/Makefile (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2011 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = +EXTRA_CFLAGS = +BINARY = nettest3 + +SOURCES = \ + nettest3.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/nettest3/nettest3.c =================================================================== --- uspace/app/nettest3/nettest3.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) +++ uspace/app/nettest3/nettest3.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nettest + * @{ + */ + +/** @file + * Networking test 3. + */ + +#include +#include +#include + +#include +#include +#include +#include + +#define BUF_SIZE 32 + +static char *data; +static size_t size; + +static char buf[BUF_SIZE]; + +static struct sockaddr_in addr; + +static uint16_t port; + +int main(int argc, char *argv[]) +{ + int rc; + int fd; + char *endptr; + + port = 7; + + data = (char *)"Hello World!"; + size = str_size(data); + + /* Connect to local IP address by default */ + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(0x7f000001); + + if (argc >= 2) { + printf("parsing address '%s'\n", argv[1]); + rc = inet_pton(AF_INET, argv[1], (uint8_t *)&addr.sin_addr.s_addr); + if (rc != EOK) { + fprintf(stderr, "Error parsing address\n"); + return 1; + } + printf("result: rc=%d, family=%d, addr=%x\n", rc, + addr.sin_family, addr.sin_addr.s_addr); + } + + if (argc >= 3) { + printf("parsing port '%s'\n", argv[2]); + addr.sin_port = htons(strtoul(argv[2], &endptr, 10)); + if (*endptr != '\0') { + fprintf(stderr, "Error parsing port\n"); + return 1; + } + } + + printf("socket()\n"); + fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + printf(" -> %d\n", fd); + if (fd < 0) + return 1; + + printf("connect()\n"); + rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr)); + printf(" -> %d\n", rc); + if (rc != 0) + return 1; + + printf("send()\n"); + rc = send(fd, data, size, 0); + printf(" -> %d\n", rc); + if (rc < 0) + return 1; + + do { + printf("recv()\n"); + rc = recv(fd, buf, BUF_SIZE, 0); + printf(" -> %d\n", rc); + } while (rc > 0); + + async_usleep(1000*1000); + + printf("closesocket()\n"); + rc = closesocket(fd); + printf(" -> %d\n", rc); + + return 0; +} + + +/** @} + */ Index: uspace/app/tester/mm/common.c =================================================================== --- uspace/app/tester/mm/common.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/tester/mm/common.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -342,16 +342,9 @@ link_initialize(&area->link); - /* Map the memory area */ - void *addr = as_get_mappable_page(size); - if (addr == NULL) { + area->addr = as_area_create((void *) -1, size, + AS_AREA_WRITE | AS_AREA_READ); + if (area->addr == (void *) -1) { free(area); check_consistency("map_area (a)"); - return NULL; - } - - area->addr = as_area_create(addr, size, AS_AREA_WRITE | AS_AREA_READ); - if (area->addr == (void *) -1) { - free(area); - check_consistency("map_area (b)"); return NULL; } Index: uspace/app/tester/mm/mapping1.c =================================================================== --- uspace/app/tester/mm/mapping1.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/tester/mm/mapping1.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -35,15 +35,16 @@ #include "../tester.h" -#define BUFFER1_PAGES 4 -#define BUFFER2_PAGES 2 +#define BUFFER1_PAGES 4 +#define BUFFER2_PAGES 2 static void *create_as_area(size_t size) { - void *result = as_get_mappable_page(size); TPRINTF("Creating AS area...\n"); - if (as_area_create(result, size, - AS_AREA_READ | AS_AREA_WRITE) != result) { + + void *result = as_area_create((void *) -1, size, + AS_AREA_READ | AS_AREA_WRITE); + if (result == (void *) -1) return NULL; - } + return result; } @@ -71,5 +72,5 @@ int i; for (i = 0; i < page_count; i++) { - void *page_start = ((char *)area) + PAGE_SIZE * i; + void *page_start = ((char *) area) + PAGE_SIZE * i; int rc = as_get_physical_mapping(page_start, NULL); if (rc != expected_rc) { Index: uspace/app/trace/syscalls.c =================================================================== --- uspace/app/trace/syscalls.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/trace/syscalls.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -72,6 +72,6 @@ [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, - [SYS_REGISTER_IRQ] = { "register_irq", 4, V_ERRNO }, - [SYS_UNREGISTER_IRQ] = { "unregister_irq", 2, V_ERRNO }, + [SYS_IRQ_REGISTER] = { "irq_register", 4, V_ERRNO }, + [SYS_IRQ_UNREGISTER] = { "irq_unregister", 2, V_ERRNO }, [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type", 2, V_INTEGER }, Index: uspace/app/usbinfo/dev.c =================================================================== --- uspace/app/usbinfo/dev.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/usbinfo/dev.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -34,5 +34,6 @@ * Representation of queried device. */ -#include +#include +#include #include #include @@ -52,5 +53,8 @@ bool transfer_started = false; - rc = usb_device_connection_initialize(&dev->wire, hc_handle, dev_addr); + usb_hc_connection_initialize(&dev->hc_conn, hc_handle); + + rc = usb_device_connection_initialize( + &dev->wire, &dev->hc_conn, dev_addr); if (rc != EOK) { fprintf(stderr, Index: uspace/app/usbinfo/info.c =================================================================== --- uspace/app/usbinfo/info.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/usbinfo/info.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -287,4 +287,19 @@ void dump_strings(usbinfo_device_t *dev) { + /* Find used indexes. Devices with more than 64 strings are very rare.*/ + uint64_t str_mask = 0; + find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0, + &str_mask); + usb_dp_walk_simple(dev->full_configuration_descriptor, + dev->full_configuration_descriptor_size, + usb_dp_standard_descriptor_nesting, + find_string_indexes_callback, + &str_mask); + + if (str_mask == 0) { + printf("Device does not support string descriptors.\n"); + return; + } + /* Get supported languages. */ l18_win_locales_t *langs; @@ -305,15 +320,4 @@ } printf(".\n"); - - /* Find used indexes. Device with more than 64 strings are very rare. - */ - uint64_t str_mask = 0; - find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0, - &str_mask); - usb_dp_walk_simple(dev->full_configuration_descriptor, - dev->full_configuration_descriptor_size, - usb_dp_standard_descriptor_nesting, - find_string_indexes_callback, - &str_mask); /* Get all strings and dump them. */ Index: uspace/app/usbinfo/main.c =================================================================== --- uspace/app/usbinfo/main.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/usbinfo/main.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -44,4 +44,5 @@ #include #include +#include #include #include "usbinfo.h" Index: uspace/app/usbinfo/usbinfo.h =================================================================== --- uspace/app/usbinfo/usbinfo.h (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/usbinfo/usbinfo.h (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -44,6 +44,7 @@ typedef struct { + usb_hc_connection_t hc_conn; + usb_device_connection_t wire; usb_pipe_t ctrl_pipe; - usb_device_connection_t wire; usb_standard_device_descriptor_t device_descriptor; uint8_t *full_configuration_descriptor; Index: uspace/app/websrv/websrv.c =================================================================== --- uspace/app/websrv/websrv.c (revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289) +++ uspace/app/websrv/websrv.c (revision a84ddf0d5cc93090bf7aede743de7c8fb32c483a) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2010 Jiri Svoboda + * Copyright (c) 2011 Jiri Svoboda * All rights reserved. * @@ -31,8 +31,14 @@ */ /** - * @file (Less-than-skeleton) web server. + * @file Skeletal web server. */ +#include +#include #include +#include +#include +#include +#include #include @@ -44,13 +50,194 @@ #define PORT_NUMBER 8080 +#define WEB_ROOT "/data/web" + /** Buffer for receiving the request. */ #define BUFFER_SIZE 1024 -static char buf[BUFFER_SIZE]; +static char rbuf[BUFFER_SIZE]; +static size_t rbuf_out, rbuf_in; + +static char lbuf[BUFFER_SIZE + 1]; +static size_t lbuf_used; + +static char fbuf[BUFFER_SIZE]; /** Response to send to client. */ -static const char *response_msg = +static const char *ok_msg = "HTTP/1.0 200 OK\r\n" - "\r\n" - "

Hello from HelenOS!

\r\n"; + "\r\n"; + +/** Receive one character (with buffering) */ +static int recv_char(int fd, char *c) +{ + ssize_t rc; + + if (rbuf_out == rbuf_in) { + rbuf_out = 0; + rbuf_in = 0; + + rc = recv(fd, rbuf, BUFFER_SIZE, 0); + if (rc <= 0) { + printf("recv() failed (%zd)\n", rc); + return rc; + } + + rbuf_in = rc; + } + + *c = rbuf[rbuf_out++]; + return EOK; +} + +/** Receive one line with length limit. */ +static int recv_line(int fd) +{ + char c, prev; + int rc; + char *bp; + + bp = lbuf; c = '\0'; + while (bp < lbuf + BUFFER_SIZE) { + prev = c; + rc = recv_char(fd, &c); + if (rc != EOK) + return rc; + + *bp++ = c; + if (prev == '\r' && c == '\n') + break; + } + + lbuf_used = bp - lbuf; + *bp = '\0'; + + if (bp == lbuf + BUFFER_SIZE) + return ELIMIT; + + return EOK; +} + +static bool uri_is_valid(char *uri) +{ + char *cp; + char c; + + if (uri[0] != '/') + return false; + if (uri[1] == '.') + return false; + + cp = uri + 1; + while (*cp != '\0') { + c = *cp++; + if (c == '/') + return false; + } + + return true; +} + +static int send_response(int conn_sd, const char *msg) +{ + size_t response_size; + ssize_t rc; + + response_size = str_size(msg); + + /* Send a canned response. */ + printf("Send response...\n"); + rc = send(conn_sd, (void *) msg, response_size, 0); + if (rc < 0) { + printf("send() failed.\n"); + return rc; + } + + return EOK; +} + +static int uri_get(const char *uri, int conn_sd) +{ + int rc; + char *fname; + int fd; + ssize_t nr; + + if (str_cmp(uri, "/") == 0) + uri = "/index.htm"; + + rc = asprintf(&fname, "%s%s", WEB_ROOT, uri); + if (rc < 0) + return ENOMEM; + + fd = open(fname, O_RDONLY); + if (fd < 0) { + printf("File '%s' not found.\n", fname); + free(fname); + return ENOENT; + } + + free(fname); + + rc = send_response(conn_sd, ok_msg); + if (rc != EOK) + return rc; + + while (true) { + nr = read(fd, fbuf, BUFFER_SIZE); + if (nr == 0) + break; + + if (nr < 0) { + close(fd); + return EIO; + } + + rc = send(conn_sd, fbuf, nr, 0); + if (rc < 0) { + printf("send() failed\n"); + close(fd); + return rc; + } + } + + close(fd); + + return EOK; +} + +static int req_process(int conn_sd) +{ + int rc; + char *uri, *end_uri; + + rc = recv_line(conn_sd); + if (rc != EOK) { + printf("recv_line() failed\n"); + return rc; + } + + printf("%s", lbuf); + + if (str_lcmp(lbuf, "GET ", 4) != 0) { + printf("Invalid HTTP method.\n"); + return EINVAL; + } + + uri = lbuf + 4; + end_uri = str_chr(uri, ' '); + if (end_uri == NULL) { + end_uri = lbuf + lbuf_used - 2; + assert(*end_uri == '\r'); + } + + *end_uri = '\0'; + printf("Requested URI '%s'.\n", uri); + + if (!uri_is_valid(uri)) { + printf("Invalid request URI.\n"); + return EINVAL; + } + + return uri_get(uri, conn_sd); +} int main(int argc, char *argv[]) @@ -64,5 +251,4 @@ int rc; - size_t response_size; addr.sin_family = AF_INET; @@ -94,6 +280,4 @@ return 1; } - - response_size = str_size(response_msg); printf("Listening for connections at port number %u.\n", PORT_NUMBER); @@ -105,5 +289,5 @@ if (conn_sd < 0) { printf("accept() failed.\n"); - return 1; + continue; } @@ -111,23 +295,14 @@ printf("Wait for client request\n"); - - /* Really we should wait for a blank line. */ - rc = recv(conn_sd, buf, BUFFER_SIZE, 0); - if (rc < 0) { - printf("recv() failed\n"); - return 1; - } - - /* Send a canned response. */ - printf("Send response...\n"); - rc = send(conn_sd, (void *) response_msg, response_size, 0); - if (rc < 0) { - printf("send() failed.\n"); - return 1; - } + rbuf_out = rbuf_in = 0; + + rc = req_process(conn_sd); + if (rc != EOK) + printf("Error processing request.\n"); rc = closesocket(conn_sd); if (rc != EOK) { printf("Error closing connection socket: %d\n", rc); + closesocket(listen_sd); return 1; }