Commit a1b0acbe authored by danielinux's avatar danielinux

Fixes to work with different config (via frosted OS)

parent f2f2e924
......@@ -162,7 +162,7 @@ struct pico_stack {
# ifdef PICO_SUPPORT_IPV4FRAG
uint32_t ipv4_cur_frag_id;
uint32_t ipv4_fragments_timer;
struct pico_tree ipv6_fragments;
struct pico_tree ipv4_fragments;
# endif
uint16_t ipv4_pre_forward_last_id;
uint16_t ipv4_pre_forward_last_proto;
......
......@@ -1175,7 +1175,7 @@ static int pico_ipv4_mcast_filter(struct pico_stack *S, struct pico_frame *f)
#else
int pico_ipv4_mcast_join(struct pico_ip4 *mcast_link, struct pico_ip4 *mcast_group, uint8_t reference_count, uint8_t filter_mode, struct pico_tree *MCASTFilter)
int pico_ipv4_mcast_join(struct pico_stack *S, struct pico_ip4 *mcast_link, struct pico_ip4 *mcast_group, uint8_t reference_count, uint8_t filter_mode, struct pico_tree *MCASTFilter)
{
IGNORE_PARAMETER(mcast_link);
IGNORE_PARAMETER(mcast_group);
......@@ -1186,7 +1186,7 @@ int pico_ipv4_mcast_join(struct pico_ip4 *mcast_link, struct pico_ip4 *mcast_gro
return -1;
}
int pico_ipv4_mcast_leave(struct pico_ip4 *mcast_link, struct pico_ip4 *mcast_group, uint8_t reference_count, uint8_t filter_mode, struct pico_tree *MCASTFilter)
int pico_ipv4_mcast_leave(struct pico_stack *S, struct pico_ip4 *mcast_link, struct pico_ip4 *mcast_group, uint8_t reference_count, uint8_t filter_mode, struct pico_tree *MCASTFilter)
{
IGNORE_PARAMETER(mcast_link);
IGNORE_PARAMETER(mcast_group);
......@@ -1870,11 +1870,12 @@ static int pico_ipv4_forward(struct pico_stack *S, struct pico_frame *f)
if (pico_ipv4_forward_check_dev(S, f) < 0)
return -1;
#ifdef PICO_SUPPORT_IPFILTER
if (ipfilter(f)) {
/*pico_frame is discarded as result of the filtering*/
return -1;
}
#endif
return pico_datalink_send(f);
}
......
......@@ -47,7 +47,7 @@ int pico_ipv4_nat_is_enabled(struct pico_ip4 *link_addr);
#else
#define pico_ipv4_nat_print_table() do {} while(0)
static inline int pico_ipv4_nat_inbound(struct pico_frame *f, struct pico_ip4 *link_addr)
static inline int pico_ipv4_nat_inbound(struct pico_stack *S, struct pico_frame *f, struct pico_ip4 *link_addr)
{
(void)f;
(void)link_addr;
......@@ -55,7 +55,7 @@ static inline int pico_ipv4_nat_inbound(struct pico_frame *f, struct pico_ip4 *l
return -1;
}
static inline int pico_ipv4_nat_outbound(struct pico_frame *f, struct pico_ip4 *link_addr)
static inline int pico_ipv4_nat_outbound(struct pico_stack *S, struct pico_frame *f, struct pico_ip4 *link_addr)
{
(void)f;
(void)link_addr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment