Changeset 2a786f9 in mainline

Timestamp:

2010-09-22T19:07:02Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ec1bdc8

Parents:

dc94cb2 (diff), 921a860 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net.

Location:

uspace

Files:

• lib/net/generic/net_remote.c (modified) (1 diff)
• lib/net/generic/packet_remote.c (modified) (5 diffs)
• lib/net/il/ip_remote.c (modified) (1 diff)
• lib/net/tl/tl_common.c (modified) (7 diffs)
• srv/net/tl/udp/udp.c (modified) (23 diffs)

uspace/lib/net/generic/net_remote.c

@@ -47 +47 @@
 #include <net_net_messages.h>
 
-int net_connect_module(services_t service){
+int net_connect_module(services_t service)
+{
         return connect_to_service(SERVICE_NETWORKING);
 }
 
-void net_free_settings(measured_string_ref settings, char * data){
-        if(settings){
+void net_free_settings(measured_string_ref settings, char * data)
+{
+        if (settings)
                 free(settings);
-        }
-        if(data){
+
+        if (data)
                 free(data);
-        }
 }
 
-int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data){
-        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data);
+int
+net_get_conf_req(int net_phone, measured_string_ref * configuration,
+    size_t count, char ** data)
+{
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0,
+            *configuration, count, configuration, data);
 }
 
-int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data){
-        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data);
+int
+net_get_device_conf_req(int net_phone, device_id_t device_id,
+    measured_string_ref * configuration, size_t count, char ** data)
+{
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
+            device_id, 0, *configuration, count, configuration, data);
 }
 

uspace/lib/net/generic/packet_remote.c

@@ -64 +64 @@
  *
  */
-static int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){
+static int
+packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+{
         ERROR_DECLARE;
         
         ipc_call_t answer;
         aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
+
         *packet = (packet_t) as_get_mappable_page(size);
         if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) ||
@@ -91 +94 @@
         
         *packet = pm_find(packet_id);
-        if (!(*packet)) {
+        if (!*packet) {
                 ipcarg_t size;
                 
-                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size));
+                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE,
+                    packet_id, &size));
                 ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
         }
-        if ((** packet).next) {
+        if ((*packet)->next) {
                 packet_t next;
                 
-                return packet_translate_remote(phone, &next, (** packet).next);
+                return packet_translate_remote(phone, &next, (*packet)->next);
         }
         
@@ -114 +118 @@
         ipcarg_t size;
         
-        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content,
-            addr_len, max_prefix, max_suffix, &packet_id, &size)))
+        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4,
+            max_content, addr_len, max_prefix, max_suffix, &packet_id, &size)))
                 return NULL;
         
@@ -121 +125 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
         }
@@ -141 +146 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
         }

uspace/lib/net/il/ip_remote.c

@@ -127 +127 @@
                 return EINVAL;
         
-        if ((!device_id) || (header) || (headerlen))
+        if ((!device_id) || (!header) || (!headerlen))
                 return EBADMEM;
         

uspace/lib/net/tl/tl_common.c

@@ -58 +58 @@
 DEVICE_MAP_IMPLEMENT(packet_dimensions, packet_dimension_t);
 
-int tl_get_address_port(const struct sockaddr * addr, int addrlen, uint16_t * port){
-        const struct sockaddr_in * address_in;
-        const struct sockaddr_in6 * address_in6;
-
-        if((addrlen <= 0) || ((size_t) addrlen < sizeof(struct sockaddr))){
-                return EINVAL;
-        }
-        switch(addr->sa_family){
-                case AF_INET:
-                        if(addrlen != sizeof(struct sockaddr_in)){
+int
+tl_get_address_port(const struct sockaddr *addr, int addrlen, uint16_t *port)
+{
+        const struct sockaddr_in *address_in;
+        const struct sockaddr_in6 *address_in6;
+
+        if ((addrlen <= 0) || ((size_t) addrlen < sizeof(struct sockaddr)))
+                return EINVAL;
+
+        switch (addr->sa_family) {
+        case AF_INET:
+                if (addrlen != sizeof(struct sockaddr_in))
+                        return EINVAL;
+
+                address_in = (struct sockaddr_in *) addr;
+                *port = ntohs(address_in->sin_port);
+                break;
+        case AF_INET6:
+                if (addrlen != sizeof(struct sockaddr_in6))
                                 return EINVAL;
-                        }
-                        address_in = (struct sockaddr_in *) addr;
-                        *port = ntohs(address_in->sin_port);
-                        break;
-                case AF_INET6:
-                        if(addrlen != sizeof(struct sockaddr_in6)){
-                                return EINVAL;
-                        }
-                        address_in6 = (struct sockaddr_in6 *) addr;
-                        *port = ntohs(address_in6->sin6_port);
-                        break;
-                default:
-                        return EAFNOSUPPORT;
-        }
+
+                address_in6 = (struct sockaddr_in6 *) addr;
+                *port = ntohs(address_in6->sin6_port);
+                break;
+        default:
+                return EAFNOSUPPORT;
+        }
+
         return EOK;
 }
@@ -112 +115 @@
                 return EBADMEM;
         
-        *packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
+        *packet_dimension = packet_dimensions_find(packet_dimensions,
+            device_id);
         if (!*packet_dimension) {
                 /* Ask for and remember them if not found */
@@ -136 +140 @@
 }
 
-int tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions, device_id_t device_id, size_t content){
+int
+tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+    device_id_t device_id, size_t content)
+{
         packet_dimension_ref packet_dimension;
 
         packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
-        if(! packet_dimension){
+        if (!packet_dimension)
                 return ENOENT;
-        }
         packet_dimension->content = content;
-        if(device_id != DEVICE_INVALID_ID){
-                packet_dimension = packet_dimensions_find(packet_dimensions, DEVICE_INVALID_ID);
-                if(packet_dimension){
-                        if(packet_dimension->content >= content){
+
+        if (device_id != DEVICE_INVALID_ID) {
+                packet_dimension = packet_dimensions_find(packet_dimensions,
+                    DEVICE_INVALID_ID);
+
+                if (packet_dimension) {
+                        if (packet_dimension->content >= content)
                                 packet_dimension->content = content;
-                        }else{
-                                packet_dimensions_exclude(packet_dimensions, DEVICE_INVALID_ID);
-                        }
+                        else
+                                packet_dimensions_exclude(packet_dimensions,
+                                    DEVICE_INVALID_ID);
+
                 }
         }
+
         return EOK;
 }
@@ -159 +170 @@
 int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
 {
-        struct sockaddr_in * address_in;
-        struct sockaddr_in6 * address_in6;
+        struct sockaddr_in *address_in;
+        struct sockaddr_in6 *address_in6;
         size_t length;
 
@@ -188 +199 @@
 }
 
-int tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet, services_t error){
+int
+tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet,
+    services_t error)
+{
         packet_t next;
-        uint8_t * src;
+        uint8_t *src;
         int length;
 
@@ -199 +213 @@
         
         length = packet_get_addr(packet, &src, NULL);
-        if((length > 0)
-                && (! error)
-                && (icmp_phone >= 0)
-        // set both addresses to the source one (avoids the source address deletion before setting the destination one)
-                && (packet_set_addr(packet, src, src, (size_t) length) == EOK)){
+        if ((length > 0) && (!error) && (icmp_phone >= 0) &&
+            // set both addresses to the source one (avoids the source address
+            // deletion before setting the destination one)
+            (packet_set_addr(packet, src, src, (size_t) length) == EOK)) {
                 return EOK;
-        }else{
+        } else
                 pq_release_remote(packet_phone, packet_get_id(packet));
-        }
+
         return ENOENT;
 }
 
-int tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix, const packet_dimension_ref dimension, const struct sockaddr * addr, socklen_t addrlen){
+int
+tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
+    const packet_dimension_ref dimension, const struct sockaddr *addr,
+    socklen_t addrlen)
+{
         ERROR_DECLARE;
 
@@ -218 +235 @@
         void * data;
 
-        if(! dimension){
-                return EINVAL;
-        }
+        if (!dimension)
+                return EINVAL;
+
         // get the data length
-        if(! async_data_write_receive(&callid, &length)){
-                return EINVAL;
-        }
+        if (!async_data_write_receive(&callid, &length))
+                return EINVAL;
+
         // get a new packet
-        *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix);
-        if(! packet){
+        *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len,
+            prefix + dimension->prefix, dimension->suffix);
+        if (!packet)
                 return ENOMEM;
-        }
+
         // allocate space in the packet
         data = packet_suffix(*packet, length);
-        if(! data){
+        if (!data) {
                 pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ENOMEM;
         }
+
         // read the data into the packet
-        if(ERROR_OCCURRED(async_data_write_finalize(callid, data, length))
-        // set the packet destination address
-                || ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen))){
+        if (ERROR_OCCURRED(async_data_write_finalize(callid, data, length)) ||
+            // set the packet destination address
+            ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr,
+            addrlen))) {
                 pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ERROR_CODE;
         }
+
         return (int) length;
 }

uspace/srv/net/tl/udp/udp.c

@@ -72 +72 @@
 #include "udp_module.h"
 
-/** UDP module name.
- */
+/** UDP module name. */
 #define NAME    "UDP protocol"
 
-/** Default UDP checksum computing.
- */
+/** Default UDP checksum computing. */
 #define NET_DEFAULT_UDP_CHECKSUM_COMPUTING      true
 
-/** Default UDP autobind when sending via unbound sockets.
- */
+/** Default UDP autobind when sending via unbound sockets. */
 #define NET_DEFAULT_UDP_AUTOBINDING     true
 
-/** Maximum UDP fragment size.
- */
-#define MAX_UDP_FRAGMENT_SIZE   65535
-
-/** Free ports pool start.
- */
-#define UDP_FREE_PORTS_START    1025
-
-/** Free ports pool end.
- */
+/** Maximum UDP fragment size. */
+#define MAX_UDP_FRAGMENT_SIZE           65535
+
+/** Free ports pool start. */
+#define UDP_FREE_PORTS_START            1025
+
+/** Free ports pool end. */
 #define UDP_FREE_PORTS_END              65535
 
 /** Processes the received UDP packet queue.
+ *
  *  Is used as an entry point from the underlying IP module.
  *  Locks the global lock and calls udp_process_packet() function.
+ *
  *  @param[in] device_id The receiving device identifier.
  *  @param[in,out] packet The received packet queue.
- *  @param receiver The target service. Ignored parameter.
- *  @param[in] error The packet error reporting service. Prefixes the received packet.
- *  @returns EOK on success.
- *  @returns Other error codes as defined for the udp_process_packet() function.
- */
-int udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver, services_t error);
+ *  @param receiver     The target service. Ignored parameter.
+ *  @param[in] error    The packet error reporting service. Prefixes the
+ *                      received packet.
+ *  @returns            EOK on success.
+ *  @returns            Other error codes as defined for the
+ *                      udp_process_packet() function.
+ */
+int
+udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver,
+    services_t error);
 
 /** Processes the received UDP packet queue.
+ *
  *  Notifies the destination socket application.
- *  Releases the packet on error or sends an ICMP error notification..
+ *  Releases the packet on error or sends an ICMP error notification.
+ *
  *  @param[in] device_id The receiving device identifier.
  *  @param[in,out] packet The received packet queue.
- *  @param[in] error The packet error reporting service. Prefixes the received packet.
- *  @returns EOK on success.
- *  @returns EINVAL if the packet is not valid.
- *  @returns EINVAL if the stored packet address is not the an_addr_t.
- *  @returns EINVAL if the packet does not contain any data.
- *  @returns NO_DATA if the packet content is shorter than the user datagram header.
- *  @returns ENOMEM if there is not enough memory left.
- *  @returns EADDRNOTAVAIL if the destination socket does not exist.
- *  @returns Other error codes as defined for the ip_client_process_packet() function.
- */
-int udp_process_packet(device_id_t device_id, packet_t packet, services_t error);
+ *  @param[in] error    The packet error reporting service. Prefixes the
+ *                      received packet.
+ *  @returns            EOK on success.
+ *  @returns            EINVAL if the packet is not valid.
+ *  @returns            EINVAL if the stored packet address is not the
+ *                      an_addr_t.
+ *  @returns            EINVAL if the packet does not contain any data.
+ *  @returns            NO_DATA if the packet content is shorter than the user
+ *                      datagram header.
+ *  @returns            ENOMEM if there is not enough memory left.
+ *  @returns            EADDRNOTAVAIL if the destination socket does not exist.
+ *  @returns            Other error codes as defined for the
+ *                      ip_client_process_packet() function.
+ */
+int
+udp_process_packet(device_id_t device_id, packet_t packet, services_t error);
 
 /** Releases the packet and returns the result.
- *  @param[in] packet The packet queue to be released.
- *  @param[in] result The result to be returned.
- *  @return The result parameter.
+ *
+ *  @param[in] packet   The packet queue to be released.
+ *  @param[in] result   The result to be returned.
+ *  @return             The result parameter.
  */
 int udp_release_and_return(packet_t packet, int result);
@@ -137 +145 @@
 
 /** Processes the socket client messages.
+ *
  *  Runs until the client module disconnects.
- *  @param[in] callid The message identifier.
- *  @param[in] call The message parameters.
- *  @returns EOK on success.
- *  @see socket.h
+ *
+ *  @param[in] callid   The message identifier.
+ *  @param[in] call     The message parameters.
+ *  @returns            EOK on success.
+ *  @see                socket.h
  */
 int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call);
 
 /** Sends data from the socket to the remote address.
+ *
  *  Binds the socket to a free port if not already connected/bound.
  *  Handles the NET_SOCKET_SENDTO message.
  *  Supports AF_INET and AF_INET6 address families.
+ *
  *  @param[in,out] local_sockets The application local sockets.
  *  @param[in] socket_id Socket identifier.
- *  @param[in] addr The destination address.
- *  @param[in] addrlen The address length.
+ *  @param[in] addr     The destination address.
+ *  @param[in] addrlen  The address length.
  *  @param[in] fragments The number of data fragments.
  *  @param[out] data_fragment_size The data fragment size in bytes.
- *  @param[in] flags Various send flags.
- *  @returns EOK on success.
- *  @returns EAFNOTSUPPORT if the address family is not supported.
- *  @returns ENOTSOCK if the socket is not found.
- *  @returns EINVAL if the address is invalid.
- *  @returns ENOTCONN if the sending socket is not and cannot be bound.
- *  @returns ENOMEM if there is not enough memory left.
- *  @returns Other error codes as defined for the socket_read_packet_data() function.
- *  @returns Other error codes as defined for the ip_client_prepare_packet() function.
- *  @returns Other error codes as defined for the ip_send_msg() function.
- */
-int udp_sendto_message(socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t * data_fragment_size, int flags);
+ *  @param[in] flags    Various send flags.
+ *  @returns            EOK on success.
+ *  @returns            EAFNOTSUPPORT if the address family is not supported.
+ *  @returns            ENOTSOCK if the socket is not found.
+ *  @returns            EINVAL if the address is invalid.
+ *  @returns            ENOTCONN if the sending socket is not and cannot be
+ *                      bound.
+ *  @returns            ENOMEM if there is not enough memory left.
+ *  @returns            Other error codes as defined for the
+ *                      socket_read_packet_data() function.
+ *  @returns            Other error codes as defined for the
+ *                      ip_client_prepare_packet() function.
+ *  @returns            Other error codes as defined for the ip_send_msg()
+ *                      function.
+ */
+int
+udp_sendto_message(socket_cores_ref local_sockets, int socket_id,
+    const struct sockaddr * addr, socklen_t addrlen, int fragments,
+    size_t * data_fragment_size, int flags);
 
 /** Receives data to the socket.
+ *
  *  Handles the NET_SOCKET_RECVFROM message.
  *  Replies the source address as well.
+ *
  *  @param[in] local_sockets The application local sockets.
  *  @param[in] socket_id Socket identifier.
- *  @param[in] flags Various receive flags.
- *  @param[out] addrlen The source address length.
- *  @returns The number of bytes received.
- *  @returns ENOTSOCK if the socket is not found.
- *  @returns NO_DATA if there are no received packets or data.
- *  @returns ENOMEM if there is not enough memory left.
- *  @returns EINVAL if the received address is not an IP address.
- *  @returns Other error codes as defined for the packet_translate() function.
- *  @returns Other error codes as defined for the data_reply() function.
- */
-int udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags, size_t * addrlen);
+ *  @param[in] flags    Various receive flags.
+ *  @param[out] addrlen The source address length.
+ *  @returns            The number of bytes received.
+ *  @returns            ENOTSOCK if the socket is not found.
+ *  @returns            NO_DATA if there are no received packets or data.
+ *  @returns            ENOMEM if there is not enough memory left.
+ *  @returns            EINVAL if the received address is not an IP address.
+ *  @returns            Other error codes as defined for the packet_translate()
+ *                      function.
+ *  @returns            Other error codes as defined for the data_reply()
+ *                      function.
+ */
+int
+udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags,
+    size_t * addrlen);
 
 /*@}*/
@@ -189 +214 @@
 /** UDP global data.
  */
-udp_globals_t   udp_globals;
-
-int udp_initialize(async_client_conn_t client_connection){
+udp_globals_t udp_globals;
+
+int udp_initialize(async_client_conn_t client_connection)
+{
         ERROR_DECLARE;
 
-        measured_string_t names[] = {{str_dup("UDP_CHECKSUM_COMPUTING"), 22}, {str_dup("UDP_AUTOBINDING"), 15}};
+        measured_string_t names[] = {
+                {
+                        str_dup("UDP_CHECKSUM_COMPUTING"),
+                        22
+                },
+                {
+                        str_dup("UDP_AUTOBINDING"),
+                        15
+                }
+        };
         measured_string_ref configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
@@ -201 +236 @@
         fibril_rwlock_initialize(&udp_globals.lock);
         fibril_rwlock_write_lock(&udp_globals.lock);
-        udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, ICMP_CONNECT_TIMEOUT);
-        udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, SERVICE_UDP, client_connection, udp_received_msg);
-        if(udp_globals.ip_phone < 0){
+
+        udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,
+            ICMP_CONNECT_TIMEOUT);
+        udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP,
+            SERVICE_UDP, client_connection, udp_received_msg);
+        if (udp_globals.ip_phone < 0)
                 return udp_globals.ip_phone;
-        }
+
         // read default packet dimensions
-        ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, &udp_globals.packet_dimension));
+        ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1,
+            &udp_globals.packet_dimension));
         ERROR_PROPAGATE(socket_ports_initialize(&udp_globals.sockets));
-        if(ERROR_OCCURRED(packet_dimensions_initialize(&udp_globals.dimensions))){
+        if (ERROR_OCCURRED(packet_dimensions_initialize(
+            &udp_globals.dimensions))) {
                 socket_ports_destroy(&udp_globals.sockets);
                 return ERROR_CODE;
@@ -216 +256 @@
         udp_globals.packet_dimension.content -= sizeof(udp_header_t);
         udp_globals.last_used_port = UDP_FREE_PORTS_START - 1;
+
         // get configuration
         udp_globals.checksum_computing = NET_DEFAULT_UDP_CHECKSUM_COMPUTING;
         udp_globals.autobinding = NET_DEFAULT_UDP_AUTOBINDING;
         configuration = &names[0];
-        ERROR_PROPAGATE(net_get_conf_req(udp_globals.net_phone, &configuration, count, &data));
-        if(configuration){
-                if(configuration[0].value){
-                        udp_globals.checksum_computing = (configuration[0].value[0] == 'y');
-                }
-                if(configuration[1].value){
-                        udp_globals.autobinding = (configuration[1].value[0] == 'y');
-                }
+        ERROR_PROPAGATE(net_get_conf_req(udp_globals.net_phone, &configuration,
+            count, &data));
+        if (configuration) {
+                if (configuration[0].value)
+                        udp_globals.checksum_computing =
+                            (configuration[0].value[0] == 'y');
+                
+                if (configuration[1].value)
+                        udp_globals.autobinding =
+                            (configuration[1].value[0] == 'y');
+
                 net_free_settings(configuration, data);
         }
+
         fibril_rwlock_write_unlock(&udp_globals.lock);
         return EOK;
 }
 
-int udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver, services_t error){
+int
+udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver,
+    services_t error)
+{
         int result;
 
         fibril_rwlock_write_lock(&udp_globals.lock);
         result = udp_process_packet(device_id, packet, error);
-        if(result != EOK){
+        if (result != EOK)
                 fibril_rwlock_write_unlock(&udp_globals.lock);
-        }
 
         return result;
 }
 
-int udp_process_packet(device_id_t device_id, packet_t packet, services_t error){
+int udp_process_packet(device_id_t device_id, packet_t packet, services_t error)
+{
         ERROR_DECLARE;
 
@@ -262 +310 @@
         icmp_code_t code;
         void *ip_header;
-        struct sockaddr * src;
-        struct sockaddr * dest;
+        struct sockaddr *src;
+        struct sockaddr *dest;
         packet_dimension_ref packet_dimension;
 
-        if(error){
-                switch(error){
-                        case SERVICE_ICMP:
-                                // ignore error
-                                // length = icmp_client_header_length(packet);
-                                // process error
-                                result = icmp_client_process_packet(packet, &type, &code, NULL, NULL);
-                                if(result < 0){
-                                        return udp_release_and_return(packet, result);
-                                }
-                                length = (size_t) result;
-                                if(ERROR_OCCURRED(packet_trim(packet, length, 0))){
-                                        return udp_release_and_return(packet, ERROR_CODE);
-                                }
-                                break;
-                        default:
-                                return udp_release_and_return(packet, ENOTSUP);
-                }
-        }
+        if (error) {
+                switch (error) {
+                case SERVICE_ICMP:
+                        // ignore error
+                        // length = icmp_client_header_length(packet);
+                        // process error
+                        result = icmp_client_process_packet(packet, &type,
+                            &code, NULL, NULL);
+                        if (result < 0)
+                                return udp_release_and_return(packet, result);
+                        length = (size_t) result;
+                        if (ERROR_OCCURRED(packet_trim(packet, length, 0)))
+                                return udp_release_and_return(packet,
+                                    ERROR_CODE);
+                        break;
+                default:
+                        return udp_release_and_return(packet, ENOTSUP);
+                }
+        }
+
         // TODO process received ipopts?
         result = ip_client_process_packet(packet, NULL, NULL, NULL, NULL, NULL);
-        if(result < 0){
+        if (result < 0)
                 return udp_release_and_return(packet, result);
-        }
         offset = (size_t) result;
 
         length = packet_get_data_length(packet);
-        if(length <= 0){
+        if (length <= 0)
                 return udp_release_and_return(packet, EINVAL);
-        }
-        if(length < UDP_HEADER_SIZE + offset){
+        if (length < UDP_HEADER_SIZE + offset)
                 return udp_release_and_return(packet, NO_DATA);
-        }
 
         // trim all but UDP header
-        if(ERROR_OCCURRED(packet_trim(packet, offset, 0))){
+        if (ERROR_OCCURRED(packet_trim(packet, offset, 0)))
                 return udp_release_and_return(packet, ERROR_CODE);
-        }
 
         // get udp header
         header = (udp_header_ref) packet_get_data(packet);
-        if(! header){
+        if (!header)
                 return udp_release_and_return(packet, NO_DATA);
-        }
+
         // find the destination socket
-        socket = socket_port_find(&udp_globals.sockets, ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING, 0);
-        if(! socket){
-                if(tl_prepare_icmp_packet(udp_globals.net_phone, udp_globals.icmp_phone, packet, error) == EOK){
-                        icmp_destination_unreachable_msg(udp_globals.icmp_phone, ICMP_PORT_UNREACH, 0, packet);
+        socket = socket_port_find(&udp_globals.sockets,
+        ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING, 0);
+        if (!socket) {
+                if (tl_prepare_icmp_packet(udp_globals.net_phone,
+                    udp_globals.icmp_phone, packet, error) == EOK) {
+                        icmp_destination_unreachable_msg(udp_globals.icmp_phone,
+                            ICMP_PORT_UNREACH, 0, packet);
                 }
                 return EADDRNOTAVAIL;
@@ -323 +371 @@
         fragments = 0;
         total_length = ntohs(header->total_length);
+
         // compute header checksum if set
-        if(header->checksum && (! error)){
-                result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest);
-                if(result <= 0){
+        if (header->checksum && (!error)) {
+                result = packet_get_addr(packet, (uint8_t **) &src,
+                    (uint8_t **) &dest);
+                if( result <= 0)
                         return udp_release_and_return(packet, result);
-                }
-                if(ERROR_OCCURRED(ip_client_get_pseudo_header(IPPROTO_UDP, src, result, dest, result, total_length, &ip_header, &length))){
+
+                if (ERROR_OCCURRED(ip_client_get_pseudo_header(IPPROTO_UDP,
+                    src, result, dest, result, total_length, &ip_header,
+                    &length))) {
                         return udp_release_and_return(packet, ERROR_CODE);
-                }else{
+                } else {
                         checksum = compute_checksum(0, ip_header, length);
-                        // the udp header checksum will be added with the first fragment later
+                        // the udp header checksum will be added with the first
+                        // fragment later
                         free(ip_header);
                 }
-        }else{
+        } else {
                 header->checksum = 0;
                 checksum = 0;
         }
 
-        do{
+        do {
                 ++ fragments;
                 length = packet_get_data_length(next_packet);
-                if(length <= 0){
+                if (length <= 0)
                         return udp_release_and_return(packet, NO_DATA);
-                }
-                if(total_length < length){
-                        if(ERROR_OCCURRED(packet_trim(next_packet, 0, length - total_length))){
-                                return udp_release_and_return(packet, ERROR_CODE);
+
+                if (total_length < length) {
+                        if (ERROR_OCCURRED(packet_trim(next_packet, 0,
+                            length - total_length))) {
+                                return udp_release_and_return(packet,
+                                    ERROR_CODE);
                         }
+
                         // add partial checksum if set
-                        if(header->checksum){
-                                checksum = compute_checksum(checksum, packet_get_data(packet), packet_get_data_length(packet));
+                        if (header->checksum) {
+                                checksum = compute_checksum(checksum,
+                                    packet_get_data(packet),
+                                    packet_get_data_length(packet));
                         }
+
                         // relese the rest of the packet fragments
                         tmp_packet = pq_next(next_packet);
-                        while(tmp_packet){
+                        while (tmp_packet) {
                                 next_packet = pq_detach(tmp_packet);
-                                pq_release_remote(udp_globals.net_phone, packet_get_id(tmp_packet));
+                                pq_release_remote(udp_globals.net_phone,
+                                    packet_get_id(tmp_packet));
                                 tmp_packet = next_packet;
                         }
+
                         // exit the loop
                         break;
                 }
                 total_length -= length;
+
                 // add partial checksum if set
-                if(header->checksum){
-                        checksum = compute_checksum(checksum, packet_get_data(packet), packet_get_data_length(packet));
-                }
-        }while((next_packet = pq_next(next_packet)) && (total_length > 0));
+                if (header->checksum) {
+                        checksum = compute_checksum(checksum,
+                            packet_get_data(packet),
+                            packet_get_data_length(packet));
+                }
+
+        } while ((next_packet = pq_next(next_packet)) && (total_length > 0));
 
         // check checksum
-        if(header->checksum){
-                if(flip_checksum(compact_checksum(checksum)) != IP_CHECKSUM_ZERO){
-                        if(tl_prepare_icmp_packet(udp_globals.net_phone, udp_globals.icmp_phone, packet, error) == EOK){
+        if (header->checksum) {
+                if (flip_checksum(compact_checksum(checksum)) !=
+                    IP_CHECKSUM_ZERO) {
+                        if (tl_prepare_icmp_packet(udp_globals.net_phone,
+                            udp_globals.icmp_phone, packet, error) == EOK) {
                                 // checksum error ICMP
-                                icmp_parameter_problem_msg(udp_globals.icmp_phone, ICMP_PARAM_POINTER, ((size_t) ((void *) &header->checksum)) - ((size_t) ((void *) header)), packet);
+                                icmp_parameter_problem_msg(
+                                    udp_globals.icmp_phone, ICMP_PARAM_POINTER,
+                                    ((size_t) ((void *) &header->checksum)) -
+                                    ((size_t) ((void *) header)), packet);
                         }
                         return EINVAL;
@@ -384 +454 @@
 
         // queue the received packet
-        if(ERROR_OCCURRED(dyn_fifo_push(&socket->received, packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE))
-            || ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension))){
+        if (ERROR_OCCURRED(dyn_fifo_push(&socket->received,
+            packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE)) ||
+            ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone,
+            &udp_globals.dimensions, device_id, &packet_dimension))) {
                 return udp_release_and_return(packet, ERROR_CODE);
         }
@@ -391 +463 @@
         // notify the destination socket
         fibril_rwlock_write_unlock(&udp_globals.lock);
-        async_msg_5(socket->phone, NET_SOCKET_RECEIVED, (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0, (ipcarg_t) fragments);
+        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+            (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0,
+            (ipcarg_t) fragments);
+
         return EOK;
 }
 
-int udp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int
+udp_message_standalone(ipc_callid_t callid, ipc_call_t * call,
+    ipc_call_t * answer, int * answer_count)
+{
         ERROR_DECLARE;
 
@@ -401 +479 @@
 
         *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
-                case NET_TL_RECEIVED:
-                        if(! ERROR_OCCURRED(packet_translate_remote(udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
-                                ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_UDP, IPC_GET_ERROR(call));
-                        }
-                        return ERROR_CODE;
-                case IPC_M_CONNECT_TO_ME:
-                        return udp_process_client_messages(callid, * call);
-        }
+
+        switch (IPC_GET_METHOD(*call)) {
+        case NET_TL_RECEIVED:
+                if (!ERROR_OCCURRED(packet_translate_remote(
+                    udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))) {
+                        ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call),
+                            packet, SERVICE_UDP, IPC_GET_ERROR(call));
+                }
+                return ERROR_CODE;
+        
+        case IPC_M_CONNECT_TO_ME:
+                return udp_process_client_messages(callid, * call);
+        }
+
         return ENOTSUP;
 }
 
-int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call){
+int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call)
+{
         int res;
         bool keep_on_going = true;
         socket_cores_t local_sockets;
         int app_phone = IPC_GET_PHONE(&call);
-        struct sockaddr * addr;
+        struct sockaddr *addr;
         int socket_id;
         size_t addrlen;
@@ -433 +517 @@
         answer_count = 0;
 
-        // The client connection is only in one fibril and therefore no additional locks are needed.
+        // The client connection is only in one fibril and therefore no
+        // additional locks are needed.
 
         socket_cores_initialize(&local_sockets);
 
-        while(keep_on_going){
+        while (keep_on_going) {
 
                 // answer the call
@@ -449 +534 @@
 
                 // process the call
-                switch(IPC_GET_METHOD(call)){
-                        case IPC_M_PHONE_HUNGUP:
-                                keep_on_going = false;
-                                res = EHANGUP;
+                switch (IPC_GET_METHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
+                        keep_on_going = false;
+                        res = EHANGUP;
+                        break;
+
+                case NET_SOCKET:
+                        socket_id = SOCKET_GET_SOCKET_ID(call);
+                        res = socket_create(&local_sockets, app_phone, NULL,
+                            &socket_id);
+                        SOCKET_SET_SOCKET_ID(answer, socket_id);
+
+                        if (res != EOK)
                                 break;
-                        case NET_SOCKET:
-                                socket_id = SOCKET_GET_SOCKET_ID(call);
-                                res = socket_create(&local_sockets, app_phone, NULL, &socket_id);
-                                SOCKET_SET_SOCKET_ID(answer, socket_id);
-
-                                if(res == EOK){
-                                        if (tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
-                                                SOCKET_SET_DATA_FRAGMENT_SIZE(answer, packet_dimension->content);
-                                        }
-//                                      SOCKET_SET_DATA_FRAGMENT_SIZE(answer, MAX_UDP_FRAGMENT_SIZE);
-                                        SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE);
-                                        answer_count = 3;
-                                }
+                        
+                        if (tl_get_ip_packet_dimension(udp_globals.ip_phone,
+                            &udp_globals.dimensions, DEVICE_INVALID_ID,
+                            &packet_dimension) == EOK) {
+                                SOCKET_SET_DATA_FRAGMENT_SIZE(answer,
+                                    packet_dimension->content);
+                        }
+
+//                      SOCKET_SET_DATA_FRAGMENT_SIZE(answer,
+//                          MAX_UDP_FRAGMENT_SIZE);
+                        SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE);
+                        answer_count = 3;
+                        break;
+
+                case NET_SOCKET_BIND:
+                        res = data_receive((void **) &addr, &addrlen);
+                        if (res != EOK)
                                 break;
-                        case NET_SOCKET_BIND:
-                                res = data_receive((void **) &addr, &addrlen);
-                                if(res == EOK){
-                                        fibril_rwlock_write_lock(&udp_globals.lock);
-                                        res = socket_bind(&local_sockets, &udp_globals.sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, udp_globals.last_used_port);
-                                        fibril_rwlock_write_unlock(&udp_globals.lock);
-                                        free(addr);
-                                }
+                        fibril_rwlock_write_lock(&udp_globals.lock);
+                        res = socket_bind(&local_sockets, &udp_globals.sockets,
+                            SOCKET_GET_SOCKET_ID(call), addr, addrlen,
+                            UDP_FREE_PORTS_START, UDP_FREE_PORTS_END,
+                            udp_globals.last_used_port);
+                        fibril_rwlock_write_unlock(&udp_globals.lock);
+                        free(addr);
+                        break;
+
+                case NET_SOCKET_SENDTO:
+                        res = data_receive((void **) &addr, &addrlen);
+                        if (res != EOK)
                                 break;
-                        case NET_SOCKET_SENDTO:
-                                res = data_receive((void **) &addr, &addrlen);
-                                if(res == EOK){
-                                        fibril_rwlock_write_lock(&udp_globals.lock);
-                                        res = udp_sendto_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS(call), &size, SOCKET_GET_FLAGS(call));
-                                        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size);
-                                        if(res != EOK){
-                                                fibril_rwlock_write_unlock(&udp_globals.lock);
-                                        }else{
-                                                answer_count = 2;
-                                        }
-                                        free(addr);
-                                }
+
+                        fibril_rwlock_write_lock(&udp_globals.lock);
+                        res = udp_sendto_message(&local_sockets,
+                            SOCKET_GET_SOCKET_ID(call), addr, addrlen,
+                            SOCKET_GET_DATA_FRAGMENTS(call), &size,
+                            SOCKET_GET_FLAGS(call));
+                        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size);
+
+                        if (res != EOK)
+                                fibril_rwlock_write_unlock(&udp_globals.lock);
+                        else
+                                answer_count = 2;
+                        
+                        free(addr);
+                        break;
+
+                case NET_SOCKET_RECVFROM:
+                        fibril_rwlock_write_lock(&udp_globals.lock);
+                        res = udp_recvfrom_message(&local_sockets,
+                             SOCKET_GET_SOCKET_ID(call), SOCKET_GET_FLAGS(call),
+                             &addrlen);
+                        fibril_rwlock_write_unlock(&udp_globals.lock);
+
+                        if (res <= 0)
                                 break;
-                        case NET_SOCKET_RECVFROM:
-                                fibril_rwlock_write_lock(&udp_globals.lock);
-                                res = udp_recvfrom_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_FLAGS(call), &addrlen);
-                                fibril_rwlock_write_unlock(&udp_globals.lock);
-                                if(res > 0){
-                                        SOCKET_SET_READ_DATA_LENGTH(answer, res);
-                                        SOCKET_SET_ADDRESS_LENGTH(answer, addrlen);
-                                        answer_count = 3;
-                                        res = EOK;
-                                }
-                                break;
-                        case NET_SOCKET_CLOSE:
-                                fibril_rwlock_write_lock(&udp_globals.lock);
-                                res = socket_destroy(udp_globals.net_phone, SOCKET_GET_SOCKET_ID(call), &local_sockets, &udp_globals.sockets, NULL);
-                                fibril_rwlock_write_unlock(&udp_globals.lock);
-                                break;
-                        case NET_SOCKET_GETSOCKOPT:
-                        case NET_SOCKET_SETSOCKOPT:
-                        default:
-                                res = ENOTSUP;
-                                break;
+
+                        SOCKET_SET_READ_DATA_LENGTH(answer, res);
+                        SOCKET_SET_ADDRESS_LENGTH(answer, addrlen);
+                        answer_count = 3;
+                        res = EOK;
+                        break;
+                        
+                case NET_SOCKET_CLOSE:
+                        fibril_rwlock_write_lock(&udp_globals.lock);
+                        res = socket_destroy(udp_globals.net_phone,
+                            SOCKET_GET_SOCKET_ID(call), &local_sockets,
+                            &udp_globals.sockets, NULL);
+                        fibril_rwlock_write_unlock(&udp_globals.lock);
+                        break;
+
+                case NET_SOCKET_GETSOCKOPT:
+                case NET_SOCKET_SETSOCKOPT:
+                default:
+                        res = ENOTSUP;
+                        break;
                 }
         }
@@ -519 +631 @@
 
         // release all local sockets
-        socket_cores_release(udp_globals.net_phone, &local_sockets, &udp_globals.sockets, NULL);
+        socket_cores_release(udp_globals.net_phone, &local_sockets,
+            &udp_globals.sockets, NULL);
 
         return res;
 }
 
-int udp_sendto_message(socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t * data_fragment_size, int flags){
+int
+udp_sendto_message(socket_cores_ref local_sockets, int socket_id,
+    const struct sockaddr *addr, socklen_t addrlen, int fragments,
+    size_t *data_fragment_size, int flags)
+{
         ERROR_DECLARE;
 
@@ -544 +661 @@
 
         socket = socket_cores_find(local_sockets, socket_id);
-        if(! socket){
+        if (!socket)
                 return ENOTSOCK;
-        }
-
-        if((socket->port <= 0) && udp_globals.autobinding){
+
+        if ((socket->port <= 0) && udp_globals.autobinding) {
                 // bind the socket to a random free port if not bound
-//              do{
+//              do {
                         // try to find a free port
 //                      fibril_rwlock_read_unlock(&udp_globals.lock);
 //                      fibril_rwlock_write_lock(&udp_globals.lock);
                         // might be changed in the meantime
-//                      if(socket->port <= 0){
-                                if(ERROR_OCCURRED(socket_bind_free_port(&udp_globals.sockets, socket, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, udp_globals.last_used_port))){
-//                                      fibril_rwlock_write_unlock(&udp_globals.lock);
-//                                      fibril_rwlock_read_lock(&udp_globals.lock);
+//                      if (socket->port <= 0) {
+                                if (ERROR_OCCURRED(socket_bind_free_port(
+                                    &udp_globals.sockets, socket,
+                                    UDP_FREE_PORTS_START, UDP_FREE_PORTS_END,
+                                    udp_globals.last_used_port))) {
+//                                      fibril_rwlock_write_unlock(
+//                                          &udp_globals.lock);
+//                                      fibril_rwlock_read_lock(
+//                                          &udp_globals.lock);
                                         return ERROR_CODE;
                                 }
-                                // set the next port as the search starting port number
+                                // set the next port as the search starting port
+                                // number
                                 udp_globals.last_used_port = socket->port;
 //                      }
@@ -567 +689 @@
 //                      fibril_rwlock_read_lock(&udp_globals.lock);
                         // might be changed in the meantime
-//              }while(socket->port <= 0);
-        }
-
-        if(udp_globals.checksum_computing){
-                if(ERROR_OCCURRED(ip_get_route_req(udp_globals.ip_phone, IPPROTO_UDP, addr, addrlen, &device_id, &ip_header, &headerlen))){
+//              } while (socket->port <= 0);
+        }
+
+        if (udp_globals.checksum_computing) {
+                if (ERROR_OCCURRED(ip_get_route_req(udp_globals.ip_phone,
+                    IPPROTO_UDP, addr, addrlen, &device_id, &ip_header,
+                    &headerlen))) {
                         return udp_release_and_return(packet, ERROR_CODE);
                 }
                 // get the device packet dimension
-//              ERROR_PROPAGATE(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension));
-        }
-//      }else{
+//              ERROR_PROPAGATE(tl_get_ip_packet_dimension(udp_globals.ip_phone,
+//                  &udp_globals.dimensions, device_id, &packet_dimension));
+        }
+//      } else {
                 // do not ask all the time
-                ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, &udp_globals.packet_dimension));
+                ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1,
+                    &udp_globals.packet_dimension));
                 packet_dimension = &udp_globals.packet_dimension;
 //      }
 
         // read the first packet fragment
-        result = tl_socket_read_packet_data(udp_globals.net_phone, &packet, UDP_HEADER_SIZE, packet_dimension, addr, addrlen);
-        if(result < 0){
+        result = tl_socket_read_packet_data(udp_globals.net_phone, &packet,
+            UDP_HEADER_SIZE, packet_dimension, addr, addrlen);
+        if (result < 0)
                 return result;
-        }
+
         total_length = (size_t) result;
-        if(udp_globals.checksum_computing){
-                checksum = compute_checksum(0, packet_get_data(packet), packet_get_data_length(packet));
-        }else{
+        if (udp_globals.checksum_computing)
+                checksum = compute_checksum(0, packet_get_data(packet),
+                    packet_get_data_length(packet));
+        else
                 checksum = 0;
-        }
+
         // prefix the udp header
         header = PACKET_PREFIX(packet, udp_header_t);
-        if(! header){
+        if(! header)
                 return udp_release_and_return(packet, ENOMEM);
-        }
+
         bzero(header, sizeof(*header));
         // read the rest of the packet fragments
-        for(index = 1; index < fragments; ++ index){
-                result = tl_socket_read_packet_data(udp_globals.net_phone, &next_packet, 0, packet_dimension, addr, addrlen);
-                if(result < 0){
+        for (index = 1; index < fragments; ++ index) {
+                result = tl_socket_read_packet_data(udp_globals.net_phone,
+                    &next_packet, 0, packet_dimension, addr, addrlen);
+                if (result < 0)
                         return udp_release_and_return(packet, result);
-                }
-                if(ERROR_OCCURRED(pq_add(&packet, next_packet, index, 0))){
+
+                if (ERROR_OCCURRED(pq_add(&packet, next_packet, index, 0)))
                         return udp_release_and_return(packet, ERROR_CODE);
-                }
+
                 total_length += (size_t) result;
-                if(udp_globals.checksum_computing){
-                        checksum = compute_checksum(checksum, packet_get_data(next_packet), packet_get_data_length(next_packet));
-                }
-        }
+                if (udp_globals.checksum_computing) {
+                        checksum = compute_checksum(checksum,
+                            packet_get_data(next_packet),
+                            packet_get_data_length(next_packet));
+                }
+        }
+
         // set the udp header
         header->source_port = htons((socket->port > 0) ? socket->port : 0);
@@ -619 +751 @@
         header->total_length = htons(total_length + sizeof(*header));
         header->checksum = 0;
-        if(udp_globals.checksum_computing){
+        if (udp_globals.checksum_computing) {
                 // update the pseudo header
-                if(ERROR_OCCURRED(ip_client_set_pseudo_header_data_length(ip_header, headerlen, total_length + UDP_HEADER_SIZE))){
+                if (ERROR_OCCURRED(ip_client_set_pseudo_header_data_length(
+                    ip_header, headerlen, total_length + UDP_HEADER_SIZE))) {
                         free(ip_header);
                         return udp_release_and_return(packet, ERROR_CODE);
                 }
+
                 // finish the checksum computation
                 checksum = compute_checksum(checksum, ip_header, headerlen);
-                checksum = compute_checksum(checksum, (uint8_t *) header, sizeof(*header));
-                header->checksum = htons(flip_checksum(compact_checksum(checksum)));
+                checksum = compute_checksum(checksum, (uint8_t *) header,
+                    sizeof(*header));
+                header->checksum =
+                    htons(flip_checksum(compact_checksum(checksum)));
                 free(ip_header);
-        }else{
+        } else {
                 device_id = DEVICE_INVALID_ID;
         }
+
         // prepare the first packet fragment
-        if(ERROR_OCCURRED(ip_client_prepare_packet(packet, IPPROTO_UDP, 0, 0, 0, 0))){
+        if (ERROR_OCCURRED(ip_client_prepare_packet(packet, IPPROTO_UDP, 0, 0,
+            0, 0))) {
                 return udp_release_and_return(packet, ERROR_CODE);
         }
+
         // send the packet
         fibril_rwlock_write_unlock(&udp_globals.lock);
         ip_send_msg(udp_globals.ip_phone, device_id, packet, SERVICE_UDP, 0);
+
         return EOK;
 }
 
-int udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags, size_t * addrlen){
+int
+udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags,
+    size_t *addrlen)
+{
         ERROR_DECLARE;
 
@@ -650 +793 @@
         packet_t packet;
         udp_header_ref header;
-        struct sockaddr * addr;
+        struct sockaddr *addr;
         size_t length;
-        uint8_t * data;
+        uint8_t *data;
         int result;
 
         // find the socket
         socket = socket_cores_find(local_sockets, socket_id);
-        if(! socket){
+        if (!socket)
                 return ENOTSOCK;
-        }
+
         // get the next received packet
         packet_id = dyn_fifo_value(&socket->received);
-        if(packet_id < 0){
+        if (packet_id < 0)
                 return NO_DATA;
-        }
-        ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet, packet_id));
+
+        ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet,
+            packet_id));
+
         // get udp header
         data = packet_get_data(packet);
-        if(! data){
+        if (!data) {
                 pq_release_remote(udp_globals.net_phone, packet_id);
                 return NO_DATA;
@@ -676 +821 @@
         // set the source address port
         result = packet_get_addr(packet, (uint8_t **) &addr, NULL);
-        if(ERROR_OCCURRED(tl_set_address_port(addr, result, ntohs(header->source_port)))){
+        if (ERROR_OCCURRED(tl_set_address_port(addr, result,
+            ntohs(header->source_port)))) {
                 pq_release_remote(udp_globals.net_phone, packet_id);
                 return ERROR_CODE;
         }
         *addrlen = (size_t) result;
+
         // send the source address
         ERROR_PROPAGATE(data_reply(addr, * addrlen));
@@ -693 +840 @@
         dyn_fifo_pop(&socket->received);
         pq_release_remote(udp_globals.net_phone, packet_get_id(packet));
+
         // return the total length
         return (int) length;
 }
 
-int udp_release_and_return(packet_t packet, int result){
+int udp_release_and_return(packet_t packet, int result)
+{
         pq_release_remote(udp_globals.net_phone, packet_get_id(packet));
         return result;
@@ -704 +853 @@
 /** Default thread for new connections.
  *
- *  @param[in] iid The initial message identifier.
- *  @param[in] icall The initial message call structure.
+ *  @param[in] iid      The initial message identifier.
+ *  @param[in] icall    The initial message call structure.
  *
  */
@@ -716 +865 @@
         ipc_answer_0(iid, EOK);
         
-        while(true) {
+        while (true) {
                 ipc_call_t answer;
                 int answer_count;
@@ -731 +880 @@
                     &answer_count);
                 
-                /* End if said to either by the message or the processing result */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                /*
+                 * End if said to either by the message or the processing result
+                 */
+                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                    (res == EHANGUP))
                         return;
                 
@@ -742 +894 @@
 /** Starts the module.
  *
- *  @param argc The count of the command line arguments. Ignored parameter.
- *  @param argv The command line parameters. Ignored parameter.
- *
- *  @returns EOK on success.
- *  @returns Other error codes as defined for each specific module start function.
- *
+ *  @param argc         The count of the command line arguments. Ignored
+ *                      parameter.
+ *  @param argv         The command line parameters. Ignored parameter.
+ *
+ *  @returns            EOK on success.
+ *  @returns            Other error codes as defined for each specific module
+ *                      start function.
  */
 int main(int argc, char *argv[])