Index: uspace/lib/c/generic/net/icmp_api.c =================================================================== --- uspace/lib/c/generic/net/icmp_api.c (revision 727f04f2d1844c7dc0bcdc1f10ea16d670220276) +++ uspace/lib/c/generic/net/icmp_api.c (revision 45bb1d25acb2703ca691415d99c297d74c6f5cbb) @@ -89,5 +89,5 @@ tos, (sysarg_t) dont_fragment, NULL); - // send the address + /* Send the address */ async_data_write_start(icmp_phone, addr, (size_t) addrlen); Index: uspace/lib/c/generic/net/inet.c =================================================================== --- uspace/lib/c/generic/net/inet.c (revision 727f04f2d1844c7dc0bcdc1f10ea16d670220276) +++ uspace/lib/c/generic/net/inet.c (revision 45bb1d25acb2703ca691415d99c297d74c6f5cbb) @@ -64,9 +64,9 @@ switch (family) { case AF_INET: - // check the output buffer size + /* Check output buffer size */ if (length < INET_ADDRSTRLEN) return ENOMEM; - // fill the buffer with the IPv4 address + /* Fill buffer with IPv4 address */ snprintf(address, length, "%hhu.%hhu.%hhu.%hhu", data[0], data[1], data[2], data[3]); @@ -75,9 +75,9 @@ case AF_INET6: - // check the output buffer size + /* Check output buffer size */ if (length < INET6_ADDRSTRLEN) return ENOMEM; - // fill the buffer with the IPv6 address + /* Fill buffer with IPv6 address */ snprintf(address, length, "%hhx%hhx:%hhx%hhx:%hhx%hhx:%hhx%hhx:%hhx%hhx:%hhx%hhx:" @@ -124,5 +124,5 @@ return EINVAL; - // set the processing parameters + /* Set processing parameters */ switch (family) { case AF_INET: @@ -142,5 +142,5 @@ } - // erase if no address + /* Erase if no address */ if (!address) { bzero(data, count); @@ -148,28 +148,30 @@ } - // process the string from the beginning + /* Process string from the beginning */ next = address; index = 0; do { - // if the actual character is set + /* If the actual character is set */ if (next && *next) { - // if not on the first character + /* If not on the first character */ if (index) { - // move to the next character + /* Move to the next character */ ++next; } - // parse the actual integral value + /* Parse the actual integral value */ value = strtoul(next, &last, base); - // remember the last problematic character - // should be either '.' or ':' but is ignored to be more - // generic + /* + * Remember the last problematic character + * should be either '.' or ':' but is ignored to be + * more generic + */ next = last; - // fill the address data byte by byte + /* Fill the address data byte by byte */ shift = bytes - 1; do { - // like little endian + /* like little endian */ data[index + shift] = value; value >>= 8; @@ -178,5 +180,5 @@ index += bytes; } else { - // erase the rest of the address + /* Erase the rest of the address */ bzero(data + index, count - index); return EOK; Index: uspace/lib/c/generic/net/modules.c =================================================================== --- uspace/lib/c/generic/net/modules.c (revision 727f04f2d1844c7dc0bcdc1f10ea16d670220276) +++ uspace/lib/c/generic/net/modules.c (revision 45bb1d25acb2703ca691415d99c297d74c6f5cbb) @@ -63,5 +63,5 @@ int answer_count) { - // choose the most efficient answer function + /* Choose the most efficient answer function */ if (answer || (!answer_count)) { switch (answer_count) { @@ -178,5 +178,5 @@ int phone; - // if no timeout is set + /* If no timeout is set */ if (timeout <= 0) return async_connect_me_to_blocking(PHONE_NS, need, 0, 0); @@ -187,9 +187,9 @@ return phone; - // end if no time is left + /* Abort if no time is left */ if (timeout <= 0) return ETIMEOUT; - // wait the minimum of the module wait time and the timeout + /* Wait the minimum of the module wait time and the timeout */ usleep((timeout <= MODULE_WAIT_TIME) ? timeout : MODULE_WAIT_TIME); @@ -214,9 +214,9 @@ ipc_callid_t callid; - // fetch the request + /* Fetch the request */ if (!async_data_read_receive(&callid, &length)) return EINVAL; - // check the requested data size + /* Check the requested data size */ if (length < data_length) { async_data_read_finalize(callid, data, length); @@ -224,5 +224,5 @@ } - // send the data + /* Send the data */ return async_data_read_finalize(callid, data, data_length); } @@ -242,5 +242,5 @@ if (answer) { IPC_SET_RETVAL(*answer, 0); - // just to be precize + /* Just to be precise */ IPC_SET_IMETHOD(*answer, 0); IPC_SET_ARG1(*answer, 0); Index: uspace/lib/c/generic/net/packet.c =================================================================== --- uspace/lib/c/generic/net/packet.c (revision 727f04f2d1844c7dc0bcdc1f10ea16d670220276) +++ uspace/lib/c/generic/net/packet.c (revision 45bb1d25acb2703ca691415d99c297d74c6f5cbb) @@ -191,5 +191,5 @@ } gpm_destroy(&pm_globals.packet_map); - // leave locked + /* leave locked */ } Index: uspace/lib/c/generic/net/socket_client.c =================================================================== --- uspace/lib/c/generic/net/socket_client.c (revision 727f04f2d1844c7dc0bcdc1f10ea16d670220276) +++ uspace/lib/c/generic/net/socket_client.c (revision 45bb1d25acb2703ca691415d99c297d74c6f5cbb) @@ -220,5 +220,5 @@ fibril_rwlock_read_lock(&socket_globals.lock); - // find the socket + /* Find the socket */ socket = sockets_find(socket_get_sockets(), SOCKET_GET_SOCKET_ID(call)); @@ -232,10 +232,10 @@ case NET_SOCKET_RECEIVED: fibril_mutex_lock(&socket->receive_lock); - // push the number of received packet fragments + /* Push the number of received packet fragments */ rc = dyn_fifo_push(&socket->received, SOCKET_GET_DATA_FRAGMENTS(call), SOCKET_MAX_RECEIVED_SIZE); if (rc == EOK) { - // signal the received packet + /* Signal the received packet */ fibril_condvar_signal(&socket->receive_signal); } @@ -244,10 +244,10 @@ case NET_SOCKET_ACCEPTED: - // push the new socket identifier + /* Push the new socket identifier */ fibril_mutex_lock(&socket->accept_lock); rc = dyn_fifo_push(&socket->accepted, 1, SOCKET_MAX_ACCEPTED_SIZE); if (rc == EOK) { - // signal the accepted socket + /* Signal the accepted socket */ fibril_condvar_signal(&socket->accept_signal); } @@ -264,5 +264,5 @@ fibril_rwlock_write_lock(&socket->sending_lock); - // set the data fragment size + /* Set the data fragment size */ socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE(call); @@ -342,5 +342,5 @@ socket_id = 1; ++count; - // only this branch for last_id + /* Only this branch for last_id */ } else { if (socket_id < INT_MAX) { @@ -408,5 +408,5 @@ int rc; - // find the appropriate service + /* Find the appropriate service */ switch (domain) { case PF_INET: @@ -457,5 +457,5 @@ return phone; - // create a new socket structure + /* Create a new socket structure */ socket = (socket_t *) malloc(sizeof(socket_t)); if (!socket) @@ -465,5 +465,5 @@ fibril_rwlock_write_lock(&socket_globals.lock); - // request a new socket + /* Request a new socket */ socket_id = socket_generate_new_id(); if (socket_id <= 0) { @@ -484,7 +484,7 @@ socket->header_size = (size_t) header_size; - // finish the new socket initialization + /* Finish the new socket initialization */ socket_initialize(socket, socket_id, phone, service); - // store the new socket + /* Store the new socket */ rc = sockets_add(socket_get_sockets(), socket_id, socket); @@ -531,5 +531,5 @@ fibril_rwlock_read_lock(&socket_globals.lock); - // find the socket + /* Find the socket */ socket = sockets_find(socket_get_sockets(), socket_id); if (!socket) { @@ -538,8 +538,8 @@ } - // request the message + /* Request the message */ message_id = async_send_3(socket->phone, message, (sysarg_t) socket->socket_id, arg2, socket->service, NULL); - // send the address + /* Send the address */ async_data_write_start(socket->phone, data, datalength); @@ -566,5 +566,5 @@ return EINVAL; - // send the address + /* Send the address */ return socket_send_data(socket_id, NET_SOCKET_BIND, 0, my_addr, (size_t) addrlen); @@ -591,5 +591,5 @@ fibril_rwlock_read_lock(&socket_globals.lock); - // find the socket + /* Find the socket */ socket = sockets_find(socket_get_sockets(), socket_id); if (!socket) { @@ -598,5 +598,5 @@ } - // request listen backlog change + /* Request listen backlog change */ result = (int) async_req_3_0(socket->phone, NET_SOCKET_LISTEN, (sysarg_t) socket->socket_id, (sysarg_t) backlog, socket->service); @@ -634,5 +634,5 @@ fibril_rwlock_write_lock(&socket_globals.lock); - // find the socket + /* Find the socket */ socket = sockets_find(socket_get_sockets(), socket_id); if (!socket) { @@ -643,10 +643,10 @@ fibril_mutex_lock(&socket->accept_lock); - // wait for an accepted socket + /* Wait for an accepted socket */ ++ socket->blocked; while (dyn_fifo_value(&socket->accepted) <= 0) { fibril_rwlock_write_unlock(&socket_globals.lock); fibril_condvar_wait(&socket->accept_signal, &socket->accept_lock); - // drop the accept lock to avoid deadlock + /* Drop the accept lock to avoid deadlock */ fibril_mutex_unlock(&socket->accept_lock); fibril_rwlock_write_lock(&socket_globals.lock); @@ -655,5 +655,5 @@ -- socket->blocked; - // create a new scoket + /* Create a new socket */ new_socket = (socket_t *) malloc(sizeof(socket_t)); if (!new_socket) { @@ -681,10 +681,10 @@ } - // request accept + /* Request accept */ message_id = async_send_5(socket->phone, NET_SOCKET_ACCEPT, (sysarg_t) socket->socket_id, 0, socket->service, 0, new_socket->socket_id, &answer); - // read address + /* Read address */ ipc_data_read_start(socket->phone, cliaddr, *addrlen); fibril_rwlock_write_unlock(&socket_globals.lock); @@ -695,12 +695,12 @@ result = EINVAL; - // dequeue the accepted socket if successful + /* Dequeue the accepted socket if successful */ dyn_fifo_pop(&socket->accepted); - // set address length + /* Set address length */ *addrlen = SOCKET_GET_ADDRESS_LENGTH(answer); new_socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE(answer); } else if (result == ENOTSOCK) { - // empty the queue if no accepted sockets + /* Empty the queue if no accepted sockets */ while (dyn_fifo_pop(&socket->accepted) > 0) ; @@ -731,5 +731,5 @@ return EDESTADDRREQ; - // send the address + /* Send the address */ return socket_send_data(socket_id, NET_SOCKET_CONNECT, 0, serv_addr, addrlen); @@ -744,5 +744,5 @@ int accepted_id; - // destroy all accepted sockets + /* Destroy all accepted sockets */ while ((accepted_id = dyn_fifo_pop(&socket->accepted)) >= 0) socket_destroy(sockets_find(socket_get_sockets(), accepted_id)); @@ -780,5 +780,5 @@ } - // request close + /* Request close */ rc = (int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE, (sysarg_t) socket->socket_id, 0, socket->service); @@ -787,5 +787,5 @@ return rc; } - // free the socket structure + /* Free the socket structure */ socket_destroy(socket); @@ -833,5 +833,5 @@ fibril_rwlock_read_lock(&socket_globals.lock); - // find socket + /* Find socket */ socket = sockets_find(socket_get_sockets(), socket_id); if (!socket) { @@ -842,5 +842,5 @@ fibril_rwlock_read_lock(&socket->sending_lock); - // compute data fragment count + /* Compute data fragment count */ if (socket->data_fragment_size > 0) { fragments = (datalength + socket->header_size) / @@ -853,5 +853,5 @@ } - // request send + /* Request send */ message_id = async_send_5(socket->phone, message, (sysarg_t) socket->socket_id, @@ -859,12 +859,12 @@ socket->service, (sysarg_t) flags, fragments, &answer); - // send the address if given + /* Send the address if given */ if (!toaddr || (async_data_write_start(socket->phone, toaddr, addrlen) == EOK)) { if (fragments == 1) { - // send all if only one fragment + /* Send all if only one fragment */ async_data_write_start(socket->phone, data, datalength); } else { - // send the first fragment + /* Send the first fragment */ async_data_write_start(socket->phone, data, socket->data_fragment_size - socket->header_size); @@ -872,5 +872,5 @@ socket->data_fragment_size - socket->header_size; - // send the middle fragments + /* Send the middle fragments */ while (--fragments > 1) { async_data_write_start(socket->phone, data, @@ -880,5 +880,5 @@ } - // send the last fragment + /* Send the last fragment */ async_data_write_start(socket->phone, data, (datalength + socket->header_size) % @@ -892,5 +892,5 @@ (SOCKET_GET_DATA_FRAGMENT_SIZE(answer) != socket->data_fragment_size)) { - // set the data fragment size + /* Set the data fragment size */ socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE(answer); @@ -917,5 +917,5 @@ int send(int socket_id, void *data, size_t datalength, int flags) { - // without the address + /* Without the address */ return sendto_core(NET_SOCKET_SEND, socket_id, data, datalength, flags, NULL, 0); @@ -950,5 +950,5 @@ return EDESTADDRREQ; - // with the address + /* With the address */ return sendto_core(NET_SOCKET_SENDTO, socket_id, data, datalength, flags, toaddr, addrlen); @@ -998,5 +998,5 @@ fibril_rwlock_read_lock(&socket_globals.lock); - // find the socket + /* Find the socket */ socket = sockets_find(socket_get_sockets(), socket_id); if (!socket) { @@ -1006,5 +1006,5 @@ fibril_mutex_lock(&socket->receive_lock); - // wait for a received packet + /* Wait for a received packet */ ++socket->blocked; while ((result = dyn_fifo_value(&socket->received)) < 0) { @@ -1013,5 +1013,5 @@ &socket->receive_lock); - // drop the receive lock to avoid deadlock + /* Drop the receive lock to avoid deadlock */ fibril_mutex_unlock(&socket->receive_lock); fibril_rwlock_read_lock(&socket_globals.lock); @@ -1026,5 +1026,5 @@ } - // prepare lengths if more fragments + /* Prepare lengths if more fragments */ if (fragments > 1) { lengths = (size_t *) malloc(sizeof(size_t) * fragments + @@ -1036,19 +1036,19 @@ } - // request packet data + /* Request packet data */ message_id = async_send_4(socket->phone, message, (sysarg_t) socket->socket_id, 0, socket->service, (sysarg_t) flags, &answer); - // read the address if desired + /* Read the address if desired */ if(!fromaddr || (async_data_read_start(socket->phone, fromaddr, *addrlen) == EOK)) { - // read the fragment lengths + /* Read the fragment lengths */ if (async_data_read_start(socket->phone, lengths, sizeof(int) * (fragments + 1)) == EOK) { if (lengths[fragments] <= datalength) { - // read all fragments if long enough + /* Read all fragments if long enough */ for (index = 0; index < fragments; ++index) { @@ -1065,14 +1065,14 @@ free(lengths); } else { /* fragments == 1 */ - // request packet data + /* Request packet data */ message_id = async_send_4(socket->phone, message, (sysarg_t) socket->socket_id, 0, socket->service, (sysarg_t) flags, &answer); - // read the address if desired + /* Read the address if desired */ if (!fromaddr || (async_data_read_start(socket->phone, fromaddr, *addrlen) == EOK)) { - // read all if only one fragment + /* Read all if only one fragment */ async_data_read_start(socket->phone, data, datalength); } @@ -1082,9 +1082,9 @@ result = (int) ipc_result; if (result == EOK) { - // dequeue the received packet + /* Dequeue the received packet */ dyn_fifo_pop(&socket->received); - // return read data length + /* Return read data length */ retval = SOCKET_GET_READ_DATA_LENGTH(answer); - // set address length + /* Set address length */ if (fromaddr && addrlen) *addrlen = SOCKET_GET_ADDRESS_LENGTH(answer); @@ -1114,5 +1114,5 @@ ssize_t recv(int socket_id, void *data, size_t datalength, int flags) { - // without the address + /* Without the address */ return recvfrom_core(NET_SOCKET_RECV, socket_id, data, datalength, flags, NULL, NULL); @@ -1146,5 +1146,5 @@ return NO_DATA; - // with the address + /* With the address */ return recvfrom_core(NET_SOCKET_RECVFROM, socket_id, data, datalength, flags, fromaddr, addrlen); @@ -1181,5 +1181,5 @@ fibril_rwlock_read_lock(&socket_globals.lock); - // find the socket + /* Find the socket */ socket = sockets_find(socket_get_sockets(), socket_id); if (!socket) { @@ -1188,13 +1188,13 @@ } - // request option value + /* Request option value */ message_id = async_send_3(socket->phone, NET_SOCKET_GETSOCKOPT, (sysarg_t) socket->socket_id, (sysarg_t) optname, socket->service, NULL); - // read the length + /* Read the length */ if (async_data_read_start(socket->phone, optlen, sizeof(*optlen)) == EOK) { - // read the value + /* Read the value */ async_data_read_start(socket->phone, value, *optlen); } @@ -1223,5 +1223,5 @@ size_t optlen) { - // send the value + /* Send the value */ return socket_send_data(socket_id, NET_SOCKET_SETSOCKOPT, (sysarg_t) optname, value, optlen);