Changeset a7811f17 in mainline for uspace/srv/net/tl/udp/udp.c
- Timestamp:
- 2010-11-19T21:28:02Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a9c6b966
- Parents:
- 45f04f8 (diff), aaa3f33a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/tl/udp/udp.c
r45f04f8 ra7811f17 112 112 } 113 113 }; 114 measured_string_ refconfiguration;114 measured_string_t *configuration; 115 115 size_t count = sizeof(names) / sizeof(measured_string_t); 116 116 char *data; … … 223 223 size_t offset; 224 224 int result; 225 udp_header_ refheader;226 socket_core_ refsocket;225 udp_header_t *header; 226 socket_core_t *socket; 227 227 packet_t next_packet; 228 228 size_t total_length; … … 235 235 struct sockaddr *src; 236 236 struct sockaddr *dest; 237 packet_dimension_ refpacket_dimension;237 packet_dimension_t *packet_dimension; 238 238 int rc; 239 239 … … 277 277 278 278 /* Get UDP header */ 279 header = (udp_header_ ref) packet_get_data(packet);279 header = (udp_header_t *) packet_get_data(packet); 280 280 if (!header) 281 281 return udp_release_and_return(packet, NO_DATA); … … 453 453 * function. 454 454 */ 455 static int udp_sendto_message(socket_cores_ reflocal_sockets, int socket_id,455 static int udp_sendto_message(socket_cores_t *local_sockets, int socket_id, 456 456 const struct sockaddr *addr, socklen_t addrlen, int fragments, 457 457 size_t *data_fragment_size, int flags) 458 458 { 459 socket_core_ refsocket;459 socket_core_t *socket; 460 460 packet_t packet; 461 461 packet_t next_packet; 462 udp_header_ refheader;462 udp_header_t *header; 463 463 int index; 464 464 size_t total_length; … … 469 469 size_t headerlen; 470 470 device_id_t device_id; 471 packet_dimension_ refpacket_dimension;471 packet_dimension_t *packet_dimension; 472 472 int rc; 473 473 … … 609 609 * function. 610 610 */ 611 static int udp_recvfrom_message(socket_cores_ reflocal_sockets, int socket_id,611 static int udp_recvfrom_message(socket_cores_t *local_sockets, int socket_id, 612 612 int flags, size_t *addrlen) 613 613 { 614 socket_core_ refsocket;614 socket_core_t *socket; 615 615 int packet_id; 616 616 packet_t packet; 617 udp_header_ refheader;617 udp_header_t *header; 618 618 struct sockaddr *addr; 619 619 size_t length; … … 644 644 return udp_release_and_return(packet, NO_DATA); 645 645 } 646 header = (udp_header_ ref) data;646 header = (udp_header_t *) data; 647 647 648 648 /* Set the source address port */ … … 714 714 ipc_call_t answer; 715 715 int answer_count; 716 packet_dimension_ refpacket_dimension;716 packet_dimension_t *packet_dimension; 717 717 718 718 /*
Note:
See TracChangeset
for help on using the changeset viewer.