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

uspace/srv/net/tcp/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <inet/endpoint.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -125 +126 @@
 }
 
-static void tcp_header_setup(tcp_sockpair_t *sp, tcp_segment_t *seg, tcp_header_t *hdr)
+static void tcp_header_setup(inet_ep2_t *epp, tcp_segment_t *seg, tcp_header_t *hdr)
 {
         uint16_t doff_flags;
         uint16_t doff;
 
-        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->seq = host2uint32_t_be(seg->seq);
         hdr->ack = host2uint32_t_be(seg->ack);
@@ -190 +191 @@
 }
 
-static int tcp_header_encode(tcp_sockpair_t *sp, tcp_segment_t *seg,
+static int tcp_header_encode(inet_ep2_t *epp, tcp_segment_t *seg,
     void **header, size_t *size)
 {
@@ -199 +200 @@
                 return ENOMEM;
 
-        tcp_header_setup(sp, seg, hdr);
+        tcp_header_setup(epp, seg, hdr);
         *header = hdr;
         *size = sizeof(tcp_header_t);
@@ -293 +294 @@
 
 /** Decode incoming PDU */
-int tcp_pdu_decode(tcp_pdu_t *pdu, tcp_sockpair_t *sp, tcp_segment_t **seg)
+int tcp_pdu_decode(tcp_pdu_t *pdu, inet_ep2_t *epp, tcp_segment_t **seg)
 {
         tcp_segment_t *nseg;
@@ -307 +308 @@
         hdr = (tcp_header_t *)pdu->header;
 
-        sp->local.port = uint16_t_be2host(hdr->dest_port);
-        sp->local.addr = pdu->dest;
-        sp->foreign.port = uint16_t_be2host(hdr->src_port);
-        sp->foreign.addr = pdu->src;
+        epp->local.port = uint16_t_be2host(hdr->dest_port);
+        epp->local.addr = pdu->dest;
+        epp->remote.port = uint16_t_be2host(hdr->src_port);
+        epp->remote.addr = pdu->src;
 
         *seg = nseg;
@@ -317 +318 @@
 
 /** Encode outgoing PDU */
-int tcp_pdu_encode(tcp_sockpair_t *sp, tcp_segment_t *seg, tcp_pdu_t **pdu)
+int tcp_pdu_encode(inet_ep2_t *epp, tcp_segment_t *seg, tcp_pdu_t **pdu)
 {
         tcp_pdu_t *npdu;
@@ -327 +328 @@
                 return ENOMEM;
 
-        npdu->src = sp->local.addr;
-        npdu->dest = sp->foreign.addr;
-        tcp_header_encode(sp, seg, &npdu->header, &npdu->header_size);
+        npdu->src = epp->local.addr;
+        npdu->dest = epp->remote.addr;
+        tcp_header_encode(epp, seg, &npdu->header, &npdu->header_size);
 
         text_size = tcp_segment_text_size(seg);