Changeset 49ff5f3 in mainline for uspace/srv/net/tcp/std.h

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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/std.h (moved) (moved from uspace/lib/net/include/net_checksum.h ) (2 diffs)

uspace/srv/net/tcp/std.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup tcp
  * @{
  */
-/** @file
- * General CRC and checksum computation.
+/** @file TCP header definitions
+ *
+ * Based on IETF RFC 793
  */
 
-#ifndef LIBNET_CHECKSUM_H_
-#define LIBNET_CHECKSUM_H_
+#ifndef STD_H
+#define STD_H
 
-#include <byteorder.h>
 #include <sys/types.h>
 
-/** IP checksum value for computed zero checksum.
- *
- * Zero is returned as 0xFFFF (not flipped)
- *
- */
-#define IP_CHECKSUM_ZERO  0xffffU
+/** TCP Header (fixed part) */
+typedef struct {
+        /** Source port */
+        uint16_t src_port;
+        /** Destination port */
+        uint16_t dest_port;
+        /** Sequence number */
+        uint32_t seq;
+        /** Acknowledgement number */
+        uint32_t ack;
+        /** Data Offset, Reserved, Flags */
+        uint16_t doff_flags;
+        /** Window */
+        uint16_t window;
+        /* Checksum */
+        uint16_t checksum;
+        /** Urgent pointer */
+        uint16_t urg_ptr;
+} tcp_header_t;
 
-#ifdef __BE__
+/** Bits in tcp_header_t.doff_flags */
+enum doff_flags_bits {
+        DF_DATA_OFFSET_h        = 15,
+        DF_DATA_OFFSET_l        = 12,
+        DF_URG                  = 5,
+        DF_ACK                  = 4,
+        DF_PSH                  = 3,
+        DF_RST                  = 2,
+        DF_SYN                  = 1,
+        DF_FIN                  = 0
+};
 
-#define compute_crc32(seed, data, length) \
-        compute_crc32_be(seed, (uint8_t *) data, length)
+/** TCP pseudo header */
+typedef struct {
+        /** Source address */
+        uint32_t src_addr;
+        /** Destination address */
+        uint32_t dest_addr;
+        /** Zero */
+        uint8_t zero;
+        /** Protocol */
+        uint8_t protocol;
+        /** TCP length */
+        uint16_t tcp_length;
+} tcp_phdr_t;
 
-#endif
-
-#ifdef __LE__
-
-#define compute_crc32(seed, data, length) \
-        compute_crc32_le(seed, (uint8_t *) data, length)
-
-#endif
-
-extern uint32_t compute_crc32_le(uint32_t, uint8_t *, size_t);
-extern uint32_t compute_crc32_be(uint32_t, uint8_t *, size_t);
-extern uint32_t compute_checksum(uint32_t, uint8_t *, size_t);
-extern uint16_t compact_checksum(uint32_t);
-extern uint16_t flip_checksum(uint16_t);
-extern uint16_t ip_checksum(uint8_t *, size_t);
-extern uint64_t multicast_hash(const uint8_t addr[6]);
+/** Option kind */
+enum opt_kind {
+        /** End of option list */
+        OPT_END_LIST            = 0,
+        /** No-operation */
+        OPT_NOP                 = 1,
+        /** Maximum segment size */
+        OPT_MAX_SEG_SIZE        = 2
+};
 
 #endif