Changeset db71e2a in mainline for uspace/srv/net/dnsrsrv/transport.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/net/dnsrsrv/transport.h (moved) (moved from uspace/srv/net/inetsrv/inet_util.c ) (1 diff)

uspace/srv/net/dnsrsrv/transport.h

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup dnsres
  * @{
  */
 /**
  * @file
- * @brief
  */
 
-#include <assert.h>
-#include <bitops.h>
-#include <sys/types.h>
-#include "inet_util.h"
+#ifndef TRANSPORT_H
+#define TRANSPORT_H
 
-uint32_t inet_netmask(int bits)
-{
-        assert(bits >= 0);
-        assert(bits < 32);
+#include <inet/addr.h>
+#include "dns_type.h"
 
-        if (bits == 0)
-                return 0;
-        else
-                return BIT_RANGE(uint32_t, 31, 31 - (bits - 1));
-}
+extern inet_addr_t dns_server_addr;
+
+extern int transport_init(void);
+extern void transport_fini(void);
+extern int dns_request(dns_message_t *, dns_message_t **);
+
+#endif
 
 /** @}