|
| 1 | +--- ./sdk_lwip/include/lwipopts.h.orig 2021-03-07 13:23:09.029912491 +0000 |
| 2 | ++++ ./sdk_lwip/include/lwipopts.h 2021-03-07 13:25:56.138097825 +0000 |
| 3 | +@@ -790,7 +790,6 @@ |
| 4 | + #define LWIP_MDNS 1 |
| 5 | + #endif |
| 6 | + /* |
| 7 | +-/* |
| 8 | + ---------------------------------- |
| 9 | + ---------- DNS options ----------- |
| 10 | + ---------------------------------- |
| 11 | +--- ./sdk_lwip/include/lwip/ip_addr.h.orig 2021-03-07 13:23:09.025912487 +0000 |
| 12 | ++++ ./sdk_lwip/include/lwip/ip_addr.h 2021-03-07 13:24:19.973991159 +0000 |
| 13 | +@@ -210,7 +210,7 @@ |
| 14 | + #define ip_addr_islinklocal(addr1) (((addr1)->addr & PP_HTONL(0xffff0000UL)) == PP_HTONL(0xa9fe0000UL)) |
| 15 | + |
| 16 | + #define ip_addr_debug_print(debug, ipaddr) \ |
| 17 | +- LWIP_DEBUGF(debug, ("%"U16_F".%"U16_F".%"U16_F".%"U16_F, \ |
| 18 | ++ LWIP_DEBUGF(debug, ("%" U16_F ".%" U16_F ".%" U16_F ".%" U16_F, \ |
| 19 | + ipaddr != NULL ? ip4_addr1_16(ipaddr) : 0, \ |
| 20 | + ipaddr != NULL ? ip4_addr2_16(ipaddr) : 0, \ |
| 21 | + ipaddr != NULL ? ip4_addr3_16(ipaddr) : 0, \ |
| 22 | +--- ./sdk_lwip/include/lwip/igmp.h.orig 2021-03-07 13:23:09.025912487 +0000 |
| 23 | ++++ ./sdk_lwip/include/lwip/igmp.h 2021-03-07 13:33:02.535402600 +0000 |
| 24 | +@@ -97,7 +97,9 @@ |
| 25 | + err_t igmp_leavegroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr)ICACHE_FLASH_ATTR; |
| 26 | + void igmp_tmr(void)ICACHE_FLASH_ATTR; |
| 27 | + int r_rand(void); |
| 28 | ++#ifndef LWIP_RAND |
| 29 | + #define LWIP_RAND() r_rand() |
| 30 | ++#endif |
| 31 | + #ifdef __cplusplus |
| 32 | + } |
| 33 | + #endif |
| 34 | +--- ./sdk_lwip/src/core/dhcp.c.orig 2021-03-07 13:23:09.029912491 +0000 |
| 35 | ++++ ./sdk_lwip/src/core/dhcp.c 2021-03-07 13:57:04.167952143 +0000 |
| 36 | +@@ -189,6 +189,7 @@ |
| 37 | + } |
| 38 | + vendor_class_len = len; |
| 39 | + memcpy(vendor_class_buf, str, len); |
| 40 | ++ return ERR_OK; |
| 41 | + } |
| 42 | + |
| 43 | + /** |
| 44 | +@@ -342,7 +343,7 @@ |
| 45 | + |
| 46 | + if (vendor_class_buf != NULL) { |
| 47 | + const char *p = (const char*)vendor_class_buf; |
| 48 | +- u8_t namelen = (u8_t)os_strlen(p); |
| 49 | ++ //u8_t namelen = (u8_t)os_strlen(p); |
| 50 | + if (vendor_class_len > 0) { |
| 51 | + LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255); |
| 52 | + dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len); |
| 53 | +@@ -951,7 +952,7 @@ |
| 54 | + |
| 55 | + if (vendor_class_buf != NULL) { |
| 56 | + const char *p = (const char*)vendor_class_buf; |
| 57 | +- u8_t namelen = (u8_t)os_strlen(p); |
| 58 | ++ //u8_t namelen = (u8_t)os_strlen(p); |
| 59 | + if (vendor_class_len > 0) { |
| 60 | + LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255); |
| 61 | + dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len); |
| 62 | +@@ -1162,7 +1163,7 @@ |
| 63 | + |
| 64 | + if (vendor_class_buf != NULL) { |
| 65 | + const char *p = (const char*)vendor_class_buf; |
| 66 | +- u8_t namelen = (u8_t)os_strlen(p); |
| 67 | ++ //u8_t namelen = (u8_t)os_strlen(p); |
| 68 | + if (vendor_class_len > 0) { |
| 69 | + LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255); |
| 70 | + dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len); |
| 71 | +@@ -1237,7 +1238,7 @@ |
| 72 | + |
| 73 | + if (vendor_class_buf != NULL) { |
| 74 | + const char *p = (const char*)vendor_class_buf; |
| 75 | +- u8_t namelen = (u8_t)os_strlen(p); |
| 76 | ++ //u8_t namelen = (u8_t)os_strlen(p); |
| 77 | + if (vendor_class_len > 0) { |
| 78 | + LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255); |
| 79 | + dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len); |
| 80 | +--- ./sdk_lwip/src/core/init.c.orig 2021-03-07 13:23:09.029912491 +0000 |
| 81 | ++++ ./sdk_lwip/src/core/init.c 2021-03-07 13:58:17.432103852 +0000 |
| 82 | +@@ -260,7 +260,7 @@ |
| 83 | + lwip_init(void) |
| 84 | + { |
| 85 | + MEMP_NUM_TCP_PCB = 5; |
| 86 | +- TCP_WND = (4 * TCP_MSS); |
| 87 | ++ //TCP_WND = (4 * TCP_MSS); |
| 88 | + TCP_MAXRTX = 12; |
| 89 | + TCP_SYNMAXRTX = 6; |
| 90 | + |
| 91 | +--- ./sdk_lwip/src/core/dns.c.orig 2021-03-07 13:23:09.029912491 +0000 |
| 92 | ++++ ./sdk_lwip/src/core/dns.c 2021-03-07 13:45:28.746318109 +0000 |
| 93 | +@@ -450,7 +450,7 @@ |
| 94 | + * better check for failure: != IPADDR_NONE) or IPADDR_NONE if the hostname |
| 95 | + * was not found in the cached dns_table. |
| 96 | + */ |
| 97 | +-static u32_t ICACHE_FLASH_ATTR |
| 98 | ++u32_t ICACHE_FLASH_ATTR |
| 99 | + dns_lookup(const char *name) |
| 100 | + { |
| 101 | + u8_t i; |
| 102 | +--- ./sdk_lwip/src/core/ipv4/igmp.c.orig 2021-03-07 13:23:09.029912491 +0000 |
| 103 | ++++ ./sdk_lwip/src/core/ipv4/igmp.c 2021-03-07 14:04:05.956800908 +0000 |
| 104 | +@@ -103,7 +103,7 @@ |
| 105 | + #ifdef DYC_IGMP_DEBUG |
| 106 | + #define IGMP_LOG os_printf |
| 107 | + #else |
| 108 | +-#define IGMP_LOG //os_printf |
| 109 | ++#define IGMP_LOG(a,b,c) |
| 110 | + #endif |
| 111 | + |
| 112 | + /* |
| 113 | +@@ -150,7 +150,7 @@ |
| 114 | + static err_t igmp_remove_group(struct igmp_group *group)ICACHE_FLASH_ATTR; |
| 115 | + static void igmp_timeout( struct igmp_group *group)ICACHE_FLASH_ATTR; |
| 116 | + static void igmp_start_timer(struct igmp_group *group, u8_t max_time)ICACHE_FLASH_ATTR; |
| 117 | +-static void igmp_stop_timer(struct igmp_group *group)ICACHE_FLASH_ATTR; |
| 118 | ++//static void igmp_stop_timer(struct igmp_group *group)ICACHE_FLASH_ATTR; |
| 119 | + static void igmp_delaying_member(struct igmp_group *group, u8_t maxresp)ICACHE_FLASH_ATTR; |
| 120 | + static err_t igmp_ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest, struct netif *netif)ICACHE_FLASH_ATTR; |
| 121 | + static void igmp_send(struct igmp_group *group, u8_t type)ICACHE_FLASH_ATTR; |
| 122 | +@@ -739,7 +739,7 @@ |
| 123 | + * |
| 124 | + * @param group the igmp_group for which to stop the timer |
| 125 | + */ |
| 126 | +-static void |
| 127 | ++void |
| 128 | + igmp_stop_timer(struct igmp_group *group) |
| 129 | + { |
| 130 | + group->timer = 0; |
| 131 | +--- ./sdk_lwip/src/core/sntp.c.orig 2021-03-07 13:23:09.033912496 +0000 |
| 132 | ++++ ./sdk_lwip/src/core/sntp.c 2021-03-07 14:00:07.824328524 +0000 |
| 133 | +@@ -272,7 +272,9 @@ |
| 134 | + }; |
| 135 | + static struct sntp_server sntp_servers[SNTP_MAX_SERVERS]; |
| 136 | + |
| 137 | ++#if SNTP_GET_SERVERS_FROM_DHCP |
| 138 | + static u8_t sntp_set_servers_from_dhcp; |
| 139 | ++#endif /* SNTP_GET_SERVERS_FROM_DHCP */ |
| 140 | + #if SNTP_SUPPORT_MULTIPLE_SERVERS |
| 141 | + /** The currently used server (initialized to 0) */ |
| 142 | + static u8_t sntp_current_server; |
| 143 | +@@ -345,7 +347,6 @@ |
| 144 | + { |
| 145 | + long days, rem; |
| 146 | + time_t lcltime; |
| 147 | +- int i; |
| 148 | + int y; |
| 149 | + int yleap; |
| 150 | + const int *ip; |
| 151 | +--- ./sdk_lwip/src/core/timers.c.orig 2021-03-07 13:23:09.033912496 +0000 |
| 152 | ++++ ./sdk_lwip/src/core/timers.c 2021-03-07 14:00:42.408398071 +0000 |
| 153 | +@@ -115,7 +115,7 @@ |
| 154 | + * @param arg unused argument |
| 155 | + */ |
| 156 | + |
| 157 | +-static void ICACHE_FLASH_ATTR |
| 158 | ++void ICACHE_FLASH_ATTR |
| 159 | + tcp_timer_coarse(void *arg) |
| 160 | + { |
| 161 | + LWIP_UNUSED_ARG(arg); |
| 162 | +--- ./sdk_lwip/src/app/dhcpserver.c.orig 2021-03-07 13:23:09.029912491 +0000 |
| 163 | ++++ ./sdk_lwip/src/app/dhcpserver.c 2021-03-07 14:08:51.113351807 +0000 |
| 164 | +@@ -37,7 +37,7 @@ |
| 165 | + void wifi_softap_dhcps_client_leave(u8 *bssid, struct ip_addr *ip,bool force); |
| 166 | + uint32 wifi_softap_dhcps_client_update(u8 *bssid, struct ip_addr *ip); |
| 167 | + struct netif * eagle_lwip_getif(uint8 index); |
| 168 | +-int wifi_softap_set_station_info(char *info, struct ip_addr *addr); |
| 169 | ++int wifi_softap_set_station_info(unsigned char *info, struct ip_addr *addr); |
| 170 | + |
| 171 | + /****************************************************************************** |
| 172 | + * FunctionName : node_insert_to_list |
| 173 | +@@ -331,6 +331,8 @@ |
| 174 | + SendOffer_err_t = udp_sendto( pcb_dhcps, p, &broadcast_dhcps, DHCPS_CLIENT_PORT ); |
| 175 | + #if DHCPS_DEBUG |
| 176 | + os_printf("dhcps: send_offer>>udp_sendto result %x\n",SendOffer_err_t); |
| 177 | ++#else |
| 178 | ++ (void) SendOffer_err_t; |
| 179 | + #endif |
| 180 | + if(p->ref != 0){ |
| 181 | + #if DHCPS_DEBUG |
| 182 | +@@ -391,6 +393,8 @@ |
| 183 | + SendNak_err_t = udp_sendto( pcb_dhcps, p, &broadcast_dhcps, DHCPS_CLIENT_PORT ); |
| 184 | + #if DHCPS_DEBUG |
| 185 | + os_printf("dhcps: send_nak>>udp_sendto result %x\n",SendNak_err_t); |
| 186 | ++#else |
| 187 | ++ (void) SendNak_err_t; |
| 188 | + #endif |
| 189 | + if(p->ref != 0){ |
| 190 | + #if DHCPS_DEBUG |
| 191 | +@@ -452,6 +456,8 @@ |
| 192 | + SendAck_err_t = udp_sendto( pcb_dhcps, p, &broadcast_dhcps, DHCPS_CLIENT_PORT ); |
| 193 | + #if DHCPS_DEBUG |
| 194 | + os_printf("dhcps: send_ack>>udp_sendto result %x\n",SendAck_err_t); |
| 195 | ++#else |
| 196 | ++ (void) SendAck_err_t; |
| 197 | + #endif |
| 198 | + |
| 199 | + if(p->ref != 0){ |
| 200 | +@@ -942,7 +948,6 @@ |
| 201 | + bool ICACHE_FLASH_ATTR wifi_softap_set_dhcps_offer_option(uint8 level, void* optarg) |
| 202 | + { |
| 203 | + bool offer_flag = true; |
| 204 | +- uint8 option = 0; |
| 205 | + if (optarg == NULL && wifi_softap_dhcps_status() == false) |
| 206 | + return false; |
| 207 | + |
0 commit comments