mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-04 05:39:53 +00:00
minor coding style fixes in IPv6 code
This commit is contained in:
parent
3194c9c4cf
commit
bf3e8e6a48
@ -80,8 +80,8 @@ void
|
|||||||
icmp6_input(struct pbuf *p, struct netif *inp)
|
icmp6_input(struct pbuf *p, struct netif *inp)
|
||||||
{
|
{
|
||||||
struct icmp6_hdr *icmp6hdr;
|
struct icmp6_hdr *icmp6hdr;
|
||||||
struct pbuf * r;
|
struct pbuf *r;
|
||||||
const ip6_addr_t * reply_src;
|
const ip6_addr_t *reply_src;
|
||||||
|
|
||||||
ICMP6_STATS_INC(icmp6.recv);
|
ICMP6_STATS_INC(icmp6.recv);
|
||||||
|
|
||||||
|
@ -203,7 +203,7 @@ ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest)
|
|||||||
* source address is found
|
* source address is found
|
||||||
*/
|
*/
|
||||||
const ip_addr_t *
|
const ip_addr_t *
|
||||||
ip6_select_source_address(struct netif *netif, const ip6_addr_t * dest)
|
ip6_select_source_address(struct netif *netif, const ip6_addr_t *dest)
|
||||||
{
|
{
|
||||||
const ip_addr_t *src = NULL;
|
const ip_addr_t *src = NULL;
|
||||||
u8_t i;
|
u8_t i;
|
||||||
@ -642,7 +642,7 @@ netif_found:
|
|||||||
|
|
||||||
case IP6_NEXTH_FRAGMENT:
|
case IP6_NEXTH_FRAGMENT:
|
||||||
{
|
{
|
||||||
struct ip6_frag_hdr * frag_hdr;
|
struct ip6_frag_hdr *frag_hdr;
|
||||||
LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Fragment header\n"));
|
LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Fragment header\n"));
|
||||||
|
|
||||||
frag_hdr = (struct ip6_frag_hdr *)p->payload;
|
frag_hdr = (struct ip6_frag_hdr *)p->payload;
|
||||||
@ -1034,9 +1034,9 @@ ip6_output_hinted(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
|
|||||||
* @return ERR_OK if hop-by-hop header was added, ERR_* otherwise
|
* @return ERR_OK if hop-by-hop header was added, ERR_* otherwise
|
||||||
*/
|
*/
|
||||||
err_t
|
err_t
|
||||||
ip6_options_add_hbh_ra(struct pbuf * p, u8_t nexth, u8_t value)
|
ip6_options_add_hbh_ra(struct pbuf *p, u8_t nexth, u8_t value)
|
||||||
{
|
{
|
||||||
struct ip6_hbh_hdr * hbh_hdr;
|
struct ip6_hbh_hdr *hbh_hdr;
|
||||||
|
|
||||||
/* Move pointer to make room for hop-by-hop options header. */
|
/* Move pointer to make room for hop-by-hop options header. */
|
||||||
if (pbuf_header(p, sizeof(struct ip6_hbh_hdr))) {
|
if (pbuf_header(p, sizeof(struct ip6_hbh_hdr))) {
|
||||||
|
@ -73,7 +73,7 @@ int
|
|||||||
ip6addr_aton(const char *cp, ip6_addr_t *addr)
|
ip6addr_aton(const char *cp, ip6_addr_t *addr)
|
||||||
{
|
{
|
||||||
u32_t addr_index, zero_blocks, current_block_index, current_block_value;
|
u32_t addr_index, zero_blocks, current_block_index, current_block_value;
|
||||||
const char * s;
|
const char *s;
|
||||||
|
|
||||||
/* Count the number of colons, to count the number of blocks in a "::" sequence
|
/* Count the number of colons, to count the number of blocks in a "::" sequence
|
||||||
zero_blocks may be 1 even if there are no :: sequences */
|
zero_blocks may be 1 even if there are no :: sequences */
|
||||||
|
@ -260,7 +260,7 @@ ip6_reass(struct pbuf *p)
|
|||||||
{
|
{
|
||||||
struct ip6_reassdata *ipr, *ipr_prev;
|
struct ip6_reassdata *ipr, *ipr_prev;
|
||||||
struct ip6_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL;
|
struct ip6_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL;
|
||||||
struct ip6_frag_hdr * frag_hdr;
|
struct ip6_frag_hdr *frag_hdr;
|
||||||
u16_t offset, len;
|
u16_t offset, len;
|
||||||
u8_t clen, valid = 1;
|
u8_t clen, valid = 1;
|
||||||
struct pbuf *q;
|
struct pbuf *q;
|
||||||
@ -655,7 +655,7 @@ ip6_frag(struct pbuf *p, struct netif *netif, const ip6_addr_t *dest)
|
|||||||
{
|
{
|
||||||
struct ip6_hdr *original_ip6hdr;
|
struct ip6_hdr *original_ip6hdr;
|
||||||
struct ip6_hdr *ip6hdr;
|
struct ip6_hdr *ip6hdr;
|
||||||
struct ip6_frag_hdr * frag_hdr;
|
struct ip6_frag_hdr *frag_hdr;
|
||||||
struct pbuf *rambuf;
|
struct pbuf *rambuf;
|
||||||
struct pbuf *newpbuf;
|
struct pbuf *newpbuf;
|
||||||
static u32_t identification;
|
static u32_t identification;
|
||||||
|
@ -80,7 +80,7 @@ static struct mld_group* mld_group_list;
|
|||||||
|
|
||||||
|
|
||||||
/* Forward declarations. */
|
/* Forward declarations. */
|
||||||
static struct mld_group * mld6_new_group(struct netif *ifp, const ip6_addr_t *addr);
|
static struct mld_group *mld6_new_group(struct netif *ifp, const ip6_addr_t *addr);
|
||||||
static err_t mld6_free_group(struct mld_group *group);
|
static err_t mld6_free_group(struct mld_group *group);
|
||||||
static void mld6_delayed_report(struct mld_group *group, u16_t maxresp);
|
static void mld6_delayed_report(struct mld_group *group, u16_t maxresp);
|
||||||
static void mld6_send(struct mld_group *group, u8_t type);
|
static void mld6_send(struct mld_group *group, u8_t type);
|
||||||
@ -242,8 +242,8 @@ mld6_free_group(struct mld_group *group)
|
|||||||
void
|
void
|
||||||
mld6_input(struct pbuf *p, struct netif *inp)
|
mld6_input(struct pbuf *p, struct netif *inp)
|
||||||
{
|
{
|
||||||
struct mld_header * mld_hdr;
|
struct mld_header *mld_hdr;
|
||||||
struct mld_group* group;
|
struct mld_group *group;
|
||||||
|
|
||||||
MLD6_STATS_INC(mld6.recv);
|
MLD6_STATS_INC(mld6.recv);
|
||||||
|
|
||||||
@ -538,9 +538,9 @@ mld6_delayed_report(struct mld_group *group, u16_t maxresp)
|
|||||||
static void
|
static void
|
||||||
mld6_send(struct mld_group *group, u8_t type)
|
mld6_send(struct mld_group *group, u8_t type)
|
||||||
{
|
{
|
||||||
struct mld_header * mld_hdr;
|
struct mld_header *mld_hdr;
|
||||||
struct pbuf * p;
|
struct pbuf *p;
|
||||||
const ip6_addr_t * src_addr;
|
const ip6_addr_t *src_addr;
|
||||||
|
|
||||||
/* Allocate a packet. Size is MLD header + IPv6 Hop-by-hop options header. */
|
/* Allocate a packet. Size is MLD header + IPv6 Hop-by-hop options header. */
|
||||||
p = pbuf_alloc(PBUF_IP, sizeof(struct mld_header) + sizeof(struct ip6_hbh_hdr), PBUF_RAM);
|
p = pbuf_alloc(PBUF_IP, sizeof(struct mld_header) + sizeof(struct ip6_hbh_hdr), PBUF_RAM);
|
||||||
|
@ -82,23 +82,23 @@ static ip6_addr_t multicast_address;
|
|||||||
static u8_t nd6_ra_buffer[sizeof(struct prefix_option)];
|
static u8_t nd6_ra_buffer[sizeof(struct prefix_option)];
|
||||||
|
|
||||||
/* Forward declarations. */
|
/* Forward declarations. */
|
||||||
static s8_t nd6_find_neighbor_cache_entry(const ip6_addr_t * ip6addr);
|
static s8_t nd6_find_neighbor_cache_entry(const ip6_addr_t *ip6addr);
|
||||||
static s8_t nd6_new_neighbor_cache_entry(void);
|
static s8_t nd6_new_neighbor_cache_entry(void);
|
||||||
static void nd6_free_neighbor_cache_entry(s8_t i);
|
static void nd6_free_neighbor_cache_entry(s8_t i);
|
||||||
static s8_t nd6_find_destination_cache_entry(const ip6_addr_t * ip6addr);
|
static s8_t nd6_find_destination_cache_entry(const ip6_addr_t *ip6addr);
|
||||||
static s8_t nd6_new_destination_cache_entry(void);
|
static s8_t nd6_new_destination_cache_entry(void);
|
||||||
static s8_t nd6_is_prefix_in_netif(const ip6_addr_t * ip6addr, struct netif * netif);
|
static s8_t nd6_is_prefix_in_netif(const ip6_addr_t *ip6addr, struct netif *netif);
|
||||||
static s8_t nd6_get_router(const ip6_addr_t * router_addr, struct netif * netif);
|
static s8_t nd6_get_router(const ip6_addr_t *router_addr, struct netif *netif);
|
||||||
static s8_t nd6_new_router(const ip6_addr_t * router_addr, struct netif * netif);
|
static s8_t nd6_new_router(const ip6_addr_t *router_addr, struct netif *netif);
|
||||||
static s8_t nd6_get_onlink_prefix(ip6_addr_t * prefix, struct netif * netif);
|
static s8_t nd6_get_onlink_prefix(ip6_addr_t *prefix, struct netif *netif);
|
||||||
static s8_t nd6_new_onlink_prefix(ip6_addr_t * prefix, struct netif * netif);
|
static s8_t nd6_new_onlink_prefix(ip6_addr_t *prefix, struct netif *netif);
|
||||||
|
|
||||||
#define ND6_SEND_FLAG_MULTICAST_DEST 0x01
|
#define ND6_SEND_FLAG_MULTICAST_DEST 0x01
|
||||||
#define ND6_SEND_FLAG_ALLNODES_DEST 0x02
|
#define ND6_SEND_FLAG_ALLNODES_DEST 0x02
|
||||||
static void nd6_send_ns(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags);
|
static void nd6_send_ns(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags);
|
||||||
static void nd6_send_na(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags);
|
static void nd6_send_na(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags);
|
||||||
#if LWIP_IPV6_SEND_ROUTER_SOLICIT
|
#if LWIP_IPV6_SEND_ROUTER_SOLICIT
|
||||||
static err_t nd6_send_rs(struct netif * netif);
|
static err_t nd6_send_rs(struct netif *netif);
|
||||||
#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
|
#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
|
||||||
|
|
||||||
#if LWIP_ND6_QUEUEING
|
#if LWIP_ND6_QUEUEING
|
||||||
@ -127,8 +127,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
switch (msg_type) {
|
switch (msg_type) {
|
||||||
case ICMP6_TYPE_NA: /* Neighbor Advertisement. */
|
case ICMP6_TYPE_NA: /* Neighbor Advertisement. */
|
||||||
{
|
{
|
||||||
struct na_header * na_hdr;
|
struct na_header *na_hdr;
|
||||||
struct lladdr_option * lladdr_opt;
|
struct lladdr_option *lladdr_opt;
|
||||||
|
|
||||||
/* Check that na header fits in packet. */
|
/* Check that na header fits in packet. */
|
||||||
if (p->len < (sizeof(struct na_header))) {
|
if (p->len < (sizeof(struct na_header))) {
|
||||||
@ -262,8 +262,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
}
|
}
|
||||||
case ICMP6_TYPE_NS: /* Neighbor solicitation. */
|
case ICMP6_TYPE_NS: /* Neighbor solicitation. */
|
||||||
{
|
{
|
||||||
struct ns_header * ns_hdr;
|
struct ns_header *ns_hdr;
|
||||||
struct lladdr_option * lladdr_opt;
|
struct lladdr_option *lladdr_opt;
|
||||||
u8_t accepted;
|
u8_t accepted;
|
||||||
|
|
||||||
/* Check that ns header fits in packet. */
|
/* Check that ns header fits in packet. */
|
||||||
@ -374,8 +374,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
}
|
}
|
||||||
case ICMP6_TYPE_RA: /* Router Advertisement. */
|
case ICMP6_TYPE_RA: /* Router Advertisement. */
|
||||||
{
|
{
|
||||||
struct ra_header * ra_hdr;
|
struct ra_header *ra_hdr;
|
||||||
u8_t * buffer; /* Used to copy options. */
|
u8_t *buffer; /* Used to copy options. */
|
||||||
u16_t offset;
|
u16_t offset;
|
||||||
|
|
||||||
/* Check that RA header fits in packet. */
|
/* Check that RA header fits in packet. */
|
||||||
@ -453,7 +453,7 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
switch (buffer[0]) {
|
switch (buffer[0]) {
|
||||||
case ND6_OPTION_TYPE_SOURCE_LLADDR:
|
case ND6_OPTION_TYPE_SOURCE_LLADDR:
|
||||||
{
|
{
|
||||||
struct lladdr_option * lladdr_opt;
|
struct lladdr_option *lladdr_opt;
|
||||||
lladdr_opt = (struct lladdr_option *)buffer;
|
lladdr_opt = (struct lladdr_option *)buffer;
|
||||||
if ((default_router_list[i].neighbor_entry != NULL) &&
|
if ((default_router_list[i].neighbor_entry != NULL) &&
|
||||||
(default_router_list[i].neighbor_entry->state == ND6_INCOMPLETE)) {
|
(default_router_list[i].neighbor_entry->state == ND6_INCOMPLETE)) {
|
||||||
@ -465,7 +465,7 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
}
|
}
|
||||||
case ND6_OPTION_TYPE_MTU:
|
case ND6_OPTION_TYPE_MTU:
|
||||||
{
|
{
|
||||||
struct mtu_option * mtu_opt;
|
struct mtu_option *mtu_opt;
|
||||||
mtu_opt = (struct mtu_option *)buffer;
|
mtu_opt = (struct mtu_option *)buffer;
|
||||||
if (htonl(mtu_opt->mtu) >= 1280) {
|
if (htonl(mtu_opt->mtu) >= 1280) {
|
||||||
#if LWIP_ND6_ALLOW_RA_UPDATES
|
#if LWIP_ND6_ALLOW_RA_UPDATES
|
||||||
@ -476,7 +476,7 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
}
|
}
|
||||||
case ND6_OPTION_TYPE_PREFIX_INFO:
|
case ND6_OPTION_TYPE_PREFIX_INFO:
|
||||||
{
|
{
|
||||||
struct prefix_option * prefix_opt;
|
struct prefix_option *prefix_opt;
|
||||||
prefix_opt = (struct prefix_option *)buffer;
|
prefix_opt = (struct prefix_option *)buffer;
|
||||||
|
|
||||||
if (prefix_opt->flags & ND6_PREFIX_FLAG_ON_LINK) {
|
if (prefix_opt->flags & ND6_PREFIX_FLAG_ON_LINK) {
|
||||||
@ -526,8 +526,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
}
|
}
|
||||||
case ICMP6_TYPE_RD: /* Redirect */
|
case ICMP6_TYPE_RD: /* Redirect */
|
||||||
{
|
{
|
||||||
struct redirect_header * redir_hdr;
|
struct redirect_header *redir_hdr;
|
||||||
struct lladdr_option * lladdr_opt;
|
struct lladdr_option *lladdr_opt;
|
||||||
|
|
||||||
/* Check that Redir header fits in packet. */
|
/* Check that Redir header fits in packet. */
|
||||||
if (p->len < sizeof(struct redirect_header)) {
|
if (p->len < sizeof(struct redirect_header)) {
|
||||||
@ -599,7 +599,7 @@ nd6_input(struct pbuf *p, struct netif *inp)
|
|||||||
case ICMP6_TYPE_PTB: /* Packet too big */
|
case ICMP6_TYPE_PTB: /* Packet too big */
|
||||||
{
|
{
|
||||||
struct icmp6_hdr *icmp6hdr; /* Packet too big message */
|
struct icmp6_hdr *icmp6hdr; /* Packet too big message */
|
||||||
struct ip6_hdr * ip6hdr; /* IPv6 header of the packet which caused the error */
|
struct ip6_hdr *ip6hdr; /* IPv6 header of the packet which caused the error */
|
||||||
u32_t pmtu;
|
u32_t pmtu;
|
||||||
|
|
||||||
/* Check that ICMPv6 header + IPv6 header fit in payload */
|
/* Check that ICMPv6 header + IPv6 header fit in payload */
|
||||||
@ -655,7 +655,7 @@ void
|
|||||||
nd6_tmr(void)
|
nd6_tmr(void)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
struct netif * netif;
|
struct netif *netif;
|
||||||
|
|
||||||
/* Process neighbor entries. */
|
/* Process neighbor entries. */
|
||||||
for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
|
for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
|
||||||
@ -847,11 +847,11 @@ nd6_tmr(void)
|
|||||||
* @param flags one of ND6_SEND_FLAG_*
|
* @param flags one of ND6_SEND_FLAG_*
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
nd6_send_ns(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags)
|
nd6_send_ns(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags)
|
||||||
{
|
{
|
||||||
struct ns_header * ns_hdr;
|
struct ns_header *ns_hdr;
|
||||||
struct pbuf * p;
|
struct pbuf *p;
|
||||||
const ip6_addr_t * src_addr;
|
const ip6_addr_t *src_addr;
|
||||||
u16_t lladdr_opt_len;
|
u16_t lladdr_opt_len;
|
||||||
|
|
||||||
if (ip6_addr_isvalid(netif_ip6_addr_state(netif,0))) {
|
if (ip6_addr_isvalid(netif_ip6_addr_state(netif,0))) {
|
||||||
@ -916,13 +916,13 @@ nd6_send_ns(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags)
|
|||||||
* @param flags one of ND6_SEND_FLAG_*
|
* @param flags one of ND6_SEND_FLAG_*
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
nd6_send_na(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags)
|
nd6_send_na(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags)
|
||||||
{
|
{
|
||||||
struct na_header * na_hdr;
|
struct na_header *na_hdr;
|
||||||
struct lladdr_option * lladdr_opt;
|
struct lladdr_option *lladdr_opt;
|
||||||
struct pbuf * p;
|
struct pbuf *p;
|
||||||
const ip6_addr_t * src_addr;
|
const ip6_addr_t *src_addr;
|
||||||
const ip6_addr_t * dest_addr;
|
const ip6_addr_t *dest_addr;
|
||||||
u16_t lladdr_opt_len;
|
u16_t lladdr_opt_len;
|
||||||
|
|
||||||
/* Use link-local address as source address. */
|
/* Use link-local address as source address. */
|
||||||
@ -987,12 +987,12 @@ nd6_send_na(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags)
|
|||||||
* @param netif the netif on which to send the message
|
* @param netif the netif on which to send the message
|
||||||
*/
|
*/
|
||||||
static err_t
|
static err_t
|
||||||
nd6_send_rs(struct netif * netif)
|
nd6_send_rs(struct netif *netif)
|
||||||
{
|
{
|
||||||
struct rs_header * rs_hdr;
|
struct rs_header *rs_hdr;
|
||||||
struct lladdr_option * lladdr_opt;
|
struct lladdr_option *lladdr_opt;
|
||||||
struct pbuf * p;
|
struct pbuf *p;
|
||||||
const ip6_addr_t * src_addr;
|
const ip6_addr_t *src_addr;
|
||||||
err_t err;
|
err_t err;
|
||||||
u16_t lladdr_opt_len = 0;
|
u16_t lladdr_opt_len = 0;
|
||||||
|
|
||||||
@ -1058,7 +1058,7 @@ nd6_send_rs(struct netif * netif)
|
|||||||
* entry is found
|
* entry is found
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_find_neighbor_cache_entry(const ip6_addr_t * ip6addr)
|
nd6_find_neighbor_cache_entry(const ip6_addr_t *ip6addr)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
|
for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
|
||||||
@ -1217,7 +1217,7 @@ nd6_free_neighbor_cache_entry(s8_t i)
|
|||||||
* entry is found
|
* entry is found
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_find_destination_cache_entry(const ip6_addr_t * ip6addr)
|
nd6_find_destination_cache_entry(const ip6_addr_t *ip6addr)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
|
for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
|
||||||
@ -1267,7 +1267,7 @@ nd6_new_destination_cache_entry(void)
|
|||||||
* @return 1 if the address is on-link, 0 otherwise
|
* @return 1 if the address is on-link, 0 otherwise
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_is_prefix_in_netif(const ip6_addr_t * ip6addr, struct netif * netif)
|
nd6_is_prefix_in_netif(const ip6_addr_t *ip6addr, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
for (i = 0; i < LWIP_ND6_NUM_PREFIXES; i++) {
|
for (i = 0; i < LWIP_ND6_NUM_PREFIXES; i++) {
|
||||||
@ -1296,7 +1296,7 @@ nd6_is_prefix_in_netif(const ip6_addr_t * ip6addr, struct netif * netif)
|
|||||||
* router is found
|
* router is found
|
||||||
*/
|
*/
|
||||||
s8_t
|
s8_t
|
||||||
nd6_select_router(const ip6_addr_t * ip6addr, struct netif * netif)
|
nd6_select_router(const ip6_addr_t *ip6addr, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
/* last_router is used for round-robin router selection (as recommended
|
/* last_router is used for round-robin router selection (as recommended
|
||||||
@ -1355,7 +1355,7 @@ nd6_select_router(const ip6_addr_t * ip6addr, struct netif * netif)
|
|||||||
* @return the index of the router entry, or -1 if not found
|
* @return the index of the router entry, or -1 if not found
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_get_router(const ip6_addr_t * router_addr, struct netif * netif)
|
nd6_get_router(const ip6_addr_t *router_addr, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
|
|
||||||
@ -1380,7 +1380,7 @@ nd6_get_router(const ip6_addr_t * router_addr, struct netif * netif)
|
|||||||
* @return the index on the router table, or -1 if could not be created
|
* @return the index on the router table, or -1 if could not be created
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_new_router(const ip6_addr_t * router_addr, struct netif * netif)
|
nd6_new_router(const ip6_addr_t *router_addr, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t router_index;
|
s8_t router_index;
|
||||||
s8_t neighbor_index;
|
s8_t neighbor_index;
|
||||||
@ -1429,7 +1429,7 @@ nd6_new_router(const ip6_addr_t * router_addr, struct netif * netif)
|
|||||||
* @return the index on the prefix table, or -1 if not found
|
* @return the index on the prefix table, or -1 if not found
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_get_onlink_prefix(ip6_addr_t * prefix, struct netif * netif)
|
nd6_get_onlink_prefix(ip6_addr_t *prefix, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
|
|
||||||
@ -1453,7 +1453,7 @@ nd6_get_onlink_prefix(ip6_addr_t * prefix, struct netif * netif)
|
|||||||
* @return the index on the prefix table, or -1 if not created
|
* @return the index on the prefix table, or -1 if not created
|
||||||
*/
|
*/
|
||||||
static s8_t
|
static s8_t
|
||||||
nd6_new_onlink_prefix(ip6_addr_t * prefix, struct netif * netif)
|
nd6_new_onlink_prefix(ip6_addr_t *prefix, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
|
|
||||||
@ -1488,7 +1488,7 @@ nd6_new_onlink_prefix(ip6_addr_t * prefix, struct netif * netif)
|
|||||||
* could be created
|
* could be created
|
||||||
*/
|
*/
|
||||||
s8_t
|
s8_t
|
||||||
nd6_get_next_hop_entry(const ip6_addr_t * ip6addr, struct netif * netif)
|
nd6_get_next_hop_entry(const ip6_addr_t *ip6addr, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
|
|
||||||
@ -1600,7 +1600,7 @@ nd6_get_next_hop_entry(const ip6_addr_t * ip6addr, struct netif * netif)
|
|||||||
* @return ERR_OK if succeeded, ERR_MEM if out of memory
|
* @return ERR_OK if succeeded, ERR_MEM if out of memory
|
||||||
*/
|
*/
|
||||||
err_t
|
err_t
|
||||||
nd6_queue_packet(s8_t neighbor_index, struct pbuf * q)
|
nd6_queue_packet(s8_t neighbor_index, struct pbuf *q)
|
||||||
{
|
{
|
||||||
err_t result = ERR_MEM;
|
err_t result = ERR_MEM;
|
||||||
struct pbuf *p;
|
struct pbuf *p;
|
||||||
@ -1784,7 +1784,7 @@ nd6_send_q(s8_t i)
|
|||||||
* @return the Path MTU, if known, or the netif default MTU
|
* @return the Path MTU, if known, or the netif default MTU
|
||||||
*/
|
*/
|
||||||
u16_t
|
u16_t
|
||||||
nd6_get_destination_mtu(const ip6_addr_t * ip6addr, struct netif * netif)
|
nd6_get_destination_mtu(const ip6_addr_t *ip6addr, struct netif *netif)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
|
|
||||||
@ -1814,7 +1814,7 @@ nd6_get_destination_mtu(const ip6_addr_t * ip6addr, struct netif * netif)
|
|||||||
* by an upper layer protocol (TCP)
|
* by an upper layer protocol (TCP)
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
nd6_reachability_hint(const ip6_addr_t * ip6addr)
|
nd6_reachability_hint(const ip6_addr_t *ip6addr)
|
||||||
{
|
{
|
||||||
s8_t i;
|
s8_t i;
|
||||||
|
|
||||||
@ -1857,7 +1857,7 @@ nd6_reachability_hint(const ip6_addr_t * ip6addr)
|
|||||||
* @param netif points to a network interface
|
* @param netif points to a network interface
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
nd6_cleanup_netif(struct netif * netif)
|
nd6_cleanup_netif(struct netif *netif)
|
||||||
{
|
{
|
||||||
u8_t i;
|
u8_t i;
|
||||||
s8_t router_index;
|
s8_t router_index;
|
||||||
|
@ -89,7 +89,7 @@ struct ip6_reassdata {
|
|||||||
|
|
||||||
#define ip6_reass_init() /* Compatibility define */
|
#define ip6_reass_init() /* Compatibility define */
|
||||||
void ip6_reass_tmr(void);
|
void ip6_reass_tmr(void);
|
||||||
struct pbuf * ip6_reass(struct pbuf *p);
|
struct pbuf *ip6_reass(struct pbuf *p);
|
||||||
|
|
||||||
#endif /* LWIP_IPV6 && LWIP_IPV6_REASS */
|
#endif /* LWIP_IPV6 && LWIP_IPV6_REASS */
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ extern "C" {
|
|||||||
/** Struct for tables. */
|
/** Struct for tables. */
|
||||||
struct nd6_neighbor_cache_entry {
|
struct nd6_neighbor_cache_entry {
|
||||||
ip6_addr_t next_hop_address;
|
ip6_addr_t next_hop_address;
|
||||||
struct netif * netif;
|
struct netif *netif;
|
||||||
u8_t lladdr[NETIF_MAX_HWADDR_LEN];
|
u8_t lladdr[NETIF_MAX_HWADDR_LEN];
|
||||||
/*u32_t pmtu;*/
|
/*u32_t pmtu;*/
|
||||||
#if LWIP_ND6_QUEUEING
|
#if LWIP_ND6_QUEUEING
|
||||||
@ -90,7 +90,7 @@ struct nd6_destination_cache_entry {
|
|||||||
|
|
||||||
struct nd6_prefix_list_entry {
|
struct nd6_prefix_list_entry {
|
||||||
ip6_addr_t prefix;
|
ip6_addr_t prefix;
|
||||||
struct netif * netif;
|
struct netif *netif;
|
||||||
u32_t invalidation_timer;
|
u32_t invalidation_timer;
|
||||||
#if LWIP_IPV6_AUTOCONFIG
|
#if LWIP_IPV6_AUTOCONFIG
|
||||||
u8_t flags;
|
u8_t flags;
|
||||||
@ -101,7 +101,7 @@ struct nd6_prefix_list_entry {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct nd6_router_list_entry {
|
struct nd6_router_list_entry {
|
||||||
struct nd6_neighbor_cache_entry * neighbor_entry;
|
struct nd6_neighbor_cache_entry *neighbor_entry;
|
||||||
u32_t invalidation_timer;
|
u32_t invalidation_timer;
|
||||||
u8_t flags;
|
u8_t flags;
|
||||||
};
|
};
|
||||||
@ -344,14 +344,14 @@ extern u32_t retrans_timer;
|
|||||||
|
|
||||||
void nd6_tmr(void);
|
void nd6_tmr(void);
|
||||||
void nd6_input(struct pbuf *p, struct netif *inp);
|
void nd6_input(struct pbuf *p, struct netif *inp);
|
||||||
s8_t nd6_get_next_hop_entry(const ip6_addr_t * ip6addr, struct netif * netif);
|
s8_t nd6_get_next_hop_entry(const ip6_addr_t *ip6addr, struct netif *netif);
|
||||||
s8_t nd6_select_router(const ip6_addr_t * ip6addr, struct netif * netif);
|
s8_t nd6_select_router(const ip6_addr_t *ip6addr, struct netif *netif);
|
||||||
u16_t nd6_get_destination_mtu(const ip6_addr_t * ip6addr, struct netif * netif);
|
u16_t nd6_get_destination_mtu(const ip6_addr_t *ip6addr, struct netif *netif);
|
||||||
err_t nd6_queue_packet(s8_t neighbor_index, struct pbuf * p);
|
err_t nd6_queue_packet(s8_t neighbor_index, struct pbuf *p);
|
||||||
#if LWIP_ND6_TCP_REACHABILITY_HINTS
|
#if LWIP_ND6_TCP_REACHABILITY_HINTS
|
||||||
void nd6_reachability_hint(const ip6_addr_t * ip6addr);
|
void nd6_reachability_hint(const ip6_addr_t *ip6addr);
|
||||||
#endif /* LWIP_ND6_TCP_REACHABILITY_HINTS */
|
#endif /* LWIP_ND6_TCP_REACHABILITY_HINTS */
|
||||||
void nd6_cleanup_netif(struct netif * netif);
|
void nd6_cleanup_netif(struct netif *netif);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user