Changeset 973ef9fc in mainline for uspace/srv/net/tl/icmp/icmp.c
- Timestamp:
- 2010-12-25T21:20:28Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 631ee0c
- Parents:
- 1bfd3d3 (diff), 09178b7f (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/icmp/icmp.c
r1bfd3d3 r973ef9fc 130 130 * @return The result parameter. 131 131 */ 132 static int icmp_release_and_return(packet_t packet, int result)132 static int icmp_release_and_return(packet_t *packet, int result) 133 133 { 134 134 pq_release_remote(icmp_globals.net_phone, packet_get_id(packet)); … … 155 155 * @return EPERM if the error message is not allowed. 156 156 */ 157 static int icmp_send_packet(icmp_type_t type, icmp_code_t code, packet_t packet,157 static int icmp_send_packet(icmp_type_t type, icmp_code_t code, packet_t *packet, 158 158 icmp_header_t *header, services_t error, ip_ttl_t ttl, ip_tos_t tos, 159 159 int dont_fragment) … … 189 189 * @return NULL on errors. 190 190 */ 191 static icmp_header_t *icmp_prepare_packet(packet_t packet)191 static icmp_header_t *icmp_prepare_packet(packet_t *packet) 192 192 { 193 193 icmp_header_t *header; … … 248 248 { 249 249 icmp_header_t *header; 250 packet_t packet;250 packet_t *packet; 251 251 size_t length; 252 252 uint8_t *data; … … 340 340 341 341 static int icmp_destination_unreachable_msg_local(int icmp_phone, 342 icmp_code_t code, icmp_param_t mtu, packet_t packet)342 icmp_code_t code, icmp_param_t mtu, packet_t *packet) 343 343 { 344 344 icmp_header_t *header; … … 355 355 } 356 356 357 static int icmp_source_quench_msg_local(int icmp_phone, packet_t packet)357 static int icmp_source_quench_msg_local(int icmp_phone, packet_t *packet) 358 358 { 359 359 icmp_header_t *header; … … 368 368 369 369 static int icmp_time_exceeded_msg_local(int icmp_phone, icmp_code_t code, 370 packet_t packet)370 packet_t *packet) 371 371 { 372 372 icmp_header_t *header; … … 381 381 382 382 static int icmp_parameter_problem_msg_local(int icmp_phone, icmp_code_t code, 383 icmp_param_t pointer, packet_t packet)383 icmp_param_t pointer, packet_t *packet) 384 384 { 385 385 icmp_header_t *header; … … 479 479 * @param[in] code The received reply message code. 480 480 */ 481 static void icmp_process_echo_reply(packet_t packet, icmp_header_t *header,481 static void icmp_process_echo_reply(packet_t *packet, icmp_header_t *header, 482 482 icmp_type_t type, icmp_code_t code) 483 483 { … … 518 518 * ip_client_process_packet() function. 519 519 */ 520 static int icmp_process_packet(packet_t packet, services_t error)520 static int icmp_process_packet(packet_t *packet, services_t error) 521 521 { 522 522 size_t length; … … 658 658 * icmp_process_packet() function. 659 659 */ 660 static int icmp_received_msg_local(device_id_t device_id, packet_t packet,660 static int icmp_received_msg_local(device_id_t device_id, packet_t *packet, 661 661 services_t receiver, services_t error) 662 662 { … … 690 690 static int icmp_process_message(ipc_call_t *call) 691 691 { 692 packet_t packet;692 packet_t *packet; 693 693 int rc; 694 694 695 switch (IPC_GET_ METHOD(*call)) {695 switch (IPC_GET_IMETHOD(*call)) { 696 696 case NET_ICMP_DEST_UNREACH: 697 697 rc = packet_translate_remote(icmp_globals.net_phone, &packet, … … 824 824 825 825 /* Process the call */ 826 switch (IPC_GET_ METHOD(call)) {826 switch (IPC_GET_IMETHOD(call)) { 827 827 case IPC_M_PHONE_HUNGUP: 828 828 keep_on_going = false; … … 896 896 ipc_call_t *answer, int *answer_count) 897 897 { 898 packet_t packet;898 packet_t *packet; 899 899 int rc; 900 900 901 901 *answer_count = 0; 902 switch (IPC_GET_ METHOD(*call)) {902 switch (IPC_GET_IMETHOD(*call)) { 903 903 case NET_TL_RECEIVED: 904 904 rc = packet_translate_remote(icmp_globals.net_phone, &packet, … … 953 953 * result. 954 954 */ 955 if ((IPC_GET_ METHOD(call) == IPC_M_PHONE_HUNGUP) ||955 if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || 956 956 (res == EHANGUP)) 957 957 return;
Note:
See TracChangeset
for help on using the changeset viewer.