Changeset 0773396 in mainline for uspace/srv/net/udp/udp_type.h

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/udp/udp_type.h (modified) (4 diffs)

uspace/srv/net/udp/udp_type.h

@@ -38 +38 @@
 #include <fibril.h>
 #include <fibril_synch.h>
+#include <ipc/loc.h>
 #include <socket_core.h>
 #include <sys/types.h>
@@ -71 +72 @@
 
 typedef struct {
+        service_id_t iplink;
         udp_sock_t local;
         udp_sock_t foreign;
@@ -85 +87 @@
 /** Encoded PDU */
 typedef struct {
+        /** IP link (optional) */
+        service_id_t iplink;
         /** Source address */
         inet_addr_t src;
         /** Destination address */
         inet_addr_t dest;
-        
         /** Encoded PDU data including header */
         void *data;
@@ -143 +146 @@
         /** Connection */
         udp_assoc_t *assoc;
+        /** User-configured IP link */
+        service_id_t iplink;
         /** Receiving fibril */
         fid_t recv_fibril;