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

Timestamp:

2010-11-05T16:34:52Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

376a7fd

Parents:

60898b6

Message:

Do not drop the packet if the user can provide larger buffer next time.

File:

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

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

@@ -626 +626 @@
 
         // get the next received packet
-        packet_id = dyn_fifo_pop(&socket->received);
+        packet_id = dyn_fifo_value(&socket->received);
         if (packet_id < 0)
                 return NO_DATA;
         
         rc = packet_translate_remote(udp_globals.net_phone, &packet, packet_id);
-        if (rc != EOK)
+        if (rc != EOK) {
+                (void) dyn_fifo_pop(&socket->received);
                 return rc;
+        }
 
         // get udp header
         data = packet_get_data(packet);
-        if (!data)
+        if (!data) {
+                (void) dyn_fifo_pop(&socket->received);
                 return udp_release_and_return(packet, NO_DATA);
+        }
         header = (udp_header_ref) data;
 
@@ -643 +647 @@
         result = packet_get_addr(packet, (uint8_t **) &addr, NULL);
         rc = tl_set_address_port(addr, result, ntohs(header->source_port));
-        if (rc != EOK)
+        if (rc != EOK) {
+                (void) dyn_fifo_pop(&socket->received);
                 return udp_release_and_return(packet, rc);
+        }
         *addrlen = (size_t) result;
 
         // send the source address
         rc = data_reply(addr, *addrlen);
-        if (rc != EOK)
+        switch (rc) {
+        case EOK:
+                break;
+        case EOVERFLOW:
+                return rc;
+        default:
+                (void) dyn_fifo_pop(&socket->received);
                 return udp_release_and_return(packet, rc);
+        }
 
         // trim the header
         rc = packet_trim(packet, UDP_HEADER_SIZE, 0);
-        if (rc != EOK)
+        if (rc != EOK) {
+                (void) dyn_fifo_pop(&socket->received);
                 return udp_release_and_return(packet, rc);
+        }
 
         // reply the packets
         rc = socket_reply_packets(packet, &length);
-        if (rc != EOK)
+        switch (rc) {
+        case EOK:
+                break;
+        case EOVERFLOW:
+                return rc;
+        default:
+                (void) dyn_fifo_pop(&socket->received);
                 return udp_release_and_return(packet, rc);
+        }
+
+        (void) dyn_fifo_pop(&socket->received);
 
         // release the packet and return the total length