Changeset 0c37135 in mainline for uspace/srv/net/ethip/std.h

Timestamp:

2012-04-18T07:32:58Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5f67cd61

Parents:

3d93289a (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 with mainline

File:

• uspace/srv/net/ethip/std.h (moved) (moved from uspace/lib/net/include/net_checksum.h ) (2 diffs)

uspace/srv/net/ethip/std.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup ethip
  * @{
  */
-/** @file
- * General CRC and checksum computation.
+/**
+ * @file Ethernet, IP/Ethernet standard definitions
+ *
  */
 
-#ifndef LIBNET_CHECKSUM_H_
-#define LIBNET_CHECKSUM_H_
+#ifndef ETHIP_STD_H_
+#define ETHIP_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
+#define ETH_ADDR_SIZE 6
+#define IPV4_ADDR_SIZE 4
+#define ETH_FRAME_MIN_SIZE 60
 
-#ifdef __BE__
+/** Ethernet frame header */
+typedef struct {
+        /** Destination Address */
+        uint8_t dest[ETH_ADDR_SIZE];
+        /** Source Address */
+        uint8_t src[ETH_ADDR_SIZE];
+        /** Ethertype or Length */
+        uint16_t etype_len;
+} eth_header_t;
 
-#define compute_crc32(seed, data, length) \
-        compute_crc32_be(seed, (uint8_t *) data, length)
+/** ARP packet format (for 48-bit MAC addresses and IPv4) */
+typedef struct {
+        /** Hardware address space */
+        uint16_t hw_addr_space;
+        /** Protocol address space */
+        uint16_t proto_addr_space;
+        /** Hardware address size */
+        uint8_t hw_addr_size;
+        /** Protocol address size */
+        uint8_t proto_addr_size;
+        /** Opcode */
+        uint16_t opcode;
+        /** Sender hardware address */
+        uint8_t sender_hw_addr[ETH_ADDR_SIZE];
+        /** Sender protocol address */
+        uint32_t sender_proto_addr;
+        /** Target hardware address */
+        uint8_t target_hw_addr[ETH_ADDR_SIZE];
+        /** Target protocol address */
+        uint32_t target_proto_addr;
+} __attribute__((packed)) arp_eth_packet_fmt_t;
 
-#endif
+enum arp_opcode_fmt {
+        AOP_REQUEST = 1,
+        AOP_REPLY   = 2
+};
 
-#ifdef __LE__
+enum arp_hw_addr_space {
+        AHRD_ETHERNET = 1
+};
 
-#define compute_crc32(seed, data, length) \
-        compute_crc32_le(seed, (uint8_t *) data, length)
+/** IP Ethertype */
+enum ether_type {
+        ETYPE_ARP = 0x0806,
+        ETYPE_IP  = 0x0800
+};
 
-#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);
 
 #endif