Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 8bf672df361c98c8f5273d51034e67574914aaf3) +++ uspace/Makefile (revision 66a272f8152364aeee740191008e54027a905445) @@ -79,4 +79,5 @@ srv/taskmon \ srv/tcp \ + srv/udp \ srv/vfs \ srv/bd/ata_bd \ Index: uspace/srv/tcp/pdu.c =================================================================== --- uspace/srv/tcp/pdu.c (revision 8bf672df361c98c8f5273d51034e67574914aaf3) +++ uspace/srv/tcp/pdu.c (revision 66a272f8152364aeee740191008e54027a905445) @@ -255,5 +255,5 @@ } -/** Encode outgoing PDU */ +/** Decode incoming PDU */ int tcp_pdu_decode(tcp_pdu_t *pdu, tcp_sockpair_t *sp, tcp_segment_t **seg) { @@ -279,5 +279,5 @@ } -/** Decode incoming PDU */ +/** Encode outgoing PDU */ int tcp_pdu_encode(tcp_sockpair_t *sp, tcp_segment_t *seg, tcp_pdu_t **pdu) { Index: uspace/srv/udp/Makefile =================================================================== --- uspace/srv/udp/Makefile (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/Makefile (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2012 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 = $(LIBNET_PREFIX)/libnet.a +EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include +BINARY = udp + +SOURCES = \ + msg.c \ + sock.c \ + pdu.c \ + udp.c \ + udp_inet.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/udp/msg.c =================================================================== --- uspace/srv/udp/msg.c (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/msg.c (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ + +/** + * @file UDP message + */ + +#include +#include + +#include "msg.h" +#include "udp_type.h" + +/** Alocate new segment structure. */ +udp_msg_t *udp_msg_new(void) +{ + return calloc(1, sizeof(udp_msg_t)); +} + +/** Delete segment. */ +void udp_msg_delete(udp_msg_t *msg) +{ + free(msg); +} + +/** + * @} + */ Index: uspace/srv/udp/msg.h =================================================================== --- uspace/srv/udp/msg.h (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/msg.h (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ +/** @file UDP message + */ + +#ifndef MSG_H +#define MSG_H + +#include "udp_type.h" + +extern udp_msg_t *udp_msg_new(void); +extern void udp_msg_delete(udp_msg_t *); + +#endif + +/** @} + */ Index: uspace/srv/udp/pdu.c =================================================================== --- uspace/srv/udp/pdu.c (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/pdu.c (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,210 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ + +/** + * @file UDP PDU encoding and decoding + */ + +#include +#include +#include +#include +#include + +#include "msg.h" +#include "pdu.h" +#include "std.h" +#include "udp_type.h" + +#define UDP_CHECKSUM_INIT 0xffff + +/** One's complement addition. + * + * Result is a + b + carry. + */ +static uint16_t udp_ocadd16(uint16_t a, uint16_t b) +{ + uint32_t s; + + s = (uint32_t)a + (uint32_t)b; + return (s & 0xffff) + (s >> 16); +} + +static uint16_t udp_checksum_calc(uint16_t ivalue, void *data, size_t size) +{ + uint16_t sum; + uint16_t w; + size_t words, i; + uint8_t *bdata; + + sum = ~ivalue; + words = size / 2; + bdata = (uint8_t *)data; + + for (i = 0; i < words; i++) { + w = ((uint16_t)bdata[2*i] << 8) | bdata[2*i + 1]; + sum = udp_ocadd16(sum, w); + } + + if (size % 2 != 0) { + w = ((uint16_t)bdata[2*words] << 8); + sum = udp_ocadd16(sum, w); + } + + return ~sum; +} + +static void udp_phdr_setup(udp_pdu_t *pdu, udp_phdr_t *phdr) +{ + phdr->src_addr = host2uint32_t_be(pdu->src.ipv4); + phdr->dest_addr = host2uint32_t_be(pdu->dest.ipv4); + phdr->zero = 0; + phdr->protocol = IP_PROTO_UDP; + phdr->udp_length = host2uint16_t_be(pdu->data_size); +} + +static udp_pdu_t *udp_pdu_new(void) +{ + return calloc(1, sizeof(udp_pdu_t)); +} + +void udp_pdu_delete(udp_pdu_t *pdu) +{ + free(pdu->data); + free(pdu); +} + +static uint16_t udp_pdu_checksum_calc(udp_pdu_t *pdu) +{ + uint16_t cs_phdr; + uint16_t cs_all; + udp_phdr_t phdr; + + udp_phdr_setup(pdu, &phdr); + cs_phdr = udp_checksum_calc(UDP_CHECKSUM_INIT, (void *)&phdr, + sizeof(udp_phdr_t)); + cs_all = udp_checksum_calc(cs_phdr, pdu->data, pdu->data_size); + + return cs_all; +} + +static void udp_pdu_set_checksum(udp_pdu_t *pdu, uint16_t checksum) +{ + udp_header_t *hdr; + + hdr = (udp_header_t *)pdu->data; + hdr->checksum = host2uint16_t_be(checksum); +} + +/** Decode incoming PDU */ +int udp_pdu_decode(udp_pdu_t *pdu, udp_sockpair_t *sp, udp_msg_t **msg) +{ + udp_msg_t *nmsg; + udp_header_t *hdr; + void *text; + size_t text_size; + uint16_t length; + uint16_t checksum; + + if (pdu->data_size < sizeof(udp_header_t)) + return EINVAL; + + text = pdu->data + sizeof(udp_header_t); + text_size = pdu->data_size - sizeof(udp_header_t); + + hdr = (udp_header_t *)pdu->data; + + sp->foreign.port = uint16_t_be2host(hdr->src_port); + sp->foreign.addr = pdu->src; + sp->local.port = uint16_t_be2host(hdr->dest_port); + sp->local.addr = pdu->dest; + + length = uint16_t_be2host(hdr->length); + checksum = uint16_t_be2host(hdr->checksum); + (void) checksum; + + if (length < sizeof(udp_header_t) || + length > sizeof(udp_header_t) + text_size) + return EINVAL; + + nmsg = udp_msg_new(); + if (nmsg == NULL) + return ENOMEM; + + nmsg->data = text; + nmsg->data_size = length - sizeof(udp_header_t); + + *msg = nmsg; + return EOK; +} + +/** Encode outgoing PDU */ +int udp_pdu_encode(udp_sockpair_t *sp, udp_msg_t *msg, udp_pdu_t **pdu) +{ + udp_pdu_t *npdu; + udp_header_t *hdr; + uint16_t checksum; + + npdu = udp_pdu_new(); + if (npdu == NULL) + return ENOMEM; + + npdu->src = sp->local.addr; + npdu->dest = sp->foreign.addr; + + npdu->data_size = sizeof(udp_header_t) + msg->data_size; + npdu->data = calloc(1, npdu->data_size); + if (npdu->data == NULL) { + udp_pdu_delete(npdu); + return ENOMEM; + } + + hdr = (udp_header_t *)npdu->data; + hdr->src_port = host2uint16_t_be(sp->local.port); + hdr->dest_port = host2uint16_t_be(sp->foreign.port); + hdr->length = host2uint16_t_be(npdu->data_size); + hdr->checksum = 0; + + memcpy((uint8_t *)npdu->data + sizeof(udp_header_t), msg->data, + msg->data_size); + + /* Checksum calculation */ + checksum = udp_pdu_checksum_calc(npdu); + udp_pdu_set_checksum(npdu, checksum); + + *pdu = npdu; + return EOK; +} + +/** + * @} + */ Index: uspace/srv/udp/pdu.h =================================================================== --- uspace/srv/udp/pdu.h (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/pdu.h (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ +/** @file UDP PDU (encoded Protocol Data Unit) handling + */ + +#ifndef PDU_H +#define PDU_H + +#include +#include "std.h" +#include "udp_type.h" + +extern void udp_pdu_delete(udp_pdu_t *); +extern int udp_pdu_decode(udp_pdu_t *, udp_sockpair_t *, udp_msg_t **); +extern int udp_pdu_encode(udp_sockpair_t *, udp_msg_t *, udp_pdu_t **); + +#endif + +/** @} + */ Index: uspace/srv/udp/sock.c =================================================================== --- uspace/srv/udp/sock.c (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/sock.c (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ + +/** + * @file Socket provider + */ + +#include + +#include "sock.h" + +int udp_sock_init(void) +{ + return EOK; +} + +/** + * @} + */ Index: uspace/srv/udp/sock.h =================================================================== --- uspace/srv/udp/sock.h (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/sock.h (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ +/** @file Socket provider + */ + +#ifndef SOCK_H +#define SOCK_H + +#include + +extern int udp_sock_init(void); + +#endif + +/** @} + */ Index: uspace/srv/udp/std.h =================================================================== --- uspace/srv/udp/std.h (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/std.h (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ +/** @file UDP standard definitions + * + * Based on IETF RFC 768 + */ + +#ifndef STD_H +#define STD_H + +#include + +#define IP_PROTO_UDP 17 + +/** UDP Header */ +typedef struct { + /** Source port */ + uint16_t src_port; + /** Destination port */ + uint16_t dest_port; + /** Length (header + data) */ + uint16_t length; + /* Checksum */ + uint16_t checksum; +} udp_header_t; + +/** UDP pseudo header */ +typedef struct { + /** Source address */ + uint32_t src_addr; + /** Destination address */ + uint32_t dest_addr; + /** Zero */ + uint8_t zero; + /** Protocol */ + uint8_t protocol; + /** TCP length */ + uint16_t udp_length; +} udp_phdr_t; + +#endif + +/** @} + */ Index: uspace/srv/udp/udp.c =================================================================== --- uspace/srv/udp/udp.c (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/udp.c (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ + +/** + * @file UDP (User Datagram Protocol) service + */ + +#include +#include +#include +#include +#include + +#include "udp_inet.h" +#include "sock.h" + +#define NAME "udp" + +static int udp_init(void) +{ + int rc; + + log_msg(LVL_DEBUG, "udp_init()"); + + rc = udp_inet_init(); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed connecting to internet service."); + return ENOENT; + } + + rc = udp_sock_init(); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed initializing socket service."); + return ENOENT; + } + + return EOK; +} + +int main(int argc, char **argv) +{ + int rc; + + printf(NAME ": UDP (User Datagram Protocol) service\n"); + + rc = log_init(NAME, LVL_DEBUG); + if (rc != EOK) { + printf(NAME ": Failed to initialize log.\n"); + return 1; + } + + rc = udp_init(); + if (rc != EOK) + return 1; + + printf(NAME ": Accepting connections.\n"); + task_retval(0); + async_manager(); + + /* Not reached */ + return 0; +} + +/** + * @} + */ Index: uspace/srv/udp/udp_inet.c =================================================================== --- uspace/srv/udp/udp_inet.c (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/udp_inet.c (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ + +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include + +/* +#include "pdu.h" +#include "rqueue.h" +*/ +#include "std.h" +#include "udp_inet.h" + +static int udp_inet_ev_recv(inet_dgram_t *dgram); +//static void tcp_received_pdu(tcp_pdu_t *pdu); + +static inet_ev_ops_t udp_inet_ev_ops = { + .recv = udp_inet_ev_recv +}; + +/** Received datagram callback */ +static int udp_inet_ev_recv(inet_dgram_t *dgram) +{ + uint8_t *pdu_raw; + size_t pdu_raw_size; + + log_msg(LVL_DEBUG, "udp_inet_ev_recv()"); + + pdu_raw = dgram->data; + pdu_raw_size = dgram->size; + + (void)pdu_raw; + (void)pdu_raw_size; + /* Split into header and payload. */ +/* + log_msg(LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload"); + + tcp_pdu_t *pdu; + size_t hdr_size; + tcp_header_t *hdr; + uint32_t data_offset; + + if (pdu_raw_size < sizeof(tcp_header_t)) { + log_msg(LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu", + pdu_raw_size, sizeof(tcp_header_t)); + return EINVAL; + } + + hdr = (tcp_header_t *)pdu_raw; + data_offset = BIT_RANGE_EXTRACT(uint32_t, DF_DATA_OFFSET_h, DF_DATA_OFFSET_l, + uint16_t_be2host(hdr->doff_flags)); + + hdr_size = sizeof(uint32_t) * data_offset; + + if (pdu_raw_size < hdr_size) { + log_msg(LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu", + pdu_raw_size, hdr_size); + return EINVAL; + } + + if (hdr_size < sizeof(tcp_header_t)) { + log_msg(LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu", + hdr_size, sizeof(tcp_header_t)); return EINVAL; + } + + log_msg(LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu", + pdu_raw_size, hdr_size); + pdu = tcp_pdu_create(pdu_raw, hdr_size, pdu_raw + hdr_size, + pdu_raw_size - hdr_size); + if (pdu == NULL) { + log_msg(LVL_WARN, "Failed creating PDU. Dropped."); + return ENOMEM; + } + + pdu->src_addr.ipv4 = dgram->src.ipv4; + pdu->dest_addr.ipv4 = dgram->dest.ipv4; + log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", + pdu->src_addr.ipv4, pdu->dest_addr.ipv4); + + tcp_received_pdu(pdu); + tcp_pdu_delete(pdu); +*/ + return EOK; +} + +/** Transmit PDU over network layer. */ +/*void tcp_transmit_pdu(tcp_pdu_t *pdu) +{ + int rc; + uint8_t *pdu_raw; + size_t pdu_raw_size; + inet_dgram_t dgram; + + pdu_raw_size = pdu->header_size + pdu->text_size; + pdu_raw = malloc(pdu_raw_size); + if (pdu_raw == NULL) { + log_msg(LVL_ERROR, "Failed to transmit PDU. Out of memory."); + return; + } + + memcpy(pdu_raw, pdu->header, pdu->header_size); + memcpy(pdu_raw + pdu->header_size, pdu->text, + pdu->text_size); + + dgram.src.ipv4 = pdu->src_addr.ipv4; + dgram.dest.ipv4 = pdu->dest_addr.ipv4; + dgram.tos = 0; + dgram.data = pdu_raw; + dgram.size = pdu_raw_size; + + rc = inet_send(&dgram, INET_TTL_MAX, 0); + if (rc != EOK) + log_msg(LVL_ERROR, "Failed to transmit PDU."); +} +*/ +/** Process received PDU. */ +/* +static void tcp_received_pdu(tcp_pdu_t *pdu) +{ + tcp_segment_t *dseg; + tcp_sockpair_t rident; + + log_msg(LVL_DEBUG, "tcp_received_pdu()"); + + if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) { + log_msg(LVL_WARN, "Not enough memory. PDU dropped."); + return; + } +*/ + /* Insert decoded segment into rqueue */ +/* tcp_rqueue_insert_seg(&rident, dseg); +} +*/ +int udp_inet_init(void) +{ + int rc; + + log_msg(LVL_DEBUG, "udp_inet_init()"); + + rc = inet_init(IP_PROTO_UDP, &udp_inet_ev_ops); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed connecting to internet service."); + return ENOENT; + } + + return EOK; +} + +/** + * @} + */ Index: uspace/srv/udp/udp_inet.h =================================================================== --- uspace/srv/udp/udp_inet.h (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/udp_inet.h (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,43 @@ +/* + * 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 udp + * @{ + */ +/** @file + */ + +#ifndef UDP_INET_H +#define UDP_INET_H + +extern int udp_inet_init(void); + +#endif + +/** @} + */ Index: uspace/srv/udp/udp_type.h =================================================================== --- uspace/srv/udp/udp_type.h (revision 66a272f8152364aeee740191008e54027a905445) +++ uspace/srv/udp/udp_type.h (revision 66a272f8152364aeee740191008e54027a905445) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2012 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 udp + * @{ + */ +/** @file UDP type definitions + */ + +#ifndef UDP_TYPE_H +#define UDP_TYPE_H + +#include +#include + +typedef struct { + uint32_t ipv4; +} netaddr_t; + +typedef struct { + netaddr_t addr; + uint16_t port; +} udp_sock_t; + +typedef struct { + udp_sock_t local; + udp_sock_t foreign; +} udp_sockpair_t; + +/** Unencoded UDP message (datagram) */ +typedef struct { + /** Message data */ + void *data; + /** Message data size */ + size_t data_size; +} udp_msg_t; + +/** Encoded PDU */ +typedef struct { + /** Source address */ + netaddr_t src; + /** Destination address */ + netaddr_t dest; + + /** Encoded PDU data including header */ + void *data; + /** Encoded PDU data size */ + size_t data_size; +} udp_pdu_t; + +#endif + +/** @} + */