mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-08-25 07:33:11 +00:00
Work on bug #48728: headers should cleanly separate API vs. implementation
MLD6
This commit is contained in:
parent
f299b4b7cf
commit
81c68f529b
@ -51,6 +51,7 @@
|
|||||||
#if LWIP_IPV6 && LWIP_IPV6_MLD /* don't build if not configured for use in lwipopts.h */
|
#if LWIP_IPV6 && LWIP_IPV6_MLD /* don't build if not configured for use in lwipopts.h */
|
||||||
|
|
||||||
#include "lwip/mld6.h"
|
#include "lwip/mld6.h"
|
||||||
|
#include "lwip/prot/mld6.h"
|
||||||
#include "lwip/icmp6.h"
|
#include "lwip/icmp6.h"
|
||||||
#include "lwip/ip6.h"
|
#include "lwip/ip6.h"
|
||||||
#include "lwip/ip6_addr.h"
|
#include "lwip/ip6_addr.h"
|
||||||
|
@ -50,7 +50,6 @@
|
|||||||
#include "lwip/pbuf.h"
|
#include "lwip/pbuf.h"
|
||||||
#include "lwip/netif.h"
|
#include "lwip/netif.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
@ -73,25 +72,6 @@ struct mld_group {
|
|||||||
u8_t use;
|
u8_t use;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Multicast listener report/query/done message header. */
|
|
||||||
#ifdef PACK_STRUCT_USE_INCLUDES
|
|
||||||
# include "arch/bpstruct.h"
|
|
||||||
#endif
|
|
||||||
PACK_STRUCT_BEGIN
|
|
||||||
struct mld_header {
|
|
||||||
PACK_STRUCT_FLD_8(u8_t type);
|
|
||||||
PACK_STRUCT_FLD_8(u8_t code);
|
|
||||||
PACK_STRUCT_FIELD(u16_t chksum);
|
|
||||||
PACK_STRUCT_FIELD(u16_t max_resp_delay);
|
|
||||||
PACK_STRUCT_FIELD(u16_t reserved);
|
|
||||||
PACK_STRUCT_FLD_S(ip6_addr_p_t multicast_address);
|
|
||||||
/* Options follow. */
|
|
||||||
} PACK_STRUCT_STRUCT;
|
|
||||||
PACK_STRUCT_END
|
|
||||||
#ifdef PACK_STRUCT_USE_INCLUDES
|
|
||||||
# include "arch/epstruct.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MLD6_TMR_INTERVAL 100 /* Milliseconds */
|
#define MLD6_TMR_INTERVAL 100 /* Milliseconds */
|
||||||
|
|
||||||
/* MAC Filter Actions, these are passed to a netif's
|
/* MAC Filter Actions, these are passed to a netif's
|
||||||
@ -99,7 +79,6 @@ PACK_STRUCT_END
|
|||||||
#define MLD6_DEL_MAC_FILTER 0
|
#define MLD6_DEL_MAC_FILTER 0
|
||||||
#define MLD6_ADD_MAC_FILTER 1
|
#define MLD6_ADD_MAC_FILTER 1
|
||||||
|
|
||||||
|
|
||||||
err_t mld6_stop(struct netif *netif);
|
err_t mld6_stop(struct netif *netif);
|
||||||
void mld6_report_groups(struct netif *netif);
|
void mld6_report_groups(struct netif *netif);
|
||||||
void mld6_tmr(void);
|
void mld6_tmr(void);
|
||||||
@ -110,7 +89,6 @@ err_t mld6_joingroup_netif(struct netif *netif, const ip6_addr_t *groupaddr);
|
|||||||
err_t mld6_leavegroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr);
|
err_t mld6_leavegroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr);
|
||||||
err_t mld6_leavegroup_netif(struct netif *netif, const ip6_addr_t *groupaddr);
|
err_t mld6_leavegroup_netif(struct netif *netif, const ip6_addr_t *groupaddr);
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
70
src/include/lwip/prot/mld6.h
Normal file
70
src/include/lwip/prot/mld6.h
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* UDP protocol definitions
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2001-2004 Swedish Institute of Computer Science.
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* This file is part of the lwIP TCP/IP stack.
|
||||||
|
*
|
||||||
|
* Author: Adam Dunkels <adam@sics.se>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#ifndef LWIP_HDR_PROT_MLD6_H
|
||||||
|
#define LWIP_HDR_PROT_MLD6_H
|
||||||
|
|
||||||
|
#include "lwip/arch.h"
|
||||||
|
#include "lwip/ip6_addr.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/** Multicast listener report/query/done message header. */
|
||||||
|
#ifdef PACK_STRUCT_USE_INCLUDES
|
||||||
|
# include "arch/bpstruct.h"
|
||||||
|
#endif
|
||||||
|
PACK_STRUCT_BEGIN
|
||||||
|
struct mld_header {
|
||||||
|
PACK_STRUCT_FLD_8(u8_t type);
|
||||||
|
PACK_STRUCT_FLD_8(u8_t code);
|
||||||
|
PACK_STRUCT_FIELD(u16_t chksum);
|
||||||
|
PACK_STRUCT_FIELD(u16_t max_resp_delay);
|
||||||
|
PACK_STRUCT_FIELD(u16_t reserved);
|
||||||
|
PACK_STRUCT_FLD_S(ip6_addr_p_t multicast_address);
|
||||||
|
/* Options follow. */
|
||||||
|
} PACK_STRUCT_STRUCT;
|
||||||
|
PACK_STRUCT_END
|
||||||
|
#ifdef PACK_STRUCT_USE_INCLUDES
|
||||||
|
# include "arch/epstruct.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* LWIP_HDR_PROT_MLD6_H */
|
@ -38,6 +38,7 @@
|
|||||||
#define LWIP_HDR_PROT_ND6_H
|
#define LWIP_HDR_PROT_ND6_H
|
||||||
|
|
||||||
#include "lwip/arch.h"
|
#include "lwip/arch.h"
|
||||||
|
#include "lwip/ip6_addr.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
Loading…
Reference in New Issue
Block a user