Changes in uspace/lib/net/netif/netif_local.c [42a9f27:14f1db0] in mainline
- File:
-
- 1 edited
-
uspace/lib/net/netif/netif_local.c (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/net/netif/netif_local.c
r42a9f27 r14f1db0 27 27 */ 28 28 29 /** @addtogroup libnet29 /** @addtogroup netif 30 30 * @{ 31 31 */ … … 42 42 #include <ipc/ipc.h> 43 43 #include <ipc/services.h> 44 #include <ipc/netif.h> 45 #include < err.h>46 47 #include < generic.h>48 #include < net/modules.h>49 #include < net/packet.h>50 #include <packet _client.h>44 45 #include <net_err.h> 46 #include <net_messages.h> 47 #include <net_modules.h> 48 #include <packet/packet.h> 49 #include <packet/packet_client.h> 50 #include <packet/packet_server.h> 51 51 #include <packet_remote.h> 52 52 #include <adt/measured_strings.h> 53 #include <net /device.h>53 #include <net_device.h> 54 54 #include <nil_interface.h> 55 55 #include <netif_local.h> 56 #include <netif_messages.h> 56 57 #include <netif_interface.h> 57 58 58 59 DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); 59 60 60 /** Network interface global data. */ 61 /** Network interface global data. 62 */ 61 63 netif_globals_t netif_globals; 62 64 … … 64 66 * 65 67 * @param[in] netif_phone The network interface phone. 66 * @param[in] device_id 67 * @param[in] irq 68 * @param[in] io 69 * @return EOK on success.70 * @return Other error codes as defined for the71 * 72 * /73 int 74 netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io)68 * @param[in] device_id The device identifier. 69 * @param[in] irq The device interrupt number. 70 * @param[in] io The device input/output address. 71 * 72 * @return EOK on success. 73 * @return Other errro codes as defined for the netif_probe_message(). 74 * 75 */ 76 int netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io) 75 77 { 76 78 fibril_rwlock_write_lock(&netif_globals.lock); … … 84 86 * 85 87 * @param[in] netif_phone The network interface phone. 86 * @param[in] device_id The device identifier. 87 * @param[in] packet The packet queue. 88 * @param[in] sender The sending module service. 89 * @return EOK on success. 90 * @return Other error codes as defined for the generic_send_msg() 91 * function. 88 * @param[in] device_id The device identifier. 89 * @param[in] packet The packet queue. 90 * @param[in] sender The sending module service. 91 * 92 * @return EOK on success. 93 * @return Other error codes as defined for the generic_send_msg() function. 94 * 92 95 */ 93 96 int netif_send_msg_local(int netif_phone, device_id_t device_id, … … 104 107 * 105 108 * @param[in] netif_phone The network interface phone. 106 * @param[in] device_id 107 * @return EOK on success.108 * @return Other error codes as defined for the find_device()109 * 110 * @return Other error codes as defined for the111 * netif_start_message() function.109 * @param[in] device_id The device identifier. 110 * 111 * @return EOK on success. 112 * @return Other error codes as defined for the find_device() function. 113 * @return Other error codes as defined for the netif_start_message() function. 114 * 112 115 */ 113 116 int netif_start_req_local(int netif_phone, device_id_t device_id) … … 139 142 * 140 143 * @param[in] netif_phone The network interface phone. 141 * @param[in] device_id 142 * @return EOK on success.143 * @return Other error codes as defined for the find_device()144 * 145 * @return Other error codes as defined for the146 * netif_stop_message() function.144 * @param[in] device_id The device identifier. 145 * 146 * @return EOK on success. 147 * @return Other error codes as defined for the find_device() function. 148 * @return Other error codes as defined for the netif_stop_message() function. 149 * 147 150 */ 148 151 int netif_stop_req_local(int netif_phone, device_id_t device_id) … … 173 176 /** Return the device usage statistics. 174 177 * 175 * @param[in] netif_phone The network interface phone. 176 * @param[in] device_id The device identifier. 177 * @param[out] stats The device usage statistics. 178 * @return EOK on success. 178 * @param[in] netif_phone The network interface phone. 179 * @param[in] device_id The device identifier. 180 * @param[out] stats The device usage statistics. 181 * 182 * @return EOK on success. 183 * 179 184 */ 180 185 int netif_stats_req_local(int netif_phone, device_id_t device_id, … … 190 195 /** Return the device local hardware address. 191 196 * 192 * @param[in] netif_phone The network interface phone. 193 * @param[in] device_id The device identifier. 194 * @param[out] address The device local hardware address. 195 * @param[out] data The address data. 196 * @return EOK on success. 197 * @return EBADMEM if the address parameter is NULL. 198 * @return ENOENT if there no such device. 199 * @return Other error codes as defined for the 200 * netif_get_addr_message() function. 197 * @param[in] netif_phone The network interface phone. 198 * @param[in] device_id The device identifier. 199 * @param[out] address The device local hardware address. 200 * @param[out] data The address data. 201 * 202 * @return EOK on success. 203 * @return EBADMEM if the address parameter is NULL. 204 * @return ENOENT if there no such device. 205 * @return Other error codes as defined for the netif_get_addr_message() 206 * function. 207 * 201 208 */ 202 209 int netif_get_addr_req_local(int netif_phone, device_id_t device_id, … … 205 212 ERROR_DECLARE; 206 213 207 if ( !address || !data)214 if ((!address) || (!data)) 208 215 return EBADMEM; 209 216 … … 223 230 } 224 231 232 /** Create bidirectional connection with the network interface module and registers the message receiver. 233 * 234 * @param[in] service The network interface module service. 235 * @param[in] device_id The device identifier. 236 * @param[in] me The requesting module service. 237 * @param[in] receiver The message receiver. 238 * 239 * @return The phone of the needed service. 240 * @return EOK on success. 241 * @return Other error codes as defined for the bind_service() function. 242 * 243 */ 244 int netif_bind_service_local(services_t service, device_id_t device_id, 245 services_t me, async_client_conn_t receiver) 246 { 247 return EOK; 248 } 249 225 250 /** Find the device specific data. 226 251 * 227 * @param[in] device_id The device identifier. 228 * @param[out] device The device specific data. 229 * @return EOK on success. 230 * @return ENOENT if device is not found. 231 * @return EPERM if the device is not initialized. 252 * @param[in] device_id The device identifier. 253 * @param[out] device The device specific data. 254 * 255 * @return EOK on success. 256 * @return ENOENT if device is not found. 257 * @return EPERM if the device is not initialized. 258 * 232 259 */ 233 260 int find_device(device_id_t device_id, netif_device_t **device) … … 248 275 /** Clear the usage statistics. 249 276 * 250 * @param[in] stats The usage statistics. 277 * @param[in] stats The usage statistics. 278 * 251 279 */ 252 280 void null_device_stats(device_stats_ref stats) … … 257 285 /** Initialize the netif module. 258 286 * 259 * @param[in] client_connection The client connection functio to be registered. 260 * @return EOK on success. 261 * @return Other error codes as defined for each specific module 262 * message function. 287 * @param[in] client_connection The client connection functio to be 288 * registered. 289 * 290 * @return EOK on success. 291 * @return Other error codes as defined for each specific module 292 * message function. 293 * 263 294 */ 264 295 int netif_init_module(async_client_conn_t client_connection) … … 286 317 * Prepared for future optimization. 287 318 * 288 * @param[in] packet_id The packet identifier. 319 * @param[in] packet_id The packet identifier. 320 * 289 321 */ 290 322 void netif_pq_release(packet_id_t packet_id) … … 295 327 /** Allocate new packet to handle the given content size. 296 328 * 297 * @param[in] content The minimum content size. 298 * @return The allocated packet. 299 * @return NULL if there is an error. 329 * @param[in] content The minimum content size. 330 * 331 * @return The allocated packet. 332 * @return NULL if there is an error. 300 333 * 301 334 */ … … 305 338 } 306 339 307 /** Register the device notification receiver, the network interface layer 308 * module. 309 * 310 * @param[in] name Module name. 311 * @param[in] device_id The device identifier. 312 * @param[in] phone The network interface layer module phone. 313 * @return EOK on success. 314 * @return ENOENT if there is no such device. 315 * @return ELIMIT if there is another module registered. 340 /** Register the device notification receiver, the network interface layer module. 341 * 342 * @param[in] name Module name. 343 * @param[in] device_id The device identifier. 344 * @param[in] phone The network interface layer module phone. 345 * 346 * @return EOK on success. 347 * @return ENOENT if there is no such device. 348 * @return ELIMIT if there is another module registered. 349 * 316 350 */ 317 351 static int register_message(const char *name, device_id_t device_id, int phone) … … 332 366 /** Process the netif module messages. 333 367 * 334 * @param[in] nameModule name.335 * @param[in] callidThe message identifier.336 * @param[in] callThe message parameters.337 * @param[out] answer 338 * @param[out] answer_count The last parameter for the actual answer in the339 * 340 * @return EOK on success.341 * @return ENOTSUP if the message is not known.342 * @return Other error codes as defined for each specific module343 * 368 * @param[in] name Module name. 369 * @param[in] callid The message identifier. 370 * @param[in] call The message parameters. 371 * @param[out] answer The message answer parameters. 372 * @param[out] answer_count The last parameter for the actual answer 373 * in the answer parameter. 374 * 375 * @return EOK on success. 376 * @return ENOTSUP if the message is not known. 377 * @return Other error codes as defined for each specific module message function. 344 378 * 345 379 * @see IS_NET_NETIF_MESSAGE() … … 358 392 *answer_count = 0; 359 393 switch (IPC_GET_METHOD(*call)) { 360 case IPC_M_PHONE_HUNGUP: 361 return EOK; 362 363 case NET_NETIF_PROBE: 364 return netif_probe_req_local(0, IPC_GET_DEVICE(call), 365 NETIF_GET_IRQ(call), NETIF_GET_IO(call)); 366 367 case IPC_M_CONNECT_TO_ME: 368 fibril_rwlock_write_lock(&netif_globals.lock); 369 ERROR_CODE = register_message(name, IPC_GET_DEVICE(call), 370 IPC_GET_PHONE(call)); 371 fibril_rwlock_write_unlock(&netif_globals.lock); 372 return ERROR_CODE; 373 374 case NET_NETIF_SEND: 375 ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone, 376 &packet, IPC_GET_PACKET(call))); 377 return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet, 378 IPC_GET_SENDER(call)); 379 380 case NET_NETIF_START: 381 return netif_start_req_local(0, IPC_GET_DEVICE(call)); 382 383 case NET_NETIF_STATS: 384 fibril_rwlock_read_lock(&netif_globals.lock); 385 386 if (ERROR_OCCURRED(async_data_read_receive(&callid, &length))) { 394 case IPC_M_PHONE_HUNGUP: 395 return EOK; 396 case NET_NETIF_PROBE: 397 return netif_probe_req_local(0, IPC_GET_DEVICE(call), 398 NETIF_GET_IRQ(call), NETIF_GET_IO(call)); 399 case IPC_M_CONNECT_TO_ME: 400 fibril_rwlock_write_lock(&netif_globals.lock); 401 ERROR_CODE = register_message(name, IPC_GET_DEVICE(call), 402 IPC_GET_PHONE(call)); 403 fibril_rwlock_write_unlock(&netif_globals.lock); 404 return ERROR_CODE; 405 case NET_NETIF_SEND: 406 ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone, 407 &packet, IPC_GET_PACKET(call))); 408 return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet, 409 IPC_GET_SENDER(call)); 410 case NET_NETIF_START: 411 return netif_start_req_local(0, IPC_GET_DEVICE(call)); 412 case NET_NETIF_STATS: 413 fibril_rwlock_read_lock(&netif_globals.lock); 414 if (!ERROR_OCCURRED(async_data_read_receive(&callid, &length))) { 415 if (length < sizeof(device_stats_t)) 416 ERROR_CODE = EOVERFLOW; 417 else { 418 if (!ERROR_OCCURRED(netif_get_device_stats( 419 IPC_GET_DEVICE(call), &stats))) 420 ERROR_CODE = async_data_read_finalize(callid, &stats, 421 sizeof(device_stats_t)); 422 } 423 } 387 424 fibril_rwlock_read_unlock(&netif_globals.lock); 388 425 return ERROR_CODE; 389 } 390 if (length < sizeof(device_stats_t)) { 426 case NET_NETIF_STOP: 427 return netif_stop_req_local(0, IPC_GET_DEVICE(call)); 428 case NET_NETIF_GET_ADDR: 429 fibril_rwlock_read_lock(&netif_globals.lock); 430 if (!ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call), 431 &address))) 432 ERROR_CODE = measured_strings_reply(&address, 1); 391 433 fibril_rwlock_read_unlock(&netif_globals.lock); 392 return EOVERFLOW; 393 } 394 395 if (ERROR_NONE(netif_get_device_stats(IPC_GET_DEVICE(call), 396 &stats))) { 397 ERROR_CODE = async_data_read_finalize(callid, &stats, 398 sizeof(device_stats_t)); 399 } 400 401 fibril_rwlock_read_unlock(&netif_globals.lock); 402 return ERROR_CODE; 403 404 case NET_NETIF_STOP: 405 return netif_stop_req_local(0, IPC_GET_DEVICE(call)); 406 407 case NET_NETIF_GET_ADDR: 408 fibril_rwlock_read_lock(&netif_globals.lock); 409 if (ERROR_NONE(netif_get_addr_message(IPC_GET_DEVICE(call), 410 &address))) 411 ERROR_CODE = measured_strings_reply(&address, 1); 412 fibril_rwlock_read_unlock(&netif_globals.lock); 413 return ERROR_CODE; 434 return ERROR_CODE; 414 435 } 415 436 … … 419 440 /** Start the network interface module. 420 441 * 421 * Initialize the client connection serving function, initialize the module, 422 * registers the module service and start the async manager, processing IPC 423 * messages in an infinite loop. 424 * 425 * @param[in] client_connection The client connection processing function. 426 * The module skeleton propagates its own one. 427 * @return EOK on success. 428 * @return Other error codes as defined for each specific module 429 * message function. 442 * Initialize the client connection serving function, initialize 443 * the module, registers the module service and start the async 444 * manager, processing IPC messages in an infinite loop. 445 * 446 * @param[in] client_connection The client connection processing 447 * function. The module skeleton propagates 448 * its own one. 449 * 450 * @return EOK on success. 451 * @return Other error codes as defined for each specific module message 452 * function. 453 * 430 454 */ 431 455 int netif_module_start_standalone(async_client_conn_t client_connection)
Note:
See TracChangeset
for help on using the changeset viewer.
