Changes in uspace/lib/net/netif/netif_local.c [46d4d9f:995689d1] in mainline
- File:
-
- 1 edited
-
uspace/lib/net/netif/netif_local.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/net/netif/netif_local.c
r46d4d9f r995689d1 27 27 */ 28 28 29 /** @addtogroup libnet29 /** @addtogroup netif 30 30 * @{ 31 31 */ … … 43 43 #include <ipc/services.h> 44 44 #include <ipc/netif.h> 45 #include <err no.h>45 #include <err.h> 46 46 47 47 #include <generic.h> … … 58 58 DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); 59 59 60 /** Network interface global data. */ 60 /** Network interface global data. 61 */ 61 62 netif_globals_t netif_globals; 62 63 … … 64 65 * 65 66 * @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)67 * @param[in] device_id The device identifier. 68 * @param[in] irq The device interrupt number. 69 * @param[in] io The device input/output address. 70 * 71 * @return EOK on success. 72 * @return Other errro codes as defined for the netif_probe_message(). 73 * 74 */ 75 int netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io) 75 76 { 76 77 fibril_rwlock_write_lock(&netif_globals.lock); … … 84 85 * 85 86 * @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. 87 * @param[in] device_id The device identifier. 88 * @param[in] packet The packet queue. 89 * @param[in] sender The sending module service. 90 * 91 * @return EOK on success. 92 * @return Other error codes as defined for the generic_send_msg() function. 93 * 92 94 */ 93 95 int netif_send_msg_local(int netif_phone, device_id_t device_id, 94 packet_t *packet, services_t sender)96 packet_t packet, services_t sender) 95 97 { 96 98 fibril_rwlock_write_lock(&netif_globals.lock); … … 104 106 * 105 107 * @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.108 * @param[in] device_id The device identifier. 109 * 110 * @return EOK on success. 111 * @return Other error codes as defined for the find_device() function. 112 * @return Other error codes as defined for the netif_start_message() function. 113 * 112 114 */ 113 115 int netif_start_req_local(int netif_phone, device_id_t device_id) 114 116 { 115 int rc;117 ERROR_DECLARE; 116 118 117 119 fibril_rwlock_write_lock(&netif_globals.lock); 118 120 119 121 netif_device_t *device; 120 rc = find_device(device_id, &device); 121 if (rc != EOK) { 122 if (ERROR_OCCURRED(find_device(device_id, &device))) { 122 123 fibril_rwlock_write_unlock(&netif_globals.lock); 123 return rc;124 return ERROR_CODE; 124 125 } 125 126 … … 140 141 * 141 142 * @param[in] netif_phone The network interface phone. 142 * @param[in] device_id 143 * @return EOK on success.144 * @return Other error codes as defined for the find_device()145 * 146 * @return Other error codes as defined for the147 * netif_stop_message() function.143 * @param[in] device_id The device identifier. 144 * 145 * @return EOK on success. 146 * @return Other error codes as defined for the find_device() function. 147 * @return Other error codes as defined for the netif_stop_message() function. 148 * 148 149 */ 149 150 int netif_stop_req_local(int netif_phone, device_id_t device_id) 150 151 { 151 int rc;152 ERROR_DECLARE; 152 153 153 154 fibril_rwlock_write_lock(&netif_globals.lock); 154 155 155 156 netif_device_t *device; 156 rc = find_device(device_id, &device); 157 if (rc != EOK) { 157 if (ERROR_OCCURRED(find_device(device_id, &device))) { 158 158 fibril_rwlock_write_unlock(&netif_globals.lock); 159 return rc;159 return ERROR_CODE; 160 160 } 161 161 … … 175 175 /** Return the device usage statistics. 176 176 * 177 * @param[in] netif_phone The network interface phone. 178 * @param[in] device_id The device identifier. 179 * @param[out] stats The device usage statistics. 180 * @return EOK on success. 177 * @param[in] netif_phone The network interface phone. 178 * @param[in] device_id The device identifier. 179 * @param[out] stats The device usage statistics. 180 * 181 * @return EOK on success. 182 * 181 183 */ 182 184 int netif_stats_req_local(int netif_phone, device_id_t device_id, 183 device_stats_ t *stats)185 device_stats_ref stats) 184 186 { 185 187 fibril_rwlock_read_lock(&netif_globals.lock); … … 192 194 /** Return the device local hardware address. 193 195 * 194 * @param[in] netif_phone The network interface phone. 195 * @param[in] device_id The device identifier. 196 * @param[out] address The device local hardware address. 197 * @param[out] data The address data. 198 * @return EOK on success. 199 * @return EBADMEM if the address parameter is NULL. 200 * @return ENOENT if there no such device. 201 * @return Other error codes as defined for the 202 * netif_get_addr_message() function. 196 * @param[in] netif_phone The network interface phone. 197 * @param[in] device_id The device identifier. 198 * @param[out] address The device local hardware address. 199 * @param[out] data The address data. 200 * 201 * @return EOK on success. 202 * @return EBADMEM if the address parameter is NULL. 203 * @return ENOENT if there no such device. 204 * @return Other error codes as defined for the netif_get_addr_message() 205 * function. 206 * 203 207 */ 204 208 int netif_get_addr_req_local(int netif_phone, device_id_t device_id, 205 measured_string_ t **address, char **data)206 { 207 int rc;208 209 if ( !address || !data)209 measured_string_ref *address, char **data) 210 { 211 ERROR_DECLARE; 212 213 if ((!address) || (!data)) 210 214 return EBADMEM; 211 215 … … 213 217 214 218 measured_string_t translation; 215 rc = netif_get_addr_message(device_id, &translation); 216 if (rc == EOK) { 219 if (!ERROR_OCCURRED(netif_get_addr_message(device_id, &translation))) { 217 220 *address = measured_string_copy(&translation); 218 rc= (*address) ? EOK : ENOMEM;221 ERROR_CODE = (*address) ? EOK : ENOMEM; 219 222 } 220 223 … … 223 226 *data = (**address).value; 224 227 225 return rc;228 return ERROR_CODE; 226 229 } 227 230 228 231 /** Find the device specific data. 229 232 * 230 * @param[in] device_id The device identifier. 231 * @param[out] device The device specific data. 232 * @return EOK on success. 233 * @return ENOENT if device is not found. 234 * @return EPERM if the device is not initialized. 233 * @param[in] device_id The device identifier. 234 * @param[out] device The device specific data. 235 * 236 * @return EOK on success. 237 * @return ENOENT if device is not found. 238 * @return EPERM if the device is not initialized. 239 * 235 240 */ 236 241 int find_device(device_id_t device_id, netif_device_t **device) … … 251 256 /** Clear the usage statistics. 252 257 * 253 * @param[in] stats The usage statistics. 254 */ 255 void null_device_stats(device_stats_t *stats) 258 * @param[in] stats The usage statistics. 259 * 260 */ 261 void null_device_stats(device_stats_ref stats) 256 262 { 257 263 bzero(stats, sizeof(device_stats_t)); … … 260 266 /** Initialize the netif module. 261 267 * 262 * @param[in] client_connection The client connection functio to be registered. 263 * @return EOK on success. 264 * @return Other error codes as defined for each specific module 265 * message function. 268 * @param[in] client_connection The client connection functio to be 269 * registered. 270 * 271 * @return EOK on success. 272 * @return Other error codes as defined for each specific module 273 * message function. 274 * 266 275 */ 267 276 int netif_init_module(async_client_conn_t client_connection) 268 277 { 269 int rc;278 ERROR_DECLARE; 270 279 271 280 async_set_client_connection(client_connection); … … 274 283 netif_device_map_initialize(&netif_globals.device_map); 275 284 276 rc = pm_init(); 277 if (rc != EOK) 278 return rc; 285 ERROR_PROPAGATE(pm_init()); 279 286 280 287 fibril_rwlock_initialize(&netif_globals.lock); 281 282 rc = netif_initialize(); 283 if (rc != EOK) { 288 if (ERROR_OCCURRED(netif_initialize())) { 284 289 pm_destroy(); 285 return rc;290 return ERROR_CODE; 286 291 } 287 292 … … 293 298 * Prepared for future optimization. 294 299 * 295 * @param[in] packet_id The packet identifier. 300 * @param[in] packet_id The packet identifier. 301 * 296 302 */ 297 303 void netif_pq_release(packet_id_t packet_id) … … 302 308 /** Allocate new packet to handle the given content size. 303 309 * 304 * @param[in] content The minimum content size. 305 * @return The allocated packet. 306 * @return NULL if there is an error. 307 * 308 */ 309 packet_t *netif_packet_get_1(size_t content) 310 * @param[in] content The minimum content size. 311 * 312 * @return The allocated packet. 313 * @return NULL if there is an error. 314 * 315 */ 316 packet_t netif_packet_get_1(size_t content) 310 317 { 311 318 return packet_get_1_remote(netif_globals.net_phone, content); 312 319 } 313 320 314 /** Register the device notification receiver, the network interface layer 315 * module. 316 * 317 * @param[in] name Module name. 318 * @param[in] device_id The device identifier. 319 * @param[in] phone The network interface layer module phone. 320 * @return EOK on success. 321 * @return ENOENT if there is no such device. 322 * @return ELIMIT if there is another module registered. 321 /** Register the device notification receiver, the network interface layer module. 322 * 323 * @param[in] name Module name. 324 * @param[in] device_id The device identifier. 325 * @param[in] phone The network interface layer module phone. 326 * 327 * @return EOK on success. 328 * @return ENOENT if there is no such device. 329 * @return ELIMIT if there is another module registered. 330 * 323 331 */ 324 332 static int register_message(const char *name, device_id_t device_id, int phone) 325 333 { 334 ERROR_DECLARE; 335 326 336 netif_device_t *device; 327 int rc; 328 329 rc = find_device(device_id, &device); 330 if (rc != EOK) 331 return rc; 332 333 if (device->nil_phone > 0) 337 ERROR_PROPAGATE(find_device(device_id, &device)); 338 if(device->nil_phone > 0) 334 339 return ELIMIT; 335 340 … … 342 347 /** Process the netif module messages. 343 348 * 344 * @param[in] nameModule name.345 * @param[in] callidThe message identifier.346 * @param[in] callThe message parameters.347 * @param[out] answer 348 * @param[out] answer_count The last parameter for the actual answer in the349 * 350 * @return EOK on success.351 * @return ENOTSUP if the message is not known.352 * @return Other error codes as defined for each specific module353 * 349 * @param[in] name Module name. 350 * @param[in] callid The message identifier. 351 * @param[in] call The message parameters. 352 * @param[out] answer The message answer parameters. 353 * @param[out] answer_count The last parameter for the actual answer 354 * in the answer parameter. 355 * 356 * @return EOK on success. 357 * @return ENOTSUP if the message is not known. 358 * @return Other error codes as defined for each specific module message function. 354 359 * 355 360 * @see IS_NET_NETIF_MESSAGE() … … 359 364 ipc_call_t *call, ipc_call_t *answer, int *answer_count) 360 365 { 366 ERROR_DECLARE; 367 361 368 size_t length; 362 369 device_stats_t stats; 363 packet_t *packet;370 packet_t packet; 364 371 measured_string_t address; 365 int rc;366 372 367 373 *answer_count = 0; 368 374 switch (IPC_GET_METHOD(*call)) { 369 case IPC_M_PHONE_HUNGUP:370 return EOK;371 372 case NET_NETIF_PROBE:373 return netif_probe_req_local(0, IPC_GET_DEVICE(call),374 NETIF_GET_IRQ(call), NETIF_GET_IO(call));375 376 case IPC_M_CONNECT_TO_ME:377 fibril_rwlock_write_lock(&netif_globals.lock);378 rc = register_message(name, IPC_GET_DEVICE(call),379 IPC_GET_PHONE(call));380 fibril_rwlock_write_unlock(&netif_globals.lock);381 return rc;382 383 case NET_NETIF_SEND:384 rc = packet_translate_remote(netif_globals.net_phone, &packet,385 IPC_GET_PACKET(call));386 if (rc != EOK)387 return rc;388 return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet,389 IPC_GET_SENDER(call));390 391 case NET_NETIF_START:392 return netif_start_req_local(0, IPC_GET_DEVICE(call));393 394 case NET_NETIF_STATS:395 fibril_rwlock_read_lock(&netif_globals.lock);396 397 rc = async_data_read_receive(&callid, &length);398 if (rc != EOK) {375 case IPC_M_PHONE_HUNGUP: 376 return EOK; 377 case NET_NETIF_PROBE: 378 return netif_probe_req_local(0, IPC_GET_DEVICE(call), 379 NETIF_GET_IRQ(call), NETIF_GET_IO(call)); 380 case IPC_M_CONNECT_TO_ME: 381 fibril_rwlock_write_lock(&netif_globals.lock); 382 ERROR_CODE = register_message(name, IPC_GET_DEVICE(call), 383 IPC_GET_PHONE(call)); 384 fibril_rwlock_write_unlock(&netif_globals.lock); 385 return ERROR_CODE; 386 case NET_NETIF_SEND: 387 ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone, 388 &packet, IPC_GET_PACKET(call))); 389 return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet, 390 IPC_GET_SENDER(call)); 391 case NET_NETIF_START: 392 return netif_start_req_local(0, IPC_GET_DEVICE(call)); 393 case NET_NETIF_STATS: 394 fibril_rwlock_read_lock(&netif_globals.lock); 395 if (!ERROR_OCCURRED(async_data_read_receive(&callid, &length))) { 396 if (length < sizeof(device_stats_t)) 397 ERROR_CODE = EOVERFLOW; 398 else { 399 if (!ERROR_OCCURRED(netif_get_device_stats( 400 IPC_GET_DEVICE(call), &stats))) 401 ERROR_CODE = async_data_read_finalize(callid, &stats, 402 sizeof(device_stats_t)); 403 } 404 } 399 405 fibril_rwlock_read_unlock(&netif_globals.lock); 400 return rc; 401 } 402 if (length < sizeof(device_stats_t)) { 406 return ERROR_CODE; 407 case NET_NETIF_STOP: 408 return netif_stop_req_local(0, IPC_GET_DEVICE(call)); 409 case NET_NETIF_GET_ADDR: 410 fibril_rwlock_read_lock(&netif_globals.lock); 411 if (!ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call), 412 &address))) 413 ERROR_CODE = measured_strings_reply(&address, 1); 403 414 fibril_rwlock_read_unlock(&netif_globals.lock); 404 return EOVERFLOW; 405 } 406 407 rc = netif_get_device_stats(IPC_GET_DEVICE(call), &stats); 408 if (rc == EOK) { 409 rc = async_data_read_finalize(callid, &stats, 410 sizeof(device_stats_t)); 411 } 412 413 fibril_rwlock_read_unlock(&netif_globals.lock); 414 return rc; 415 416 case NET_NETIF_STOP: 417 return netif_stop_req_local(0, IPC_GET_DEVICE(call)); 418 419 case NET_NETIF_GET_ADDR: 420 fibril_rwlock_read_lock(&netif_globals.lock); 421 rc = netif_get_addr_message(IPC_GET_DEVICE(call), &address); 422 if (rc == EOK) 423 rc = measured_strings_reply(&address, 1); 424 fibril_rwlock_read_unlock(&netif_globals.lock); 425 return rc; 415 return ERROR_CODE; 426 416 } 427 417 … … 431 421 /** Start the network interface module. 432 422 * 433 * Initialize the client connection serving function, initialize the module, 434 * registers the module service and start the async manager, processing IPC 435 * messages in an infinite loop. 436 * 437 * @param[in] client_connection The client connection processing function. 438 * The module skeleton propagates its own one. 439 * @return EOK on success. 440 * @return Other error codes as defined for each specific module 441 * message function. 423 * Initialize the client connection serving function, initialize 424 * the module, registers the module service and start the async 425 * manager, processing IPC messages in an infinite loop. 426 * 427 * @param[in] client_connection The client connection processing 428 * function. The module skeleton propagates 429 * its own one. 430 * 431 * @return EOK on success. 432 * @return Other error codes as defined for each specific module message 433 * function. 434 * 442 435 */ 443 436 int netif_module_start_standalone(async_client_conn_t client_connection) 444 437 { 445 int rc; 446 447 rc = netif_init_module(client_connection); 448 if (rc != EOK) 449 return rc; 438 ERROR_DECLARE; 439 440 ERROR_PROPAGATE(netif_init_module(client_connection)); 450 441 451 442 async_manager();
Note:
See TracChangeset
for help on using the changeset viewer.
