Changeset fb4d788 in mainline for uspace/srv/net/udp/pdu.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/pdu.c (modified) (8 diffs)

uspace/srv/net/udp/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <stdlib.h>
 #include <inet/addr.h>
-#include <net/socket_codes.h>
 #include "msg.h"
 #include "pdu.h"
@@ -163 +162 @@
 
 /** Decode incoming PDU */
-int udp_pdu_decode(udp_pdu_t *pdu, udp_sockpair_t *sp, udp_msg_t **msg)
+int udp_pdu_decode(udp_pdu_t *pdu, inet_ep2_t *epp, udp_msg_t **msg)
 {
         udp_msg_t *nmsg;
@@ -180 +179 @@
         hdr = (udp_header_t *)pdu->data;
 
-        sp->foreign.port = uint16_t_be2host(hdr->src_port);
-        sp->foreign.addr = pdu->src;
-        sp->local.port = uint16_t_be2host(hdr->dest_port);
-        sp->local.addr = pdu->dest;
+        epp->local_link = pdu->iplink;
+        epp->remote.port = uint16_t_be2host(hdr->src_port);
+        epp->remote.addr = pdu->src;
+        epp->local.port = uint16_t_be2host(hdr->dest_port);
+        epp->local.addr = pdu->dest;
 
         length = uint16_t_be2host(hdr->length);
@@ -197 +197 @@
                 return ENOMEM;
 
-        nmsg->data = text;
         nmsg->data_size = length - sizeof(udp_header_t);
+        nmsg->data = malloc(nmsg->data_size);
+        if (nmsg->data == NULL)
+                return ENOMEM;
+
+        memcpy(nmsg->data, text, nmsg->data_size);
 
         *msg = nmsg;
@@ -205 +209 @@
 
 /** Encode outgoing PDU */
-int udp_pdu_encode(udp_sockpair_t *sp, udp_msg_t *msg, udp_pdu_t **pdu)
+int udp_pdu_encode(inet_ep2_t *epp, udp_msg_t *msg, udp_pdu_t **pdu)
 {
         udp_pdu_t *npdu;
@@ -215 +219 @@
                 return ENOMEM;
 
-        npdu->iplink = sp->iplink;
-        npdu->src = sp->local.addr;
-        npdu->dest = sp->foreign.addr;
+        npdu->iplink = epp->local_link;
+        npdu->src = epp->local.addr;
+        npdu->dest = epp->remote.addr;
 
         npdu->data_size = sizeof(udp_header_t) + msg->data_size;
@@ -227 +231 @@
 
         hdr = (udp_header_t *)npdu->data;
-        hdr->src_port = host2uint16_t_be(sp->local.port);
-        hdr->dest_port = host2uint16_t_be(sp->foreign.port);
+        hdr->src_port = host2uint16_t_be(epp->local.port);
+        hdr->dest_port = host2uint16_t_be(epp->remote.port);
         hdr->length = host2uint16_t_be(npdu->data_size);
         hdr->checksum = 0;