Changeset f4f866c in mainline for uspace/srv/net/tl/udp/udp.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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.

Message:

Merge mainline changes.

File:

• uspace/srv/net/tl/udp/udp.c (modified) (15 diffs)

uspace/srv/net/tl/udp/udp.c

@@ -48 +48 @@
 #include <adt/dynamic_fifo.h>
 #include <packet/packet_client.h>
+#include <packet_remote.h>
 #include <net_checksum.h>
 #include <in.h>
@@ -63 +64 @@
 #include <socket_messages.h>
 #include <tl_common.h>
+#include <tl_local.h>
+#include <tl_interface.h>
 #include <tl_messages.h>
 
@@ -258 +261 @@
         icmp_type_t type;
         icmp_code_t code;
-        ip_pseudo_header_ref ip_header;
+        void *ip_header;
         struct sockaddr * src;
         struct sockaddr * dest;
@@ -356 +359 @@
                         while(tmp_packet){
                                 next_packet = pq_detach(tmp_packet);
-                                pq_release(udp_globals.net_phone, packet_get_id(tmp_packet));
+                                pq_release_remote(udp_globals.net_phone, packet_get_id(tmp_packet));
                                 tmp_packet = next_packet;
                         }
@@ -382 +385 @@
         // queue the received packet
         if(ERROR_OCCURRED(dyn_fifo_push(&socket->received, packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE))
-                || ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension))){
+            || ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension))){
                 return udp_release_and_return(packet, ERROR_CODE);
         }
@@ -392 +395 @@
 }
 
-int udp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int udp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
         ERROR_DECLARE;
 
@@ -400 +403 @@
         switch(IPC_GET_METHOD(*call)){
                 case NET_TL_RECEIVED:
-                        if(! ERROR_OCCURRED(packet_translate(udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate_remote(udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_UDP, IPC_GET_ERROR(call));
                         }
@@ -457 +460 @@
 
                                 if(res == EOK){
-                                        if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
+                                        if (tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
                                                 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, packet_dimension->content);
                                         }
@@ -533 +536 @@
         uint16_t dest_port;
         uint32_t checksum;
-        ip_pseudo_header_ref ip_header;
+        void *ip_header;
         size_t headerlen;
         device_id_t device_id;
@@ -662 +665 @@
                 return NO_DATA;
         }
-        ERROR_PROPAGATE(packet_translate(udp_globals.net_phone, &packet, packet_id));
+        ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet, packet_id));
         // get udp header
         data = packet_get_data(packet);
         if(! data){
-                pq_release(udp_globals.net_phone, packet_id);
+                pq_release_remote(udp_globals.net_phone, packet_id);
                 return NO_DATA;
         }
@@ -674 +677 @@
         result = packet_get_addr(packet, (uint8_t **) &addr, NULL);
         if(ERROR_OCCURRED(tl_set_address_port(addr, result, ntohs(header->source_port)))){
-                pq_release(udp_globals.net_phone, packet_id);
+                pq_release_remote(udp_globals.net_phone, packet_id);
                 return ERROR_CODE;
         }
@@ -689 +692 @@
         // release the packet
         dyn_fifo_pop(&socket->received);
-        pq_release(udp_globals.net_phone, packet_get_id(packet));
+        pq_release_remote(udp_globals.net_phone, packet_get_id(packet));
         // return the total length
         return (int) length;
@@ -695 +698 @@
 
 int udp_release_and_return(packet_t packet, int result){
-        pq_release(udp_globals.net_phone, packet_get_id(packet));
+        pq_release_remote(udp_globals.net_phone, packet_get_id(packet));
         return result;
 }
-
-#ifdef CONFIG_NETWORKING_modular
-
-#include <tl_standalone.h>
 
 /** Default thread for new connections.
@@ -729 +728 @@
                 
                 /* Process the message */
-                int res = tl_module_message(callid, &call, &answer, &answer_count);
+                int res = tl_module_message_standalone(callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -753 +753 @@
         ERROR_DECLARE;
         
-        /* Print the module label */
-        printf("Task %d - %s\n", task_get_id(), NAME);
-        
         /* Start the module */
-        if (ERROR_OCCURRED(tl_module_start(tl_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
+        if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection)))
                 return ERROR_CODE;
-        }
         
         return EOK;
 }
 
-#endif /* CONFIG_NETWORKING_modular */
-
 /** @}
  */