Changes in uspace/srv/net/il/arp/arp.c [7837101:228e490] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/il/arp/arp.c
r7837101 r228e490 483 483 des_proto = des_hw + header->hardware_length; 484 484 trans = arp_addr_find(&proto->addresses, (char *) src_proto, 485 header->protocol_length);485 CONVERT_SIZE(uint8_t, char, header->protocol_length)); 486 486 /* Exists? */ 487 487 if (trans && trans->hw_addr) { 488 if (trans->hw_addr->length != header->hardware_length) 488 if (trans->hw_addr->length != CONVERT_SIZE(uint8_t, char, 489 header->hardware_length)) { 489 490 return EINVAL; 491 } 490 492 memcpy(trans->hw_addr->value, src_hw, trans->hw_addr->length); 491 493 } 492 494 /* Is my protocol address? */ 493 if (proto->addr->length != header->protocol_length) 495 if (proto->addr->length != CONVERT_SIZE(uint8_t, char, 496 header->protocol_length)) { 494 497 return EINVAL; 498 } 495 499 if (!str_lcmp(proto->addr->value, (char *) des_proto, 496 500 proto->addr->length)) { … … 503 507 fibril_condvar_initialize(&trans->cv); 504 508 rc = arp_addr_add(&proto->addresses, (char *) src_proto, 505 header->protocol_length, trans); 509 CONVERT_SIZE(uint8_t, char, header->protocol_length), 510 trans); 506 511 if (rc != EOK) { 507 512 /* The generic char map has already freed trans! */ … … 511 516 if (!trans->hw_addr) { 512 517 trans->hw_addr = measured_string_create_bulk( 513 (char *) src_hw, header->hardware_length); 518 (char *) src_hw, CONVERT_SIZE(uint8_t, char, 519 header->hardware_length)); 514 520 if (!trans->hw_addr) 515 521 return ENOMEM; … … 600 606 601 607 /* ARP packet content size = header + (address + translation) * 2 */ 602 length = 8 + 2 * (proto->addr->length + device->addr->length); 608 length = 8 + 2 * (CONVERT_SIZE(char, uint8_t, proto->addr->length) + 609 CONVERT_SIZE(char, uint8_t, device->addr->length)); 603 610 if (length > device->packet_dimension.content) 604 611 return ELIMIT; … … 633 640 634 641 rc = packet_set_addr(packet, (uint8_t *) device->addr->value, 635 (uint8_t *) device->broadcast_addr->value, device->addr->length); 642 (uint8_t *) device->broadcast_addr->value, 643 CONVERT_SIZE(char, uint8_t, device->addr->length)); 636 644 if (rc != EOK) { 637 645 pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
Note:
See TracChangeset
for help on using the changeset viewer.