mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
Move DNS protocol structs to separate header. Needed for Erik Ekman's MDNS implementation.
This commit is contained in:
parent
ce6ea0df15
commit
5493220c93
@ -86,6 +86,7 @@
|
|||||||
#include "lwip/mem.h"
|
#include "lwip/mem.h"
|
||||||
#include "lwip/memp.h"
|
#include "lwip/memp.h"
|
||||||
#include "lwip/dns.h"
|
#include "lwip/dns.h"
|
||||||
|
#include "lwip/prot/dns.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -104,11 +105,6 @@ static u16_t dns_txid;
|
|||||||
#define DNS_PORT_ALLOWED(port) ((port) >= 1024)
|
#define DNS_PORT_ALLOWED(port) ((port) >= 1024)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** DNS server port address */
|
|
||||||
#ifndef DNS_SERVER_PORT
|
|
||||||
#define DNS_SERVER_PORT 53
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** DNS maximum number of retries when asking for a name, before "timeout". */
|
/** DNS maximum number of retries when asking for a name, before "timeout". */
|
||||||
#ifndef DNS_MAX_RETRIES
|
#ifndef DNS_MAX_RETRIES
|
||||||
#define DNS_MAX_RETRIES 4
|
#define DNS_MAX_RETRIES 4
|
||||||
@ -165,73 +161,6 @@ static u16_t dns_txid;
|
|||||||
#define LWIP_DNS_SET_ADDRTYPE(x, y)
|
#define LWIP_DNS_SET_ADDRTYPE(x, y)
|
||||||
#endif /* LWIP_IPV4 && LWIP_IPV6 */
|
#endif /* LWIP_IPV4 && LWIP_IPV6 */
|
||||||
|
|
||||||
/** DNS field TYPE used for "Resource Records" */
|
|
||||||
#define DNS_RRTYPE_A 1 /* a host address */
|
|
||||||
#define DNS_RRTYPE_NS 2 /* an authoritative name server */
|
|
||||||
#define DNS_RRTYPE_MD 3 /* a mail destination (Obsolete - use MX) */
|
|
||||||
#define DNS_RRTYPE_MF 4 /* a mail forwarder (Obsolete - use MX) */
|
|
||||||
#define DNS_RRTYPE_CNAME 5 /* the canonical name for an alias */
|
|
||||||
#define DNS_RRTYPE_SOA 6 /* marks the start of a zone of authority */
|
|
||||||
#define DNS_RRTYPE_MB 7 /* a mailbox domain name (EXPERIMENTAL) */
|
|
||||||
#define DNS_RRTYPE_MG 8 /* a mail group member (EXPERIMENTAL) */
|
|
||||||
#define DNS_RRTYPE_MR 9 /* a mail rename domain name (EXPERIMENTAL) */
|
|
||||||
#define DNS_RRTYPE_NULL 10 /* a null RR (EXPERIMENTAL) */
|
|
||||||
#define DNS_RRTYPE_WKS 11 /* a well known service description */
|
|
||||||
#define DNS_RRTYPE_PTR 12 /* a domain name pointer */
|
|
||||||
#define DNS_RRTYPE_HINFO 13 /* host information */
|
|
||||||
#define DNS_RRTYPE_MINFO 14 /* mailbox or mail list information */
|
|
||||||
#define DNS_RRTYPE_MX 15 /* mail exchange */
|
|
||||||
#define DNS_RRTYPE_TXT 16 /* text strings */
|
|
||||||
#define DNS_RRTYPE_AAAA 28 /* IPv6 address */
|
|
||||||
|
|
||||||
/** DNS field CLASS used for "Resource Records" */
|
|
||||||
#define DNS_RRCLASS_IN 1 /* the Internet */
|
|
||||||
#define DNS_RRCLASS_CS 2 /* the CSNET class (Obsolete - used only for examples in some obsolete RFCs) */
|
|
||||||
#define DNS_RRCLASS_CH 3 /* the CHAOS class */
|
|
||||||
#define DNS_RRCLASS_HS 4 /* Hesiod [Dyer 87] */
|
|
||||||
#define DNS_RRCLASS_FLUSH 0x800 /* Flush bit */
|
|
||||||
|
|
||||||
/* DNS protocol flags */
|
|
||||||
#define DNS_FLAG1_RESPONSE 0x80
|
|
||||||
#define DNS_FLAG1_OPCODE_STATUS 0x10
|
|
||||||
#define DNS_FLAG1_OPCODE_INVERSE 0x08
|
|
||||||
#define DNS_FLAG1_OPCODE_STANDARD 0x00
|
|
||||||
#define DNS_FLAG1_AUTHORATIVE 0x04
|
|
||||||
#define DNS_FLAG1_TRUNC 0x02
|
|
||||||
#define DNS_FLAG1_RD 0x01
|
|
||||||
#define DNS_FLAG2_RA 0x80
|
|
||||||
#define DNS_FLAG2_ERR_MASK 0x0f
|
|
||||||
#define DNS_FLAG2_ERR_NONE 0x00
|
|
||||||
#define DNS_FLAG2_ERR_NAME 0x03
|
|
||||||
|
|
||||||
/* DNS protocol states */
|
|
||||||
typedef enum {
|
|
||||||
DNS_STATE_UNUSED = 0,
|
|
||||||
DNS_STATE_NEW = 1,
|
|
||||||
DNS_STATE_ASKING = 2,
|
|
||||||
DNS_STATE_DONE = 3
|
|
||||||
} dns_state_enum_t;
|
|
||||||
|
|
||||||
#ifdef PACK_STRUCT_USE_INCLUDES
|
|
||||||
# include "arch/bpstruct.h"
|
|
||||||
#endif
|
|
||||||
PACK_STRUCT_BEGIN
|
|
||||||
/** DNS message header */
|
|
||||||
struct dns_hdr {
|
|
||||||
PACK_STRUCT_FIELD(u16_t id);
|
|
||||||
PACK_STRUCT_FLD_8(u8_t flags1);
|
|
||||||
PACK_STRUCT_FLD_8(u8_t flags2);
|
|
||||||
PACK_STRUCT_FIELD(u16_t numquestions);
|
|
||||||
PACK_STRUCT_FIELD(u16_t numanswers);
|
|
||||||
PACK_STRUCT_FIELD(u16_t numauthrr);
|
|
||||||
PACK_STRUCT_FIELD(u16_t numextrarr);
|
|
||||||
} PACK_STRUCT_STRUCT;
|
|
||||||
PACK_STRUCT_END
|
|
||||||
#ifdef PACK_STRUCT_USE_INCLUDES
|
|
||||||
# include "arch/epstruct.h"
|
|
||||||
#endif
|
|
||||||
#define SIZEOF_DNS_HDR 12
|
|
||||||
|
|
||||||
/** DNS query message structure.
|
/** DNS query message structure.
|
||||||
No packing needed: only used locally on the stack. */
|
No packing needed: only used locally on the stack. */
|
||||||
struct dns_query {
|
struct dns_query {
|
||||||
|
126
src/include/lwip/prot/dns.h
Normal file
126
src/include/lwip/prot/dns.h
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* DNS - host name to IP address resolver.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Port to lwIP from uIP
|
||||||
|
* by Jim Pettinato April 2007
|
||||||
|
*
|
||||||
|
* security fixes and more by Simon Goldschmidt
|
||||||
|
*
|
||||||
|
* uIP version Copyright (c) 2002-2003, Adam Dunkels.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. The name of the author may not be used to endorse or promote
|
||||||
|
* products derived from this software without specific prior
|
||||||
|
* written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
|
||||||
|
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||||
|
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef LWIP_HDR_PROT_DNS_H
|
||||||
|
#define LWIP_HDR_PROT_DNS_H
|
||||||
|
|
||||||
|
#include "lwip/arch.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/** DNS server port address */
|
||||||
|
#ifndef DNS_SERVER_PORT
|
||||||
|
#define DNS_SERVER_PORT 53
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* DNS field TYPE used for "Resource Records" */
|
||||||
|
#define DNS_RRTYPE_A 1 /* a host address */
|
||||||
|
#define DNS_RRTYPE_NS 2 /* an authoritative name server */
|
||||||
|
#define DNS_RRTYPE_MD 3 /* a mail destination (Obsolete - use MX) */
|
||||||
|
#define DNS_RRTYPE_MF 4 /* a mail forwarder (Obsolete - use MX) */
|
||||||
|
#define DNS_RRTYPE_CNAME 5 /* the canonical name for an alias */
|
||||||
|
#define DNS_RRTYPE_SOA 6 /* marks the start of a zone of authority */
|
||||||
|
#define DNS_RRTYPE_MB 7 /* a mailbox domain name (EXPERIMENTAL) */
|
||||||
|
#define DNS_RRTYPE_MG 8 /* a mail group member (EXPERIMENTAL) */
|
||||||
|
#define DNS_RRTYPE_MR 9 /* a mail rename domain name (EXPERIMENTAL) */
|
||||||
|
#define DNS_RRTYPE_NULL 10 /* a null RR (EXPERIMENTAL) */
|
||||||
|
#define DNS_RRTYPE_WKS 11 /* a well known service description */
|
||||||
|
#define DNS_RRTYPE_PTR 12 /* a domain name pointer */
|
||||||
|
#define DNS_RRTYPE_HINFO 13 /* host information */
|
||||||
|
#define DNS_RRTYPE_MINFO 14 /* mailbox or mail list information */
|
||||||
|
#define DNS_RRTYPE_MX 15 /* mail exchange */
|
||||||
|
#define DNS_RRTYPE_TXT 16 /* text strings */
|
||||||
|
#define DNS_RRTYPE_AAAA 28 /* IPv6 address */
|
||||||
|
|
||||||
|
/* DNS field CLASS used for "Resource Records" */
|
||||||
|
#define DNS_RRCLASS_IN 1 /* the Internet */
|
||||||
|
#define DNS_RRCLASS_CS 2 /* the CSNET class (Obsolete - used only for examples in some obsolete RFCs) */
|
||||||
|
#define DNS_RRCLASS_CH 3 /* the CHAOS class */
|
||||||
|
#define DNS_RRCLASS_HS 4 /* Hesiod [Dyer 87] */
|
||||||
|
#define DNS_RRCLASS_FLUSH 0x800 /* Flush bit */
|
||||||
|
|
||||||
|
/* DNS protocol flags */
|
||||||
|
#define DNS_FLAG1_RESPONSE 0x80
|
||||||
|
#define DNS_FLAG1_OPCODE_STATUS 0x10
|
||||||
|
#define DNS_FLAG1_OPCODE_INVERSE 0x08
|
||||||
|
#define DNS_FLAG1_OPCODE_STANDARD 0x00
|
||||||
|
#define DNS_FLAG1_AUTHORATIVE 0x04
|
||||||
|
#define DNS_FLAG1_TRUNC 0x02
|
||||||
|
#define DNS_FLAG1_RD 0x01
|
||||||
|
#define DNS_FLAG2_RA 0x80
|
||||||
|
#define DNS_FLAG2_ERR_MASK 0x0f
|
||||||
|
#define DNS_FLAG2_ERR_NONE 0x00
|
||||||
|
#define DNS_FLAG2_ERR_NAME 0x03
|
||||||
|
|
||||||
|
#ifdef PACK_STRUCT_USE_INCLUDES
|
||||||
|
# include "arch/bpstruct.h"
|
||||||
|
#endif
|
||||||
|
PACK_STRUCT_BEGIN
|
||||||
|
/** DNS message header */
|
||||||
|
struct dns_hdr {
|
||||||
|
PACK_STRUCT_FIELD(u16_t id);
|
||||||
|
PACK_STRUCT_FLD_8(u8_t flags1);
|
||||||
|
PACK_STRUCT_FLD_8(u8_t flags2);
|
||||||
|
PACK_STRUCT_FIELD(u16_t numquestions);
|
||||||
|
PACK_STRUCT_FIELD(u16_t numanswers);
|
||||||
|
PACK_STRUCT_FIELD(u16_t numauthrr);
|
||||||
|
PACK_STRUCT_FIELD(u16_t numextrarr);
|
||||||
|
} PACK_STRUCT_STRUCT;
|
||||||
|
PACK_STRUCT_END
|
||||||
|
#ifdef PACK_STRUCT_USE_INCLUDES
|
||||||
|
# include "arch/epstruct.h"
|
||||||
|
#endif
|
||||||
|
#define SIZEOF_DNS_HDR 12
|
||||||
|
|
||||||
|
/* DNS protocol states */
|
||||||
|
typedef enum {
|
||||||
|
DNS_STATE_UNUSED = 0,
|
||||||
|
DNS_STATE_NEW = 1,
|
||||||
|
DNS_STATE_ASKING = 2,
|
||||||
|
DNS_STATE_DONE = 3
|
||||||
|
} dns_state_enum_t;
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* DNS_H */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user