Changeset fb4d788 in mainline for uspace/srv/net/udp/udp_inet.c

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 from the mainline

File:

• uspace/srv/net/udp/udp_inet.c (modified) (3 diffs)

uspace/srv/net/udp/udp_inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -64 +64 @@
 
         pdu = udp_pdu_new();
+        pdu->iplink = dgram->iplink;
         pdu->data = dgram->data;
         pdu->data_size = dgram->size;
@@ -105 +106 @@
 {
         udp_msg_t *dmsg;
-        udp_sockpair_t rident;
+        inet_ep2_t rident;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_received_pdu()");