Changes in / [eb221e5:bbc74af7] in mainline
- Location:
- uspace
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/net/modules.c
reb221e5 rbbc74af7 198 198 } 199 199 200 /** Receives data from the other party.201 *202 * The received data buffer is allocated and returned.203 *204 * @param[out] data The data buffer to be filled.205 * @param[out] length The buffer length.206 * @return EOK on success.207 * @return EBADMEM if the data or the length parameter is NULL.208 * @return EINVAL if the client does not send data.209 * @return ENOMEM if there is not enough memory left.210 * @return Other error codes as defined for the211 * async_data_write_finalize() function.212 */213 int data_receive(void **data, size_t *length)214 {215 ipc_callid_t callid;216 int rc;217 218 if (!data || !length)219 return EBADMEM;220 221 // fetch the request222 if (!async_data_write_receive(&callid, length))223 return EINVAL;224 225 // allocate the buffer226 *data = malloc(*length);227 if (!*data)228 return ENOMEM;229 230 // fetch the data231 rc = async_data_write_finalize(callid, *data, *length);232 if (rc != EOK) {233 free(data);234 return rc;235 }236 237 return EOK;238 }239 240 200 /** Replies the data to the other party. 241 201 * -
uspace/lib/c/include/net/modules.h
reb221e5 rbbc74af7 49 49 #include <sys/time.h> 50 50 51 /** Converts the data length between different types.52 *53 * @param[in] type_from The source type.54 * @param[in] type_to The destination type.55 * @param[in] count The number units of the source type size.56 */57 #define CONVERT_SIZE(type_from, type_to, count) \58 ((sizeof(type_from) / sizeof(type_to)) * (count))59 60 /** Registers the module service at the name server.61 *62 * @param[in] me The module service.63 * @param[out] phonehash The created phone hash.64 */65 #define REGISTER_ME(me, phonehash) \66 ipc_connect_to_me(PHONE_NS, (me), 0, 0, (phonehash))67 68 51 /** Connect to the needed module function type definition. 69 52 * … … 80 63 extern int connect_to_service(services_t); 81 64 extern int connect_to_service_timeout(services_t, suseconds_t); 82 extern int data_receive(void **, size_t *);83 65 extern int data_reply(void *, size_t); 84 66 extern void refresh_answer(ipc_call_t *, int *); -
uspace/srv/hw/netif/dp8390/dp8390_module.c
reb221e5 rbbc74af7 197 197 return rc; 198 198 address->value = (char *) (&((dpeth_t *) device->specific)->de_address); 199 address->length = CONVERT_SIZE(ether_addr_t, char, 1);199 address->length = sizeof(ether_addr_t); 200 200 return EOK; 201 201 } … … 310 310 async_set_interrupt_received(irq_handler); 311 311 312 return REGISTER_ME(SERVICE_DP8390, &phonehash);312 return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash); 313 313 } 314 314 -
uspace/srv/net/il/arp/arp.c
reb221e5 rbbc74af7 483 483 des_proto = des_hw + header->hardware_length; 484 484 trans = arp_addr_find(&proto->addresses, (char *) src_proto, 485 CONVERT_SIZE(uint8_t, char, header->protocol_length));485 header->protocol_length); 486 486 /* Exists? */ 487 487 if (trans && trans->hw_addr) { 488 if (trans->hw_addr->length != CONVERT_SIZE(uint8_t, char, 489 header->hardware_length)) { 488 if (trans->hw_addr->length != header->hardware_length) 490 489 return EINVAL; 491 }492 490 memcpy(trans->hw_addr->value, src_hw, trans->hw_addr->length); 493 491 } 494 492 /* Is my protocol address? */ 495 if (proto->addr->length != CONVERT_SIZE(uint8_t, char, 496 header->protocol_length)) { 493 if (proto->addr->length != header->protocol_length) 497 494 return EINVAL; 498 }499 495 if (!str_lcmp(proto->addr->value, (char *) des_proto, 500 496 proto->addr->length)) { … … 507 503 fibril_condvar_initialize(&trans->cv); 508 504 rc = arp_addr_add(&proto->addresses, (char *) src_proto, 509 CONVERT_SIZE(uint8_t, char, header->protocol_length), 510 trans); 505 header->protocol_length, trans); 511 506 if (rc != EOK) { 512 507 /* The generic char map has already freed trans! */ … … 516 511 if (!trans->hw_addr) { 517 512 trans->hw_addr = measured_string_create_bulk( 518 (char *) src_hw, CONVERT_SIZE(uint8_t, char, 519 header->hardware_length)); 513 (char *) src_hw, header->hardware_length); 520 514 if (!trans->hw_addr) 521 515 return ENOMEM; … … 606 600 607 601 /* ARP packet content size = header + (address + translation) * 2 */ 608 length = 8 + 2 * (CONVERT_SIZE(char, uint8_t, proto->addr->length) + 609 CONVERT_SIZE(char, uint8_t, device->addr->length)); 602 length = 8 + 2 * (proto->addr->length + device->addr->length); 610 603 if (length > device->packet_dimension.content) 611 604 return ELIMIT; … … 640 633 641 634 rc = packet_set_addr(packet, (uint8_t *) device->addr->value, 642 (uint8_t *) device->broadcast_addr->value, 643 CONVERT_SIZE(char, uint8_t, device->addr->length)); 635 (uint8_t *) device->broadcast_addr->value, device->addr->length); 644 636 if (rc != EOK) { 645 637 pq_release_remote(arp_globals.net_phone, packet_get_id(packet)); -
uspace/srv/net/il/arp/arp_module.c
reb221e5 rbbc74af7 79 79 goto out; 80 80 81 rc = REGISTER_ME(SERVICE_ARP, &phonehash);81 rc = ipc_connect_to_me(PHONE_NS, SERVICE_ARP, 0, 0, &phonehash); 82 82 if (rc != EOK) 83 83 goto out; -
uspace/srv/net/il/ip/ip.c
reb221e5 rbbc74af7 442 442 if (route) { 443 443 address.value = (char *) &route->address.s_addr; 444 address.length = CONVERT_SIZE(in_addr_t, char, 1);444 address.length = sizeof(in_addr_t); 445 445 446 446 rc = arp_device_req(ip_netif->arp->phone, … … 639 639 if (destination) { 640 640 rc = packet_set_addr(packet, NULL, (uint8_t *) destination->value, 641 CONVERT_SIZE(char, uint8_t, destination->length));641 destination->length); 642 642 } else { 643 643 rc = packet_set_addr(packet, NULL, NULL, 0); … … 687 687 rc = packet_set_addr(next, NULL, 688 688 (uint8_t *) destination->value, 689 CONVERT_SIZE(char, uint8_t, 690 destination->length)); 689 destination->length); 691 690 if (rc != EOK) { 692 691 free(last_header); … … 718 717 rc = packet_set_addr(next, NULL, 719 718 (uint8_t *) destination->value, 720 CONVERT_SIZE(char, uint8_t, destination->length));719 destination->length); 721 720 if (rc != EOK) { 722 721 free(last_header); … … 1006 1005 destination.value = route->gateway.s_addr ? 1007 1006 (char *) &route->gateway.s_addr : (char *) &dest.s_addr; 1008 destination.length = CONVERT_SIZE(dest.s_addr, char, 1);1007 destination.length = sizeof(dest.s_addr); 1009 1008 1010 1009 rc = arp_translate_req(netif->arp->phone, netif->device_id, … … 1758 1757 // clear the ARP mapping if any 1759 1758 address.value = (char *) &header->destination_address; 1760 address.length = CONVERT_SIZE(uint8_t, char, 1761 sizeof(header->destination_address)); 1759 address.length = sizeof(header->destination_address); 1762 1760 arp_clear_address_req(netif->arp->phone, 1763 1761 netif->device_id, SERVICE_IP, &address); … … 1951 1949 1952 1950 case NET_IP_GET_ROUTE: 1953 rc = data_receive((void **) &addr, &addrlen); 1951 rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, 1952 &addrlen); 1954 1953 if (rc != EOK) 1955 1954 return rc; -
uspace/srv/net/il/ip/ip_module.c
reb221e5 rbbc74af7 80 80 goto out; 81 81 82 rc = REGISTER_ME(SERVICE_IP, &phonehash);82 rc = ipc_connect_to_me(PHONE_NS, SERVICE_IP, 0, 0, &phonehash); 83 83 if (rc != EOK) 84 84 goto out; -
uspace/srv/net/net/net.c
reb221e5 rbbc74af7 335 335 goto out; 336 336 337 rc = REGISTER_ME(SERVICE_NETWORKING, &phonehash);337 rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash); 338 338 if (rc != EOK) 339 339 goto out; -
uspace/srv/net/netif/lo/lo.c
reb221e5 rbbc74af7 166 166 sysarg_t phonehash; 167 167 168 return REGISTER_ME(SERVICE_LO, &phonehash);168 return ipc_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, &phonehash); 169 169 } 170 170 -
uspace/srv/net/nil/eth/eth.c
reb221e5 rbbc74af7 201 201 202 202 eth_globals.broadcast_addr = 203 measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", 204 CONVERT_SIZE(uint8_t, char, ETH_ADDR)); 203 measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR); 205 204 if (!eth_globals.broadcast_addr) { 206 205 rc = ENOMEM; -
uspace/srv/net/nil/eth/eth_module.c
reb221e5 rbbc74af7 66 66 goto out; 67 67 68 rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);68 rc = ipc_connect_to_me(PHONE_NS, SERVICE_ETHERNET, 0, 0, &phonehash); 69 69 if (rc != EOK) 70 70 goto out; -
uspace/srv/net/nil/nildummy/nildummy_module.c
reb221e5 rbbc74af7 67 67 goto out; 68 68 69 rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);69 rc = ipc_connect_to_me(PHONE_NS, SERVICE_NILDUMMY, 0, 0, &phonehash); 70 70 if (rc != EOK) 71 71 goto out; -
uspace/srv/net/tl/icmp/icmp_module.c
reb221e5 rbbc74af7 74 74 goto out; 75 75 76 rc = REGISTER_ME(SERVICE_ICMP, &phonehash);76 rc = ipc_connect_to_me(PHONE_NS, SERVICE_ICMP, 0, 0, &phonehash); 77 77 if (rc != EOK) 78 78 goto out; -
uspace/srv/net/tl/tcp/tcp.c
reb221e5 rbbc74af7 1365 1365 1366 1366 case NET_SOCKET_BIND: 1367 res = data_receive((void **) &addr, &addrlen); 1367 res = async_data_write_accept((void **) &addr, false, 1368 0, 0, 0, &addrlen); 1368 1369 if (res != EOK) 1369 1370 break; … … 1402 1403 1403 1404 case NET_SOCKET_CONNECT: 1404 res = data_receive((void **) &addr, &addrlen); 1405 res = async_data_write_accept((void **) &addr, false, 1406 0, 0, 0, &addrlen); 1405 1407 if (res != EOK) 1406 1408 break; … … 1453 1455 1454 1456 case NET_SOCKET_SENDTO: 1455 res = data_receive((void **) &addr, &addrlen); 1457 res = async_data_write_accept((void **) &addr, false, 1458 0, 0, 0, &addrlen); 1456 1459 if (res != EOK) 1457 1460 break; -
uspace/srv/net/tl/tcp/tcp_module.c
reb221e5 rbbc74af7 75 75 goto out; 76 76 77 rc = REGISTER_ME(SERVICE_TCP, &phonehash);77 rc = ipc_connect_to_me(PHONE_NS, SERVICE_TCP, 0, 0, &phonehash); 78 78 if (rc != EOK) 79 79 goto out; -
uspace/srv/net/tl/udp/udp.c
reb221e5 rbbc74af7 771 771 772 772 case NET_SOCKET_BIND: 773 res = data_receive((void **) &addr, &addrlen); 773 res = async_data_write_accept((void **) &addr, false, 774 0, 0, 0, &addrlen); 774 775 if (res != EOK) 775 776 break; … … 784 785 785 786 case NET_SOCKET_SENDTO: 786 res = data_receive((void **) &addr, &addrlen); 787 res = async_data_write_accept((void **) &addr, false, 788 0, 0, 0, &addrlen); 787 789 if (res != EOK) 788 790 break; -
uspace/srv/net/tl/udp/udp_module.c
reb221e5 rbbc74af7 75 75 goto out; 76 76 77 rc = REGISTER_ME(SERVICE_UDP, &phonehash);77 rc = ipc_connect_to_me(PHONE_NS, SERVICE_UDP, 0, 0, &phonehash); 78 78 if (rc != EOK) 79 79 goto out;
Note:
See TracChangeset
for help on using the changeset viewer.