Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision ea5352913e3f4737d9d751831020498633794587) +++ uspace/srv/hw/irc/apic/apic.c (revision 28a3e74e6d058abea15c330564b3724616fe271b) @@ -56,5 +56,5 @@ static int apic_enable_irq(sysarg_t irq) { - // FIXME: TODO + /* FIXME: TODO */ return ENOTSUP; } Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision ea5352913e3f4737d9d751831020498633794587) +++ uspace/srv/net/il/ip/ip.c (revision 28a3e74e6d058abea15c330564b3724616fe271b) @@ -176,5 +176,5 @@ socklen_t addrlen; - // detach the first packet and release the others + /* Detach the first packet and release the others */ next = pq_detach(packet); if (next) @@ -185,5 +185,5 @@ return ENOMEM; - // get header + /* Get header */ header = (ip_header_t *) packet_get_data(packet); if (!header) @@ -192,13 +192,13 @@ } - // only for the first fragment + /* Only for the first fragment */ if (IP_FRAGMENT_OFFSET(header)) return EINVAL; - // not for the ICMP protocol + /* Not for the ICMP protocol */ if (header->protocol == IPPROTO_ICMP) return EPERM; - // set the destination address + /* Set the destination address */ switch (header->version) { case IPVERSION: @@ -351,5 +351,5 @@ configuration = &names[0]; - // get configuration + /* Get configuration */ rc = net_get_device_conf_req(ip_globals.net_phone, ip_netif->device_id, &configuration, count, &data); @@ -365,5 +365,5 @@ if (ip_netif->dhcp) { - // TODO dhcp + /* TODO dhcp */ net_free_settings(configuration, data); return ENOTSUP; @@ -398,5 +398,5 @@ } } else { - // TODO ipv6 in separate module + /* TODO ipv6 in separate module */ net_free_settings(configuration, data); return ENOTSUP; @@ -419,5 +419,5 @@ } - // binds the netif service which also initializes the device + /* Bind netif service which also initializes the device */ ip_netif->phone = nil_bind_service(ip_netif->service, (sysarg_t) ip_netif->device_id, SERVICE_IP, @@ -429,5 +429,5 @@ } - // has to be after the device netif module initialization + /* Has to be after the device netif module initialization */ if (ip_netif->arp) { if (route) { @@ -445,5 +445,5 @@ } - // get packet dimensions + /* Get packet dimensions */ rc = nil_packet_size_req(ip_netif->phone, ip_netif->device_id, &ip_netif->packet_dimension); @@ -463,5 +463,5 @@ if (gateway.s_addr) { - // the default gateway + /* The default gateway */ ip_globals.gateway.address.s_addr = 0; ip_globals.gateway.netmask.s_addr = 0; @@ -512,10 +512,10 @@ ip_netif->arp->usage++; - // print the settings + /* Print the settings */ printf("%s: Device registered (id: %d, phone: %d, ipv: %d, conf: %s)\n", NAME, ip_netif->device_id, ip_netif->phone, ip_netif->ipv, ip_netif->dhcp ? "dhcp" : "static"); - // TODO ipv6 addresses + /* TODO ipv6 addresses */ char address[INET_ADDRSTRLEN]; @@ -587,5 +587,5 @@ ip_netif_t *netif; - // start with the last netif - the newest one + /* Start with the last netif - the newest one */ index = ip_netifs_count(&ip_globals.netifs) - 1; while (index >= 0) { @@ -629,18 +629,18 @@ size_t length; - // copy first itself + /* Copy first itself */ memcpy(last, first, sizeof(ip_header_t)); length = sizeof(ip_header_t); next = sizeof(ip_header_t); - // process all ip options + /* Process all IP options */ while (next < first->header_length) { option = (ip_option_t *) (((uint8_t *) first) + next); - // skip end or noop + /* Skip end or noop */ if ((option->type == IPOPT_END) || (option->type == IPOPT_NOOP)) { next++; } else { - // copy if told so or skip + /* Copy if told so or skip */ if (IPOPT_COPIED(option->type)) { memcpy(((uint8_t *) last) + length, @@ -648,10 +648,10 @@ length += option->length; } - // next option + /* Next option */ next += option->length; } } - // align 4 byte boundary + /* Align 4 byte boundary */ if (length % 4) { bzero(((uint8_t *) last) + length, 4 - (length % 4)); @@ -789,5 +789,5 @@ header->total_length = htons(length); - // unnecessary for all protocols + /* Unnecessary for all protocols */ header->header_checksum = IP_HEADER_CHECKSUM(header); @@ -916,14 +916,14 @@ return ENOMEM; - // get header + /* Get header */ header = (ip_header_t *) packet_get_data(packet); if (!header) return EINVAL; - // fragmentation forbidden? + /* Fragmentation forbidden? */ if(header->flags & IPFLAG_DONT_FRAGMENT) return EPERM; - // create the last fragment + /* Create the last fragment */ new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length, suffix, ((addrlen > addr_len) ? addrlen : addr_len)); @@ -931,5 +931,5 @@ return ENOMEM; - // allocate as much as originally + /* Allocate as much as originally */ last_header = (ip_header_t *) packet_suffix(new_packet, IP_HEADER_LENGTH(header)); @@ -939,5 +939,5 @@ ip_create_last_header(last_header, header); - // trim the unused space + /* Trim the unused space */ rc = packet_trim(new_packet, 0, IP_HEADER_LENGTH(header) - IP_HEADER_LENGTH(last_header)); @@ -945,6 +945,6 @@ return ip_release_and_return(packet, rc); - // biggest multiple of 8 lower than content - // TODO even fragmentation? + /* Greatest multiple of 8 lower than content */ + /* TODO even fragmentation? */ length = length & ~0x7; @@ -957,8 +957,8 @@ return ip_release_and_return(packet, rc); - // mark the first as fragmented + /* Mark the first as fragmented */ header->flags |= IPFLAG_MORE_FRAGMENTS; - // create middle framgents + /* Create middle fragments */ while (IP_TOTAL_LENGTH(header) > length) { new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, @@ -981,5 +981,5 @@ } - // finish the first fragment + /* Finish the first fragment */ header->header_checksum = IP_HEADER_CHECKSUM(header); @@ -1012,5 +1012,5 @@ next = packet; - // check all packets + /* Check all packets */ while (next) { length = packet_get_data_length(next); @@ -1021,5 +1021,5 @@ } - // too long + /* Too long */ result = ip_fragment_packet(next, content, prefix, suffix, addr_len); @@ -1027,13 +1027,13 @@ new_packet = pq_detach(next); if (next == packet) { - // the new first packet of the queue + /* The new first packet of the queue */ packet = new_packet; } - // fragmentation needed? + /* Fragmentation needed? */ if (result == EPERM) { phone = ip_prepare_icmp_and_get_phone( error, next, NULL); if (phone >= 0) { - // fragmentation necessary ICMP + /* Fragmentation necessary ICMP */ icmp_destination_unreachable_msg(phone, ICMP_FRAG_NEEDED, content, next); @@ -1080,5 +1080,5 @@ int rc; - // get destination hardware address + /* Get destination hardware address */ if (netif->arp && (route->address.s_addr != dest.s_addr)) { destination.value = route->gateway.s_addr ? @@ -1102,5 +1102,5 @@ NULL); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1148,6 +1148,8 @@ int rc; - // addresses in the host byte order - // should be the next hop address or the target destination address + /* + * Addresses in the host byte order + * Should be the next hop address or the target destination address + */ addrlen = packet_get_addr(packet, NULL, (uint8_t **) &addr); if (addrlen < 0) @@ -1174,5 +1176,5 @@ fibril_rwlock_read_lock(&ip_globals.netifs_lock); - // device specified? + /* Device specified? */ if (device_id > 0) { netif = ip_netifs_find(&ip_globals.netifs, device_id); @@ -1190,5 +1192,5 @@ phone = ip_prepare_icmp_and_get_phone(error, packet, NULL); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_NET_UNREACH, 0, packet); @@ -1198,6 +1200,8 @@ if (error) { - // do not send for broadcast, anycast packets or network - // broadcast + /* + * Do not send for broadcast, anycast packets or network + * broadcast. + */ if (!dest->s_addr || !(~dest->s_addr) || !(~((dest->s_addr & ~route->netmask.s_addr) | @@ -1208,8 +1212,8 @@ } - // if the local host is the destination + /* Ff the local host is the destination */ if ((route->address.s_addr == dest->s_addr) && (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) { - // find the loopback device to deliver + /* Find the loopback device to deliver */ dest->s_addr = IPV4_LOCALHOST_ADDRESS; route = ip_find_route(*dest); @@ -1220,5 +1224,5 @@ NULL); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1252,5 +1256,5 @@ fibril_rwlock_write_lock(&ip_globals.netifs_lock); - // find the device + /* Find the device */ netif = ip_netifs_find(&ip_globals.netifs, device_id); if (!netif) { @@ -1275,5 +1279,5 @@ in_addr_t destination; - // TODO search set ipopt route? + /* TODO search set ipopt route? */ destination.s_addr = header->destination_address; return destination; @@ -1317,5 +1321,5 @@ if ((header->flags & IPFLAG_MORE_FRAGMENTS) || IP_FRAGMENT_OFFSET(header)) { - // TODO fragmented + /* TODO fragmented */ return ENOTSUP; } @@ -1344,5 +1348,5 @@ return ip_release_and_return(packet, rc); - // trim padding if present + /* Trim padding if present */ if (!error && (IP_TOTAL_LENGTH(header) < packet_get_data_length(packet))) { @@ -1360,5 +1364,5 @@ phone = ip_prepare_icmp_and_get_phone(error, packet, header); if (phone >= 0) { - // unreachable ICMP + /* Unreachable ICMP */ icmp_destination_unreachable_msg(phone, ICMP_PROT_UNREACH, 0, packet); @@ -1417,10 +1421,10 @@ return ip_release_and_return(packet, ENOMEM); - // checksum + /* Checksum */ if ((header->header_checksum) && (IP_HEADER_CHECKSUM(header) != IP_CHECKSUM_ZERO)) { phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // checksum error ICMP + /* Checksum error ICMP */ icmp_parameter_problem_msg(phone, ICMP_PARAM_POINTER, ((size_t) ((void *) &header->header_checksum)) - @@ -1433,5 +1437,5 @@ phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // ttl exceeded ICMP + /* ttl exceeded ICMP */ icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet); } @@ -1439,8 +1443,8 @@ } - // process ipopt and get destination + /* Process ipopt and get destination */ dest = ip_get_destination(header); - // set the addrination address + /* Set the destination address */ switch (header->version) { case IPVERSION: @@ -1464,5 +1468,5 @@ phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // unreachable ICMP + /* Unreachable ICMP */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1472,5 +1476,5 @@ if (route->address.s_addr == dest.s_addr) { - // local delivery + /* Local delivery */ return ip_deliver_local(device_id, packet, header, 0); } @@ -1484,5 +1488,5 @@ phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1770,8 +1774,8 @@ header = (ip_header_t *)(data + offset); - // destination host unreachable? + /* Destination host unreachable? */ if ((type != ICMP_DEST_UNREACH) || (code != ICMP_HOST_UNREACH)) { - // no, something else + /* No, something else */ break; } @@ -1787,8 +1791,8 @@ route = ip_routes_get_index(&netif->routes, 0); - // from the same network? + /* From the same network? */ if (route && ((route->address.s_addr & route->netmask.s_addr) == (header->destination_address & route->netmask.s_addr))) { - // clear the ARP mapping if any + /* Clear the ARP mapping if any */ address.value = (uint8_t *) &header->destination_address; address.length = sizeof(header->destination_address); @@ -1844,8 +1848,8 @@ fibril_rwlock_read_lock(&ip_globals.lock); route = ip_find_route(*dest); - // if the local host is the destination + /* If the local host is the destination */ if (route && (route->address.s_addr == dest->s_addr) && (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) { - // find the loopback device to deliver + /* Find the loopback device to deliver */ dest->s_addr = IPV4_LOCALHOST_ADDRESS; route = ip_find_route(*dest); Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision ea5352913e3f4737d9d751831020498633794587) +++ uspace/srv/net/nil/eth/eth.c (revision 28a3e74e6d058abea15c330564b3724616fe271b) @@ -531,5 +531,5 @@ proto->service); } else { - // drop invalid/unknown + /* Drop invalid/unknown */ pq_release_remote(eth_globals.net_phone, packet_get_id(packet)); Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision ea5352913e3f4737d9d751831020498633794587) +++ uspace/srv/net/tl/tcp/tcp.c (revision 28a3e74e6d058abea15c330564b3724616fe271b) @@ -299,7 +299,8 @@ return tcp_release_and_return(packet, NO_DATA); -// printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header), -// ntohs(header->destination_port)); - +#if 0 + printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header), + ntohs(header->destination_port)); +#endif result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest); if (result <= 0) @@ -1062,5 +1063,5 @@ tcp_process_acknowledgement(socket, socket_data, header); - socket_data->next_incoming = ntohl(header->sequence_number); // + 1; + socket_data->next_incoming = ntohl(header->sequence_number); /* + 1; */ pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); socket_data->state = TCP_SOCKET_ESTABLISHED; Index: uspace/srv/net/tl/tcp/tcp.h =================================================================== --- uspace/srv/net/tl/tcp/tcp.h (revision ea5352913e3f4737d9d751831020498633794587) +++ uspace/srv/net/tl/tcp/tcp.h (revision 28a3e74e6d058abea15c330564b3724616fe271b) @@ -190,7 +190,4 @@ int backlog; -// /** Segment size. */ -// size_t segment_size; - /** * Parent listening socket identifier. Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision ea5352913e3f4737d9d751831020498633794587) +++ uspace/srv/vfs/vfs_ops.c (revision 28a3e74e6d058abea15c330564b3724616fe271b) @@ -611,5 +611,5 @@ void vfs_open_node(ipc_callid_t rid, ipc_call_t *request) { - // FIXME: check for sanity of the supplied fs, dev and index + /* FIXME: check for sanity of the supplied fs, dev and index */ /*