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

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

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.

Message:

Merge mainline changes.

File:

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

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

@@ -190 +190 @@
  * @return              The result parameter.
  */
-static int udp_release_and_return(packet_t packet, int result)
+static int udp_release_and_return(packet_t *packet, int result)
 {
         pq_release_remote(udp_globals.net_phone, packet_get_id(packet));
@@ -217 +217 @@
  *                      ip_client_process_packet() function.
  */
-static int udp_process_packet(device_id_t device_id, packet_t packet,
+static int udp_process_packet(device_id_t device_id, packet_t *packet,
     services_t error)
 {
@@ -225 +225 @@
         udp_header_t *header;
         socket_core_t *socket;
-        packet_t next_packet;
+        packet_t *next_packet;
         size_t total_length;
         uint32_t checksum;
         int fragments;
-        packet_t tmp_packet;
+        packet_t *tmp_packet;
         icmp_type_t type;
         icmp_code_t code;
@@ -393 +393 @@
         fibril_rwlock_write_unlock(&udp_globals.lock);
         async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
-            (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0,
-            (ipcarg_t) fragments);
+            (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0,
+            (sysarg_t) fragments);
 
         return EOK;
@@ -413 +413 @@
  *                      udp_process_packet() function.
  */
-static int udp_received_msg(device_id_t device_id, packet_t packet,
+static int udp_received_msg(device_id_t device_id, packet_t *packet,
     services_t receiver, services_t error)
 {
@@ -458 +458 @@
 {
         socket_core_t *socket;
-        packet_t packet;
-        packet_t next_packet;
+        packet_t *packet;
+        packet_t *next_packet;
         udp_header_t *header;
         int index;
@@ -614 +614 @@
         socket_core_t *socket;
         int packet_id;
-        packet_t packet;
+        packet_t *packet;
         udp_header_t *header;
         struct sockaddr *addr;
@@ -742 +742 @@
 
                 /* Process the call */
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         keep_on_going = false;
@@ -771 +771 @@
 
                 case NET_SOCKET_BIND:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -784 +785 @@
 
                 case NET_SOCKET_SENDTO:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -861 +863 @@
     ipc_call_t *answer, int *answer_count)
 {
-        packet_t packet;
+        packet_t *packet;
         int rc;
 
         *answer_count = 0;
 
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(udp_globals.net_phone, &packet,
@@ -913 +915 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;