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

Timestamp:

2013-06-23T19:54:53Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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) (5 diffs)

uspace/srv/net/udp/udp_type.h

@@ -40 +40 @@
 #include <socket_core.h>
 #include <sys/types.h>
+#include <inet/addr.h>
 
 #define UDP_FRAGMENT_SIZE 4096
@@ -51 +52 @@
         UDP_EUNSPEC,
         /* No route to destination */
-        UDP_ENOROUTE
+        UDP_ENOROUTE,
+        /** Association reset by user */
+        UDP_ERESET
 } udp_error_t;
 
 typedef enum {
-        XF_DUMMY        = 0x1
+        XF_DUMMY = 0x1
 } xflags_t;
-
-typedef struct {
-        uint32_t ipv4;
-} netaddr_t;
-
-enum netaddr {
-        UDP_IPV4_ANY = 0
-};
 
 enum udp_port {
@@ -71 +66 @@
 
 typedef struct {
-        netaddr_t addr;
+        inet_addr_t addr;
         uint16_t port;
 } udp_sock_t;
@@ -91 +86 @@
 typedef struct {
         /** Source address */
-        netaddr_t src;
+        inet_addr_t src;
         /** Destination address */
-        netaddr_t dest;
-
+        inet_addr_t dest;
+        
         /** Encoded PDU data including header */
         void *data;
@@ -118 +113 @@
         /** Association identification (local and foreign socket) */
         udp_sockpair_t ident;
+
+        /** True if association was reset by user */
+        bool reset;
 
         /** True if association was deleted by user */