Index: uspace/lib/net/generic/net_remote.c =================================================================== --- uspace/lib/net/generic/net_remote.c (revision 7c8267bcb6529519f2f87fb59adae95a03a25d91) +++ uspace/lib/net/generic/net_remote.c (revision 2fa0ad9cca78b8b0aff7a28357c49273d68f8990) @@ -47,23 +47,32 @@ #include -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); } Index: uspace/lib/net/generic/packet_remote.c =================================================================== --- uspace/lib/net/generic/packet_remote.c (revision 7c8267bcb6529519f2f87fb59adae95a03a25d91) +++ uspace/lib/net/generic/packet_remote.c (revision 2fa0ad9cca78b8b0aff7a28357c49273d68f8990) @@ -64,9 +64,12 @@ * */ -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,14 +94,15 @@ *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,6 +118,6 @@ 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,5 +125,6 @@ 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,5 +146,6 @@ 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; } Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision 7c8267bcb6529519f2f87fb59adae95a03a25d91) +++ uspace/lib/net/tl/tl_common.c (revision 2fa0ad9cca78b8b0aff7a28357c49273d68f8990) @@ -58,29 +58,32 @@ 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,5 +115,6 @@ 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,22 +140,29 @@ } -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,6 +170,6 @@ 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,7 +199,10 @@ } -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,17 +213,20 @@ 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,29 +235,33 @@ 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; }