[LWIP] sync lwip src from iot sdk ezviz_m50 and wifi6 rf lib

git addr:git@code.bouffalolab.com:bouffalo_sw/customer/ezviz_bl618_m50.git
wifi6:git@code.bouffalolab.com:bouffalo_sw/wifi/fhost6/wifi6.git
branch:c_ezviz_bl618m50
commit ID:4dd5b470de09a3717e8e1b9dc3269e6cd6b4528c
bl6macsw:git@code.bouffalolab.com:bouffalo_sw/wifi/fhost6/bl6_macsw.git
branch:c_ezviz_bl618m50
commit ID:0a64ffd1377f566b0465155227b8357f36c4fd85
rf:git@code.bouffalolab.com:bouffalo_sw/wireless/bl616_phy.git
branch:debug/debug_fw
commit ID:b173ce726802d6e790515b000ddb3fb94f89a352
This commit is contained in:
Yiming 2023-11-19 14:53:55 +08:00
parent 5b189fe985
commit db67c24665
14 changed files with 11 additions and 12 deletions

View File

@ -43,6 +43,7 @@ endif
ifeq ($(CONFIG_IPV6), 1)
COMPONENT_SRCDIRS += src/core/ipv6
CPPFLAGS += -D CFG_IPV6
endif
ifeq ($(CONFIG_OTBR),1)

View File

@ -55,20 +55,20 @@ void __attribute__((section(".bugkiller_code"))) bugkiller_sockets_dump()
case NETCONN_UDP:
printf(lwip_bugkiller_format[0], i);
printf(lwip_bugkiller_format[1],
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.udp->local_ip.addr),
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.udp->local_ip),
sockets[i].conn->pcb.udp->local_port);
printf(lwip_bugkiller_format[6],
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.udp->remote_ip.addr),
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.udp->remote_ip),
sockets[i].conn->pcb.udp->remote_port);
break;
case NETCONN_TCP:
printf(lwip_bugkiller_format[3], i);
printf(lwip_bugkiller_format[1],
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.udp->local_ip.addr),
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.udp->local_ip),
sockets[i].conn->pcb.tcp->local_port);
if(sockets[i].conn->pcb.tcp->state != LISTEN) {
printf(lwip_bugkiller_format[2],
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.tcp->remote_ip.addr),
ip4addr_ntoa((const ip4_addr_t *) &sockets[i].conn->pcb.tcp->remote_ip),
sockets[i].conn->pcb.tcp->remote_port);
}
puts(lwip_bugkiller_tcp_state[sockets[i].conn->pcb.tcp->state]);

View File

@ -40,6 +40,6 @@ void __attribute__((section(".bugkiller_code"))) bugkiller_tcp_seg_dump(void *s)
void __attribute__((section(".bugkiller_code"))) bugkiller_tcp_listen_dump(unsigned long accept_num,void *s)
{
struct tcp_pcb_listen *listen_pcb = (struct tcp_pcb_listen *)s;
//struct tcp_pcb_listen *listen_pcb = (struct tcp_pcb_listen *)s;
printf(lwip_bugkiller_tcp_listen_format[0], accept_num);
}

View File

@ -2106,7 +2106,7 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
LWIP_ASSERT("socket gone at the end of select", sock != NULL);
if (sock != NULL) {
/* for now, handle select_waiting==0... */
LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
// LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
if (sock->select_waiting > 0) {
sock->select_waiting--;
}
@ -2229,7 +2229,7 @@ lwip_pollscan(struct pollfd *fds, nfds_t nfds, enum lwip_pollscan_opts opts)
}
} else if ((opts & LWIP_POLLSCAN_DEC_WAIT) != 0) {
/* for now, handle select_waiting==0... */
LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
// LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
if (sock->select_waiting > 0) {
sock->select_waiting--;
}

View File

@ -1252,11 +1252,9 @@ dhcp_bind(struct netif *netif)
dhcp_set_state(dhcp, DHCP_STATE_BOUND);
netif->addr_ext.arp_for_us_disable = 0;
if(netif->addr_ext.dhcp_qc_callback && !ip4_addr_cmp(netif_ip4_addr(netif), &dhcp->offered_ip_addr)) {
netif_set_addr(netif, &dhcp->offered_ip_addr, &sn_mask, &gw_addr);
netif_set_addr(netif, &dhcp->offered_ip_addr, &sn_mask, &gw_addr);
if (netif->addr_ext.dhcp_qc_callback) {
netif->addr_ext.dhcp_qc_callback(netif);
} else {
netif_set_addr(netif, &dhcp->offered_ip_addr, &sn_mask, &gw_addr);
}
/* interface is used by routing now that an address is set */
// Add dhcp_timer_coarse_needed to fix the timer runs when WiFi have not connected

View File

@ -474,7 +474,7 @@ lowpan6_frag(struct netif *netif, struct pbuf *p, const struct lowpan6_link_addr
/* Calculate frame length */
p_frag->len = p_frag->tot_len = frag_len + lowpan6_header_len + ieee_header_len + 2;
LWIP_ASSERT("", p_frag->len <= 127);
LWIP_ASSERT("frame must be less than 127", p_frag->len <= 127);
/* 2 bytes CRC */
crc = LWIP_6LOWPAN_DO_CALC_CRC(p_frag->payload, p_frag->len - 2);

Binary file not shown.