Index: uspace/srv/net/dhcp/dhcp.c =================================================================== --- uspace/srv/net/dhcp/dhcp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dhcp/dhcp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -430,10 +430,10 @@ dlink->retries_left = dhcp_discover_retries; - + if ((dlink->timeout->state == fts_not_set) || (dlink->timeout->state == fts_fired)) fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val, dhcpsrv_discover_timeout, dlink); - + return rc; } @@ -507,7 +507,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id); - + dhcp_link_t *dlink = dhcpsrv_link_find(link_id); - + if (dlink == NULL) { log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist", @@ -515,5 +515,5 @@ return EINVAL; } - + return dhcp_discover_proc(dlink); } Index: uspace/srv/net/dnsrsrv/dns_msg.c =================================================================== --- uspace/srv/net/dnsrsrv/dns_msg.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dnsrsrv/dns_msg.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -298,10 +298,10 @@ { assert(buf_size >= 4); - + uint32_t w = ((uint32_t) buf[0] << 24) + ((uint32_t) buf[1] << 16) + ((uint32_t) buf[2] << 8) + buf[3]; - + return w; } @@ -311,5 +311,5 @@ { assert(buf_size >= 16); - + addr128_t_be2host(buf, addr); } Index: uspace/srv/net/dnsrsrv/dnsrsrv.c =================================================================== --- uspace/srv/net/dnsrsrv/dnsrsrv.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dnsrsrv/dnsrsrv.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -90,7 +90,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()"); - + ip_ver_t ver = IPC_GET_ARG1(*icall); - + char *name; errno_t rc = async_data_write_accept((void **) &name, true, 0, @@ -100,5 +100,5 @@ return; } - + dns_host_info_t *hinfo; rc = dns_name2host(name, &hinfo, ver); @@ -107,5 +107,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -115,5 +115,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -121,5 +121,5 @@ return; } - + rc = async_data_read_finalize(callid, &hinfo->addr, size); if (rc != EOK) { @@ -128,5 +128,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -134,5 +134,5 @@ return; } - + size_t act_size = str_size(hinfo->cname); if (act_size > size) { @@ -141,11 +141,11 @@ return; } - + rc = async_data_read_finalize(callid, hinfo->cname, act_size); if (rc != EOK) async_answer_0(callid, rc); - + async_answer_0(iid, rc); - + dns_hostinfo_destroy(hinfo); } @@ -155,5 +155,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()"); - + ipc_callid_t callid; size_t size; @@ -163,5 +163,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -169,11 +169,11 @@ return; } - + // FIXME locking - + errno_t rc = async_data_read_finalize(callid, &dns_server_addr, size); if (rc != EOK) async_answer_0(callid, rc); - + async_answer_0(iid, rc); } @@ -183,5 +183,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_set_srvaddr_srv()"); - + ipc_callid_t callid; size_t size; @@ -191,5 +191,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -197,7 +197,7 @@ return; } - + // FIXME locking - + errno_t rc = async_data_write_finalize(callid, &dns_server_addr, size); if (rc != EOK) { @@ -205,5 +205,5 @@ async_answer_0(iid, rc); } - + async_answer_0(iid, rc); } Index: uspace/srv/net/dnsrsrv/query.c =================================================================== --- uspace/srv/net/dnsrsrv/query.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dnsrsrv/query.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,5 +54,5 @@ if (sname == NULL) return ENOMEM; - + char *qname = str_dup(name); if (qname == NULL) { @@ -60,5 +60,5 @@ return ENOMEM; } - + dns_question_t *question = calloc(1, sizeof(dns_question_t)); if (question == NULL) { @@ -67,9 +67,9 @@ return ENOMEM; } - + question->qname = qname; question->qtype = qtype; question->qclass = DC_IN; - + dns_message_t *msg = dns_message_new(); if (msg == NULL) { @@ -79,5 +79,5 @@ return ENOMEM; } - + msg->id = msg_id++; msg->qr = QR_QUERY; @@ -87,7 +87,7 @@ msg->rd = true; msg->ra = false; - + list_append(&question->msg, &msg->question); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "dns_name_query: send DNS request"); dns_message_t *amsg; @@ -98,15 +98,15 @@ return rc; } - + list_foreach(amsg->answer, msg, dns_rr_t, rr) { log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %zu", rr->name, rr->rtype, rr->rclass, rr->rdata_size); - + if ((rr->rtype == DTYPE_CNAME) && (rr->rclass == DC_IN) && (str_cmp(rr->name, sname) == 0)) { - + log_msg(LOG_DEFAULT, LVL_DEBUG, "decode cname (%p, %zu, %zu)", amsg->pdu.data, amsg->pdu.size, rr->roff); - + char *cname; size_t eoff; @@ -114,26 +114,26 @@ if (rc != EOK) { assert((rc == EINVAL) || (rc == ENOMEM)); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "error decoding cname"); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return rc; } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "name = '%s' " "cname = '%s'", sname, cname); - + /* Continue looking for the more canonical name */ free(sname); sname = cname; } - + if ((qtype == DTYPE_A) && (rr->rtype == DTYPE_A) && (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr32_t)) && (str_cmp(rr->name, sname) == 0)) { - + info->cname = str_dup(rr->name); if (info->cname == NULL) { @@ -141,22 +141,22 @@ dns_message_destroy(amsg); free(sname); - + return ENOMEM; } - + inet_addr_set(dns_uint32_t_decode(rr->rdata, rr->rdata_size), &info->addr); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return EOK; } - + if ((qtype == DTYPE_AAAA) && (rr->rtype == DTYPE_AAAA) && (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr128_t)) && (str_cmp(rr->name, sname) == 0)) { - + info->cname = str_dup(rr->name); if (info->cname == NULL) { @@ -164,27 +164,27 @@ dns_message_destroy(amsg); free(sname); - + return ENOMEM; } - + addr128_t addr; dns_addr128_t_decode(rr->rdata, rr->rdata_size, addr); - + inet_addr_set6(addr, &info->addr); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return EOK; } } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "'%s' not resolved, fail", sname); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return EIO; } @@ -195,14 +195,14 @@ if (info == NULL) return ENOMEM; - + errno_t rc; - + switch (ver) { case ip_any: rc = dns_name_query(name, DTYPE_AAAA, info); - + if (rc != EOK) rc = dns_name_query(name, DTYPE_A, info); - + break; case ip_v4: @@ -215,10 +215,10 @@ rc = EINVAL; } - + if (rc == EOK) *rinfo = info; else free(info); - + return rc; } Index: uspace/srv/net/ethip/arp.c =================================================================== --- uspace/srv/net/ethip/arp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/arp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,33 +55,33 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_received()"); - + arp_eth_packet_t packet; errno_t rc = arp_pdu_decode(frame->data, frame->size, &packet); if (rc != EOK) return; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x", packet.opcode, packet.target_proto_addr); - + inet_addr_t addr; inet_addr_set(packet.target_proto_addr, &addr); - + ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, &addr); if (laddr == NULL) return; - + addr32_t laddr_v4; ip_ver_t laddr_ver = inet_addr_get(&laddr->addr, &laddr_v4, NULL); if (laddr_ver != ip_v4) return; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Request/reply to my address"); - + (void) atrans_add(packet.sender_proto_addr, packet.sender_hw_addr); - + if (packet.opcode == aop_request) { arp_eth_packet_t reply; - + reply.opcode = aop_reply; addr48(nic->mac_addr, reply.sender_hw_addr); @@ -89,5 +89,5 @@ addr48(packet.sender_hw_addr, reply.target_hw_addr); reply.target_proto_addr = packet.sender_proto_addr; - + arp_send_packet(nic, &reply); } @@ -106,7 +106,7 @@ if (rc == EOK) return EOK; - + arp_eth_packet_t packet; - + packet.opcode = aop_request; addr48(nic->mac_addr, packet.sender_hw_addr); @@ -114,9 +114,9 @@ addr48(addr48_broadcast, packet.target_hw_addr); packet.target_proto_addr = ip_addr; - + rc = arp_send_packet(nic, &packet); if (rc != EOK) return rc; - + return atrans_lookup_timeout(ip_addr, ARP_REQUEST_TIMEOUT, mac_addr); } Index: uspace/srv/net/ethip/ethip.c =================================================================== --- uspace/srv/net/ethip/ethip.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/ethip.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -80,5 +80,5 @@ { async_set_fallback_port_handler(ethip_client_conn, NULL); - + errno_t rc = loc_server_register(NAME); if (rc != EOK) { @@ -86,9 +86,9 @@ return rc; } - + rc = ethip_nic_discovery_start(); if (rc != EOK) return rc; - + return EOK; } @@ -173,8 +173,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; eth_frame_t frame; - + errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest); if (rc != EOK) { @@ -183,10 +183,10 @@ return rc; } - + addr48(nic->mac_addr, frame.src); frame.etype_len = ETYPE_IP; frame.data = sdu->data; frame.size = sdu->size; - + void *data; size_t size; @@ -194,8 +194,8 @@ if (rc != EOK) return rc; - + rc = ethip_nic_send(nic, data, size); free(data); - + return rc; } @@ -204,8 +204,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send6()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; eth_frame_t frame; - + addr48(sdu->dest, frame.dest); addr48(nic->mac_addr, frame.src); @@ -213,5 +213,5 @@ frame.data = sdu->data; frame.size = sdu->size; - + void *data; size_t size; @@ -219,8 +219,8 @@ if (rc != EOK) return rc; - + rc = ethip_nic_send(nic, data, size); free(data); - + return rc; } @@ -230,7 +230,7 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received(): srv=%p", srv); ethip_nic_t *nic = (ethip_nic_t *) srv->arg; - + log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode"); - + eth_frame_t frame; errno_t rc = eth_pdu_decode(data, size, &frame); @@ -239,7 +239,7 @@ return rc; } - + iplink_recv_sdu_t sdu; - + switch (frame.etype_len) { case ETYPE_ARP: @@ -264,5 +264,5 @@ frame.etype_len); } - + free(frame.data); return rc; @@ -279,8 +279,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; addr48(nic->mac_addr, *mac); - + return EOK; } @@ -289,8 +289,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; addr48(*mac, nic->mac_addr); - + return EOK; } @@ -299,5 +299,5 @@ { ethip_nic_t *nic = (ethip_nic_t *) srv->arg; - + return ethip_nic_addr_add(nic, addr); } @@ -306,5 +306,5 @@ { ethip_nic_t *nic = (ethip_nic_t *) srv->arg; - + return ethip_nic_addr_remove(nic, addr); } Index: uspace/srv/net/ethip/ethip.h =================================================================== --- uspace/srv/net/ethip/ethip.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/ethip.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,5 +62,5 @@ /** MAC address */ addr48_t mac_addr; - + /** * List of IP addresses configured on this link Index: uspace/srv/net/ethip/ethip_nic.c =================================================================== --- uspace/srv/net/ethip/ethip_nic.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/ethip_nic.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -112,8 +112,8 @@ return NULL; } - + link_initialize(&nic->link); list_initialize(&nic->addr_list); - + return nic; } @@ -127,8 +127,8 @@ return NULL; } - + link_initialize(&laddr->link); laddr->addr = *addr; - + return laddr; } @@ -138,5 +138,5 @@ if (nic->svc_name != NULL) free(nic->svc_name); - + free(nic); } @@ -151,10 +151,10 @@ bool in_list = false; nic_address_t nic_address; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_open()"); ethip_nic_t *nic = ethip_nic_new(); if (nic == NULL) return ENOMEM; - + errno_t rc = loc_service_get_name(sid, &nic->svc_name); if (rc != EOK) { @@ -162,5 +162,5 @@ goto error; } - + nic->sess = loc_service_connect(sid, INTERFACE_DDF, 0); if (nic->sess == NULL) { @@ -168,7 +168,7 @@ goto error; } - + nic->svc_id = sid; - + rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic); if (rc != EOK) { @@ -192,5 +192,5 @@ goto error; } - + addr48(nic_address.address, nic->mac_addr); @@ -216,8 +216,8 @@ if (in_list) list_remove(&nic->link); - + if (nic->sess != NULL) async_hangup(nic->sess); - + ethip_nic_delete(nic); return rc; @@ -332,5 +332,5 @@ return rc; } - + return ethip_nic_check_new(); } @@ -371,9 +371,9 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_setup_multicast()"); - + /* Count the number of multicast addresses */ - + size_t count = 0; - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, NULL); @@ -381,17 +381,17 @@ count++; } - + if (count == 0) return nic_multicast_set_mode(nic->sess, NIC_MULTICAST_BLOCKED, NULL, 0); - + nic_address_t *mac_list = calloc(count, sizeof(nic_address_t)); if (mac_list == NULL) return ENOMEM; - + /* Create the multicast MAC list */ - + size_t i = 0; - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { addr128_t v6; @@ -399,14 +399,14 @@ if (ver != ip_v6) continue; - + assert(i < count); - + addr48_t mac; addr48_solicited_node(v6, mac); - + /* Avoid duplicate addresses in the list */ - + bool found = false; - + for (size_t j = 0; j < i; j++) { if (addr48_compare(mac_list[j].address, mac)) { @@ -415,5 +415,5 @@ } } - + if (!found) { addr48(mac, mac_list[i].address); @@ -422,10 +422,10 @@ count--; } - + /* Setup the multicast MAC list */ - + errno_t rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST, mac_list, count); - + free(mac_list); return rc; @@ -435,11 +435,11 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()"); - + ethip_link_addr_t *laddr = ethip_nic_addr_new(addr); if (laddr == NULL) return ENOMEM; - + list_append(&laddr->link, &nic->addr_list); - + return ethip_nic_setup_multicast(nic); } @@ -448,12 +448,12 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()"); - + ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, addr); if (laddr == NULL) return ENOENT; - + list_remove(&laddr->link); ethip_link_addr_delete(laddr); - + return ethip_nic_setup_multicast(nic); } @@ -463,10 +463,10 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()"); - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { if (inet_addr_compare(addr, &laddr->addr)) return laddr; } - + return NULL; } Index: uspace/srv/net/inetsrv/addrobj.c =================================================================== --- uspace/srv/net/inetsrv/addrobj.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/addrobj.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -113,5 +113,5 @@ { fibril_mutex_lock(&addr_list_lock); - + list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) { switch (find) { @@ -134,8 +134,8 @@ } } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found"); fibril_mutex_unlock(&addr_list_lock); - + return NULL; } Index: uspace/srv/net/inetsrv/icmpv6.c =================================================================== --- uspace/srv/net/inetsrv/icmpv6.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/icmpv6.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,32 +50,32 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_request()"); - + if (dgram->size < sizeof(icmpv6_message_t)) return EINVAL; - + icmpv6_message_t *request = (icmpv6_message_t *) dgram->data; size_t size = dgram->size; - + addr128_t src_v6; ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6); - + addr128_t dest_v6; ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6); - + if ((src_ver != dest_ver) || (src_ver != ip_v6)) return EINVAL; - + icmpv6_message_t *reply = calloc(1, size); if (reply == NULL) return ENOMEM; - + memcpy(reply, request, size); - + reply->type = ICMPV6_ECHO_REPLY; reply->code = 0; reply->checksum = 0; - + inet_dgram_t rdgram; - + inet_get_srcaddr(&dgram->src, 0, &rdgram.src); rdgram.dest = dgram->src; @@ -84,7 +84,7 @@ rdgram.data = reply; rdgram.size = size; - + icmpv6_phdr_t phdr; - + host2addr128_t_be(dest_v6, phdr.src_addr); host2addr128_t_be(src_v6, phdr.dest_addr); @@ -92,18 +92,18 @@ memset(phdr.zeroes, 0, 3); phdr.next = IP_PROTO_ICMPV6; - + uint16_t cs_phdr = inet_checksum_calc(INET_CHECKSUM_INIT, &phdr, sizeof(icmpv6_phdr_t)); - + uint16_t cs_all = inet_checksum_calc(cs_phdr, reply, size); - + reply->checksum = host2uint16_t_be(cs_all); - + errno_t rc = inet_route_packet(&rdgram, IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); - + free(reply); - + return rc; } @@ -112,21 +112,21 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_reply()"); - + if (dgram->size < sizeof(icmpv6_message_t)) return EINVAL; - + inetping_sdu_t sdu; - + sdu.src = dgram->src; sdu.dest = dgram->dest; - + icmpv6_message_t *reply = (icmpv6_message_t *) dgram->data; - + sdu.seq_no = uint16_t_be2host(reply->un.echo.seq_no); sdu.data = reply + sizeof(icmpv6_message_t); sdu.size = dgram->size - sizeof(icmpv6_message_t); - + uint16_t ident = uint16_t_be2host(reply->un.echo.ident); - + return inetping_recv(ident, &sdu); } @@ -135,10 +135,10 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv()"); - + if (dgram->size < 1) return EINVAL; - + uint8_t type = *(uint8_t *) dgram->data; - + switch (type) { case ICMPV6_ECHO_REQUEST: @@ -153,5 +153,5 @@ break; } - + return EINVAL; } @@ -163,7 +163,7 @@ if (rdata == NULL) return ENOMEM; - + icmpv6_message_t *request = (icmpv6_message_t *) rdata; - + request->type = ICMPV6_ECHO_REQUEST; request->code = 0; @@ -171,9 +171,9 @@ request->un.echo.ident = host2uint16_t_be(ident); request->un.echo.seq_no = host2uint16_t_be(sdu->seq_no); - + memcpy(rdata + sizeof(icmpv6_message_t), sdu->data, sdu->size); - + inet_dgram_t dgram; - + dgram.src = sdu->src; dgram.dest = sdu->dest; @@ -182,10 +182,10 @@ dgram.data = rdata; dgram.size = rsize; - + icmpv6_phdr_t phdr; - + assert(sdu->src.version == ip_v6); assert(sdu->dest.version == ip_v6); - + host2addr128_t_be(sdu->src.addr6, phdr.src_addr); host2addr128_t_be(sdu->dest.addr6, phdr.dest_addr); @@ -193,18 +193,18 @@ memset(phdr.zeroes, 0, 3); phdr.next = IP_PROTO_ICMPV6; - + uint16_t cs_phdr = inet_checksum_calc(INET_CHECKSUM_INIT, &phdr, sizeof(icmpv6_phdr_t)); - + uint16_t cs_all = inet_checksum_calc(cs_phdr, rdata, rsize); - + request->checksum = host2uint16_t_be(cs_all); - + errno_t rc = inet_route_packet(&dgram, IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); - + free(rdata); - + return rc; } Index: uspace/srv/net/inetsrv/inet_link.c =================================================================== --- uspace/srv/net/inetsrv/inet_link.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/inet_link.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -154,5 +154,5 @@ if (ilink->svc_name != NULL) free(ilink->svc_name); - + free(ilink); } @@ -197,5 +197,5 @@ goto error; } - + /* * Get the MAC address of the link. If the link has a MAC @@ -221,17 +221,17 @@ inet_addrobj_t *addr = NULL; - + /* XXX FIXME Cannot rely on loopback being the first IP link service!! */ if (first_link) { addr = inet_addrobj_new(); - + inet_naddr(&addr->naddr, 127, 0, 0, 1, 24); first_link = false; } - + if (addr != NULL) { addr->ilink = ilink; addr->name = str_dup("v4a"); - + rc = inet_addrobj_add(addr); if (rc == EOK) { @@ -249,25 +249,25 @@ } } - + inet_addrobj_t *addr6 = NULL; - + if (first_link6) { addr6 = inet_addrobj_new(); - + inet_naddr6(&addr6->naddr, 0, 0, 0, 0, 0, 0, 0, 1, 128); first_link6 = false; } else if (ilink->mac_valid) { addr6 = inet_addrobj_new(); - + addr128_t link_local; inet_link_local_node_ip(ilink->mac, link_local); - + inet_naddr_set6(link_local, 64, &addr6->naddr); } - + if (addr6 != NULL) { addr6->ilink = ilink; addr6->name = str_dup("v6a"); - + rc = inet_addrobj_add(addr6); if (rc == EOK) { @@ -285,12 +285,12 @@ } } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Configured link '%s'.", ilink->svc_name); return EOK; - + error: if (ilink->iplink != NULL) iplink_close(ilink->iplink); - + inet_link_delete(ilink); return rc; @@ -319,22 +319,22 @@ if (src_ver != ip_v4) return EINVAL; - + addr32_t dest_v4; ip_ver_t dest_ver = inet_addr_get(&dgram->dest, &dest_v4, NULL); if (dest_ver != ip_v4) return EINVAL; - + /* * Fill packet structure. Fragmentation is performed by * inet_pdu_encode(). */ - + iplink_sdu_t sdu; - + sdu.src = lsrc; sdu.dest = ldest; - + inet_packet_t packet; - + packet.src = dgram->src; packet.dest = dgram->dest; @@ -342,20 +342,20 @@ packet.proto = proto; packet.ttl = ttl; - + /* Allocate identifier */ fibril_mutex_lock(&ip_ident_lock); packet.ident = ++ip_ident; fibril_mutex_unlock(&ip_ident_lock); - + packet.df = df; packet.data = dgram->data; packet.size = dgram->size; - + errno_t rc; size_t offs = 0; - + do { /* Encode one fragment */ - + size_t roffs; rc = inet_pdu_encode(&packet, src_v4, dest_v4, offs, ilink->def_mtu, @@ -363,12 +363,12 @@ if (rc != EOK) return rc; - + /* Send the PDU */ rc = iplink_send(ilink->iplink, &sdu); - + free(sdu.data); offs = roffs; } while (offs < packet.size); - + return rc; } @@ -394,20 +394,20 @@ if (src_ver != ip_v6) return EINVAL; - + addr128_t dest_v6; ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6); if (dest_ver != ip_v6) return EINVAL; - + iplink_sdu6_t sdu6; addr48(ldest, sdu6.dest); - + /* * Fill packet structure. Fragmentation is performed by * inet_pdu_encode6(). */ - + inet_packet_t packet; - + packet.src = dgram->src; packet.dest = dgram->dest; @@ -415,20 +415,20 @@ packet.proto = proto; packet.ttl = ttl; - + /* Allocate identifier */ fibril_mutex_lock(&ip_ident_lock); packet.ident = ++ip_ident; fibril_mutex_unlock(&ip_ident_lock); - + packet.df = df; packet.data = dgram->data; packet.size = dgram->size; - + errno_t rc; size_t offs = 0; - + do { /* Encode one fragment */ - + size_t roffs; rc = inet_pdu_encode6(&packet, src_v6, dest_v6, offs, ilink->def_mtu, @@ -436,12 +436,12 @@ if (rc != EOK) return rc; - + /* Send the PDU */ rc = iplink_send6(ilink->iplink, &sdu6); - + free(sdu6.data); offs = roffs; } while (offs < packet.size); - + return rc; } Index: uspace/srv/net/inetsrv/inetcfg.c =================================================================== --- uspace/srv/net/inetsrv/inetcfg.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/inetcfg.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -257,7 +257,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_create_static_srv()"); - + sysarg_t link_id = IPC_GET_ARG1(*icall); - + ipc_callid_t callid; size_t size; @@ -267,5 +267,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -273,5 +273,5 @@ return; } - + inet_naddr_t naddr; errno_t rc = async_data_write_finalize(callid, &naddr, size); @@ -281,5 +281,5 @@ return; } - + char *name; rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, @@ -289,5 +289,5 @@ return; } - + sysarg_t addr_id = 0; rc = inetcfg_addr_create_static(name, &naddr, link_id, &addr_id); @@ -312,13 +312,13 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()"); - + sysarg_t addr_id = IPC_GET_ARG1(*icall); - + inet_addr_info_t ainfo; - + inet_naddr_any(&ainfo.naddr); ainfo.ilink = 0; ainfo.name = NULL; - + errno_t rc = inetcfg_addr_get(addr_id, &ainfo); if (rc != EOK) { @@ -326,5 +326,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -334,5 +334,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -340,5 +340,5 @@ return; } - + rc = async_data_read_finalize(callid, &ainfo.naddr, size); if (rc != EOK) { @@ -347,5 +347,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -353,15 +353,15 @@ return; } - + rc = async_data_read_finalize(callid, ainfo.name, min(size, str_size(ainfo.name))); free(ainfo.name); - - if (rc != EOK) { - async_answer_0(callid, rc); - async_answer_0(iid, rc); - return; - } - + + if (rc != EOK) { + async_answer_0(callid, rc); + async_answer_0(iid, rc); + return; + } + async_answer_1(iid, rc, ainfo.ilink); } @@ -584,5 +584,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -590,5 +590,5 @@ return; } - + inet_naddr_t dest; errno_t rc = async_data_write_finalize(callid, &dest, size); @@ -598,5 +598,5 @@ return; } - + if (!async_data_write_receive(&callid, &size)) { async_answer_0(callid, EINVAL); @@ -604,5 +604,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -610,5 +610,5 @@ return; } - + inet_addr_t router; rc = async_data_write_finalize(callid, &router, size); @@ -618,5 +618,5 @@ return; } - + char *name; rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, @@ -626,5 +626,5 @@ return; } - + sysarg_t sroute_id = 0; rc = inetcfg_sroute_create(name, &dest, &router, &sroute_id); @@ -649,13 +649,13 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()"); - + sysarg_t sroute_id = IPC_GET_ARG1(*icall); - + inet_sroute_info_t srinfo; - + inet_naddr_any(&srinfo.dest); inet_addr_any(&srinfo.router); srinfo.name = NULL; - + errno_t rc = inetcfg_sroute_get(sroute_id, &srinfo); if (rc != EOK) { @@ -663,5 +663,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -671,5 +671,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -677,5 +677,5 @@ return; } - + rc = async_data_read_finalize(callid, &srinfo.dest, size); if (rc != EOK) { @@ -684,5 +684,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -690,5 +690,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -696,5 +696,5 @@ return; } - + rc = async_data_read_finalize(callid, &srinfo.router, size); if (rc != EOK) { @@ -703,5 +703,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -709,9 +709,9 @@ return; } - + rc = async_data_read_finalize(callid, srinfo.name, min(size, str_size(srinfo.name))); free(srinfo.name); - + async_answer_0(iid, rc); } Index: uspace/srv/net/inetsrv/inetsrv.c =================================================================== --- uspace/srv/net/inetsrv/inetsrv.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/inetsrv.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -87,5 +87,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()"); - + port_id_t port; errno_t rc = async_create_port(INTERFACE_INET, @@ -93,15 +93,15 @@ if (rc != EOK) return rc; - + rc = async_create_port(INTERFACE_INETCFG, inet_cfg_conn, NULL, &port); if (rc != EOK) return rc; - + rc = async_create_port(INTERFACE_INETPING, inetping_conn, NULL, &port); if (rc != EOK) return rc; - + rc = loc_server_register(NAME); if (rc != EOK) { @@ -109,5 +109,5 @@ return EEXIST; } - + service_id_t sid; rc = loc_service_register(SERVICE_NAME_INET, &sid); @@ -116,5 +116,5 @@ return EEXIST; } - + return EOK; } @@ -234,7 +234,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()"); - + uint8_t tos = IPC_GET_ARG1(*icall); - + ipc_callid_t callid; size_t size; @@ -244,5 +244,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -250,5 +250,5 @@ return; } - + inet_addr_t remote; errno_t rc = async_data_write_finalize(callid, &remote, size); @@ -257,5 +257,5 @@ async_answer_0(iid, rc); } - + inet_addr_t local; rc = inet_get_srcaddr(&remote, tos, &local); @@ -264,5 +264,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -270,5 +270,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -276,5 +276,5 @@ return; } - + rc = async_data_read_finalize(callid, &local, size); if (rc != EOK) { @@ -283,5 +283,5 @@ return; } - + async_answer_0(iid, rc); } @@ -291,13 +291,13 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send_srv()"); - + inet_dgram_t dgram; - + dgram.iplink = IPC_GET_ARG1(*icall); dgram.tos = IPC_GET_ARG2(*icall); - + uint8_t ttl = IPC_GET_ARG3(*icall); int df = IPC_GET_ARG4(*icall); - + ipc_callid_t callid; size_t size; @@ -307,5 +307,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -313,5 +313,5 @@ return; } - + errno_t rc = async_data_write_finalize(callid, &dgram.src, size); if (rc != EOK) { @@ -319,5 +319,5 @@ async_answer_0(iid, rc); } - + if (!async_data_write_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -325,5 +325,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -331,5 +331,5 @@ return; } - + rc = async_data_write_finalize(callid, &dgram.dest, size); if (rc != EOK) { @@ -337,5 +337,5 @@ async_answer_0(iid, rc); } - + rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size); @@ -344,7 +344,7 @@ return; } - + rc = inet_send(client, &dgram, client->protocol, ttl, df); - + free(dgram.data); async_answer_0(iid, rc); Index: uspace/srv/net/inetsrv/ndp.c =================================================================== --- uspace/srv/net/inetsrv/ndp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/ndp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,10 +68,10 @@ inet_dgram_t dgram; ndp_pdu_encode(packet, &dgram); - + inet_link_send_dgram6(link, packet->target_hw_addr, &dgram, IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); - + free(dgram.data); - + return EOK; } @@ -86,21 +86,21 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ndp_received()"); - + ndp_packet_t packet; errno_t rc = ndp_pdu_decode(dgram, &packet); if (rc != EOK) return rc; - + inet_addr_t sender; inet_addr_set6(packet.sender_proto_addr, &sender); - + inet_addr_t target; inet_addr_set6(packet.target_proto_addr, &target); - + inet_addrobj_t *laddr; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "NDP PDU decoded; opcode: %d", packet.opcode); - + switch (packet.opcode) { case ICMPV6_NEIGHBOUR_SOLICITATION: @@ -111,7 +111,7 @@ if (rc != EOK) return rc; - + ndp_packet_t reply; - + reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT; addr48(laddr->ilink->mac, reply.sender_hw_addr); @@ -119,8 +119,8 @@ addr48(packet.sender_hw_addr, reply.target_hw_addr); addr128(packet.sender_proto_addr, reply.target_proto_addr); - + ndp_send_packet(laddr->ilink, &reply); } - + break; case ICMPV6_NEIGHBOUR_ADVERTISEMENT: @@ -129,5 +129,5 @@ return ntrans_add(packet.sender_proto_addr, packet.sender_hw_addr); - + break; case ICMPV6_ROUTER_ADVERTISEMENT: @@ -136,5 +136,5 @@ return ENOTSUP; } - + return EOK; } @@ -159,11 +159,11 @@ return EOK; } - + errno_t rc = ntrans_lookup(ip_addr, mac_addr); if (rc == EOK) return EOK; - + ndp_packet_t packet; - + packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION; addr48(ilink->mac, packet.sender_hw_addr); @@ -172,11 +172,11 @@ addr48_solicited_node(ip_addr, packet.target_hw_addr); ndp_solicited_node_ip(ip_addr, packet.target_proto_addr); - + rc = ndp_send_packet(ilink, &packet); if (rc != EOK) return rc; - + (void) ntrans_wait_timeout(NDP_REQUEST_TIMEOUT); - + return ntrans_lookup(ip_addr, mac_addr); } Index: uspace/srv/net/inetsrv/ntrans.c =================================================================== --- uspace/srv/net/inetsrv/ntrans.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/ntrans.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -142,5 +142,5 @@ return ENOENT; } - + fibril_mutex_unlock(&ntrans_list_lock); addr48(ntrans->mac_addr, mac_addr); @@ -162,5 +162,5 @@ timeout); fibril_mutex_unlock(&ntrans_list_lock); - + return rc; } Index: uspace/srv/net/inetsrv/pdu.c =================================================================== --- uspace/srv/net/inetsrv/pdu.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/pdu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -107,33 +107,33 @@ /* Upper bound for fragment offset field */ size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l + 1); - + /* Verify that total size of datagram is within reasonable bounds */ if (packet->size > FRAG_OFFS_UNIT * fragoff_limit) return ELIMIT; - + size_t hdr_size = sizeof(ip_header_t); if (hdr_size >= mtu) return EINVAL; - + assert(hdr_size % 4 == 0); assert(offs % FRAG_OFFS_UNIT == 0); assert(offs / FRAG_OFFS_UNIT < fragoff_limit); - + /* Value for the fragment offset field */ uint16_t foff = offs / FRAG_OFFS_UNIT; - + /* Amount of space in the PDU available for payload */ size_t spc_avail = mtu - hdr_size; spc_avail -= (spc_avail % FRAG_OFFS_UNIT); - + /* Amount of data (payload) to transfer */ size_t xfer_size = min(packet->size - offs, spc_avail); - + /* Total PDU size */ size_t size = hdr_size + xfer_size; - + /* Offset of remaining payload */ size_t rem_offs = offs + xfer_size; - + /* Flags */ uint16_t flags_foff = @@ -141,12 +141,12 @@ (rem_offs < packet->size ? BIT_V(uint16_t, FF_FLAG_MF) : 0) + (foff << FF_FRAGOFF_l); - + void *data = calloc(size, 1); if (data == NULL) return ENOMEM; - + /* Encode header fields */ ip_header_t *hdr = (ip_header_t *) data; - + hdr->ver_ihl = (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t)); @@ -160,17 +160,17 @@ hdr->src_addr = host2uint32_t_be(src); hdr->dest_addr = host2uint32_t_be(dest); - + /* Compute checksum */ uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT, (void *) hdr, hdr_size); hdr->chksum = host2uint16_t_be(chksum); - + /* Copy payload */ memcpy((uint8_t *) data + hdr_size, packet->data + offs, xfer_size); - + *rdata = data; *rsize = size; *roffs = rem_offs; - + return EOK; } @@ -200,12 +200,12 @@ if (mtu < 1280) return ELIMIT; - + /* Upper bound for fragment offset field */ size_t fragoff_limit = 1 << (OF_FRAGOFF_h - OF_FRAGOFF_l); - + /* Verify that total size of datagram is within reasonable bounds */ if (offs + packet->size > FRAG_OFFS_UNIT * fragoff_limit) return ELIMIT; - + /* Determine whether we need the Fragment extension header */ bool fragment; @@ -214,5 +214,5 @@ else fragment = true; - + size_t hdr_size; if (fragment) @@ -220,59 +220,59 @@ else hdr_size = sizeof(ip6_header_t); - + if (hdr_size >= mtu) return EINVAL; - + static_assert(sizeof(ip6_header_t) % 8 == 0); assert(hdr_size % 8 == 0); assert(offs % FRAG_OFFS_UNIT == 0); assert(offs / FRAG_OFFS_UNIT < fragoff_limit); - + /* Value for the fragment offset field */ uint16_t foff = offs / FRAG_OFFS_UNIT; - + /* Amount of space in the PDU available for payload */ size_t spc_avail = mtu - hdr_size; spc_avail -= (spc_avail % FRAG_OFFS_UNIT); - + /* Amount of data (payload) to transfer */ size_t xfer_size = min(packet->size - offs, spc_avail); - + /* Total PDU size */ size_t size = hdr_size + xfer_size; - + /* Offset of remaining payload */ size_t rem_offs = offs + xfer_size; - + /* Flags */ uint16_t offsmf = (rem_offs < packet->size ? BIT_V(uint16_t, OF_FLAG_M) : 0) + (foff << OF_FRAGOFF_l); - + void *data = calloc(size, 1); if (data == NULL) return ENOMEM; - + /* Encode header fields */ ip6_header_t *hdr6 = (ip6_header_t *) data; - + hdr6->ver_tc = (6 << (VI_VERSION_l)); memset(hdr6->tc_fl, 0, 3); hdr6->hop_limit = packet->ttl; - + host2addr128_t_be(src, hdr6->src_addr); host2addr128_t_be(dest, hdr6->dest_addr); - + /* Optionally encode Fragment extension header fields */ if (fragment) { assert(offsmf != 0); - + hdr6->payload_len = host2uint16_t_be(packet->size + sizeof(ip6_header_fragment_t)); hdr6->next = IP6_NEXT_FRAGMENT; - + ip6_header_fragment_t *hdr6f = (ip6_header_fragment_t *) (hdr6 + 1); - + hdr6f->next = packet->proto; hdr6f->reserved = 0; @@ -281,16 +281,16 @@ } else { assert(offsmf == 0); - + hdr6->payload_len = host2uint16_t_be(packet->size); hdr6->next = packet->proto; } - + /* Copy payload */ memcpy((uint8_t *) data + hdr_size, packet->data + offs, xfer_size); - + *rdata = data; *rsize = size; *roffs = rem_offs; - + return EOK; } @@ -312,12 +312,12 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode()"); - + if (size < sizeof(ip_header_t)) { log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size); return EINVAL; } - + ip_header_t *hdr = (ip_header_t *) data; - + uint8_t version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h, VI_VERSION_l, hdr->ver_ihl); @@ -326,5 +326,5 @@ return EINVAL; } - + size_t tot_len = uint16_t_be2host(hdr->tot_len); if (tot_len < sizeof(ip_header_t)) { @@ -332,5 +332,5 @@ return EINVAL; } - + if (tot_len > size) { log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length = %zu > PDU size = %zu", @@ -338,5 +338,5 @@ return EINVAL; } - + uint16_t ident = uint16_t_be2host(hdr->id); uint16_t flags_foff = uint16_t_be2host(hdr->flags_foff); @@ -344,5 +344,5 @@ flags_foff); /* XXX Checksum */ - + inet_addr_set(uint32_t_be2host(hdr->src_addr), &packet->src); inet_addr_set(uint32_t_be2host(hdr->dest_addr), &packet->dest); @@ -351,13 +351,13 @@ packet->ttl = hdr->ttl; packet->ident = ident; - + packet->df = (flags_foff & BIT_V(uint16_t, FF_FLAG_DF)) != 0; packet->mf = (flags_foff & BIT_V(uint16_t, FF_FLAG_MF)) != 0; packet->offs = foff * FRAG_OFFS_UNIT; - + /* XXX IP options */ size_t data_offs = sizeof(uint32_t) * BIT_RANGE_EXTRACT(uint8_t, VI_IHL_h, VI_IHL_l, hdr->ver_ihl); - + packet->size = tot_len - data_offs; packet->data = calloc(packet->size, 1); @@ -366,8 +366,8 @@ return ENOMEM; } - + memcpy(packet->data, (uint8_t *) data + data_offs, packet->size); packet->link_id = link_id; - + return EOK; } @@ -389,12 +389,12 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode6()"); - + if (size < sizeof(ip6_header_t)) { log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size); return EINVAL; } - + ip6_header_t *hdr6 = (ip6_header_t *) data; - + uint8_t version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h, VI_VERSION_l, hdr6->ver_tc); @@ -403,5 +403,5 @@ return EINVAL; } - + size_t payload_len = uint16_t_be2host(hdr6->payload_len); if (payload_len + sizeof(ip6_header_t) > size) { @@ -410,5 +410,5 @@ return EINVAL; } - + uint32_t ident; uint16_t offsmf; @@ -416,10 +416,10 @@ uint16_t next; size_t data_offs = sizeof(ip6_header_t); - + /* Fragment extension header */ if (hdr6->next == IP6_NEXT_FRAGMENT) { ip6_header_fragment_t *hdr6f = (ip6_header_fragment_t *) (hdr6 + 1); - + ident = uint32_t_be2host(hdr6f->id); offsmf = uint16_t_be2host(hdr6f->offsmf); @@ -435,23 +435,23 @@ next = hdr6->next; } - + addr128_t src; addr128_t dest; - + addr128_t_be2host(hdr6->src_addr, src); inet_addr_set6(src, &packet->src); - + addr128_t_be2host(hdr6->dest_addr, dest); inet_addr_set6(dest, &packet->dest); - + packet->tos = 0; packet->proto = next; packet->ttl = hdr6->hop_limit; packet->ident = ident; - + packet->df = 1; packet->mf = (offsmf & BIT_V(uint16_t, OF_FLAG_M)) != 0; packet->offs = foff * FRAG_OFFS_UNIT; - + packet->size = payload_len; packet->data = calloc(packet->size, 1); @@ -460,5 +460,5 @@ return ENOMEM; } - + memcpy(packet->data, (uint8_t *) data + data_offs, packet->size); packet->link_id = link_id; @@ -480,17 +480,17 @@ dgram->tos = 0; dgram->size = sizeof(icmpv6_message_t) + sizeof(ndp_message_t); - + dgram->data = calloc(1, dgram->size); if (dgram->data == NULL) return ENOMEM; - + icmpv6_message_t *icmpv6 = (icmpv6_message_t *) dgram->data; - + icmpv6->type = ndp->opcode; icmpv6->code = 0; memset(icmpv6->un.ndp.reserved, 0, 3); - + ndp_message_t *message = (ndp_message_t *) (icmpv6 + 1); - + if (ndp->opcode == ICMPV6_NEIGHBOUR_SOLICITATION) { host2addr128_t_be(ndp->solicited_ip, message->target_address); @@ -502,10 +502,10 @@ icmpv6->un.ndp.flags = NDP_FLAG_OVERRIDE | NDP_FLAG_SOLICITED; } - + message->length = 1; addr48(ndp->sender_hw_addr, message->mac); - + icmpv6_phdr_t phdr; - + host2addr128_t_be(ndp->sender_proto_addr, phdr.src_addr); host2addr128_t_be(ndp->target_proto_addr, phdr.dest_addr); @@ -513,14 +513,14 @@ memset(phdr.zeroes, 0, 3); phdr.next = IP_PROTO_ICMPV6; - + uint16_t cs_phdr = inet_checksum_calc(INET_CHECKSUM_INIT, &phdr, sizeof(icmpv6_phdr_t)); - + uint16_t cs_all = inet_checksum_calc(cs_phdr, dgram->data, dgram->size); - + icmpv6->checksum = host2uint16_t_be(cs_all); - + return EOK; } @@ -541,17 +541,17 @@ if (src_ver != ip_v6) return EINVAL; - + if (dgram->size < sizeof(icmpv6_message_t) + sizeof(ndp_message_t)) return EINVAL; - + icmpv6_message_t *icmpv6 = (icmpv6_message_t *) dgram->data; - + ndp->opcode = icmpv6->type; - + ndp_message_t *message = (ndp_message_t *) (icmpv6 + 1); - + addr128_t_be2host(message->target_address, ndp->target_proto_addr); addr48(message->mac, ndp->sender_hw_addr); - + return EOK; } Index: uspace/srv/net/inetsrv/sroute.c =================================================================== --- uspace/srv/net/inetsrv/sroute.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/sroute.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -96,37 +96,37 @@ { ip_ver_t addr_ver = inet_addr_get(addr, NULL, NULL); - + inet_sroute_t *best = NULL; uint8_t best_bits = 0; - - fibril_mutex_lock(&sroute_list_lock); - + + fibril_mutex_lock(&sroute_list_lock); + list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) { uint8_t dest_bits; ip_ver_t dest_ver = inet_naddr_get(&sroute->dest, NULL, NULL, &dest_bits); - + /* Skip comparison with different address family */ if (addr_ver != dest_ver) continue; - + /* Look for the most specific route */ if ((best != NULL) && (best_bits >= dest_bits)) continue; - + if (inet_naddr_compare_mask(&sroute->dest, addr)) { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found candidate %p", sroute); - + best = sroute; best_bits = dest_bits; } } - + if (best == NULL) log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found"); - - fibril_mutex_unlock(&sroute_list_lock); - + + fibril_mutex_unlock(&sroute_list_lock); + return best; } Index: uspace/srv/net/loopip/loopip.c =================================================================== --- uspace/srv/net/loopip/loopip.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/loopip/loopip.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,5 +77,5 @@ typedef struct { link_t link; - + /* XXX Version should be part of SDU */ ip_ver_t ver; @@ -90,11 +90,11 @@ rqueue_entry_t *rqe = list_get_instance(link, rqueue_entry_t, link); - + (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->ver); - + free(rqe->sdu.data); free(rqe); } - + return 0; } @@ -103,5 +103,5 @@ { async_set_fallback_port_handler(loopip_client_conn, NULL); - + errno_t rc = loc_server_register(NAME); if (rc != EOK) { @@ -109,11 +109,11 @@ return rc; } - + iplink_srv_init(&loopip_iplink); loopip_iplink.ops = &loopip_iplink_ops; loopip_iplink.arg = NULL; - + prodcons_initialize(&loopip_rcv_queue); - + const char *svc_name = "net/loopback"; service_id_t sid; @@ -124,5 +124,5 @@ return rc; } - + category_id_t iplink_cat; rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); @@ -131,5 +131,5 @@ return rc; } - + rc = loc_service_add_to_cat(sid, iplink_cat); if (rc != EOK) { @@ -138,11 +138,11 @@ return rc; } - + fid_t fid = fibril_create(loopip_recv_fibril, NULL); if (fid == 0) return ENOMEM; - + fibril_add_ready(fid); - + return EOK; } @@ -169,9 +169,9 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()"); - + rqueue_entry_t *rqe = calloc(1, sizeof(rqueue_entry_t)); if (rqe == NULL) return ENOMEM; - + /* * Clone SDU @@ -183,13 +183,13 @@ return ENOMEM; } - + memcpy(rqe->sdu.data, sdu->data, sdu->size); rqe->sdu.size = sdu->size; - + /* * Insert to receive queue */ prodcons_produce(&loopip_rcv_queue, &rqe->link); - + return EOK; } @@ -198,9 +198,9 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip6_send()"); - + rqueue_entry_t *rqe = calloc(1, sizeof(rqueue_entry_t)); if (rqe == NULL) return ENOMEM; - + /* * Clone SDU @@ -212,13 +212,13 @@ return ENOMEM; } - + memcpy(rqe->sdu.data, sdu->data, sdu->size); rqe->sdu.size = sdu->size; - + /* * Insert to receive queue */ prodcons_produce(&loopip_rcv_queue, &rqe->link); - + return EOK; } @@ -250,5 +250,5 @@ { printf("%s: HelenOS loopback IP link provider\n", NAME); - + errno_t rc = log_init(NAME); if (rc != EOK) { @@ -256,5 +256,5 @@ return rc; } - + rc = loopip_init(); if (rc != EOK) { @@ -262,9 +262,9 @@ return rc; } - + printf("%s: Accepting connections.\n", NAME); task_retval(0); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/net/slip/slip.c =================================================================== --- uspace/srv/net/slip/slip.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/slip/slip.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -129,8 +129,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()"); - + chardev_t *chardev = (chardev_t *) srv->arg; uint8_t *data = sdu->data; - + /* * Strictly speaking, this is not prescribed by the RFC, but the RFC @@ -139,5 +139,5 @@ */ write_buffered(chardev, SLIP_END); - + for (size_t i = 0; i < sdu->size; i++) { switch (data[i]) { @@ -155,8 +155,8 @@ } } - + write_buffered(chardev, SLIP_END); write_flush(chardev); - + return EOK; } @@ -165,5 +165,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send6()"); - + return ENOTSUP; } @@ -272,5 +272,5 @@ break; } - + }