Changeset a7811f17 in mainline for uspace/lib/net
- Timestamp:
- 2010-11-19T21:28:02Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a9c6b966
- Parents:
- 45f04f8 (diff), aaa3f33a (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. - Location:
- uspace/lib/net
- Files:
-
- 24 edited
-
adt/module_map.c (modified) (2 diffs)
-
generic/generic.c (modified) (3 diffs)
-
generic/net_remote.c (modified) (3 diffs)
-
generic/packet_remote.c (modified) (2 diffs)
-
il/arp_remote.c (modified) (3 diffs)
-
il/ip_client.c (modified) (8 diffs)
-
il/ip_remote.c (modified) (1 diff)
-
include/adt/module_map.h (modified) (2 diffs)
-
include/arp_interface.h (modified) (1 diff)
-
include/generic.h (modified) (2 diffs)
-
include/icmp_header.h (modified) (2 diffs)
-
include/ip_header.h (modified) (2 diffs)
-
include/ip_remote.h (modified) (1 diff)
-
include/net_interface.h (modified) (1 diff)
-
include/netif_local.h (modified) (3 diffs)
-
include/netif_remote.h (modified) (2 diffs)
-
include/packet_remote.h (modified) (1 diff)
-
include/socket_core.h (modified) (3 diffs)
-
include/tl_common.h (modified) (1 diff)
-
netif/netif_local.c (modified) (3 diffs)
-
netif/netif_remote.c (modified) (2 diffs)
-
tl/icmp_client.c (modified) (1 diff)
-
tl/socket_core.c (modified) (14 diffs)
-
tl/tl_common.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/net/adt/module_map.c
r45f04f8 ra7811f17 63 63 */ 64 64 int 65 add_module(module_ ref *module, modules_refmodules, const char *name,65 add_module(module_t **module, modules_t *modules, const char *name, 66 66 const char *filename, services_t service, task_id_t task_id, 67 67 connect_module_t connect_module) 68 68 { 69 module_ reftmp_module;69 module_t *tmp_module; 70 70 int rc; 71 71 72 tmp_module = (module_ ref) malloc(sizeof(module_t));72 tmp_module = (module_t *) malloc(sizeof(module_t)); 73 73 if (!tmp_module) 74 74 return ENOMEM; … … 104 104 * @returns NULL if there is no such module. 105 105 */ 106 module_ ref get_running_module(modules_refmodules, char *name)106 module_t *get_running_module(modules_t *modules, char *name) 107 107 { 108 module_ refmodule;108 module_t *module; 109 109 110 110 module = modules_find(modules, name, 0); -
uspace/lib/net/generic/generic.c
r45f04f8 ra7811f17 100 100 int 101 101 generic_get_addr_req(int phone, int message, device_id_t device_id, 102 measured_string_ ref*address, char ** data)102 measured_string_t **address, char ** data) 103 103 { 104 104 aid_t message_id; … … 138 138 int 139 139 generic_packet_size_req_remote(int phone, int message, device_id_t device_id, 140 packet_dimension_ refpacket_dimension)140 packet_dimension_t *packet_dimension) 141 141 { 142 142 if (!packet_dimension) … … 233 233 int 234 234 generic_translate_req(int phone, int message, device_id_t device_id, 235 services_t service, measured_string_ refconfiguration, size_t count,236 measured_string_ ref*translation, char **data)235 services_t service, measured_string_t *configuration, size_t count, 236 measured_string_t **translation, char **data) 237 237 { 238 238 aid_t message_id; -
uspace/lib/net/generic/net_remote.c
r45f04f8 ra7811f17 63 63 * @see net_get_conf_req() 64 64 */ 65 void net_free_settings(measured_string_ refsettings, char *data)65 void net_free_settings(measured_string_t *settings, char *data) 66 66 { 67 67 if (settings) … … 90 90 */ 91 91 int 92 net_get_conf_req(int net_phone, measured_string_ ref*configuration,92 net_get_conf_req(int net_phone, measured_string_t **configuration, 93 93 size_t count, char **data) 94 94 { … … 118 118 int 119 119 net_get_device_conf_req(int net_phone, device_id_t device_id, 120 measured_string_ ref*configuration, size_t count, char **data)120 measured_string_t **configuration, size_t count, char **data) 121 121 { 122 122 return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, -
uspace/lib/net/generic/packet_remote.c
r45f04f8 ra7811f17 64 64 */ 65 65 static int 66 packet_return(int phone, packet_ refpacket, packet_id_t packet_id, size_t size)66 packet_return(int phone, packet_t *packet, packet_id_t packet_id, size_t size) 67 67 { 68 68 ipc_call_t answer; … … 107 107 * function. 108 108 */ 109 int packet_translate_remote(int phone, packet_ refpacket, packet_id_t packet_id)109 int packet_translate_remote(int phone, packet_t *packet, packet_id_t packet_id) 110 110 { 111 111 int rc; -
uspace/lib/net/il/arp_remote.c
r45f04f8 ra7811f17 83 83 int 84 84 arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, 85 measured_string_ refaddress)85 measured_string_t *address) 86 86 { 87 87 aid_t message_id; … … 133 133 */ 134 134 int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, 135 services_t netif, measured_string_ refaddress)135 services_t netif, measured_string_t *address) 136 136 { 137 137 aid_t message_id; … … 165 165 int 166 166 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, 167 measured_string_ ref address, measured_string_ref*translation, char **data)167 measured_string_t *address, measured_string_t **translation, char **data) 168 168 { 169 169 return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id, -
uspace/lib/net/il/ip_client.c
r45f04f8 ra7811f17 53 53 size_t ip_client_header_length(packet_t packet) 54 54 { 55 ip_header_ refheader;56 57 header = (ip_header_ ref) packet_get_data(packet);55 ip_header_t *header; 56 57 header = (ip_header_t *) packet_get_data(packet); 58 58 if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t))) 59 59 return 0; … … 91 91 size_t data_length, void **header, size_t *headerlen) 92 92 { 93 ipv4_pseudo_header_ refheader_in;93 ipv4_pseudo_header_t *header_in; 94 94 struct sockaddr_in *address_in; 95 95 … … 109 109 110 110 *headerlen = sizeof(*header_in); 111 header_in = (ipv4_pseudo_header_ ref) malloc(*headerlen);111 header_in = (ipv4_pseudo_header_t *) malloc(*headerlen); 112 112 if (!header_in) 113 113 return ENOMEM; … … 155 155 ip_tos_t tos, int dont_fragment, size_t ipopt_length) 156 156 { 157 ip_header_ refheader;157 ip_header_t *header; 158 158 uint8_t *data; 159 159 size_t padding; … … 177 177 178 178 // set the header 179 header = (ip_header_ ref) data;179 header = (ip_header_t *) data; 180 180 header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + 181 181 ipopt_length); … … 211 211 ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length) 212 212 { 213 ip_header_ refheader;214 215 header = (ip_header_ ref) packet_get_data(packet);213 ip_header_t *header; 214 215 header = (ip_header_t *) packet_get_data(packet); 216 216 if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t))) 217 217 return ENOMEM; … … 247 247 size_t data_length) 248 248 { 249 ipv4_pseudo_header_ refheader_in;249 ipv4_pseudo_header_t *header_in; 250 250 251 251 if (!header) … … 253 253 254 254 if (headerlen == sizeof(ipv4_pseudo_header_t)) { 255 header_in = (ipv4_pseudo_header_ ref) header;255 header_in = (ipv4_pseudo_header_t *) header; 256 256 header_in->data_length = htons(data_length); 257 257 return EOK; -
uspace/lib/net/il/ip_remote.c
r45f04f8 ra7811f17 186 186 */ 187 187 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id, 188 packet_dimension_ refpacket_dimension)188 packet_dimension_t *packet_dimension) 189 189 { 190 190 return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, -
uspace/lib/net/include/adt/module_map.h
r45f04f8 ra7811f17 48 48 typedef struct module_struct module_t; 49 49 50 /** Type definition of the module structure pointer.51 * @see module_struct52 */53 typedef module_t *module_ref;54 55 50 /** Module map. 56 51 * Sorted by module names. … … 77 72 }; 78 73 79 extern int add_module(module_ ref *, modules_ref, const char *, const char *,74 extern int add_module(module_t **, modules_t *, const char *, const char *, 80 75 services_t, task_id_t, connect_module_t *); 81 extern module_ ref get_running_module(modules_ref, char *);76 extern module_t *get_running_module(modules_t *, char *); 82 77 extern task_id_t spawn(const char *); 83 78 -
uspace/lib/net/include/arp_interface.h
r45f04f8 ra7811f17 48 48 49 49 extern int arp_device_req(int, device_id_t, services_t, services_t, 50 measured_string_ ref);51 extern int arp_translate_req(int, device_id_t, services_t, measured_string_ ref,52 measured_string_ ref*, char **);50 measured_string_t *); 51 extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *, 52 measured_string_t **, char **); 53 53 extern int arp_clear_device_req(int, device_id_t); 54 54 extern int arp_clear_address_req(int, device_id_t, services_t, 55 measured_string_ ref);55 measured_string_t *); 56 56 extern int arp_clean_cache_req(int); 57 57 extern int arp_connect_module(services_t); -
uspace/lib/net/include/generic.h
r45f04f8 ra7811f17 49 49 services_t); 50 50 extern int generic_device_req_remote(int, int, device_id_t, int, services_t); 51 extern int generic_get_addr_req(int, int, device_id_t, measured_string_ ref*,51 extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **, 52 52 char **); 53 53 extern int generic_packet_size_req_remote(int, int, device_id_t, 54 packet_dimension_ ref);54 packet_dimension_t *); 55 55 extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t, 56 56 services_t, services_t); … … 58 58 services_t, services_t); 59 59 extern int generic_translate_req(int, int, device_id_t, services_t, 60 measured_string_ ref, size_t, measured_string_ref*, char **);60 measured_string_t *, size_t, measured_string_t **, char **); 61 61 62 62 #endif -
uspace/lib/net/include/icmp_header.h
r45f04f8 ra7811f17 52 52 typedef struct icmp_echo icmp_echo_t; 53 53 54 /** Type definition of the echo specific data pointer.55 * @see icmp_echo56 */57 typedef icmp_echo_t *icmp_echo_ref;58 59 54 /** Echo specific data. */ 60 55 struct icmp_echo { … … 69 64 */ 70 65 typedef struct icmp_header icmp_header_t; 71 72 /** Type definition of the internet control message header pointer.73 * @see icmp_header74 */75 typedef icmp_header_t *icmp_header_ref;76 66 77 67 /** Internet control message header. */ -
uspace/lib/net/include/ip_header.h
r45f04f8 ra7811f17 127 127 typedef struct ip_header ip_header_t; 128 128 129 /** Type definition of the internet header pointer.130 * @see ip_header131 */132 typedef ip_header_t *ip_header_ref;133 134 129 /** Type definition of the internet option header. 135 130 * @see ip_header … … 137 132 typedef struct ip_option ip_option_t; 138 133 139 /** Type definition of the internet option header pointer.140 * @see ip_header141 */142 typedef ip_option_t *ip_option_ref;143 144 134 /** Type definition of the internet version 4 pseudo header. 145 135 * @see ipv4_pseudo_header 146 136 */ 147 137 typedef struct ipv4_pseudo_header ipv4_pseudo_header_t; 148 149 /** Type definition of the internet version 4 pseudo header pointer.150 * @see ipv4_pseudo_header151 */152 typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;153 138 154 139 /** Internet header. -
uspace/lib/net/include/ip_remote.h
r45f04f8 ra7811f17 44 44 45 45 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t); 46 extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_ ref);46 extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *); 47 47 extern int ip_received_error_msg_remote(int, device_id_t, packet_t, services_t, 48 48 services_t); -
uspace/lib/net/include/net_interface.h
r45f04f8 ra7811f17 44 44 /*@{*/ 45 45 46 extern int net_get_device_conf_req(int, device_id_t, measured_string_ ref*,46 extern int net_get_device_conf_req(int, device_id_t, measured_string_t **, 47 47 size_t, char **); 48 extern int net_get_conf_req(int, measured_string_ ref*, size_t, char **);49 extern void net_free_settings(measured_string_ ref, char *);48 extern int net_get_conf_req(int, measured_string_t **, size_t, char **); 49 extern void net_free_settings(measured_string_t *, char *); 50 50 extern int net_connect_module(void); 51 51 -
uspace/lib/net/include/netif_local.h
r45f04f8 ra7811f17 158 158 */ 159 159 extern int netif_get_addr_message(device_id_t device_id, 160 measured_string_ refaddress);160 measured_string_t *address); 161 161 162 162 /** Process the netif driver specific message. … … 193 193 */ 194 194 extern int netif_get_device_stats(device_id_t device_id, 195 device_stats_ refstats);196 197 extern int netif_get_addr_req_local(int, device_id_t, measured_string_ ref*,195 device_stats_t *stats); 196 197 extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **, 198 198 char **); 199 199 extern int netif_probe_req_local(int, device_id_t, int, int); … … 201 201 extern int netif_start_req_local(int, device_id_t); 202 202 extern int netif_stop_req_local(int, device_id_t); 203 extern int netif_stats_req_local(int, device_id_t, device_stats_ ref);203 extern int netif_stats_req_local(int, device_id_t, device_stats_t *); 204 204 extern int netif_bind_service_local(services_t, device_id_t, services_t, 205 205 async_client_conn_t); 206 206 207 207 extern int find_device(device_id_t, netif_device_t **); 208 extern void null_device_stats(device_stats_ ref);208 extern void null_device_stats(device_stats_t *); 209 209 extern void netif_pq_release(packet_id_t); 210 210 extern packet_t netif_packet_get_1(size_t); -
uspace/lib/net/include/netif_remote.h
r45f04f8 ra7811f17 41 41 #include <net/packet.h> 42 42 43 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ ref*,43 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **, 44 44 char **); 45 45 extern int netif_probe_req_remote(int, device_id_t, int, int); … … 47 47 extern int netif_start_req_remote(int, device_id_t); 48 48 extern int netif_stop_req_remote(int, device_id_t); 49 extern int netif_stats_req_remote(int, device_id_t, device_stats_ ref);49 extern int netif_stats_req_remote(int, device_id_t, device_stats_t *); 50 50 extern int netif_bind_service_remote(services_t, device_id_t, services_t, 51 51 async_client_conn_t); -
uspace/lib/net/include/packet_remote.h
r45f04f8 ra7811f17 37 37 #include <sys/types.h> 38 38 39 extern int packet_translate_remote(int, packet_ ref, packet_id_t);39 extern int packet_translate_remote(int, packet_t *, packet_id_t); 40 40 extern packet_t packet_get_4_remote(int, size_t, size_t, size_t, size_t); 41 41 extern packet_t packet_get_1_remote(int, size_t); -
uspace/lib/net/include/socket_core.h
r45f04f8 ra7811f17 66 66 typedef struct socket_core socket_core_t; 67 67 68 /** Type definition of the socket core pointer.69 * @see socket_core70 */71 typedef socket_core_t *socket_core_ref;72 73 68 /** Type definition of the socket port. 74 69 * @see socket_port 75 70 */ 76 71 typedef struct socket_port socket_port_t; 77 78 /** Type definition of the socket port pointer.79 * @see socket_port80 */81 typedef socket_port_t *socket_port_ref;82 72 83 73 /** Socket core. */ … … 111 101 * the other use the remote addresses. 112 102 */ 113 GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ ref);103 GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_t *); 114 104 115 105 /** Ports map. … … 118 108 INT_MAP_DECLARE(socket_ports, socket_port_t); 119 109 120 extern void socket_cores_release(int, socket_cores_ ref, socket_ports_ref,121 void (*)(socket_core_ ref));122 extern int socket_bind(socket_cores_ ref, socket_ports_ref, int, void *, size_t,110 extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *, 111 void (*)(socket_core_t *)); 112 extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t, 123 113 int, int, int); 124 extern int socket_bind_free_port(socket_ports_ ref, socket_core_ref, int, int,114 extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int, 125 115 int); 126 extern int socket_create(socket_cores_ ref, int, void *, int *);127 extern int socket_destroy(int, int, socket_cores_ ref, socket_ports_ref,128 void (*)(socket_core_ ref));116 extern int socket_create(socket_cores_t *, int, void *, int *); 117 extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *, 118 void (*)(socket_core_t *)); 129 119 extern int socket_reply_packets(packet_t, size_t *); 130 extern socket_core_ ref socket_port_find(socket_ports_ref, int, const char *,120 extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *, 131 121 size_t); 132 extern void socket_port_release(socket_ports_ ref, socket_core_ref);133 extern int socket_port_add(socket_ports_ ref, int, socket_core_ref,122 extern void socket_port_release(socket_ports_t *, socket_core_t *); 123 extern int socket_port_add(socket_ports_t *, int, socket_core_t *, 134 124 const char *, size_t); 135 125 -
uspace/lib/net/include/tl_common.h
r45f04f8 ra7811f17 51 51 DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t); 52 52 53 extern int tl_get_ip_packet_dimension(int, packet_dimensions_ ref,54 device_id_t, packet_dimension_ ref*);53 extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *, 54 device_id_t, packet_dimension_t **); 55 55 extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *); 56 extern int tl_update_ip_packet_dimension(packet_dimensions_ ref, device_id_t,56 extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t, 57 57 size_t); 58 58 extern int tl_set_address_port(struct sockaddr *, int, uint16_t); 59 59 extern int tl_prepare_icmp_packet(int, int, packet_t, services_t); 60 extern int tl_socket_read_packet_data(int, packet_ ref, size_t,61 const packet_dimension_ ref, const struct sockaddr *, socklen_t);60 extern int tl_socket_read_packet_data(int, packet_t *, size_t, 61 const packet_dimension_t *, const struct sockaddr *, socklen_t); 62 62 63 63 #endif -
uspace/lib/net/netif/netif_local.c
r45f04f8 ra7811f17 181 181 */ 182 182 int netif_stats_req_local(int netif_phone, device_id_t device_id, 183 device_stats_ refstats)183 device_stats_t *stats) 184 184 { 185 185 fibril_rwlock_read_lock(&netif_globals.lock); … … 203 203 */ 204 204 int netif_get_addr_req_local(int netif_phone, device_id_t device_id, 205 measured_string_ ref*address, char **data)205 measured_string_t **address, char **data) 206 206 { 207 207 int rc; … … 253 253 * @param[in] stats The usage statistics. 254 254 */ 255 void null_device_stats(device_stats_ refstats)255 void null_device_stats(device_stats_t *stats) 256 256 { 257 257 bzero(stats, sizeof(device_stats_t)); -
uspace/lib/net/netif/netif_remote.c
r45f04f8 ra7811f17 60 60 */ 61 61 int netif_get_addr_req_remote(int netif_phone, device_id_t device_id, 62 measured_string_ ref*address, char **data)62 measured_string_t **address, char **data) 63 63 { 64 64 return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, … … 138 138 */ 139 139 int netif_stats_req_remote(int netif_phone, device_id_t device_id, 140 device_stats_ refstats)140 device_stats_t *stats) 141 141 { 142 142 if (!stats) -
uspace/lib/net/tl/icmp_client.c
r45f04f8 ra7811f17 64 64 icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu) 65 65 { 66 icmp_header_ refheader;66 icmp_header_t *header; 67 67 68 header = (icmp_header_ ref) packet_get_data(packet);68 header = (icmp_header_t *) packet_get_data(packet); 69 69 if (!header || 70 70 (packet_get_data_length(packet) < sizeof(icmp_header_t))) { -
uspace/lib/net/tl/socket_core.c
r45f04f8 ra7811f17 68 68 INT_MAP_IMPLEMENT(socket_cores, socket_core_t); 69 69 70 GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_ ref);70 GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_t *); 71 71 72 72 INT_MAP_IMPLEMENT(socket_ports, socket_port_t); … … 85 85 */ 86 86 static void 87 socket_destroy_core(int packet_phone, socket_core_ refsocket,88 socket_cores_ ref local_sockets, socket_ports_refglobal_sockets,89 void (* socket_release)(socket_core_ refsocket))87 socket_destroy_core(int packet_phone, socket_core_t *socket, 88 socket_cores_t *local_sockets, socket_ports_t *global_sockets, 89 void (* socket_release)(socket_core_t *socket)) 90 90 { 91 91 int packet_id; … … 121 121 */ 122 122 void 123 socket_cores_release(int packet_phone, socket_cores_ reflocal_sockets,124 socket_ports_ refglobal_sockets,125 void (* socket_release)(socket_core_ refsocket))123 socket_cores_release(int packet_phone, socket_cores_t *local_sockets, 124 socket_ports_t *global_sockets, 125 void (* socket_release)(socket_core_t *socket)) 126 126 { 127 127 int index; … … 160 160 */ 161 161 static int 162 socket_port_add_core(socket_port_ ref socket_port, socket_core_refsocket,162 socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket, 163 163 const char *key, size_t key_length) 164 164 { 165 socket_core_ ref*socket_ref;165 socket_core_t **socket_ref; 166 166 int rc; 167 167 … … 200 200 */ 201 201 static int 202 socket_bind_insert(socket_ports_ ref global_sockets, socket_core_refsocket,202 socket_bind_insert(socket_ports_t *global_sockets, socket_core_t *socket, 203 203 int port) 204 204 { 205 socket_port_ refsocket_port;205 socket_port_t *socket_port; 206 206 int rc; 207 207 … … 258 258 */ 259 259 int 260 socket_bind(socket_cores_ ref local_sockets, socket_ports_refglobal_sockets,260 socket_bind(socket_cores_t *local_sockets, socket_ports_t *global_sockets, 261 261 int socket_id, void *addr, size_t addrlen, int free_ports_start, 262 262 int free_ports_end, int last_used_port) 263 263 { 264 socket_core_ refsocket;265 socket_port_ refsocket_port;264 socket_core_t *socket; 265 socket_port_t *socket_port; 266 266 struct sockaddr *address; 267 267 struct sockaddr_in *address_in; … … 328 328 */ 329 329 int 330 socket_bind_free_port(socket_ports_ ref global_sockets, socket_core_refsocket,330 socket_bind_free_port(socket_ports_t *global_sockets, socket_core_t *socket, 331 331 int free_ports_start, int free_ports_end, int last_used_port) 332 332 { … … 370 370 * @returns ELIMIT if there is no socket identifier available. 371 371 */ 372 static int socket_generate_new_id(socket_cores_ reflocal_sockets, int positive)372 static int socket_generate_new_id(socket_cores_t *local_sockets, int positive) 373 373 { 374 374 int socket_id; … … 415 415 */ 416 416 int 417 socket_create(socket_cores_ reflocal_sockets, int app_phone,417 socket_create(socket_cores_t *local_sockets, int app_phone, 418 418 void *specific_data, int *socket_id) 419 419 { 420 socket_core_ refsocket;420 socket_core_t *socket; 421 421 int positive; 422 422 int rc; … … 437 437 } 438 438 439 socket = (socket_core_ ref) malloc(sizeof(*socket));439 socket = (socket_core_t *) malloc(sizeof(*socket)); 440 440 if (!socket) 441 441 return ENOMEM; … … 486 486 */ 487 487 int 488 socket_destroy(int packet_phone, int socket_id, socket_cores_ reflocal_sockets,489 socket_ports_ refglobal_sockets,490 void (*socket_release)(socket_core_ refsocket))491 { 492 socket_core_ refsocket;488 socket_destroy(int packet_phone, int socket_id, socket_cores_t *local_sockets, 489 socket_ports_t *global_sockets, 490 void (*socket_release)(socket_core_t *socket)) 491 { 492 socket_core_t *socket; 493 493 int accepted_id; 494 494 … … 601 601 * @returns NULL if no socket was found. 602 602 */ 603 socket_core_ ref604 socket_port_find(socket_ports_ refglobal_sockets, int port, const char *key,603 socket_core_t * 604 socket_port_find(socket_ports_t *global_sockets, int port, const char *key, 605 605 size_t key_length) 606 606 { 607 socket_port_ refsocket_port;608 socket_core_ ref*socket_ref;607 socket_port_t *socket_port; 608 socket_core_t **socket_ref; 609 609 610 610 socket_port = socket_ports_find(global_sockets, port); … … 628 628 */ 629 629 void 630 socket_port_release(socket_ports_ ref global_sockets, socket_core_refsocket)631 { 632 socket_port_ refsocket_port;633 socket_core_ ref*socket_ref;630 socket_port_release(socket_ports_t *global_sockets, socket_core_t *socket) 631 { 632 socket_port_t *socket_port; 633 socket_core_t **socket_ref; 634 634 635 635 if (!socket->port) … … 679 679 */ 680 680 int 681 socket_port_add(socket_ports_ refglobal_sockets, int port,682 socket_core_ refsocket, const char *key, size_t key_length)683 { 684 socket_port_ refsocket_port;681 socket_port_add(socket_ports_t *global_sockets, int port, 682 socket_core_t *socket, const char *key, size_t key_length) 683 { 684 socket_port_t *socket_port; 685 685 int rc; 686 686 -
uspace/lib/net/tl/tl_common.c
r45f04f8 ra7811f17 120 120 int 121 121 tl_get_ip_packet_dimension(int ip_phone, 122 packet_dimensions_ refpacket_dimensions, device_id_t device_id,123 packet_dimension_ ref*packet_dimension)122 packet_dimensions_t *packet_dimensions, device_id_t device_id, 123 packet_dimension_t **packet_dimension) 124 124 { 125 125 int rc; … … 162 162 */ 163 163 int 164 tl_update_ip_packet_dimension(packet_dimensions_ refpacket_dimensions,164 tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions, 165 165 device_id_t device_id, size_t content) 166 166 { 167 packet_dimension_ refpacket_dimension;167 packet_dimension_t *packet_dimension; 168 168 169 169 packet_dimension = packet_dimensions_find(packet_dimensions, device_id); … … 287 287 */ 288 288 int 289 tl_socket_read_packet_data(int packet_phone, packet_ refpacket, size_t prefix,290 const packet_dimension_ refdimension, const struct sockaddr *addr,289 tl_socket_read_packet_data(int packet_phone, packet_t *packet, size_t prefix, 290 const packet_dimension_t *dimension, const struct sockaddr *addr, 291 291 socklen_t addrlen) 292 292 {
Note:
See TracChangeset
for help on using the changeset viewer.
