Changeset c42f50d in mainline for uspace/lib/c/include/inet

Timestamp:

2013-10-05T11:53:43Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cbfc8b7

Parents:

408424e (diff), 3e896e1 (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

Location:

uspace/lib/c/include/inet

Files:

• addr.h (modified) (6 diffs)
• dhcp.h (moved) (moved from uspace/lib/c/include/net/device.h ) (2 diffs)
• dnsr.h (modified) (1 diff)
• inetcfg.h (modified) (1 diff)
• inetping.h (modified) (3 diffs)
• iplink.h (modified) (2 diffs)
• iplink_srv.h (modified) (2 diffs)

uspace/lib/c/include/inet/addr.h

@@ -39 +39 @@
 #include <net/in.h>
 #include <net/in6.h>
+#include <net/socket.h>
 
 typedef uint32_t addr32_t;
@@ -44 +45 @@
 typedef uint8_t addr128_t[16];
 
+typedef enum {
+        /** Any IP protocol version */
+        ip_any,
+        /** IPv4 */
+        ip_v4,
+        /** IPv6 */
+        ip_v6
+} ip_ver_t;
+
 /** Node address */
 typedef struct {
-        uint16_t family;
+        /** IP version */
+        ip_ver_t version;
         union {
                 addr32_t addr;
@@ -55 +66 @@
 /** Network address */
 typedef struct {
-        /** Address family */
-        uint16_t family;
+        /** IP version */
+        ip_ver_t version;
         
         /** Address */
@@ -91 +102 @@
     uint16_t, uint16_t, uint16_t, uint16_t, uint8_t);
 
-extern int inet_addr_family(const char *, uint16_t *);
 extern void inet_naddr_addr(const inet_naddr_t *, inet_addr_t *);
 extern void inet_addr_naddr(const inet_addr_t *, uint8_t, inet_naddr_t *);
@@ -110 +120 @@
 extern int inet_naddr_format(const inet_naddr_t *, char **);
 
-extern uint16_t inet_addr_get(const inet_addr_t *, addr32_t *, addr128_t *);
-extern uint16_t inet_naddr_get(const inet_naddr_t *, addr32_t *, addr128_t *,
+extern ip_ver_t inet_addr_get(const inet_addr_t *, addr32_t *, addr128_t *);
+extern ip_ver_t inet_naddr_get(const inet_naddr_t *, addr32_t *, addr128_t *,
     uint8_t *);
 
@@ -125 +135 @@
     sockaddr_in6_t *);
 
+extern ip_ver_t ipver_from_af(int af);
+extern int inet_addr_sockaddr(const inet_addr_t *, uint16_t, sockaddr_t **,
+    socklen_t *);
+
 #endif
 

uspace/lib/c/include/inet/dhcp.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-
 /** @file
- * Network device.
  */
 
-#ifndef LIBC_NET_DEVICE_H_
-#define LIBC_NET_DEVICE_H_
+#ifndef LIBC_INET_DHCP_H_
+#define LIBC_INET_DHCP_H_
 
-#include <adt/int_map.h>
-#include <nic/nic.h>
+#include <sys/types.h>
 
-/** Device identifier to generic type map declaration. */
-#define DEVICE_MAP_DECLARE  INT_MAP_DECLARE
-
-/** Device identifier to generic type map implementation. */
-#define DEVICE_MAP_IMPLEMENT  INT_MAP_IMPLEMENT
-
-/** Device identifier type. */
-typedef int nic_device_id_t;
-
-/** Invalid device identifier. */
-#define NIC_DEVICE_INVALID_ID  (-1)
+extern int dhcp_init(void);
+extern int dhcp_link_add(sysarg_t);
+extern int dhcp_link_remove(sysarg_t);
 
 #endif

uspace/lib/c/include/inet/dnsr.h

@@ -51 +51 @@
 
 extern int dnsr_init(void);
-extern int dnsr_name2host(const char *, dnsr_hostinfo_t **, uint16_t);
+extern int dnsr_name2host(const char *, dnsr_hostinfo_t **, ip_ver_t);
 extern void dnsr_hostinfo_destroy(dnsr_hostinfo_t *);
 extern int dnsr_get_srvaddr(inet_addr_t *);

uspace/lib/c/include/inet/inetcfg.h

@@ -48 +48 @@
 extern int inetcfg_get_link_list(sysarg_t **, size_t *);
 extern int inetcfg_get_sroute_list(sysarg_t **, size_t *);
+extern int inetcfg_link_add(sysarg_t);
 extern int inetcfg_link_get(sysarg_t, inet_link_info_t *);
+extern int inetcfg_link_remove(sysarg_t);
 extern int inetcfg_sroute_get(sysarg_t, inet_sroute_info_t *);
 extern int inetcfg_sroute_get_id(const char *, sysarg_t *);

uspace/lib/c/include/inet/inetping.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <inet/inet.h>
 #include <sys/types.h>
-
-typedef struct {
-        uint32_t src;
-        uint32_t dest;
-        uint16_t seq_no;
-        void *data;
-        size_t size;
-} inetping_sdu_t;
+#include <types/inetping.h>
 
 typedef struct inetping_ev_ops {
@@ -53 +46 @@
 extern int inetping_init(inetping_ev_ops_t *);
 extern int inetping_send(inetping_sdu_t *);
-extern int inetping_get_srcaddr(uint32_t, uint32_t *);
+extern int inetping_get_srcaddr(const inet_addr_t *, inet_addr_t *);
 
 #endif

uspace/lib/c/include/inet/iplink.h

@@ -37 +37 @@
 
 #include <async.h>
-#include <sys/types.h>
 #include <inet/addr.h>
 
@@ -78 +77 @@
 
 typedef struct iplink_ev_ops {
-        int (*recv)(iplink_t *, iplink_recv_sdu_t *, uint16_t);
+        int (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
 } iplink_ev_ops_t;
 

uspace/lib/c/include/inet/iplink_srv.h

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
 #include <inet/addr.h>
 #include <inet/iplink.h>
@@ -67 +66 @@
 
 extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
-extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, uint16_t);
+extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t);
 
 #endif