Changeset 88a1bb9 in mainline for uspace/srv/net/il/ip/ip.c
- Timestamp:
- 2010-11-18T23:20:09Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4eca056
- Parents:
- f772bc55
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/il/ip/ip.c
rf772bc55 r88a1bb9 170 170 * @returns Other error codes as defined for the packet_set_addr(). 171 171 */ 172 static int ip_prepare_icmp(packet_t packet, ip_header_ refheader)172 static int ip_prepare_icmp(packet_t packet, ip_header_t *header) 173 173 { 174 174 packet_t next; … … 187 187 188 188 // get header 189 header = (ip_header_ ref) packet_get_data(packet);189 header = (ip_header_t *) packet_get_data(packet); 190 190 if (!header) 191 191 return EINVAL; … … 234 234 static int 235 235 ip_prepare_icmp_and_get_phone(services_t error, packet_t packet, 236 ip_header_ refheader)236 ip_header_t *header) 237 237 { 238 238 int phone; … … 542 542 * @returns NULL on error. 543 543 */ 544 static ip_header_ ref545 ip_create_middle_header(packet_t packet, ip_header_ reflast)546 { 547 ip_header_ refmiddle;548 549 middle = (ip_header_ ref) packet_suffix(packet, IP_HEADER_LENGTH(last));544 static ip_header_t * 545 ip_create_middle_header(packet_t packet, ip_header_t *last) 546 { 547 ip_header_t *middle; 548 549 middle = (ip_header_t *) packet_suffix(packet, IP_HEADER_LENGTH(last)); 550 550 if (!middle) 551 551 return NULL; … … 562 562 * @param[in] first The original header to be copied. 563 563 */ 564 static void ip_create_last_header(ip_header_ ref last, ip_header_reffirst)565 { 566 ip_option_ refoption;564 static void ip_create_last_header(ip_header_t *last, ip_header_t *first) 565 { 566 ip_option_t *option; 567 567 size_t next; 568 568 size_t length; … … 575 575 // process all ip options 576 576 while (next < first->header_length) { 577 option = (ip_option_ ref) (((uint8_t *) first) + next);577 option = (ip_option_t *) (((uint8_t *) first) + next); 578 578 // skip end or noop 579 579 if ((option->type == IPOPT_END) || … … 626 626 { 627 627 size_t length; 628 ip_header_ refheader;629 ip_header_ reflast_header;630 ip_header_ refmiddle_header;628 ip_header_t *header; 629 ip_header_t *last_header; 630 ip_header_t *middle_header; 631 631 packet_t next; 632 632 int rc; … … 636 636 return EINVAL; 637 637 638 header = (ip_header_ ref) packet_get_data(packet);638 header = (ip_header_t *) packet_get_data(packet); 639 639 if (destination) { 640 640 rc = packet_set_addr(packet, NULL, (uint8_t *) destination->value, … … 660 660 661 661 if (pq_next(packet)) { 662 last_header = (ip_header_ ref) malloc(IP_HEADER_LENGTH(header));662 last_header = (ip_header_t *) malloc(IP_HEADER_LENGTH(header)); 663 663 if (!last_header) 664 664 return ENOMEM; … … 666 666 next = pq_next(packet); 667 667 while (pq_next(next)) { 668 middle_header = (ip_header_ ref) packet_prefix(next,668 middle_header = (ip_header_t *) packet_prefix(next, 669 669 IP_HEADER_LENGTH(last_header)); 670 670 if (!middle_header) { … … 698 698 } 699 699 700 middle_header = (ip_header_ ref) packet_prefix(next,700 middle_header = (ip_header_t *) packet_prefix(next, 701 701 IP_HEADER_LENGTH(last_header)); 702 702 if (!middle_header) { … … 755 755 static int 756 756 ip_fragment_packet_data(packet_t packet, packet_t new_packet, 757 ip_header_ ref header, ip_header_refnew_header, size_t length,757 ip_header_t *header, ip_header_t *new_header, size_t length, 758 758 const struct sockaddr *src, const struct sockaddr *dest, socklen_t addrlen) 759 759 { … … 820 820 { 821 821 packet_t new_packet; 822 ip_header_ refheader;823 ip_header_ refmiddle_header;824 ip_header_ reflast_header;822 ip_header_t *header; 823 ip_header_t *middle_header; 824 ip_header_t *last_header; 825 825 struct sockaddr *src; 826 826 struct sockaddr *dest; … … 838 838 839 839 // get header 840 header = (ip_header_ ref) packet_get_data(packet);840 header = (ip_header_t *) packet_get_data(packet); 841 841 if (!header) 842 842 return EINVAL; … … 853 853 854 854 // allocate as much as originally 855 last_header = (ip_header_ ref) packet_suffix(new_packet,855 last_header = (ip_header_t *) packet_suffix(new_packet, 856 856 IP_HEADER_LENGTH(header)); 857 857 if (!last_header) … … 1065 1065 * @returns NULL if no route was found. 1066 1066 */ 1067 static ip_route_t 1068 *ip_netif_find_route(ip_netif_t *netif, in_addr_t destination)1067 static ip_route_t * 1068 ip_netif_find_route(ip_netif_t *netif, in_addr_t destination) 1069 1069 { 1070 1070 int index; … … 1420 1420 * @returns The packet destination address. 1421 1421 */ 1422 static in_addr_t ip_get_destination(ip_header_ refheader)1422 static in_addr_t ip_get_destination(ip_header_t *header) 1423 1423 { 1424 1424 in_addr_t destination; … … 1451 1451 */ 1452 1452 static int 1453 ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_ refheader,1453 ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_t *header, 1454 1454 services_t error) 1455 1455 { … … 1555 1555 ip_process_packet(device_id_t device_id, packet_t packet) 1556 1556 { 1557 ip_header_ refheader;1557 ip_header_t *header; 1558 1558 in_addr_t dest; 1559 1559 ip_route_t *route; … … 1564 1564 int rc; 1565 1565 1566 header = (ip_header_ ref) packet_get_data(packet);1566 header = (ip_header_t *) packet_get_data(packet); 1567 1567 if (!header) 1568 1568 return ip_release_and_return(packet, ENOMEM); … … 1724 1724 measured_string_t address; 1725 1725 ip_route_t *route; 1726 ip_header_ refheader;1726 ip_header_t *header; 1727 1727 1728 1728 switch (error) { … … 1734 1734 1735 1735 data = packet_get_data(packet); 1736 header = (ip_header_ ref)(data + offset);1736 header = (ip_header_t *)(data + offset); 1737 1737 1738 1738 // destination host unreachable? … … 1783 1783 in_addr_t *src; 1784 1784 ip_route_t *route; 1785 ipv4_pseudo_header_ refheader_in;1785 ipv4_pseudo_header_t *header_in; 1786 1786 1787 1787 if (!destination || (addrlen <= 0)) … … 1829 1829 1830 1830 *headerlen = sizeof(*header_in); 1831 header_in = (ipv4_pseudo_header_ ref) malloc(*headerlen);1831 header_in = (ipv4_pseudo_header_t *) malloc(*headerlen); 1832 1832 if (!header_in) 1833 1833 return ENOMEM;
Note:
See TracChangeset
for help on using the changeset viewer.