Changeset 97c7682 in mainline for uspace/srv/net/inetsrv/addrobj.h

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/net/inetsrv/addrobj.h (moved) (moved from uspace/lib/net/include/ethernet_lsap.h ) (2 diffs)

uspace/srv/net/inetsrv/addrobj.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup inet
  * @{
  */
-
-/** @file
- * Link service access point identifiers.
+/**
+ * @file
+ * @brief
  */
 
-#ifndef LIBNET_ETHERNET_LSAP_H_
-#define LIBNET_ETHERNET_LSAP_H_
+#ifndef INET_ADDROBJ_H_
+#define INET_ADDROBJ_H_
 
 #include <sys/types.h>
+#include "inetsrv.h"
 
-/** Ethernet LSAP type definition. */
-typedef uint8_t eth_lsap_t;
+typedef enum {
+        /* Find matching network address (using mask) */
+        iaf_net,
+        /* Find exact local address (not using mask) */
+        iaf_addr
+} inet_addrobj_find_t;
 
-/** @name Ethernet LSAP values definitions */
-/*@{*/
+extern inet_addrobj_t *inet_addrobj_new(void);
+extern void inet_addrobj_delete(inet_addrobj_t *);
+extern int inet_addrobj_add(inet_addrobj_t *);
+extern void inet_addrobj_remove(inet_addrobj_t *);
+extern inet_addrobj_t *inet_addrobj_find(inet_addr_t *, inet_addrobj_find_t);
+extern inet_addrobj_t *inet_addrobj_find_by_name(const char *, inet_link_t *);
+extern inet_addrobj_t *inet_addrobj_get_by_id(sysarg_t);
+extern int inet_addrobj_send_dgram(inet_addrobj_t *, inet_addr_t *,
+    inet_dgram_t *, uint8_t, uint8_t, int);
+extern int inet_addrobj_get_id_list(sysarg_t **, size_t *);
 
-/** Null LSAP LSAP identifier. */
-#define ETH_LSAP_NULL   0x00
-/** ARPANET Internet Protocol (IP) LSAP identifier. */
-#define ETH_LSAP_IP     0x06
-/** ARPANET Address Resolution Protocol (ARP) LSAP identifier. */
-#define ETH_LSAP_ARP    0x98
-/** SubNetwork Access Protocol (SNAP) LSAP identifier. */
-#define ETH_LSAP_SNAP   0xAA
-/** Global LSAP LSAP identifier. */
-#define ETH_LSAP_GLSAP  0xFF
-
-/*@}*/
 
 #endif