Changeset 89ac5513 in mainline for uspace/srv/net/tcp/pdu.c

Timestamp:

2013-06-23T19:54:53Z (12 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/tcp/pdu.c (modified) (1 diff)

uspace/srv/net/tcp/pdu.c

@@ -146 +146 @@
 static void tcp_phdr_setup(tcp_pdu_t *pdu, tcp_phdr_t *phdr)
 {
-        phdr->src_addr = host2uint32_t_be(pdu->src_addr.ipv4);
-        phdr->dest_addr = host2uint32_t_be(pdu->dest_addr.ipv4);
+        // FIXME: Check for correctness
+        
+        uint32_t src_addr;
+        inet_addr_pack(&pdu->src_addr, &src_addr);
+        
+        uint32_t dest_addr;
+        inet_addr_pack(&pdu->dest_addr, &dest_addr);
+        
+        phdr->src_addr = host2uint32_t_be(src_addr);
+        phdr->dest_addr = host2uint32_t_be(dest_addr);
         phdr->zero = 0;
         phdr->protocol = 6; /* XXX Magic number */