From b044007b566455532d7d5e3e2514d942cc5da57a Mon Sep 17 00:00:00 2001 From: xujie Date: Sun, 15 Oct 2023 21:46:59 +0800 Subject: [PATCH] update lwip to v22.03 Signed-off-by: xujie --- 0001-add-makefile.patch | 234 + 0002-adapt-lstack.patch | 5569 +++++++++++++++++ ...asional-coredump-when-the-lwip-exits.patch | 63 + ...or-of-deleting-conn-table-in-connect.patch | 79 + ...n-rcvd-state-reg-conn-into-conntable.patch | 27 + 0006-fix-coredump-in-etharp.patch | 29 + ...lle-fix-epoll_ctl-EPOLLET-mode-error.patch | 102 + ...ix-lwip_accept-memcpy-sockaddr-large.patch | 25 + ...ack-buffer-overflow-when-memcpy-addr.patch | 35 + ...-incomplete-release-of-the-conntable.patch | 115 + 0011-remove-gazelle-tcp-conn-func.patch | 116 + ...plete-resource-release-in-lwip-close.patch | 49 + 0013-remove-gazelle-syscall-thread.patch | 126 + 0014-fix-some-compile-errors.patch | 62 + 0015-fix-tcp-port-alloc-issue.patch | 36 + 0016-lstack-support-mysql-mode.patch | 943 +++ 0017-support-REUSEPOR-option.patch | 58 + ...-gazelle_init_sock-before-read-event.patch | 37 + 0019-gazelle-reduce-copy-in-send.patch | 50 + ...ym_handle-function-set-handle-to-RTL.patch | 63 + ...f-ring-is-full-the-node-is-added-to-.patch | 33 + ...hat-sock-state-changes-to-CLOSE_WAIT.patch | 56 + ...r-event-and-checksum-offload-support.patch | 698 +++ 0024-refactor-pkt-read-send-performance.patch | 320 + ...place-gettid-with-syscall-SYS_gettid.patch | 57 + ...wait_close-and-move-epoll_events-pos.patch | 30 + 0027-modify-EISCONN-condition.patch | 39 + 0028-per-thread-reassdata-variables.patch | 30 + ...and-remove-same-customized-modificat.patch | 114 + 0030-refactor-tcp-new-port.patch | 195 + ...factor-add-event-limit-send-pkts-num.patch | 71 + 0032-fix-free-pbuf-miss-data.patch | 80 + 0033-alloc-socket-fail-clean-sock.patch | 39 + 0034-add-accept4-and-epoll_create1.patch | 182 + 0035-add-writev-and-readv.patch | 41 + 0036-add-fs-secure-compilation-option.patch | 25 + ...P-QUEUE-to-avoid-sync-packet-dropped.patch | 27 + 0038-add-tso.patch | 380 ++ ...optimize-app-thread-write-buff-block.patch | 94 + 0040-add-huge-snd_buf.patch | 86 + ...pcb-list-limit-send-size-and-ack-now.patch | 374 ++ 0042-expand-recv-win.patch | 39 + 0043-add-prefetch.patch | 62 + 0044-skip-unnecessary-tcp_route.patch | 103 + 0045-add-variable-in-struct-sock.patch | 26 + ...ck-when-recv-too-many-acks-with-data.patch | 91 + 0047-reduce-struct-pbuf-size.patch | 25 + BUILD.gn | 25 + CHANGELOG | 4548 -------------- CMakeLists.txt | 20 - COPYING | 33 - FEATURES | 11 - FILES | 5 - README | 106 - UPGRADING | 278 - ...t-tcp-fix-sequence-number-comparison.patch | 36 + ...p-tighten-up-checks-for-received-SYN.patch | 58 + doc/FILES | 9 - doc/NO_SYS_SampleCode.c | 122 - doc/ZeroCopyRx.c | 45 - doc/contrib.txt | 58 - doc/doxygen/generate.bat | 1 - doc/doxygen/generate.sh | 3 - doc/doxygen/lwip.Doxyfile | 2531 -------- doc/doxygen/lwip.Doxyfile.cmake.in | 2531 -------- doc/doxygen/main_page.h | 412 -- doc/doxygen/output/index.html | 10 - doc/mdns.txt | 112 - doc/mqtt_client.txt | 162 - doc/ppp.txt | 529 -- doc/savannah.txt | 120 - install.py | 287 + lwip-2.1.3.zip | Bin 0 -> 4192506 bytes lwip.gni | 14 +- lwip.spec | 269 + pax_global_header | 1 - src/FILES | 15 - src/Filelists.cmake | 281 - src/Filelists.mk | 207 - src/api/api_lib.c | 1367 ---- src/api/api_msg.c | 2242 ------- src/api/err.c | 115 - src/api/if_api.c | 102 - src/api/netbuf.c | 250 - src/api/netdb.c | 418 -- src/api/netifapi.c | 428 -- src/api/sockets.c | 4246 ------------- src/api/tcpip.c | 734 --- src/apps/altcp_tls/altcp_tls_mbedtls.c | 1270 ---- src/apps/altcp_tls/altcp_tls_mbedtls_mem.c | 210 - src/apps/altcp_tls/altcp_tls_mbedtls_mem.h | 72 - .../altcp_tls/altcp_tls_mbedtls_structs.h | 83 - src/apps/http/altcp_proxyconnect.c | 584 -- src/apps/http/fs.c | 174 - src/apps/http/fs/404.html | 21 - src/apps/http/fs/img/sics.gif | Bin 724 -> 0 bytes src/apps/http/fs/index.html | 47 - src/apps/http/fsdata.c | 337 - src/apps/http/fsdata.h | 41 - src/apps/http/http_client.c | 909 --- src/apps/http/httpd.c | 2762 -------- src/apps/http/httpd_structs.h | 123 - src/apps/http/makefsdata/makefsdata | 97 - src/apps/http/makefsdata/makefsdata.c | 1251 ---- src/apps/http/makefsdata/readme.txt | 13 - src/apps/http/makefsdata/tinydir.h | 808 --- src/apps/lwiperf/lwiperf.c | 841 --- src/apps/mdns/mdns.c | 2407 ------- src/apps/mqtt/mqtt.c | 1462 ----- src/apps/netbiosns/netbiosns.c | 533 -- src/apps/smtp/smtp.c | 1555 ----- src/apps/snmp/snmp_asn1.c | 704 --- src/apps/snmp/snmp_asn1.h | 113 - src/apps/snmp/snmp_core.c | 1353 ---- src/apps/snmp/snmp_core_priv.h | 83 - src/apps/snmp/snmp_mib2.c | 116 - src/apps/snmp/snmp_mib2_icmp.c | 182 - src/apps/snmp/snmp_mib2_interfaces.c | 368 -- src/apps/snmp/snmp_mib2_ip.c | 731 --- src/apps/snmp/snmp_mib2_snmp.c | 227 - src/apps/snmp/snmp_mib2_system.c | 376 -- src/apps/snmp/snmp_mib2_tcp.c | 607 -- src/apps/snmp/snmp_mib2_udp.c | 372 -- src/apps/snmp/snmp_msg.c | 1951 ------ src/apps/snmp/snmp_msg.h | 185 - src/apps/snmp/snmp_netconn.c | 123 - src/apps/snmp/snmp_pbuf_stream.c | 156 - src/apps/snmp/snmp_pbuf_stream.h | 72 - src/apps/snmp/snmp_raw.c | 103 - src/apps/snmp/snmp_scalar.c | 232 - src/apps/snmp/snmp_snmpv2_framework.c | 90 - src/apps/snmp/snmp_snmpv2_usm.c | 410 -- src/apps/snmp/snmp_table.c | 342 - src/apps/snmp/snmp_threadsync.c | 231 - src/apps/snmp/snmp_traps.c | 458 -- src/apps/snmp/snmpv3.c | 136 - src/apps/snmp/snmpv3_mbedtls.c | 342 - src/apps/snmp/snmpv3_priv.h | 69 - src/apps/sntp/sntp.c | 903 --- src/apps/tftp/tftp_server.c | 435 -- src/core/altcp.c | 717 --- src/core/altcp_alloc.c | 87 - src/core/altcp_tcp.c | 577 -- src/core/def.c | 240 - src/core/distributed_net/distributed_net.c | 157 - .../distributed_net/distributed_net_core.c | 260 - .../distributed_net/distributed_net_utils.c | 105 - src/core/distributed_net/udp_transmit.c | 147 - src/core/dns.c | 1743 ------ src/core/inet_chksum.c | 608 -- src/core/init.c | 388 -- src/core/ip.c | 181 - src/core/ipv4/autoip.c | 550 -- src/core/ipv4/dhcp.c | 2059 ------ src/core/ipv4/etharp.c | 1244 ---- src/core/ipv4/icmp.c | 418 -- src/core/ipv4/igmp.c | 838 --- src/core/ipv4/ip4.c | 1178 ---- src/core/ipv4/ip4_addr.c | 323 - src/core/ipv4/ip4_frag.c | 914 --- src/core/ipv6/dhcp6.c | 850 --- src/core/ipv6/ethip6.c | 123 - src/core/ipv6/icmp6.c | 438 -- src/core/ipv6/inet6.c | 53 - src/core/ipv6/ip6.c | 1566 ----- src/core/ipv6/ip6_addr.c | 343 - src/core/ipv6/ip6_frag.c | 882 --- src/core/ipv6/mld6.c | 667 -- src/core/ipv6/nd6.c | 2554 -------- src/core/lowpower.c | 489 -- src/core/mem.c | 1017 --- src/core/memp.c | 447 -- src/core/net_group.c | 90 - src/core/netif.c | 1962 ------ src/core/pbuf.c | 1548 ----- src/core/raw.c | 704 --- src/core/stats.c | 169 - src/core/sys.c | 148 - src/core/tcp.c | 2867 --------- src/core/tcp_in.c | 2213 ------- src/core/tcp_out.c | 2203 ------- src/core/timeouts.c | 454 -- src/core/udp.c | 1370 ---- src/include/compat/posix/arpa/inet.h | 33 - src/include/compat/posix/net/if.h | 36 - src/include/compat/posix/netdb.h | 33 - src/include/compat/posix/sys/socket.h | 33 - src/include/compat/stdc/errno.h | 33 - src/include/lwip/altcp.h | 206 - src/include/lwip/altcp_tcp.h | 72 - src/include/lwip/altcp_tls.h | 143 - src/include/lwip/api.h | 431 -- src/include/lwip/apps/FILES | 2 - src/include/lwip/apps/altcp_proxyconnect.h | 79 - .../lwip/apps/altcp_tls_mbedtls_opts.h | 105 - src/include/lwip/apps/fs.h | 126 - src/include/lwip/apps/http_client.h | 160 - src/include/lwip/apps/httpd.h | 255 - src/include/lwip/apps/httpd_opts.h | 396 -- src/include/lwip/apps/lwiperf.h | 100 - src/include/lwip/apps/mdns.h | 105 - src/include/lwip/apps/mdns_opts.h | 81 - src/include/lwip/apps/mdns_priv.h | 74 - src/include/lwip/apps/mqtt.h | 205 - src/include/lwip/apps/mqtt_opts.h | 103 - src/include/lwip/apps/mqtt_priv.h | 104 - src/include/lwip/apps/netbiosns.h | 51 - src/include/lwip/apps/netbiosns_opts.h | 66 - src/include/lwip/apps/smtp.h | 128 - src/include/lwip/apps/smtp_opts.h | 81 - src/include/lwip/apps/snmp.h | 135 - src/include/lwip/apps/snmp_core.h | 377 -- src/include/lwip/apps/snmp_mib2.h | 78 - src/include/lwip/apps/snmp_opts.h | 297 - src/include/lwip/apps/snmp_scalar.h | 113 - src/include/lwip/apps/snmp_snmpv2_framework.h | 32 - src/include/lwip/apps/snmp_snmpv2_usm.h | 24 - src/include/lwip/apps/snmp_table.h | 134 - src/include/lwip/apps/snmp_threadsync.h | 114 - src/include/lwip/apps/snmpv3.h | 114 - src/include/lwip/apps/sntp.h | 80 - src/include/lwip/apps/sntp_opts.h | 215 - src/include/lwip/apps/tftp_opts.h | 106 - src/include/lwip/apps/tftp_server.h | 95 - src/include/lwip/arch.h | 393 -- src/include/lwip/autoip.h | 103 - src/include/lwip/debug.h | 159 - src/include/lwip/def.h | 152 - src/include/lwip/dhcp.h | 183 - src/include/lwip/dhcp6.h | 108 - .../lwip/distributed_net/distributed_net.h | 83 - .../distributed_net/distributed_net_core.h | 83 - .../distributed_net/distributed_net_utils.h | 48 - .../lwip/distributed_net/udp_transmit.h | 67 - src/include/lwip/dns.h | 135 - src/include/lwip/err.h | 117 - src/include/lwip/errno.h | 200 - src/include/lwip/etharp.h | 109 - src/include/lwip/ethip6.h | 68 - src/include/lwip/icmp.h | 110 - src/include/lwip/icmp6.h | 72 - src/include/lwip/if_api.h | 71 - src/include/lwip/igmp.h | 119 - src/include/lwip/inet.h | 169 - src/include/lwip/inet_chksum.h | 105 - src/include/lwip/init.h | 100 - src/include/lwip/init.h.cmake.in | 100 - src/include/lwip/ip.h | 368 -- src/include/lwip/ip4.h | 119 - src/include/lwip/ip4_addr.h | 216 - src/include/lwip/ip4_frag.h | 105 - src/include/lwip/ip6.h | 97 - src/include/lwip/ip6_addr.h | 352 -- src/include/lwip/ip6_frag.h | 148 - src/include/lwip/ip6_zone.h | 312 - src/include/lwip/ip_addr.h | 438 -- src/include/lwip/lowpower.h | 169 - src/include/lwip/mem.h | 82 - src/include/lwip/memp.h | 155 - src/include/lwip/mld6.h | 103 - src/include/lwip/nd6.h | 94 - src/include/lwip/net_group.h | 61 - src/include/lwip/netbuf.h | 116 - src/include/lwip/netdb.h | 150 - src/include/lwip/netif.h | 711 --- src/include/lwip/netifapi.h | 170 - src/include/lwip/opt.h | 3560 ----------- src/include/lwip/pbuf.h | 326 - src/include/lwip/priv/altcp_priv.h | 159 - src/include/lwip/priv/api_msg.h | 282 - src/include/lwip/priv/mem_priv.h | 84 - src/include/lwip/priv/memp_priv.h | 161 - src/include/lwip/priv/memp_std.h | 158 - src/include/lwip/priv/nd6_priv.h | 142 - src/include/lwip/priv/raw_priv.h | 69 - src/include/lwip/priv/sockets_priv.h | 175 - src/include/lwip/priv/tcp_priv.h | 528 -- src/include/lwip/priv/tcpip_priv.h | 179 - src/include/lwip/prot/autoip.h | 78 - src/include/lwip/prot/dhcp.h | 178 - src/include/lwip/prot/dhcp6.h | 138 - src/include/lwip/prot/dns.h | 140 - src/include/lwip/prot/etharp.h | 114 - src/include/lwip/prot/ethernet.h | 125 - src/include/lwip/prot/iana.h | 97 - src/include/lwip/prot/icmp.h | 91 - src/include/lwip/prot/icmp6.h | 172 - src/include/lwip/prot/ieee.h | 91 - src/include/lwip/prot/igmp.h | 90 - src/include/lwip/prot/ip.h | 59 - src/include/lwip/prot/ip4.h | 133 - src/include/lwip/prot/ip6.h | 235 - src/include/lwip/prot/mld6.h | 71 - src/include/lwip/prot/nd6.h | 274 - src/include/lwip/prot/tcp.h | 100 - src/include/lwip/prot/udp.h | 68 - src/include/lwip/raw.h | 147 - src/include/lwip/sio.h | 142 - src/include/lwip/snmp.h | 213 - src/include/lwip/sockets.h | 707 --- src/include/lwip/stats.h | 491 -- src/include/lwip/sys.h | 560 -- src/include/lwip/tcp.h | 509 -- src/include/lwip/tcpbase.h | 88 - src/include/lwip/tcpip.h | 117 - src/include/lwip/timeouts.h | 132 - src/include/lwip/udp.h | 199 - src/include/netif/bridgeif.h | 127 - src/include/netif/bridgeif_opts.h | 90 - src/include/netif/etharp.h | 3 - src/include/netif/ethernet.h | 77 - src/include/netif/ieee802154.h | 112 - src/include/netif/lowpan6.h | 92 - src/include/netif/lowpan6_ble.h | 78 - src/include/netif/lowpan6_common.h | 82 - src/include/netif/lowpan6_opts.h | 122 - src/include/netif/ppp/ccp.h | 164 - src/include/netif/ppp/chap-md5.h | 36 - src/include/netif/ppp/chap-new.h | 200 - src/include/netif/ppp/chap_ms.h | 44 - src/include/netif/ppp/eap.h | 169 - src/include/netif/ppp/ecp.h | 62 - src/include/netif/ppp/eui64.h | 102 - src/include/netif/ppp/fsm.h | 182 - src/include/netif/ppp/ipcp.h | 134 - src/include/netif/ppp/ipv6cp.h | 191 - src/include/netif/ppp/lcp.h | 179 - src/include/netif/ppp/magic.h | 130 - src/include/netif/ppp/mppe.h | 181 - src/include/netif/ppp/polarssl/arc4.h | 81 - src/include/netif/ppp/polarssl/des.h | 92 - src/include/netif/ppp/polarssl/md4.h | 97 - src/include/netif/ppp/polarssl/md5.h | 96 - src/include/netif/ppp/polarssl/sha1.h | 96 - src/include/netif/ppp/ppp.h | 698 --- src/include/netif/ppp/ppp_impl.h | 722 --- src/include/netif/ppp/ppp_opts.h | 617 -- src/include/netif/ppp/pppapi.h | 137 - src/include/netif/ppp/pppcrypt.h | 144 - src/include/netif/ppp/pppdebug.h | 88 - src/include/netif/ppp/pppoe.h | 187 - src/include/netif/ppp/pppol2tp.h | 209 - src/include/netif/ppp/pppos.h | 126 - src/include/netif/ppp/upap.h | 131 - src/include/netif/ppp/vj.h | 169 - src/include/netif/slipif.h | 87 - src/include/netif/zepif.h | 81 - src/netif/FILES | 23 - src/netif/bridgeif.c | 563 -- src/netif/bridgeif_fdb.c | 212 - src/netif/ethernet.c | 321 - src/netif/lowpan6.c | 945 --- src/netif/lowpan6_ble.c | 447 -- src/netif/lowpan6_common.c | 841 --- src/netif/ppp/PPPD_FOLLOWUP | 473 -- src/netif/ppp/auth.c | 2510 -------- src/netif/ppp/ccp.c | 1740 ----- src/netif/ppp/chap-md5.c | 126 - src/netif/ppp/chap-new.c | 677 -- src/netif/ppp/chap_ms.c | 962 --- src/netif/ppp/demand.c | 465 -- src/netif/ppp/eap.c | 2423 ------- src/netif/ppp/ecp.c | 191 - src/netif/ppp/eui64.c | 56 - src/netif/ppp/fsm.c | 799 --- src/netif/ppp/ipcp.c | 2418 ------- src/netif/ppp/ipv6cp.c | 1533 ----- src/netif/ppp/lcp.c | 2790 --------- src/netif/ppp/magic.c | 294 - src/netif/ppp/mppe.c | 412 -- src/netif/ppp/multilink.c | 609 -- src/netif/ppp/polarssl/README | 22 - src/netif/ppp/polarssl/arc4.c | 101 - src/netif/ppp/polarssl/des.c | 422 -- src/netif/ppp/polarssl/md4.c | 281 - src/netif/ppp/polarssl/md5.c | 300 - src/netif/ppp/polarssl/sha1.c | 335 - src/netif/ppp/ppp.c | 1631 ----- src/netif/ppp/pppapi.c | 427 -- src/netif/ppp/pppcrypt.c | 66 - src/netif/ppp/pppoe.c | 1198 ---- src/netif/ppp/pppol2tp.c | 1159 ---- src/netif/ppp/pppos.c | 895 --- src/netif/ppp/upap.c | 677 -- src/netif/ppp/utils.c | 957 --- src/netif/ppp/vj.c | 685 -- src/netif/slipif.c | 558 -- src/netif/zepif.c | 300 - test/fuzz/Makefile | 54 - test/fuzz/README | 37 - test/fuzz/config.h | 0 test/fuzz/fuzz.c | 189 - test/fuzz/inputs/arp/arp_req.bin | Bin 42 -> 0 bytes test/fuzz/inputs/icmp/icmp_ping.bin | Bin 98 -> 0 bytes .../inputs/ipv6/neighbor_solicitation.bin | Bin 86 -> 0 bytes test/fuzz/inputs/ipv6/router_adv.bin | Bin 118 -> 0 bytes test/fuzz/inputs/tcp/tcp_syn.bin | Bin 74 -> 0 bytes test/fuzz/inputs/udp/udp_port_5000.bin | Bin 50 -> 0 bytes test/fuzz/lwipopts.h | 80 - test/fuzz/output_to_pcap.sh | 31 - test/sockets/sockets_stresstest.c | 726 --- test/sockets/sockets_stresstest.h | 40 - test/unit/Filelists.cmake | 31 - test/unit/Filelists.mk | 51 - test/unit/api/test_sockets.c | 852 --- test/unit/api/test_sockets.h | 8 - test/unit/arch/sys_arch.c | 387 -- test/unit/arch/sys_arch.h | 79 - test/unit/core/test_def.c | 84 - test/unit/core/test_def.h | 8 - test/unit/core/test_mem.c | 224 - test/unit/core/test_mem.h | 8 - test/unit/core/test_netif.c | 281 - test/unit/core/test_netif.h | 8 - test/unit/core/test_pbuf.c | 271 - test/unit/core/test_pbuf.h | 8 - test/unit/core/test_timers.c | 233 - test/unit/core/test_timers.h | 8 - test/unit/dhcp/test_dhcp.c | 1057 ---- test/unit/dhcp/test_dhcp.h | 8 - test/unit/etharp/test_etharp.c | 272 - test/unit/etharp/test_etharp.h | 8 - test/unit/ip4/test_ip4.c | 160 - test/unit/ip4/test_ip4.h | 8 - test/unit/ip6/test_ip6.c | 359 -- test/unit/ip6/test_ip6.h | 8 - test/unit/lwip_check.h | 52 - test/unit/lwip_unittests.c | 107 - test/unit/lwipopts.h | 86 - test/unit/mdns/test_mdns.c | 915 --- test/unit/mdns/test_mdns.h | 8 - test/unit/mqtt/test_mqtt.c | 115 - test/unit/mqtt/test_mqtt.h | 8 - test/unit/tcp/tcp_helper.c | 319 - test/unit/tcp/tcp_helper.h | 58 - test/unit/tcp/test_tcp.c | 1695 ----- test/unit/tcp/test_tcp.h | 8 - test/unit/tcp/test_tcp_oos.c | 1018 --- test/unit/tcp/test_tcp_oos.h | 8 - test/unit/udp/test_udp.c | 472 -- test/unit/udp/test_udp.h | 8 - 441 files changed, 11816 insertions(+), 157092 deletions(-) create mode 100644 0001-add-makefile.patch create mode 100644 0002-adapt-lstack.patch create mode 100644 0003-fix-the-occasional-coredump-when-the-lwip-exits.patch create mode 100644 0004-fix-error-of-deleting-conn-table-in-connect.patch create mode 100644 0005-syn-rcvd-state-reg-conn-into-conntable.patch create mode 100644 0006-fix-coredump-in-etharp.patch create mode 100644 0007-gazelle-fix-epoll_ctl-EPOLLET-mode-error.patch create mode 100644 0008-gazelle-fix-lwip_accept-memcpy-sockaddr-large.patch create mode 100644 0009-fix-stack-buffer-overflow-when-memcpy-addr.patch create mode 100644 0010-fix-the-incomplete-release-of-the-conntable.patch create mode 100644 0011-remove-gazelle-tcp-conn-func.patch create mode 100644 0012-fix-incomplete-resource-release-in-lwip-close.patch create mode 100644 0013-remove-gazelle-syscall-thread.patch create mode 100644 0014-fix-some-compile-errors.patch create mode 100644 0015-fix-tcp-port-alloc-issue.patch create mode 100644 0016-lstack-support-mysql-mode.patch create mode 100644 0017-support-REUSEPOR-option.patch create mode 100644 0018-exec-gazelle_init_sock-before-read-event.patch create mode 100644 0019-gazelle-reduce-copy-in-send.patch create mode 100644 0020-remove-chose_dlsym_handle-function-set-handle-to-RTL.patch create mode 100644 0021-refactor-event-if-ring-is-full-the-node-is-added-to-.patch create mode 100644 0022-notify-app-that-sock-state-changes-to-CLOSE_WAIT.patch create mode 100644 0023-refactor-event-and-checksum-offload-support.patch create mode 100644 0024-refactor-pkt-read-send-performance.patch create mode 100644 0025-Replace-gettid-with-syscall-SYS_gettid.patch create mode 100644 0026-del-redundant-wait_close-and-move-epoll_events-pos.patch create mode 100644 0027-modify-EISCONN-condition.patch create mode 100644 0028-per-thread-reassdata-variables.patch create mode 100644 0029-fix-EISCONN-err-and-remove-same-customized-modificat.patch create mode 100644 0030-refactor-tcp-new-port.patch create mode 100644 0031-refactor-add-event-limit-send-pkts-num.patch create mode 100644 0032-fix-free-pbuf-miss-data.patch create mode 100644 0033-alloc-socket-fail-clean-sock.patch create mode 100644 0034-add-accept4-and-epoll_create1.patch create mode 100644 0035-add-writev-and-readv.patch create mode 100644 0036-add-fs-secure-compilation-option.patch create mode 100644 0037-enable-ARP-QUEUE-to-avoid-sync-packet-dropped.patch create mode 100644 0038-add-tso.patch create mode 100644 0039-optimize-app-thread-write-buff-block.patch create mode 100644 0040-add-huge-snd_buf.patch create mode 100644 0041-optimite-pcb-list-limit-send-size-and-ack-now.patch create mode 100644 0042-expand-recv-win.patch create mode 100644 0043-add-prefetch.patch create mode 100644 0044-skip-unnecessary-tcp_route.patch create mode 100644 0045-add-variable-in-struct-sock.patch create mode 100644 0046-add-dataack-when-recv-too-many-acks-with-data.patch create mode 100644 0047-reduce-struct-pbuf-size.patch create mode 100644 BUILD.gn delete mode 100644 CHANGELOG delete mode 100644 CMakeLists.txt delete mode 100644 COPYING delete mode 100644 FEATURES delete mode 100644 FILES delete mode 100644 README delete mode 100644 UPGRADING create mode 100644 backport-tcp-fix-sequence-number-comparison.patch create mode 100644 backport-tcp-tighten-up-checks-for-received-SYN.patch delete mode 100644 doc/FILES delete mode 100644 doc/NO_SYS_SampleCode.c delete mode 100644 doc/ZeroCopyRx.c delete mode 100644 doc/contrib.txt delete mode 100644 doc/doxygen/generate.bat delete mode 100755 doc/doxygen/generate.sh delete mode 100644 doc/doxygen/lwip.Doxyfile delete mode 100644 doc/doxygen/lwip.Doxyfile.cmake.in delete mode 100644 doc/doxygen/main_page.h delete mode 100644 doc/doxygen/output/index.html delete mode 100644 doc/mdns.txt delete mode 100644 doc/mqtt_client.txt delete mode 100644 doc/ppp.txt delete mode 100644 doc/savannah.txt create mode 100644 install.py create mode 100644 lwip-2.1.3.zip create mode 100644 lwip.spec delete mode 100644 pax_global_header delete mode 100644 src/FILES delete mode 100644 src/Filelists.cmake delete mode 100644 src/Filelists.mk delete mode 100644 src/api/api_lib.c delete mode 100644 src/api/api_msg.c delete mode 100644 src/api/err.c delete mode 100644 src/api/if_api.c delete mode 100644 src/api/netbuf.c delete mode 100644 src/api/netdb.c delete mode 100644 src/api/netifapi.c delete mode 100644 src/api/sockets.c delete mode 100644 src/api/tcpip.c delete mode 100644 src/apps/altcp_tls/altcp_tls_mbedtls.c delete mode 100644 src/apps/altcp_tls/altcp_tls_mbedtls_mem.c delete mode 100644 src/apps/altcp_tls/altcp_tls_mbedtls_mem.h delete mode 100644 src/apps/altcp_tls/altcp_tls_mbedtls_structs.h delete mode 100644 src/apps/http/altcp_proxyconnect.c delete mode 100644 src/apps/http/fs.c delete mode 100644 src/apps/http/fs/404.html delete mode 100644 src/apps/http/fs/img/sics.gif delete mode 100644 src/apps/http/fs/index.html delete mode 100644 src/apps/http/fsdata.c delete mode 100644 src/apps/http/fsdata.h delete mode 100644 src/apps/http/http_client.c delete mode 100644 src/apps/http/httpd.c delete mode 100644 src/apps/http/httpd_structs.h delete mode 100644 src/apps/http/makefsdata/makefsdata delete mode 100644 src/apps/http/makefsdata/makefsdata.c delete mode 100644 src/apps/http/makefsdata/readme.txt delete mode 100644 src/apps/http/makefsdata/tinydir.h delete mode 100644 src/apps/lwiperf/lwiperf.c delete mode 100644 src/apps/mdns/mdns.c delete mode 100644 src/apps/mqtt/mqtt.c delete mode 100644 src/apps/netbiosns/netbiosns.c delete mode 100644 src/apps/smtp/smtp.c delete mode 100644 src/apps/snmp/snmp_asn1.c delete mode 100644 src/apps/snmp/snmp_asn1.h delete mode 100644 src/apps/snmp/snmp_core.c delete mode 100644 src/apps/snmp/snmp_core_priv.h delete mode 100644 src/apps/snmp/snmp_mib2.c delete mode 100644 src/apps/snmp/snmp_mib2_icmp.c delete mode 100644 src/apps/snmp/snmp_mib2_interfaces.c delete mode 100644 src/apps/snmp/snmp_mib2_ip.c delete mode 100644 src/apps/snmp/snmp_mib2_snmp.c delete mode 100644 src/apps/snmp/snmp_mib2_system.c delete mode 100644 src/apps/snmp/snmp_mib2_tcp.c delete mode 100644 src/apps/snmp/snmp_mib2_udp.c delete mode 100644 src/apps/snmp/snmp_msg.c delete mode 100644 src/apps/snmp/snmp_msg.h delete mode 100644 src/apps/snmp/snmp_netconn.c delete mode 100644 src/apps/snmp/snmp_pbuf_stream.c delete mode 100644 src/apps/snmp/snmp_pbuf_stream.h delete mode 100644 src/apps/snmp/snmp_raw.c delete mode 100644 src/apps/snmp/snmp_scalar.c delete mode 100644 src/apps/snmp/snmp_snmpv2_framework.c delete mode 100644 src/apps/snmp/snmp_snmpv2_usm.c delete mode 100644 src/apps/snmp/snmp_table.c delete mode 100644 src/apps/snmp/snmp_threadsync.c delete mode 100644 src/apps/snmp/snmp_traps.c delete mode 100644 src/apps/snmp/snmpv3.c delete mode 100644 src/apps/snmp/snmpv3_mbedtls.c delete mode 100644 src/apps/snmp/snmpv3_priv.h delete mode 100644 src/apps/sntp/sntp.c delete mode 100644 src/apps/tftp/tftp_server.c delete mode 100644 src/core/altcp.c delete mode 100644 src/core/altcp_alloc.c delete mode 100644 src/core/altcp_tcp.c delete mode 100644 src/core/def.c delete mode 100644 src/core/distributed_net/distributed_net.c delete mode 100644 src/core/distributed_net/distributed_net_core.c delete mode 100644 src/core/distributed_net/distributed_net_utils.c delete mode 100644 src/core/distributed_net/udp_transmit.c delete mode 100644 src/core/dns.c delete mode 100644 src/core/inet_chksum.c delete mode 100644 src/core/init.c delete mode 100644 src/core/ip.c delete mode 100644 src/core/ipv4/autoip.c delete mode 100644 src/core/ipv4/dhcp.c delete mode 100644 src/core/ipv4/etharp.c delete mode 100644 src/core/ipv4/icmp.c delete mode 100644 src/core/ipv4/igmp.c delete mode 100644 src/core/ipv4/ip4.c delete mode 100644 src/core/ipv4/ip4_addr.c delete mode 100644 src/core/ipv4/ip4_frag.c delete mode 100644 src/core/ipv6/dhcp6.c delete mode 100644 src/core/ipv6/ethip6.c delete mode 100644 src/core/ipv6/icmp6.c delete mode 100644 src/core/ipv6/inet6.c delete mode 100644 src/core/ipv6/ip6.c delete mode 100644 src/core/ipv6/ip6_addr.c delete mode 100644 src/core/ipv6/ip6_frag.c delete mode 100644 src/core/ipv6/mld6.c delete mode 100644 src/core/ipv6/nd6.c delete mode 100644 src/core/lowpower.c delete mode 100644 src/core/mem.c delete mode 100644 src/core/memp.c delete mode 100644 src/core/net_group.c delete mode 100644 src/core/netif.c delete mode 100644 src/core/pbuf.c delete mode 100644 src/core/raw.c delete mode 100644 src/core/stats.c delete mode 100644 src/core/sys.c delete mode 100644 src/core/tcp.c delete mode 100644 src/core/tcp_in.c delete mode 100644 src/core/tcp_out.c delete mode 100644 src/core/timeouts.c delete mode 100644 src/core/udp.c delete mode 100644 src/include/compat/posix/arpa/inet.h delete mode 100644 src/include/compat/posix/net/if.h delete mode 100644 src/include/compat/posix/netdb.h delete mode 100644 src/include/compat/posix/sys/socket.h delete mode 100644 src/include/compat/stdc/errno.h delete mode 100644 src/include/lwip/altcp.h delete mode 100644 src/include/lwip/altcp_tcp.h delete mode 100644 src/include/lwip/altcp_tls.h delete mode 100644 src/include/lwip/api.h delete mode 100644 src/include/lwip/apps/FILES delete mode 100644 src/include/lwip/apps/altcp_proxyconnect.h delete mode 100644 src/include/lwip/apps/altcp_tls_mbedtls_opts.h delete mode 100644 src/include/lwip/apps/fs.h delete mode 100644 src/include/lwip/apps/http_client.h delete mode 100644 src/include/lwip/apps/httpd.h delete mode 100644 src/include/lwip/apps/httpd_opts.h delete mode 100644 src/include/lwip/apps/lwiperf.h delete mode 100644 src/include/lwip/apps/mdns.h delete mode 100644 src/include/lwip/apps/mdns_opts.h delete mode 100644 src/include/lwip/apps/mdns_priv.h delete mode 100644 src/include/lwip/apps/mqtt.h delete mode 100644 src/include/lwip/apps/mqtt_opts.h delete mode 100644 src/include/lwip/apps/mqtt_priv.h delete mode 100644 src/include/lwip/apps/netbiosns.h delete mode 100644 src/include/lwip/apps/netbiosns_opts.h delete mode 100644 src/include/lwip/apps/smtp.h delete mode 100644 src/include/lwip/apps/smtp_opts.h delete mode 100644 src/include/lwip/apps/snmp.h delete mode 100644 src/include/lwip/apps/snmp_core.h delete mode 100644 src/include/lwip/apps/snmp_mib2.h delete mode 100644 src/include/lwip/apps/snmp_opts.h delete mode 100644 src/include/lwip/apps/snmp_scalar.h delete mode 100644 src/include/lwip/apps/snmp_snmpv2_framework.h delete mode 100644 src/include/lwip/apps/snmp_snmpv2_usm.h delete mode 100644 src/include/lwip/apps/snmp_table.h delete mode 100644 src/include/lwip/apps/snmp_threadsync.h delete mode 100644 src/include/lwip/apps/snmpv3.h delete mode 100644 src/include/lwip/apps/sntp.h delete mode 100644 src/include/lwip/apps/sntp_opts.h delete mode 100644 src/include/lwip/apps/tftp_opts.h delete mode 100644 src/include/lwip/apps/tftp_server.h delete mode 100644 src/include/lwip/arch.h delete mode 100644 src/include/lwip/autoip.h delete mode 100644 src/include/lwip/debug.h delete mode 100644 src/include/lwip/def.h delete mode 100644 src/include/lwip/dhcp.h delete mode 100644 src/include/lwip/dhcp6.h delete mode 100644 src/include/lwip/distributed_net/distributed_net.h delete mode 100644 src/include/lwip/distributed_net/distributed_net_core.h delete mode 100644 src/include/lwip/distributed_net/distributed_net_utils.h delete mode 100644 src/include/lwip/distributed_net/udp_transmit.h delete mode 100644 src/include/lwip/dns.h delete mode 100644 src/include/lwip/err.h delete mode 100644 src/include/lwip/errno.h delete mode 100644 src/include/lwip/etharp.h delete mode 100644 src/include/lwip/ethip6.h delete mode 100644 src/include/lwip/icmp.h delete mode 100644 src/include/lwip/icmp6.h delete mode 100644 src/include/lwip/if_api.h delete mode 100644 src/include/lwip/igmp.h delete mode 100644 src/include/lwip/inet.h delete mode 100644 src/include/lwip/inet_chksum.h delete mode 100644 src/include/lwip/init.h delete mode 100644 src/include/lwip/init.h.cmake.in delete mode 100644 src/include/lwip/ip.h delete mode 100644 src/include/lwip/ip4.h delete mode 100644 src/include/lwip/ip4_addr.h delete mode 100644 src/include/lwip/ip4_frag.h delete mode 100644 src/include/lwip/ip6.h delete mode 100644 src/include/lwip/ip6_addr.h delete mode 100644 src/include/lwip/ip6_frag.h delete mode 100644 src/include/lwip/ip6_zone.h delete mode 100644 src/include/lwip/ip_addr.h delete mode 100644 src/include/lwip/lowpower.h delete mode 100644 src/include/lwip/mem.h delete mode 100644 src/include/lwip/memp.h delete mode 100644 src/include/lwip/mld6.h delete mode 100644 src/include/lwip/nd6.h delete mode 100644 src/include/lwip/net_group.h delete mode 100644 src/include/lwip/netbuf.h delete mode 100644 src/include/lwip/netdb.h delete mode 100644 src/include/lwip/netif.h delete mode 100644 src/include/lwip/netifapi.h delete mode 100644 src/include/lwip/opt.h delete mode 100644 src/include/lwip/pbuf.h delete mode 100644 src/include/lwip/priv/altcp_priv.h delete mode 100644 src/include/lwip/priv/api_msg.h delete mode 100644 src/include/lwip/priv/mem_priv.h delete mode 100644 src/include/lwip/priv/memp_priv.h delete mode 100644 src/include/lwip/priv/memp_std.h delete mode 100644 src/include/lwip/priv/nd6_priv.h delete mode 100644 src/include/lwip/priv/raw_priv.h delete mode 100644 src/include/lwip/priv/sockets_priv.h delete mode 100644 src/include/lwip/priv/tcp_priv.h delete mode 100644 src/include/lwip/priv/tcpip_priv.h delete mode 100644 src/include/lwip/prot/autoip.h delete mode 100644 src/include/lwip/prot/dhcp.h delete mode 100644 src/include/lwip/prot/dhcp6.h delete mode 100644 src/include/lwip/prot/dns.h delete mode 100644 src/include/lwip/prot/etharp.h delete mode 100644 src/include/lwip/prot/ethernet.h delete mode 100644 src/include/lwip/prot/iana.h delete mode 100644 src/include/lwip/prot/icmp.h delete mode 100644 src/include/lwip/prot/icmp6.h delete mode 100644 src/include/lwip/prot/ieee.h delete mode 100644 src/include/lwip/prot/igmp.h delete mode 100644 src/include/lwip/prot/ip.h delete mode 100644 src/include/lwip/prot/ip4.h delete mode 100644 src/include/lwip/prot/ip6.h delete mode 100644 src/include/lwip/prot/mld6.h delete mode 100644 src/include/lwip/prot/nd6.h delete mode 100644 src/include/lwip/prot/tcp.h delete mode 100644 src/include/lwip/prot/udp.h delete mode 100644 src/include/lwip/raw.h delete mode 100644 src/include/lwip/sio.h delete mode 100644 src/include/lwip/snmp.h delete mode 100644 src/include/lwip/sockets.h delete mode 100644 src/include/lwip/stats.h delete mode 100644 src/include/lwip/sys.h delete mode 100644 src/include/lwip/tcp.h delete mode 100644 src/include/lwip/tcpbase.h delete mode 100644 src/include/lwip/tcpip.h delete mode 100644 src/include/lwip/timeouts.h delete mode 100644 src/include/lwip/udp.h delete mode 100644 src/include/netif/bridgeif.h delete mode 100644 src/include/netif/bridgeif_opts.h delete mode 100644 src/include/netif/etharp.h delete mode 100644 src/include/netif/ethernet.h delete mode 100644 src/include/netif/ieee802154.h delete mode 100644 src/include/netif/lowpan6.h delete mode 100644 src/include/netif/lowpan6_ble.h delete mode 100644 src/include/netif/lowpan6_common.h delete mode 100644 src/include/netif/lowpan6_opts.h delete mode 100644 src/include/netif/ppp/ccp.h delete mode 100644 src/include/netif/ppp/chap-md5.h delete mode 100644 src/include/netif/ppp/chap-new.h delete mode 100644 src/include/netif/ppp/chap_ms.h delete mode 100644 src/include/netif/ppp/eap.h delete mode 100644 src/include/netif/ppp/ecp.h delete mode 100644 src/include/netif/ppp/eui64.h delete mode 100644 src/include/netif/ppp/fsm.h delete mode 100644 src/include/netif/ppp/ipcp.h delete mode 100644 src/include/netif/ppp/ipv6cp.h delete mode 100644 src/include/netif/ppp/lcp.h delete mode 100644 src/include/netif/ppp/magic.h delete mode 100644 src/include/netif/ppp/mppe.h delete mode 100644 src/include/netif/ppp/polarssl/arc4.h delete mode 100644 src/include/netif/ppp/polarssl/des.h delete mode 100644 src/include/netif/ppp/polarssl/md4.h delete mode 100644 src/include/netif/ppp/polarssl/md5.h delete mode 100644 src/include/netif/ppp/polarssl/sha1.h delete mode 100644 src/include/netif/ppp/ppp.h delete mode 100644 src/include/netif/ppp/ppp_impl.h delete mode 100644 src/include/netif/ppp/ppp_opts.h delete mode 100644 src/include/netif/ppp/pppapi.h delete mode 100644 src/include/netif/ppp/pppcrypt.h delete mode 100644 src/include/netif/ppp/pppdebug.h delete mode 100644 src/include/netif/ppp/pppoe.h delete mode 100644 src/include/netif/ppp/pppol2tp.h delete mode 100644 src/include/netif/ppp/pppos.h delete mode 100644 src/include/netif/ppp/upap.h delete mode 100644 src/include/netif/ppp/vj.h delete mode 100644 src/include/netif/slipif.h delete mode 100644 src/include/netif/zepif.h delete mode 100644 src/netif/FILES delete mode 100644 src/netif/bridgeif.c delete mode 100644 src/netif/bridgeif_fdb.c delete mode 100644 src/netif/ethernet.c delete mode 100644 src/netif/lowpan6.c delete mode 100644 src/netif/lowpan6_ble.c delete mode 100644 src/netif/lowpan6_common.c delete mode 100644 src/netif/ppp/PPPD_FOLLOWUP delete mode 100644 src/netif/ppp/auth.c delete mode 100644 src/netif/ppp/ccp.c delete mode 100644 src/netif/ppp/chap-md5.c delete mode 100644 src/netif/ppp/chap-new.c delete mode 100644 src/netif/ppp/chap_ms.c delete mode 100644 src/netif/ppp/demand.c delete mode 100644 src/netif/ppp/eap.c delete mode 100644 src/netif/ppp/ecp.c delete mode 100644 src/netif/ppp/eui64.c delete mode 100644 src/netif/ppp/fsm.c delete mode 100644 src/netif/ppp/ipcp.c delete mode 100644 src/netif/ppp/ipv6cp.c delete mode 100644 src/netif/ppp/lcp.c delete mode 100644 src/netif/ppp/magic.c delete mode 100644 src/netif/ppp/mppe.c delete mode 100644 src/netif/ppp/multilink.c delete mode 100644 src/netif/ppp/polarssl/README delete mode 100644 src/netif/ppp/polarssl/arc4.c delete mode 100644 src/netif/ppp/polarssl/des.c delete mode 100644 src/netif/ppp/polarssl/md4.c delete mode 100644 src/netif/ppp/polarssl/md5.c delete mode 100644 src/netif/ppp/polarssl/sha1.c delete mode 100644 src/netif/ppp/ppp.c delete mode 100644 src/netif/ppp/pppapi.c delete mode 100644 src/netif/ppp/pppcrypt.c delete mode 100644 src/netif/ppp/pppoe.c delete mode 100644 src/netif/ppp/pppol2tp.c delete mode 100644 src/netif/ppp/pppos.c delete mode 100644 src/netif/ppp/upap.c delete mode 100644 src/netif/ppp/utils.c delete mode 100644 src/netif/ppp/vj.c delete mode 100644 src/netif/slipif.c delete mode 100644 src/netif/zepif.c delete mode 100644 test/fuzz/Makefile delete mode 100644 test/fuzz/README delete mode 100644 test/fuzz/config.h delete mode 100644 test/fuzz/fuzz.c delete mode 100644 test/fuzz/inputs/arp/arp_req.bin delete mode 100644 test/fuzz/inputs/icmp/icmp_ping.bin delete mode 100644 test/fuzz/inputs/ipv6/neighbor_solicitation.bin delete mode 100644 test/fuzz/inputs/ipv6/router_adv.bin delete mode 100644 test/fuzz/inputs/tcp/tcp_syn.bin delete mode 100644 test/fuzz/inputs/udp/udp_port_5000.bin delete mode 100644 test/fuzz/lwipopts.h delete mode 100644 test/fuzz/output_to_pcap.sh delete mode 100644 test/sockets/sockets_stresstest.c delete mode 100644 test/sockets/sockets_stresstest.h delete mode 100644 test/unit/Filelists.cmake delete mode 100644 test/unit/Filelists.mk delete mode 100644 test/unit/api/test_sockets.c delete mode 100644 test/unit/api/test_sockets.h delete mode 100644 test/unit/arch/sys_arch.c delete mode 100644 test/unit/arch/sys_arch.h delete mode 100644 test/unit/core/test_def.c delete mode 100644 test/unit/core/test_def.h delete mode 100644 test/unit/core/test_mem.c delete mode 100644 test/unit/core/test_mem.h delete mode 100644 test/unit/core/test_netif.c delete mode 100644 test/unit/core/test_netif.h delete mode 100644 test/unit/core/test_pbuf.c delete mode 100644 test/unit/core/test_pbuf.h delete mode 100644 test/unit/core/test_timers.c delete mode 100644 test/unit/core/test_timers.h delete mode 100644 test/unit/dhcp/test_dhcp.c delete mode 100644 test/unit/dhcp/test_dhcp.h delete mode 100644 test/unit/etharp/test_etharp.c delete mode 100644 test/unit/etharp/test_etharp.h delete mode 100644 test/unit/ip4/test_ip4.c delete mode 100644 test/unit/ip4/test_ip4.h delete mode 100644 test/unit/ip6/test_ip6.c delete mode 100644 test/unit/ip6/test_ip6.h delete mode 100644 test/unit/lwip_check.h delete mode 100644 test/unit/lwip_unittests.c delete mode 100644 test/unit/lwipopts.h delete mode 100644 test/unit/mdns/test_mdns.c delete mode 100644 test/unit/mdns/test_mdns.h delete mode 100644 test/unit/mqtt/test_mqtt.c delete mode 100644 test/unit/mqtt/test_mqtt.h delete mode 100644 test/unit/tcp/tcp_helper.c delete mode 100644 test/unit/tcp/tcp_helper.h delete mode 100644 test/unit/tcp/test_tcp.c delete mode 100644 test/unit/tcp/test_tcp.h delete mode 100644 test/unit/tcp/test_tcp_oos.c delete mode 100644 test/unit/tcp/test_tcp_oos.h delete mode 100644 test/unit/udp/test_udp.c delete mode 100644 test/unit/udp/test_udp.h diff --git a/0001-add-makefile.patch b/0001-add-makefile.patch new file mode 100644 index 0000000..9f48bdf --- /dev/null +++ b/0001-add-makefile.patch @@ -0,0 +1,234 @@ +From 777db45e3ae9c17abf397daf79a129ad5ed1e0cf Mon Sep 17 00:00:00 2001 +From: peanut_huang +Date: Mon, 30 Nov 2020 06:53:46 +0000 +Subject: [PATCH] add makefile + +Signed-off-by: peanut_huang +--- + src/Makefile | 60 ++++++++++++++++++++++++++++ + src/api/dir.mk | 3 ++ + src/core/dir.mk | 6 +++ + src/include/arch/cc.h | 7 ++++ + src/include/arch/sys_arch.h | 7 ++++ + src/include/lwipopts.h | 80 +++++++++++++++++++++++++++++++++++++ + src/netif/dir.mk | 3 ++ + 7 files changed, 166 insertions(+) + create mode 100644 src/Makefile + create mode 100644 src/api/dir.mk + create mode 100644 src/core/dir.mk + create mode 100644 src/include/arch/cc.h + create mode 100644 src/include/arch/sys_arch.h + create mode 100644 src/include/lwipopts.h + create mode 100644 src/netif/dir.mk + +diff --git a/src/Makefile b/src/Makefile +new file mode 100644 +index 0000000..3ecf8d2 +--- /dev/null ++++ b/src/Makefile +@@ -0,0 +1,60 @@ ++LWIP_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) ++ROOT_DIR := $(dir $(abspath $(LWIP_DIR))) ++ ++LWIP_INC = $(LWIP_DIR)/include ++#DPDK_INCLUDE_FILE ?= /usr/include/dpdk ++ ++SEC_FLAGS = -fstack-protector-strong -Werror -Wall -Wl,-z,relro,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIC ++ ++CC = gcc ++AR = ar ++OPTIMIZATION = -O3 ++INC = -I$(LWIP_DIR) \ ++ -I$(LWIP_INC) ++ ++CFLAGS = -g $(OPTIMIZATION) $(INC) $(SEC_FLAGS) ++ARFLAGS = crDP ++ ++ifeq ($(shell $(CC) -dumpmachine | cut -d"-" -f1), x86_64) ++ CFLAGS += -mssse3 ++endif ++ ++SRCS = ++DIRS = api core netif ++ ++define register_dir ++SRCS += $(patsubst %, $(1)/%, $(2)) ++endef ++ ++include $(patsubst %, %/dir.mk, $(DIRS)) ++ ++OBJS = $(subst .c,.o,$(SRCS)) ++TMPS := $(subst .c,.s,$(SRCS)) ++TMPS += $(subst .c,.i,$(SRCS)) ++ ++LWIP_LIB = liblwip.a ++ ++INSTALL_LIB = $(DESTDIR)/usr/lib64 ++INSTALL_INC = $(DESTDIR)/usr/include/lwip ++ ++.PHONY: all ++all: $(LWIP_LIB) ++ ++.depend: $(SRCS) ++ rm -f ./.depend ++ $(foreach SRC,$(SRCS),$(CC) $(CFLAGS) -MM -MT $(SRC:.c=.o) $(SRC) >> .depend;) ++ ++-include .depend ++ ++$(LWIP_LIB): $(OBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) ++ ++.PHONY: install ++install: ++ install -dp $(INSTALL_LIB) $(INSTALL_INC) ++ install -Dp $(LWIP_DIR)/$(LWIP_LIB) $(INSTALL_LIB) ++ cp -pr $(LWIP_INC)/* $(INSTALL_INC)/ ++ ++.PHONY: clean ++clean: ++ $(RM) $(LWIP_LIB) $(OBJS) $(TMPS) .depend +diff --git a/src/api/dir.mk b/src/api/dir.mk +new file mode 100644 +index 0000000..72142ab +--- /dev/null ++++ b/src/api/dir.mk +@@ -0,0 +1,3 @@ ++SRC = api_lib.c api_msg.c err.c netbuf.c netdb.c netifapi.c sockets.c tcpip.c ++ ++$(eval $(call register_dir, api, $(SRC))) +diff --git a/src/core/dir.mk b/src/core/dir.mk +new file mode 100644 +index 0000000..e5a055b +--- /dev/null ++++ b/src/core/dir.mk +@@ -0,0 +1,6 @@ ++SRC = inet_chksum.c init.c ip.c mem.c memp.c netif.c pbuf.c \ ++ raw.c stats.c tcp.c tcp_in.c tcp_out.c timeouts.c udp.c \ ++ ipv4/etharp.c ipv4/icmp.c ipv4/ip4_addr.c ipv4/ip4.c \ ++ ipv4/ip4_frag.c ++ ++$(eval $(call register_dir, core, $(SRC))) +diff --git a/src/include/arch/cc.h b/src/include/arch/cc.h +new file mode 100644 +index 0000000..52b76f9 +--- /dev/null ++++ b/src/include/arch/cc.h +@@ -0,0 +1,7 @@ ++#ifndef LWIP_CC_H ++#define LWIP_CC_H ++ ++ ++ ++#endif /* LWIP_CC_H */ ++ +diff --git a/src/include/arch/sys_arch.h b/src/include/arch/sys_arch.h +new file mode 100644 +index 0000000..3f555ee +--- /dev/null ++++ b/src/include/arch/sys_arch.h +@@ -0,0 +1,7 @@ ++#ifndef LWIP_SYS_ARCH_H ++#define LWIP_SYS_ARCH_H ++ ++ ++ ++#endif /* LWIP_SYS_ARCH_H */ ++ +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +new file mode 100644 +index 0000000..4ab26f2 +--- /dev/null ++++ b/src/include/lwipopts.h +@@ -0,0 +1,80 @@ ++/* ++ * Copyright (c) 2001-2003 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: Simon Goldschmidt ++ * ++ */ ++#ifndef LWIP_HDR_LWIPOPTS_H__ ++#define LWIP_HDR_LWIPOPTS_H__ ++ ++/* Prevent having to link sys_arch.c (we don't test the API layers in unit tests) */ ++#define NO_SYS 1 ++#define LWIP_NETCONN 0 ++#define LWIP_SOCKET 0 ++#define SYS_LIGHTWEIGHT_PROT 0 ++ ++#define LWIP_IPV6 1 ++#define IPV6_FRAG_COPYHEADER 1 ++#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 0 ++ ++/* Enable some protocols to test them */ ++#define LWIP_DHCP 1 ++#define LWIP_AUTOIP 1 ++ ++#define LWIP_IGMP 1 ++#define LWIP_DNS 1 ++ ++#define LWIP_ALTCP 1 ++ ++/* Turn off checksum verification of fuzzed data */ ++#define CHECKSUM_CHECK_IP 0 ++#define CHECKSUM_CHECK_UDP 0 ++#define CHECKSUM_CHECK_TCP 0 ++#define CHECKSUM_CHECK_ICMP 0 ++#define CHECKSUM_CHECK_ICMP6 0 ++ ++/* Minimal changes to opt.h required for tcp unit tests: */ ++#define MEM_SIZE 16000 ++#define TCP_SND_QUEUELEN 40 ++#define MEMP_NUM_TCP_SEG TCP_SND_QUEUELEN ++#define TCP_OVERSIZE 1 ++#define TCP_SND_BUF (12 * TCP_MSS) ++#define TCP_WND (10 * TCP_MSS) ++#define LWIP_WND_SCALE 1 ++#define TCP_RCV_SCALE 2 ++#define PBUF_POOL_SIZE 400 /* pbuf tests need ~200KByte */ ++ ++/* Minimal changes to opt.h required for etharp unit tests: */ ++#define ETHARP_SUPPORT_STATIC_ENTRIES 1 ++ ++#define LWIP_NUM_NETIF_CLIENT_DATA 1 ++#define LWIP_SNMP 1 ++#define MIB2_STATS 1 ++#define LWIP_MDNS_RESPONDER 1 ++ ++#endif /* LWIP_HDR_LWIPOPTS_H__ */ +diff --git a/src/netif/dir.mk b/src/netif/dir.mk +new file mode 100644 +index 0000000..233c79a +--- /dev/null ++++ b/src/netif/dir.mk +@@ -0,0 +1,3 @@ ++SRC = ethernet.c ++ ++$(eval $(call register_dir, netif, $(SRC))) +-- +2.23.0 + diff --git a/0002-adapt-lstack.patch b/0002-adapt-lstack.patch new file mode 100644 index 0000000..87f36cd --- /dev/null +++ b/0002-adapt-lstack.patch @@ -0,0 +1,5569 @@ +From 388525230f809bfa61fe31921b54ebfb6aae57ec Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Fri, 31 Dec 2021 17:32:49 +0800 +Subject: [PATCH] adapt lstack + +--- + src/Makefile | 5 +- + src/api/api_lib.c | 2 + + src/api/api_msg.c | 46 +++ + src/api/dir.mk | 2 +- + src/api/perf.c | 182 ++++++++++++ + src/api/posix_api.c | 156 ++++++++++ + src/api/sockets.c | 558 ++++++++++++++++++++++++++++++++++- + src/api/sys_arch.c | 379 ++++++++++++++++++++++++ + src/api/tcpip.c | 34 ++- + src/core/dir.mk | 8 +- + src/core/init.c | 4 +- + src/core/ip.c | 2 +- + src/core/ipv4/ip4.c | 14 + + src/core/ipv6/ip6.c | 10 + + src/core/mem.c | 6 +- + src/core/memp.c | 4 + + src/core/netif.c | 8 +- + src/core/pbuf.c | 4 + + src/core/stats.c | 13 +- + src/core/tcp.c | 196 +++++++++++- + src/core/tcp_in.c | 101 ++++++- + src/core/tcp_out.c | 25 +- + src/core/timeouts.c | 18 +- + src/core/udp.c | 15 + + src/include/arch/cc.h | 80 ++++- + src/include/arch/perf.h | 155 ++++++++++ + src/include/arch/sys_arch.h | 92 +++++- + src/include/eventpoll.h | 72 +++++ + src/include/hlist.h | 233 +++++++++++++++ + src/include/list.h | 110 +++++++ + src/include/lwip/api.h | 35 +++ + src/include/lwip/debug.h | 1 + + src/include/lwip/def.h | 15 + + src/include/lwip/ip.h | 8 +- + src/include/lwip/memp.h | 17 ++ + src/include/lwip/netif.h | 4 +- + src/include/lwip/opt.h | 62 +++- + src/include/lwip/priv/memp_std.h | 7 + + src/include/lwip/priv/sockets_priv.h | 49 +-- + src/include/lwip/priv/tcp_priv.h | 162 +++++++++- + src/include/lwip/prot/ip4.h | 15 + + src/include/lwip/sockets.h | 67 ++++- + src/include/lwip/stats.h | 4 +- + src/include/lwip/tcp.h | 94 +++++- + src/include/lwip/tcpip.h | 2 +- + src/include/lwip/timeouts.h | 4 + + src/include/lwiplog.h | 81 +++++ + src/include/lwipopts.h | 253 ++++++++++++---- + src/include/lwipsock.h | 155 ++++++++++ + src/include/memp_def.h | 66 +++++ + src/include/posix_api.h | 88 ++++++ + src/include/reg_sock.h | 62 ++++ + src/netif/dir.mk | 2 +- + 53 files changed, 3581 insertions(+), 206 deletions(-) + create mode 100644 src/api/perf.c + create mode 100644 src/api/posix_api.c + create mode 100644 src/api/sys_arch.c + create mode 100644 src/include/arch/perf.h + create mode 100644 src/include/eventpoll.h + create mode 100644 src/include/hlist.h + create mode 100644 src/include/list.h + create mode 100644 src/include/lwiplog.h + create mode 100644 src/include/lwipsock.h + create mode 100644 src/include/memp_def.h + create mode 100644 src/include/posix_api.h + create mode 100644 src/include/reg_sock.h + +diff --git a/src/Makefile b/src/Makefile +index 3ecf8d2..1676a71 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2,7 +2,7 @@ LWIP_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) + ROOT_DIR := $(dir $(abspath $(LWIP_DIR))) + + LWIP_INC = $(LWIP_DIR)/include +-#DPDK_INCLUDE_FILE ?= /usr/include/dpdk ++DPDK_INCLUDE_FILE ?= /usr/include/dpdk + + SEC_FLAGS = -fstack-protector-strong -Werror -Wall -Wl,-z,relro,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIC + +@@ -10,7 +10,8 @@ CC = gcc + AR = ar + OPTIMIZATION = -O3 + INC = -I$(LWIP_DIR) \ +- -I$(LWIP_INC) ++ -I$(LWIP_INC) \ ++ -I$(DPDK_INCLUDE_FILE) + + CFLAGS = -g $(OPTIMIZATION) $(INC) $(SEC_FLAGS) + ARFLAGS = crDP +diff --git a/src/api/api_lib.c b/src/api/api_lib.c +index ffa14d6..ba9f3c5 100644 +--- a/src/api/api_lib.c ++++ b/src/api/api_lib.c +@@ -1061,7 +1061,9 @@ netconn_write_vectors_partly(struct netconn *conn, struct netvector *vectors, u1 + /* For locking the core: this _can_ be delayed on low memory/low send buffer, + but if it is, this is done inside api_msg.c:do_write(), so we can use the + non-blocking version here. */ ++ PERF_START(PERF_LAYER_TCP, PERF_POINT_TCP_DATA_SEND); + err = netconn_apimsg(lwip_netconn_do_write, &API_MSG_VAR_REF(msg)); ++ PERF_STOP_INCREASE_COUNT("lwip_netconn_do_write", PERF_LAYER_TCP); + if (err == ERR_OK) { + if (bytes_written != NULL) { + *bytes_written = API_MSG_VAR_REF(msg).msg.w.offset; +diff --git a/src/api/api_msg.c b/src/api/api_msg.c +index 3f08e03..d5a738f 100644 +--- a/src/api/api_msg.c ++++ b/src/api/api_msg.c +@@ -54,6 +54,11 @@ + #include "lwip/mld6.h" + #include "lwip/priv/tcpip_priv.h" + ++#if USE_LIBOS ++#include "lwip/sockets.h" ++#include "lwipsock.h" ++#endif ++ + #include + + /* netconns are polled once per second (e.g. continue write on memory error) */ +@@ -452,6 +457,14 @@ err_tcp(void *arg, err_t err) + old_state = conn->state; + conn->state = NETCONN_NONE; + ++#if USE_LIBOS ++ if (CONN_TYPE_IS_HOST(conn)) { ++ LWIP_DEBUGF(API_MSG_DEBUG, ++ ("linux localhost connection already success, ignore lwip err_tcp fd=%d\n", conn->socket)); ++ return; ++ } ++#endif /* USE_LIBOS */ ++ + SYS_ARCH_UNPROTECT(lev); + + /* Notify the user layer about a connection error. Used to signal select. */ +@@ -595,6 +608,10 @@ accept_function(void *arg, struct tcp_pcb *newpcb, err_t err) + API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0); + } + ++#if USE_LIBOS ++ LWIP_DEBUGF(API_MSG_DEBUG, ("libos incoming connection established\n")); ++ SET_CONN_TYPE_LIBOS(newconn); ++#endif + return ERR_OK; + } + #endif /* LWIP_TCP */ +@@ -1315,6 +1332,31 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err) + return ERR_VAL; + } + ++#if USE_LIBOS ++ if (CONN_TYPE_IS_HOST(conn)) { ++ LWIP_DEBUGF(API_MSG_DEBUG, ++ ("libos outgoing connection abort fd=%d\n", conn->socket)); ++ return ERR_ABRT; ++ } ++ ++ LWIP_DEBUGF(API_MSG_DEBUG, ("libos outgoing connection established\n")); ++ if (CONN_TYPE_HAS_INPRG(conn) && CONN_TYPE_HAS_HOST(conn)) { ++ int s = conn->socket; ++ struct lwip_sock *sock = get_socket_without_errno(s); ++ ++ if (!!sock && !!sock->epoll_data) { ++ struct epoll_event ee = {0}; ++ ee.data.fd = s; ++ ee.events |= EPOLLIN | EPOLLOUT | EPOLLERR; ++ posix_api->epoll_ctl_fn(sock->epoll_data->fd, EPOLL_CTL_DEL, s, &ee); ++ posix_api->shutdown_fn(s, SHUT_RDWR); ++ LWIP_DEBUGF(API_MSG_DEBUG, ++ ("linux outgoing connection abort fd=%d\n", s)); ++ } ++ } ++ SET_CONN_TYPE_LIBOS(conn); ++#endif ++ + LWIP_ASSERT("conn->state == NETCONN_CONNECT", conn->state == NETCONN_CONNECT); + LWIP_ASSERT("(conn->current_msg != NULL) || conn->in_non_blocking_connect", + (conn->current_msg != NULL) || IN_NONBLOCKING_CONNECT(conn)); +@@ -1338,6 +1380,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err) + if (was_blocking) { + sys_sem_signal(op_completed_sem); + } ++ + return ERR_OK; + } + #endif /* LWIP_TCP */ +@@ -1372,6 +1415,7 @@ lwip_netconn_do_connect(void *m) + #endif /* LWIP_UDP */ + #if LWIP_TCP + case NETCONN_TCP: ++ PERF_START(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_SEND); + /* Prevent connect while doing any other action. */ + if (msg->conn->state == NETCONN_CONNECT) { + err = ERR_ALREADY; +@@ -1389,6 +1433,7 @@ lwip_netconn_do_connect(void *m) + err = ERR_INPROGRESS; + } else { + msg->conn->current_msg = msg; ++ PERF_STOP_INCREASE_COUNT("lwip_netconn_do_connect", PERF_LAYER_TCP); + /* sys_sem_signal() is called from lwip_netconn_do_connected (or err_tcp()), + when the connection is established! */ + #if LWIP_TCPIP_CORE_LOCKING +@@ -1402,6 +1447,7 @@ lwip_netconn_do_connect(void *m) + } + } + } ++ PERF_STOP_INCREASE_COUNT("lwip_netconn_do_connect", PERF_LAYER_TCP); + break; + #endif /* LWIP_TCP */ + default: +diff --git a/src/api/dir.mk b/src/api/dir.mk +index 72142ab..afbf863 100644 +--- a/src/api/dir.mk ++++ b/src/api/dir.mk +@@ -1,3 +1,3 @@ +-SRC = api_lib.c api_msg.c err.c netbuf.c netdb.c netifapi.c sockets.c tcpip.c ++SRC = api_lib.c api_msg.c err.c netbuf.c netdb.c netifapi.c sockets.c tcpip.c perf.c posix_api.c sys_arch.c + + $(eval $(call register_dir, api, $(SRC))) +diff --git a/src/api/perf.c b/src/api/perf.c +new file mode 100644 +index 0000000..1c2a273 +--- /dev/null ++++ b/src/api/perf.c +@@ -0,0 +1,182 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#include "arch/perf.h" ++ ++#include ++ ++#include ++ ++#if LWIP_RECORD_PERF ++ ++#define SIG_FUNC_NUM 3 ++ ++#define SIG_STATS_DISPLAY 38 ++#define SIG_PERF_BEGIN 39 ++#define SIG_PERF_END 40 ++ ++typedef void (*pSignalFunc) (int); ++static void signal_stats_display(int s); ++static void signal_perf_begin(int s); ++static void signal_perf_end(int s); ++ ++uint32_t g_record_perf; ++__thread uint64_t g_timeTaken[PERF_POINT_END]; ++__thread int g_perfPoint[PERF_LAYER_END]; ++__thread struct timespec tvStart[PERF_LAYER_END]; ++volatile uint64_t g_perfMaxtime[PERF_POINT_END]; ++volatile uint64_t g_astPacketCnt[PERF_POINT_END]; ++volatile uint64_t g_astPacketProcTime[PERF_POINT_END]; ++ ++char *g_ppLayerName[PERF_POINT_END] = { ++ "IP_RECV", ++ "TCP_DATA_RECV", ++ "UDP_PARTIAL", ++ "TCP_SYN_RECV", ++ "TCP_SYN_ACK_SEND", ++ "TCP_ACK_RECV", ++ "TCP_SYN_SEND", ++ "TCP_SYN_ACK_RECV", ++ "TCP_ACK_SEND", ++ "TCP_DATA_SEND", ++ "IP_SEND" ++}; ++ ++static int gsig_arr[SIG_FUNC_NUM] = { ++ SIG_STATS_DISPLAY, ++ SIG_PERF_BEGIN, ++ SIG_PERF_END ++}; ++ ++static pSignalFunc g_Funcs[SIG_FUNC_NUM] = { ++ signal_stats_display, ++ signal_perf_begin, ++ signal_perf_end, ++}; ++ ++static void print_perf_data_and_reset() ++{ ++ int i; ++ printf("\n********* PERF DATA START*************\n"); ++ for (i = 0; i < PERF_POINT_END; i++) { ++ printf("%-20s Total: PacketProcTime: %-15"PRIu64", Maxtime: %-15"PRIu64", packetCnt: %-15"PRIu64"\n", ++ g_ppLayerName[i], __sync_fetch_and_or(&g_astPacketProcTime[i], 0), ++ __sync_fetch_and_or(&g_perfMaxtime[i], 0), ++ __sync_fetch_and_or(&g_astPacketCnt[i], 0)); ++ ++ if (__sync_fetch_and_or(&g_astPacketProcTime[i], 0) && __sync_fetch_and_or(&g_astPacketCnt[i], 0)) { ++ printf("%-20s Average: PacketProcTime: %-15lf, MaxTime: %-15"PRIu64"\n", g_ppLayerName[i], ++ (double)__sync_fetch_and_or(&g_astPacketProcTime[i], 0) / (double)__sync_fetch_and_or(&g_astPacketCnt[i], 0), ++ __sync_or_and_fetch(&g_perfMaxtime[i], 0)); ++ } ++ ++ __sync_fetch_and_and (&g_astPacketProcTime[i], 0); ++ __sync_fetch_and_and (&g_astPacketCnt[i], 0); ++ __sync_fetch_and_and (&g_perfMaxtime[i], 0); ++ } ++ printf("\n********* PERF DATA END*************\n"); ++} ++ ++static void signal_stats_display(int s) ++{ ++ struct sigaction s_test; ++ printf("Received signal %d, stats display.\n", s); ++ stats_display(); ++ s_test.sa_handler = (void *) signal_stats_display; ++ if (sigemptyset(&s_test.sa_mask) != 0) { ++ printf("sigemptyset failed.\n"); ++ } ++ s_test.sa_flags = SA_RESETHAND; ++ if (sigaction(s, &s_test, NULL) != 0) { ++ printf("Could not register %d signal handler.\n", s); ++ } ++} ++ ++static void signal_perf_begin(int s) ++{ ++ struct sigaction s_test; ++ printf("Received signal %d, perf_begin.\n", s); ++ g_record_perf = 1; ++ s_test.sa_handler = (void *) signal_perf_begin; ++ if (sigemptyset(&s_test.sa_mask) != 0) { ++ printf("sigemptyset failed.\n"); ++ } ++ s_test.sa_flags = SA_RESETHAND; ++ if (sigaction(s, &s_test, NULL) != 0) { ++ printf("Could not register %d signal handler.\n", s); ++ } ++} ++ ++static void signal_perf_end(int s) ++{ ++ struct sigaction s_test; ++ printf("Received signal %d, perf_end\n", s); ++ g_record_perf = 0; ++ print_perf_data_and_reset(); ++ s_test.sa_handler = (void *) signal_perf_end; ++ if (sigemptyset(&s_test.sa_mask) != 0) { ++ printf("sigemptyset failed.\n"); ++ } ++ s_test.sa_flags = SA_RESETHAND; ++ if (sigaction(s, &s_test, NULL) != 0) { ++ printf("Could not register %d signal handler.\n", s); ++ } ++} ++ ++int check_layer_point(int layer, int point) ++{ ++ if (point == g_perfPoint[layer]) { ++ return 1; ++ } ++ return 0; ++} ++ ++int perf_init(void) ++{ ++ int i; ++ struct sigaction s_test; ++ for (i = 0; i < SIG_FUNC_NUM; i++) { ++ s_test.sa_handler = (void *) g_Funcs[i]; ++ if (sigemptyset(&s_test.sa_mask) != 0) { ++ printf("sigemptyset failed.\n"); ++ return 1; ++ } ++ ++ s_test.sa_flags = SA_RESETHAND; ++ if (sigaction(gsig_arr[i], &s_test, NULL) != 0) { ++ printf("Could not register %d signal handler.\n", gsig_arr[i]); ++ return 1; ++ } ++ } ++ return 0; ++} ++#endif +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +new file mode 100644 +index 0000000..a917cea +--- /dev/null ++++ b/src/api/posix_api.c +@@ -0,0 +1,156 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "lwip/err.h" ++#include "lwipsock.h" ++ ++posix_api_t *posix_api; ++posix_api_t posix_api_val; ++ ++static int chld_is_epfd(int fd) ++{ ++ return 0; ++} ++ ++static struct lwip_sock *chld_get_socket(int fd) ++{ ++ return NULL; ++} ++ ++void posix_api_fork(void) ++{ ++ /* lstack helper api */ ++ posix_api->is_chld = 1; ++ posix_api->is_epfd = chld_is_epfd; ++ posix_api->get_socket = chld_get_socket; ++} ++ ++static int chose_dlsym_handle(void *__restrict* khandle) ++{ ++ void *dlhandle; ++ int (*gazelle_epoll_create)(int size); ++ dlhandle = dlopen ("liblstack.so", RTLD_LAZY); ++ if (dlhandle == NULL) { ++ return ERR_IF; ++ } ++ ++ gazelle_epoll_create = dlsym(dlhandle, "epoll_create"); ++ if (gazelle_epoll_create == NULL) { ++ return ERR_MEM; ++ } ++ ++ dlclose(dlhandle); ++ ++ *khandle = RTLD_NEXT; ++ if (dlsym(*khandle, "epoll_create") == gazelle_epoll_create) { ++ RTE_LOG(ERR, EAL, "posix api use RTLD_DEFAULT\n"); ++ *khandle = RTLD_DEFAULT; ++ } else { ++ RTE_LOG(ERR, EAL, "posix api use RTLD_NEXT\n"); ++ } ++ ++ return ERR_OK; ++} ++ ++int posix_api_init(void) ++{ ++/* the symbol we use here won't be NULL, so we don't need dlerror() ++ to test error */ ++#define CHECK_DLSYM_RET_RETURN(ret) do { \ ++ if ((ret) == NULL) \ ++ goto err_out; \ ++ } while (0) ++ ++ posix_api = &posix_api_val; ++ ++ void *__restrict handle; ++ int ret = chose_dlsym_handle(&handle); ++ if (ret != ERR_OK) { ++ return ret; ++ } ++ ++ /* glibc standard api */ ++ CHECK_DLSYM_RET_RETURN(posix_api->socket_fn = dlsym(handle, "socket")); ++ CHECK_DLSYM_RET_RETURN(posix_api->accept_fn = dlsym(handle, "accept")); ++ CHECK_DLSYM_RET_RETURN(posix_api->accept4_fn = dlsym(handle, "accept4")); ++ CHECK_DLSYM_RET_RETURN(posix_api->bind_fn = dlsym(handle, "bind")); ++ CHECK_DLSYM_RET_RETURN(posix_api->listen_fn = dlsym(handle, "listen")); ++ CHECK_DLSYM_RET_RETURN(posix_api->connect_fn = dlsym(handle, "connect")); ++ CHECK_DLSYM_RET_RETURN(posix_api->setsockopt_fn = dlsym(handle, "setsockopt")); ++ CHECK_DLSYM_RET_RETURN(posix_api->getsockopt_fn = dlsym(handle, "getsockopt")); ++ CHECK_DLSYM_RET_RETURN(posix_api->getpeername_fn = dlsym(handle, "getpeername")); ++ CHECK_DLSYM_RET_RETURN(posix_api->getsockname_fn = dlsym(handle, "getsockname")); ++ CHECK_DLSYM_RET_RETURN(posix_api->shutdown_fn = dlsym(handle, "shutdown")); ++ CHECK_DLSYM_RET_RETURN(posix_api->close_fn = dlsym(handle, "close")); ++ CHECK_DLSYM_RET_RETURN(posix_api->read_fn = dlsym(handle, "read")); ++ CHECK_DLSYM_RET_RETURN(posix_api->write_fn = dlsym(handle, "write")); ++ CHECK_DLSYM_RET_RETURN(posix_api->recv_fn = dlsym(handle, "recv")); ++ CHECK_DLSYM_RET_RETURN(posix_api->send_fn = dlsym(handle, "send")); ++ CHECK_DLSYM_RET_RETURN(posix_api->recv_msg = dlsym(handle, "recvmsg")); ++ CHECK_DLSYM_RET_RETURN(posix_api->send_msg = dlsym(handle, "sendmsg")); ++ CHECK_DLSYM_RET_RETURN(posix_api->recv_from = dlsym(handle, "recvfrom")); ++ CHECK_DLSYM_RET_RETURN(posix_api->send_to = dlsym(handle, "sendto")); ++ CHECK_DLSYM_RET_RETURN(posix_api->fcntl_fn = dlsym(handle, "fcntl")); ++ CHECK_DLSYM_RET_RETURN(posix_api->fcntl64_fn = dlsym(handle, "fcntl64")); ++ CHECK_DLSYM_RET_RETURN(posix_api->pipe_fn = dlsym(handle, "pipe")); ++ CHECK_DLSYM_RET_RETURN(posix_api->epoll_create_fn = dlsym(handle, "epoll_create")); ++ CHECK_DLSYM_RET_RETURN(posix_api->epoll_ctl_fn = dlsym(handle, "epoll_ctl")); ++ CHECK_DLSYM_RET_RETURN(posix_api->epoll_wait_fn = dlsym(handle, "epoll_wait")); ++ CHECK_DLSYM_RET_RETURN(posix_api->fork_fn = dlsym(handle, "fork")); ++ CHECK_DLSYM_RET_RETURN(posix_api->eventfd_fn = dlsym(handle, "eventfd")); ++ CHECK_DLSYM_RET_RETURN(posix_api->sigaction_fn = dlsym(handle, "sigaction")); ++ CHECK_DLSYM_RET_RETURN(posix_api->poll_fn = dlsym(handle, "poll")); ++ CHECK_DLSYM_RET_RETURN(posix_api->ioctl_fn = dlsym(handle, "ioctl")); ++ ++ /* lstack helper api */ ++ posix_api->get_socket = get_socket; ++ posix_api->is_epfd = lwip_is_epfd; ++ posix_api->epoll_close_fn = lwip_epoll_close; ++ ++ /* support fork */ ++ posix_api->is_chld = 0; ++ return ERR_OK; ++ ++err_out: ++ return ERR_MEM; ++#undef CHECK_DLSYM_RET_RETURN ++} +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 7852635..3262c1b 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -62,6 +62,11 @@ + #include + #endif + ++#if USE_LIBOS ++#include ++#include "lwipsock.h" ++#endif ++ + #include + + #ifdef LWIP_HOOK_FILENAME +@@ -85,13 +90,29 @@ + #define API_SELECT_CB_VAR_ALLOC(name, retblock) API_VAR_ALLOC_EXT(struct lwip_select_cb, MEMP_SELECT_CB, name, retblock) + #define API_SELECT_CB_VAR_FREE(name) API_VAR_FREE(MEMP_SELECT_CB, name) + ++#if USE_LIBOS ++enum KERNEL_LWIP_PATH { ++ PATH_KERNEL = 0, ++ PATH_LWIP, ++ PATH_ERR, ++}; ++#endif ++ + #if LWIP_IPV4 ++#if USE_LIBOS ++#define IP4ADDR_PORT_TO_SOCKADDR(sin, ipaddr, port) do { \ ++ (sin)->sin_family = AF_INET; \ ++ (sin)->sin_port = lwip_htons((port)); \ ++ inet_addr_from_ip4addr(&(sin)->sin_addr, ipaddr); \ ++ memset((sin)->sin_zero, 0, SIN_ZERO_LEN); }while(0) ++#else + #define IP4ADDR_PORT_TO_SOCKADDR(sin, ipaddr, port) do { \ + (sin)->sin_len = sizeof(struct sockaddr_in); \ + (sin)->sin_family = AF_INET; \ + (sin)->sin_port = lwip_htons((port)); \ + inet_addr_from_ip4addr(&(sin)->sin_addr, ipaddr); \ + memset((sin)->sin_zero, 0, SIN_ZERO_LEN); }while(0) ++#endif /* USE_LIBOS */ + #define SOCKADDR4_TO_IP4ADDR_PORT(sin, ipaddr, port) do { \ + inet_addr_to_ip4addr(ip_2_ip4(ipaddr), &((sin)->sin_addr)); \ + (port) = lwip_ntohs((sin)->sin_port); }while(0) +@@ -257,7 +278,12 @@ static void lwip_socket_drop_registered_mld6_memberships(int s); + #endif /* LWIP_IPV6_MLD */ + + /** The global array of available sockets */ ++#if USE_LIBOS ++uint32_t sockets_num; ++struct lwip_sock *sockets; ++#else + static struct lwip_sock sockets[NUM_SOCKETS]; ++#endif /* USE_LIBOS */ + + #if LWIP_SOCKET_SELECT || LWIP_SOCKET_POLL + #if LWIP_TCPIP_CORE_LOCKING +@@ -285,7 +311,7 @@ static struct lwip_select_cb *select_cb_list; + + /* Forward declaration of some functions */ + #if LWIP_SOCKET_SELECT || LWIP_SOCKET_POLL +-static void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len); ++void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len); + #define DEFAULT_SOCKET_EVENTCB event_callback + static void select_check_waiters(int s, int has_recvevent, int has_sendevent, int has_errevent); + #else +@@ -411,7 +437,13 @@ static struct lwip_sock * + tryget_socket_unconn_nouse(int fd) + { + int s = fd - LWIP_SOCKET_OFFSET; +- if ((s < 0) || (s >= NUM_SOCKETS)) { ++ ++#if USE_LIBOS ++ if ((s < 0) || (s >= sockets_num)) ++#else ++ if ((s < 0) || (s >= NUM_SOCKETS)) ++#endif /* USE_LIBOS */ ++ { + LWIP_DEBUGF(SOCKETS_DEBUG, ("tryget_socket_unconn(%d): invalid\n", fd)); + return NULL; + } +@@ -475,8 +507,13 @@ tryget_socket(int fd) + * @param fd externally used socket index + * @return struct lwip_sock for the socket or NULL if not found + */ ++#if USE_LIBOS ++struct lwip_sock * ++get_socket(int fd) ++#else + static struct lwip_sock * + get_socket(int fd) ++#endif /* USE_LIBOS */ + { + struct lwip_sock *sock = tryget_socket(fd); + if (!sock) { +@@ -489,6 +526,24 @@ get_socket(int fd) + return sock; + } + ++#if USE_LIBOS ++/** ++ * Map a externally used socket index to the internal socket representation. ++ * ++ * @param s externally used socket index ++ * @return struct lwip_sock for the socket or NULL if not found without ++ * checking. ++ */ ++struct lwip_sock * ++get_socket_by_fd(int fd) ++{ ++ if ((fd < LWIP_SOCKET_OFFSET) || (fd >= sockets_num + LWIP_SOCKET_OFFSET)) { ++ return NULL; ++ } ++ return &sockets[fd - LWIP_SOCKET_OFFSET]; ++} ++#endif /* USE_LIBOS */ ++ + /** + * Allocate a new socket for a given netconn. + * +@@ -504,6 +559,62 @@ alloc_socket(struct netconn *newconn, int accepted) + SYS_ARCH_DECL_PROTECT(lev); + LWIP_UNUSED_ARG(accepted); + ++#if USE_LIBOS ++ int type, protocol = 0, domain = AF_INET; ++ switch (NETCONNTYPE_GROUP(newconn->type)) { ++ case NETCONN_RAW: ++ type = SOCK_RAW; ++ break; ++ case NETCONN_UDPLITE: ++ case NETCONN_UDP: ++ type = SOCK_DGRAM; ++ break; ++ case NETCONN_TCP: ++ type = SOCK_STREAM; ++ break; ++ default: ++ type = -1; ++ break; ++ } ++ ++ SYS_ARCH_PROTECT(lev); ++ i = posix_api->socket_fn(domain, type, protocol); ++ if (i == -1) { ++ goto err; ++ } ++ ++ if ((i < LWIP_SOCKET_OFFSET) || (i >= sockets_num + LWIP_SOCKET_OFFSET)) { ++ goto err; ++ } ++ ++ if (!sockets[i].conn && (sockets[i].select_waiting == 0)) { ++ /*initialize state as NETCONN_HOST | NETCONN_LIBOS, ++ *if connection accepted and alloc_socket called, it can be only NETCONN_LIBOS*/ ++ if (accepted) ++ SET_CONN_TYPE_LIBOS(newconn); ++ else ++ SET_CONN_TYPE_LIBOS_OR_HOST(newconn); ++ sockets[i].conn = newconn; ++ /* The socket is not yet known to anyone, so no need to protect ++ after having marked it as used. */ ++ SYS_ARCH_UNPROTECT(lev); ++ sockets[i].lastdata.pbuf = NULL; ++ sockets[i].rcvevent = 0; ++ /* TCP sendbuf is empty, but the socket is not yet writable until connected ++ * (unless it has been created by accept()). */ ++ sockets[i].sendevent = (NETCONNTYPE_GROUP(newconn->type) == NETCONN_TCP ? (accepted != 0) : 1); ++ sockets[i].errevent = 0; ++ sockets[i].epoll_data = NULL; ++ init_list_node_null(&sockets[i].list); ++ return i + LWIP_SOCKET_OFFSET; ++ } ++ ++err: ++ posix_api->close_fn(i); ++ SYS_ARCH_UNPROTECT(lev); ++ return -1; ++#else /* USE_LIBOS */ ++ + /* allocate a new socket identifier */ + for (i = 0; i < NUM_SOCKETS; ++i) { + /* Protect socket array */ +@@ -535,6 +646,8 @@ alloc_socket(struct netconn *newconn, int accepted) + SYS_ARCH_UNPROTECT(lev); + } + return -1; ++ ++#endif /* USE_LIBOS */ + } + + /** Free a socket (under lock) +@@ -629,10 +742,43 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + SYS_ARCH_DECL_PROTECT(lev); + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d)...\n", s)); ++#if USE_LIBOS ++ int sys_errno = 0; ++ ++ sock = posix_api->get_socket(s); ++ /*AF_UNIX case*/ ++ if (!sock) { ++ if (rearm_accept_fd(s) < 0) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ++ ("failed to rearm accept fd=%d errno=%d\n", s, errno)); ++ } ++ return posix_api->accept_fn(s, addr, addrlen); ++ } ++ ++ /*for AF_INET, we may try both linux and lwip*/ ++ if (!CONN_TYPE_HAS_LIBOS_AND_HOST(sock->conn)) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type has libos and host bits")); ++ set_errno(EINVAL); ++ return -1; ++ } ++ ++ if (rearm_accept_fd(s) < 0) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ++ ("failed to rearm accept fd=%d errno=%d\n", s, errno)); ++ } ++ ++ /* raise accept syscall in palce */ ++ newsock = posix_api->accept_fn(s, addr, addrlen); ++ if (newsock >= 0) { ++ return newsock; ++ } ++ sys_errno = errno; ++#else + sock = get_socket(s); + if (!sock) { + return -1; + } ++#endif + + /* wait for a new connection */ + err = netconn_accept(sock->conn, &newconn); +@@ -646,6 +792,9 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + sock_set_errno(sock, err_to_errno(err)); + } + done_socket(sock); ++#if USE_LIBOS ++ set_errno(sys_errno); ++#endif /* USE_LIBOS */ + return -1; + } + LWIP_ASSERT("newconn != NULL", newconn != NULL); +@@ -657,7 +806,11 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + done_socket(sock); + return -1; + } ++#if USE_LIBOS ++ LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < sockets_num + LWIP_SOCKET_OFFSET)); ++#else + LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); ++#endif /* USE_LIBOS */ + nsock = &sockets[newsock - LWIP_SOCKET_OFFSET]; + + /* See event_callback: If data comes in right away after an accept, even +@@ -695,9 +848,11 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + } + + IPADDR_PORT_TO_SOCKADDR(&tempaddr, &naddr, port); ++#if !USE_LIBOS + if (*addrlen > tempaddr.sa.sa_len) { + *addrlen = tempaddr.sa.sa_len; + } ++#endif /* USE_LIBOS */ + MEMCPY(addr, &tempaddr, *addrlen); + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d) returning new sock=%d addr=", s, newsock)); +@@ -720,11 +875,24 @@ lwip_bind(int s, const struct sockaddr *name, socklen_t namelen) + ip_addr_t local_addr; + u16_t local_port; + err_t err; +- ++#if USE_LIBOS ++ sock = posix_api->get_socket(s); ++ /*AF_UNIX case*/ ++ if (!sock) { ++ return posix_api->bind_fn(s, name, namelen); ++ } ++ /*for AF_INET, we may try both linux and lwip*/ ++ if (!CONN_TYPE_HAS_LIBOS_AND_HOST(sock->conn)) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type has libos and host bits")); ++ set_errno(EINVAL); ++ return -1; ++ } ++#else + sock = get_socket(s); + if (!sock) { + return -1; + } ++#endif + + if (!SOCK_ADDR_TYPE_MATCH(name, sock)) { + /* sockaddr does not match socket type (IPv4/IPv6) */ +@@ -744,6 +912,18 @@ lwip_bind(int s, const struct sockaddr *name, socklen_t namelen) + ip_addr_debug_print_val(SOCKETS_DEBUG, local_addr); + LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", local_port)); + ++#if USE_LIBOS ++ /* Supports kernel NIC IP address. */ ++ int ret = posix_api->bind_fn(s, name, namelen); ++ if (ret < 0) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("bind syscall failed\n")); ++ /* bind must succeed on both linux and libos */ ++ if (!is_host_ipv4(local_addr.addr)) { ++ return ret; ++ } ++ } ++#endif /* USE_LIBOS */ ++ + #if LWIP_IPV4 && LWIP_IPV6 + /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */ + if (IP_IS_V6_VAL(local_addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&local_addr))) { +@@ -776,10 +956,29 @@ lwip_close(int s) + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_close(%d)\n", s)); + ++#if USE_LIBOS ++ int ret; ++ if (posix_api->is_epfd(s)) { ++ return posix_api->epoll_close_fn(s); ++ } ++ ++ ret = posix_api->close_fn(s); ++ if (ret < 0) ++ return ret; ++ if (posix_api->is_chld == 0) ++ clean_host_fd(s); ++ ++ sock = posix_api->get_socket(s); ++ /*AF_UNIX case*/ ++ if (!sock) { ++ return ret; ++ } ++#else + sock = get_socket(s); + if (!sock) { + return -1; + } ++#endif /* USE_LIBOS */ + + if (sock->conn != NULL) { + is_tcp = NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP; +@@ -803,6 +1002,13 @@ lwip_close(int s) + return -1; + } + ++#if USE_LIBOS ++ sock->epoll = LIBOS_EPOLLNONE; ++ sock->events = 0; ++ sock->epoll_data = NULL; ++ list_del_node_null(&sock->list); ++#endif ++ + free_socket(sock, is_tcp); + set_errno(0); + return 0; +@@ -814,10 +1020,28 @@ lwip_connect(int s, const struct sockaddr *name, socklen_t namelen) + struct lwip_sock *sock; + err_t err; + ++#if USE_LIBOS ++ int ret; ++ ++ sock = posix_api->get_socket(s); ++ if (!sock) { ++ return posix_api->connect_fn(s, name, namelen); ++ } ++ ++ /* raise connect syscall in place */ ++ ADD_CONN_TYPE_INPRG(sock->conn); ++ ret = posix_api->connect_fn(s, name, namelen); ++ if (!ret) { ++ SET_CONN_TYPE_HOST(sock->conn); ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("linux connect succeed fd=%d\n", s)); ++ return ret; ++ } ++#else + sock = get_socket(s); + if (!sock) { + return -1; + } ++#endif + + if (!SOCK_ADDR_TYPE_MATCH_OR_UNSPEC(name, sock)) { + /* sockaddr does not match socket type (IPv4/IPv6) */ +@@ -862,6 +1086,11 @@ lwip_connect(int s, const struct sockaddr *name, socklen_t namelen) + return -1; + } + ++#if USE_LIBOS ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("libos connect succeed fd=%d\n",s)); ++ SET_CONN_TYPE_LIBOS(sock->conn); ++#endif /* USE_LIBOS */ ++ + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d) succeeded\n", s)); + sock_set_errno(sock, 0); + done_socket(sock); +@@ -884,10 +1113,29 @@ lwip_listen(int s, int backlog) + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_listen(%d, backlog=%d)\n", s, backlog)); + ++#if USE_LIBOS ++ int ret; ++ ++ sock = posix_api->get_socket(s); ++ /*AF_UNIX case*/ ++ if (!sock) { ++ return posix_api->listen_fn(s, backlog); ++ } ++ /*for AF_INET, we may try both linux and lwip*/ ++ if (!CONN_TYPE_HAS_LIBOS_AND_HOST(sock->conn)) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type has libos and host bits")); ++ set_errno(EADDRINUSE); ++ return -1; ++ } ++ ++ if ((ret = posix_api->listen_fn(s, backlog)) == -1) ++ return ret; ++#else + sock = get_socket(s); + if (!sock) { + return -1; + } ++#endif + + /* limit the "backlog" parameter to fit in an u8_t */ + backlog = LWIP_MIN(LWIP_MAX(backlog, 0), 0xff); +@@ -919,6 +1167,9 @@ static ssize_t + lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + { + u8_t apiflags = NETCONN_NOAUTORCVD; ++#if USE_LIBOS ++ apiflags = 0; ++#endif + ssize_t recvd = 0; + ssize_t recv_left = (len <= SSIZE_MAX) ? (ssize_t)len : SSIZE_MAX; + +@@ -938,6 +1189,13 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + /* Check if there is data left from the last recv operation. */ + if (sock->lastdata.pbuf) { + p = sock->lastdata.pbuf; ++#if USE_LIBOS ++ if ((flags & MSG_PEEK) == 0) { ++ if ((NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP)) { ++ del_epoll_event(sock->conn, EPOLLIN); ++ } ++ } ++#endif + } else { + /* No data was left from the previous operation, so we try to get + some from the network. */ +@@ -1008,10 +1266,22 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + /* @todo: do we need to support peeking more than one pbuf? */ + } while ((recv_left > 0) && !(flags & MSG_PEEK)); + lwip_recv_tcp_done: +- if ((recvd > 0) && !(flags & MSG_PEEK)) { +- /* ensure window update after copying all data */ +- netconn_tcp_recvd(sock->conn, (size_t)recvd); ++#if USE_LIBOS ++ if (apiflags & NETCONN_NOAUTORCVD) ++#endif ++ { ++ if ((recvd > 0) && !(flags & MSG_PEEK)) { ++ /* ensure window update after copying all data */ ++ netconn_tcp_recvd(sock->conn, (size_t)recvd); ++ } + } ++#if USE_LIBOS ++ if ((flags & MSG_PEEK) == 0) { ++ if (((NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP)) && sock->lastdata.pbuf) { ++ add_epoll_event(sock->conn, EPOLLIN); ++ } ++ } ++#endif + sock_set_errno(sock, 0); + return recvd; + } +@@ -1040,11 +1310,13 @@ lwip_sock_make_addr(struct netconn *conn, ip_addr_t *fromaddr, u16_t port, + #endif /* LWIP_IPV4 && LWIP_IPV6 */ + + IPADDR_PORT_TO_SOCKADDR(&saddr, fromaddr, port); ++#if !USE_LIBOS + if (*fromlen < saddr.sa.sa_len) { + truncated = 1; + } else if (*fromlen > saddr.sa.sa_len) { + *fromlen = saddr.sa.sa_len; + } ++#endif + MEMCPY(from, &saddr, *fromlen); + return truncated; + } +@@ -1194,6 +1466,43 @@ lwip_recvfrom_udp_raw(struct lwip_sock *sock, int flags, struct msghdr *msg, u16 + return ERR_OK; + } + ++#if USE_LIBOS ++static inline enum KERNEL_LWIP_PATH select_path(int s) ++{ ++ struct lwip_sock *sock; ++ ++ sock = posix_api->get_socket(s); ++ /*AF_UNIX case*/ ++ if (!sock) { ++ if (rearm_host_fd(s) < 0) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("failed to rearm fd=%d errno=%d\n", s, errno)); ++ } ++ return PATH_KERNEL; ++ } ++ ++ if (CONN_TYPE_HAS_INPRG(sock->conn)) { ++ set_errno(EWOULDBLOCK); ++ return PATH_ERR; ++ } ++ ++ /*for AF_INET, we can try erther linux or lwip*/ ++ if (CONN_TYPE_IS_HOST(sock->conn)) { ++ if (rearm_host_fd(s) < 0) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("failed to rearm read fd=%d errno=%d\n", s, errno)); ++ } ++ return PATH_KERNEL; ++ } ++ ++ if (!CONN_TYPE_IS_LIBOS(sock->conn)) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type is not libos bit type=%x", netconn_type(sock->conn))); ++ set_errno(EINVAL); ++ return PATH_ERR; ++ } ++ ++ return PATH_LWIP; ++} ++#endif ++ + ssize_t + lwip_recvfrom(int s, void *mem, size_t len, int flags, + struct sockaddr *from, socklen_t *fromlen) +@@ -1201,6 +1510,15 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, + struct lwip_sock *sock; + ssize_t ret; + ++#if USE_LIBOS ++ enum KERNEL_LWIP_PATH path = select_path(s); ++ if (path == PATH_ERR) { ++ return -1; ++ } else if (path == PATH_KERNEL) { ++ return posix_api->recv_from(s, mem, len, flags, from, fromlen); ++ } ++#endif ++ + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d, %p, %"SZT_F", 0x%x, ..)\n", s, mem, len, flags)); + sock = get_socket(s); + if (!sock) { +@@ -1250,6 +1568,14 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, + ssize_t + lwip_read(int s, void *mem, size_t len) + { ++#if USE_LIBOS ++ enum KERNEL_LWIP_PATH path = select_path(s); ++ if (path == PATH_ERR) { ++ return -1; ++ } else if (path == PATH_KERNEL) { ++ return posix_api->read_fn(s, mem, len); ++ } ++#endif + return lwip_recvfrom(s, mem, len, 0, NULL, NULL); + } + +@@ -1283,6 +1609,15 @@ lwip_recvmsg(int s, struct msghdr *message, int flags) + int i; + ssize_t buflen; + ++#if USE_LIBOS ++ enum KERNEL_LWIP_PATH path = select_path(s); ++ if (path == PATH_ERR) { ++ return -1; ++ } else if (path == PATH_KERNEL) { ++ return posix_api->recv_msg(s, message, flags); ++ } ++#endif ++ + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvmsg(%d, message=%p, flags=0x%x)\n", s, (void *)message, flags)); + LWIP_ERROR("lwip_recvmsg: invalid message pointer", message != NULL, return ERR_ARG;); + LWIP_ERROR("lwip_recvmsg: unsupported flags", (flags & ~(MSG_PEEK|MSG_DONTWAIT)) == 0, +@@ -1427,6 +1762,15 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags) + #endif + err_t err = ERR_OK; + ++#if USE_LIBOS ++ enum KERNEL_LWIP_PATH path = select_path(s); ++ if (path == PATH_ERR) { ++ return -1; ++ } else if (path == PATH_KERNEL) { ++ return posix_api->send_msg(s, msg, flags); ++ } ++#endif ++ + sock = get_socket(s); + if (!sock) { + return -1; +@@ -1436,10 +1780,10 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags) + sock_set_errno(sock, err_to_errno(ERR_ARG)); done_socket(sock); return -1;); + LWIP_ERROR("lwip_sendmsg: invalid msghdr iov", msg->msg_iov != NULL, + sock_set_errno(sock, err_to_errno(ERR_ARG)); done_socket(sock); return -1;); +- LWIP_ERROR("lwip_sendmsg: maximum iovs exceeded", (msg->msg_iovlen > 0) && (msg->msg_iovlen <= IOV_MAX), +- sock_set_errno(sock, EMSGSIZE); done_socket(sock); return -1;); +- LWIP_ERROR("lwip_sendmsg: unsupported flags", (flags & ~(MSG_DONTWAIT | MSG_MORE)) == 0, +- sock_set_errno(sock, EOPNOTSUPP); done_socket(sock); return -1;); ++ //LWIP_ERROR("lwip_sendmsg: maximum iovs exceeded", (msg->msg_iovlen > 0) && (msg->msg_iovlen <= IOV_MAX), ++ // sock_set_errno(sock, EMSGSIZE); done_socket(sock); return -1;); ++ //LWIP_ERROR("lwip_sendmsg: unsupported flags", (flags & ~(MSG_DONTWAIT | MSG_MORE)) == 0, ++ // sock_set_errno(sock, EOPNOTSUPP); done_socket(sock); return -1;); + + LWIP_UNUSED_ARG(msg->msg_control); + LWIP_UNUSED_ARG(msg->msg_controllen); +@@ -1590,6 +1934,15 @@ lwip_sendto(int s, const void *data, size_t size, int flags, + u16_t remote_port; + struct netbuf buf; + ++#if USE_LIBOS ++ enum KERNEL_LWIP_PATH path = select_path(s); ++ if (path == PATH_ERR) { ++ return -1; ++ } else if (path == PATH_KERNEL) { ++ return posix_api->send_to(s, data, size, flags, to, tolen); ++ } ++#endif ++ + sock = get_socket(s); + if (!sock) { + return -1; +@@ -1688,6 +2041,11 @@ lwip_socket(int domain, int type, int protocol) + + LWIP_UNUSED_ARG(domain); /* @todo: check this */ + ++#if USE_LIBOS ++ if ((domain != AF_INET && domain != AF_UNSPEC) || posix_api->is_chld) ++ return posix_api->socket_fn(domain, type, protocol); ++#endif ++ + /* create a netconn */ + switch (type) { + case SOCK_RAW: +@@ -1744,6 +2102,14 @@ lwip_socket(int domain, int type, int protocol) + ssize_t + lwip_write(int s, const void *data, size_t size) + { ++#if USE_LIBOS ++ enum KERNEL_LWIP_PATH path = select_path(s); ++ if (path == PATH_ERR) { ++ return -1; ++ } else if (path == PATH_KERNEL) { ++ return posix_api->write_fn(s, data, size); ++ } ++#endif + return lwip_send(s, data, size, 0); + } + +@@ -2479,7 +2845,7 @@ lwip_poll_should_wake(const struct lwip_select_cb *scb, int fd, int has_recveven + * NETCONN_EVT_ERROR + * This requirement will be asserted in select_check_waiters() + */ +-static void ++void + event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + { + int s, check_waiters; +@@ -2528,23 +2894,38 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + if (sock->rcvevent > 1) { + check_waiters = 0; + } ++#if USE_LIBOS ++ add_epoll_event(conn, EPOLLIN); ++#endif + break; + case NETCONN_EVT_RCVMINUS: + sock->rcvevent--; + check_waiters = 0; ++#if USE_LIBOS ++ del_epoll_event(conn, EPOLLIN); ++#endif + break; + case NETCONN_EVT_SENDPLUS: + if (sock->sendevent) { + check_waiters = 0; + } + sock->sendevent = 1; ++#if USE_LIBOS ++ add_epoll_event(conn, EPOLLOUT); ++#endif + break; + case NETCONN_EVT_SENDMINUS: + sock->sendevent = 0; + check_waiters = 0; ++#if USE_LIBOS ++ del_epoll_event(conn, EPOLLOUT); ++#endif + break; + case NETCONN_EVT_ERROR: + sock->errevent = 1; ++#if USE_LIBOS ++ add_epoll_event(conn, EPOLLERR); ++#endif + break; + default: + LWIP_ASSERT("unknown event", 0); +@@ -2739,9 +3120,11 @@ lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local) + ip_addr_debug_print_val(SOCKETS_DEBUG, naddr); + LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", port)); + ++#if !USE_LIBOS + if (*namelen > saddr.sa.sa_len) { + *namelen = saddr.sa.sa_len; + } ++#endif + MEMCPY(name, &saddr, *namelen); + + sock_set_errno(sock, 0); +@@ -2752,12 +3135,41 @@ lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local) + int + lwip_getpeername(int s, struct sockaddr *name, socklen_t *namelen) + { ++#if USE_LIBOS ++ struct lwip_sock *sock; ++ ++ sock = posix_api->get_socket(s); ++ if (!sock) { ++ return posix_api->getpeername_fn(s, name, namelen); ++ } ++ /*for AF_INET, if has only host type bit, just call linux api, ++ *if has libos and host type bits, it's a not connected fd, call ++ *linux api and return -1(errno == ENOTCONN) is also ok*/ ++ if (CONN_TYPE_HAS_HOST(sock->conn)) { ++ return posix_api->getpeername_fn(s, name, namelen); ++ } ++#endif ++ + return lwip_getaddrname(s, name, namelen, 0); + } + + int + lwip_getsockname(int s, struct sockaddr *name, socklen_t *namelen) + { ++#if USE_LIBOS ++ struct lwip_sock *sock; ++ ++ sock = posix_api->get_socket(s); ++ if (!sock) { ++ return posix_api->getsockname_fn(s, name, namelen); ++ } ++ /*for AF_INET, if has only host type bit, just call linux api, ++ *if has libos and host type bits, also call linux api*/ ++ if (CONN_TYPE_HAS_HOST(sock->conn)) { ++ return posix_api->getsockname_fn(s, name, namelen); ++ } ++#endif ++ + return lwip_getaddrname(s, name, namelen, 1); + } + +@@ -2765,15 +3177,28 @@ int + lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) + { + int err; +- struct lwip_sock *sock = get_socket(s); + #if !LWIP_TCPIP_CORE_LOCKING + err_t cberr; + LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data); + #endif /* !LWIP_TCPIP_CORE_LOCKING */ + ++#if USE_LIBOS ++ struct lwip_sock *sock = posix_api->get_socket(s); ++ ++ if (!sock) { ++ return posix_api->getsockopt_fn(s, level, optname, optval, optlen); ++ } ++ /*for AF_INET, we return linux result? */ ++ if (CONN_TYPE_HAS_HOST(sock->conn)) { ++ return posix_api->getsockopt_fn(s, level, optname, optval, optlen); ++ } ++#else ++ struct lwip_sock *sock = get_socket(s); ++ + if (!sock) { + return -1; + } ++#endif /* USE_LIBOS */ + + if ((NULL == optval) || (NULL == optlen)) { + sock_set_errno(sock, EFAULT); +@@ -3211,15 +3636,30 @@ int + lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen) + { + int err = 0; +- struct lwip_sock *sock = get_socket(s); + #if !LWIP_TCPIP_CORE_LOCKING + err_t cberr; + LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data); + #endif /* !LWIP_TCPIP_CORE_LOCKING */ + ++#if USE_LIBOS ++ struct lwip_sock *sock = posix_api->get_socket(s); ++ ++ if (!sock) { ++ return posix_api->setsockopt_fn(s, level, optname, optval, optlen); ++ } ++ /*for AF_INET, we may try both linux and lwip*/ ++ if (CONN_TYPE_HAS_HOST(sock->conn)) { ++ if (posix_api->setsockopt_fn(s, level, optname, optval, optlen) < 0) { ++ return -1; ++ } ++ } ++#else ++ struct lwip_sock *sock = get_socket(s); ++ + if (!sock) { + return -1; + } ++#endif /* USE_LIBOS */ + + if (NULL == optval) { + sock_set_errno(sock, EFAULT); +@@ -3333,6 +3773,7 @@ lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_ + case SO_KEEPALIVE: + #if SO_REUSE + case SO_REUSEADDR: ++ case SO_REUSEPORT: + #endif /* SO_REUSE */ + if ((optname == SO_BROADCAST) && + (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_UDP)) { +@@ -3745,6 +4186,29 @@ lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_ + return err; + } + ++#if USE_LIBOS ++int ++lwip_ioctl(int s, long cmd, ...) ++{ ++ struct lwip_sock *sock = posix_api->get_socket(s); ++ u8_t val; ++ ++ int ret = -1; ++ void *argp; ++ va_list ap; ++ ++ va_start(ap, cmd); ++ argp = va_arg(ap, void *); ++ va_end(ap); ++ ++ if (!sock) { ++ return posix_api->ioctl_fn(s, cmd, argp); ++ } ++ if (CONN_TYPE_HAS_HOST(sock->conn)) { ++ if ((ret = posix_api->ioctl_fn(s, cmd, argp)) == -1) ++ return ret; ++ } ++#else + int + lwip_ioctl(int s, long cmd, void *argp) + { +@@ -3757,6 +4221,7 @@ lwip_ioctl(int s, long cmd, void *argp) + if (!sock) { + return -1; + } ++#endif /* USE_LIBOS */ + + switch (cmd) { + #if LWIP_SO_RCVBUF || LWIP_FIONREAD_LINUXMODE +@@ -3839,6 +4304,26 @@ lwip_ioctl(int s, long cmd, void *argp) + * the flag O_NONBLOCK is implemented for F_SETFL. + */ + int ++#if USE_LIBOS ++lwip_fcntl(int s, int cmd, ...) ++{ ++ struct lwip_sock *sock = posix_api->get_socket(s); ++ int val, ret = -1; ++ int op_mode = 0; ++ va_list ap; ++ ++ va_start(ap, cmd); ++ val = va_arg(ap, int); ++ va_end(ap); ++ ++ if (!sock) { ++ return posix_api->fcntl_fn(s, cmd, val); ++ } ++ if (CONN_TYPE_HAS_HOST(sock->conn)) { ++ if ((ret = posix_api->fcntl_fn(s, cmd, val)) == -1) ++ return ret; ++ } ++#else /* USE_LIBOS */ + lwip_fcntl(int s, int cmd, int val) + { + struct lwip_sock *sock = get_socket(s); +@@ -3848,6 +4333,7 @@ lwip_fcntl(int s, int cmd, int val) + if (!sock) { + return -1; + } ++#endif /* USE_LIBOS */ + + switch (cmd) { + case F_GETFL: +@@ -4163,4 +4649,50 @@ lwip_socket_drop_registered_mld6_memberships(int s) + } + #endif /* LWIP_IPV6_MLD */ + ++#if USE_LIBOS ++void lwip_sock_init(void) ++{ ++ if (sockets_num == 0) { ++ sockets_num = NUM_SOCKETS; ++ sockets = calloc(sockets_num, sizeof(struct lwip_sock)); ++ LWIP_ASSERT("sockets != NULL", sockets != NULL); ++ memset(sockets, 0, sockets_num * sizeof(struct lwip_sock)); ++ } ++ return; ++} ++ ++//modify from lwip_close ++void lwip_exit(void) ++{ ++ int i, is_tcp; ++ struct lwip_sock *sock; ++ ++ if (memp_pools[MEMP_SYS_MBOX] == NULL) { ++ return; ++ } ++ ++ for (i = 0; i < sockets_num; i++) { ++ sock = &sockets[i]; ++ if (!sock->conn) ++ continue; ++#if LWIP_IGMP ++ /* drop all possibly joined IGMP memberships */ ++ lwip_socket_drop_registered_memberships(i); ++#endif /* LWIP_IGMP */ ++ /* ++ * process is exiting, call netconn_delete to ++ * close tcp connection, and ignore the return value ++ */ ++ is_tcp = NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP; ++ netconn_delete(sock->conn); ++ free_socket(sock, is_tcp); ++ } ++ ++ free(sockets); ++ sockets = NULL; ++ sockets_num = 0; ++} ++ ++#endif /* USE_LIBOS */ ++ + #endif /* LWIP_SOCKET */ +diff --git a/src/api/sys_arch.c b/src/api/sys_arch.c +new file mode 100644 +index 0000000..55561b1 +--- /dev/null ++++ b/src/api/sys_arch.c +@@ -0,0 +1,379 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "lwip/err.h" ++#include "lwip/mem.h" ++#include "lwip/memp.h" ++#include "lwip/opt.h" ++#include "lwip/sys.h" ++#include "lwip/timeouts.h" ++#include "arch/sys_arch.h" ++ ++struct sys_mutex { ++ volatile unsigned int m; ++}; ++ ++struct sys_mutex lstack_mutex; ++ ++struct sys_sem lstack_sem; ++ ++#define MAX_THREAD_NAME 64 ++#define MBOX_NAME_PREFIX "_mbox_0x" ++#define MAX_MBOX_NAME_LEN (sizeof(MBOX_NAME_PREFIX) + 32) // log(UINT64_MAX) < 32 ++ ++struct sys_thread { ++ struct sys_thread *next; ++ char name[MAX_THREAD_NAME]; ++ lwip_thread_fn fn; ++ void *arg; ++ int stacksize; ++ int prio; ++ pthread_t tid; ++}; ++ ++ ++struct sys_mem_stats { ++ uint32_t tot_len; ++}; ++ ++static PER_THREAD struct sys_mem_stats hugepage_stats; ++ ++static PER_THREAD uint64_t cycles_per_ms __attribute__((aligned(64))); ++static PER_THREAD uint64_t sys_start_ms __attribute__((aligned(64))); ++ ++/* ++ * Mailbox ++ * */ ++static int mbox_wait_func(void) ++{ ++#if LWIP_TIMERS ++ sys_timer_run(); ++#endif /* LWIP_TIMER */ ++ return eth_dev_poll(); ++} ++ ++err_t sys_mbox_new(struct sys_mbox **mb, int size) ++{ ++ int ret; ++ struct sys_mbox *mbox; ++ ++ mbox = (struct sys_mbox *)memp_malloc(MEMP_SYS_MBOX); ++ if (mbox == NULL) { ++ return ERR_MEM; ++ } ++ ++ mbox->flags = RING_F_SP_ENQ | RING_F_SC_DEQ; ++ ++ ret = snprintf(mbox->name, sizeof(mbox->name), MBOX_NAME_PREFIX"%"PRIXPTR, (uintptr_t)mbox); ++ if (ret < 0) { ++ memp_free(MEMP_SYS_MBOX, mbox); ++ return ERR_VAL; ++ } ++ ++ mbox->size = size; ++ mbox->socket_id = rte_socket_id(); ++ mbox->ring = rte_ring_create(mbox->name, mbox->size, mbox->socket_id, mbox->flags); ++ if (!mbox->ring) { ++ RTE_LOG(ERR, EAL, "cannot create rte_ring for mbox\n"); ++ memp_free(MEMP_SYS_MBOX, mbox); ++ return ERR_MEM; ++ } ++ mbox->wait_fn = mbox_wait_func; ++ *mb = mbox; ++ ++ return ERR_OK; ++} ++ ++void sys_mbox_free(struct sys_mbox **mb) ++{ ++ struct sys_mbox *mbox = *mb; ++ rte_ring_free(mbox->ring); ++ memp_free(MEMP_SYS_MBOX, mbox); ++} ++ ++err_t sys_mbox_trypost(struct sys_mbox **mb, void *msg) ++{ ++ unsigned int n; ++ struct sys_mbox *mbox = *mb; ++ ++ n = rte_ring_sp_enqueue_bulk(mbox->ring, &msg, 1, NULL); ++ if (!n) ++ return ERR_BUF; ++ return ERR_OK; ++} ++ ++void sys_mbox_post(struct sys_mbox **mb, void *msg) ++{ ++ struct sys_mbox *mbox = *mb; ++ ++ /* NOTE: sys_mbox_post is used on mbox defined in src/api/tcpip.c. ++ * If the ring size of mbox is greater than MEMP_NUM_TCPIP_MSG_API, ++ * enqueue failure will never happen. ++ * */ ++ if (!rte_ring_sp_enqueue_bulk(mbox->ring, &msg, 1, NULL)) { ++ LWIP_ASSERT("It is failed to post msg into mbox", 0); ++ } ++} ++ ++err_t sys_mbox_trypost_fromisr(sys_mbox_t *q, void *msg) ++{ ++ return sys_mbox_trypost(q, msg); ++} ++ ++uint32_t sys_arch_mbox_tryfetch(struct sys_mbox **mb, void **msg) ++{ ++ unsigned int n; ++ struct sys_mbox *mbox = *mb; ++ ++ n = rte_ring_sc_dequeue_bulk(mbox->ring, msg, 1, NULL); ++ if (!n) { ++ *msg = NULL; ++ return SYS_MBOX_EMPTY; ++ } ++ ++ return 0; ++} ++ ++uint32_t sys_arch_mbox_fetch(struct sys_mbox **mb, void **msg, uint32_t timeout) ++{ ++ unsigned int n; ++ uint32_t poll_ts = 0; ++ uint32_t time_needed = 0; ++ struct sys_mbox *mbox = *mb; ++ ++ n = rte_ring_sc_dequeue_bulk(mbox->ring, msg, 1, NULL); ++ ++ if (timeout > 0) ++ poll_ts = sys_now(); ++ ++ while (!n) { ++ if (timeout > 0) { ++ time_needed = sys_now() - poll_ts; ++ if (time_needed >= timeout) { ++ return SYS_ARCH_TIMEOUT; ++ } ++ } ++ ++ (void)mbox->wait_fn(); ++ ++ n = rte_ring_sc_dequeue_bulk(mbox->ring, msg, 1, NULL); ++ } ++ ++ return time_needed; ++} ++ ++int sys_mbox_empty(struct sys_mbox *mb) ++{ ++ return rte_ring_count(mb->ring) == 0; ++} ++ ++/* ++ * Threads ++ * */ ++sys_thread_t sys_thread_new(const char *name, lwip_thread_fn function, void *arg, int stacksize, int prio) ++{ ++ int err; ++ pthread_t tid; ++ struct sys_thread *thread; ++ ++ thread = (struct sys_thread *)malloc(sizeof(struct sys_thread)); ++ if (thread == NULL) { ++ LWIP_DEBUGF(SYS_DEBUG, ("sys_thread_new: malloc sys_thread failed\n")); ++ rte_exit(EXIT_FAILURE, "malloc sys_thread failed\n"); ++ } ++ ++ err = pthread_create(&tid, NULL, (void*(*)(void *))function, arg); ++ if (err > 0) { ++ LWIP_DEBUGF(SYS_DEBUG, ("sys_thread_new: pthread_create failed\n")); ++ rte_exit(EXIT_FAILURE, "pthread_create failed\n"); ++ } ++ ++ err = pthread_setname_np(tid, name); ++ if (err > 0) { ++ LWIP_DEBUGF(SYS_DEBUG, ("sys_thread_new: pthread_setname_np failed\n")); ++ } ++ thread->tid = tid; ++ thread->stacksize = stacksize; ++ thread->prio = prio; ++ ++ return thread; ++} ++ ++/* ++ * Semaphore ++ * */ ++err_t sys_sem_new(struct sys_sem **sem, uint8_t count) ++{ ++ *sem = (struct sys_sem *)memp_malloc(MEMP_SYS_SEM); ++ if ((*sem) == NULL) { ++ return ERR_MEM; ++ } ++ (*sem)->c = 0; ++ (*sem)->wait_fn = mbox_wait_func; ++ return ERR_OK; ++} ++ ++void sys_sem_signal(struct sys_sem **s) ++{ ++ struct sys_sem *sem = NULL; ++ LWIP_ASSERT("invalid sem", (s != NULL) && (*s != NULL)); ++ sem = *s; ++ ++(sem->c); ++} ++ ++static uint32_t cond_wait(struct sys_sem *sem, uint32_t timeout) ++{ ++ uint32_t used_ms = 0; ++ uint32_t poll_ts; ++ ++ if (timeout == 0) { ++ (void)sem->wait_fn(); ++ return 0; ++ } ++ ++ poll_ts = sys_now(); ++ ++ while (used_ms < timeout) { ++ if (sem->c > 0) ++ return timeout - used_ms; ++ ++ (void)sem->wait_fn(); ++ used_ms = sys_now() - poll_ts; ++ } ++ ++ return SYS_ARCH_TIMEOUT; ++} ++ ++uint32_t sys_arch_sem_wait(struct sys_sem **s, uint32_t timeout) ++{ ++ uint32_t time_needed = 0; ++ struct sys_sem *sem = NULL; ++ LWIP_ASSERT("invalid sem", (s != NULL) && (*s != NULL)); ++ sem = *s; ++ ++ while (sem->c <= 0) { ++ if (timeout > 0) { ++ time_needed = cond_wait(sem, timeout); ++ ++ if (time_needed == SYS_ARCH_TIMEOUT) { ++ return SYS_ARCH_TIMEOUT; ++ } ++ } else { ++ cond_wait(sem, 0); ++ } ++ } ++ ++ sem->c--; ++ return time_needed; ++} ++ ++void sys_sem_free(struct sys_sem **s) ++{ ++ if ((s != NULL) && (*s != SYS_SEM_NULL)) ++ memp_free(MEMP_SYS_SEM, *s); ++} ++ ++/* ++ * Mutex ++ * */ ++err_t sys_mutex_new(struct sys_mutex **mutex) ++{ ++ return ERR_OK; ++} ++ ++void sys_mutex_lock(struct sys_mutex **mutex) ++{ ++} ++ ++void sys_mutex_unlock(struct sys_mutex **mutex) ++{ ++} ++ ++void sys_mutex_free(struct sys_mutex **mutex) ++{ ++} ++ ++/* Timer from DPDK */ ++void sys_calibrate_tsc(void) ++{ ++#define MS_PER_SEC 1E3 ++ uint64_t freq = rte_get_tsc_hz(); ++ ++ cycles_per_ms = (freq + MS_PER_SEC - 1) / MS_PER_SEC; ++ sys_start_ms = rte_rdtsc() / cycles_per_ms; ++} ++ ++uint32_t sys_now(void) ++{ ++ uint64_t cur_ms = rte_rdtsc() / cycles_per_ms; ++ return (uint32_t)(cur_ms - sys_start_ms); ++} ++ ++/* ++ * Critical section ++ * */ ++sys_prot_t sys_arch_protect(void) ++{ ++ return 0; ++} ++ ++void sys_arch_unprotect(sys_prot_t pval) ++{ ++} ++ ++/* ++ * Hugepage memory manager ++ * */ ++uint8_t *sys_hugepage_malloc(const char *name, uint32_t size) ++{ ++ const struct rte_memzone *mz; ++ ++ mz = rte_memzone_reserve(name, size, rte_socket_id(), 0); ++ if (mz == NULL) { ++ rte_exit(EXIT_FAILURE, "failed to reserver memory for mempool[%s]\n", name); ++ return NULL; ++ } ++ ++ memset(mz->addr, 0, mz->len); ++ hugepage_stats.tot_len += mz->len; ++ ++ return (uint8_t*)mz->addr; ++} +diff --git a/src/api/tcpip.c b/src/api/tcpip.c +index a7e312a..d3d0b55 100644 +--- a/src/api/tcpip.c ++++ b/src/api/tcpip.c +@@ -56,13 +56,13 @@ + #define TCPIP_MSG_VAR_FREE(name) API_VAR_FREE(MEMP_TCPIP_MSG_API, name) + + /* global variables */ +-static tcpip_init_done_fn tcpip_init_done; +-static void *tcpip_init_done_arg; +-static sys_mbox_t tcpip_mbox; ++static PER_THREAD tcpip_init_done_fn tcpip_init_done; ++static PER_THREAD void *tcpip_init_done_arg; ++static PER_THREAD sys_mbox_t tcpip_mbox; + + #if LWIP_TCPIP_CORE_LOCKING + /** The global semaphore to lock the stack. */ +-sys_mutex_t lock_tcpip_core; ++PER_THREAD sys_mutex_t lock_tcpip_core; + #endif /* LWIP_TCPIP_CORE_LOCKING */ + + static void tcpip_thread_handle_msg(struct tcpip_msg *msg); +@@ -123,8 +123,13 @@ again: + * + * @param arg unused argument + */ ++#if USE_LIBOS ++__attribute__((unused)) static void ++tcpip_thread(void *arg) ++#else + static void + tcpip_thread(void *arg) ++#endif /* USE_LIBOS */ + { + struct tcpip_msg *msg; + LWIP_UNUSED_ARG(arg); +@@ -242,6 +247,9 @@ tcpip_inpkt(struct pbuf *p, struct netif *inp, netif_input_fn input_fn) + #if LWIP_TCPIP_CORE_LOCKING_INPUT + err_t ret; + LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_inpkt: PACKET %p/%p\n", (void *)p, (void *)inp)); ++#if USE_LIBOS && LWIP_TIMERS ++ sys_timer_run(); ++#endif + LOCK_TCPIP_CORE(); + ret = input_fn(p, inp); + UNLOCK_TCPIP_CORE(); +@@ -321,6 +329,9 @@ tcpip_callback(tcpip_callback_fn function, void *ctx) + msg->msg.cb.function = function; + msg->msg.cb.ctx = ctx; + ++#if USE_LIBOS && LWIP_TIMER ++ sys_timer_run(); ++#endif + sys_mbox_post(&tcpip_mbox, msg); + return ERR_OK; + } +@@ -357,6 +368,9 @@ tcpip_try_callback(tcpip_callback_fn function, void *ctx) + msg->msg.cb.function = function; + msg->msg.cb.ctx = ctx; + ++#if USE_LIBOS && LWIP_TIMER ++ sys_timer_run(); ++#endif + if (sys_mbox_trypost(&tcpip_mbox, msg) != ERR_OK) { + memp_free(MEMP_TCPIP_MSG_API, msg); + return ERR_MEM; +@@ -438,6 +452,9 @@ tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t *sem) + { + #if LWIP_TCPIP_CORE_LOCKING + LWIP_UNUSED_ARG(sem); ++#if USE_LIBOS && LWIP_TIMERS ++ sys_timer_run(); ++#endif + LOCK_TCPIP_CORE(); + fn(apimsg); + UNLOCK_TCPIP_CORE(); +@@ -475,6 +492,9 @@ tcpip_api_call(tcpip_api_call_fn fn, struct tcpip_api_call_data *call) + #if LWIP_TCPIP_CORE_LOCKING + err_t err; + LOCK_TCPIP_CORE(); ++#if USE_LIBOS && LWIP_TIMERS ++ sys_timer_run(); ++#endif + err = fn(call); + UNLOCK_TCPIP_CORE(); + return err; +@@ -537,6 +557,10 @@ tcpip_callbackmsg_new(tcpip_callback_fn function, void *ctx) + msg->type = TCPIP_MSG_CALLBACK_STATIC; + msg->msg.cb.function = function; + msg->msg.cb.ctx = ctx; ++ ++#if USE_LIBOS && LWIP_TIMER ++ sys_timer_run(); ++#endif + return (struct tcpip_callback_msg *)msg; + } + +@@ -614,7 +638,9 @@ tcpip_init(tcpip_init_done_fn initfunc, void *arg) + } + #endif /* LWIP_TCPIP_CORE_LOCKING */ + ++#if !USE_LIBOS + sys_thread_new(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO); ++#endif + } + + /** +diff --git a/src/core/dir.mk b/src/core/dir.mk +index e5a055b..ebc01a5 100644 +--- a/src/core/dir.mk ++++ b/src/core/dir.mk +@@ -1,6 +1,6 @@ +-SRC = inet_chksum.c init.c ip.c mem.c memp.c netif.c pbuf.c \ +- raw.c stats.c tcp.c tcp_in.c tcp_out.c timeouts.c udp.c \ +- ipv4/etharp.c ipv4/icmp.c ipv4/ip4_addr.c ipv4/ip4.c \ +- ipv4/ip4_frag.c ++SRC = def.c inet_chksum.c init.c ip.c mem.c memp.c netif.c pbuf.c \ ++ raw.c tcp.c tcp_in.c tcp_out.c timeouts.c udp.c stats.c\ ++ ipv4/icmp.c ipv4/ip4_addr.c ipv4/ip4_frag.c ipv4/etharp.c \ ++ ipv4/ip4.c + + $(eval $(call register_dir, core, $(SRC))) +diff --git a/src/core/init.c b/src/core/init.c +index 3620e1d..60e1c68 100644 +--- a/src/core/init.c ++++ b/src/core/init.c +@@ -343,9 +343,7 @@ lwip_init(void) + + /* Modules initialization */ + stats_init(); +-#if !NO_SYS +- sys_init(); +-#endif /* !NO_SYS */ ++ + mem_init(); + memp_init(); + pbuf_init(); +diff --git a/src/core/ip.c b/src/core/ip.c +index 18514cf..0d39d2d 100644 +--- a/src/core/ip.c ++++ b/src/core/ip.c +@@ -61,7 +61,7 @@ + #include "lwip/ip.h" + + /** Global data for both IPv4 and IPv6 */ +-struct ip_globals ip_data; ++PER_THREAD struct ip_globals ip_data; + + #if LWIP_IPV4 && LWIP_IPV6 + +diff --git a/src/core/ipv4/ip4.c b/src/core/ipv4/ip4.c +index 26c26a9..c83afbe 100644 +--- a/src/core/ipv4/ip4.c ++++ b/src/core/ipv4/ip4.c +@@ -282,7 +282,9 @@ ip4_forward(struct pbuf *p, struct ip_hdr *iphdr, struct netif *inp) + { + struct netif *netif; + ++#ifndef LWIP_PERF + PERF_START; ++#endif + LWIP_UNUSED_ARG(inp); + + if (!ip4_canforward(p)) { +@@ -344,7 +346,9 @@ ip4_forward(struct pbuf *p, struct ip_hdr *iphdr, struct netif *inp) + MIB2_STATS_INC(mib2.ipforwdatagrams); + IP_STATS_INC(ip.xmit); + ++#ifndef LWIP_PERF + PERF_STOP("ip4_forward"); ++#endif + /* don't fragment if interface has mtu set to 0 [loopif] */ + if (netif->mtu && (p->tot_len > netif->mtu)) { + if ((IPH_OFFSET(iphdr) & PP_NTOHS(IP_DF)) == 0) { +@@ -438,6 +442,8 @@ ip4_input(struct pbuf *p, struct netif *inp) + + LWIP_ASSERT_CORE_LOCKED(); + ++ PERF_START(PERF_LAYER_IP, PERF_POINT_IP_RECV); ++ + IP_STATS_INC(ip.recv); + MIB2_STATS_INC(mib2.ipinreceives); + +@@ -700,13 +706,19 @@ ip4_input(struct pbuf *p, struct netif *inp) + case IP_PROTO_UDPLITE: + #endif /* LWIP_UDPLITE */ + MIB2_STATS_INC(mib2.ipindelivers); ++ PERF_PAUSE(PERF_LAYER_IP); + udp_input(p, inp); ++ PERF_RESUME(PERF_LAYER_IP, PERF_POINT_IP_RECV); + break; + #endif /* LWIP_UDP */ + #if LWIP_TCP + case IP_PROTO_TCP: + MIB2_STATS_INC(mib2.ipindelivers); ++ PERF_PAUSE(PERF_LAYER_IP); ++ PERF_START(PERF_LAYER_TCP, PERF_POINT_TCP_RECV); + tcp_input(p, inp); ++ PERF_STOP_INCREASE_COUNT("tcp_input", PERF_LAYER_TCP); ++ PERF_RESUME(PERF_LAYER_IP, PERF_POINT_IP_RECV); + break; + #endif /* LWIP_TCP */ + #if LWIP_ICMP +@@ -755,6 +767,8 @@ ip4_input(struct pbuf *p, struct netif *inp) + ip4_addr_set_any(ip4_current_src_addr()); + ip4_addr_set_any(ip4_current_dest_addr()); + ++ PERF_STOP_INCREASE_COUNT("ip4_input", PERF_LAYER_IP); ++ + return ERR_OK; + } + +diff --git a/src/core/ipv6/ip6.c b/src/core/ipv6/ip6.c +index 060d5f3..9d904ec 100644 +--- a/src/core/ipv6/ip6.c ++++ b/src/core/ipv6/ip6.c +@@ -522,6 +522,8 @@ ip6_input(struct pbuf *p, struct netif *inp) + + LWIP_ASSERT_CORE_LOCKED(); + ++ PERF_START(PERF_LAYER_IP, PERF_POINT_IP_RECV); ++ + IP6_STATS_INC(ip6.recv); + + /* identify the IP header */ +@@ -1069,12 +1071,18 @@ options_done: + #if LWIP_UDPLITE + case IP6_NEXTH_UDPLITE: + #endif /* LWIP_UDPLITE */ ++ PERF_PAUSE(PERF_LAYER_IP); + udp_input(p, inp); ++ PERF_RESUME(PERF_LAYER_IP, PERF_POINT_IP_RECV); + break; + #endif /* LWIP_UDP */ + #if LWIP_TCP + case IP6_NEXTH_TCP: ++ PERF_PAUSE(PERF_LAYER_IP); ++ PERF_START(PERF_LAYER_TCP, PERF_POINT_TCP_RECV); + tcp_input(p, inp); ++ PERF_STOP_INCREASE_COUNT("tcp_input", PERF_LAYER_TCP); ++ PERF_RESUME(PERF_LAYER_IP, PERF_POINT_IP_RECV); + break; + #endif /* LWIP_TCP */ + #if LWIP_ICMP6 +@@ -1115,6 +1123,8 @@ ip6_input_cleanup: + ip6_addr_set_zero(ip6_current_src_addr()); + ip6_addr_set_zero(ip6_current_dest_addr()); + ++ PERF_STOP_INCREASE_COUNT("ip6_input", PERF_LAYER_IP); ++ + return ERR_OK; + } + +diff --git a/src/core/mem.c b/src/core/mem.c +index 315fb3c..84b3fcc 100644 +--- a/src/core/mem.c ++++ b/src/core/mem.c +@@ -381,9 +381,9 @@ LWIP_DECLARE_MEMORY_ALIGNED(ram_heap, MEM_SIZE_ALIGNED + (2U * SIZEOF_STRUCT_MEM + #endif /* LWIP_RAM_HEAP_POINTER */ + + /** pointer to the heap (ram_heap): for alignment, ram is now a pointer instead of an array */ +-static u8_t *ram; ++static PER_THREAD u8_t *ram; + /** the last entry, always unused! */ +-static struct mem *ram_end; ++static PER_THREAD struct mem *ram_end; + + /** concurrent access protection */ + #if !NO_SYS +@@ -418,7 +418,7 @@ static volatile u8_t mem_free_count; + #endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */ + + /** pointer to the lowest free block, this is used for faster search */ +-static struct mem * LWIP_MEM_LFREE_VOLATILE lfree; ++static PER_THREAD struct mem * LWIP_MEM_LFREE_VOLATILE lfree; + + #if MEM_SANITY_CHECK + static void mem_sanity(void); +diff --git a/src/core/memp.c b/src/core/memp.c +index 352ce5a..454ba32 100644 +--- a/src/core/memp.c ++++ b/src/core/memp.c +@@ -78,10 +78,14 @@ + #define LWIP_MEMPOOL(name,num,size,desc) LWIP_MEMPOOL_DECLARE(name,num,size,desc) + #include "lwip/priv/memp_std.h" + ++#if USE_LIBOS ++PER_THREAD struct memp_desc* memp_pools[MEMP_MAX] = {NULL}; ++#else + const struct memp_desc *const memp_pools[MEMP_MAX] = { + #define LWIP_MEMPOOL(name,num,size,desc) &memp_ ## name, + #include "lwip/priv/memp_std.h" + }; ++#endif /* USE_LIBOS */ + + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME +diff --git a/src/core/netif.c b/src/core/netif.c +index 088b50e..70392cb 100644 +--- a/src/core/netif.c ++++ b/src/core/netif.c +@@ -107,12 +107,12 @@ static netif_ext_callback_t *ext_callback; + #endif + + #if !LWIP_SINGLE_NETIF +-struct netif *netif_list; ++PER_THREAD struct netif *netif_list; + #endif /* !LWIP_SINGLE_NETIF */ +-struct netif *netif_default; ++PER_THREAD struct netif *netif_default; + + #define netif_index_to_num(index) ((index) - 1) +-static u8_t netif_num; ++static PER_THREAD u8_t netif_num; + + #if LWIP_NUM_NETIF_CLIENT_DATA > 0 + static u8_t netif_client_id; +@@ -138,7 +138,7 @@ static err_t netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, const i + #endif + + +-static struct netif loop_netif; ++static PER_THREAD struct netif loop_netif; + + /** + * Initialize a lwip network interface structure for a loopback interface +diff --git a/src/core/pbuf.c b/src/core/pbuf.c +index 7638dfd..27afc28 100644 +--- a/src/core/pbuf.c ++++ b/src/core/pbuf.c +@@ -737,7 +737,9 @@ pbuf_free(struct pbuf *p) + } + LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free(%p)\n", (void *)p)); + ++#ifndef LWIP_PERF + PERF_START; ++#endif + + count = 0; + /* de-allocate all consecutive pbufs from the head of the chain that +@@ -794,7 +796,9 @@ pbuf_free(struct pbuf *p) + p = NULL; + } + } ++#ifndef LWIP_PERF + PERF_STOP("pbuf_free"); ++#endif + /* return number of de-allocated pbufs */ + return count; + } +diff --git a/src/core/stats.c b/src/core/stats.c +index 34e9b27..f7e0604 100644 +--- a/src/core/stats.c ++++ b/src/core/stats.c +@@ -47,7 +47,7 @@ + + #include + +-struct stats_ lwip_stats; ++PER_THREAD struct stats_ lwip_stats; + + void + stats_init(void) +@@ -59,6 +59,17 @@ stats_init(void) + #endif /* LWIP_DEBUG */ + } + ++int get_mib2_stats(char *buf) ++{ ++ int len = 0; ++#if MIB2_STATS ++ len = (long)&((struct stats_mib2 *)0)->udpindatagrams; ++ /* we just need the ip&tcp, others not needed. */ ++ memcpy(buf, &lwip_stats.mib2, len); ++#endif ++ return len; ++} ++ + #if LWIP_STATS_DISPLAY + void + stats_display_proto(struct stats_proto *proto, const char *name) +diff --git a/src/core/tcp.c b/src/core/tcp.c +index 371db2b..9e75810 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -113,6 +113,7 @@ + #include "lwip/nd6.h" + + #include ++#include + + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME +@@ -157,36 +158,50 @@ static const char *const tcp_state_str[] = { + + /* last local TCP port */ + static u16_t tcp_port = TCP_LOCAL_PORT_RANGE_START; ++static pthread_mutex_t g_tcp_port_mutex = PTHREAD_MUTEX_INITIALIZER; + + /* Incremented every coarse grained timer shot (typically every 500 ms). */ +-u32_t tcp_ticks; +-static const u8_t tcp_backoff[13] = ++PER_THREAD u32_t tcp_ticks; ++static PER_THREAD const u8_t tcp_backoff[13] = + { 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7}; + /* Times per slowtmr hits */ +-static const u8_t tcp_persist_backoff[7] = { 3, 6, 12, 24, 48, 96, 120 }; ++static PER_THREAD const u8_t tcp_persist_backoff[7] = { 3, 6, 12, 24, 48, 96, 120 }; + + /* The TCP PCB lists. */ + + /** List of all TCP PCBs bound but not yet (connected || listening) */ +-struct tcp_pcb *tcp_bound_pcbs; ++PER_THREAD struct tcp_pcb *tcp_bound_pcbs; + /** List of all TCP PCBs in LISTEN state */ +-union tcp_listen_pcbs_t tcp_listen_pcbs; ++PER_THREAD union tcp_listen_pcbs_t tcp_listen_pcbs; + /** List of all TCP PCBs that are in a state in which + * they accept or send data. */ +-struct tcp_pcb *tcp_active_pcbs; ++PER_THREAD struct tcp_pcb *tcp_active_pcbs; + /** List of all TCP PCBs in TIME-WAIT state */ +-struct tcp_pcb *tcp_tw_pcbs; ++PER_THREAD struct tcp_pcb *tcp_tw_pcbs; + + /** An array with all (non-temporary) PCB lists, mainly used for smaller code size */ +-struct tcp_pcb **const tcp_pcb_lists[] = {&tcp_listen_pcbs.pcbs, &tcp_bound_pcbs, +- &tcp_active_pcbs, &tcp_tw_pcbs +-}; ++PER_THREAD struct tcp_pcb ** tcp_pcb_lists[NUM_TCP_PCB_LISTS] = {NULL, NULL, NULL, NULL}; ++ ++#if TCP_PCB_HASH ++#define INIT_TCP_HTABLE(ht_ptr) \ ++ do { \ ++ int _i; \ ++ (ht_ptr)->size = TCP_HTABLE_SIZE; \ ++ for (_i = 0; _i < TCP_HTABLE_SIZE; ++_i) { \ ++ if (sys_mutex_new(&(ht_ptr)->array[_i].mutex) != ERR_OK) \ ++ LWIP_ASSERT("failed to create ht->array[].mutex", 0);\ ++ INIT_HLIST_HEAD(&(ht_ptr)->array[_i].chain); \ ++ }\ ++ } while (0) ++ ++PER_THREAD struct tcp_hash_table *tcp_active_htable; /* key: lport/fport/lip/fip */ ++#endif + +-u8_t tcp_active_pcbs_changed; ++PER_THREAD u8_t tcp_active_pcbs_changed; + + /** Timer counter to handle calling slow-timer from tcp_tmr() */ +-static u8_t tcp_timer; +-static u8_t tcp_timer_ctr; ++static PER_THREAD u8_t tcp_timer; ++static PER_THREAD u8_t tcp_timer_ctr; + static u16_t tcp_new_port(void); + + static err_t tcp_close_shutdown_fin(struct tcp_pcb *pcb); +@@ -200,9 +215,20 @@ static void tcp_ext_arg_invoke_callbacks_destroyed(struct tcp_pcb_ext_args *ext_ + void + tcp_init(void) + { ++ tcp_pcb_lists[0] = &tcp_listen_pcbs.pcbs; ++ tcp_pcb_lists[1] = &tcp_bound_pcbs; ++ tcp_pcb_lists[2] = &tcp_active_pcbs; ++ tcp_pcb_lists[3] = &tcp_tw_pcbs; ++ + #ifdef LWIP_RAND + tcp_port = TCP_ENSURE_LOCAL_PORT_RANGE(LWIP_RAND()); + #endif /* LWIP_RAND */ ++ ++#if TCP_PCB_HASH ++ tcp_active_htable = (struct tcp_hash_table*)mem_malloc(sizeof(struct tcp_hash_table)); ++ LWIP_ASSERT("malloc tcp_active_htable mem failed.", tcp_active_htable != NULL); ++ INIT_TCP_HTABLE(tcp_active_htable); ++#endif + } + + /** Free a tcp pcb */ +@@ -361,6 +387,9 @@ tcp_close_shutdown(struct tcp_pcb *pcb, u8_t rst_on_unacked_data) + pcb->local_port, pcb->remote_port); + + tcp_pcb_purge(pcb); ++#if TCP_PCB_HASH ++ TCP_RMV_ACTIVE_HASH(pcb); ++#endif + TCP_RMV_ACTIVE(pcb); + /* Deallocate the pcb since we already sent a RST for it */ + if (tcp_input_pcb == pcb) { +@@ -395,6 +424,9 @@ tcp_close_shutdown(struct tcp_pcb *pcb, u8_t rst_on_unacked_data) + tcp_free_listen(pcb); + break; + case SYN_SENT: ++#if TCP_PCB_HASH ++ TCP_PCB_REMOVE_ACTIVE_HASH(pcb); ++#endif + TCP_PCB_REMOVE_ACTIVE(pcb); + tcp_free(pcb); + MIB2_STATS_INC(mib2.tcpattemptfails); +@@ -494,6 +526,7 @@ tcp_close(struct tcp_pcb *pcb) + /* Set a flag not to receive any more data... */ + tcp_set_flags(pcb, TF_RXCLOSED); + } ++ + /* ... and close */ + return tcp_close_shutdown(pcb, 1); + } +@@ -599,6 +632,9 @@ tcp_abandon(struct tcp_pcb *pcb, int reset) + } else { + send_rst = reset; + local_port = pcb->local_port; ++#if TCP_PCB_HASH ++ TCP_PCB_REMOVE_ACTIVE_HASH(pcb); ++#endif + TCP_PCB_REMOVE_ACTIVE(pcb); + } + if (pcb->unacked != NULL) { +@@ -880,6 +916,11 @@ tcp_listen_with_backlog_and_err(struct tcp_pcb *pcb, u8_t backlog, err_t *err) + } + } + #endif /* SO_REUSE */ ++ ++#if USE_LIBOS ++ vdev_reg_done(REG_RING_TCP_LISTEN, pcb); ++#endif ++ + lpcb = (struct tcp_pcb_listen *)memp_malloc(MEMP_TCP_PCB_LISTEN); + if (lpcb == NULL) { + res = ERR_MEM; +@@ -1015,6 +1056,7 @@ tcp_new_port(void) + u16_t n = 0; + struct tcp_pcb *pcb; + ++ pthread_mutex_lock(&g_tcp_port_mutex); + again: + tcp_port++; + if (tcp_port == TCP_LOCAL_PORT_RANGE_END) { +@@ -1032,6 +1074,8 @@ again: + } + } + } ++ pthread_mutex_unlock(&g_tcp_port_mutex); ++ + return tcp_port; + } + +@@ -1142,6 +1186,10 @@ tcp_connect(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port, + #endif /* SO_REUSE */ + } + ++#if USE_LIBOS ++ vdev_reg_done(REG_RING_TCP_CONNECT, pcb); ++#endif ++ + iss = tcp_next_iss(pcb); + pcb->rcv_nxt = 0; + pcb->snd_nxt = iss; +@@ -1174,6 +1222,9 @@ tcp_connect(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port, + if (old_local_port != 0) { + TCP_RMV(&tcp_bound_pcbs, pcb); + } ++#if TCP_PCB_HASH ++ TCP_REG_ACTIVE_HASH(pcb); ++#endif + TCP_REG_ACTIVE(pcb); + MIB2_STATS_INC(mib2.tcpactiveopens); + +@@ -1389,11 +1440,26 @@ tcp_slowtmr_start: + if (prev != NULL) { + LWIP_ASSERT("tcp_slowtmr: middle tcp != tcp_active_pcbs", pcb != tcp_active_pcbs); + prev->next = pcb->next; ++#if USE_LIBOS ++ if (pcb->next) ++ pcb->next->prev = prev; ++ //dont set next NULL, it will be used below ++ pcb->prev = NULL; ++#endif + } else { + /* This PCB was the first. */ + LWIP_ASSERT("tcp_slowtmr: first pcb == tcp_active_pcbs", tcp_active_pcbs == pcb); + tcp_active_pcbs = pcb->next; ++#if USE_LIBOS ++ if (pcb->next) ++ pcb->next->prev = NULL; ++ //dont set next NULL, it will be used below ++ pcb->prev = NULL; ++#endif + } ++#if TCP_PCB_HASH ++ TCP_RMV_ACTIVE_HASH(pcb); ++#endif + + if (pcb_reset) { + tcp_rst(pcb, pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip, +@@ -1404,6 +1470,9 @@ tcp_slowtmr_start: + last_state = pcb->state; + pcb2 = pcb; + pcb = pcb->next; ++#if USE_LIBOS ++ pcb2->next = NULL; ++#endif + tcp_free(pcb2); + + tcp_active_pcbs_changed = 0; +@@ -1455,13 +1524,28 @@ tcp_slowtmr_start: + if (prev != NULL) { + LWIP_ASSERT("tcp_slowtmr: middle tcp != tcp_tw_pcbs", pcb != tcp_tw_pcbs); + prev->next = pcb->next; ++#if USE_LIBOS ++ if (pcb->next) ++ pcb->next->prev = prev; ++ //dont set next NULL, it will be used below ++ pcb->prev = NULL; ++#endif + } else { + /* This PCB was the first. */ + LWIP_ASSERT("tcp_slowtmr: first pcb == tcp_tw_pcbs", tcp_tw_pcbs == pcb); + tcp_tw_pcbs = pcb->next; ++#if USE_LIBOS ++ if (pcb->next) ++ pcb->next->prev = NULL; ++ //dont set next NULL, it will be used below ++ pcb->prev = NULL; ++#endif + } + pcb2 = pcb; + pcb = pcb->next; ++#if USE_LIBOS ++ pcb2->next = NULL; ++#endif + tcp_free(pcb2); + } else { + prev = pcb; +@@ -2210,6 +2294,14 @@ tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) + LWIP_ASSERT("tcp_pcb_remove: tcp_pcbs_sane()", tcp_pcbs_sane()); + } + ++#if TCP_PCB_HASH ++void ++tcp_pcb_remove_hash(struct tcp_hash_table *htb, struct tcp_pcb *pcb) ++{ ++ TCP_RMV_HASH(htb, pcb); ++} ++#endif /* TCP_PCB_HASH */ ++ + /** + * Calculates a new initial sequence number for new connections. + * +@@ -2384,6 +2476,84 @@ tcp_tcp_get_tcp_addrinfo(struct tcp_pcb *pcb, int local, ip_addr_t *addr, u16_t + return ERR_VAL; + } + ++uint32_t tcp_get_conn_num(void) ++{ ++ struct tcp_pcb *pcb = NULL; ++ struct tcp_pcb_listen *pcbl = NULL; ++ uint32_t conn_num = 0; ++ ++ for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { ++ conn_num++; ++ } ++ ++ for (pcbl = tcp_listen_pcbs.listen_pcbs; pcbl != NULL; pcbl = pcbl->next) { ++ conn_num++; ++ } ++ ++ for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) { ++ conn_num++; ++ } ++ ++ return conn_num; ++} ++ ++void tcp_get_conn(char *buf, int32_t len, uint32_t *conn_num) ++{ ++ int tmp_len = 0; ++ char *tmp_buf = buf; ++ struct tcp_pcb_dp tdp; ++ struct tcp_pcb *pcb = NULL; ++ struct tcp_pcb_listen *pcbl = NULL; ++ ++#define COPY_TDP(b, l) \ ++ do { \ ++ if (l + sizeof(tdp) <= len) { \ ++ memcpy(b, &tdp, sizeof(tdp)); \ ++ b += sizeof(tdp); \ ++ l += sizeof(tdp); \ ++ *conn_num += 1; \ ++ } else \ ++ return; \ ++ } while(0); ++ ++ *conn_num = 0; ++ ++ for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { ++ tdp.state = ACTIVE_LIST; ++ tdp.lip = pcb->local_ip.addr; ++ tdp.rip = pcb->remote_ip.addr; ++ tdp.l_port = pcb->local_port; ++ tdp.r_port = pcb->remote_port; ++ tdp.s_next = pcb->snd_queuelen; ++ /* lwip not cache rcv buf. Set it to 0. */ ++ tdp.r_next = 0; ++ tdp.tcp_sub_state = pcb->state; ++ COPY_TDP(tmp_buf, tmp_len); ++ } ++ ++ for (pcbl = tcp_listen_pcbs.listen_pcbs; pcbl != NULL; pcbl = pcbl->next) { ++ tdp.state = LISTEN_LIST; ++ tdp.lip = pcbl->local_ip.addr; ++ tdp.rip = pcbl->remote_ip.addr; ++ tdp.l_port = pcbl->local_port; ++ tdp.tcp_sub_state = pcbl->state; ++ COPY_TDP(tmp_buf, tmp_len); ++ } ++ ++ for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) { ++ tdp.state = TIME_WAIT_LIST; ++ tdp.lip = pcb->local_ip.addr; ++ tdp.rip = pcb->remote_ip.addr; ++ tdp.l_port = pcb->local_port; ++ tdp.r_port = pcb->remote_port; ++ tdp.s_next = pcb->snd_queuelen; ++ /* lwip not cache rcv buf. Set it to 0. */ ++ tdp.r_next = 0; ++ tdp.tcp_sub_state = pcb->state; ++ COPY_TDP(tmp_buf, tmp_len); ++ } ++} ++ + #if TCP_QUEUE_OOSEQ + /* Free all ooseq pbufs (and possibly reset SACK state) */ + void +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index 2202e38..2b4c160 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -71,21 +71,22 @@ + /* These variables are global to all functions involved in the input + processing of TCP segments. They are set by the tcp_input() + function. */ +-static struct tcp_seg inseg; +-static struct tcp_hdr *tcphdr; +-static u16_t tcphdr_optlen; +-static u16_t tcphdr_opt1len; +-static u8_t *tcphdr_opt2; +-static u16_t tcp_optidx; +-static u32_t seqno, ackno; +-static tcpwnd_size_t recv_acked; +-static u16_t tcplen; +-static u8_t flags; +- +-static u8_t recv_flags; +-static struct pbuf *recv_data; +- +-struct tcp_pcb *tcp_input_pcb; ++static PER_THREAD struct tcp_seg inseg; ++static PER_THREAD struct tcp_hdr *tcphdr; ++static PER_THREAD u16_t tcphdr_optlen; ++static PER_THREAD u16_t tcphdr_opt1len; ++static PER_THREAD u8_t *tcphdr_opt2; ++static PER_THREAD u16_t tcp_optidx; ++static PER_THREAD u32_t seqno; ++static PER_THREAD u32_t ackno; ++static PER_THREAD tcpwnd_size_t recv_acked; ++static PER_THREAD u16_t tcplen; ++static PER_THREAD u8_t flags; ++ ++static PER_THREAD u8_t recv_flags; ++static PER_THREAD struct pbuf *recv_data; ++ ++PER_THREAD struct tcp_pcb *tcp_input_pcb; + + /* Forward declarations. */ + static err_t tcp_process(struct tcp_pcb *pcb); +@@ -126,11 +127,20 @@ tcp_input(struct pbuf *p, struct netif *inp) + u8_t hdrlen_bytes; + err_t err; + ++#if TCP_PCB_HASH ++ u32_t idx; ++ struct hlist_head *head; ++ struct hlist_node *node; ++ pcb = NULL; ++#endif ++ + LWIP_UNUSED_ARG(inp); + LWIP_ASSERT_CORE_LOCKED(); + LWIP_ASSERT("tcp_input: invalid pbuf", p != NULL); + ++#ifndef LWIP_PERF + PERF_START; ++#endif + + TCP_STATS_INC(tcp.recv); + MIB2_STATS_INC(mib2.tcpinsegs); +@@ -247,7 +257,15 @@ tcp_input(struct pbuf *p, struct netif *inp) + for an active connection. */ + prev = NULL; + ++#if TCP_PCB_HASH ++ idx = TUPLE4_HASH_FN( ip_current_dest_addr()->addr, tcphdr->dest, ++ ip_current_src_addr()->addr, tcphdr->src) & ++ (tcp_active_htable->size - 1); ++ head = &tcp_active_htable->array[idx].chain; ++ tcppcb_hlist_for_each(pcb, node, head) { ++#else + for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { ++#endif + LWIP_ASSERT("tcp_input: active pcb->state != CLOSED", pcb->state != CLOSED); + LWIP_ASSERT("tcp_input: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT); + LWIP_ASSERT("tcp_input: active pcb->state != LISTEN", pcb->state != LISTEN); +@@ -263,6 +281,7 @@ tcp_input(struct pbuf *p, struct netif *inp) + pcb->local_port == tcphdr->dest && + ip_addr_cmp(&pcb->remote_ip, ip_current_src_addr()) && + ip_addr_cmp(&pcb->local_ip, ip_current_dest_addr())) { ++#if !TCP_PCB_HASH + /* Move this PCB to the front of the list so that subsequent + lookups will be faster (we exploit locality in TCP segment + arrivals). */ +@@ -275,9 +294,14 @@ tcp_input(struct pbuf *p, struct netif *inp) + TCP_STATS_INC(tcp.cachehit); + } + LWIP_ASSERT("tcp_input: pcb->next != pcb (after cache)", pcb->next != pcb); ++#endif + break; + } ++#if TCP_PCB_HASH ++ pcb = NULL; ++#else + prev = pcb; ++#endif + } + + if (pcb == NULL) { +@@ -363,8 +387,15 @@ tcp_input(struct pbuf *p, struct netif *inp) + arrivals). */ + if (prev != NULL) { + ((struct tcp_pcb_listen *)prev)->next = lpcb->next; ++#if USE_LIBOS ++ if (lpcb->next) ++ lpcb->next->prev = (struct tcp_pcb_listen *)prev; ++#endif + /* our successor is the remainder of the listening list */ + lpcb->next = tcp_listen_pcbs.listen_pcbs; ++#if USE_LIBOS ++ lpcb->prev = NULL; ++#endif + /* put this listening pcb at the head of the listening list */ + tcp_listen_pcbs.listen_pcbs = lpcb; + } else { +@@ -445,6 +476,9 @@ tcp_input(struct pbuf *p, struct netif *inp) + application that the connection is dead before we + deallocate the PCB. */ + TCP_EVENT_ERR(pcb->state, pcb->errf, pcb->callback_arg, ERR_RST); ++#if TCP_PCB_HASH ++ tcp_pcb_remove_hash(tcp_active_htable, pcb); ++#endif + tcp_pcb_remove(&tcp_active_pcbs, pcb); + tcp_free(pcb); + } else { +@@ -550,7 +584,19 @@ tcp_input(struct pbuf *p, struct netif *inp) + goto aborted; + } + /* Try to send something out. */ ++#if LWIP_RECORD_PERF ++ if (check_layer_point(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_ACK_RECV)) { ++ PERF_PAUSE(PERF_LAYER_TCP); ++ PERF_START(PERF_LAYER_TCP, PERF_POINT_TCP_ACK_SEND); ++ } ++#endif + tcp_output(pcb); ++#if LWIP_RECORD_PERF ++ if (check_layer_point(PERF_LAYER_TCP, PERF_POINT_TCP_ACK_SEND)) { ++ PERF_STOP_INCREASE_COUNT("tcp_in", PERF_LAYER_TCP); ++ PERF_RESUME(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_ACK_RECV); ++ } ++#endif + #if TCP_INPUT_DEBUG + #if TCP_DEBUG + tcp_debug_print_state(pcb->state); +@@ -583,7 +629,9 @@ aborted: + } + + LWIP_ASSERT("tcp_input: tcp_pcbs_sane()", tcp_pcbs_sane()); ++#ifndef LWIP_PERF + PERF_STOP("tcp_input"); ++#endif + return; + dropped: + TCP_STATS_INC(tcp.drop); +@@ -610,6 +658,9 @@ tcp_input_delayed_close(struct tcp_pcb *pcb) + ensure the application doesn't continue using the PCB. */ + TCP_EVENT_ERR(pcb->state, pcb->errf, pcb->callback_arg, ERR_CLSD); + } ++#if TCP_PCB_HASH ++ tcp_pcb_remove_hash(tcp_active_htable, pcb); ++#endif + tcp_pcb_remove(&tcp_active_pcbs, pcb); + tcp_free(pcb); + return 1; +@@ -649,6 +700,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb) + tcp_rst((const struct tcp_pcb *)pcb, ackno, seqno + tcplen, ip_current_dest_addr(), + ip_current_src_addr(), tcphdr->dest, tcphdr->src); + } else if (flags & TCP_SYN) { ++ PERF_UPDATE_POINT(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_RECV); + LWIP_DEBUGF(TCP_DEBUG, ("TCP connection request %"U16_F" -> %"U16_F".\n", tcphdr->src, tcphdr->dest)); + #if TCP_LISTEN_BACKLOG + if (pcb->accepts_pending >= pcb->backlog) { +@@ -695,6 +747,9 @@ tcp_listen_input(struct tcp_pcb_listen *pcb) + npcb->netif_idx = pcb->netif_idx; + /* Register the new PCB so that we can begin receiving segments + for it. */ ++#if TCP_PCB_HASH ++ TCP_REG_ACTIVE_HASH(npcb); ++#endif + TCP_REG_ACTIVE(npcb); + + /* Parse any options in the SYN. */ +@@ -715,13 +770,18 @@ tcp_listen_input(struct tcp_pcb_listen *pcb) + } + #endif + ++ PERF_PAUSE(PERF_LAYER_TCP); ++ PERF_START(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_ACK_SEND); + /* Send a SYN|ACK together with the MSS option. */ + rc = tcp_enqueue_flags(npcb, TCP_SYN | TCP_ACK); + if (rc != ERR_OK) { + tcp_abandon(npcb, 0); ++ PERF_RESUME(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_RECV); + return; + } + tcp_output(npcb); ++ PERF_STOP_INCREASE_COUNT("tcp_output", PERF_LAYER_TCP); ++ PERF_RESUME(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_RECV); + } + return; + } +@@ -858,6 +918,7 @@ tcp_process(struct tcp_pcb *pcb) + /* received SYN ACK with expected sequence number? */ + if ((flags & TCP_ACK) && (flags & TCP_SYN) + && (ackno == pcb->lastack + 1)) { ++ PERF_UPDATE_POINT(PERF_LAYER_TCP, PERF_POINT_TCP_SYN_ACK_RECV); + pcb->rcv_nxt = seqno + 1; + pcb->rcv_ann_right_edge = pcb->rcv_nxt; + pcb->lastack = ackno; +@@ -925,6 +986,7 @@ tcp_process(struct tcp_pcb *pcb) + /* expected ACK number? */ + if (TCP_SEQ_BETWEEN(ackno, pcb->lastack + 1, pcb->snd_nxt)) { + pcb->state = ESTABLISHED; ++ PERF_UPDATE_POINT(PERF_LAYER_TCP, PERF_POINT_TCP_ACK_RECV); + LWIP_DEBUGF(TCP_DEBUG, ("TCP connection established %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest)); + #if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG + if (pcb->listener == NULL) { +@@ -995,6 +1057,9 @@ tcp_process(struct tcp_pcb *pcb) + ("TCP connection closed: FIN_WAIT_1 %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest)); + tcp_ack_now(pcb); + tcp_pcb_purge(pcb); ++#if TCP_PCB_HASH ++ TCP_RMV_ACTIVE_HASH(pcb); ++#endif + TCP_RMV_ACTIVE(pcb); + pcb->state = TIME_WAIT; + TCP_REG(&tcp_tw_pcbs, pcb); +@@ -1013,6 +1078,9 @@ tcp_process(struct tcp_pcb *pcb) + LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: FIN_WAIT_2 %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest)); + tcp_ack_now(pcb); + tcp_pcb_purge(pcb); ++#if TCP_PCB_HASH ++ TCP_RMV_ACTIVE_HASH(pcb); ++#endif + TCP_RMV_ACTIVE(pcb); + pcb->state = TIME_WAIT; + TCP_REG(&tcp_tw_pcbs, pcb); +@@ -1023,6 +1091,9 @@ tcp_process(struct tcp_pcb *pcb) + if ((flags & TCP_ACK) && ackno == pcb->snd_nxt && pcb->unsent == NULL) { + LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: CLOSING %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest)); + tcp_pcb_purge(pcb); ++#if TCP_PCB_HASH ++ TCP_RMV_ACTIVE_HASH(pcb); ++#endif + TCP_RMV_ACTIVE(pcb); + pcb->state = TIME_WAIT; + TCP_REG(&tcp_tw_pcbs, pcb); +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index 8149d39..dac498e 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -271,7 +271,7 @@ tcp_pbuf_prealloc(pbuf_layer layer, u16_t length, u16_t max_length, + return p; + } + #else /* TCP_OVERSIZE */ +-#define tcp_pbuf_prealloc(layer, length, mx, os, pcb, api, fst) pbuf_alloc((layer), (length), PBUF_RAM) ++#define tcp_pbuf_prealloc(layer, length, mx, os, pcb, api, fst) pbuf_alloc((layer), (length), PBUF_POOL) + #endif /* TCP_OVERSIZE */ + + #if TCP_CHECKSUM_ON_COPY +@@ -640,7 +640,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + ((struct pbuf_rom *)p2)->payload = (const u8_t *)arg + pos; + + /* Second, allocate a pbuf for the headers. */ +- if ((p = pbuf_alloc(PBUF_TRANSPORT, optlen, PBUF_RAM)) == NULL) { ++ if ((p = pbuf_alloc(PBUF_TRANSPORT, optlen, PBUF_POOL)) == NULL) { + /* If allocation fails, we have to deallocate the data pbuf as + * well. */ + pbuf_free(p2); +@@ -1458,6 +1458,11 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + err_t err; + u16_t len; + u32_t *opts; ++ ++#if LWIP_RECORD_PERF ++ int tmpPoint; ++#endif ++ + #if TCP_CHECKSUM_ON_COPY + int seg_chksum_was_swapped = 0; + #endif +@@ -1604,6 +1609,9 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + #endif /* CHECKSUM_GEN_TCP */ + TCP_STATS_INC(tcp.xmit); + ++ PERF_PAUSE_RETURN_POINT(PERF_LAYER_TCP, tmpPoint); ++ PERF_START(PERF_LAYER_IP, PERF_POINT_IP_SEND); ++ + NETIF_SET_HINTS(netif, &(pcb->netif_hints)); + err = ip_output_if(seg->p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl, + pcb->tos, IP_PROTO_TCP, netif); +@@ -1618,6 +1626,9 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + } + #endif + ++ PERF_STOP_INCREASE_COUNT("ip_out", PERF_LAYER_IP); ++ PERF_RESUME(PERF_LAYER_TCP, tmpPoint); ++ + return err; + } + +@@ -2024,6 +2035,10 @@ tcp_send_empty_ack(struct tcp_pcb *pcb) + u8_t optlen, optflags = 0; + u8_t num_sacks = 0; + ++#if LWIP_RECORD_PERF ++ int tmpPoint; ++#endif ++ + LWIP_ASSERT("tcp_send_empty_ack: invalid pcb", pcb != NULL); + + #if LWIP_TCP_TIMESTAMPS +@@ -2040,6 +2055,9 @@ tcp_send_empty_ack(struct tcp_pcb *pcb) + } + #endif + ++ PERF_PAUSE_RETURN_POINT(PERF_LAYER_TCP, tmpPoint); ++ PERF_START(PERF_LAYER_IP, PERF_POINT_IP_SEND); ++ + p = tcp_output_alloc_header(pcb, optlen, 0, lwip_htonl(pcb->snd_nxt)); + if (p == NULL) { + /* let tcp_fasttmr retry sending this ACK */ +@@ -2064,6 +2082,9 @@ tcp_send_empty_ack(struct tcp_pcb *pcb) + tcp_clear_flags(pcb, TF_ACK_DELAY | TF_ACK_NOW); + } + ++ PERF_STOP_INCREASE_COUNT("ip_out", PERF_LAYER_IP); ++ PERF_RESUME(PERF_LAYER_TCP, tmpPoint); ++ + return err; + } + +diff --git a/src/core/timeouts.c b/src/core/timeouts.c +index f37acfe..0542a32 100644 +--- a/src/core/timeouts.c ++++ b/src/core/timeouts.c +@@ -119,9 +119,9 @@ const int lwip_num_cyclic_timers = LWIP_ARRAYSIZE(lwip_cyclic_timers); + #if LWIP_TIMERS && !LWIP_TIMERS_CUSTOM + + /** The one and only timeout list */ +-static struct sys_timeo *next_timeout; ++static PER_THREAD struct sys_timeo *next_timeout; + +-static u32_t current_timeout_due_time; ++static PER_THREAD u32_t current_timeout_due_time; + + #if LWIP_TESTMODE + struct sys_timeo** +@@ -133,7 +133,7 @@ sys_timeouts_get_next_timeout(void) + + #if LWIP_TCP + /** global variable that shows if the tcp timer is currently scheduled or not */ +-static int tcpip_tcp_timer_active; ++static PER_THREAD int tcpip_tcp_timer_active; + + /** + * Timer callback function that calls tcp_tmr() and reschedules itself. +@@ -442,6 +442,18 @@ sys_timeouts_sleeptime(void) + } + } + ++#if USE_LIBOS ++void sys_timer_run(void) ++{ ++ u32_t sleeptime; ++ ++ sleeptime = sys_timeouts_sleeptime(); ++ if (sleeptime == 0) { ++ sys_check_timeouts(); ++ } ++} ++#endif /* USE_LIBOS */ ++ + #else /* LWIP_TIMERS && !LWIP_TIMERS_CUSTOM */ + /* Satisfy the TCP code which calls this function */ + void +diff --git a/src/core/udp.c b/src/core/udp.c +index 0b609d3..a5f76b9 100644 +--- a/src/core/udp.c ++++ b/src/core/udp.c +@@ -207,7 +207,11 @@ udp_input(struct pbuf *p, struct netif *inp) + LWIP_ASSERT("udp_input: invalid pbuf", p != NULL); + LWIP_ASSERT("udp_input: invalid netif", inp != NULL); + ++#if LWIP_RECORD_PERF ++ PERF_START(PERF_LAYER_UDP, PERF_POINT_UDP); ++#else + PERF_START; ++#endif + + UDP_STATS_INC(udp.recv); + +@@ -428,7 +432,12 @@ udp_input(struct pbuf *p, struct netif *inp) + pbuf_free(p); + } + end: ++#if LWIP_RECORD_PERF ++ PERF_STOP_INCREASE_COUNT("udp_input", PERF_LAYER_UDP); ++#else + PERF_STOP("udp_input"); ++#endif ++ + return; + #if CHECKSUM_CHECK_UDP + chkerr: +@@ -438,7 +447,13 @@ chkerr: + UDP_STATS_INC(udp.drop); + MIB2_STATS_INC(mib2.udpinerrors); + pbuf_free(p); ++ ++#if LWIP_RECORD_PERF ++ PERF_STOP_INCREASE_COUNT("udp_input", PERF_LAYER_UDP); ++#else + PERF_STOP("udp_input"); ++#endif ++ + #endif /* CHECKSUM_CHECK_UDP */ + } + +diff --git a/src/include/arch/cc.h b/src/include/arch/cc.h +index 52b76f9..33c24b4 100644 +--- a/src/include/arch/cc.h ++++ b/src/include/arch/cc.h +@@ -1,7 +1,81 @@ +-#ifndef LWIP_CC_H +-#define LWIP_CC_H ++/* ++ * 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: Huawei Technologies ++ * ++ */ + ++#ifndef LWIP_ARCH_CC_H ++#define LWIP_ARCH_CC_H + ++#include ++#include ++#include ++#include + +-#endif /* LWIP_CC_H */ ++#include "lwiplog.h" + ++#define LWIP_NOASSERT ++ ++#define LWIP_ERRNO_STDINCLUDE 1 ++#define MEMP_MEMORY_BASE_PLACEHOLDER 0 ++#define MEMZONE_NAMESIZE 32 ++ ++#define LWIP_RAND() ((uint32_t)rand()) ++ ++extern uint8_t *sys_hugepage_malloc(const char *name, uint32_t size); ++ ++#define LWIP_DECLARE_MEMP_BASE_ALIGNED(name, __size)\ ++PER_THREAD uint8_t *memp_memory_##name##_base; \ ++void alloc_memp_##name##_base(void) \ ++{ \ ++ memp_ ## name.desc = memp_desc_ ## name; \ ++ memp_ ## name.stats = &memp_stat ## name; \ ++ memp_ ## name.size = memp_size ## name; \ ++ memp_ ## name.num = memp_num ## name; \ ++ memp_ ## name.tab = &memp_tab_ ## name; \ ++ memp_pools[MEMP_##name] = &memp_ ## name; \ ++ \ ++ char mpname[MEMZONE_NAMESIZE] = {0}; \ ++ snprintf(mpname, MEMZONE_NAMESIZE, "%ld_%s", gettid(), #name); \ ++ memp_memory_##name##_base = \ ++ sys_hugepage_malloc(mpname, LWIP_MEM_ALIGN_BUFFER(__size)); \ ++ memp_pools[MEMP_##name]->base = memp_memory_##name##_base; \ ++} ++ ++#define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size) \ ++PER_THREAD uint8_t *variable_name; \ ++void alloc_memory_##variable_name(void) \ ++{ \ ++ char mpname[MEMZONE_NAMESIZE] = {0}; \ ++ snprintf(mpname, MEMZONE_NAMESIZE, "%ld_%s", gettid(), #variable_name); \ ++ (variable_name) = \ ++ sys_hugepage_malloc(mpname, LWIP_MEM_ALIGN_BUFFER(size)); \ ++} ++ ++#endif /* LWIP_ARCH_CC_H */ +diff --git a/src/include/arch/perf.h b/src/include/arch/perf.h +new file mode 100644 +index 0000000..e505da7 +--- /dev/null ++++ b/src/include/arch/perf.h +@@ -0,0 +1,155 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef LWIP_ARCH_PERF_H ++#define LWIP_ARCH_PERF_H ++ ++#include ++ ++#include "lwip/debug.h" ++ ++#if LWIP_RECORD_PERF ++enum PERF_POINT { ++ PERF_POINT_IP_RECV, ++ PERF_POINT_TCP_RECV, ++ PERF_POINT_UDP, ++ PERF_POINT_TCP_SYN_RECV, ++ PERF_POINT_TCP_SYN_ACK_SEND, ++ PERF_POINT_TCP_ACK_RECV, ++ PERF_POINT_TCP_SYN_SEND, ++ PERF_POINT_TCP_SYN_ACK_RECV, ++ PERF_POINT_TCP_ACK_SEND, ++ PERF_POINT_TCP_DATA_SEND, ++ PERF_POINT_IP_SEND, ++ PERF_POINT_END ++}; ++ ++enum PERF_LAYER { ++ PERF_LAYER_IP, ++ PERF_LAYER_TCP, ++ PERF_LAYER_UDP, ++ PERF_LAYER_END ++}; ++ ++extern uint32_t g_record_perf; ++ ++extern __thread uint64_t g_timeTaken[PERF_POINT_END]; ++extern __thread int g_perfPoint[PERF_LAYER_END]; ++extern __thread struct timespec tvStart[PERF_LAYER_END]; ++ ++extern char *g_ppLayerName[PERF_POINT_END]; ++extern volatile uint64_t g_perfMaxtime[PERF_POINT_END]; ++extern volatile uint64_t g_astPacketCnt[PERF_POINT_END]; ++extern volatile uint64_t g_astPacketProcTime[PERF_POINT_END]; ++ ++#define PERF_START(layer, point) do {\ ++ g_perfPoint[(layer)] = (point);\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("set point %d:%s\n", layer, g_ppLayerName[g_perfPoint[(layer)]]));\ ++ clock_gettime(CLOCK_MONOTONIC, &tvStart[(layer)]);\ ++ g_timeTaken[(point)] = 0;\ ++} while (0) ++ ++#define PERF_UPDATE_POINT(layer, point) do {\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("old point %d:%s\n", layer, g_ppLayerName[g_perfPoint[(layer)]]));\ ++ g_timeTaken[(point)] = g_timeTaken[g_perfPoint[(layer)]];\ ++ g_timeTaken[g_perfPoint[(layer)]] = 0;\ ++ g_perfPoint[(layer)] = (point);\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("new point %d:%s\n", layer, g_ppLayerName[g_perfPoint[(layer)]]));\ ++} while (0) ++ ++#define PERF_PAUSE(layer) do {\ ++ struct timespec tvEnd;\ ++ clock_gettime(CLOCK_MONOTONIC, &tvEnd);\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("perf pause layer%d\n", layer));\ ++ g_timeTaken[g_perfPoint[(layer)]] += ((tvEnd.tv_sec - tvStart[(layer)].tv_sec) \ ++ * (1000000000UL) + (tvEnd.tv_nsec - tvStart[(layer)].tv_nsec));\ ++} while (0) ++ ++#define PERF_PAUSE_RETURN_POINT(layer, pause_point) do {\ ++ struct timespec tvEnd;\ ++ clock_gettime(CLOCK_MONOTONIC, &tvEnd);\ ++ g_timeTaken[g_perfPoint[(layer)]] += ((tvEnd.tv_sec - tvStart[(layer)].tv_sec) \ ++ * (1000000000UL) + (tvEnd.tv_nsec - tvStart[(layer)].tv_nsec));\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("perf pause point %d:%s\n", layer, g_ppLayerName[g_perfPoint[(layer)]]));\ ++ (pause_point) = g_perfPoint[(layer)];\ ++} while (0) ++ ++ ++#define PERF_RESUME(layer, point) do {\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("perf resule point %d:%s\n", layer, g_ppLayerName[point]));\ ++ clock_gettime(CLOCK_MONOTONIC, &tvStart[(layer)]);\ ++ g_perfPoint[(layer)] = (point);\ ++} while (0) ++ ++ ++/* x is a prompt */ ++#define PERF_STOP_INCREASE_COUNT(x, layer) do {\ ++ if (g_record_perf)\ ++ {\ ++ struct timespec tvEnd;\ ++ int i = 2;\ ++ uint32_t oldValue = 0;\ ++ clock_gettime(CLOCK_MONOTONIC, &tvEnd);\ ++ g_timeTaken[g_perfPoint[(layer)]] += ((tvEnd.tv_sec - tvStart[(layer)].tv_sec) \ ++ * (1000000000UL) + (tvEnd.tv_nsec - tvStart[(layer)].tv_nsec));\ ++ while (i && !oldValue)\ ++ {\ ++ oldValue = __sync_or_and_fetch(&g_perfMaxtime[g_perfPoint[(layer)]], 0);\ ++ if (oldValue >= g_timeTaken[g_perfPoint[(layer)]])\ ++ {\ ++ break;\ ++ }\ ++ oldValue = __sync_val_compare_and_swap(&g_perfMaxtime[g_perfPoint[(layer)]],\ ++ oldValue, g_timeTaken[g_perfPoint[(layer)]]);\ ++ i--;\ ++ }\ ++ __sync_fetch_and_add(&g_astPacketCnt[g_perfPoint[(layer)]], 1);\ ++ __sync_fetch_and_add(&g_astPacketProcTime[g_perfPoint[(layer)]], g_timeTaken[g_perfPoint[(layer)]]);\ ++ LWIP_DEBUGF(PERF_OUTPUT_DEBUG, ("Time for %s is: %ld\n",\ ++ g_ppLayerName[g_perfPoint[(layer)]], g_timeTaken[g_perfPoint[(layer)]]));\ ++ }\ ++} while (0) ++ ++ ++int check_layer_point(int layer, int point); ++int perf_init(); ++ ++#else ++#define PERF_START(layer, point) do { } while (0) ++#define PERF_UPDATE_POINT(layer, point) do { } while (0) ++#define PERF_PAUSE(layer) do { } while (0) ++#define PERF_PAUSE_RETURN_POINT(layer, pause_point) do { } while (0) ++#define PERF_RESUME(layer, point) do { } while (0) ++#define PERF_STOP_INCREASE_COUNT(x, layer) do { } while (0) ++#endif ++ ++#endif /* LWIP_ARCH_PERF_H */ +diff --git a/src/include/arch/sys_arch.h b/src/include/arch/sys_arch.h +index 3f555ee..b8a0d28 100644 +--- a/src/include/arch/sys_arch.h ++++ b/src/include/arch/sys_arch.h +@@ -1,7 +1,93 @@ +-#ifndef LWIP_SYS_ARCH_H +-#define LWIP_SYS_ARCH_H ++/* ++ * 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: Huawei Technologies ++ * ++ */ + ++#ifndef LWIP_ARCH_SYS_ARCH_H ++#define LWIP_ARCH_SYS_ARCH_H + ++#include ++#include + +-#endif /* LWIP_SYS_ARCH_H */ ++#define SYS_MBOX_NULL NULL ++#define SYS_SEM_NULL NULL ++typedef uint32_t sys_prot_t; + ++struct sys_sem { ++ volatile unsigned int c; ++ int (*wait_fn)(void); ++}; ++ ++#define MBOX_NAME_LEN 64 ++struct sys_mbox { ++ struct rte_ring *ring; ++ char name[MBOX_NAME_LEN]; ++ int size; ++ int socket_id; ++ unsigned flags; ++ int (*wait_fn)(void); ++}; ++ ++typedef struct sys_sem *sys_sem_t; ++#define sys_sem_valid(sem) (((sem) != NULL) && (*(sem) != NULL)) ++#define sys_sem_valid_val(sem) ((sem) != NULL) ++#define sys_sem_set_invalid(sem) do { if ((sem) != NULL) { *(sem) = NULL; }} while(0) ++#define sys_sem_set_invalid_val(sem) do { (sem) = NULL; } while(0) ++ ++struct sys_mutex; ++typedef struct sys_mutex *sys_mutex_t; ++#define sys_mutex_valid(mutex) sys_sem_valid(mutex) ++#define sys_mutex_set_invalid(mutex) sys_sem_set_invalid(mutex) ++ ++typedef struct sys_mbox *sys_mbox_t; ++#define sys_mbox_valid(mbox) sys_sem_valid(mbox) ++#define sys_mbox_valid_val(mbox) sys_sem_valid_val(mbox) ++#define sys_mbox_set_invalid(mbox) sys_sem_set_invalid(mbox) ++#define sys_mbox_set_invalid_val(mbox) sys_sem_set_invalid_val(mbox) ++int sys_mbox_empty(struct sys_mbox *); ++ ++struct sys_thread; ++typedef struct sys_thread *sys_thread_t; ++ ++extern int eth_dev_poll(void); ++ ++void sys_calibrate_tsc(void); ++uint32_t sys_now(void); ++__attribute__((always_inline)) inline int update_timeout(int timeout, uint32_t poll_ts) ++{ ++ uint32_t used_ms = sys_now() - poll_ts; ++ if (timeout > 0 && used_ms < timeout) { ++ return timeout; ++ } else { ++ return 0; ++ } ++} ++ ++#endif /* LWIP_ARCH_SYS_ARCH_H */ +diff --git a/src/include/eventpoll.h b/src/include/eventpoll.h +new file mode 100644 +index 0000000..01f8d64 +--- /dev/null ++++ b/src/include/eventpoll.h +@@ -0,0 +1,72 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __EVENTPOLL_H__ ++#define __EVENTPOLL_H__ ++ ++#include ++ ++#include "lwip/api.h" ++#include "list.h" ++ ++#define MAX_EPOLLFDS 32 ++ ++#define LIBOS_EPOLLNONE (0x0) ++#define LIBOS_BADEP (NULL) ++ ++struct event_queue { ++ struct list_node events; ++ /* total number of sockets have events */ ++ int num_events; ++}; ++ ++struct event_array { ++ sys_mbox_t mbox; ++ volatile int num_events; ++ struct epoll_event events[0]; ++}; ++ ++struct libos_epoll { ++ struct event_queue *libos_queue; ++ struct event_array *host_queue; ++ int num_hostfds; ++ int hints; ++ int fd; /* self fd */ ++ int efd; /* eventfd */ ++}; ++ ++extern int add_epoll_event(struct netconn*, uint32_t); ++extern int del_epoll_event(struct netconn*, uint32_t); ++extern int lwip_epoll_close(int); ++extern int lwip_is_epfd(int); ++ ++#endif /* __EVENTPOLL_H__ */ +diff --git a/src/include/hlist.h b/src/include/hlist.h +new file mode 100644 +index 0000000..7059488 +--- /dev/null ++++ b/src/include/hlist.h +@@ -0,0 +1,233 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __HLIST_H__ ++#define __HLIST_H__ ++ ++#include "list.h" ++ ++//#if TCP_PCB_HASH ++struct hlist_node { ++ /** ++ * @pprev: point the previous node's next pointer ++ */ ++ struct hlist_node *next; ++ struct hlist_node **pprev; ++}; ++ ++struct hlist_head { ++ struct hlist_node *first; ++}; ++ ++struct hlist_tail { ++ struct hlist_node *end; ++}; ++ ++struct hlist_ctl { ++ struct hlist_head head; ++ struct hlist_tail tail; ++}; ++ ++#define INIT_HLIST_CTRL(ptr) {(ptr)->head.first = NULL; (ptr)->tail.end = NULL;} ++#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL) ++#define INIT_HLIST_NODE(ptr) {(ptr)->next = NULL; (ptr)->pprev = NULL;} ++#define hlist_entry(ptr, type, member) \ ++ container_of(ptr, type, member) ++ ++/** ++ * hlist_for_each_entry - iterate over list of given type ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry(tpos, pos, head, member) \ ++ for (pos = (head)->first; \ ++ pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1; }); \ ++ pos = (pos)->next) ++ ++/** ++ * next must be != NULL ++ * add n node before next node ++ * ++ * @n: new node ++ * @next: node in the hlist ++ */ ++static inline void hlist_add_before(struct hlist_node *n, struct hlist_node *next) ++{ ++ n->pprev = next->pprev; ++ n->next = next; ++ next->pprev = &n->next; ++ *(n->pprev) = n; ++} ++ ++static inline int hlist_empty(const struct hlist_head *h) ++{ ++ return !h->first; ++} ++ ++static inline int hlist_unhashed(const struct hlist_node *h) ++{ ++ return !h->pprev; ++} ++ ++static inline void hlist_del_init(struct hlist_node *n) ++{ ++ struct hlist_node *next = n->next; ++ struct hlist_node **pprev = n->pprev; ++ ++ if (pprev == NULL) { ++ return; ++ } ++ ++ *pprev = next; ++ if (next != NULL) { ++ next->pprev = pprev; ++ } ++ ++ n->next = NULL; ++ n->pprev = NULL; ++} ++ ++static inline void hlist_ctl_del(struct hlist_ctl *ctl, struct hlist_node *n) ++{ ++ if (ctl->head.first == ctl->tail.end) { ++ ctl->head.first = NULL; ++ ctl->tail.end = NULL; ++ return; ++ } ++ ++ if (ctl->tail.end == n) { ++ ctl->tail.end = (struct hlist_node *)n->pprev; ++ } ++ ++ hlist_del_init(n); ++} ++ ++static inline struct hlist_node *hlist_pop_tail(struct hlist_ctl *ctl) ++{ ++ if (hlist_empty(&ctl->head)) { ++ return NULL; ++ } ++ ++ if (ctl->head.first == ctl->tail.end) { ++ struct hlist_node *ret = ctl->tail.end; ++ ctl->tail.end = NULL; ++ ctl->head.first = NULL; ++ return ret; ++ } ++ ++ struct hlist_node *temp = ctl->tail.end; ++ ++ struct hlist_node **ptailPrev = ctl->tail.end->pprev; ++ *ptailPrev = NULL; ++ ++ ctl->tail.end = (struct hlist_node *)ptailPrev; ++ temp->pprev = NULL; ++ return temp; ++} ++ ++static inline void hlist_add_after(struct hlist_node *n, struct hlist_node *next) ++{ ++ next->next = n->next; ++ n->next = next; ++ next->pprev = &n->next; ++ if (next->next) { ++ next->next->pprev = &next->next; ++ } ++} ++ ++static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h) ++{ ++ struct hlist_node *first = h->first; ++ ++ n->next = first; ++ if (first != NULL) { ++ first->pprev = &n->next; ++ } ++ ++ h->first = n; ++ n->pprev = &h->first; ++} ++ ++static inline struct hlist_node *hlist_pop_head(struct hlist_ctl *ctl) ++{ ++ if (hlist_empty(&ctl->head)) { ++ return NULL; ++ } ++ ++ struct hlist_node *temp = ctl->head.first; ++ hlist_ctl_del(ctl, temp); ++ return temp; ++} ++ ++static inline void hlist_ctl_add_tail(struct hlist_ctl *ctl, struct hlist_node *node) ++{ ++ if (hlist_empty(&ctl->head)) { ++ hlist_add_head(node, &ctl->head); ++ ctl->tail.end = ctl->head.first; ++ return; ++ } ++ ++ ctl->tail.end->next = node; ++ ++ node->pprev = &(ctl->tail.end->next); ++ node->next = NULL; ++ ctl->tail.end = node; ++} ++ ++static inline void hlist_ctl_add_head(struct hlist_node *node, struct hlist_ctl *ctl) ++{ ++ hlist_add_head(node, &ctl->head); ++ if (ctl->tail.end == NULL) { ++ ctl->tail.end = ctl->head.first; ++ } ++} ++ ++static inline void hlist_ctl_add_before(struct hlist_node *n, struct hlist_node *next, struct hlist_ctl *ctl) ++{ ++ hlist_add_before(n, next); ++ if (next == ctl->head.first) { ++ ctl->head.first = n; ++ } ++} ++ ++static inline void hlist_ctl_add_after(struct hlist_node *n, struct hlist_node *next, struct hlist_ctl *ctl) ++{ ++ hlist_add_after(n, next); ++ if (n == ctl->tail.end) { ++ ctl->tail.end = next; ++ } ++} ++//#endif /* TCP_PCB_HASH */ ++ ++#endif /* __HLIST_H__ */ +diff --git a/src/include/list.h b/src/include/list.h +new file mode 100644 +index 0000000..11f94c2 +--- /dev/null ++++ b/src/include/list.h +@@ -0,0 +1,110 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __LIST_H__ ++#define __LIST_H__ ++ ++#ifndef NULL ++#ifdef __cplusplus ++#define NULL 0 ++#else ++#define NULL ((void *)0) ++#endif ++#endif ++ ++struct list_node { ++ struct list_node *prev; ++ struct list_node *next; ++}; ++ ++static inline void init_list_node_null(struct list_node *n) ++{ ++ n->prev = NULL; ++ n->next = NULL; ++} ++ ++static inline void init_list_node(struct list_node *n) ++{ ++ n->prev = n; ++ n->next = n; ++} ++ ++static inline void list_add_node(struct list_node *h, struct list_node *n) ++{ ++ n->next = h; ++ n->prev = h->prev; ++ h->prev->next = n; ++ h->prev = n; ++} ++ ++static inline void list_del_node(struct list_node *n) ++{ ++ struct list_node *prev = n->prev; ++ struct list_node *next = n->next; ++ next->prev = prev; ++ prev->next = next; ++} ++ ++static inline void list_del_node_init(struct list_node *n) ++{ ++ list_del_node(n); ++ init_list_node(n); ++} ++ ++static inline void list_del_node_null(struct list_node *n) ++{ ++ if ((n->next) && (n->prev)) { ++ list_del_node(n); ++ } ++ init_list_node_null(n); ++} ++ ++static inline int list_is_null(const struct list_node *n) ++{ ++ return (n->prev == NULL) && (n->next == NULL); ++} ++ ++static inline int list_is_empty(const struct list_node *h) ++{ ++ return h == h->next; ++} ++ ++#define list_for_each_safe(pos, n, head) \ ++ for (pos = (head)->next, n = (pos)->next; pos != (head); pos = n, n = (pos)->next) ++ ++#ifndef container_of ++#define container_of(ptr, type, member) ({ \ ++ typeof( ((type *)0)->member ) *__mptr = (ptr); \ ++ (type *)((char *)__mptr - offsetof(type,member));}) ++#endif /* container_of */ ++ ++#endif /* __LIST_H__ */ +diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h +index c2afaf2..6dec8c0 100644 +--- a/src/include/lwip/api.h ++++ b/src/include/lwip/api.h +@@ -140,8 +140,43 @@ enum netconn_type { + /** Raw connection IPv6 (dual-stack by default, unless you call @ref netconn_set_ipv6only) */ + , NETCONN_RAW_IPV6 = NETCONN_RAW | NETCONN_TYPE_IPV6 /* 0x48 */ + #endif /* LWIP_IPV6 */ ++ ++#if USE_LIBOS ++ /*here must bigger than 0xff, because (type & 0xff) is for lwip inner use*/ ++ , NETCONN_LIBOS = 0x100 ++ , NETCONN_HOST = 0x200 ++ , NETCONN_INPRG = 0x400 ++ , NETCONN_STACK = NETCONN_LIBOS | NETCONN_HOST | NETCONN_INPRG ++#endif /* USE_LIBOS */ + }; + ++#ifdef USE_LIBOS ++#define SET_CONN_TYPE_LIBOS_OR_HOST(conn) do { \ ++ conn->type &= ~(NETCONN_STACK); \ ++ conn->type |= (NETCONN_LIBOS | NETCONN_HOST); } while (0) ++#define SET_CONN_TYPE_LIBOS(conn) do { \ ++ conn->type &= ~(NETCONN_STACK); \ ++ conn->type |= NETCONN_LIBOS; } while (0) ++#define SET_CONN_TYPE_HOST(conn) do { \ ++ conn->type &= ~(NETCONN_STACK); \ ++ conn->type |= NETCONN_HOST; } while (0) ++#define ADD_CONN_TYPE_INPRG(conn) do { \ ++ conn->type |= NETCONN_INPRG; } while(0) ++#define CONN_TYPE_HAS_LIBOS_AND_HOST(conn) ((conn->type & (NETCONN_LIBOS | NETCONN_HOST)) == (NETCONN_LIBOS | NETCONN_HOST)) ++#define CONN_TYPE_HAS_LIBOS(conn) (conn->type & NETCONN_LIBOS) ++#define CONN_TYPE_HAS_HOST(conn) (conn->type & NETCONN_HOST) ++#define CONN_TYPE_HAS_INPRG(conn) (!!(conn->type & NETCONN_INPRG)) ++#define CONN_TYPE_IS_LIBOS(conn) (!!(NETCONN_LIBOS == (conn->type & NETCONN_STACK))) ++#define CONN_TYPE_IS_HOST(conn) (!!(NETCONN_HOST == (conn->type & NETCONN_STACK))) ++#else ++#define SET_CONN_TYPE_LIBOS_OR_HOST(conn) do {} while (0) ++#define SET_CONN_TYPE_LIBOS(conn) do {} while (0) ++#define SET_CONN_TYPE_HOST(conn) do {} while (0) ++#define CONN_TYPE_HAS_LIBOS_AND_HOST(conn) (0) ++#define CONN_TYPE_HAS_LIBOS(conn) (0) ++#define CONN_TYPE_HAS_HOST(conn) (0) ++#endif /* USE_LIBOS */ ++ + /** Current state of the netconn. Non-TCP netconns are always + * in state NETCONN_NONE! */ + enum netconn_state { +diff --git a/src/include/lwip/debug.h b/src/include/lwip/debug.h +index 579fd24..f47cbfe 100644 +--- a/src/include/lwip/debug.h ++++ b/src/include/lwip/debug.h +@@ -145,6 +145,7 @@ + ((debug) & LWIP_DBG_ON) && \ + ((debug) & LWIP_DBG_TYPES_ON) && \ + ((s16_t)((debug) & LWIP_DBG_MASK_LEVEL) >= LWIP_DBG_MIN_LEVEL)) { \ ++ LWIP_PLATFORM_LOG(debug, STRIP_BRACES(ESC_ARGS message)); \ + LWIP_PLATFORM_DIAG(message); \ + if ((debug) & LWIP_DBG_HALT) { \ + while(1); \ +diff --git a/src/include/lwip/def.h b/src/include/lwip/def.h +index dfb266d..fea7187 100644 +--- a/src/include/lwip/def.h ++++ b/src/include/lwip/def.h +@@ -116,6 +116,21 @@ u32_t lwip_htonl(u32_t x); + + /* Provide usual function names as macros for users, but this can be turned off */ + #ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS ++ ++/* avoid conflicts with netinet/in.h */ ++#ifdef htons ++#undef htons ++#endif ++#ifdef ntohs ++#undef ntohs ++#endif ++#ifdef htonl ++#undef htonl ++#endif ++#ifdef ntohl ++#undef ntohl ++#endif ++ + #define htons(x) lwip_htons(x) + #define ntohs(x) lwip_ntohs(x) + #define htonl(x) lwip_htonl(x) +diff --git a/src/include/lwip/ip.h b/src/include/lwip/ip.h +index 653c3b2..d560f6b 100644 +--- a/src/include/lwip/ip.h ++++ b/src/include/lwip/ip.h +@@ -96,9 +96,15 @@ struct ip_pcb { + /* + * Option flags per-socket. These are the same like SO_XXX in sockets.h + */ ++#if USE_LIBOS ++#define SOF_REUSEADDR 0x02U /* allow local address reuse */ ++#define SOF_KEEPALIVE 0x09U /* keep connections alive */ ++#define SOF_BROADCAST 0x06U /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */ ++#else + #define SOF_REUSEADDR 0x04U /* allow local address reuse */ + #define SOF_KEEPALIVE 0x08U /* keep connections alive */ + #define SOF_BROADCAST 0x20U /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */ ++#endif /* USE_LIBOS */ + + /* These flags are inherited (e.g. from a listen-pcb to a connection-pcb): */ + #define SOF_INHERITED (SOF_REUSEADDR|SOF_KEEPALIVE) +@@ -125,7 +131,7 @@ struct ip_globals + /** Destination IP address of current_header */ + ip_addr_t current_iphdr_dest; + }; +-extern struct ip_globals ip_data; ++extern PER_THREAD struct ip_globals ip_data; + + + /** Get the interface that accepted the current packet. +diff --git a/src/include/lwip/memp.h b/src/include/lwip/memp.h +index 1630b26..64d8f31 100644 +--- a/src/include/lwip/memp.h ++++ b/src/include/lwip/memp.h +@@ -58,7 +58,11 @@ typedef enum { + #include "lwip/priv/memp_priv.h" + #include "lwip/stats.h" + ++#if USE_LIBOS ++extern PER_THREAD struct memp_desc* memp_pools[MEMP_MAX]; ++#else + extern const struct memp_desc* const memp_pools[MEMP_MAX]; ++#endif /* USE_LIBOS */ + + /** + * @ingroup mempool +@@ -92,6 +96,18 @@ extern const struct memp_desc* const memp_pools[MEMP_MAX]; + * To relocate a pool, declare it as extern in cc.h. Example for GCC: + * extern u8_t \_\_attribute\_\_((section(".onchip_mem"))) memp_memory_my_private_pool_base[]; + */ ++#if USE_LIBOS ++#define LWIP_MEMPOOL_DECLARE(name,num,size,desc) \ ++ PER_THREAD struct memp_desc memp_ ## name = {0}; \ ++ PER_THREAD char memp_desc_ ## name[] = desc; \ ++ PER_THREAD struct stats_mem memp_stat ## name = {0}; \ ++ PER_THREAD u16_t memp_size ## name = size; \ ++ PER_THREAD u16_t memp_num ## name = num; \ ++ PER_THREAD struct memp *memp_tab_ ## name = NULL; \ ++ LWIP_DECLARE_MEMP_BASE_ALIGNED(name, ((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))); ++ ++#else /* USE_LIBOS */ ++ + #define LWIP_MEMPOOL_DECLARE(name,num,size,desc) \ + LWIP_DECLARE_MEMORY_ALIGNED(memp_memory_ ## name ## _base, ((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))); \ + \ +@@ -108,6 +124,7 @@ extern const struct memp_desc* const memp_pools[MEMP_MAX]; + &memp_tab_ ## name \ + }; + ++#endif /* USE_LIBOS */ + #endif /* MEMP_MEM_MALLOC */ + + /** +diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h +index 9a16ded..057c51f 100644 +--- a/src/include/lwip/netif.h ++++ b/src/include/lwip/netif.h +@@ -406,11 +406,11 @@ struct netif { + #define NETIF_FOREACH(netif) if (((netif) = netif_default) != NULL) + #else /* LWIP_SINGLE_NETIF */ + /** The list of network interfaces. */ +-extern struct netif *netif_list; ++extern PER_THREAD struct netif *netif_list; + #define NETIF_FOREACH(netif) for ((netif) = netif_list; (netif) != NULL; (netif) = (netif)->next) + #endif /* LWIP_SINGLE_NETIF */ + /** The default network interface. */ +-extern struct netif *netif_default; ++extern PER_THREAD struct netif *netif_default; + + void netif_init(void); + +diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h +index d8c82d1..8294cdd 100644 +--- a/src/include/lwip/opt.h ++++ b/src/include/lwip/opt.h +@@ -533,6 +533,22 @@ + #endif + + /** ++ * MEMP_NUM_SYS_SEM: the number of struct sys_sems. ++ * (only needed if you use the sequential API, like api_lib.c) ++ */ ++#if !defined MEMP_NUM_SYS_SEM || defined __DOXYGEN__ ++#define MEMP_NUM_SYS_SEM 128 ++#endif ++ ++/** ++ * MEMP_NUM_SYS_MBOX: the number of struct sys_sems. ++ * (only needed if you use the sequential API, like api_lib.c) ++ */ ++#if !defined MEMP_NUM_SYS_MBOX || defined __DOXYGEN__ ++#define MEMP_NUM_SYS_MBOX 128 ++#endif ++ ++/** + * MEMP_NUM_SELECT_CB: the number of struct lwip_select_cb. + * (Only needed if you have LWIP_MPU_COMPATIBLE==1 and use the socket API. + * In that case, you need one per thread calling lwip_select.) +@@ -2232,7 +2248,7 @@ + * MIB2_STATS==1: Stats for SNMP MIB2. + */ + #if !defined MIB2_STATS || defined __DOXYGEN__ +-#define MIB2_STATS 0 ++#define MIB2_STATS 1 + #endif + + #else +@@ -3422,6 +3438,10 @@ + #define TCP_OUTPUT_DEBUG LWIP_DBG_OFF + #endif + ++#ifndef PERF_OUTPUT_DEBUG ++ #define PERF_OUTPUT_DEBUG LWIP_DBG_OFF ++#endif ++ + /** + * TCP_RST_DEBUG: Enable debugging for TCP with the RST message. + */ +@@ -3502,6 +3522,46 @@ + #define LWIP_TESTMODE 0 + #endif + ++/** ++ * EPOLL_DEBUG: Enable debugging in epoll.c. ++ */ ++#if !defined EPOLL_DEBUG || defined __DOXYGEN__ && USE_LIBOS ++#define EPOLL_DEBUG LWIP_DBG_OFF ++#endif ++/** ++ * @} ++ */ ++ ++/** ++ * ETHDEV_DEBUG: Enable debugging in ethdev.c. ++ */ ++#if !defined ETHDEV_DEBUG || defined __DOXYGEN__ && USE_LIBOS ++#define ETHDEV_DEBUG LWIP_DBG_OFF ++#endif ++/** ++ * @} ++ */ ++ ++/** ++ * ETHDEV_DEBUG: Enable debugging in ethdev.c. ++ */ ++#if !defined SYSCALL_DEBUG || defined __DOXYGEN__ && USE_LIBOS ++#define SYSCALL_DEBUG LWIP_DBG_OFF ++#endif ++/** ++ * @} ++ */ ++ ++/** ++ * CONTROL_DEBUG: Enable debugging in control_plane.c. ++ */ ++#if !defined CONTROL_DEBUG || defined __DOXYGEN__ && USE_LIBOS ++#define CONTROL_DEBUG LWIP_DBG_ON ++#endif ++/** ++ * @} ++ */ ++ + /* + -------------------------------------------------- + ---------- Performance tracking options ---------- +diff --git a/src/include/lwip/priv/memp_std.h b/src/include/lwip/priv/memp_std.h +index 669ad4d..395ac0c 100644 +--- a/src/include/lwip/priv/memp_std.h ++++ b/src/include/lwip/priv/memp_std.h +@@ -122,6 +122,13 @@ LWIP_MEMPOOL(MLD6_GROUP, MEMP_NUM_MLD6_GROUP, sizeof(struct mld_group), + #endif /* LWIP_IPV6 && LWIP_IPV6_MLD */ + + ++#if USE_LIBOS ++#if !LWIP_NETCONN_SEM_PER_THREAD ++LWIP_MEMPOOL(SYS_SEM, MEMP_NUM_SYS_SEM, sizeof(struct sys_sem), "SYS_SEM") ++#endif ++ ++LWIP_MEMPOOL(SYS_MBOX, MEMP_NUM_SYS_MBOX, sizeof(struct sys_mbox), "SYS_MBOX") ++#endif /* USE_LIBOS */ + /* + * A list of pools of pbuf's used by LWIP. + * +diff --git a/src/include/lwip/priv/sockets_priv.h b/src/include/lwip/priv/sockets_priv.h +index d8f9904..7268a17 100644 +--- a/src/include/lwip/priv/sockets_priv.h ++++ b/src/include/lwip/priv/sockets_priv.h +@@ -45,56 +45,17 @@ + #include "lwip/sockets.h" + #include "lwip/sys.h" + ++/* move some definitions to the lwipsock.h for libnet to use, and ++ * at the same time avoid conflict between lwip/sockets.h and sys/socket.h ++ */ ++#include "lwipsock.h" ++ + #ifdef __cplusplus + extern "C" { + #endif + + #define NUM_SOCKETS MEMP_NUM_NETCONN + +-/** This is overridable for the rare case where more than 255 threads +- * select on the same socket... +- */ +-#ifndef SELWAIT_T +-#define SELWAIT_T u8_t +-#endif +- +-union lwip_sock_lastdata { +- struct netbuf *netbuf; +- struct pbuf *pbuf; +-}; +- +-/** Contains all internal pointers and states used for a socket */ +-struct lwip_sock { +- /** sockets currently are built on netconns, each socket has one netconn */ +- struct netconn *conn; +- /** data that was left from the previous read */ +- union lwip_sock_lastdata lastdata; +-#if LWIP_SOCKET_SELECT || LWIP_SOCKET_POLL +- /** number of times data was received, set by event_callback(), +- tested by the receive and select functions */ +- s16_t rcvevent; +- /** number of times data was ACKed (free send buffer), set by event_callback(), +- tested by select */ +- u16_t sendevent; +- /** error happened for this socket, set by event_callback(), tested by select */ +- u16_t errevent; +- /** counter of how many threads are waiting for this socket using select */ +- SELWAIT_T select_waiting; +-#endif /* LWIP_SOCKET_SELECT || LWIP_SOCKET_POLL */ +-#if LWIP_NETCONN_FULLDUPLEX +- /* counter of how many threads are using a struct lwip_sock (not the 'int') */ +- u8_t fd_used; +- /* status of pending close/delete actions */ +- u8_t fd_free_pending; +-#define LWIP_SOCK_FD_FREE_TCP 1 +-#define LWIP_SOCK_FD_FREE_FREE 2 +-#endif +-}; +- +-#ifndef set_errno +-#define set_errno(err) do { if (err) { errno = (err); } } while(0) +-#endif +- + #if !LWIP_TCPIP_CORE_LOCKING + /** Maximum optlen used by setsockopt/getsockopt */ + #define LWIP_SETGETSOCKOPT_MAXOPTLEN LWIP_MAX(16, sizeof(struct ifreq)) +diff --git a/src/include/lwip/priv/tcp_priv.h b/src/include/lwip/priv/tcp_priv.h +index 72f9126..192edc4 100644 +--- a/src/include/lwip/priv/tcp_priv.h ++++ b/src/include/lwip/priv/tcp_priv.h +@@ -323,25 +323,42 @@ struct tcp_seg { + #endif /* LWIP_WND_SCALE */ + + /* Global variables: */ +-extern struct tcp_pcb *tcp_input_pcb; +-extern u32_t tcp_ticks; +-extern u8_t tcp_active_pcbs_changed; ++extern PER_THREAD struct tcp_pcb *tcp_input_pcb; ++extern PER_THREAD u32_t tcp_ticks; ++extern PER_THREAD u8_t tcp_active_pcbs_changed; + + /* The TCP PCB lists. */ + union tcp_listen_pcbs_t { /* List of all TCP PCBs in LISTEN state. */ + struct tcp_pcb_listen *listen_pcbs; + struct tcp_pcb *pcbs; + }; +-extern struct tcp_pcb *tcp_bound_pcbs; +-extern union tcp_listen_pcbs_t tcp_listen_pcbs; +-extern struct tcp_pcb *tcp_active_pcbs; /* List of all TCP PCBs that are in a ++extern PER_THREAD struct tcp_pcb *tcp_bound_pcbs; ++extern PER_THREAD union tcp_listen_pcbs_t tcp_listen_pcbs; ++extern PER_THREAD struct tcp_pcb *tcp_active_pcbs; /* List of all TCP PCBs that are in a + state in which they accept or send + data. */ +-extern struct tcp_pcb *tcp_tw_pcbs; /* List of all TCP PCBs in TIME-WAIT. */ ++extern PER_THREAD struct tcp_pcb *tcp_tw_pcbs; /* List of all TCP PCBs in TIME-WAIT. */ + + #define NUM_TCP_PCB_LISTS_NO_TIME_WAIT 3 + #define NUM_TCP_PCB_LISTS 4 +-extern struct tcp_pcb ** const tcp_pcb_lists[NUM_TCP_PCB_LISTS]; ++extern PER_THREAD struct tcp_pcb ** tcp_pcb_lists[NUM_TCP_PCB_LISTS]; ++ ++#if USE_LIBOS ++#include "reg_sock.h" ++static inline int vdev_reg_done(enum reg_ring_type reg_type, const struct tcp_pcb *pcb) ++{ ++ LWIP_ASSERT("Invalid parameter", pcb != NULL); ++ ++ struct libnet_quintuple qtuple; ++ qtuple.protocol = 0; ++ qtuple.src_ip = pcb->local_ip.addr; ++ qtuple.src_port = lwip_htons(pcb->local_port); ++ qtuple.dst_ip = pcb->remote_ip.addr; ++ qtuple.dst_port = lwip_htons(pcb->remote_port); ++ ++ return vdev_reg_xmit(reg_type, &qtuple); ++} ++#endif + + /* Axioms about the above lists: + 1) Every TCP PCB that is not CLOSED is in one of the lists. +@@ -355,6 +372,54 @@ extern struct tcp_pcb ** const tcp_pcb_lists[NUM_TCP_PCB_LISTS]; + #define TCP_DEBUG_PCB_LISTS 0 + #endif + #if TCP_DEBUG_PCB_LISTS ++#if USE_LIBOS ++#define TCP_REG(pcbs, npcb) do {\ ++ struct tcp_pcb *tcp_tmp_pcb; \ ++ LWIP_DEBUGF(TCP_DEBUG, ("TCP_REG %p local port %d\n", (npcb), (npcb)->local_port)); \ ++ for (tcp_tmp_pcb = *(pcbs); \ ++ tcp_tmp_pcb != NULL; \ ++ tcp_tmp_pcb = tcp_tmp_pcb->next) { \ ++ LWIP_ASSERT("TCP_REG: already registered\n", tcp_tmp_pcb != (npcb)); \ ++ } \ ++ LWIP_ASSERT("TCP_REG: pcb->state != CLOSED", ((pcbs) == &tcp_bound_pcbs) || ((npcb)->state != CLOSED)); \ ++ if (*pcbs) \ ++ (*pcbs)->prev = npcb; \ ++ (npcb)->prev = NULL; \ ++ (npcb)->next = *(pcbs); \ ++ LWIP_ASSERT("TCP_REG: npcb->next != npcb", (npcb)->next != (npcb)); \ ++ *(pcbs) = (npcb); \ ++ LWIP_ASSERT("TCP_RMV: tcp_pcbs sane", tcp_pcbs_sane()); \ ++ tcp_timer_needed(); \ ++ } while(0) ++#define TCP_RMV(pcbs, npcb) do { \ ++ if (pcb->state == LISTEN) \ ++ vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ ++ else \ ++ vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb);\ ++ struct tcp_pcb *tcp_tmp_pcb; \ ++ LWIP_ASSERT("TCP_RMV: pcbs != NULL", *(pcbs) != NULL); \ ++ LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removing %p from %p\n", (npcb), *(pcbs))); \ ++ if(*(pcbs) == (npcb)) { \ ++ *(pcbs) = (*pcbs)->next; \ ++ if (*pcbs) \ ++ (*pcbs)->prev = NULL; \ ++ } else { \ ++ struct tcp_pcb *prev, *next; \ ++ prev = npcb->prev; \ ++ next = npcb->next; \ ++ if (prev) \ ++ prev->next = next; \ ++ if (next) \ ++ next->prev = prev; \ ++ } \ ++ } \ ++ (npcb)->prev = NULL; \ ++ (npcb)->next = NULL; \ ++ LWIP_ASSERT("TCP_RMV: tcp_pcbs sane", tcp_pcbs_sane()); \ ++ LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removed %p from %p\n", (npcb), *(pcbs))); \ ++ } while(0) ++ ++#else /* USE_LIBOS */ + #define TCP_REG(pcbs, npcb) do {\ + struct tcp_pcb *tcp_tmp_pcb; \ + LWIP_DEBUGF(TCP_DEBUG, ("TCP_REG %p local port %"U16_F"\n", (void *)(npcb), (npcb)->local_port)); \ +@@ -387,8 +452,65 @@ extern struct tcp_pcb ** const tcp_pcb_lists[NUM_TCP_PCB_LISTS]; + LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removed %p from %p\n", (void *)(npcb), (void *)(*(pcbs)))); \ + } while(0) + ++#endif /* USE_LIBOS */ + #else /* LWIP_DEBUG */ + ++#if TCP_PCB_HASH ++#define TCP_REG_HASH(pcbs, npcb) \ ++ do { \ ++ u32_t idx; \ ++ struct hlist_head *hd; \ ++ struct tcp_hash_table *htb = pcbs; \ ++ idx = TUPLE4_HASH_FN((npcb)->local_ip.addr, (npcb)->local_port, \ ++ (npcb)->remote_ip.addr, (npcb)->remote_port) & \ ++ (htb->size - 1); \ ++ hd = &htb->array[idx].chain; \ ++ hlist_add_head(&(npcb)->tcp_node, hd); \ ++ tcp_timer_needed(); \ ++ } while (0) ++ ++#define TCP_RMV_HASH(pcbs, npcb) \ ++ do { \ ++ hlist_del_init(&(npcb)->tcp_node); \ ++ } while (0) ++#endif /* TCP_PCB_HASH */ ++ ++#if USE_LIBOS ++#define TCP_REG(pcbs, npcb) \ ++ do { \ ++ if (*pcbs) \ ++ (*pcbs)->prev = npcb; \ ++ (npcb)->prev = NULL; \ ++ (npcb)->next = *pcbs; \ ++ *(pcbs) = (npcb); \ ++ tcp_timer_needed(); \ ++ } while (0) ++ ++#define TCP_RMV(pcbs, npcb) \ ++ do { \ ++ if (pcb->state == LISTEN) \ ++ vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ ++ else \ ++ vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb);\ ++ if(*(pcbs) == (npcb)) { \ ++ (*(pcbs)) = (*pcbs)->next; \ ++ if (*pcbs) \ ++ (*pcbs)->prev = NULL; \ ++ } \ ++ else { \ ++ struct tcp_pcb *prev, *next; \ ++ prev = npcb->prev; \ ++ next = npcb->next; \ ++ if (prev) \ ++ prev->next = next; \ ++ if (next) \ ++ next->prev = prev; \ ++ } \ ++ (npcb)->prev = NULL; \ ++ (npcb)->next = NULL; \ ++ } while(0) ++ ++#else /* USE_LIBOS */ + #define TCP_REG(pcbs, npcb) \ + do { \ + (npcb)->next = *pcbs; \ +@@ -415,8 +537,32 @@ extern struct tcp_pcb ** const tcp_pcb_lists[NUM_TCP_PCB_LISTS]; + (npcb)->next = NULL; \ + } while(0) + ++#endif /* USE_LIBOS */ + #endif /* LWIP_DEBUG */ + ++ ++#if TCP_PCB_HASH ++#define TCP_REG_ACTIVE_HASH(npcb) \ ++ do { \ ++ TCP_REG_HASH(tcp_active_htable, npcb); \ ++ tcp_active_pcbs_changed = 1; \ ++ } while (0) ++ ++#define TCP_RMV_ACTIVE_HASH(npcb) \ ++ do { \ ++ TCP_RMV_HASH(tcp_active_htable, npcb); \ ++ tcp_active_pcbs_changed = 1; \ ++ } while (0) ++ ++#define TCP_PCB_REMOVE_ACTIVE_HASH(pcb) \ ++ do { \ ++ tcp_pcb_remove_hash(tcp_active_htable, pcb); \ ++ tcp_active_pcbs_changed = 1; \ ++ } while (0) ++ ++void tcp_pcb_remove_hash(struct tcp_hash_table *htb, struct tcp_pcb *pcb); ++#endif /* TCP_PCB_HASH */ ++ + #define TCP_REG_ACTIVE(npcb) \ + do { \ + TCP_REG(&tcp_active_pcbs, npcb); \ +diff --git a/src/include/lwip/prot/ip4.h b/src/include/lwip/prot/ip4.h +index 9347461..c9ad89c 100644 +--- a/src/include/lwip/prot/ip4.h ++++ b/src/include/lwip/prot/ip4.h +@@ -81,6 +81,21 @@ struct ip_hdr { + PACK_STRUCT_FIELD(u16_t _id); + /* fragment offset field */ + PACK_STRUCT_FIELD(u16_t _offset); ++ ++/* avoid conflicts with netinet/ip.h */ ++#ifdef IP_RF ++#undef IP_RF ++#endif ++#ifdef IP_DF ++#undef IP_DF ++#endif ++#ifdef IP_MF ++#undef IP_MF ++#endif ++#ifdef IP_OFFMASK ++#undef IP_OFFMASK ++#endif ++ + #define IP_RF 0x8000U /* reserved fragment flag */ + #define IP_DF 0x4000U /* don't fragment flag */ + #define IP_MF 0x2000U /* more fragments flag */ +diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h +index d70d36c..345e26c 100644 +--- a/src/include/lwip/sockets.h ++++ b/src/include/lwip/sockets.h +@@ -57,6 +57,11 @@ extern "C" { + + /* If your port already typedef's sa_family_t, define SA_FAMILY_T_DEFINED + to prevent this code from redefining it. */ ++#if USE_LIBOS ++#define SA_FAMILY_T_DEFINED ++ typedef u16_t sa_family_t; ++#endif ++ + #if !defined(sa_family_t) && !defined(SA_FAMILY_T_DEFINED) + typedef u8_t sa_family_t; + #endif +@@ -69,7 +74,9 @@ typedef u16_t in_port_t; + #if LWIP_IPV4 + /* members are in network byte order */ + struct sockaddr_in { ++#if !USE_LIBOS + u8_t sin_len; ++#endif + sa_family_t sin_family; + in_port_t sin_port; + struct in_addr sin_addr; +@@ -90,7 +97,9 @@ struct sockaddr_in6 { + #endif /* LWIP_IPV6 */ + + struct sockaddr { ++#if !USE_LIBOS + u8_t sa_len; ++#endif + sa_family_t sa_family; + char sa_data[14]; + }; +@@ -189,6 +198,9 @@ struct ifreq { + #define SOCK_DGRAM 2 + #define SOCK_RAW 3 + ++#if USE_LIBOS ++#include ++#else + /* + * Option flags per-socket. These must match the SOF_ flags in ip.h (checked in init.c) + */ +@@ -221,6 +233,12 @@ struct ifreq { + #define SO_BINDTODEVICE 0x100b /* bind to device */ + + /* ++ * Level number for (get/set)sockopt() to apply to socket itself. ++ */ ++#define SOL_SOCKET 0xfff /* options for socket level */ ++#endif /* USE_LIBOS */ ++ ++/* + * Structure used for manipulating linger option. + */ + struct linger { +@@ -228,11 +246,6 @@ struct linger { + int l_linger; /* linger time in seconds */ + }; + +-/* +- * Level number for (get/set)sockopt() to apply to socket itself. +- */ +-#define SOL_SOCKET 0xfff /* options for socket level */ +- + + #define AF_UNSPEC 0 + #define AF_INET 2 +@@ -276,11 +289,20 @@ struct linger { + /* + * Options for level IPPROTO_TCP + */ ++#if USE_LIBOS ++/* come from netinet/tcp.h */ ++#define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ ++#define TCP_KEEPALIVE 0x24 /* send KEEPALIVE probes when idle for pcb->keep_idle milliseconds */ ++#define TCP_KEEPIDLE 0x04 /* set pcb->keep_idle - Same as TCP_KEEPALIVE, but use seconds for get/setsockopt */ ++#define TCP_KEEPINTVL 0x05 /* set pcb->keep_intvl - Use seconds for get/setsockopt */ ++#define TCP_KEEPCNT 0x06 /* set pcb->keep_cnt - Use number of probes sent for get/setsockopt */ ++#else /* USE_LIBOS */ + #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ + #define TCP_KEEPALIVE 0x02 /* send KEEPALIVE probes when idle for pcb->keep_idle milliseconds */ + #define TCP_KEEPIDLE 0x03 /* set pcb->keep_idle - Same as TCP_KEEPALIVE, but use seconds for get/setsockopt */ + #define TCP_KEEPINTVL 0x04 /* set pcb->keep_intvl - Use seconds for get/setsockopt */ + #define TCP_KEEPCNT 0x05 /* set pcb->keep_cnt - Use number of probes sent for get/setsockopt */ ++#endif /* USE_LIBOS */ + #endif /* LWIP_TCP */ + + #if LWIP_IPV6 +@@ -483,12 +505,30 @@ typedef struct fd_set + unsigned char fd_bits [(FD_SETSIZE+7)/8]; + } fd_set; + +-#elif FD_SETSIZE < (LWIP_SOCKET_OFFSET + MEMP_NUM_NETCONN) ++#elif FD_SETSIZE < (LWIP_SOCKET_OFFSET + MEMP_NUM_NETCONN) && !USE_LIBOS + #error "external FD_SETSIZE too small for number of sockets" + #else + #define LWIP_SELECT_MAXNFDS FD_SETSIZE + #endif /* FD_SET */ + ++#if USE_LIBOS ++#if !defined(POLLIN) && !defined(POLLOUT) ++/* come from bits/poll.h */ ++#define POLLIN 0x001 ++#define POLLOUT 0x004 ++#define POLLERR 0x008 ++#define POLLNVAL 0x020 ++/* Below values are unimplemented */ ++#define POLLRDNORM 0x040 ++#define POLLRDBAND 0x080 ++#define POLLPRI 0x002 ++#define POLLWRNORM 0x100 ++#define POLLWRBAND 0x200 ++#define POLLHUP 0x010 ++#endif ++#endif /* USE_LIBOS */ ++ ++#if LWIP_SOCKET_POLL + /* poll-related defines and types */ + /* @todo: find a better way to guard the definition of these defines and types if already defined */ + #if !defined(POLLIN) && !defined(POLLOUT) +@@ -511,6 +551,7 @@ struct pollfd + short revents; + }; + #endif ++#endif /* LWIP_SOCKET_POLL */ + + /** LWIP_TIMEVAL_PRIVATE: if you want to use the struct timeval provided + * by your system, set this to 0 and include in cc.h */ +@@ -603,8 +644,15 @@ int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptse + #if LWIP_SOCKET_POLL + int lwip_poll(struct pollfd *fds, nfds_t nfds, int timeout); + #endif ++ ++#if USE_LIBOS ++int lwip_ioctl(int s, long cmd, ...); ++int lwip_fcntl(int s, int cmd, ...); ++#else + int lwip_ioctl(int s, long cmd, void *argp); + int lwip_fcntl(int s, int cmd, int val); ++#endif /* USE_LIBOS */ ++ + const char *lwip_inet_ntop(int af, const void *src, char *dst, socklen_t size); + int lwip_inet_pton(int af, const char *src, void *dst); + +@@ -670,10 +718,17 @@ int lwip_inet_pton(int af, const char *src, void *dst); + #define writev(s,iov,iovcnt) lwip_writev(s,iov,iovcnt) + /** @ingroup socket */ + #define close(s) lwip_close(s) ++ ++#if USE_LIBOS ++#define fcntl(s,cmd...) lwip_fcntl(s,cmd) ++#define ioctl(s,cmd...) lwip_ioctl(s,cmd) ++#else + /** @ingroup socket */ + #define fcntl(s,cmd,val) lwip_fcntl(s,cmd,val) + /** @ingroup socket */ + #define ioctl(s,cmd,argp) lwip_ioctl(s,cmd,argp) ++#endif /* USE_LIBOS */ ++ + #endif /* LWIP_POSIX_SOCKETS_IO_NAMES */ + #endif /* LWIP_COMPAT_SOCKETS != 2 */ + +diff --git a/src/include/lwip/stats.h b/src/include/lwip/stats.h +index b570dba..4470531 100644 +--- a/src/include/lwip/stats.h ++++ b/src/include/lwip/stats.h +@@ -301,7 +301,7 @@ struct stats_ { + }; + + /** Global variable containing lwIP internal statistics. Add this to your debugger's watchlist. */ +-extern struct stats_ lwip_stats; ++extern PER_THREAD struct stats_ lwip_stats; + + /** Init statistics */ + void stats_init(void); +@@ -467,6 +467,8 @@ void stats_init(void); + #define MIB2_STATS_INC(x) + #endif + ++int get_mib2_stats(char *buf); ++ + /* Display of statistics */ + #if LWIP_STATS_DISPLAY + void stats_display(void); +diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h +index daf7599..4f86b46 100644 +--- a/src/include/lwip/tcp.h ++++ b/src/include/lwip/tcp.h +@@ -51,6 +51,11 @@ + #include "lwip/ip6.h" + #include "lwip/ip6_addr.h" + ++#if TCP_PCB_HASH ++#include "lwip/sys.h" ++#include "hlist.h" ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -209,15 +214,27 @@ typedef u16_t tcpflags_t; + /** + * members common to struct tcp_pcb and struct tcp_listen_pcb + */ ++#if USE_LIBOS + #define TCP_PCB_COMMON(type) \ + type *next; /* for the linked list */ \ ++ type *prev; /* for the linked list */ \ + void *callback_arg; \ + TCP_PCB_EXTARGS \ + enum tcp_state state; /* TCP state */ \ + u8_t prio; \ + /* ports are in host byte order */ \ + u16_t local_port +- ++ ++#else /* USE_LIBOS */ ++#define TCP_PCB_COMMON(type) \ ++ type *next; /* for the linked list */ \ ++ void *callback_arg; \ ++ TCP_PCB_EXTARGS \ ++ enum tcp_state state; /* TCP state */ \ ++ u8_t prio; \ ++ /* ports are in host byte order */ \ ++ u16_t local_port ++#endif /* USE_LIBOS */ + + /** the TCP protocol control block for listening pcbs */ + struct tcp_pcb_listen { +@@ -244,6 +261,9 @@ struct tcp_pcb { + IP_PCB; + /** protocol specific PCB members */ + TCP_PCB_COMMON(struct tcp_pcb); ++#if TCP_PCB_HASH ++ struct hlist_node tcp_node; ++#endif + + /* ports are in host byte order */ + u16_t remote_port; +@@ -388,6 +408,58 @@ struct tcp_pcb { + #endif + }; + ++#if TCP_PCB_HASH ++#define TCP_HTABLE_SIZE MEMP_NUM_NETCONN*12 ++ ++struct tcp_hashbucket ++{ ++ sys_mutex_t mutex; ++ struct hlist_head chain; ++}; ++ ++struct tcp_hash_table ++{ ++ u32_t size; ++ struct tcp_hashbucket array[TCP_HTABLE_SIZE]; ++}; ++ ++extern PER_THREAD struct tcp_hash_table *tcp_active_htable; /* key: lport/fport/lip/fip */ ++ ++#define JHASH_INITVAL 0xdeadbeef ++ ++static inline unsigned int rol32(unsigned int word, unsigned int shift) ++{ ++ return (word << shift) | (word >> (32 - shift)); ++} ++ ++#define __jhash_final(a, b, c) \ ++{ \ ++ c ^= b; c -= rol32(b, 14); \ ++ a ^= c; a -= rol32(c, 11); \ ++ b ^= a; b -= rol32(a, 25); \ ++ c ^= b; c -= rol32(b, 16); \ ++ a ^= c; a -= rol32(c, 4); \ ++ b ^= a; b -= rol32(a, 14); \ ++ c ^= b; c -= rol32(b, 24); \ ++} ++ ++static inline unsigned int jhash_3words(unsigned int a, unsigned int b, unsigned int c) ++{ ++ a += JHASH_INITVAL; ++ b += JHASH_INITVAL;; ++ ++ __jhash_final(a, b, c); ++ ++ return c; ++} ++ ++#define TUPLE4_HASH_FN(laddr, lport, faddr, fport) jhash_3words(laddr, faddr,lport|(fport<<16)) ++ ++#define tcppcb_hlist_for_each(tcppcb, node, list) \ ++ hlist_for_each_entry(tcppcb, node, list, tcp_node) ++ ++#endif /* TCP_PCB_HASH */ ++ + #if LWIP_EVENT_API + + enum lwip_event { +@@ -481,6 +553,26 @@ err_t tcp_tcp_get_tcp_addrinfo(struct tcp_pcb *pcb, int local, ip_add + + #define tcp_dbg_get_tcp_state(pcb) ((pcb)->state) + ++enum tcp_list_state { ++ ACTIVE_LIST, ++ LISTEN_LIST, ++ TIME_WAIT_LIST, ++}; ++ ++struct tcp_pcb_dp { ++ uint32_t state; ++ uint32_t lip; ++ uint32_t rip; ++ uint16_t l_port; ++ uint16_t r_port; ++ uint32_t r_next; ++ uint32_t s_next; ++ uint32_t tcp_sub_state; ++}; ++ ++void tcp_get_conn(char *buf, int32_t len, uint32_t *conn_num); ++uint32_t tcp_get_conn_num(void); ++ + /* for compatibility with older implementation */ + #define tcp_new_ip6() tcp_new_ip_type(IPADDR_TYPE_V6) + +diff --git a/src/include/lwip/tcpip.h b/src/include/lwip/tcpip.h +index 0b8880a..d2c2440 100644 +--- a/src/include/lwip/tcpip.h ++++ b/src/include/lwip/tcpip.h +@@ -51,7 +51,7 @@ extern "C" { + + #if LWIP_TCPIP_CORE_LOCKING + /** The global semaphore to lock the stack. */ +-extern sys_mutex_t lock_tcpip_core; ++extern PER_THREAD sys_mutex_t lock_tcpip_core; + #if !defined LOCK_TCPIP_CORE || defined __DOXYGEN__ + /** Lock lwIP core mutex (needs @ref LWIP_TCPIP_CORE_LOCKING 1) */ + #define LOCK_TCPIP_CORE() sys_mutex_lock(&lock_tcpip_core) +diff --git a/src/include/lwip/timeouts.h b/src/include/lwip/timeouts.h +index b601f9e..b451554 100644 +--- a/src/include/lwip/timeouts.h ++++ b/src/include/lwip/timeouts.h +@@ -119,6 +119,10 @@ struct sys_timeo** sys_timeouts_get_next_timeout(void); + void lwip_cyclic_timer(void *arg); + #endif + ++#if USE_LIBOS ++void sys_timer_run(void); ++#endif /* USE_LIBOS */ ++ + #endif /* LWIP_TIMERS */ + + #ifdef __cplusplus +diff --git a/src/include/lwiplog.h b/src/include/lwiplog.h +new file mode 100644 +index 0000000..363e516 +--- /dev/null ++++ b/src/include/lwiplog.h +@@ -0,0 +1,81 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __LWIPLOG_H__ ++#define __LWIPLOG_H__ ++ ++#include ++#include ++ ++#include ++ ++#include "lwipopts.h" ++ ++#define gettid() syscall(__NR_gettid) ++ ++#if USE_DPDK_LOG ++ ++#define LWIP_LOG_WARN LWIP_DBG_LEVEL_WARNING ++#define LWIP_LOG_ERROR LWIP_DBG_LEVEL_SERIOUS ++#define LWIP_LOG_FATAL LWIP_DBG_LEVEL_SEVERE ++ ++#define LWIP_PLATFORM_LOG(level, fmt, ...) \ ++do { \ ++ if ((level) & LWIP_LOG_FATAL) { \ ++ RTE_LOG(ERR, EAL, fmt, ##__VA_ARGS__); \ ++ abort(); \ ++ } else if ((level) & LWIP_LOG_ERROR) { \ ++ RTE_LOG(ERR, EAL, fmt, ##__VA_ARGS__); \ ++ } else if ((level) & LWIP_LOG_WARN) { \ ++ RTE_LOG(WARNING, EAL, fmt, ##__VA_ARGS__); \ ++ } else { \ ++ RTE_LOG(INFO, EAL, fmt, ##__VA_ARGS__); \ ++ } \ ++} while(0) ++ ++ ++#define LWIP_PLATFORM_DIAG(x) ++ ++#define ESC_ARGS(...) __VA_ARGS__ ++#define STRIP_BRACES(args) args ++ ++#define LWIP_PLATFORM_ASSERT(x) \ ++do { LWIP_PLATFORM_LOG(LWIP_LOG_FATAL, "Assertion \"%s\" failed at line %d in %s\n", \ ++ x, __LINE__, __FILE__); abort();} while(0) ++ ++#else ++ ++#define LWIP_PLATFORM_LOG(debug, message) ++ ++#endif /* USE_DPDK_LOG */ ++ ++#endif /* __LWIPLOG_H__ */ +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index 4ab26f2..8893a5f 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -1,8 +1,8 @@ + /* +- * Copyright (c) 2001-2003 Swedish Institute of Computer Science. +- * All rights reserved. +- * +- * Redistribution and use in source and binary forms, with or without modification, ++ * 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, +@@ -11,70 +11,193 @@ + * 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. ++ * 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 ++ * 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: Simon Goldschmidt ++ * ++ * Author: Huawei Technologies + * + */ +-#ifndef LWIP_HDR_LWIPOPTS_H__ +-#define LWIP_HDR_LWIPOPTS_H__ +- +-/* Prevent having to link sys_arch.c (we don't test the API layers in unit tests) */ +-#define NO_SYS 1 +-#define LWIP_NETCONN 0 +-#define LWIP_SOCKET 0 +-#define SYS_LIGHTWEIGHT_PROT 0 +- +-#define LWIP_IPV6 1 +-#define IPV6_FRAG_COPYHEADER 1 +-#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 0 +- +-/* Enable some protocols to test them */ +-#define LWIP_DHCP 1 +-#define LWIP_AUTOIP 1 +- +-#define LWIP_IGMP 1 +-#define LWIP_DNS 1 +- +-#define LWIP_ALTCP 1 +- +-/* Turn off checksum verification of fuzzed data */ +-#define CHECKSUM_CHECK_IP 0 +-#define CHECKSUM_CHECK_UDP 0 +-#define CHECKSUM_CHECK_TCP 0 +-#define CHECKSUM_CHECK_ICMP 0 +-#define CHECKSUM_CHECK_ICMP6 0 +- +-/* Minimal changes to opt.h required for tcp unit tests: */ +-#define MEM_SIZE 16000 +-#define TCP_SND_QUEUELEN 40 +-#define MEMP_NUM_TCP_SEG TCP_SND_QUEUELEN +-#define TCP_OVERSIZE 1 +-#define TCP_SND_BUF (12 * TCP_MSS) +-#define TCP_WND (10 * TCP_MSS) +-#define LWIP_WND_SCALE 1 +-#define TCP_RCV_SCALE 2 +-#define PBUF_POOL_SIZE 400 /* pbuf tests need ~200KByte */ +- +-/* Minimal changes to opt.h required for etharp unit tests: */ +-#define ETHARP_SUPPORT_STATIC_ENTRIES 1 +- +-#define LWIP_NUM_NETIF_CLIENT_DATA 1 +-#define LWIP_SNMP 1 +-#define MIB2_STATS 1 +-#define LWIP_MDNS_RESPONDER 1 +- +-#endif /* LWIP_HDR_LWIPOPTS_H__ */ ++ ++#ifndef __LWIPOPTS_H__ ++#define __LWIPOPTS_H__ ++ ++#define LWIP_TCPIP_CORE_LOCKING 1 ++ ++#define LWIP_NETCONN_SEM_PER_THREAD 0 ++ ++#define LWIP_TCP 1 ++ ++#define LWIP_SO_SENTIMEO 0 ++ ++#define LIP_SO_LINGER 0 ++ ++#define MEMP_USE_CUSTOM_POOLS 0 ++#define MEM_USE_POOLS 0 ++ ++#define PER_TCP_PCB_BUFFER (16 * 128) ++ ++#define MAX_CLIENTS (20000) ++ ++#define RESERVED_CLIENTS (2000) ++ ++#define MEMP_NUM_TCP_PCB (MAX_CLIENTS + RESERVED_CLIENTS) ++ ++/* we use PBUF_POOL instead of PBUF_RAM in tcp_write, so reduce PBUF_RAM size, ++ * and do NOT let PBUF_POOL_BUFSIZE less then TCP_MSS ++*/ ++#define MEM_SIZE (((PER_TCP_PCB_BUFFER + 128) * MEMP_NUM_TCP_SEG) >> 2) ++ ++#define MEMP_NUM_TCP_PCB_LISTEN 3000 ++ ++#define MEMP_NUM_TCP_SEG (128 * 128 * 2) ++ ++#define MEMP_NUM_NETCONN (MAX_CLIENTS + RESERVED_CLIENTS) ++ ++#define MEMP_NUM_SYS_SEM (MAX_CLIENTS + RESERVED_CLIENTS) ++ ++#define MEMP_NUM_SYS_MBOX (MAX_CLIENTS + RESERVED_CLIENTS) ++ ++#define PBUF_POOL_SIZE (MAX_CLIENTS * 2) ++ ++#define MEMP_MEM_MALLOC 0 ++ ++#define LWIP_ARP 1 ++ ++#define ETHARP_SUPPORT_STATIC_ENTRIES 1 ++ ++#define LWIP_IPV4 1 ++ ++#define IP_FORWARD 0 ++ ++#define IP_REASSEMBLY 1 ++ ++#define LWIP_UDP 0 ++ ++#define LWIP_TCP 1 ++ ++#define IP_HLEN 20 ++ ++#define TCP_HLEN 20 ++ ++#define FRAME_MTU 1500 ++ ++#define TCP_MSS (FRAME_MTU - IP_HLEN - TCP_HLEN) ++ ++#define TCP_WND (40 * TCP_MSS) ++ ++#define TCP_SND_BUF (5 * TCP_MSS) ++ ++#define TCP_SND_QUEUELEN (8191) ++ ++#define TCP_SNDLOWAT (TCP_SND_BUF / 5) ++ ++#define TCP_SNDQUEUELOWAT (TCP_SND_QUEUELEN / 5) ++ ++#define TCP_LISTEN_BACKLOG 1 ++ ++#define TCP_DEFAULT_LISTEN_BACKLOG 0xff ++ ++#define TCP_OVERSIZE 0 ++ ++#define LWIP_NETIF_API 1 ++ ++#define DEFAULT_TCP_RECVMBOX_SIZE 128 ++ ++#define DEFAULT_ACCEPTMBOX_SIZE 1024 ++ ++#define LWIP_NETCONN 1 ++ ++#define LWIP_TCPIP_TIMEOUT 0 ++ ++#define LWIP_SOCKET 1 ++ ++#define LWIP_TCP_KEEPALIVE 1 ++ ++#define LWIP_STATS 1 ++ ++#define LWIP_STATS_DISPLAY 1 ++ ++#define CHECKSUM_GEN_IP 1 /* master switch */ ++ ++#define CHECKSUM_GEN_TCP 1 /* master switch */ ++ ++#define CHECKSUM_CHECK_IP 1 /* master switch */ ++ ++#define CHECKSUM_CHECK_TCP 1 /* master switch */ ++ ++#define LWIP_TIMEVAL_PRIVATE 0 ++ ++#define USE_LIBOS 1 ++ ++#define LWIP_DEBUG 1 ++ ++#define LWIP_PERF 1 ++ ++#define LWIP_RECORD_PERF 0 ++ ++#define LWIP_SOCKET_POLL 0 ++ ++#define USE_LIBOS_ZC_RING 0 ++ ++#define SO_REUSE 1 ++ ++#define SIOCSHIWAT 1 ++ ++#define O_NONBLOCK 04000 /* same as define in bits/fcntl-linux.h */ ++ ++#define O_NDELAY O_NONBLOCK ++ ++#define FIONBIO 0x5421 /* same as define in asm-generic/ioctls.h */ ++ ++#define LWIP_SUPPORT_CUSTOM_PBUF 1 ++ ++#define MEM_LIBC_MALLOC 0 ++ ++#define LWIP_TIMERS 1 ++ ++#define TCPIP_MBOX_SIZE (MEMP_NUM_TCPIP_MSG_API) ++ ++#define TCP_PCB_HASH 1 ++ ++#define USE_DPDK_LOG 1 ++ ++#define LWIP_EPOOL_WAIT_MAX_EVENTS 30 ++ ++#define ARP_TABLE_SIZE 512 ++ ++/* ++ --------------------------------------- ++ ------- Syscall thread options -------- ++ --------------------------------------- ++*/ ++#define USE_SYSCALL_THREAD 1 ++ ++#define MAX_BLOCKING_ACCEPT_FD (100) ++ ++#define MAX_BLOCKING_CONNECT_FD (100) ++ ++#define MAX_BLOCKING_EPOLL_FD (100) ++ ++#define MAX_SYSCALL_EVENTS (MAX_BLOCKING_ACCEPT_FD + MAX_BLOCKING_CONNECT_FD + MAX_BLOCKING_EPOLL_FD) ++ ++#define MAX_HOST_FD (MAX_CLIENTS + RESERVED_CLIENTS) ++ ++#if USE_LIBOS ++#define PER_THREAD __thread ++#else ++#define PER_THREAD ++#endif ++ ++#endif /* __LWIPOPTS_H__ */ +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +new file mode 100644 +index 0000000..dbc67b9 +--- /dev/null ++++ b/src/include/lwipsock.h +@@ -0,0 +1,155 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __LWIPSOCK_H__ ++#define __LWIPSOCK_H__ ++ ++#include "lwip/opt.h" ++#include "lwip/api.h" ++ ++#include "posix_api.h" ++#include "eventpoll.h" ++ ++/* move some definitions to the lwipsock.h for libnet to use, and ++ * at the same time avoid conflict between lwip/sockets.h and sys/socket.h ++ */ ++ ++/* -------------------------------------------------- ++ * the following definition is copied from lwip/priv/tcpip_priv.h ++ * -------------------------------------------------- ++ */ ++ ++/** This is overridable for the rare case where more than 255 threads ++ * select on the same socket... ++ */ ++#ifndef SELWAIT_T ++#define SELWAIT_T u8_t ++#endif ++ ++union lwip_sock_lastdata { ++ struct netbuf *netbuf; ++ struct pbuf *pbuf; ++}; ++ ++/** Contains all internal pointers and states used for a socket */ ++struct lwip_sock { ++ /** sockets currently are built on netconns, each socket has one netconn */ ++ struct netconn *conn; ++ /** data that was left from the previous read */ ++ union lwip_sock_lastdata lastdata; ++#if LWIP_SOCKET_SELECT || LWIP_SOCKET_POLL ++ /** number of times data was received, set by event_callback(), ++ tested by the receive and select functions */ ++ s16_t rcvevent; ++ /** number of times data was ACKed (free send buffer), set by event_callback(), ++ tested by select */ ++ u16_t sendevent; ++ /** error happened for this socket, set by event_callback(), tested by select */ ++ u16_t errevent; ++ /** counter of how many threads are waiting for this socket using select */ ++ SELWAIT_T select_waiting; ++#endif /* LWIP_SOCKET_SELECT || LWIP_SOCKET_POLL */ ++#if LWIP_NETCONN_FULLDUPLEX ++ /* counter of how many threads are using a struct lwip_sock (not the 'int') */ ++ u8_t fd_used; ++ /* status of pending close/delete actions */ ++ u8_t fd_free_pending; ++#define LWIP_SOCK_FD_FREE_TCP 1 ++#define LWIP_SOCK_FD_FREE_FREE 2 ++#endif ++ ++#if USE_LIBOS ++ struct list_node list; ++ /* registered events */ ++ uint32_t epoll; ++ /* available events */ ++ uint32_t events; ++ epoll_data_t ep_data; ++ /* libos_epoll pointer in use */ ++ struct libos_epoll *epoll_data; ++#endif ++}; ++ ++#ifndef set_errno ++#define set_errno(err) do { if (err) { errno = (err); } } while(0) ++#endif ++ ++ ++/* -------------------------------------------------- ++ * --------------- LIBNET references ---------------- ++ * -------------------------------------------------- ++ */ ++#if USE_LIBOS ++extern uint32_t sockets_num; ++extern struct lwip_sock *sockets; ++/** ++ * Map a externally used socket index to the internal socket representation. ++ * ++ * @param s externally used socket index ++ * @return struct lwip_sock for the socket or NULL if not found ++ */ ++static inline struct lwip_sock * ++get_socket_without_errno(int s) ++{ ++ struct lwip_sock *sock = NULL; ++ ++ s -= LWIP_SOCKET_OFFSET; ++ ++ if ((s < 0) || (s >= sockets_num)) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): invalid\n", s + LWIP_SOCKET_OFFSET)); ++ return NULL; ++ } ++ ++ sock = &sockets[s]; ++ ++ if (!sock->conn) { ++ LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): not active\n", s + LWIP_SOCKET_OFFSET)); ++ return NULL; ++ } ++ ++ return sock; ++} ++#endif /* USE_LIBOS */ ++ ++struct lwip_sock *get_socket(int s); ++struct lwip_sock *get_socket_by_fd(int s); ++void lwip_sock_init(void); ++void lwip_exit(void); ++ ++extern int is_host_ipv4(uint32_t ipv4); ++extern int rearm_host_fd(int fd); ++extern int rearm_accept_fd(int fd); ++extern void unarm_host_fd(int fd); ++extern void clean_host_fd(int fd); ++extern int arm_host_fd(struct libos_epoll *ep, int op, int fd, struct epoll_event *event); ++ ++#endif /* __LWIPSOCK_H__ */ +diff --git a/src/include/memp_def.h b/src/include/memp_def.h +new file mode 100644 +index 0000000..082f685 +--- /dev/null ++++ b/src/include/memp_def.h +@@ -0,0 +1,66 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __MEMP_DEF_H__ ++#define __MEMP_DEF_H__ ++ ++#include "lwip/opt.h" ++#include "arch/cc.h" ++ ++#define LWIP_MEMPOOL_BASE_DECLARE(name) \ ++ extern void alloc_memp_##name##_base(void); ++ ++#define LWIP_MEM_MEMORY_DECLARE(name) \ ++ extern void alloc_memory_##name(void); ++ ++#define LWIP_MEMPOOL_BASE_INIT(name) \ ++ alloc_memp_##name##_base(); ++ ++#define LWIP_MEM_MEMORY_INIT(name) \ ++ alloc_memory_##name(); ++ ++#define LWIP_MEMPOOL(name, num, size, desc) LWIP_MEMPOOL_BASE_DECLARE(name) ++#include ++#undef LWIP_MEMPOOL ++ ++static inline void hugepage_init(void) ++{ ++#define LWIP_MEMPOOL(name,num,size,desc) LWIP_MEMPOOL_BASE_INIT(name) ++#include "lwip/priv/memp_std.h" ++ ++#if !MEM_LIBC_MALLOC ++ LWIP_MEM_MEMORY_DECLARE(ram_heap) ++ LWIP_MEM_MEMORY_INIT(ram_heap) ++#endif /* MEM_LIBC_MALLOC */ ++} ++ ++#endif /* __MEMP_DEF_H__ */ +diff --git a/src/include/posix_api.h b/src/include/posix_api.h +new file mode 100644 +index 0000000..8aa8516 +--- /dev/null ++++ b/src/include/posix_api.h +@@ -0,0 +1,88 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __POSIX_API_H__ ++#define __POSIX_API_H__ ++ ++#include ++#include ++#include ++#include ++ ++typedef struct { ++ void *handle; ++ int (*socket_fn)(int domain, int type, int protocol); ++ int (*accept_fn)(int s, struct sockaddr*, socklen_t*); ++ int (*accept4_fn)(int s, struct sockaddr *addr, socklen_t *addrlen, int flags); ++ int (*bind_fn)(int s, const struct sockaddr*, socklen_t); ++ int (*listen_fn)(int s, int backlog); ++ int (*connect_fn)(int s, const struct sockaddr *name, socklen_t namelen); ++ int (*getpeername_fn)(int s, struct sockaddr *name, socklen_t *namelen); ++ int (*getsockname_fn)(int s, struct sockaddr *name, socklen_t *namelen); ++ int (*setsockopt_fn)(int s, int level, int optname, const void *optval, socklen_t optlen); ++ int (*getsockopt_fn)(int s, int level, int optname, void *optval, socklen_t *optlen); ++ int (*shutdown_fn)(int s, int how); ++ int (*close_fn)(int fd); ++ pid_t (*fork_fn)(void); ++ ssize_t (*read_fn)(int fd, void *mem, size_t len); ++ ssize_t (*write_fn)(int fd, const void *data, size_t len); ++ ssize_t (*recv_fn)(int sockfd, void *buf, size_t len, int flags); ++ ssize_t (*send_fn)(int sockfd, const void *buf, size_t len, int flags); ++ ssize_t (*recv_msg)(int sockfd, const struct msghdr *msg, int flags); ++ ssize_t (*send_msg)(int sockfd, const struct msghdr *msg, int flags); ++ ssize_t (*recv_from)(int sockfd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen); ++ ssize_t (*send_to)(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, ++ socklen_t addrlen); ++ int (*fcntl_fn)(int fd, int cmd, ...); ++ int (*fcntl64_fn)(int fd, int cmd, ...); ++ int (*pipe_fn)(int pipefd[2]); ++ int (*epoll_create_fn)(int size); ++ int (*epoll_ctl_fn)(int epfd, int op, int fd, struct epoll_event *event); ++ int (*epoll_wait_fn)(int epfd, struct epoll_event *events, int maxevents, int timeout); ++ int (*epoll_close_fn)(int epfd); ++ int (*eventfd_fn)(unsigned int initval, int flags); ++ int (*is_epfd)(int fd); ++ struct lwip_sock* (*get_socket)(int fd); ++ int (*sigaction_fn)(int signum, const struct sigaction *act, struct sigaction *oldact); ++ int (*poll_fn)(struct pollfd *fds, nfds_t nfds, int timeout); ++ int (*ioctl_fn)(int fd, int cmd, ...); ++ ++ int is_chld; ++} posix_api_t; ++ ++posix_api_t *posix_api; ++ ++int posix_api_init(void); ++void posix_api_free(void); ++void posix_api_fork(void); ++ ++#endif /* __POSIX_API_H__ */ +diff --git a/src/include/reg_sock.h b/src/include/reg_sock.h +new file mode 100644 +index 0000000..76d4c48 +--- /dev/null ++++ b/src/include/reg_sock.h +@@ -0,0 +1,62 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __REG_SOCK_H__ ++#define __REG_SOCK_H__ ++ ++enum reg_ring_type { ++ REG_RING_TCP_LISTEN = 0, ++ REG_RING_TCP_LISTEN_CLOSE, ++ REG_RING_TCP_CONNECT, ++ REG_RING_TCP_CONNECT_CLOSE, ++ RING_REG_MAX, ++}; ++ ++struct libnet_quintuple { ++ uint32_t protocol; ++ /* net byte order */ ++ uint16_t src_port; ++ uint16_t dst_port; ++ uint32_t src_ip; ++ uint32_t dst_ip; ++}; ++ ++struct reg_ring_msg { ++ enum reg_ring_type type; ++ ++ uint32_t tid; ++ struct libnet_quintuple qtuple; ++}; ++ ++extern int vdev_reg_xmit(enum reg_ring_type type, struct libnet_quintuple *qtuple); ++ ++#endif /* __REG_SOCK_H__ */ +\ No newline at end of file +diff --git a/src/netif/dir.mk b/src/netif/dir.mk +index 233c79a..f585d5e 100644 +--- a/src/netif/dir.mk ++++ b/src/netif/dir.mk +@@ -1,3 +1,3 @@ +-SRC = ethernet.c ++SRC = ethernet.c + + $(eval $(call register_dir, netif, $(SRC))) +-- +1.8.3.1 + diff --git a/0003-fix-the-occasional-coredump-when-the-lwip-exits.patch b/0003-fix-the-occasional-coredump-when-the-lwip-exits.patch new file mode 100644 index 0000000..a540728 --- /dev/null +++ b/0003-fix-the-occasional-coredump-when-the-lwip-exits.patch @@ -0,0 +1,63 @@ +From 0d5070b4a40912a7921e0101461a9c7d61919acd Mon Sep 17 00:00:00 2001 +From: HuangLiming +Date: Tue, 25 May 2021 03:08:33 -0400 +Subject: [PATCH] fix the occasional coredump when the lwip exits + +Signed-off-by: HuangLiming +--- + src/api/sockets.c | 37 +++++++++---------------------------- + 1 file changed, 9 insertions(+), 28 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index d62e55b..658f762 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -4655,36 +4655,17 @@ void lwip_sock_init(void) + return; + } + +-//modify from lwip_close + void lwip_exit(void) + { +- int i, is_tcp; +- struct lwip_sock *sock; +- +- if (memp_pools[MEMP_SYS_MBOX] == NULL) { +- return; +- } +- +- for (i = 0; i < sockets_num; i++) { +- sock = &sockets[i]; +- if (!sock->conn) +- continue; +-#if LWIP_IGMP +- /* drop all possibly joined IGMP memberships */ +- lwip_socket_drop_registered_memberships(i); +-#endif /* LWIP_IGMP */ +- /* +- * process is exiting, call netconn_delete to +- * close tcp connection, and ignore the return value +- */ +- is_tcp = NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP; +- netconn_delete(sock->conn); +- free_socket(sock, is_tcp); +- } +- +- free(sockets); +- sockets = NULL; +- sockets_num = 0; ++ /* ++ * LwIP has the following two parts of memory application, but ++ * it is unnecessary to release all memory in sequentially, ++ * which increases complexity. Therefore, we rely on the process ++ * reclamation mechanism of the system to release memory. ++ * 1. a sockets table of the process. ++ * 2. a batch of hugepage memory of each thread. ++ */ ++ return; + } + + #endif /* USE_LIBOS */ +-- +2.23.0 + diff --git a/0004-fix-error-of-deleting-conn-table-in-connect.patch b/0004-fix-error-of-deleting-conn-table-in-connect.patch new file mode 100644 index 0000000..3208182 --- /dev/null +++ b/0004-fix-error-of-deleting-conn-table-in-connect.patch @@ -0,0 +1,79 @@ +From ed999b65aac44fcb68fc533e8bd5a23cf2d09e7c Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Wed, 26 May 2021 19:09:41 +0800 +Subject: [PATCH] fix-error-of-deleting-conn-table-in-connect + +--- + src/include/lwip/priv/tcp_priv.h | 42 ++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 8 deletions(-) + +diff --git a/src/include/lwip/priv/tcp_priv.h b/src/include/lwip/priv/tcp_priv.h +index 192edc4..599289f 100644 +--- a/src/include/lwip/priv/tcp_priv.h ++++ b/src/include/lwip/priv/tcp_priv.h +@@ -358,6 +358,28 @@ static inline int vdev_reg_done(enum reg_ring_type reg_type, const struct tcp_pc + + return vdev_reg_xmit(reg_type, &qtuple); + } ++ ++/* TCP_RMV pcb whether to call vdev_reg_xmit to reg conn-sock table. ++ fix the error of adding conn table in connect func and deleting conn table ++ when moving pcb from tcp_bound_pcbs to tcp_listen_pcbs */ ++static inline int need_vdev_reg(struct tcp_pcb *pcb_list, const struct tcp_pcb *pcb) ++{ ++ /* tw_pcbs_list and tcp_listen_pcbs will not change pcb to other list always reg */ ++ if ((pcb_list == tcp_tw_pcbs) || (pcb_list == tcp_listen_pcbs.pcbs)) { ++ return 1; ++ } ++ ++ /* tcp_active_pcbs in FIN_WAIT_1,FIN_WAIT_2,CLOSING state will change pcb to tw_pcbs_list don't reg. ++ detail info see func tcp_process in tcp_in.c */ ++ if (pcb_list == tcp_active_pcbs) { ++ if ((pcb->state != FIN_WAIT_1) && (pcb->state != FIN_WAIT_2) && (pcb->state != CLOSING)) { ++ return 1; ++ } ++ } ++ ++ /* tcp_bound_pcbs and others don't reg */ ++ return 0; ++} + #endif + + /* Axioms about the above lists: +@@ -392,10 +414,12 @@ static inline int vdev_reg_done(enum reg_ring_type reg_type, const struct tcp_pc + tcp_timer_needed(); \ + } while(0) + #define TCP_RMV(pcbs, npcb) do { \ +- if (pcb->state == LISTEN) \ +- vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ +- else \ +- vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb);\ ++ if (need_vdev_reg(*pcbs, npcb)) { \ ++ if (npcb->state == LISTEN) \ ++ vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ ++ else \ ++ vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb); \ ++ } \ + struct tcp_pcb *tcp_tmp_pcb; \ + LWIP_ASSERT("TCP_RMV: pcbs != NULL", *(pcbs) != NULL); \ + LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removing %p from %p\n", (npcb), *(pcbs))); \ +@@ -488,10 +512,12 @@ static inline int vdev_reg_done(enum reg_ring_type reg_type, const struct tcp_pc + + #define TCP_RMV(pcbs, npcb) \ + do { \ +- if (pcb->state == LISTEN) \ +- vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ +- else \ +- vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb);\ ++ if (need_vdev_reg(*pcbs, npcb)) { \ ++ if (npcb->state == LISTEN) \ ++ vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ ++ else \ ++ vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb);\ ++ } \ + if(*(pcbs) == (npcb)) { \ + (*(pcbs)) = (*pcbs)->next; \ + if (*pcbs) \ +-- +2.23.0 + diff --git a/0005-syn-rcvd-state-reg-conn-into-conntable.patch b/0005-syn-rcvd-state-reg-conn-into-conntable.patch new file mode 100644 index 0000000..2634f11 --- /dev/null +++ b/0005-syn-rcvd-state-reg-conn-into-conntable.patch @@ -0,0 +1,27 @@ +From 19c51d7baf7eeeae72525f6b716253557be2b31c Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Tue, 29 Jun 2021 14:12:25 +0800 +Subject: [PATCH] add-conn-check + +--- + src/core/tcp_in.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index c3d1f54..57186c7 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -752,6 +752,10 @@ tcp_listen_input(struct tcp_pcb_listen *pcb) + #endif + TCP_REG_ACTIVE(npcb); + ++#if USE_LIBOS ++ vdev_reg_done(REG_RING_TCP_CONNECT, npcb); ++#endif ++ + /* Parse any options in the SYN. */ + tcp_parseopt(npcb); + npcb->snd_wnd = tcphdr->wnd; +-- +2.23.0 + diff --git a/0006-fix-coredump-in-etharp.patch b/0006-fix-coredump-in-etharp.patch new file mode 100644 index 0000000..d361649 --- /dev/null +++ b/0006-fix-coredump-in-etharp.patch @@ -0,0 +1,29 @@ +From a066306d783693d3f78b9c5e84feca7d690cf27a Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Fri, 2 Jul 2021 16:54:43 +0800 +Subject: [PATCH] fix coredump in etharp + +--- + src/core/ipv4/etharp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/ipv4/etharp.c b/src/core/ipv4/etharp.c +index c3a5a10..effb7db 100644 +--- a/src/core/ipv4/etharp.c ++++ b/src/core/ipv4/etharp.c +@@ -102,10 +102,10 @@ struct etharp_entry { + u8_t state; + }; + +-static struct etharp_entry arp_table[ARP_TABLE_SIZE]; ++static PER_THREAD struct etharp_entry arp_table[ARP_TABLE_SIZE]; + + #if !LWIP_NETIF_HWADDRHINT +-static netif_addr_idx_t etharp_cached_entry; ++static PER_THREAD netif_addr_idx_t etharp_cached_entry; + #endif /* !LWIP_NETIF_HWADDRHINT */ + + /** Try hard to create a new entry - we want the IP address to appear in +-- +2.23.0 + diff --git a/0007-gazelle-fix-epoll_ctl-EPOLLET-mode-error.patch b/0007-gazelle-fix-epoll_ctl-EPOLLET-mode-error.patch new file mode 100644 index 0000000..97b5d78 --- /dev/null +++ b/0007-gazelle-fix-epoll_ctl-EPOLLET-mode-error.patch @@ -0,0 +1,102 @@ +From b867f6901773def31884a9ae527a1282d274a85d Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Sat, 10 Jul 2021 22:27:19 +0800 +Subject: [PATCH] fix epoll_ctl EPOLLET mode error +--- + src/api/sockets.c | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 658f762..eccc7f9 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -714,6 +714,13 @@ free_socket(struct lwip_sock *sock, int is_tcp) + /* Protect socket array */ + SYS_ARCH_PROTECT(lev); + ++#if USE_LIBOS ++ sock->epoll = LIBOS_EPOLLNONE; ++ sock->events = 0; ++ sock->epoll_data = NULL; ++ list_del_node_null(&sock->list); ++#endif ++ + freed = free_socket_locked(sock, is_tcp, &conn, &lastdata); + SYS_ARCH_UNPROTECT(lev); + /* don't use 'sock' after this line, as another task might have allocated it */ +@@ -1003,13 +1010,6 @@ lwip_close(int s) + return -1; + } + +-#if USE_LIBOS +- sock->epoll = LIBOS_EPOLLNONE; +- sock->events = 0; +- sock->epoll_data = NULL; +- list_del_node_null(&sock->list); +-#endif +- + free_socket(sock, is_tcp); + set_errno(0); + return 0; +@@ -1191,7 +1191,7 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + if (sock->lastdata.pbuf) { + p = sock->lastdata.pbuf; + #if USE_LIBOS +- if ((flags & MSG_PEEK) == 0) { ++ if (((flags & MSG_PEEK) == 0) && ((sock->epoll & EPOLLET) == 0)) { + if ((NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP)) { + del_epoll_event(sock->conn, EPOLLIN); + } +@@ -2889,6 +2889,9 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + check_waiters = 0; + } + #if USE_LIBOS ++ if (sock->epoll & EPOLLET) { ++ list_del_node_null(&sock->list); ++ } + add_epoll_event(conn, EPOLLIN); + #endif + break; +@@ -2896,7 +2899,9 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + sock->rcvevent--; + check_waiters = 0; + #if USE_LIBOS +- del_epoll_event(conn, EPOLLIN); ++ if ((sock->epoll & EPOLLET) == 0) { ++ del_epoll_event(conn, EPOLLIN); ++ } + #endif + break; + case NETCONN_EVT_SENDPLUS: +@@ -2905,6 +2910,9 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + } + sock->sendevent = 1; + #if USE_LIBOS ++ if (sock->epoll & EPOLLET) { ++ list_del_node_null(&sock->list); ++ } + add_epoll_event(conn, EPOLLOUT); + #endif + break; +@@ -2912,12 +2920,17 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + sock->sendevent = 0; + check_waiters = 0; + #if USE_LIBOS +- del_epoll_event(conn, EPOLLOUT); ++ if ((sock->epoll & EPOLLET) == 0) { ++ del_epoll_event(conn, EPOLLOUT); ++ } + #endif + break; + case NETCONN_EVT_ERROR: + sock->errevent = 1; + #if USE_LIBOS ++ if (sock->epoll & EPOLLET) { ++ list_del_node_null(&sock->list); ++ } + add_epoll_event(conn, EPOLLERR); + #endif + break; +-- +2.23.0 + diff --git a/0008-gazelle-fix-lwip_accept-memcpy-sockaddr-large.patch b/0008-gazelle-fix-lwip_accept-memcpy-sockaddr-large.patch new file mode 100644 index 0000000..94eec7f --- /dev/null +++ b/0008-gazelle-fix-lwip_accept-memcpy-sockaddr-large.patch @@ -0,0 +1,25 @@ +From bf1c7febb9f6c3a2336f18f658694393dea451ae Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Fri, 16 Jul 2021 14:44:03 +0800 +Subject: [PATCH] [Huawei]gazelle: fix lwip_accept memcpy sockaddr larger than + actual +--- + src/api/sockets.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index eccc7f9..e640945 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -860,6 +860,8 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + if (*addrlen > tempaddr.sa.sa_len) { + *addrlen = tempaddr.sa.sa_len; + } ++#else ++ *addrlen = LWIP_MIN(*addrlen, sizeof(tempaddr)); + #endif /* USE_LIBOS */ + MEMCPY(addr, &tempaddr, *addrlen); + +-- +2.23.0 + diff --git a/0009-fix-stack-buffer-overflow-when-memcpy-addr.patch b/0009-fix-stack-buffer-overflow-when-memcpy-addr.patch new file mode 100644 index 0000000..38f97ee --- /dev/null +++ b/0009-fix-stack-buffer-overflow-when-memcpy-addr.patch @@ -0,0 +1,35 @@ +From d1f9ccd5da1712477f30bf2662e8888395ed95cd Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Wed, 21 Jul 2021 20:01:47 +0800 +Subject: [PATCH] fix stack-buffer-overflow in lwip_sock_make_addr and + lwip_getaddrname + +--- + src/api/sockets.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index e640945..7ce9378 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -1319,6 +1319,8 @@ lwip_sock_make_addr(struct netconn *conn, ip_addr_t *fromaddr, u16_t port, + } else if (*fromlen > saddr.sa.sa_len) { + *fromlen = saddr.sa.sa_len; + } ++#else ++ *fromlen = LWIP_MIN(*fromlen, sizeof(saddr)); + #endif + MEMCPY(from, &saddr, *fromlen); + return truncated; +@@ -3133,6 +3135,8 @@ lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local) + if (*namelen > saddr.sa.sa_len) { + *namelen = saddr.sa.sa_len; + } ++#else ++ *namelen = LWIP_MIN(*namelen, sizeof(saddr)); + #endif + MEMCPY(name, &saddr, *namelen); + +-- +2.23.0 + diff --git a/0010-fix-the-incomplete-release-of-the-conntable.patch b/0010-fix-the-incomplete-release-of-the-conntable.patch new file mode 100644 index 0000000..8c7c4f0 --- /dev/null +++ b/0010-fix-the-incomplete-release-of-the-conntable.patch @@ -0,0 +1,115 @@ +From 70a1cdd2618f117c9f7da17b111a6c51db242f4b Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Tue, 3 Aug 2021 11:23:10 +0800 +Subject: [PATCH] fix-the-incomplete-release-of-the-conntable + +--- + src/core/tcp.c | 12 +++++++++++ + src/include/lwip/priv/tcp_priv.h | 37 ++++++-------------------------- + 2 files changed, 19 insertions(+), 30 deletions(-) + +diff --git a/src/core/tcp.c b/src/core/tcp.c +index 0aafa9b..2cfbce2 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -235,6 +235,9 @@ tcp_init(void) + void + tcp_free(struct tcp_pcb *pcb) + { ++#if USE_LIBOS ++ vdev_unreg_done(pcb); ++#endif + LWIP_ASSERT("tcp_free: LISTEN", pcb->state != LISTEN); + #if LWIP_TCP_PCB_NUM_EXT_ARGS + tcp_ext_arg_invoke_callbacks_destroyed(pcb->ext_args); +@@ -943,6 +946,11 @@ tcp_listen_with_backlog_and_err(struct tcp_pcb *pcb, u8_t backlog, err_t *err) + #if LWIP_TCP_PCB_NUM_EXT_ARGS + /* copy over ext_args to listening pcb */ + memcpy(&lpcb->ext_args, &pcb->ext_args, sizeof(pcb->ext_args)); ++#endif ++#if USE_LIBOS ++ /* pcb transfer to lpcb and reg into tcp_listen_pcbs. freeing pcb shouldn't release sock table in here. ++ * local_port=0 avoid to release sock table in tcp_free */ ++ pcb->local_port = 0; + #endif + tcp_free(pcb); + #if LWIP_CALLBACK_API +@@ -2263,6 +2271,10 @@ tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) + LWIP_ASSERT("tcp_pcb_remove: invalid pcb", pcb != NULL); + LWIP_ASSERT("tcp_pcb_remove: invalid pcblist", pcblist != NULL); + ++#if USE_LIBOS ++ vdev_unreg_done(pcb); ++#endif ++ + TCP_RMV(pcblist, pcb); + + tcp_pcb_purge(pcb); +diff --git a/src/include/lwip/priv/tcp_priv.h b/src/include/lwip/priv/tcp_priv.h +index 599289f..f771725 100644 +--- a/src/include/lwip/priv/tcp_priv.h ++++ b/src/include/lwip/priv/tcp_priv.h +@@ -358,27 +358,16 @@ static inline int vdev_reg_done(enum reg_ring_type reg_type, const struct tcp_pc + + return vdev_reg_xmit(reg_type, &qtuple); + } +- +-/* TCP_RMV pcb whether to call vdev_reg_xmit to reg conn-sock table. +- fix the error of adding conn table in connect func and deleting conn table +- when moving pcb from tcp_bound_pcbs to tcp_listen_pcbs */ +-static inline int need_vdev_reg(struct tcp_pcb *pcb_list, const struct tcp_pcb *pcb) ++static inline void vdev_unreg_done(const struct tcp_pcb *pcb) + { +- /* tw_pcbs_list and tcp_listen_pcbs will not change pcb to other list always reg */ +- if ((pcb_list == tcp_tw_pcbs) || (pcb_list == tcp_listen_pcbs.pcbs)) { +- return 1; ++ if (pcb->local_port == 0) { ++ return; + } +- +- /* tcp_active_pcbs in FIN_WAIT_1,FIN_WAIT_2,CLOSING state will change pcb to tw_pcbs_list don't reg. +- detail info see func tcp_process in tcp_in.c */ +- if (pcb_list == tcp_active_pcbs) { +- if ((pcb->state != FIN_WAIT_1) && (pcb->state != FIN_WAIT_2) && (pcb->state != CLOSING)) { +- return 1; +- } ++ if (pcb->state == LISTEN) { ++ vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, pcb); ++ } else { ++ vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, pcb); + } +- +- /* tcp_bound_pcbs and others don't reg */ +- return 0; + } + #endif + +@@ -414,12 +403,6 @@ static inline int need_vdev_reg(struct tcp_pcb *pcb_list, const struct tcp_pcb * + tcp_timer_needed(); \ + } while(0) + #define TCP_RMV(pcbs, npcb) do { \ +- if (need_vdev_reg(*pcbs, npcb)) { \ +- if (npcb->state == LISTEN) \ +- vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ +- else \ +- vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb); \ +- } \ + struct tcp_pcb *tcp_tmp_pcb; \ + LWIP_ASSERT("TCP_RMV: pcbs != NULL", *(pcbs) != NULL); \ + LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removing %p from %p\n", (npcb), *(pcbs))); \ +@@ -512,12 +495,6 @@ static inline int need_vdev_reg(struct tcp_pcb *pcb_list, const struct tcp_pcb * + + #define TCP_RMV(pcbs, npcb) \ + do { \ +- if (need_vdev_reg(*pcbs, npcb)) { \ +- if (npcb->state == LISTEN) \ +- vdev_reg_done(REG_RING_TCP_LISTEN_CLOSE, npcb); \ +- else \ +- vdev_reg_done(REG_RING_TCP_CONNECT_CLOSE, npcb);\ +- } \ + if(*(pcbs) == (npcb)) { \ + (*(pcbs)) = (*pcbs)->next; \ + if (*pcbs) \ +-- +2.23.0 + diff --git a/0011-remove-gazelle-tcp-conn-func.patch b/0011-remove-gazelle-tcp-conn-func.patch new file mode 100644 index 0000000..08a3dd3 --- /dev/null +++ b/0011-remove-gazelle-tcp-conn-func.patch @@ -0,0 +1,116 @@ +From fdccb3a2c430c6270ff5272220cf471bf760fda7 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Sat, 21 Aug 2021 15:22:52 +0800 +Subject: [PATCH] del tcp_conn + +--- + src/core/tcp.c | 78 ------------------------------------------ + src/include/lwip/tcp.h | 3 -- + 2 files changed, 81 deletions(-) + +diff --git a/src/core/tcp.c b/src/core/tcp.c +index 2cfbce2..0f3e830 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -2484,84 +2484,6 @@ tcp_tcp_get_tcp_addrinfo(struct tcp_pcb *pcb, int local, ip_addr_t *addr, u16_t + return ERR_VAL; + } + +-uint32_t tcp_get_conn_num(void) +-{ +- struct tcp_pcb *pcb = NULL; +- struct tcp_pcb_listen *pcbl = NULL; +- uint32_t conn_num = 0; +- +- for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { +- conn_num++; +- } +- +- for (pcbl = tcp_listen_pcbs.listen_pcbs; pcbl != NULL; pcbl = pcbl->next) { +- conn_num++; +- } +- +- for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) { +- conn_num++; +- } +- +- return conn_num; +-} +- +-void tcp_get_conn(char *buf, int32_t len, uint32_t *conn_num) +-{ +- int tmp_len = 0; +- char *tmp_buf = buf; +- struct tcp_pcb_dp tdp; +- struct tcp_pcb *pcb = NULL; +- struct tcp_pcb_listen *pcbl = NULL; +- +-#define COPY_TDP(b, l) \ +- do { \ +- if (l + sizeof(tdp) <= len) { \ +- memcpy(b, &tdp, sizeof(tdp)); \ +- b += sizeof(tdp); \ +- l += sizeof(tdp); \ +- *conn_num += 1; \ +- } else \ +- return; \ +- } while(0); +- +- *conn_num = 0; +- +- for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { +- tdp.state = ACTIVE_LIST; +- tdp.lip = pcb->local_ip.addr; +- tdp.rip = pcb->remote_ip.addr; +- tdp.l_port = pcb->local_port; +- tdp.r_port = pcb->remote_port; +- tdp.s_next = pcb->snd_queuelen; +- /* lwip not cache rcv buf. Set it to 0. */ +- tdp.r_next = 0; +- tdp.tcp_sub_state = pcb->state; +- COPY_TDP(tmp_buf, tmp_len); +- } +- +- for (pcbl = tcp_listen_pcbs.listen_pcbs; pcbl != NULL; pcbl = pcbl->next) { +- tdp.state = LISTEN_LIST; +- tdp.lip = pcbl->local_ip.addr; +- tdp.rip = pcbl->remote_ip.addr; +- tdp.l_port = pcbl->local_port; +- tdp.tcp_sub_state = pcbl->state; +- COPY_TDP(tmp_buf, tmp_len); +- } +- +- for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) { +- tdp.state = TIME_WAIT_LIST; +- tdp.lip = pcb->local_ip.addr; +- tdp.rip = pcb->remote_ip.addr; +- tdp.l_port = pcb->local_port; +- tdp.r_port = pcb->remote_port; +- tdp.s_next = pcb->snd_queuelen; +- /* lwip not cache rcv buf. Set it to 0. */ +- tdp.r_next = 0; +- tdp.tcp_sub_state = pcb->state; +- COPY_TDP(tmp_buf, tmp_len); +- } +-} +- + #if TCP_QUEUE_OOSEQ + /* Free all ooseq pbufs (and possibly reset SACK state) */ + void +diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h +index 4f86b46..b36bf33 100644 +--- a/src/include/lwip/tcp.h ++++ b/src/include/lwip/tcp.h +@@ -570,9 +570,6 @@ struct tcp_pcb_dp { + uint32_t tcp_sub_state; + }; + +-void tcp_get_conn(char *buf, int32_t len, uint32_t *conn_num); +-uint32_t tcp_get_conn_num(void); +- + /* for compatibility with older implementation */ + #define tcp_new_ip6() tcp_new_ip_type(IPADDR_TYPE_V6) + +-- +2.23.0 + diff --git a/0012-fix-incomplete-resource-release-in-lwip-close.patch b/0012-fix-incomplete-resource-release-in-lwip-close.patch new file mode 100644 index 0000000..eeea235 --- /dev/null +++ b/0012-fix-incomplete-resource-release-in-lwip-close.patch @@ -0,0 +1,49 @@ +From c5db70bef7f1ac6627b278fdf06be57bce0ef00b Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 19 Aug 2021 14:53:14 +0800 +Subject: [PATCH] fix event.data.ptr double free due to socket don't free in +lwip_close + +--- +src/api/sockets.c | 10 ++++++---- +1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 7ce9378..ac4cccb 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -963,18 +963,20 @@ lwip_close(int s) + struct lwip_sock *sock; + int is_tcp = 0; + err_t err; ++ int ret = 0; + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_close(%d)\n", s)); + + #if USE_LIBOS +- int ret; + if (posix_api->is_epfd(s)) { + return posix_api->epoll_close_fn(s); + } + ++ /* No matter what the result of close, lwip_sock resources should release ++ * to prevent the potential double freee problem caused by reporting events after the close */ + ret = posix_api->close_fn(s); +- if (ret < 0) +- return ret; ++ if ((ret < 0) && (errno == EINTR)) ++ ret = posix_api->close_fn(s); + if (posix_api->is_chld == 0) + clean_host_fd(s); + +@@ -1014,7 +1016,7 @@ lwip_close(int s) + + free_socket(sock, is_tcp); + set_errno(0); +- return 0; ++ return ret; + } + + int +-- +2.23.0 diff --git a/0013-remove-gazelle-syscall-thread.patch b/0013-remove-gazelle-syscall-thread.patch new file mode 100644 index 0000000..c098137 --- /dev/null +++ b/0013-remove-gazelle-syscall-thread.patch @@ -0,0 +1,126 @@ +From afd0d39d31196a74d6808120d1ca5664825d477c Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Mon, 6 Sep 2021 22:52:41 +0800 +Subject: [PATCH] aaa + +--- + src/api/sockets.c | 17 ----------------- + src/include/eventpoll.h | 1 - + src/include/lwipopts.h | 17 ----------------- + src/include/lwipsock.h | 5 ----- + 4 files changed, 40 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index ac4cccb..8719568 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -755,10 +755,6 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + sock = posix_api->get_socket(s); + /*AF_UNIX case*/ + if (!sock) { +- if (rearm_accept_fd(s) < 0) { +- LWIP_DEBUGF(SOCKETS_DEBUG, +- ("failed to rearm accept fd=%d errno=%d\n", s, errno)); +- } + return posix_api->accept_fn(s, addr, addrlen); + } + +@@ -769,11 +765,6 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + return -1; + } + +- if (rearm_accept_fd(s) < 0) { +- LWIP_DEBUGF(SOCKETS_DEBUG, +- ("failed to rearm accept fd=%d errno=%d\n", s, errno)); +- } +- + /* raise accept syscall in palce */ + newsock = posix_api->accept_fn(s, addr, addrlen); + if (newsock >= 0) { +@@ -977,8 +968,6 @@ lwip_close(int s) + ret = posix_api->close_fn(s); + if ((ret < 0) && (errno == EINTR)) + ret = posix_api->close_fn(s); +- if (posix_api->is_chld == 0) +- clean_host_fd(s); + + sock = posix_api->get_socket(s); + /*AF_UNIX case*/ +@@ -1481,9 +1470,6 @@ static inline enum KERNEL_LWIP_PATH select_path(int s) + sock = posix_api->get_socket(s); + /*AF_UNIX case*/ + if (!sock) { +- if (rearm_host_fd(s) < 0) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("failed to rearm fd=%d errno=%d\n", s, errno)); +- } + return PATH_KERNEL; + } + +@@ -1494,9 +1480,6 @@ static inline enum KERNEL_LWIP_PATH select_path(int s) + + /*for AF_INET, we can try erther linux or lwip*/ + if (CONN_TYPE_IS_HOST(sock->conn)) { +- if (rearm_host_fd(s) < 0) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("failed to rearm read fd=%d errno=%d\n", s, errno)); +- } + return PATH_KERNEL; + } + +diff --git a/src/include/eventpoll.h b/src/include/eventpoll.h +index 01f8d64..f525bc2 100644 +--- a/src/include/eventpoll.h ++++ b/src/include/eventpoll.h +@@ -57,7 +57,6 @@ struct event_array { + + struct libos_epoll { + struct event_queue *libos_queue; +- struct event_array *host_queue; + int num_hostfds; + int hints; + int fd; /* self fd */ +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index 8893a5f..e0364a2 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -177,23 +177,6 @@ + + #define ARP_TABLE_SIZE 512 + +-/* +- --------------------------------------- +- ------- Syscall thread options -------- +- --------------------------------------- +-*/ +-#define USE_SYSCALL_THREAD 1 +- +-#define MAX_BLOCKING_ACCEPT_FD (100) +- +-#define MAX_BLOCKING_CONNECT_FD (100) +- +-#define MAX_BLOCKING_EPOLL_FD (100) +- +-#define MAX_SYSCALL_EVENTS (MAX_BLOCKING_ACCEPT_FD + MAX_BLOCKING_CONNECT_FD + MAX_BLOCKING_EPOLL_FD) +- +-#define MAX_HOST_FD (MAX_CLIENTS + RESERVED_CLIENTS) +- + #if USE_LIBOS + #define PER_THREAD __thread + #else +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index dbc67b9..e9ffbb1 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -146,10 +146,5 @@ void lwip_sock_init(void); + void lwip_exit(void); + + extern int is_host_ipv4(uint32_t ipv4); +-extern int rearm_host_fd(int fd); +-extern int rearm_accept_fd(int fd); +-extern void unarm_host_fd(int fd); +-extern void clean_host_fd(int fd); +-extern int arm_host_fd(struct libos_epoll *ep, int op, int fd, struct epoll_event *event); + + #endif /* __LWIPSOCK_H__ */ +-- +2.23.0 + diff --git a/0014-fix-some-compile-errors.patch b/0014-fix-some-compile-errors.patch new file mode 100644 index 0000000..5be2bdf --- /dev/null +++ b/0014-fix-some-compile-errors.patch @@ -0,0 +1,62 @@ +From 4970d00fecf52a472a28d55243f87142d3d08268 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Tue, 4 Jan 2022 17:23:03 +0800 +Subject: [PATCH] fix some compile errors + +--- + src/include/arch/cc.h | 4 ++-- + src/include/lwiplog.h | 2 +- + src/include/posix_api.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/include/arch/cc.h b/src/include/arch/cc.h +index 33c24b4..222b0c9 100644 +--- a/src/include/arch/cc.h ++++ b/src/include/arch/cc.h +@@ -62,7 +62,7 @@ void alloc_memp_##name##_base(void) \ + memp_pools[MEMP_##name] = &memp_ ## name; \ + \ + char mpname[MEMZONE_NAMESIZE] = {0}; \ +- snprintf(mpname, MEMZONE_NAMESIZE, "%ld_%s", gettid(), #name); \ ++ snprintf(mpname, MEMZONE_NAMESIZE, "%d_%s", gettid(), #name); \ + memp_memory_##name##_base = \ + sys_hugepage_malloc(mpname, LWIP_MEM_ALIGN_BUFFER(__size)); \ + memp_pools[MEMP_##name]->base = memp_memory_##name##_base; \ +@@ -73,7 +73,7 @@ PER_THREAD uint8_t *variable_name; \ + void alloc_memory_##variable_name(void) \ + { \ + char mpname[MEMZONE_NAMESIZE] = {0}; \ +- snprintf(mpname, MEMZONE_NAMESIZE, "%ld_%s", gettid(), #variable_name); \ ++ snprintf(mpname, MEMZONE_NAMESIZE, "%d_%s", gettid(), #variable_name); \ + (variable_name) = \ + sys_hugepage_malloc(mpname, LWIP_MEM_ALIGN_BUFFER(size)); \ + } +diff --git a/src/include/lwiplog.h b/src/include/lwiplog.h +index 363e516..6fccac8 100644 +--- a/src/include/lwiplog.h ++++ b/src/include/lwiplog.h +@@ -40,7 +40,7 @@ + + #include "lwipopts.h" + +-#define gettid() syscall(__NR_gettid) ++extern int gettid(void); + + #if USE_DPDK_LOG + +diff --git a/src/include/posix_api.h b/src/include/posix_api.h +index 8aa8516..0dca8eb 100644 +--- a/src/include/posix_api.h ++++ b/src/include/posix_api.h +@@ -79,7 +79,7 @@ typedef struct { + int is_chld; + } posix_api_t; + +-posix_api_t *posix_api; ++extern posix_api_t *posix_api; + + int posix_api_init(void); + void posix_api_free(void); +-- +1.8.3.1 + diff --git a/0015-fix-tcp-port-alloc-issue.patch b/0015-fix-tcp-port-alloc-issue.patch new file mode 100644 index 0000000..4576af8 --- /dev/null +++ b/0015-fix-tcp-port-alloc-issue.patch @@ -0,0 +1,36 @@ +From bd0fdaf755544da1a276820a7cc3f664a2765194 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Tue, 18 Jan 2022 10:34:42 +0800 +Subject: [PATCH] fix tcp port alloc issue + +--- + src/core/tcp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/core/tcp.c b/src/core/tcp.c +index a9a91fd..b65ab33 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -1062,6 +1062,7 @@ tcp_new_port(void) + { + u8_t i; + u16_t n = 0; ++ u16_t tmp_port; + struct tcp_pcb *pcb; + + pthread_mutex_lock(&g_tcp_port_mutex); +@@ -1082,9 +1083,10 @@ again: + } + } + } ++ tmp_port = tcp_port; + pthread_mutex_unlock(&g_tcp_port_mutex); + +- return tcp_port; ++ return tmp_port; + } + + /** +-- +1.8.3.1 + diff --git a/0016-lstack-support-mysql-mode.patch b/0016-lstack-support-mysql-mode.patch new file mode 100644 index 0000000..0ac7fe1 --- /dev/null +++ b/0016-lstack-support-mysql-mode.patch @@ -0,0 +1,943 @@ +From 1f0f3742019e2fa62ba1669c5a880fb63a3fee12 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Thu, 24 Feb 2022 20:08:46 +0800 +Subject: [PATCH] lstack support mysql mode + +--- + src/api/api_msg.c | 26 +-- + src/api/posix_api.c | 5 +- + src/api/sockets.c | 350 ++----------------------------- + src/api/sys_arch.c | 12 +- + src/core/tcp_out.c | 13 ++ + src/include/eventpoll.h | 6 +- + src/include/lwip/priv/tcp_priv.h | 2 +- + src/include/lwip/sockets.h | 2 +- + src/include/lwipsock.h | 29 ++- + src/include/posix_api.h | 2 +- + src/include/reg_sock.h | 8 +- + 11 files changed, 85 insertions(+), 370 deletions(-) + +diff --git a/src/api/api_msg.c b/src/api/api_msg.c +index d5a738f..3072dd9 100644 +--- a/src/api/api_msg.c ++++ b/src/api/api_msg.c +@@ -342,6 +342,12 @@ recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) + #endif /* LWIP_SO_RCVBUF */ + /* Register event with callback */ + API_EVENT(conn, NETCONN_EVT_RCVPLUS, len); ++#if USE_LIBOS ++ if (conn->state == NETCONN_WRITE || conn->state == NETCONN_CLOSE || ++ conn->state == NETCONN_CONNECT) { ++ add_recv_list(conn->socket); ++ } ++#endif + } + + return ERR_OK; +@@ -457,14 +463,6 @@ err_tcp(void *arg, err_t err) + old_state = conn->state; + conn->state = NETCONN_NONE; + +-#if USE_LIBOS +- if (CONN_TYPE_IS_HOST(conn)) { +- LWIP_DEBUGF(API_MSG_DEBUG, +- ("linux localhost connection already success, ignore lwip err_tcp fd=%d\n", conn->socket)); +- return; +- } +-#endif /* USE_LIBOS */ +- + SYS_ARCH_UNPROTECT(lev); + + /* Notify the user layer about a connection error. Used to signal select. */ +@@ -479,6 +477,12 @@ err_tcp(void *arg, err_t err) + if (NETCONN_MBOX_VALID(conn, &conn->recvmbox)) { + /* use trypost to prevent deadlock */ + sys_mbox_trypost(&conn->recvmbox, mbox_msg); ++#if USE_LIBOS ++ if ((old_state == NETCONN_WRITE) || (old_state == NETCONN_CLOSE) || ++ (old_state == NETCONN_CONNECT)) { ++ add_recv_list(conn->socket); ++ } ++#endif + } + /* pass error message to acceptmbox to wake up pending accept */ + if (NETCONN_MBOX_VALID(conn, &conn->acceptmbox)) { +@@ -1344,11 +1348,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err) + int s = conn->socket; + struct lwip_sock *sock = get_socket_without_errno(s); + +- if (!!sock && !!sock->epoll_data) { +- struct epoll_event ee = {0}; +- ee.data.fd = s; +- ee.events |= EPOLLIN | EPOLLOUT | EPOLLERR; +- posix_api->epoll_ctl_fn(sock->epoll_data->fd, EPOLL_CTL_DEL, s, &ee); ++ if (!!sock) { + posix_api->shutdown_fn(s, SHUT_RDWR); + LWIP_DEBUGF(API_MSG_DEBUG, + ("linux outgoing connection abort fd=%d\n", s)); +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +index a917cea..eff9f46 100644 +--- a/src/api/posix_api.c ++++ b/src/api/posix_api.c +@@ -143,11 +143,10 @@ int posix_api_init(void) + + /* lstack helper api */ + posix_api->get_socket = get_socket; +- posix_api->is_epfd = lwip_is_epfd; +- posix_api->epoll_close_fn = lwip_epoll_close; ++ posix_api->epoll_close_fn = lstack_epoll_close; + + /* support fork */ +- posix_api->is_chld = 0; ++ posix_api->is_chld = 1; + return ERR_OK; + + err_out: +diff --git a/src/api/sockets.c b/src/api/sockets.c +index f44c34f..b032ce9 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -90,14 +90,6 @@ + #define API_SELECT_CB_VAR_ALLOC(name, retblock) API_VAR_ALLOC_EXT(struct lwip_select_cb, MEMP_SELECT_CB, name, retblock) + #define API_SELECT_CB_VAR_FREE(name) API_VAR_FREE(MEMP_SELECT_CB, name) + +-#if USE_LIBOS +-enum KERNEL_LWIP_PATH { +- PATH_KERNEL = 0, +- PATH_LWIP, +- PATH_ERR, +-}; +-#endif +- + #if LWIP_IPV4 + #if USE_LIBOS + #define IP4ADDR_PORT_TO_SOCKADDR(sin, ipaddr, port) do { \ +@@ -604,8 +596,6 @@ alloc_socket(struct netconn *newconn, int accepted) + * (unless it has been created by accept()). */ + sockets[i].sendevent = (NETCONNTYPE_GROUP(newconn->type) == NETCONN_TCP ? (accepted != 0) : 1); + sockets[i].errevent = 0; +- sockets[i].epoll_data = NULL; +- init_list_node_null(&sockets[i].list); + return i + LWIP_SOCKET_OFFSET; + } + +@@ -714,13 +704,6 @@ free_socket(struct lwip_sock *sock, int is_tcp) + /* Protect socket array */ + SYS_ARCH_PROTECT(lev); + +-#if USE_LIBOS +- sock->epoll = LIBOS_EPOLLNONE; +- sock->events = 0; +- sock->epoll_data = NULL; +- list_del_node_null(&sock->list); +-#endif +- + freed = free_socket_locked(sock, is_tcp, &conn, &lastdata); + SYS_ARCH_UNPROTECT(lev); + /* don't use 'sock' after this line, as another task might have allocated it */ +@@ -749,34 +732,11 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + SYS_ARCH_DECL_PROTECT(lev); + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d)...\n", s)); +-#if USE_LIBOS +- int sys_errno = 0; +- +- sock = posix_api->get_socket(s); +- /*AF_UNIX case*/ +- if (!sock) { +- return posix_api->accept_fn(s, addr, addrlen); +- } +- +- /*for AF_INET, we may try both linux and lwip*/ +- if (!CONN_TYPE_HAS_LIBOS_AND_HOST(sock->conn)) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type has libos and host bits")); +- set_errno(EINVAL); +- return -1; +- } +- +- /* raise accept syscall in palce */ +- newsock = posix_api->accept_fn(s, addr, addrlen); +- if (newsock >= 0) { +- return newsock; +- } +- sys_errno = errno; +-#else ++ + sock = get_socket(s); + if (!sock) { + return -1; + } +-#endif + + /* wait for a new connection */ + err = netconn_accept(sock->conn, &newconn); +@@ -790,9 +750,6 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + sock_set_errno(sock, err_to_errno(err)); + } + done_socket(sock); +-#if USE_LIBOS +- set_errno(sys_errno); +-#endif /* USE_LIBOS */ + return -1; + } + LWIP_ASSERT("newconn != NULL", newconn != NULL); +@@ -875,24 +832,11 @@ lwip_bind(int s, const struct sockaddr *name, socklen_t namelen) + ip_addr_t local_addr; + u16_t local_port; + err_t err; +-#if USE_LIBOS +- sock = posix_api->get_socket(s); +- /*AF_UNIX case*/ +- if (!sock) { +- return posix_api->bind_fn(s, name, namelen); +- } +- /*for AF_INET, we may try both linux and lwip*/ +- if (!CONN_TYPE_HAS_LIBOS_AND_HOST(sock->conn)) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type has libos and host bits")); +- set_errno(EINVAL); +- return -1; +- } +-#else ++ + sock = get_socket(s); + if (!sock) { + return -1; + } +-#endif + + if (!SOCK_ADDR_TYPE_MATCH(name, sock)) { + /* sockaddr does not match socket type (IPv4/IPv6) */ +@@ -912,18 +856,6 @@ lwip_bind(int s, const struct sockaddr *name, socklen_t namelen) + ip_addr_debug_print_val(SOCKETS_DEBUG, local_addr); + LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", local_port)); + +-#if USE_LIBOS +- /* Supports kernel NIC IP address. */ +- int ret = posix_api->bind_fn(s, name, namelen); +- if (ret < 0) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("bind syscall failed\n")); +- /* bind must succeed on both linux and libos */ +- if (!is_host_ipv4(local_addr.addr)) { +- return ret; +- } +- } +-#endif /* USE_LIBOS */ +- + #if LWIP_IPV4 && LWIP_IPV6 + /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */ + if (IP_IS_V6_VAL(local_addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&local_addr))) { +@@ -953,32 +885,13 @@ lwip_close(int s) + struct lwip_sock *sock; + int is_tcp = 0; + err_t err; +- int ret = 0; + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_close(%d)\n", s)); + +-#if USE_LIBOS +- if (posix_api->is_epfd(s)) { +- return posix_api->epoll_close_fn(s); +- } +- +- /* No matter what the result of close, lwip_sock resources should release +- * to prevent the potential double freee problem caused by reporting events after the close */ +- ret = posix_api->close_fn(s); +- if ((ret < 0) && (errno == EINTR)) +- ret = posix_api->close_fn(s); +- +- sock = posix_api->get_socket(s); +- /*AF_UNIX case*/ +- if (!sock) { +- return ret; +- } +-#else + sock = get_socket(s); + if (!sock) { + return -1; + } +-#endif /* USE_LIBOS */ + + if (sock->conn != NULL) { + is_tcp = NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP; +@@ -1004,7 +917,7 @@ lwip_close(int s) + + free_socket(sock, is_tcp); + set_errno(0); +- return ret; ++ return 0; + } + + int +@@ -1013,28 +926,10 @@ lwip_connect(int s, const struct sockaddr *name, socklen_t namelen) + struct lwip_sock *sock; + err_t err; + +-#if USE_LIBOS +- int ret; +- +- sock = posix_api->get_socket(s); +- if (!sock) { +- return posix_api->connect_fn(s, name, namelen); +- } +- +- /* raise connect syscall in place */ +- ADD_CONN_TYPE_INPRG(sock->conn); +- ret = posix_api->connect_fn(s, name, namelen); +- if (!ret) { +- SET_CONN_TYPE_HOST(sock->conn); +- LWIP_DEBUGF(SOCKETS_DEBUG, ("linux connect succeed fd=%d\n", s)); +- return ret; +- } +-#else + sock = get_socket(s); + if (!sock) { + return -1; + } +-#endif + + if (!SOCK_ADDR_TYPE_MATCH_OR_UNSPEC(name, sock)) { + /* sockaddr does not match socket type (IPv4/IPv6) */ +@@ -1106,29 +1001,10 @@ lwip_listen(int s, int backlog) + + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_listen(%d, backlog=%d)\n", s, backlog)); + +-#if USE_LIBOS +- int ret; +- +- sock = posix_api->get_socket(s); +- /*AF_UNIX case*/ +- if (!sock) { +- return posix_api->listen_fn(s, backlog); +- } +- /*for AF_INET, we may try both linux and lwip*/ +- if (!CONN_TYPE_HAS_LIBOS_AND_HOST(sock->conn)) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type has libos and host bits")); +- set_errno(EADDRINUSE); +- return -1; +- } +- +- if ((ret = posix_api->listen_fn(s, backlog)) == -1) +- return ret; +-#else + sock = get_socket(s); + if (!sock) { + return -1; + } +-#endif + + /* limit the "backlog" parameter to fit in an u8_t */ + backlog = LWIP_MIN(LWIP_MAX(backlog, 0), 0xff); +@@ -1160,11 +1036,12 @@ static ssize_t + lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + { + u8_t apiflags = NETCONN_NOAUTORCVD; ++ ssize_t recvd = 0; + #if USE_LIBOS + apiflags = 0; +-#endif +- ssize_t recvd = 0; ++#else + ssize_t recv_left = (len <= SSIZE_MAX) ? (ssize_t)len : SSIZE_MAX; ++#endif + + LWIP_ASSERT("no socket given", sock != NULL); + LWIP_ASSERT("this should be checked internally", NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP); +@@ -1173,6 +1050,7 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + apiflags |= NETCONN_DONTBLOCK; + } + ++#if !USE_LIBOS + do { + struct pbuf *p; + err_t err; +@@ -1182,13 +1060,6 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + /* Check if there is data left from the last recv operation. */ + if (sock->lastdata.pbuf) { + p = sock->lastdata.pbuf; +-#if USE_LIBOS +- if (((flags & MSG_PEEK) == 0) && ((sock->epoll & EPOLLET) == 0)) { +- if ((NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP)) { +- del_epoll_event(sock->conn, EPOLLIN); +- } +- } +-#endif + } else { + /* No data was left from the previous operation, so we try to get + some from the network. */ +@@ -1258,23 +1129,21 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + apiflags |= NETCONN_DONTBLOCK | NETCONN_NOFIN; + /* @todo: do we need to support peeking more than one pbuf? */ + } while ((recv_left > 0) && !(flags & MSG_PEEK)); ++ + lwip_recv_tcp_done: +-#if USE_LIBOS +- if (apiflags & NETCONN_NOAUTORCVD) +-#endif +- { ++#else /* USE_LIBOS */ ++ recvd = read_lwip_data(sock, flags, apiflags); ++ if (recvd <= 0) { ++ return recvd; ++ } ++#endif /* USE_LIBOS */ ++ if (apiflags & NETCONN_NOAUTORCVD) { + if ((recvd > 0) && !(flags & MSG_PEEK)) { + /* ensure window update after copying all data */ + netconn_tcp_recvd(sock->conn, (size_t)recvd); + } + } +-#if USE_LIBOS +- if ((flags & MSG_PEEK) == 0) { +- if (((NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP)) && sock->lastdata.pbuf) { +- add_epoll_event(sock->conn, EPOLLIN); +- } +- } +-#endif ++ + sock_set_errno(sock, 0); + return recvd; + } +@@ -1461,37 +1330,6 @@ lwip_recvfrom_udp_raw(struct lwip_sock *sock, int flags, struct msghdr *msg, u16 + return ERR_OK; + } + +-#if USE_LIBOS +-static inline enum KERNEL_LWIP_PATH select_path(int s) +-{ +- struct lwip_sock *sock; +- +- sock = posix_api->get_socket(s); +- /*AF_UNIX case*/ +- if (!sock) { +- return PATH_KERNEL; +- } +- +- if (CONN_TYPE_HAS_INPRG(sock->conn)) { +- set_errno(EWOULDBLOCK); +- return PATH_ERR; +- } +- +- /*for AF_INET, we can try erther linux or lwip*/ +- if (CONN_TYPE_IS_HOST(sock->conn)) { +- return PATH_KERNEL; +- } +- +- if (!CONN_TYPE_IS_LIBOS(sock->conn)) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("conn->type is not libos bit type=%x", netconn_type(sock->conn))); +- set_errno(EINVAL); +- return PATH_ERR; +- } +- +- return PATH_LWIP; +-} +-#endif +- + ssize_t + lwip_recvfrom(int s, void *mem, size_t len, int flags, + struct sockaddr *from, socklen_t *fromlen) +@@ -1499,15 +1337,6 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, + struct lwip_sock *sock; + ssize_t ret; + +-#if USE_LIBOS +- enum KERNEL_LWIP_PATH path = select_path(s); +- if (path == PATH_ERR) { +- return -1; +- } else if (path == PATH_KERNEL) { +- return posix_api->recv_from(s, mem, len, flags, from, fromlen); +- } +-#endif +- + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d, %p, %"SZT_F", 0x%x, ..)\n", s, mem, len, flags)); + sock = get_socket(s); + if (!sock) { +@@ -1557,14 +1386,6 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, + ssize_t + lwip_read(int s, void *mem, size_t len) + { +-#if USE_LIBOS +- enum KERNEL_LWIP_PATH path = select_path(s); +- if (path == PATH_ERR) { +- return -1; +- } else if (path == PATH_KERNEL) { +- return posix_api->read_fn(s, mem, len); +- } +-#endif + return lwip_recvfrom(s, mem, len, 0, NULL, NULL); + } + +@@ -1598,15 +1419,6 @@ lwip_recvmsg(int s, struct msghdr *message, int flags) + int i; + ssize_t buflen; + +-#if USE_LIBOS +- enum KERNEL_LWIP_PATH path = select_path(s); +- if (path == PATH_ERR) { +- return -1; +- } else if (path == PATH_KERNEL) { +- return posix_api->recv_msg(s, message, flags); +- } +-#endif +- + LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvmsg(%d, message=%p, flags=0x%x)\n", s, (void *)message, flags)); + LWIP_ERROR("lwip_recvmsg: invalid message pointer", message != NULL, return ERR_ARG;); + LWIP_ERROR("lwip_recvmsg: unsupported flags", (flags & ~(MSG_PEEK|MSG_DONTWAIT)) == 0, +@@ -1751,15 +1563,6 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags) + #endif + err_t err = ERR_OK; + +-#if USE_LIBOS +- enum KERNEL_LWIP_PATH path = select_path(s); +- if (path == PATH_ERR) { +- return -1; +- } else if (path == PATH_KERNEL) { +- return posix_api->send_msg(s, msg, flags); +- } +-#endif +- + sock = get_socket(s); + if (!sock) { + return -1; +@@ -1923,15 +1726,6 @@ lwip_sendto(int s, const void *data, size_t size, int flags, + u16_t remote_port; + struct netbuf buf; + +-#if USE_LIBOS +- enum KERNEL_LWIP_PATH path = select_path(s); +- if (path == PATH_ERR) { +- return -1; +- } else if (path == PATH_KERNEL) { +- return posix_api->send_to(s, data, size, flags, to, tolen); +- } +-#endif +- + sock = get_socket(s); + if (!sock) { + return -1; +@@ -2030,11 +1824,6 @@ lwip_socket(int domain, int type, int protocol) + + LWIP_UNUSED_ARG(domain); /* @todo: check this */ + +-#if USE_LIBOS +- if ((domain != AF_INET && domain != AF_UNSPEC) || posix_api->is_chld) +- return posix_api->socket_fn(domain, type, protocol); +-#endif +- + /* create a netconn */ + switch (type) { + case SOCK_RAW: +@@ -2091,14 +1880,6 @@ lwip_socket(int domain, int type, int protocol) + ssize_t + lwip_write(int s, const void *data, size_t size) + { +-#if USE_LIBOS +- enum KERNEL_LWIP_PATH path = select_path(s); +- if (path == PATH_ERR) { +- return -1; +- } else if (path == PATH_KERNEL) { +- return posix_api->write_fn(s, data, size); +- } +-#endif + return lwip_send(s, data, size, 0); + } + +@@ -2884,20 +2665,16 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + check_waiters = 0; + } + #if USE_LIBOS +- if (sock->epoll & EPOLLET) { +- list_del_node_null(&sock->list); ++ if (conn->state == NETCONN_LISTEN) { ++ add_epoll_event(conn, EPOLLIN); ++ } else { ++ add_recv_list(conn->socket); + } +- add_epoll_event(conn, EPOLLIN); + #endif + break; + case NETCONN_EVT_RCVMINUS: + sock->rcvevent--; + check_waiters = 0; +-#if USE_LIBOS +- if ((sock->epoll & EPOLLET) == 0) { +- del_epoll_event(conn, EPOLLIN); +- } +-#endif + break; + case NETCONN_EVT_SENDPLUS: + if (sock->sendevent) { +@@ -2905,27 +2682,16 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + } + sock->sendevent = 1; + #if USE_LIBOS +- if (sock->epoll & EPOLLET) { +- list_del_node_null(&sock->list); +- } + add_epoll_event(conn, EPOLLOUT); + #endif + break; + case NETCONN_EVT_SENDMINUS: + sock->sendevent = 0; + check_waiters = 0; +-#if USE_LIBOS +- if ((sock->epoll & EPOLLET) == 0) { +- del_epoll_event(conn, EPOLLOUT); +- } +-#endif + break; + case NETCONN_EVT_ERROR: + sock->errevent = 1; + #if USE_LIBOS +- if (sock->epoll & EPOLLET) { +- list_del_node_null(&sock->list); +- } + add_epoll_event(conn, EPOLLERR); + #endif + break; +@@ -3139,41 +2905,12 @@ lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local) + int + lwip_getpeername(int s, struct sockaddr *name, socklen_t *namelen) + { +-#if USE_LIBOS +- struct lwip_sock *sock; +- +- sock = posix_api->get_socket(s); +- if (!sock) { +- return posix_api->getpeername_fn(s, name, namelen); +- } +- /*for AF_INET, if has only host type bit, just call linux api, +- *if has libos and host type bits, it's a not connected fd, call +- *linux api and return -1(errno == ENOTCONN) is also ok*/ +- if (CONN_TYPE_HAS_HOST(sock->conn)) { +- return posix_api->getpeername_fn(s, name, namelen); +- } +-#endif +- + return lwip_getaddrname(s, name, namelen, 0); + } + + int + lwip_getsockname(int s, struct sockaddr *name, socklen_t *namelen) + { +-#if USE_LIBOS +- struct lwip_sock *sock; +- +- sock = posix_api->get_socket(s); +- if (!sock) { +- return posix_api->getsockname_fn(s, name, namelen); +- } +- /*for AF_INET, if has only host type bit, just call linux api, +- *if has libos and host type bits, also call linux api*/ +- if (CONN_TYPE_HAS_HOST(sock->conn)) { +- return posix_api->getsockname_fn(s, name, namelen); +- } +-#endif +- + return lwip_getaddrname(s, name, namelen, 1); + } + +@@ -3186,23 +2923,11 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) + LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data); + #endif /* !LWIP_TCPIP_CORE_LOCKING */ + +-#if USE_LIBOS +- struct lwip_sock *sock = posix_api->get_socket(s); +- +- if (!sock) { +- return posix_api->getsockopt_fn(s, level, optname, optval, optlen); +- } +- /*for AF_INET, we return linux result? */ +- if (CONN_TYPE_HAS_HOST(sock->conn)) { +- return posix_api->getsockopt_fn(s, level, optname, optval, optlen); +- } +-#else + struct lwip_sock *sock = get_socket(s); + + if (!sock) { + return -1; + } +-#endif /* USE_LIBOS */ + + if ((NULL == optval) || (NULL == optlen)) { + sock_set_errno(sock, EFAULT); +@@ -3645,25 +3370,11 @@ lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t opt + LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data); + #endif /* !LWIP_TCPIP_CORE_LOCKING */ + +-#if USE_LIBOS +- struct lwip_sock *sock = posix_api->get_socket(s); +- +- if (!sock) { +- return posix_api->setsockopt_fn(s, level, optname, optval, optlen); +- } +- /*for AF_INET, we may try both linux and lwip*/ +- if (CONN_TYPE_HAS_HOST(sock->conn)) { +- if (posix_api->setsockopt_fn(s, level, optname, optval, optlen) < 0) { +- return -1; +- } +- } +-#else + struct lwip_sock *sock = get_socket(s); + + if (!sock) { + return -1; + } +-#endif /* USE_LIBOS */ + + if (NULL == optval) { + sock_set_errno(sock, EFAULT); +@@ -4308,26 +4019,6 @@ lwip_ioctl(int s, long cmd, void *argp) + * the flag O_NONBLOCK is implemented for F_SETFL. + */ + int +-#if USE_LIBOS +-lwip_fcntl(int s, int cmd, ...) +-{ +- struct lwip_sock *sock = posix_api->get_socket(s); +- int val, ret = -1; +- int op_mode = 0; +- va_list ap; +- +- va_start(ap, cmd); +- val = va_arg(ap, int); +- va_end(ap); +- +- if (!sock) { +- return posix_api->fcntl_fn(s, cmd, val); +- } +- if (CONN_TYPE_HAS_HOST(sock->conn)) { +- if ((ret = posix_api->fcntl_fn(s, cmd, val)) == -1) +- return ret; +- } +-#else /* USE_LIBOS */ + lwip_fcntl(int s, int cmd, int val) + { + struct lwip_sock *sock = get_socket(s); +@@ -4337,7 +4028,6 @@ lwip_fcntl(int s, int cmd, int val) + if (!sock) { + return -1; + } +-#endif /* USE_LIBOS */ + + switch (cmd) { + case F_GETFL: +diff --git a/src/api/sys_arch.c b/src/api/sys_arch.c +index 55561b1..9a92143 100644 +--- a/src/api/sys_arch.c ++++ b/src/api/sys_arch.c +@@ -76,8 +76,8 @@ struct sys_mem_stats { + + static PER_THREAD struct sys_mem_stats hugepage_stats; + +-static PER_THREAD uint64_t cycles_per_ms __attribute__((aligned(64))); +-static PER_THREAD uint64_t sys_start_ms __attribute__((aligned(64))); ++static uint64_t cycles_per_ms __attribute__((aligned(64))); ++static uint64_t sys_start_ms __attribute__((aligned(64))); + + /* + * Mailbox +@@ -337,8 +337,12 @@ void sys_calibrate_tsc(void) + #define MS_PER_SEC 1E3 + uint64_t freq = rte_get_tsc_hz(); + +- cycles_per_ms = (freq + MS_PER_SEC - 1) / MS_PER_SEC; +- sys_start_ms = rte_rdtsc() / cycles_per_ms; ++ if (cycles_per_ms == 0) { ++ cycles_per_ms = (freq + MS_PER_SEC - 1) / MS_PER_SEC; ++ } ++ if (sys_start_ms == 0) { ++ sys_start_ms = rte_rdtsc() / cycles_per_ms; ++ } + } + + uint32_t sys_now(void) +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index dac498e..b99974d 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -472,6 +472,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + * pos records progress as data is segmented. + */ + ++#if !USE_LIBOS + /* Find the tail of the unsent queue. */ + if (pcb->unsent != NULL) { + u16_t space; +@@ -587,6 +588,13 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + pcb->unsent_oversize == 0); + #endif /* TCP_OVERSIZE */ + } ++#else /* USE_LIBOS */ ++ if (pcb->unsent != NULL) { ++ /* @todo: this could be sped up by keeping last_unsent in the pcb */ ++ for (last_unsent = pcb->unsent; last_unsent->next != NULL; ++ last_unsent = last_unsent->next); ++ } ++#endif /* USE_LIBOS */ + + /* + * Phase 3: Create new segments. +@@ -604,6 +612,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + u8_t chksum_swapped = 0; + #endif /* TCP_CHECKSUM_ON_COPY */ + ++#if !USE_LIBOS + if (apiflags & TCP_WRITE_FLAG_COPY) { + /* If copy is set, memory should be allocated and data copied + * into pbuf */ +@@ -650,6 +659,10 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + /* Concatenate the headers and data pbufs together. */ + pbuf_cat(p/*header*/, p2/*data*/); + } ++#else /* USE_LIBOS */ ++ p = (struct pbuf *)arg; ++ seglen = p->len; ++#endif /* USE_LIBOS */ + + queuelen += pbuf_clen(p); + +diff --git a/src/include/eventpoll.h b/src/include/eventpoll.h +index f525bc2..aacc1d2 100644 +--- a/src/include/eventpoll.h ++++ b/src/include/eventpoll.h +@@ -63,9 +63,7 @@ struct libos_epoll { + int efd; /* eventfd */ + }; + +-extern int add_epoll_event(struct netconn*, uint32_t); +-extern int del_epoll_event(struct netconn*, uint32_t); +-extern int lwip_epoll_close(int); +-extern int lwip_is_epfd(int); ++extern void add_epoll_event(struct netconn*, uint32_t); ++extern int32_t lstack_epoll_close(int32_t); + + #endif /* __EVENTPOLL_H__ */ +diff --git a/src/include/lwip/priv/tcp_priv.h b/src/include/lwip/priv/tcp_priv.h +index f771725..83208bf 100644 +--- a/src/include/lwip/priv/tcp_priv.h ++++ b/src/include/lwip/priv/tcp_priv.h +@@ -349,7 +349,7 @@ static inline int vdev_reg_done(enum reg_ring_type reg_type, const struct tcp_pc + { + LWIP_ASSERT("Invalid parameter", pcb != NULL); + +- struct libnet_quintuple qtuple; ++ struct gazelle_quintuple qtuple; + qtuple.protocol = 0; + qtuple.src_ip = pcb->local_ip.addr; + qtuple.src_port = lwip_htons(pcb->local_port); +diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h +index 345e26c..4e7e671 100644 +--- a/src/include/lwip/sockets.h ++++ b/src/include/lwip/sockets.h +@@ -647,7 +647,7 @@ int lwip_poll(struct pollfd *fds, nfds_t nfds, int timeout); + + #if USE_LIBOS + int lwip_ioctl(int s, long cmd, ...); +-int lwip_fcntl(int s, int cmd, ...); ++int lwip_fcntl(int s, int cmd, int val); + #else + int lwip_ioctl(int s, long cmd, void *argp); + int lwip_fcntl(int s, int cmd, int val); +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index e9ffbb1..069cdcb 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -60,6 +60,10 @@ union lwip_sock_lastdata { + struct pbuf *pbuf; + }; + ++#if USE_LIBOS ++struct protocol_stack; ++struct weakup_poll; ++#endif + /** Contains all internal pointers and states used for a socket */ + struct lwip_sock { + /** sockets currently are built on netconns, each socket has one netconn */ +@@ -88,14 +92,19 @@ struct lwip_sock { + #endif + + #if USE_LIBOS +- struct list_node list; +- /* registered events */ +- uint32_t epoll; +- /* available events */ +- uint32_t events; ++ uint32_t epoll_events; /* registered events */ ++ uint32_t events; /* available events */ ++ int32_t in_event; /* avoid recurring events */ + epoll_data_t ep_data; +- /* libos_epoll pointer in use */ +- struct libos_epoll *epoll_data; ++ struct weakup_poll *weakup; ++ struct protocol_stack *stack; ++ void *recv_ring; ++ struct pbuf *recv_lastdata; /* unread data in one pbuf */ ++ struct pbuf *send_lastdata; /* unread data in one pbuf */ ++ void *send_ring; ++ int32_t recv_flags; ++ int32_t nextfd; /* listenfd list */ ++ struct list_node recv_list; + #endif + }; + +@@ -138,6 +147,10 @@ get_socket_without_errno(int s) + + return sock; + } ++ ++extern void add_recv_list(int32_t fd); ++extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); ++extern void gazelle_clean_sock(int32_t fd); + #endif /* USE_LIBOS */ + + struct lwip_sock *get_socket(int s); +@@ -145,6 +158,4 @@ struct lwip_sock *get_socket_by_fd(int s); + void lwip_sock_init(void); + void lwip_exit(void); + +-extern int is_host_ipv4(uint32_t ipv4); +- + #endif /* __LWIPSOCK_H__ */ +diff --git a/src/include/posix_api.h b/src/include/posix_api.h +index 0dca8eb..2afd266 100644 +--- a/src/include/posix_api.h ++++ b/src/include/posix_api.h +@@ -34,7 +34,7 @@ + #define __POSIX_API_H__ + + #include +-#include ++#include + #include + #include + +diff --git a/src/include/reg_sock.h b/src/include/reg_sock.h +index 76d4c48..76673da 100644 +--- a/src/include/reg_sock.h ++++ b/src/include/reg_sock.h +@@ -41,7 +41,7 @@ enum reg_ring_type { + RING_REG_MAX, + }; + +-struct libnet_quintuple { ++struct gazelle_quintuple { + uint32_t protocol; + /* net byte order */ + uint16_t src_port; +@@ -54,9 +54,9 @@ struct reg_ring_msg { + enum reg_ring_type type; + + uint32_t tid; +- struct libnet_quintuple qtuple; ++ struct gazelle_quintuple qtuple; + }; + +-extern int vdev_reg_xmit(enum reg_ring_type type, struct libnet_quintuple *qtuple); ++extern int vdev_reg_xmit(enum reg_ring_type type, struct gazelle_quintuple *qtuple); + +-#endif /* __REG_SOCK_H__ */ +\ No newline at end of file ++#endif /* __REG_SOCK_H__ */ +-- +2.30.0 + diff --git a/0017-support-REUSEPOR-option.patch b/0017-support-REUSEPOR-option.patch new file mode 100644 index 0000000..c6c8b0f --- /dev/null +++ b/0017-support-REUSEPOR-option.patch @@ -0,0 +1,58 @@ +From 670f888704c7bbb1121e63bc380ca34b83c43464 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Thu, 3 Mar 2022 17:06:03 +0800 +Subject: [PATCH] support REUSEPOR option fix rpc msg too much + fix recurring events + +--- + src/api/sockets.c | 4 ++++ + src/include/lwipsock.h | 10 ++++++++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index b032ce9..4b682f3 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -3029,6 +3029,10 @@ lwip_sockopt_to_ipopt(int optname) + return SOF_KEEPALIVE; + case SO_REUSEADDR: + return SOF_REUSEADDR; ++#if USE_LIBOS ++ case SO_REUSEPORT: ++ return SO_REUSEPORT; ++#endif + default: + LWIP_ASSERT("Unknown socket option", 0); + return 0; +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 069cdcb..e2519ff 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -94,7 +94,8 @@ struct lwip_sock { + #if USE_LIBOS + uint32_t epoll_events; /* registered events */ + uint32_t events; /* available events */ +- int32_t in_event; /* avoid recurring events */ ++ volatile bool have_event; /* avoid recurring events */ ++ volatile bool have_rpc_send; /* avoid recurring rpc_send */ + epoll_data_t ep_data; + struct weakup_poll *weakup; + struct protocol_stack *stack; +@@ -103,8 +104,13 @@ struct lwip_sock { + struct pbuf *send_lastdata; /* unread data in one pbuf */ + void *send_ring; + int32_t recv_flags; +- int32_t nextfd; /* listenfd list */ ++ bool wait_close; ++ int32_t attach_fd; ++ struct lwip_sock *shadowed_sock; ++ struct list_node attach_list; ++ struct list_node listen_list; + struct list_node recv_list; ++ int32_t nextfd; /* listenfd list */ + #endif + }; + +-- +1.8.3.1 + diff --git a/0018-exec-gazelle_init_sock-before-read-event.patch b/0018-exec-gazelle_init_sock-before-read-event.patch new file mode 100644 index 0000000..11d4db0 --- /dev/null +++ b/0018-exec-gazelle_init_sock-before-read-event.patch @@ -0,0 +1,37 @@ +From 544bf45ec99c853ad5e9ec2607669df01b4e0572 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Mon, 7 Mar 2022 21:06:39 +0800 +Subject: [PATCH] exec gazelle_init_sock() before read event + +--- + src/api/sockets.c | 1 + + src/include/lwipsock.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 4b682f3..21de5d9 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -763,6 +763,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + } + #if USE_LIBOS + LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < sockets_num + LWIP_SOCKET_OFFSET)); ++ gazelle_init_sock(newsock); + #else + LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); + #endif /* USE_LIBOS */ +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index e2519ff..355bf47 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -157,6 +157,7 @@ get_socket_without_errno(int s) + extern void add_recv_list(int32_t fd); + extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); + extern void gazelle_clean_sock(int32_t fd); ++extern void gazelle_init_sock(int32_t fd); + #endif /* USE_LIBOS */ + + struct lwip_sock *get_socket(int s); +-- +1.8.3.1 + diff --git a/0019-gazelle-reduce-copy-in-send.patch b/0019-gazelle-reduce-copy-in-send.patch new file mode 100644 index 0000000..fffa8b7 --- /dev/null +++ b/0019-gazelle-reduce-copy-in-send.patch @@ -0,0 +1,50 @@ +From 05bfdb54fc744d835c8b3b50b54d220fe7e87277 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Mon, 7 Mar 2022 21:10:06 +0800 +Subject: [PATCH] reduce copy in send + +--- + src/core/pbuf.c | 5 +++++ + src/include/lwip/pbuf.h | 3 +++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/pbuf.c b/src/core/pbuf.c +index 27afc28..cd6b558 100644 +--- a/src/core/pbuf.c ++++ b/src/core/pbuf.c +@@ -281,6 +281,10 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type) + } + + /* If pbuf is to be allocated in RAM, allocate memory for it. */ ++#if USE_LIBOS ++ /* alloc mbuf to reduce copy in sending */ ++ p = lwip_alloc_pbuf(layer, length, type); ++#else + p = (struct pbuf *)mem_malloc(alloc_len); + if (p == NULL) { + return NULL; +@@ -289,6 +293,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type) + length, length, type, 0); + LWIP_ASSERT("pbuf_alloc: pbuf->payload properly aligned", + ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0); ++#endif + break; + } + default: +diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h +index e5daf96..3894574 100644 +--- a/src/include/lwip/pbuf.h ++++ b/src/include/lwip/pbuf.h +@@ -272,6 +272,9 @@ void pbuf_free_ooseq(void); + /* Initializes the pbuf module. This call is empty for now, but may not be in future. */ + #define pbuf_init() + ++#if USE_LIBOS ++struct pbuf *lwip_alloc_pbuf(pbuf_layer l, u16_t length, pbuf_type type); ++#endif + struct pbuf *pbuf_alloc(pbuf_layer l, u16_t length, pbuf_type type); + struct pbuf *pbuf_alloc_reference(void *payload, u16_t length, pbuf_type type); + #if LWIP_SUPPORT_CUSTOM_PBUF +-- +2.30.0 + diff --git a/0020-remove-chose_dlsym_handle-function-set-handle-to-RTL.patch b/0020-remove-chose_dlsym_handle-function-set-handle-to-RTL.patch new file mode 100644 index 0000000..54243bc --- /dev/null +++ b/0020-remove-chose_dlsym_handle-function-set-handle-to-RTL.patch @@ -0,0 +1,63 @@ +From 970d9d6fd15c433af20bbbd7418c5e9773d58471 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Mon, 7 Mar 2022 21:08:13 +0800 +Subject: [PATCH] remove chose_dlsym_handle function, set handle to RTLD_NEXT + +--- + src/api/posix_api.c | 33 +-------------------------------- + 1 file changed, 1 insertion(+), 32 deletions(-) + +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +index eff9f46..bce07f5 100644 +--- a/src/api/posix_api.c ++++ b/src/api/posix_api.c +@@ -64,33 +64,6 @@ void posix_api_fork(void) + posix_api->get_socket = chld_get_socket; + } + +-static int chose_dlsym_handle(void *__restrict* khandle) +-{ +- void *dlhandle; +- int (*gazelle_epoll_create)(int size); +- dlhandle = dlopen ("liblstack.so", RTLD_LAZY); +- if (dlhandle == NULL) { +- return ERR_IF; +- } +- +- gazelle_epoll_create = dlsym(dlhandle, "epoll_create"); +- if (gazelle_epoll_create == NULL) { +- return ERR_MEM; +- } +- +- dlclose(dlhandle); +- +- *khandle = RTLD_NEXT; +- if (dlsym(*khandle, "epoll_create") == gazelle_epoll_create) { +- RTE_LOG(ERR, EAL, "posix api use RTLD_DEFAULT\n"); +- *khandle = RTLD_DEFAULT; +- } else { +- RTE_LOG(ERR, EAL, "posix api use RTLD_NEXT\n"); +- } +- +- return ERR_OK; +-} +- + int posix_api_init(void) + { + /* the symbol we use here won't be NULL, so we don't need dlerror() +@@ -102,11 +75,7 @@ int posix_api_init(void) + + posix_api = &posix_api_val; + +- void *__restrict handle; +- int ret = chose_dlsym_handle(&handle); +- if (ret != ERR_OK) { +- return ret; +- } ++ void *__restrict handle = RTLD_NEXT; + + /* glibc standard api */ + CHECK_DLSYM_RET_RETURN(posix_api->socket_fn = dlsym(handle, "socket")); +-- +1.8.3.1 + diff --git a/0021-refactor-event-if-ring-is-full-the-node-is-added-to-.patch b/0021-refactor-event-if-ring-is-full-the-node-is-added-to-.patch new file mode 100644 index 0000000..b5b5e29 --- /dev/null +++ b/0021-refactor-event-if-ring-is-full-the-node-is-added-to-.patch @@ -0,0 +1,33 @@ +From b7faf0800631668d4d23cb497f1ceeb5948e4a41 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Tue, 15 Mar 2022 19:22:22 +0800 +Subject: [PATCH] refactor event, if ring is full, the node is added to list + +--- + src/include/lwipsock.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 355bf47..36bcaed 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -104,12 +104,16 @@ struct lwip_sock { + struct pbuf *send_lastdata; /* unread data in one pbuf */ + void *send_ring; + int32_t recv_flags; ++ int32_t send_flags; + bool wait_close; + int32_t attach_fd; + struct lwip_sock *shadowed_sock; + struct list_node attach_list; + struct list_node listen_list; + struct list_node recv_list; ++ struct list_node event_list; ++ struct list_node wakeup_list; ++ struct list_node send_list; + int32_t nextfd; /* listenfd list */ + #endif + }; +-- +1.8.3.1 + diff --git a/0022-notify-app-that-sock-state-changes-to-CLOSE_WAIT.patch b/0022-notify-app-that-sock-state-changes-to-CLOSE_WAIT.patch new file mode 100644 index 0000000..be4b0e7 --- /dev/null +++ b/0022-notify-app-that-sock-state-changes-to-CLOSE_WAIT.patch @@ -0,0 +1,56 @@ +From 05159c41efdc2f07ddbe3520330faf2675baa3d6 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Tue, 15 Mar 2022 20:10:07 +0800 +Subject: [PATCH] notify app that sock changes to CLOSE_WAAIT + +--- + src/core/tcp_in.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index 1652b86..0d3a2f1 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -58,6 +58,9 @@ + #if LWIP_ND6_TCP_REACHABILITY_HINTS + #include "lwip/nd6.h" + #endif /* LWIP_ND6_TCP_REACHABILITY_HINTS */ ++#if USE_LIBOS ++#include "lwip/api.h" ++#endif + + #include + +@@ -1032,6 +1035,9 @@ tcp_process(struct tcp_pcb *pcb) + if (recv_flags & TF_GOT_FIN) { + tcp_ack_now(pcb); + pcb->state = CLOSE_WAIT; ++#if USE_LIBOS ++ API_EVENT(((struct netconn *)pcb->callback_arg), NETCONN_EVT_ERROR, 0); ++#endif + } + } else { + /* incorrect ACK number, send RST */ +@@ -1050,6 +1056,9 @@ tcp_process(struct tcp_pcb *pcb) + if (recv_flags & TF_GOT_FIN) { /* passive close */ + tcp_ack_now(pcb); + pcb->state = CLOSE_WAIT; ++#if USE_LIBOS ++ API_EVENT(((struct netconn *)pcb->callback_arg), NETCONN_EVT_ERROR, 0); ++#endif + } + break; + case FIN_WAIT_1: +@@ -1676,6 +1685,9 @@ tcp_receive(struct tcp_pcb *pcb) + recv_flags |= TF_GOT_FIN; + if (pcb->state == ESTABLISHED) { /* force passive close or we can move to active close */ + pcb->state = CLOSE_WAIT; ++#if USE_LIBOS ++ API_EVENT(((struct netconn *)pcb->callback_arg), NETCONN_EVT_ERROR, 0); ++#endif + } + } + +-- +1.8.3.1 + diff --git a/0023-refactor-event-and-checksum-offload-support.patch b/0023-refactor-event-and-checksum-offload-support.patch new file mode 100644 index 0000000..3a170ab --- /dev/null +++ b/0023-refactor-event-and-checksum-offload-support.patch @@ -0,0 +1,698 @@ +From 8dd0a15e60cfee7e7f1be1ea051d0e09031f8fdd Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Tue, 29 Mar 2022 21:33:17 +0800 +Subject: [PATCH] refactor event and add HW checksum offload + +--- + src/api/api_msg.c | 9 ++++ + src/api/posix_api.c | 2 + + src/api/sockets.c | 4 +- + src/core/ipv4/icmp.c | 13 +++++ + src/core/ipv4/ip4.c | 24 ++++++++- + src/core/ipv4/ip4_frag.c | 23 +++++++++ + src/core/pbuf.c | 9 +++- + src/core/tcp_in.c | 17 +++++++ + src/core/tcp_out.c | 72 +++++++++++++++++++++++++- + src/include/dpdk_cksum.h | 107 +++++++++++++++++++++++++++++++++++++++ + src/include/lwip/pbuf.h | 12 ++++- + src/include/lwipopts.h | 30 ++++++++--- + src/include/lwipsock.h | 18 +++---- + src/netif/ethernet.c | 8 +++ + 14 files changed, 322 insertions(+), 26 deletions(-) + create mode 100644 src/include/dpdk_cksum.h + +diff --git a/src/api/api_msg.c b/src/api/api_msg.c +index 3072dd9..672f022 100644 +--- a/src/api/api_msg.c ++++ b/src/api/api_msg.c +@@ -57,6 +57,7 @@ + #if USE_LIBOS + #include "lwip/sockets.h" + #include "lwipsock.h" ++#include "posix_api.h" + #endif + + #include +@@ -1758,7 +1759,15 @@ lwip_netconn_do_writemore(struct netconn *conn WRITE_DELAYED_PARAM) + } else { + write_more = 0; + } ++#if USE_LIBOS ++ /* vector->ptr is private arg sock */ ++ LWIP_UNUSED_ARG(dataptr); ++ write_more = 0; ++ err = tcp_write(conn->pcb.tcp, conn->current_msg->msg.w.vector->ptr, len, apiflags); ++ conn->current_msg->msg.w.len = len; ++#else + err = tcp_write(conn->pcb.tcp, dataptr, len, apiflags); ++#endif + if (err == ERR_OK) { + conn->current_msg->msg.w.offset += len; + conn->current_msg->msg.w.vector_off += len; +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +index bce07f5..3f85bad 100644 +--- a/src/api/posix_api.c ++++ b/src/api/posix_api.c +@@ -42,6 +42,7 @@ + + #include "lwip/err.h" + #include "lwipsock.h" ++#include "posix_api.h" + + posix_api_t *posix_api; + posix_api_t posix_api_val; +@@ -64,6 +65,7 @@ void posix_api_fork(void) + posix_api->get_socket = chld_get_socket; + } + ++ + int posix_api_init(void) + { + /* the symbol we use here won't be NULL, so we don't need dlerror() +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 21de5d9..3d94454 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -65,6 +65,7 @@ + #if USE_LIBOS + #include + #include "lwipsock.h" ++#include "posix_api.h" + #endif + + #include +@@ -2682,9 +2683,6 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + check_waiters = 0; + } + sock->sendevent = 1; +-#if USE_LIBOS +- add_epoll_event(conn, EPOLLOUT); +-#endif + break; + case NETCONN_EVT_SENDMINUS: + sock->sendevent = 0; +diff --git a/src/core/ipv4/icmp.c b/src/core/ipv4/icmp.c +index 59b493a..c58ae25 100644 +--- a/src/core/ipv4/icmp.c ++++ b/src/core/ipv4/icmp.c +@@ -51,6 +51,10 @@ + + #include + ++#if USE_LIBOS && CHECKSUM_GEN_IP_HW ++#include "dpdk_cksum.h" ++#endif ++ + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME + #endif +@@ -236,7 +240,16 @@ icmp_input(struct pbuf *p, struct netif *inp) + IPH_CHKSUM_SET(iphdr, 0); + #if CHECKSUM_GEN_IP + IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_GEN_IP) { ++#if CHECKSUM_GEN_IP_HW ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_IPV4_CKSUM) { ++ iph_cksum_set(p, hlen, 1); ++ } else { ++ iph_cksum_set(p, hlen, 0); ++ IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, hlen)); ++ } ++#else + IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, hlen)); ++#endif + } + #endif /* CHECKSUM_GEN_IP */ + +diff --git a/src/core/ipv4/ip4.c b/src/core/ipv4/ip4.c +index c83afbe..1334cdc 100644 +--- a/src/core/ipv4/ip4.c ++++ b/src/core/ipv4/ip4.c +@@ -59,6 +59,10 @@ + + #include + ++#if USE_LIBOS && (CHECKSUM_CHECK_IP_HW || CHECKSUM_GEN_IP_HW) ++#include "dpdk_cksum.h" ++#endif ++ + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME + #endif +@@ -503,8 +507,17 @@ ip4_input(struct pbuf *p, struct netif *inp) + /* verify checksum */ + #if CHECKSUM_CHECK_IP + IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_CHECK_IP) { ++#if CHECKSUM_CHECK_IP_HW ++ u64_t ret; ++ if (get_eth_params_rx_ol() & DEV_RX_OFFLOAD_IPV4_CKSUM) { ++ ret = is_cksum_ipbad(p); ++ } else { ++ ret = (u64_t)inet_chksum(iphdr, iphdr_hlen); ++ } ++ if (ret != 0) { ++#else + if (inet_chksum(iphdr, iphdr_hlen) != 0) { +- ++#endif + LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, + ("Checksum (0x%"X16_F") failed, IP packet dropped.\n", inet_chksum(iphdr, iphdr_hlen))); + ip4_debug_print(p); +@@ -972,7 +985,16 @@ ip4_output_if_opt_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *d + IPH_CHKSUM_SET(iphdr, 0); + #if CHECKSUM_GEN_IP + IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_IP) { ++#if CHECKSUM_GEN_IP_HW ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_IPV4_CKSUM) { ++ iph_cksum_set(p, ip_hlen, 1); ++ } else { ++ iph_cksum_set(p, ip_hlen, 0); ++ IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, ip_hlen)); ++ } ++#else + IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, ip_hlen)); ++#endif + } + #endif /* CHECKSUM_GEN_IP */ + #endif /* CHECKSUM_GEN_IP_INLINE */ +diff --git a/src/core/ipv4/ip4_frag.c b/src/core/ipv4/ip4_frag.c +index a445530..17a4ccd 100644 +--- a/src/core/ipv4/ip4_frag.c ++++ b/src/core/ipv4/ip4_frag.c +@@ -51,6 +51,10 @@ + + #include + ++#if USE_LIBOS && CHECKSUM_GEN_IP_HW ++#include "dpdk_cksum.h" ++#endif ++ + #if IP_REASSEMBLY + /** + * The IP reassembly code currently has the following limitations: +@@ -632,8 +636,17 @@ ip4_reass(struct pbuf *p) + /* @todo: do we need to set/calculate the correct checksum? */ + #if CHECKSUM_GEN_IP + IF__NETIF_CHECKSUM_ENABLED(ip_current_input_netif(), NETIF_CHECKSUM_GEN_IP) { ++#if CHECKSUM_GEN_IP_HW ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_IPV4_CKSUM) { ++ iph_cksum_set(p, IP_HLEN, 1); ++ } else { ++ iph_cksum_set(p, IP_HLEN, 0); + IPH_CHKSUM_SET(fraghdr, inet_chksum(fraghdr, IP_HLEN)); + } ++#else ++ IPH_CHKSUM_SET(fraghdr, inet_chksum(fraghdr, IP_HLEN)); ++#endif ++ } + #endif /* CHECKSUM_GEN_IP */ + + p = ipr->p; +@@ -862,8 +875,18 @@ ip4_frag(struct pbuf *p, struct netif *netif, const ip4_addr_t *dest) + IPH_CHKSUM_SET(iphdr, 0); + #if CHECKSUM_GEN_IP + IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_IP) { ++#if CHECKSUM_GEN_IP_HW ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_IPV4_CKSUM) { ++ iph_cksum_set(p, IP_HLEN, 1); ++ } else { ++ iph_cksum_set(p, IP_HLEN, 0); + IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN)); + } ++ ++#else ++ IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN)); ++#endif ++ } + #endif /* CHECKSUM_GEN_IP */ + + /* No need for separate header pbuf - we allowed room for it in rambuf +diff --git a/src/core/pbuf.c b/src/core/pbuf.c +index cd6b558..247681d 100644 +--- a/src/core/pbuf.c ++++ b/src/core/pbuf.c +@@ -282,7 +282,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type) + + /* If pbuf is to be allocated in RAM, allocate memory for it. */ + #if USE_LIBOS +- /* alloc mbuf to reduce copy in sending */ ++ /* alloc mbuf avoid send copy */ + p = lwip_alloc_pbuf(layer, length, type); + #else + p = (struct pbuf *)mem_malloc(alloc_len); +@@ -1019,6 +1019,13 @@ pbuf_copy_partial_pbuf(struct pbuf *p_to, const struct pbuf *p_from, u16_t copy_ + /* current p_from does not fit into current p_to */ + len_calc = p_to->len - offset_to; + } ++ ++#if USE_LIBOS && (CHECKSUM_GEN_IP_HW || CHECKSUM_GEN_TCP_HW) ++ p_to->l2_len = p_from->l2_len; ++ p_to->l3_len = p_from->l3_len; ++ p_to->ol_flags = p_from->ol_flags; ++#endif ++ + len = (u16_t)LWIP_MIN(copy_len, len_calc); + MEMCPY((u8_t *)p_to->payload + offset_to, (u8_t *)p_from->payload + offset_from, len); + offset_to += len; +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index 0d3a2f1..b1bbe00 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -64,6 +64,10 @@ + + #include + ++#if USE_LIBOS && CHECKSUM_CHECK_TCP_HW ++#include ++#endif /* CHECKSUM_CHECK_TCP_HW */ ++ + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME + #endif +@@ -172,11 +176,24 @@ tcp_input(struct pbuf *p, struct netif *inp) + #if CHECKSUM_CHECK_TCP + IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_CHECK_TCP) { + /* Verify TCP checksum. */ ++#if CHECKSUM_CHECK_TCP_HW ++ u64_t ret; ++ if (get_eth_params_rx_ol() & DEV_RX_OFFLOAD_TCP_CKSUM) { ++ ret = is_cksum_tcpbad(p); ++ } else { ++ ret = (u64_t)ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len, ++ ip_current_src_addr(), ip_current_dest_addr()); ++ ++ } ++ if (ret != 0) { ++ LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packet discarded due to failing checksum\n")); ++#else + u16_t chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len, + ip_current_src_addr(), ip_current_dest_addr()); + if (chksum != 0) { + LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packet discarded due to failing checksum 0x%04"X16_F"\n", + chksum)); ++#endif + tcp_debug_print(tcphdr); + TCP_STATS_INC(tcp.chkerr); + goto dropped; +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index b99974d..1b0af8d 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -80,6 +80,13 @@ + + #include + ++#if USE_LIBOS ++#include "lwipsock.h" ++#if CHECKSUM_GEN_TCP_HW ++#include "dpdk_cksum.h" ++#endif ++#endif ++ + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME + #endif +@@ -660,8 +667,11 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + pbuf_cat(p/*header*/, p2/*data*/); + } + #else /* USE_LIBOS */ +- p = (struct pbuf *)arg; +- seglen = p->len; ++ p = write_lwip_data((struct lwip_sock *)arg, len - pos, &apiflags); ++ if (p == NULL) { ++ break; ++ } ++ seglen = p->tot_len; + #endif /* USE_LIBOS */ + + queuelen += pbuf_clen(p); +@@ -789,8 +799,13 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + /* + * Finally update the pcb state. + */ ++#if USE_LIBOS ++ pcb->snd_lbb += pos; ++ pcb->snd_buf -= pos; ++#else + pcb->snd_lbb += len; + pcb->snd_buf -= len; ++#endif + pcb->snd_queuelen = queuelen; + + LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_write: %"S16_F" (after enqueued)\n", +@@ -1584,6 +1599,11 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + + #if CHECKSUM_GEN_TCP + IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) { ++#if CHECKSUM_GEN_TCP_HW ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_CKSUM) { ++ tcph_cksum_set(seg->p, TCP_HLEN); ++ seg->tcphdr->chksum = ip_chksum_pseudo_offload(IP_PROTO_TCP,seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip); ++ } else { + #if TCP_CHECKSUM_ON_COPY + u32_t acc; + #if TCP_CHECKSUM_ON_COPY_SANITY_CHECK +@@ -1618,6 +1638,44 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + seg->tcphdr->chksum = ip_chksum_pseudo(seg->p, IP_PROTO_TCP, + seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip); + #endif /* TCP_CHECKSUM_ON_COPY */ ++ ++ } ++#else ++#if TCP_CHECKSUM_ON_COPY ++ u32_t acc; ++#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK ++ u16_t chksum_slow = ip_chksum_pseudo(seg->p, IP_PROTO_TCP, ++ seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip); ++#endif /* TCP_CHECKSUM_ON_COPY_SANITY_CHECK */ ++ if ((seg->flags & TF_SEG_DATA_CHECKSUMMED) == 0) { ++ LWIP_ASSERT("data included but not checksummed", ++ seg->p->tot_len == TCPH_HDRLEN_BYTES(seg->tcphdr)); ++ } ++ ++ /* rebuild TCP header checksum (TCP header changes for retransmissions!) */ ++ acc = ip_chksum_pseudo_partial(seg->p, IP_PROTO_TCP, ++ seg->p->tot_len, TCPH_HDRLEN_BYTES(seg->tcphdr), &pcb->local_ip, &pcb->remote_ip); ++ /* add payload checksum */ ++ if (seg->chksum_swapped) { ++ seg_chksum_was_swapped = 1; ++ seg->chksum = SWAP_BYTES_IN_WORD(seg->chksum); ++ seg->chksum_swapped = 0; ++ } ++ acc = (u16_t)~acc + seg->chksum; ++ seg->tcphdr->chksum = (u16_t)~FOLD_U32T(acc); ++#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK ++ if (chksum_slow != seg->tcphdr->chksum) { ++ TCP_CHECKSUM_ON_COPY_SANITY_CHECK_FAIL( ++ ("tcp_output_segment: calculated checksum is %"X16_F" instead of %"X16_F"\n", ++ seg->tcphdr->chksum, chksum_slow)); ++ seg->tcphdr->chksum = chksum_slow; ++ } ++#endif /* TCP_CHECKSUM_ON_COPY_SANITY_CHECK */ ++#else /* TCP_CHECKSUM_ON_COPY */ ++ seg->tcphdr->chksum = ip_chksum_pseudo(seg->p, IP_PROTO_TCP, ++ seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip); ++#endif /* TCP_CHECKSUM_ON_COPY */ ++#endif /* CHECKSUM_GEN_TCP_HW */ + } + #endif /* CHECKSUM_GEN_TCP */ + TCP_STATS_INC(tcp.xmit); +@@ -1959,8 +2017,18 @@ tcp_output_control_segment(const struct tcp_pcb *pcb, struct pbuf *p, + #if CHECKSUM_GEN_TCP + IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) { + struct tcp_hdr *tcphdr = (struct tcp_hdr *)p->payload; ++#if CHECKSUM_GEN_TCP_HW ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_CKSUM) { ++ tcph_cksum_set(p, TCP_HLEN); ++ tcphdr->chksum = ip_chksum_pseudo_offload(IP_PROTO_TCP, p->tot_len, src, dst); ++ } else { ++ tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len, ++ src, dst); ++ } ++#else + tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len, + src, dst); ++#endif + } + #endif + if (pcb != NULL) { +diff --git a/src/include/dpdk_cksum.h b/src/include/dpdk_cksum.h +new file mode 100644 +index 0000000..e57be4d +--- /dev/null ++++ b/src/include/dpdk_cksum.h +@@ -0,0 +1,107 @@ ++/* ++ * 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: Huawei Technologies ++ * ++ */ ++ ++#ifndef __DPDK_CKSUM_H__ ++#define __DPDK_CKSUM_H__ ++ ++#include "lwipopts.h" ++#if USE_LIBOS ++#include ++ ++#if CHECKSUM_OFFLOAD_ALL ++#include ++#include "lwip/pbuf.h" ++#endif ++ ++extern uint64_t get_eth_params_rx_ol(void); ++extern uint64_t get_eth_params_tx_ol(void); ++#if CHECKSUM_CHECK_IP_HW ++// for ip4_input ++static inline u64_t is_cksum_ipbad(struct pbuf *p) { ++ return p->ol_flags & (RTE_MBUF_F_RX_IP_CKSUM_BAD); ++} ++#endif /* CHECKSUM_CHECK_IP_HW */ ++ ++#if CHECKSUM_CHECK_TCP_HW ++// for tcp_input ++static inline u64_t is_cksum_tcpbad(struct pbuf *p) { ++ return p->ol_flags & (RTE_MBUF_F_RX_L4_CKSUM_BAD); ++} ++#endif /* CHECKSUM_CHECK_TCP_HW */ ++ ++#if CHECKSUM_GEN_IP_HW ++static inline void ethh_cksum_set(struct pbuf *p, u16_t len) { ++ p->l2_len = len; ++} ++ ++// replaces IPH_CHKSUM_SET ++static inline void iph_cksum_set(struct pbuf *p, u16_t len, bool do_ipcksum) { ++ p->ol_flags |= RTE_MBUF_F_TX_IPV4; ++ if (do_ipcksum) { ++ p->ol_flags |= RTE_MBUF_F_TX_IP_CKSUM; ++ } ++ p->l3_len = len; ++} ++#endif /* CHECKSUM_GEN_IP_HW */ ++ ++// replace ip_chksum_pseudo ++#if CHECKSUM_GEN_TCP_HW ++#include ++ ++static inline void tcph_cksum_set(struct pbuf *p, u16_t len) { ++ (void)len; ++ p->ol_flags |= RTE_MBUF_F_TX_TCP_CKSUM; ++} ++ ++static inline u16_t ip_chksum_pseudo_offload(u8_t proto, u16_t proto_len, ++ const ip_addr_t *src, const ip_addr_t *dst) ++{ ++ struct ipv4_psd_header { ++ uint32_t src_addr; /* IP address of source host. */ ++ uint32_t dst_addr; /* IP address of destination host. */ ++ uint8_t zero; /* zero. */ ++ uint8_t proto; /* L4 protocol type. */ ++ uint16_t len; /* L4 length. */ ++ } psd_hdr; ++ ++ psd_hdr.src_addr = ip4_addr_get_u32(src); ++ psd_hdr.dst_addr = ip4_addr_get_u32(dst); ++ psd_hdr.proto = proto; ++ psd_hdr.len = lwip_htons(proto_len); ++ psd_hdr.zero = 0; ++ ++ return rte_raw_cksum(&psd_hdr, sizeof(psd_hdr)); ++} ++#endif /* CHECKSUM_GEN_TCP_HW */ ++ ++#endif /* USE_LIBOS */ ++#endif /* __DPDK_CKSUM_H__ */ +diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h +index 3894574..87cd960 100644 +--- a/src/include/lwip/pbuf.h ++++ b/src/include/lwip/pbuf.h +@@ -220,6 +220,15 @@ struct pbuf { + /** For incoming packets, this contains the input netif's index */ + u8_t if_idx; + ++#if USE_LIBOS && CHECKSUM_OFFLOAD_ALL ++ /** checksum offload ol_flags */ ++ u64_t ol_flags; ++ /** checksum offload l2_len */ ++ u64_t l2_len:7; ++ /** checksum offload l3_len */ ++ u64_t l3_len:9; ++#endif /* USE_LIBOS CHECKSUM_OFFLOAD_SWITCH */ ++ + /** In case the user needs to store data custom data on a pbuf */ + LWIP_PBUF_CUSTOM_DATA + }; +@@ -271,9 +280,8 @@ void pbuf_free_ooseq(void); + + /* Initializes the pbuf module. This call is empty for now, but may not be in future. */ + #define pbuf_init() +- + #if USE_LIBOS +-struct pbuf *lwip_alloc_pbuf(pbuf_layer l, u16_t length, pbuf_type type); ++struct pbuf *lwip_alloc_pbuf(pbuf_layer layer, uint16_t length, pbuf_type type); + #endif + struct pbuf *pbuf_alloc(pbuf_layer l, u16_t length, pbuf_type type); + struct pbuf *pbuf_alloc_reference(void *payload, u16_t length, pbuf_type type); +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index e0364a2..df587c0 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -129,14 +129,6 @@ + + #define LWIP_STATS_DISPLAY 1 + +-#define CHECKSUM_GEN_IP 1 /* master switch */ +- +-#define CHECKSUM_GEN_TCP 1 /* master switch */ +- +-#define CHECKSUM_CHECK_IP 1 /* master switch */ +- +-#define CHECKSUM_CHECK_TCP 1 /* master switch */ +- + #define LWIP_TIMEVAL_PRIVATE 0 + + #define USE_LIBOS 1 +@@ -177,6 +169,28 @@ + + #define ARP_TABLE_SIZE 512 + ++/* --------------------------------------- ++ * ------- NIC offloads -------- ++ * --------------------------------------- ++ */ ++#define LWIP_CHECKSUM_CTRL_PER_NETIF 1 /* checksum ability check before checksum*/ ++ ++// rx cksum ++#define CHECKSUM_CHECK_IP 1 /* master switch */ ++#define CHECKSUM_CHECK_TCP 1 /* master switch */ ++// tx cksum ++#define CHECKSUM_GEN_IP 1 /* master switch */ ++#define CHECKSUM_GEN_TCP 1 /* master switch */ ++ ++// rx offload cksum ++#define CHECKSUM_CHECK_IP_HW (1 && CHECKSUM_CHECK_IP) /* hardware switch */ ++#define CHECKSUM_CHECK_TCP_HW (1 && CHECKSUM_CHECK_TCP) /* hardware switch */ ++// tx offload cksum ++#define CHECKSUM_GEN_IP_HW (1 && CHECKSUM_GEN_IP) /* hardware switch */ ++#define CHECKSUM_GEN_TCP_HW (1 && CHECKSUM_GEN_TCP) /* hardware switch */ ++ ++#define CHECKSUM_OFFLOAD_ALL (CHECKSUM_GEN_IP_HW || CHECKSUM_GEN_TCP_HW || CHECKSUM_CHECK_IP_HW || CHECKSUM_CHECK_TCP_HW) ++ + #if USE_LIBOS + #define PER_THREAD __thread + #else +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 36bcaed..eec4e8e 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -36,7 +36,6 @@ + #include "lwip/opt.h" + #include "lwip/api.h" + +-#include "posix_api.h" + #include "eventpoll.h" + + /* move some definitions to the lwipsock.h for libnet to use, and +@@ -62,7 +61,8 @@ union lwip_sock_lastdata { + + #if USE_LIBOS + struct protocol_stack; +-struct weakup_poll; ++struct wakeup_poll; ++struct rte_ring; + #endif + /** Contains all internal pointers and states used for a socket */ + struct lwip_sock { +@@ -93,16 +93,16 @@ struct lwip_sock { + + #if USE_LIBOS + uint32_t epoll_events; /* registered events */ +- uint32_t events; /* available events */ +- volatile bool have_event; /* avoid recurring events */ +- volatile bool have_rpc_send; /* avoid recurring rpc_send */ ++ volatile uint32_t events; /* available events */ + epoll_data_t ep_data; +- struct weakup_poll *weakup; ++ struct wakeup_poll *wakeup; + struct protocol_stack *stack; +- void *recv_ring; ++ struct rte_ring *recv_ring; ++ struct rte_ring *recv_wait_free; + struct pbuf *recv_lastdata; /* unread data in one pbuf */ + struct pbuf *send_lastdata; /* unread data in one pbuf */ +- void *send_ring; ++ struct rte_ring *send_ring; ++ struct rte_ring *send_idle_ring; + int32_t recv_flags; + int32_t send_flags; + bool wait_close; +@@ -112,7 +112,6 @@ struct lwip_sock { + struct list_node listen_list; + struct list_node recv_list; + struct list_node event_list; +- struct list_node wakeup_list; + struct list_node send_list; + int32_t nextfd; /* listenfd list */ + #endif +@@ -160,6 +159,7 @@ get_socket_without_errno(int s) + + extern void add_recv_list(int32_t fd); + extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); ++extern struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); + extern void gazelle_clean_sock(int32_t fd); + extern void gazelle_init_sock(int32_t fd); + #endif /* USE_LIBOS */ +diff --git a/src/netif/ethernet.c b/src/netif/ethernet.c +index dd171e2..ab976a8 100644 +--- a/src/netif/ethernet.c ++++ b/src/netif/ethernet.c +@@ -56,6 +56,10 @@ + #include "netif/ppp/pppoe.h" + #endif /* PPPOE_SUPPORT */ + ++#if USE_LIBOS && (CHECKSUM_GEN_TCP_HW || CHECKSUM_GEN_IP_HW) ++#include "dpdk_cksum.h" ++#endif ++ + #ifdef LWIP_HOOK_FILENAME + #include LWIP_HOOK_FILENAME + #endif +@@ -308,6 +312,10 @@ ethernet_output(struct netif * netif, struct pbuf * p, + LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, + ("ethernet_output: sending packet %p\n", (void *)p)); + ++#if CHECKSUM_GEN_IP_HW || CHECKSUM_GEN_TCP_HW ++ ethh_cksum_set(p, sizeof(*ethhdr)); ++#endif ++ + /* send the packet */ + return netif->linkoutput(netif, p); + +-- +2.23.0 diff --git a/0024-refactor-pkt-read-send-performance.patch b/0024-refactor-pkt-read-send-performance.patch new file mode 100644 index 0000000..529738a --- /dev/null +++ b/0024-refactor-pkt-read-send-performance.patch @@ -0,0 +1,320 @@ +From 10e21843fc3fde51cb99510792835a65c9b5baad Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 7 Jul 2022 20:00:14 +0800 +Subject: [PATCH] refactor pkt read/send + +--- + src/api/api_msg.c | 15 ++++++--------- + src/api/posix_api.c | 4 ++-- + src/api/sockets.c | 11 +++-------- + src/api/sys_arch.c | 11 +++++------ + src/include/arch/sys_arch.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ + src/include/lwipopts.h | 2 +- + src/include/lwipsock.h | 29 +++++++++++----------------- + src/include/posix_api.h | 2 +- + 8 files changed, 75 insertions(+), 45 deletions(-) + +diff --git a/src/api/api_msg.c b/src/api/api_msg.c +index 672f022..7839526 100644 +--- a/src/api/api_msg.c ++++ b/src/api/api_msg.c +@@ -341,13 +341,12 @@ recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) + #if LWIP_SO_RCVBUF + SYS_ARCH_INC(conn->recv_avail, len); + #endif /* LWIP_SO_RCVBUF */ +- /* Register event with callback */ +- API_EVENT(conn, NETCONN_EVT_RCVPLUS, len); + #if USE_LIBOS +- if (conn->state == NETCONN_WRITE || conn->state == NETCONN_CLOSE || +- conn->state == NETCONN_CONNECT) { + add_recv_list(conn->socket); +- } ++ LWIP_UNUSED_ARG(len); ++#else ++ /* Register event with callback */ ++ API_EVENT(conn, NETCONN_EVT_RCVPLUS, len); + #endif + } + +@@ -479,10 +478,7 @@ err_tcp(void *arg, err_t err) + /* use trypost to prevent deadlock */ + sys_mbox_trypost(&conn->recvmbox, mbox_msg); + #if USE_LIBOS +- if ((old_state == NETCONN_WRITE) || (old_state == NETCONN_CLOSE) || +- (old_state == NETCONN_CONNECT)) { +- add_recv_list(conn->socket); +- } ++ add_recv_list(conn->socket); + #endif + } + /* pass error message to acceptmbox to wake up pending accept */ +@@ -1356,6 +1352,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err) + } + } + SET_CONN_TYPE_LIBOS(conn); ++ add_epoll_event(conn, EPOLLOUT); + #endif + + LWIP_ASSERT("conn->state == NETCONN_CONNECT", conn->state == NETCONN_CONNECT); +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +index 3f85bad..6afb9c6 100644 +--- a/src/api/posix_api.c ++++ b/src/api/posix_api.c +@@ -60,7 +60,7 @@ static struct lwip_sock *chld_get_socket(int fd) + void posix_api_fork(void) + { + /* lstack helper api */ +- posix_api->is_chld = 1; ++ posix_api->ues_posix = 1; + posix_api->is_epfd = chld_is_epfd; + posix_api->get_socket = chld_get_socket; + } +@@ -117,7 +117,7 @@ int posix_api_init(void) + posix_api->epoll_close_fn = lstack_epoll_close; + + /* support fork */ +- posix_api->is_chld = 1; ++ posix_api->ues_posix = 1; + return ERR_OK; + + err_out: +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 3d94454..4d4cea1 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -1039,11 +1039,7 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + { + u8_t apiflags = NETCONN_NOAUTORCVD; + ssize_t recvd = 0; +-#if USE_LIBOS +- apiflags = 0; +-#else + ssize_t recv_left = (len <= SSIZE_MAX) ? (ssize_t)len : SSIZE_MAX; +-#endif + + LWIP_ASSERT("no socket given", sock != NULL); + LWIP_ASSERT("this should be checked internally", NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP); +@@ -1134,6 +1130,7 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) + + lwip_recv_tcp_done: + #else /* USE_LIBOS */ ++ LWIP_UNUSED_ARG(recv_left); + recvd = read_lwip_data(sock, flags, apiflags); + if (recvd <= 0) { + return recvd; +@@ -2667,10 +2664,8 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + check_waiters = 0; + } + #if USE_LIBOS +- if (conn->state == NETCONN_LISTEN) { +- add_epoll_event(conn, EPOLLIN); +- } else { +- add_recv_list(conn->socket); ++ if (conn->acceptmbox != NULL && !sys_mbox_empty(conn->acceptmbox)) { ++ add_epoll_event(conn, POLLIN); + } + #endif + break; +diff --git a/src/api/sys_arch.c b/src/api/sys_arch.c +index 9a92143..f93a00e 100644 +--- a/src/api/sys_arch.c ++++ b/src/api/sys_arch.c +@@ -37,7 +37,6 @@ + #include + + #include +-#include + + #include "lwip/err.h" + #include "lwip/mem.h" +@@ -134,7 +133,7 @@ err_t sys_mbox_trypost(struct sys_mbox **mb, void *msg) + unsigned int n; + struct sys_mbox *mbox = *mb; + +- n = rte_ring_sp_enqueue_bulk(mbox->ring, &msg, 1, NULL); ++ n = gazelle_st_ring_enqueue_busrt(mbox->ring, &msg, 1); + if (!n) + return ERR_BUF; + return ERR_OK; +@@ -148,7 +147,7 @@ void sys_mbox_post(struct sys_mbox **mb, void *msg) + * If the ring size of mbox is greater than MEMP_NUM_TCPIP_MSG_API, + * enqueue failure will never happen. + * */ +- if (!rte_ring_sp_enqueue_bulk(mbox->ring, &msg, 1, NULL)) { ++ if (!gazelle_st_ring_enqueue_busrt(mbox->ring, &msg, 1)) { + LWIP_ASSERT("It is failed to post msg into mbox", 0); + } + } +@@ -163,7 +162,7 @@ uint32_t sys_arch_mbox_tryfetch(struct sys_mbox **mb, void **msg) + unsigned int n; + struct sys_mbox *mbox = *mb; + +- n = rte_ring_sc_dequeue_bulk(mbox->ring, msg, 1, NULL); ++ n = gazelle_st_ring_dequeue_burst(mbox->ring, msg, 1); + if (!n) { + *msg = NULL; + return SYS_MBOX_EMPTY; +@@ -179,7 +178,7 @@ uint32_t sys_arch_mbox_fetch(struct sys_mbox **mb, void **msg, uint32_t timeout) + uint32_t time_needed = 0; + struct sys_mbox *mbox = *mb; + +- n = rte_ring_sc_dequeue_bulk(mbox->ring, msg, 1, NULL); ++ n = gazelle_st_ring_dequeue_burst(mbox->ring, msg, 1); + + if (timeout > 0) + poll_ts = sys_now(); +@@ -194,7 +193,7 @@ uint32_t sys_arch_mbox_fetch(struct sys_mbox **mb, void **msg, uint32_t timeout) + + (void)mbox->wait_fn(); + +- n = rte_ring_sc_dequeue_bulk(mbox->ring, msg, 1, NULL); ++ n = gazelle_st_ring_dequeue_burst(mbox->ring, msg, 1); + } + + return time_needed; +diff --git a/src/include/arch/sys_arch.h b/src/include/arch/sys_arch.h +index b8a0d28..fc4a9fd 100644 +--- a/src/include/arch/sys_arch.h ++++ b/src/include/arch/sys_arch.h +@@ -76,7 +76,53 @@ int sys_mbox_empty(struct sys_mbox *); + struct sys_thread; + typedef struct sys_thread *sys_thread_t; + ++#if USE_LIBOS + extern int eth_dev_poll(void); ++#include ++ ++/* ++ gazelle custom rte ring interface ++ lightweight ring no atomic. ++ only surpport in single thread. ++ */ ++static __rte_always_inline uint32_t gazelle_st_ring_enqueue_busrt(struct rte_ring *r, void **obj_table, uint32_t n) ++{ ++ uint32_t prod = r->prod.tail; ++ uint32_t cons = r->cons.tail; ++ uint32_t free_entries = r->capacity + cons - prod; ++ ++ if (n > free_entries) { ++ return 0; ++ } ++ ++ __rte_ring_enqueue_elems(r, prod, obj_table, sizeof(void *), n); ++ ++ r->prod.tail = prod + n; ++ ++ return n; ++} ++ ++static __rte_always_inline uint32_t gazelle_st_ring_dequeue_burst(struct rte_ring *r, void **obj_table, uint32_t n) ++{ ++ uint32_t cons = r->cons.tail; ++ uint32_t prod = r->prod.tail; ++ uint32_t entries = prod - cons; ++ ++ if (n > entries) { ++ n = entries; ++ } ++ ++ if (n == 0) { ++ return 0; ++ } ++ ++ __rte_ring_dequeue_elems(r, cons, obj_table, sizeof(void *), n); ++ ++ r->cons.tail = cons + n; ++ ++ return n; ++} ++#endif + + void sys_calibrate_tsc(void); + uint32_t sys_now(void); +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index df587c0..75d3c74 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -97,7 +97,7 @@ + + #define TCP_WND (40 * TCP_MSS) + +-#define TCP_SND_BUF (5 * TCP_MSS) ++#define TCP_SND_BUF (40 * TCP_MSS) + + #define TCP_SND_QUEUELEN (8191) + +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index eec4e8e..500292d 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -63,6 +63,7 @@ union lwip_sock_lastdata { + struct protocol_stack; + struct wakeup_poll; + struct rte_ring; ++#include + #endif + /** Contains all internal pointers and states used for a socket */ + struct lwip_sock { +@@ -92,28 +93,21 @@ struct lwip_sock { + #endif + + #if USE_LIBOS ++ volatile uint32_t events __rte_cache_aligned; /* available events */ ++ struct pbuf *recv_lastdata __rte_cache_aligned; /* unread data in one pbuf */ ++ struct list_node recv_list __rte_cache_aligned; ++ struct list_node event_list __rte_cache_aligned; ++ struct list_node send_list __rte_cache_aligned; ++ char pad __rte_cache_aligned; ++ + uint32_t epoll_events; /* registered events */ +- volatile uint32_t events; /* available events */ +- epoll_data_t ep_data; + struct wakeup_poll *wakeup; ++ epoll_data_t ep_data; ++ bool wait_close; ++ struct lwip_sock *listen_next; /* listenfd list */ + struct protocol_stack *stack; + struct rte_ring *recv_ring; +- struct rte_ring *recv_wait_free; +- struct pbuf *recv_lastdata; /* unread data in one pbuf */ +- struct pbuf *send_lastdata; /* unread data in one pbuf */ + struct rte_ring *send_ring; +- struct rte_ring *send_idle_ring; +- int32_t recv_flags; +- int32_t send_flags; +- bool wait_close; +- int32_t attach_fd; +- struct lwip_sock *shadowed_sock; +- struct list_node attach_list; +- struct list_node listen_list; +- struct list_node recv_list; +- struct list_node event_list; +- struct list_node send_list; +- int32_t nextfd; /* listenfd list */ + #endif + }; + +@@ -160,7 +154,6 @@ get_socket_without_errno(int s) + extern void add_recv_list(int32_t fd); + extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); + extern struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); +-extern void gazelle_clean_sock(int32_t fd); + extern void gazelle_init_sock(int32_t fd); + #endif /* USE_LIBOS */ + +diff --git a/src/include/posix_api.h b/src/include/posix_api.h +index 2afd266..c8f2cf9 100644 +--- a/src/include/posix_api.h ++++ b/src/include/posix_api.h +@@ -76,7 +76,7 @@ typedef struct { + int (*poll_fn)(struct pollfd *fds, nfds_t nfds, int timeout); + int (*ioctl_fn)(int fd, int cmd, ...); + +- int is_chld; ++ int ues_posix; + } posix_api_t; + + extern posix_api_t *posix_api; +-- +2.8.4.windows.1 + diff --git a/0025-Replace-gettid-with-syscall-SYS_gettid.patch b/0025-Replace-gettid-with-syscall-SYS_gettid.patch new file mode 100644 index 0000000..92abd14 --- /dev/null +++ b/0025-Replace-gettid-with-syscall-SYS_gettid.patch @@ -0,0 +1,57 @@ +From 35300925c26ce9eba9f4f1c9a4181708da771392 Mon Sep 17 00:00:00 2001 +From: Honggang LI +Date: Tue, 12 Jul 2022 10:15:36 +0800 +Subject: [PATCH] Replace gettid() with syscall(SYS_gettid) + +Remove gettid() to address a backport issue for gazelle library. + +Signed-off-by: Honggang LI +--- + src/include/arch/cc.h | 4 ++-- + src/include/lwiplog.h | 3 +-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/include/arch/cc.h b/src/include/arch/cc.h +index 222b0c9..aa18573 100644 +--- a/src/include/arch/cc.h ++++ b/src/include/arch/cc.h +@@ -62,7 +62,7 @@ void alloc_memp_##name##_base(void) \ + memp_pools[MEMP_##name] = &memp_ ## name; \ + \ + char mpname[MEMZONE_NAMESIZE] = {0}; \ +- snprintf(mpname, MEMZONE_NAMESIZE, "%d_%s", gettid(), #name); \ ++ snprintf(mpname, MEMZONE_NAMESIZE, "%d_%s", (int)syscall(SYS_gettid), #name); \ + memp_memory_##name##_base = \ + sys_hugepage_malloc(mpname, LWIP_MEM_ALIGN_BUFFER(__size)); \ + memp_pools[MEMP_##name]->base = memp_memory_##name##_base; \ +@@ -73,7 +73,7 @@ PER_THREAD uint8_t *variable_name; \ + void alloc_memory_##variable_name(void) \ + { \ + char mpname[MEMZONE_NAMESIZE] = {0}; \ +- snprintf(mpname, MEMZONE_NAMESIZE, "%d_%s", gettid(), #variable_name); \ ++ snprintf(mpname, MEMZONE_NAMESIZE, "%d_%s", (int)syscall(SYS_gettid), #variable_name); \ + (variable_name) = \ + sys_hugepage_malloc(mpname, LWIP_MEM_ALIGN_BUFFER(size)); \ + } +diff --git a/src/include/lwiplog.h b/src/include/lwiplog.h +index 6fccac8..011ed21 100644 +--- a/src/include/lwiplog.h ++++ b/src/include/lwiplog.h +@@ -35,13 +35,12 @@ + + #include + #include ++#include + + #include + + #include "lwipopts.h" + +-extern int gettid(void); +- + #if USE_DPDK_LOG + + #define LWIP_LOG_WARN LWIP_DBG_LEVEL_WARNING +-- +2.31.1 + diff --git a/0026-del-redundant-wait_close-and-move-epoll_events-pos.patch b/0026-del-redundant-wait_close-and-move-epoll_events-pos.patch new file mode 100644 index 0000000..cee127b --- /dev/null +++ b/0026-del-redundant-wait_close-and-move-epoll_events-pos.patch @@ -0,0 +1,30 @@ +From ab62f970793c257c712c357a6976b9aca2e63b98 Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Tue, 26 Jul 2022 17:36:29 +0800 +Subject: [PATCH] del redundant wait_close and move epoll_events pos + +--- + src/include/lwipsock.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 500292d..16e0dd3 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -98,12 +98,11 @@ struct lwip_sock { + struct list_node recv_list __rte_cache_aligned; + struct list_node event_list __rte_cache_aligned; + struct list_node send_list __rte_cache_aligned; ++ uint32_t epoll_events; /* registered events, EPOLLONESHOT write frequently */ + char pad __rte_cache_aligned; + +- uint32_t epoll_events; /* registered events */ + struct wakeup_poll *wakeup; + epoll_data_t ep_data; +- bool wait_close; + struct lwip_sock *listen_next; /* listenfd list */ + struct protocol_stack *stack; + struct rte_ring *recv_ring; +-- +2.23.0 + diff --git a/0027-modify-EISCONN-condition.patch b/0027-modify-EISCONN-condition.patch new file mode 100644 index 0000000..2693e91 --- /dev/null +++ b/0027-modify-EISCONN-condition.patch @@ -0,0 +1,39 @@ +From b8c388a7adef4dc53d3bb135102da64bf8a08b76 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 15:57:33 +0800 +Subject: [PATCH] modify-EISCONN-condition + +--- + src/api/api_msg.c | 2 +- + src/include/lwipsock.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/api/api_msg.c b/src/api/api_msg.c +index 7839526..2dded75 100644 +--- a/src/api/api_msg.c ++++ b/src/api/api_msg.c +@@ -1417,7 +1417,7 @@ lwip_netconn_do_connect(void *m) + /* Prevent connect while doing any other action. */ + if (msg->conn->state == NETCONN_CONNECT) { + err = ERR_ALREADY; +- } else if (msg->conn->state != NETCONN_NONE) { ++ } else if (msg->conn->pcb.tcp->state != ESTABLISHED) { + err = ERR_ISCONN; + } else { + setup_tcp(msg->conn); +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 16e0dd3..3c5c44b 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -98,6 +98,8 @@ struct lwip_sock { + struct list_node recv_list __rte_cache_aligned; + struct list_node event_list __rte_cache_aligned; + struct list_node send_list __rte_cache_aligned; ++ uint32_t in_send __rte_cache_aligned; /* avoid sock too much send rpc msg*/ ++ uint32_t send_flag __rte_cache_aligned; /* avoid sock too much send rpc msg*/ + uint32_t epoll_events; /* registered events, EPOLLONESHOT write frequently */ + char pad __rte_cache_aligned; + +-- +2.27.0 + diff --git a/0028-per-thread-reassdata-variables.patch b/0028-per-thread-reassdata-variables.patch new file mode 100644 index 0000000..28eff78 --- /dev/null +++ b/0028-per-thread-reassdata-variables.patch @@ -0,0 +1,30 @@ +From a554661e9dd189f2d4b5dee8970fd009db89d9aa Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 17:33:16 +0800 +Subject: [PATCH] per thread reassdata variables + +--- + src/core/ipv4/ip4_frag.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/core/ipv4/ip4_frag.c b/src/core/ipv4/ip4_frag.c +index 17a4ccd..c60523d 100644 +--- a/src/core/ipv4/ip4_frag.c ++++ b/src/core/ipv4/ip4_frag.c +@@ -115,8 +115,13 @@ PACK_STRUCT_END + IPH_ID(iphdrA) == IPH_ID(iphdrB)) ? 1 : 0 + + /* global variables */ ++#if USE_LIBOS ++static PER_THREAD struct ip_reassdata *reassdatagrams; ++static PER_THREAD u16_t ip_reass_pbufcount; ++#else + static struct ip_reassdata *reassdatagrams; + static u16_t ip_reass_pbufcount; ++#endif + + /* function prototypes */ + static void ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev); +-- +2.27.0 + diff --git a/0029-fix-EISCONN-err-and-remove-same-customized-modificat.patch b/0029-fix-EISCONN-err-and-remove-same-customized-modificat.patch new file mode 100644 index 0000000..91ac15e --- /dev/null +++ b/0029-fix-EISCONN-err-and-remove-same-customized-modificat.patch @@ -0,0 +1,114 @@ +From ec2f5414c6c98b63376e4bce9534abc5c01ce13c Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 18:47:06 +0800 +Subject: [PATCH] fix EISCONN err and remove same customized modification + +--- + src/api/api_msg.c | 22 ++-------------------- + src/include/lwipsock.h | 33 ++++----------------------------- + 2 files changed, 6 insertions(+), 49 deletions(-) + +diff --git a/src/api/api_msg.c b/src/api/api_msg.c +index 2dded75..1fedaad 100644 +--- a/src/api/api_msg.c ++++ b/src/api/api_msg.c +@@ -1334,25 +1334,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err) + } + + #if USE_LIBOS +- if (CONN_TYPE_IS_HOST(conn)) { +- LWIP_DEBUGF(API_MSG_DEBUG, +- ("libos outgoing connection abort fd=%d\n", conn->socket)); +- return ERR_ABRT; +- } +- +- LWIP_DEBUGF(API_MSG_DEBUG, ("libos outgoing connection established\n")); +- if (CONN_TYPE_HAS_INPRG(conn) && CONN_TYPE_HAS_HOST(conn)) { +- int s = conn->socket; +- struct lwip_sock *sock = get_socket_without_errno(s); +- +- if (!!sock) { +- posix_api->shutdown_fn(s, SHUT_RDWR); +- LWIP_DEBUGF(API_MSG_DEBUG, +- ("linux outgoing connection abort fd=%d\n", s)); +- } +- } +- SET_CONN_TYPE_LIBOS(conn); +- add_epoll_event(conn, EPOLLOUT); ++ gazelle_connected_callback(conn); + #endif + + LWIP_ASSERT("conn->state == NETCONN_CONNECT", conn->state == NETCONN_CONNECT); +@@ -1417,7 +1399,7 @@ lwip_netconn_do_connect(void *m) + /* Prevent connect while doing any other action. */ + if (msg->conn->state == NETCONN_CONNECT) { + err = ERR_ALREADY; +- } else if (msg->conn->pcb.tcp->state != ESTABLISHED) { ++ } else if (msg->conn->pcb.tcp->state == ESTABLISHED) { + err = ERR_ISCONN; + } else { + setup_tcp(msg->conn); +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 3c5c44b..912d471 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -93,13 +93,14 @@ struct lwip_sock { + #endif + + #if USE_LIBOS ++ struct pbuf *send_lastdata; ++ uint16_t send_datalen; + volatile uint32_t events __rte_cache_aligned; /* available events */ + struct pbuf *recv_lastdata __rte_cache_aligned; /* unread data in one pbuf */ + struct list_node recv_list __rte_cache_aligned; + struct list_node event_list __rte_cache_aligned; + struct list_node send_list __rte_cache_aligned; + uint32_t in_send __rte_cache_aligned; /* avoid sock too much send rpc msg*/ +- uint32_t send_flag __rte_cache_aligned; /* avoid sock too much send rpc msg*/ + uint32_t epoll_events; /* registered events, EPOLLONESHOT write frequently */ + char pad __rte_cache_aligned; + +@@ -124,38 +125,12 @@ struct lwip_sock { + #if USE_LIBOS + extern uint32_t sockets_num; + extern struct lwip_sock *sockets; +-/** +- * Map a externally used socket index to the internal socket representation. +- * +- * @param s externally used socket index +- * @return struct lwip_sock for the socket or NULL if not found +- */ +-static inline struct lwip_sock * +-get_socket_without_errno(int s) +-{ +- struct lwip_sock *sock = NULL; +- +- s -= LWIP_SOCKET_OFFSET; +- +- if ((s < 0) || (s >= sockets_num)) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): invalid\n", s + LWIP_SOCKET_OFFSET)); +- return NULL; +- } +- +- sock = &sockets[s]; +- +- if (!sock->conn) { +- LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): not active\n", s + LWIP_SOCKET_OFFSET)); +- return NULL; +- } +- +- return sock; +-} +- ++extern void gazelle_connected_callback(struct netconn *conn); + extern void add_recv_list(int32_t fd); + extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); + extern struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); + extern void gazelle_init_sock(int32_t fd); ++extern void write_lwip_over(struct lwip_sock *sock, uint32_t n); + #endif /* USE_LIBOS */ + + struct lwip_sock *get_socket(int s); +-- +2.27.0 + diff --git a/0030-refactor-tcp-new-port.patch b/0030-refactor-tcp-new-port.patch new file mode 100644 index 0000000..8d59fbc --- /dev/null +++ b/0030-refactor-tcp-new-port.patch @@ -0,0 +1,195 @@ +From 68c1fe8794077eab032b542094608338947f3d4f Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 19:27:41 +0800 +Subject: [PATCH] fix tcp new port + +--- + src/core/tcp.c | 87 +++++++++++++++++++++++++++++------------- + src/include/reg_sock.h | 1 + + 2 files changed, 61 insertions(+), 27 deletions(-) + +diff --git a/src/core/tcp.c b/src/core/tcp.c +index b65ab33..436ef85 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -202,13 +202,26 @@ PER_THREAD u8_t tcp_active_pcbs_changed; + /** Timer counter to handle calling slow-timer from tcp_tmr() */ + static PER_THREAD u8_t tcp_timer; + static PER_THREAD u8_t tcp_timer_ctr; ++#if USE_LIBOS ++static u16_t tcp_new_port(struct tcp_pcb *pcb); ++#else + static u16_t tcp_new_port(void); ++#endif + + static err_t tcp_close_shutdown_fin(struct tcp_pcb *pcb); + #if LWIP_TCP_PCB_NUM_EXT_ARGS + static void tcp_ext_arg_invoke_callbacks_destroyed(struct tcp_pcb_ext_args *ext_args); + #endif + ++#if USE_LIBOS ++static u8_t port_state[TCP_LOCAL_PORT_RANGE_END - TCP_LOCAL_PORT_RANGE_START + 1] = {0}; ++void release_port(u16_t port) ++{ ++ if (port >= TCP_LOCAL_PORT_RANGE_START && port <= TCP_LOCAL_PORT_RANGE_END) { ++ port_state[port - TCP_LOCAL_PORT_RANGE_START] = 0; ++ } ++} ++#endif + /** + * Initialize this module. + */ +@@ -237,6 +250,7 @@ tcp_free(struct tcp_pcb *pcb) + { + #if USE_LIBOS + vdev_unreg_done(pcb); ++ release_port(pcb->local_port); + #endif + LWIP_ASSERT("tcp_free: LISTEN", pcb->state != LISTEN); + #if LWIP_TCP_PCB_NUM_EXT_ARGS +@@ -746,7 +760,11 @@ tcp_bind(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port) + #endif /* LWIP_IPV6 && LWIP_IPV6_SCOPES */ + + if (port == 0) { ++#if USE_LIBOS ++ port = tcp_new_port(pcb); ++#else + port = tcp_new_port(); ++#endif + if (port == 0) { + return ERR_BUF; + } +@@ -1057,33 +1075,43 @@ tcp_recved(struct tcp_pcb *pcb, u16_t len) + * + * @return a new (free) local TCP port number + */ ++#if USE_LIBOS ++static u16_t ++tcp_new_port(struct tcp_pcb *pcb) ++#else + static u16_t + tcp_new_port(void) ++#endif + { +- u8_t i; + u16_t n = 0; +- u16_t tmp_port; +- struct tcp_pcb *pcb; ++ u16_t tmp_port = 0; + + pthread_mutex_lock(&g_tcp_port_mutex); +-again: +- tcp_port++; +- if (tcp_port == TCP_LOCAL_PORT_RANGE_END) { +- tcp_port = TCP_LOCAL_PORT_RANGE_START; +- } +- /* Check all PCB lists. */ +- for (i = 0; i < NUM_TCP_PCB_LISTS; i++) { +- for (pcb = *tcp_pcb_lists[i]; pcb != NULL; pcb = pcb->next) { +- if (pcb->local_port == tcp_port) { +- n++; +- if (n > (TCP_LOCAL_PORT_RANGE_END - TCP_LOCAL_PORT_RANGE_START)) { +- return 0; ++ do { ++ tcp_port++; ++ if (tcp_port == TCP_LOCAL_PORT_RANGE_END) { ++ tcp_port = TCP_LOCAL_PORT_RANGE_START; ++ } ++ ++ if (__atomic_load_n(&port_state[tcp_port - TCP_LOCAL_PORT_RANGE_START], __ATOMIC_ACQUIRE) == 0) { ++#if USE_LIBOS ++ if (port_in_stack_queue(pcb->remote_ip.addr, pcb->local_ip.addr, pcb->remote_port, tcp_port)) { ++ tmp_port = tcp_port; ++ __atomic_store_n(&port_state[tcp_port - TCP_LOCAL_PORT_RANGE_START], 1, __ATOMIC_RELEASE); ++ break; + } +- goto again; ++#else ++ __atomic_store_n(&port_state[tcp_port - TCP_LOCAL_PORT_RANGE_START], 1, __ATOMIC_RELEASE); ++ break; ++#endif + } +- } +- } +- tmp_port = tcp_port; ++ ++ n++; ++ if (n > TCP_LOCAL_PORT_RANGE_END - TCP_LOCAL_PORT_RANGE_START) { ++ break; ++ } ++ } while (tmp_port == 0); ++ + pthread_mutex_unlock(&g_tcp_port_mutex); + + return tmp_port; +@@ -1169,7 +1197,11 @@ tcp_connect(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port, + + old_local_port = pcb->local_port; + if (pcb->local_port == 0) { ++#if USE_LIBOS ++ pcb->local_port = tcp_new_port(pcb); ++#else + pcb->local_port = tcp_new_port(); ++#endif + if (pcb->local_port == 0) { + return ERR_BUF; + } +@@ -1196,10 +1228,6 @@ tcp_connect(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port, + #endif /* SO_REUSE */ + } + +-#if USE_LIBOS +- vdev_reg_done(REG_RING_TCP_CONNECT, pcb); +-#endif +- + iss = tcp_next_iss(pcb); + pcb->rcv_nxt = 0; + pcb->snd_nxt = iss; +@@ -1227,6 +1255,10 @@ tcp_connect(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port, + /* Send a SYN together with the MSS option. */ + ret = tcp_enqueue_flags(pcb, TCP_SYN); + if (ret == ERR_OK) { ++#if USE_LIBOS ++ vdev_reg_done(REG_RING_TCP_CONNECT, pcb); ++#endif ++ + /* SYN segment was enqueued, changed the pcbs state now */ + pcb->state = SYN_SENT; + if (old_local_port != 0) { +@@ -2277,10 +2309,6 @@ tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) + LWIP_ASSERT("tcp_pcb_remove: invalid pcb", pcb != NULL); + LWIP_ASSERT("tcp_pcb_remove: invalid pcblist", pcblist != NULL); + +-#if USE_LIBOS +- vdev_unreg_done(pcb); +-#endif +- + TCP_RMV(pcblist, pcb); + + tcp_pcb_purge(pcb); +@@ -2301,6 +2329,11 @@ tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) + #endif /* TCP_QUEUE_OOSEQ */ + } + ++#if USE_LIBOS ++ vdev_unreg_done(pcb); ++ release_port(pcb->local_port); ++#endif ++ + pcb->state = CLOSED; + /* reset the local port to prevent the pcb from being 'bound' */ + pcb->local_port = 0; +diff --git a/src/include/reg_sock.h b/src/include/reg_sock.h +index 76673da..e349e85 100644 +--- a/src/include/reg_sock.h ++++ b/src/include/reg_sock.h +@@ -58,5 +58,6 @@ struct reg_ring_msg { + }; + + extern int vdev_reg_xmit(enum reg_ring_type type, struct gazelle_quintuple *qtuple); ++extern bool port_in_stack_queue(uint32_t src_ip, uint32_t dst_ip, uint16_t src_port, uint16_t dst_port); + + #endif /* __REG_SOCK_H__ */ +-- +2.27.0 + diff --git a/0031-refactor-add-event-limit-send-pkts-num.patch b/0031-refactor-add-event-limit-send-pkts-num.patch new file mode 100644 index 0000000..63ba303 --- /dev/null +++ b/0031-refactor-add-event-limit-send-pkts-num.patch @@ -0,0 +1,71 @@ +From 87166f699e0febd36b81d914713b770119ead471 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 20:16:06 +0800 +Subject: [PATCH] refactor add event, limit send pkts num + +--- + src/api/sockets.c | 4 ++-- + src/core/tcp_out.c | 8 ++++++++ + src/include/eventpoll.h | 3 ++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 4d4cea1..d5b69eb 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -2665,7 +2665,7 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + } + #if USE_LIBOS + if (conn->acceptmbox != NULL && !sys_mbox_empty(conn->acceptmbox)) { +- add_epoll_event(conn, POLLIN); ++ add_sock_event(sock, POLLIN); + } + #endif + break; +@@ -2686,7 +2686,7 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) + case NETCONN_EVT_ERROR: + sock->errevent = 1; + #if USE_LIBOS +- add_epoll_event(conn, EPOLLERR); ++ add_sock_event(sock, EPOLLERR); + #endif + break; + default: +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index 1b0af8d..dd780d3 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -1358,8 +1358,16 @@ tcp_output(struct tcp_pcb *pcb) + for (; useg->next != NULL; useg = useg->next); + } + /* data available and window allows it to be sent? */ ++#if USE_LIBOS ++ /* avoid send cose too much time, limit send pkts num max 10 */ ++ uint16_t send_pkt = 0; ++ while (seg != NULL && send_pkt < 10 && ++ lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { ++ send_pkt++; ++#else + while (seg != NULL && + lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { ++#endif + LWIP_ASSERT("RST not expected here!", + (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0); + /* Stop sending if the nagle algorithm would prevent it +diff --git a/src/include/eventpoll.h b/src/include/eventpoll.h +index aacc1d2..a10c84b 100644 +--- a/src/include/eventpoll.h ++++ b/src/include/eventpoll.h +@@ -63,7 +63,8 @@ struct libos_epoll { + int efd; /* eventfd */ + }; + +-extern void add_epoll_event(struct netconn*, uint32_t); ++struct lwip_sock; ++extern void add_sock_event(struct lwip_sock *sock, uint32_t event); + extern int32_t lstack_epoll_close(int32_t); + + #endif /* __EVENTPOLL_H__ */ +-- +2.27.0 + diff --git a/0032-fix-free-pbuf-miss-data.patch b/0032-fix-free-pbuf-miss-data.patch new file mode 100644 index 0000000..0816127 --- /dev/null +++ b/0032-fix-free-pbuf-miss-data.patch @@ -0,0 +1,80 @@ +From 0c7d7ad7f9a79a557a867a6009aa2aac067d454e Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Thu, 6 Oct 2022 21:07:12 +0800 +Subject: [PATCH] fix free pbuf miss data + +--- + src/core/tcp_out.c | 18 ++++++++++++++++++ + src/include/lwipopts.h | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index dd780d3..2834ba3 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -682,11 +682,24 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + if (queuelen > LWIP_MIN(TCP_SND_QUEUELEN, TCP_SNDQUEUELEN_OVERFLOW)) { + LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_write: queue too long %"U16_F" (%d)\n", + queuelen, (int)TCP_SND_QUEUELEN)); ++#if USE_LIBOS ++ if (pos > 0) { ++ queuelen -= pbuf_clen(p); ++ break; ++ } ++#else + pbuf_free(p); ++#endif + goto memerr; + } + + if ((seg = tcp_create_segment(pcb, p, 0, pcb->snd_lbb + pos, optflags)) == NULL) { ++#if USE_LIBOS ++ if (pos > 0) { ++ queuelen -= pbuf_clen(p); ++ break; ++ } ++#endif + goto memerr; + } + #if TCP_OVERSIZE_DBGCHECK +@@ -714,6 +727,9 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + lwip_ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg))); + + pos += seglen; ++#if USE_LIBOS ++ write_lwip_over((struct lwip_sock*)arg, 1); ++#endif + } + + /* +@@ -825,12 +841,14 @@ memerr: + tcp_set_flags(pcb, TF_NAGLEMEMERR); + TCP_STATS_INC(tcp.memerr); + ++#if !USE_LIBOS + if (concat_p != NULL) { + pbuf_free(concat_p); + } + if (queue != NULL) { + tcp_segs_free(queue); + } ++#endif + if (pcb->snd_queuelen != 0) { + LWIP_ASSERT("tcp_write: valid queue length", pcb->unacked != NULL || + pcb->unsent != NULL); +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index 75d3c74..7459991 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -133,7 +133,7 @@ + + #define USE_LIBOS 1 + +-#define LWIP_DEBUG 1 ++//#define LWIP_DEBUG 1 + + #define LWIP_PERF 1 + +-- +2.27.0 + diff --git a/0033-alloc-socket-fail-clean-sock.patch b/0033-alloc-socket-fail-clean-sock.patch new file mode 100644 index 0000000..0a932dd --- /dev/null +++ b/0033-alloc-socket-fail-clean-sock.patch @@ -0,0 +1,39 @@ +From fc2a5b52f7d9f02eb43931414767635e5cf4c8c1 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Tue, 11 Oct 2022 21:47:24 +0800 +Subject: [PATCH] alloc socket fail clean sock + +--- + src/api/sockets.c | 3 +++ + src/include/lwipsock.h | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 14f2b35..3552599 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -598,6 +598,9 @@ alloc_socket(struct netconn *newconn, int accepted) + sockets[i].sendevent = (NETCONNTYPE_GROUP(newconn->type) == NETCONN_TCP ? (accepted != 0) : 1); + sockets[i].errevent = 0; + return i + LWIP_SOCKET_OFFSET; ++ } else { ++ lwip_close(i); ++ gazelle_clean_sock(i); + } + + err: +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 912d471..2ffb077 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -130,6 +130,7 @@ extern void add_recv_list(int32_t fd); + extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); + extern struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); + extern void gazelle_init_sock(int32_t fd); ++extern void gazelle_clean_sock(int32_t fd); + extern void write_lwip_over(struct lwip_sock *sock, uint32_t n); + #endif /* USE_LIBOS */ + +-- +2.23.0 + diff --git a/0034-add-accept4-and-epoll_create1.patch b/0034-add-accept4-and-epoll_create1.patch new file mode 100644 index 0000000..37594eb --- /dev/null +++ b/0034-add-accept4-and-epoll_create1.patch @@ -0,0 +1,182 @@ +From 547f316821a3b24e028d539f7f48b5e3e5ba5c36 Mon Sep 17 00:00:00 2001 +From: compile_success <980965867@qq.com> +Date: Wed, 19 Oct 2022 12:14:08 +0000 +Subject: [PATCH] add epoll_create1 and accept4 + +--- + src/api/posix_api.c | 1 + + src/api/sockets.c | 34 ++++++++++++++++++++++++++++++---- + src/include/lwip/sockets.h | 21 +++++++++++++++++++++ + src/include/posix_api.h | 1 + + 4 files changed, 53 insertions(+), 4 deletions(-) + +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +index 6afb9c6..e721381 100644 +--- a/src/api/posix_api.c ++++ b/src/api/posix_api.c +@@ -104,6 +104,7 @@ int posix_api_init(void) + CHECK_DLSYM_RET_RETURN(posix_api->fcntl64_fn = dlsym(handle, "fcntl64")); + CHECK_DLSYM_RET_RETURN(posix_api->pipe_fn = dlsym(handle, "pipe")); + CHECK_DLSYM_RET_RETURN(posix_api->epoll_create_fn = dlsym(handle, "epoll_create")); ++ CHECK_DLSYM_RET_RETURN(posix_api->epoll_create1_fn = dlsym(handle, "epoll_create1")); + CHECK_DLSYM_RET_RETURN(posix_api->epoll_ctl_fn = dlsym(handle, "epoll_ctl")); + CHECK_DLSYM_RET_RETURN(posix_api->epoll_wait_fn = dlsym(handle, "epoll_wait")); + CHECK_DLSYM_RET_RETURN(posix_api->fork_fn = dlsym(handle, "fork")); +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 4d4cea1..c939899 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -543,10 +543,11 @@ get_socket_by_fd(int fd) + * @param newconn the netconn for which to allocate a socket + * @param accepted 1 if socket has been created by accept(), + * 0 if socket has been created by socket() ++ * @param flags only support SOCK_CLOEXEC and SOCK_NONBLOCK + * @return the index of the new socket; -1 on error + */ + static int +-alloc_socket(struct netconn *newconn, int accepted) ++alloc_socket(struct netconn *newconn, int accepted, int flags) + { + int i; + SYS_ARCH_DECL_PROTECT(lev); +@@ -570,12 +571,19 @@ alloc_socket(struct netconn *newconn, int accepted) + break; + } + ++ /*add CLOEXEC OR NONBLOCK OR NONE*/ ++ type |= flags; ++ + SYS_ARCH_PROTECT(lev); + i = posix_api->socket_fn(domain, type, protocol); + if (i == -1) { + goto err; + } + ++ if ((flags & O_NONBLOCK) != 0){ ++ netconn_set_nonblocking(newconn, flags & O_NONBLOCK); ++ } ++ + if ((i < LWIP_SOCKET_OFFSET) || (i >= sockets_num + LWIP_SOCKET_OFFSET)) { + goto err; + } +@@ -721,7 +729,7 @@ free_socket(struct lwip_sock *sock, int is_tcp) + */ + + int +-lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) ++lwip_accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags) + { + struct lwip_sock *sock, *nsock; + struct netconn *newconn; +@@ -755,7 +763,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + } + LWIP_ASSERT("newconn != NULL", newconn != NULL); + +- newsock = alloc_socket(newconn, 1); ++ newsock = alloc_socket(newconn, 1, flags); + if (newsock == -1) { + netconn_delete(newconn); + sock_set_errno(sock, ENFILE); +@@ -827,6 +835,12 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) + return newsock; + } + ++int ++lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) ++{ ++ return lwip_accept4(s, addr, addrlen, 0); ++} ++ + int + lwip_bind(int s, const struct sockaddr *name, socklen_t namelen) + { +@@ -1823,6 +1837,10 @@ lwip_socket(int domain, int type, int protocol) + + LWIP_UNUSED_ARG(domain); /* @todo: check this */ + ++ int flags = type & ~SOCK_TYPE_MASK; ++ type &= SOCK_TYPE_MASK; ++ ++ + /* create a netconn */ + switch (type) { + case SOCK_RAW: +@@ -1862,7 +1880,15 @@ lwip_socket(int domain, int type, int protocol) + return -1; + } + +- i = alloc_socket(conn, 0); ++ if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)){ ++ set_errno(EINVAL); ++ return -1; ++ } ++ ++ if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) ++ flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; ++ ++ i = alloc_socket(conn, 0, flags); + + if (i == -1) { + netconn_delete(conn); +diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h +index 4e7e671..3c5b87b 100644 +--- a/src/include/lwip/sockets.h ++++ b/src/include/lwip/sockets.h +@@ -573,6 +573,7 @@ void lwip_socket_thread_cleanup(void); /* LWIP_NETCONN_SEM_PER_THREAD==1: destro + #if LWIP_COMPAT_SOCKETS == 2 + /* This helps code parsers/code completion by not having the COMPAT functions as defines */ + #define lwip_accept accept ++#define lwip_accept4 accept4 + #define lwip_bind bind + #define lwip_shutdown shutdown + #define lwip_getpeername getpeername +@@ -614,7 +615,25 @@ int fcntl(int s, int cmd, ...); + #endif /* LWIP_POSIX_SOCKETS_IO_NAMES */ + #endif /* LWIP_COMPAT_SOCKETS == 2 */ + ++#ifndef O_CLOEXEC ++#define O_CLOEXEC 02000000 ++#endif ++ ++#ifndef SOCK_TYPE_MASK ++#define SOCK_TYPE_MASK 0xf ++#endif ++ ++#ifndef SOCK_CLOEXEC ++#define SOCK_CLOEXEC O_CLOEXEC ++#endif ++ ++#ifndef SOCK_NONBLOCK ++#define SOCK_NONBLOCK O_NONBLOCK ++#endif ++ ++ + int lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen); ++int lwip_accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags); + int lwip_bind(int s, const struct sockaddr *name, socklen_t namelen); + int lwip_shutdown(int s, int how); + int lwip_getpeername (int s, struct sockaddr *name, socklen_t *namelen); +@@ -661,6 +680,8 @@ int lwip_inet_pton(int af, const char *src, void *dst); + /** @ingroup socket */ + #define accept(s,addr,addrlen) lwip_accept(s,addr,addrlen) + /** @ingroup socket */ ++#define accept4(s,addr,addrlen,flags) lwip_accept4(s,addr,addrlen,flags) ++/** @ingroup socket */ + #define bind(s,name,namelen) lwip_bind(s,name,namelen) + /** @ingroup socket */ + #define shutdown(s,how) lwip_shutdown(s,how) +diff --git a/src/include/posix_api.h b/src/include/posix_api.h +index c8f2cf9..e958ded 100644 +--- a/src/include/posix_api.h ++++ b/src/include/posix_api.h +@@ -66,6 +66,7 @@ typedef struct { + int (*fcntl64_fn)(int fd, int cmd, ...); + int (*pipe_fn)(int pipefd[2]); + int (*epoll_create_fn)(int size); ++ int (*epoll_create1_fn)(int size); + int (*epoll_ctl_fn)(int epfd, int op, int fd, struct epoll_event *event); + int (*epoll_wait_fn)(int epfd, struct epoll_event *events, int maxevents, int timeout); + int (*epoll_close_fn)(int epfd); +-- +2.33.0 + diff --git a/0035-add-writev-and-readv.patch b/0035-add-writev-and-readv.patch new file mode 100644 index 0000000..fc43028 --- /dev/null +++ b/0035-add-writev-and-readv.patch @@ -0,0 +1,41 @@ +From d5aca360e7518791d21ca63b44ae2dfaa6c35072 Mon Sep 17 00:00:00 2001 +From: compile_success <980965867@qq.com> +Date: Mon, 17 Oct 2022 14:18:53 +0000 +Subject: [PATCH] add writev and readv + +--- + src/api/posix_api.c | 2 ++ + src/include/posix_api.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/api/posix_api.c b/src/api/posix_api.c +index e721381..b7334da 100644 +--- a/src/api/posix_api.c ++++ b/src/api/posix_api.c +@@ -93,7 +93,9 @@ int posix_api_init(void) + CHECK_DLSYM_RET_RETURN(posix_api->shutdown_fn = dlsym(handle, "shutdown")); + CHECK_DLSYM_RET_RETURN(posix_api->close_fn = dlsym(handle, "close")); + CHECK_DLSYM_RET_RETURN(posix_api->read_fn = dlsym(handle, "read")); ++ CHECK_DLSYM_RET_RETURN(posix_api->readv_fn = dlsym(handle, "readv")); + CHECK_DLSYM_RET_RETURN(posix_api->write_fn = dlsym(handle, "write")); ++ CHECK_DLSYM_RET_RETURN(posix_api->writev_fn = dlsym(handle, "writev")); + CHECK_DLSYM_RET_RETURN(posix_api->recv_fn = dlsym(handle, "recv")); + CHECK_DLSYM_RET_RETURN(posix_api->send_fn = dlsym(handle, "send")); + CHECK_DLSYM_RET_RETURN(posix_api->recv_msg = dlsym(handle, "recvmsg")); +diff --git a/src/include/posix_api.h b/src/include/posix_api.h +index e958ded..a73e2ec 100644 +--- a/src/include/posix_api.h ++++ b/src/include/posix_api.h +@@ -54,7 +54,9 @@ typedef struct { + int (*close_fn)(int fd); + pid_t (*fork_fn)(void); + ssize_t (*read_fn)(int fd, void *mem, size_t len); ++ ssize_t (*readv_fn)(int s, const struct iovec *iov, int iovcnt); + ssize_t (*write_fn)(int fd, const void *data, size_t len); ++ ssize_t (*writev_fn)(int s, const struct iovec *iov, int iovcnt); + ssize_t (*recv_fn)(int sockfd, void *buf, size_t len, int flags); + ssize_t (*send_fn)(int sockfd, const void *buf, size_t len, int flags); + ssize_t (*recv_msg)(int sockfd, const struct msghdr *msg, int flags); +-- +2.33.0 + diff --git a/0036-add-fs-secure-compilation-option.patch b/0036-add-fs-secure-compilation-option.patch new file mode 100644 index 0000000..3021f6e --- /dev/null +++ b/0036-add-fs-secure-compilation-option.patch @@ -0,0 +1,25 @@ +From c2c7c2f5bbf84f62acc6468113b1f11cdc6b8410 Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Sat, 22 Oct 2022 16:05:37 +0800 +Subject: [PATCH] add fs secure compilation option + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 1676a71..f445601 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -4,7 +4,7 @@ ROOT_DIR := $(dir $(abspath $(LWIP_DIR))) + LWIP_INC = $(LWIP_DIR)/include + DPDK_INCLUDE_FILE ?= /usr/include/dpdk + +-SEC_FLAGS = -fstack-protector-strong -Werror -Wall -Wl,-z,relro,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIC ++SEC_FLAGS = -fstack-protector-strong -Werror -Wall -Wl,-z,relro,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIC -D_FORTIRY_SOURCE=2 -O2 + + CC = gcc + AR = ar +-- +2.23.0 + diff --git a/0037-enable-ARP-QUEUE-to-avoid-sync-packet-dropped.patch b/0037-enable-ARP-QUEUE-to-avoid-sync-packet-dropped.patch new file mode 100644 index 0000000..ea99146 --- /dev/null +++ b/0037-enable-ARP-QUEUE-to-avoid-sync-packet-dropped.patch @@ -0,0 +1,27 @@ +From 2acba8aecef2140045a8ae50b05f9f36f5dc865f Mon Sep 17 00:00:00 2001 +From: jiangheng +Date: Wed, 23 Nov 2022 09:37:34 +0800 +Subject: [PATCH] enable ARP QUEUE to avoid sync packet dropped + +--- + src/include/lwipopts.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index 7459991..a5add21 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -169,6 +169,10 @@ + + #define ARP_TABLE_SIZE 512 + ++#define ARP_QUEUEING 1 ++ ++#define ARP_QUEUE_LEN 32 ++ + /* --------------------------------------- + * ------- NIC offloads -------- + * --------------------------------------- +-- +2.23.0 + diff --git a/0038-add-tso.patch b/0038-add-tso.patch new file mode 100644 index 0000000..457efe8 --- /dev/null +++ b/0038-add-tso.patch @@ -0,0 +1,380 @@ +From af8ac36acb103aa27b498dafa0ae8ba4332faac8 Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Sat, 3 Dec 2022 21:38:09 +0800 +Subject: [PATCH] add-tso + +--- + src/core/ipv4/etharp.c | 17 +++- + src/core/ipv4/ip4.c | 10 ++- + src/core/tcp.c | 6 ++ + src/core/tcp_out.c | 178 +++++++++++++++++++++++++++++++++++++-- + src/include/dpdk_cksum.h | 2 +- + src/include/lwip/pbuf.h | 8 +- + src/include/lwipopts.h | 4 + + 7 files changed, 211 insertions(+), 14 deletions(-) + +diff --git a/src/core/ipv4/etharp.c b/src/core/ipv4/etharp.c +index effb7db..f1903e4 100644 +--- a/src/core/ipv4/etharp.c ++++ b/src/core/ipv4/etharp.c +@@ -482,6 +482,13 @@ etharp_update_arp_entry(struct netif *netif, const ip4_addr_t *ipaddr, struct et + struct pbuf *p = arp_table[i].q; + arp_table[i].q = NULL; + #endif /* ARP_QUEUEING */ ++#if USE_LIBOS ++ struct pbuf *tmp = p->next; ++ while (tmp != NULL) { ++ tmp->ref--; ++ tmp = tmp->next; ++ } ++#endif + /* send the queued IP packet */ + ethernet_output(netif, p, (struct eth_addr *)(netif->hwaddr), ethaddr, ETHTYPE_IP); + /* free the queued IP packet */ +@@ -1027,7 +1034,15 @@ etharp_query(struct netif *netif, const ip4_addr_t *ipaddr, struct pbuf *q) + } else { + /* referencing the old pbuf is enough */ + p = q; +- pbuf_ref(p); ++#if USE_LIBOS ++ struct pbuf *tmp = p; ++ while (tmp != NULL) { ++ pbuf_ref(tmp); ++ tmp = tmp->next; ++ } ++#else ++ pbuf_ref(p); ++#endif + } + /* packet could be taken over? */ + if (p != NULL) { +diff --git a/src/core/ipv4/ip4.c b/src/core/ipv4/ip4.c +index 1334cdc..d823491 100644 +--- a/src/core/ipv4/ip4.c ++++ b/src/core/ipv4/ip4.c +@@ -1034,9 +1034,15 @@ ip4_output_if_opt_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *d + #endif /* ENABLE_LOOPBACK */ + #if IP_FRAG + /* don't fragment if interface has mtu set to 0 [loopif] */ +- if (netif->mtu && (p->tot_len > netif->mtu)) { +- return ip4_frag(p, netif, dest); ++#if USE_LIBOS ++ if (!(get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_TSO)) { ++#endif ++ if (netif->mtu && (p->tot_len > netif->mtu)) { ++ return ip4_frag(p, netif, dest); ++ } ++#if USE_LIBOS + } ++#endif + #endif /* IP_FRAG */ + + LWIP_DEBUGF(IP_DEBUG, ("ip4_output_if: call netif->output()\n")); +diff --git a/src/core/tcp.c b/src/core/tcp.c +index 7c18408..51ada38 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -1756,7 +1756,9 @@ tcp_seg_free(struct tcp_seg *seg) + seg->p = NULL; + #endif /* TCP_DEBUG */ + } ++#if !USE_LIBOS + memp_free(MEMP_TCP_SEG, seg); ++#endif + } + } + +@@ -1792,10 +1794,14 @@ tcp_seg_copy(struct tcp_seg *seg) + + LWIP_ASSERT("tcp_seg_copy: invalid seg", seg != NULL); + ++#if USE_LIBOS ++ cseg = (struct tcp_seg *)((uint8_t *)seg->p + sizeof(struct pbuf_custom)); ++#else + cseg = (struct tcp_seg *)memp_malloc(MEMP_TCP_SEG); + if (cseg == NULL) { + return NULL; + } ++#endif + SMEMCPY((u8_t *)cseg, (const u8_t *)seg, sizeof(struct tcp_seg)); + pbuf_ref(cseg->p); + return cseg; +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index 2834ba3..ee6f40b 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -161,6 +161,40 @@ tcp_route(const struct tcp_pcb *pcb, const ip_addr_t *src, const ip_addr_t *dst) + * The TCP header is filled in except ackno and wnd. + * p is freed on failure. + */ ++#if USE_LIBOS ++void tcp_init_segment(struct tcp_seg *seg, const struct tcp_pcb *pcb, struct pbuf *p, u8_t hdrflags, ++ u32_t seqno, u8_t optflags) ++{ ++ u8_t optlen = LWIP_TCP_OPT_LENGTH_SEGMENT(optflags, pcb); ++ ++ seg->flags = optflags; ++ seg->next = NULL; ++ seg->p = p; ++ seg->len = p->tot_len - optlen; ++ ++ /* build TCP header */ ++ pbuf_add_header(p, TCP_HLEN); ++ seg->tcphdr = (struct tcp_hdr *)seg->p->payload; ++ seg->tcphdr->src = lwip_htons(pcb->local_port); ++ seg->tcphdr->dest = lwip_htons(pcb->remote_port); ++ seg->tcphdr->seqno = lwip_htonl(seqno); ++ ++ TCPH_HDRLEN_FLAGS_SET(seg->tcphdr, (TCP_HLEN + optlen) / 4, hdrflags); ++ seg->tcphdr->urgp = 0; ++} ++ ++static struct tcp_seg * ++tcp_create_segment(const struct tcp_pcb *pcb, struct pbuf *p, u8_t hdrflags, u32_t seqno, u8_t optflags) ++{ ++ struct tcp_seg *seg; ++ ++ seg = (struct tcp_seg *)((uint8_t *)p + sizeof(struct pbuf_custom)); ++ ++ tcp_init_segment(seg, pcb, p, hdrflags, seqno, optflags); ++ ++ return seg; ++} ++#else + static struct tcp_seg * + tcp_create_segment(const struct tcp_pcb *pcb, struct pbuf *p, u8_t hdrflags, u32_t seqno, u8_t optflags) + { +@@ -210,6 +244,7 @@ tcp_create_segment(const struct tcp_pcb *pcb, struct pbuf *p, u8_t hdrflags, u32 + seg->tcphdr->urgp = 0; + return seg; + } ++#endif + + /** + * Allocate a PBUF_RAM pbuf, perhaps with extra space at the end. +@@ -1272,6 +1307,60 @@ tcp_build_wnd_scale_option(u32_t *opts) + } + #endif + ++#if USE_LIBOS ++static struct tcp_seg *tcp_output_over(struct tcp_pcb *pcb, struct tcp_seg *seg, struct tcp_seg *useg) ++{ ++ if (TCP_TCPLEN(seg) > 0) { ++ seg->next = NULL; ++ if (useg == NULL) { ++ pcb->unacked = seg; ++ useg = seg; ++ } else { ++ if (TCP_SEQ_LT(lwip_ntohl(seg->tcphdr->seqno), lwip_ntohl(useg->tcphdr->seqno))) { ++ /* add segment to before tail of unacked list, keeping the list sorted */ ++ struct tcp_seg **cur_seg = &(pcb->unacked); ++ while (*cur_seg && ++ TCP_SEQ_LT(lwip_ntohl((*cur_seg)->tcphdr->seqno), lwip_ntohl(seg->tcphdr->seqno))) { ++ cur_seg = &((*cur_seg)->next ); ++ } ++ seg->next = (*cur_seg); ++ (*cur_seg) = seg; ++ } else { ++ /* add segment to tail of unacked list */ ++ useg->next = seg; ++ useg = seg; ++ } ++ } ++ } else { ++ tcp_seg_free(seg); ++ } ++ ++ return useg; ++} ++static err_t tcp_output_seg(struct tcp_pcb *pcb, struct tcp_seg *seg, struct netif *netif, u32_t snd_nxt) ++{ ++ if (pcb->state != SYN_SENT) { ++ TCPH_SET_FLAG(seg->tcphdr, TCP_ACK); ++ } ++ ++ err_t err = tcp_output_segment(seg, pcb, netif); ++ if (err != ERR_OK) { ++ /* segment could not be sent, for whatever reason */ ++ tcp_set_flags(pcb, TF_NAGLEMEMERR); ++ return err; ++ } ++ ++ if (pcb->state != SYN_SENT) { ++ tcp_clear_flags(pcb, TF_ACK_DELAY | TF_ACK_NOW); ++ } ++ ++ if (TCP_SEQ_LT(pcb->snd_nxt, snd_nxt)) { ++ pcb->snd_nxt = snd_nxt; ++ } ++ ++ return ERR_OK; ++} ++#endif + /** + * @ingroup tcp_raw + * Find out what we can send and send it +@@ -1376,16 +1465,88 @@ tcp_output(struct tcp_pcb *pcb) + for (; useg->next != NULL; useg = useg->next); + } + /* data available and window allows it to be sent? */ ++ + #if USE_LIBOS +- /* avoid send cose too much time, limit send pkts num max 10 */ +- uint16_t send_pkt = 0; +- while (seg != NULL && send_pkt < 10 && +- lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { +- send_pkt++; +-#else ++ if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_TSO) { ++ while(seg) { ++ /** ++ * 1）遍历unsent队列，找到所有的待发送seg. 将seg的buf串起来 ++ * 2) 生成新的seg, 调用tcp_output_segment, 新的seg释放掉 ++ * 3) 若成功，则更新snd_nxt, unacked队列，和unsent队列。 ++ */ ++ struct tcp_seg *start_seg = seg; ++ struct pbuf *first_pbuf = NULL; ++ struct pbuf *pre_pbuf = NULL; ++ u8_t pbuf_chain_len = 0; ++ u32_t next_seqno = lwip_ntohl(seg->tcphdr->seqno); ++ while (seg != NULL && pbuf_chain_len < MAX_PBUF_CHAIN_LEN) { ++ u32_t seg_seqno = lwip_ntohl(seg->tcphdr->seqno); ++ if (seg_seqno - pcb->lastack + seg->len > wnd) { ++ if (first_pbuf) ++ break; ++ else ++ goto output_done; ++ } ++ ++ if ((tcp_do_output_nagle(pcb) == 0) && ((pcb->flags & (TF_NAGLEMEMERR | TF_FIN)) == 0)) { ++ if (first_pbuf) ++ break; ++ else ++ goto output_done; ++ } ++ ++ if (seg->len < TCP_MSS || next_seqno != seg_seqno || pbuf_chain_len >= MAX_PBUF_CHAIN_LEN) { ++ break; ++ } ++ if (first_pbuf == NULL && (seg->next == NULL || seg->next->len < TCP_MSS)) { ++ break; ++ } ++ ++ pbuf_remove_header(seg->p, seg->p->tot_len - seg->len); ++ if (first_pbuf == NULL) { ++ first_pbuf = seg->p; ++ } else { ++ first_pbuf->tot_len += seg->p->len; ++ pre_pbuf->next = seg->p; ++ } ++ ++ pre_pbuf = seg->p; ++ next_seqno = seg_seqno + seg->len; ++ seg = seg->next; ++ pcb->unsent = seg; ++ pbuf_chain_len++; ++ } ++ ++ if (first_pbuf == NULL) { ++ err = tcp_output_seg(pcb, seg, netif, next_seqno + seg->len); ++ if (err != ERR_OK) ++ return err; ++ pcb->unsent = seg->next; ++ useg = tcp_output_over(pcb, seg, useg); ++ seg = pcb->unsent; ++ continue; ++ } ++ ++ struct tcp_seg new_seg; ++ tcp_init_segment(&new_seg, pcb, first_pbuf, 0, lwip_ntohl(start_seg->tcphdr->seqno), 0); ++ ++ err = tcp_output_seg(pcb, &new_seg, netif, next_seqno); ++ ++ for (u32_t i = 0; i < pbuf_chain_len; i++) { ++ struct tcp_seg *next_seg = start_seg->next; ++ start_seg->p->next = NULL; ++ useg = tcp_output_over(pcb, start_seg, useg); ++ start_seg = next_seg; ++ } ++ ++ pbuf_remove_header(new_seg.p, new_seg.p->tot_len - new_seg.len - TCPH_HDRLEN_BYTES(new_seg.tcphdr)); ++ new_seg.p->tot_len = new_seg.p->len; ++ } ++ } else ++#endif ++{ + while (seg != NULL && + lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { +-#endif + LWIP_ASSERT("RST not expected here!", + (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0); + /* Stop sending if the nagle algorithm would prevent it +@@ -1462,6 +1623,7 @@ tcp_output(struct tcp_pcb *pcb) + } + seg = pcb->unsent; + } ++} + #if TCP_OVERSIZE + if (pcb->unsent == NULL) { + /* last unsent has been removed, reset unsent_oversize */ +@@ -1627,7 +1789,7 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) { + #if CHECKSUM_GEN_TCP_HW + if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_CKSUM) { +- tcph_cksum_set(seg->p, TCP_HLEN); ++ tcph_cksum_set(seg->p, TCPH_HDRLEN_BYTES(seg->tcphdr)); + seg->tcphdr->chksum = ip_chksum_pseudo_offload(IP_PROTO_TCP,seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip); + } else { + #if TCP_CHECKSUM_ON_COPY +diff --git a/src/include/dpdk_cksum.h b/src/include/dpdk_cksum.h +index e57be4d..83c9c38 100644 +--- a/src/include/dpdk_cksum.h ++++ b/src/include/dpdk_cksum.h +@@ -78,7 +78,7 @@ static inline void iph_cksum_set(struct pbuf *p, u16_t len, bool do_ipcksum) { + #include + + static inline void tcph_cksum_set(struct pbuf *p, u16_t len) { +- (void)len; ++ p->l4_len = len; + p->ol_flags |= RTE_MBUF_F_TX_TCP_CKSUM; + } + +diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h +index 87cd960..ef879da 100644 +--- a/src/include/lwip/pbuf.h ++++ b/src/include/lwip/pbuf.h +@@ -223,10 +223,14 @@ struct pbuf { + #if USE_LIBOS && CHECKSUM_OFFLOAD_ALL + /** checksum offload ol_flags */ + u64_t ol_flags; +- /** checksum offload l2_len */ ++ /* < L2 (MAC) Header Length for non-tunneling pkt. */ + u64_t l2_len:7; +- /** checksum offload l3_len */ ++ /* < L3 (IP) Header Length. */ + u64_t l3_len:9; ++ /* < L4 (TCP/UDP) Header Length. */ ++ u64_t l4_len:8; ++ u16_t header_off; ++ u8_t rexmit; + #endif /* USE_LIBOS CHECKSUM_OFFLOAD_SWITCH */ + + /** In case the user needs to store data custom data on a pbuf */ +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index a5add21..7c819d0 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -173,6 +173,10 @@ + + #define ARP_QUEUE_LEN 32 + ++#define MAX_PBUF_CHAIN_LEN 40 ++ ++#define MIN_TSO_SEG_LEN 256 ++ + /* --------------------------------------- + * ------- NIC offloads -------- + * --------------------------------------- +-- +2.23.0 + diff --git a/0039-optimize-app-thread-write-buff-block.patch b/0039-optimize-app-thread-write-buff-block.patch new file mode 100644 index 0000000..42280e3 --- /dev/null +++ b/0039-optimize-app-thread-write-buff-block.patch @@ -0,0 +1,94 @@ +From be541628552ccc3a8dcd3c6ad6e5a1aed07c4928 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Sat, 3 Dec 2022 20:35:34 +0800 +Subject: [PATCH 2/2] fix app thread write fail + +--- + src/core/tcp_out.c | 2 +- + src/include/lwip/pbuf.h | 3 +++ + src/include/lwipsock.h | 33 +++++++++++++++++++++++---------- + 3 files changed, 27 insertions(+), 11 deletions(-) + +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index ee6f40b..f53750b 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -763,7 +763,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + + pos += seglen; + #if USE_LIBOS +- write_lwip_over((struct lwip_sock*)arg, 1); ++ write_lwip_over((struct lwip_sock*)arg); + #endif + } + +diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h +index ef879da..10e2af9 100644 +--- a/src/include/lwip/pbuf.h ++++ b/src/include/lwip/pbuf.h +@@ -231,6 +231,9 @@ struct pbuf { + u64_t l4_len:8; + u16_t header_off; + u8_t rexmit; ++ u8_t in_write; ++ u8_t head; ++ struct pbuf *last; + #endif /* USE_LIBOS CHECKSUM_OFFLOAD_SWITCH */ + + /** In case the user needs to store data custom data on a pbuf */ +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 2ffb077..f919330 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -93,17 +93,30 @@ struct lwip_sock { + #endif + + #if USE_LIBOS +- struct pbuf *send_lastdata; +- uint16_t send_datalen; +- volatile uint32_t events __rte_cache_aligned; /* available events */ +- struct pbuf *recv_lastdata __rte_cache_aligned; /* unread data in one pbuf */ +- struct list_node recv_list __rte_cache_aligned; +- struct list_node event_list __rte_cache_aligned; +- struct list_node send_list __rte_cache_aligned; +- uint32_t in_send __rte_cache_aligned; /* avoid sock too much send rpc msg*/ ++ char pad0 __rte_cache_aligned; ++ /* app thread use */ ++ struct pbuf *recv_lastdata; /* unread data in one pbuf */ ++ uint16_t remain_len; + uint32_t epoll_events; /* registered events, EPOLLONESHOT write frequently */ +- char pad __rte_cache_aligned; ++ volatile uint32_t events; /* available events */ ++ struct list_node event_list; ++ ++ char pad1 __rte_cache_aligned; ++ /* app and stack thread all use */ ++ uint32_t in_send; /* avoid sock too much send rpc msg*/ ++ pthread_spinlock_t sock_lock; ++ ++ char pad2 __rte_cache_aligned; ++ /* stack thread all use */ ++ struct list_node recv_list; ++ struct list_node send_list; ++ struct pbuf *send_lastdata; ++ struct pbuf *send_pre_del; ++ uint64_t recv_all; ++ uint64_t send_all; + ++ char pad3 __rte_cache_aligned; ++ /* nerver change */ + struct wakeup_poll *wakeup; + epoll_data_t ep_data; + struct lwip_sock *listen_next; /* listenfd list */ +@@ -131,7 +144,7 @@ extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apifla + extern struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); + extern void gazelle_init_sock(int32_t fd); + extern void gazelle_clean_sock(int32_t fd); +-extern void write_lwip_over(struct lwip_sock *sock, uint32_t n); ++extern void write_lwip_over(struct lwip_sock *sock); + #endif /* USE_LIBOS */ + + struct lwip_sock *get_socket(int s); +-- +2.8.4.windows.1 + diff --git a/0040-add-huge-snd_buf.patch b/0040-add-huge-snd_buf.patch new file mode 100644 index 0000000..73fa142 --- /dev/null +++ b/0040-add-huge-snd_buf.patch @@ -0,0 +1,86 @@ +diff -Nur lwip-2.1.3-org/src/core/init.c lwip-2.1.3/src/core/init.c +--- lwip-2.1.3-org/src/core/init.c 2022-12-06 14:40:45.280000000 +0000 ++++ lwip-2.1.3/src/core/init.c 2022-12-06 14:41:01.452000000 +0000 +@@ -306,7 +306,7 @@ + #if TCP_SNDLOWAT >= TCP_SND_BUF + #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must be less than TCP_SND_BUF. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error." + #endif +-#if TCP_SNDLOWAT >= (0xFFFF - (4 * TCP_MSS)) ++#if TCP_SNDLOWAT >= (0xFFFFFFFF - (4 * TCP_MSS)) + #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must at least be 4*MSS below u16_t overflow!" + #endif + #if TCP_SNDQUEUELOWAT >= TCP_SND_QUEUELEN +diff -Nur lwip-2.1.3-org/src/core/pbuf.c lwip-2.1.3/src/core/pbuf.c +--- lwip-2.1.3-org/src/core/pbuf.c 2022-12-06 14:40:45.280000000 +0000 ++++ lwip-2.1.3/src/core/pbuf.c 2022-12-06 14:46:04.860000000 +0000 +@@ -869,13 +869,13 @@ + /* proceed to last pbuf of chain */ + for (p = h; p->next != NULL; p = p->next) { + /* add total length of second chain to all totals of first chain */ +- p->tot_len = (u16_t)(p->tot_len + t->tot_len); ++ p->tot_len = p->tot_len + t->tot_len; + } + /* { p is last pbuf of first h chain, p->next == NULL } */ + LWIP_ASSERT("p->tot_len == p->len (of last pbuf in chain)", p->tot_len == p->len); + LWIP_ASSERT("p->next == NULL", p->next == NULL); + /* add total length of second chain to last pbuf total of first chain */ +- p->tot_len = (u16_t)(p->tot_len + t->tot_len); ++ p->tot_len = p->tot_len + t->tot_len; + /* chain last pbuf of head (p) with first of tail (t) */ + p->next = t; + /* p->next now references t, but the caller will drop its reference to t, +@@ -1181,7 +1181,7 @@ + if (r != NULL) { + /* Update the tot_len field in the first part */ + for (i = p; i != NULL; i = i->next) { +- i->tot_len = (u16_t)(i->tot_len - r->tot_len); ++ i->tot_len = tot_len_front; + LWIP_ASSERT("tot_len/len mismatch in last pbuf", + (i->next != NULL) || (i->tot_len == i->len)); + } +@@ -1192,6 +1192,9 @@ + /* tot_len field in rest does not need modifications */ + /* reference counters do not need modifications */ + *rest = r; ++ r->tot_len = r->len; ++ }else{ ++ p->tot_len = tot_len_front; + } + } + } +diff -Nur lwip-2.1.3-org/src/include/lwip/opt.h lwip-2.1.3/src/include/lwip/opt.h +--- lwip-2.1.3-org/src/include/lwip/opt.h 2022-12-06 14:40:45.292000000 +0000 ++++ lwip-2.1.3/src/include/lwip/opt.h 2022-12-06 14:41:01.456000000 +0000 +@@ -1482,7 +1482,7 @@ + * send window while having a small receive window only. + */ + #if !defined LWIP_WND_SCALE || defined __DOXYGEN__ +-#define LWIP_WND_SCALE 0 ++#define LWIP_WND_SCALE 1 + #define TCP_RCV_SCALE 0 + #endif + +diff -Nur lwip-2.1.3-org/src/include/lwip/pbuf.h lwip-2.1.3/src/include/lwip/pbuf.h +--- lwip-2.1.3-org/src/include/lwip/pbuf.h 2022-12-06 14:40:45.284000000 +0000 ++++ lwip-2.1.3/src/include/lwip/pbuf.h 2022-12-06 14:46:36.720000000 +0000 +@@ -197,7 +197,7 @@ + * For non-queue packet chains this is the invariant: + * p->tot_len == p->len + (p->next? p->next->tot_len: 0) + */ +- u16_t tot_len; ++ u32_t tot_len; + + /** length of this buffer */ + u16_t len; +diff -Nur lwip-2.1.3-org/src/include/lwipopts.h lwip-2.1.3/src/include/lwipopts.h +--- lwip-2.1.3-org/src/include/lwipopts.h 2022-12-06 14:40:45.292000000 +0000 ++++ lwip-2.1.3/src/include/lwipopts.h 2022-12-06 14:41:01.456000000 +0000 +@@ -97,7 +97,7 @@ + + #define TCP_WND (40 * TCP_MSS) + +-#define TCP_SND_BUF (40 * TCP_MSS) ++#define TCP_SND_BUF (2500 * TCP_MSS) + + #define TCP_SND_QUEUELEN (8191) + diff --git a/0041-optimite-pcb-list-limit-send-size-and-ack-now.patch b/0041-optimite-pcb-list-limit-send-size-and-ack-now.patch new file mode 100644 index 0000000..0ca6a88 --- /dev/null +++ b/0041-optimite-pcb-list-limit-send-size-and-ack-now.patch @@ -0,0 +1,374 @@ +From 08716b71ccb93c6d998d1654c1fac137f29d2851 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Tue, 13 Dec 2022 22:27:33 +0800 +Subject: [PATCH] optimite pcb-list limit , send size and ack now + +--- + src/core/tcp.c | 1 + + src/core/tcp_in.c | 16 +++++++- + src/core/tcp_out.c | 103 ++++++++++++++++++++++++++++++------------------- + src/include/lwip/opt.h | 2 +- + src/include/lwip/tcp.h | 2 + + src/include/lwipsock.h | 2 - + 6 files changed, 83 insertions(+), 43 deletions(-) + +diff --git a/src/core/tcp.c b/src/core/tcp.c +index 51ada38..cb08f95 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -2297,6 +2297,7 @@ tcp_pcb_purge(struct tcp_pcb *pcb) + tcp_segs_free(pcb->unsent); + tcp_segs_free(pcb->unacked); + pcb->unacked = pcb->unsent = NULL; ++ pcb->last_unacked = pcb->last_unsent = NULL; + #if TCP_OVERSIZE + pcb->unsent_oversize = 0; + #endif /* TCP_OVERSIZE */ +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index 2d6cb6a..78954bd 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -976,8 +976,14 @@ tcp_process(struct tcp_pcb *pcb) + rseg = pcb->unsent; + LWIP_ASSERT("no segment to free", rseg != NULL); + pcb->unsent = rseg->next; ++ if (pcb->last_unsent == rseg) { ++ pcb->last_unsent = rseg->next; ++ } + } else { + pcb->unacked = rseg->next; ++ if (pcb->last_unacked == rseg) { ++ pcb->last_unacked = rseg->next; ++ } + } + tcp_seg_free(rseg); + +@@ -1393,6 +1399,8 @@ tcp_receive(struct tcp_pcb *pcb) + /* Remove segment from the unacknowledged list if the incoming + ACK acknowledges them. */ + pcb->unacked = tcp_free_acked_segments(pcb, pcb->unacked, "unacked", pcb->unsent); ++ if (pcb->unacked == NULL) ++ pcb->last_unacked = NULL; + /* We go through the ->unsent list to see if any of the segments + on the list are acknowledged by the ACK. This may seem + strange since an "unsent" segment shouldn't be acked. The +@@ -1400,6 +1408,8 @@ tcp_receive(struct tcp_pcb *pcb) + ->unsent list after a retransmission, so these segments may + in fact have been sent once. */ + pcb->unsent = tcp_free_acked_segments(pcb, pcb->unsent, "unsent", pcb->unacked); ++ if (pcb->unsent == NULL) ++ pcb->last_unsent = NULL; + + /* If there's nothing left to acknowledge, stop the retransmit + timer, otherwise reset it to start again */ +@@ -1736,7 +1746,11 @@ tcp_receive(struct tcp_pcb *pcb) + + + /* Acknowledge the segment(s). */ +- tcp_ack(pcb); ++ if (flags & TCP_PSH) { ++ tcp_ack_now(pcb); ++ } else { ++ tcp_ack(pcb); ++ } + + #if LWIP_TCP_SACK_OUT + if (LWIP_TCP_SACK_VALID(pcb, 0)) { +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index f53750b..55053d8 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -631,11 +631,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + #endif /* TCP_OVERSIZE */ + } + #else /* USE_LIBOS */ +- if (pcb->unsent != NULL) { +- /* @todo: this could be sped up by keeping last_unsent in the pcb */ +- for (last_unsent = pcb->unsent; last_unsent->next != NULL; +- last_unsent = last_unsent->next); +- } ++ last_unsent = pcb->last_unsent; + #endif /* USE_LIBOS */ + + /* +@@ -851,6 +847,9 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) + * Finally update the pcb state. + */ + #if USE_LIBOS ++ if (queue) { ++ pcb->last_unsent = prev_seg; ++ } + pcb->snd_lbb += pos; + pcb->snd_buf -= pos; + #else +@@ -1050,6 +1049,8 @@ tcp_split_unsent_seg(struct tcp_pcb *pcb, u16_t split) + /* Finally insert remainder into queue after split (which stays head) */ + seg->next = useg->next; + useg->next = seg; ++ if (pcb->last_unsent == useg) ++ pcb->last_unsent = seg; + + #if TCP_OVERSIZE + /* If remainder is last segment on the unsent, ensure we clear the oversize amount +@@ -1086,9 +1087,7 @@ tcp_send_fin(struct tcp_pcb *pcb) + + /* first, try to add the fin to the last unsent segment */ + if (pcb->unsent != NULL) { +- struct tcp_seg *last_unsent; +- for (last_unsent = pcb->unsent; last_unsent->next != NULL; +- last_unsent = last_unsent->next); ++ struct tcp_seg *last_unsent = pcb->unsent; + + if ((TCPH_FLAGS(last_unsent->tcphdr) & (TCP_SYN | TCP_FIN | TCP_RST)) == 0) { + /* no SYN/FIN/RST flag in the header, we can add the FIN flag */ +@@ -1182,10 +1181,10 @@ tcp_enqueue_flags(struct tcp_pcb *pcb, u8_t flags) + if (pcb->unsent == NULL) { + pcb->unsent = seg; + } else { +- struct tcp_seg *useg; +- for (useg = pcb->unsent; useg->next != NULL; useg = useg->next); ++ struct tcp_seg *useg = pcb->last_unsent; + useg->next = seg; + } ++ pcb->last_unsent = seg; + #if TCP_OVERSIZE + /* The new unsent tail has no space */ + pcb->unsent_oversize = 0; +@@ -1314,6 +1313,7 @@ static struct tcp_seg *tcp_output_over(struct tcp_pcb *pcb, struct tcp_seg *seg, + seg->next = NULL; + if (useg == NULL) { + pcb->unacked = seg; ++ pcb->last_unacked = seg; + useg = seg; + } else { + if (TCP_SEQ_LT(lwip_ntohl(seg->tcphdr->seqno), lwip_ntohl(useg->tcphdr->seqno))) { +@@ -1329,6 +1329,7 @@ static struct tcp_seg *tcp_output_over(struct tcp_pcb *pcb, struct tcp_seg *seg, + /* add segment to tail of unacked list */ + useg->next = seg; + useg = seg; ++ pcb->last_unacked = seg; + } + } + } else { +@@ -1460,15 +1461,14 @@ tcp_output(struct tcp_pcb *pcb) + pcb->persist_backoff = 0; + + /* useg should point to last segment on unacked queue */ +- useg = pcb->unacked; +- if (useg != NULL) { +- for (; useg->next != NULL; useg = useg->next); +- } ++ useg = pcb->last_unacked; ++ + /* data available and window allows it to be sent? */ + ++ u32_t send_len = 0; + #if USE_LIBOS + if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_TSO) { +- while(seg) { ++ while(seg && send_len < 0xffff) { + /** + * 1）遍历unsent队列，找到所有的待发送seg. 将seg的buf串起来 + * 2) 生成新的seg, 调用tcp_output_segment, 新的seg释放掉 +@@ -1510,6 +1510,7 @@ tcp_output(struct tcp_pcb *pcb) + pre_pbuf->next = seg->p; + } + ++ send_len += seg->len; + pre_pbuf = seg->p; + next_seqno = seg_seqno + seg->len; + seg = seg->next; +@@ -1519,8 +1520,11 @@ tcp_output(struct tcp_pcb *pcb) + + if (first_pbuf == NULL) { + err = tcp_output_seg(pcb, seg, netif, next_seqno + seg->len); +- if (err != ERR_OK) ++ if (err != ERR_OK) { ++ if (pcb->unsent == NULL) ++ pcb->last_unsent = NULL; + return err; ++ } + pcb->unsent = seg->next; + useg = tcp_output_over(pcb, seg, useg); + seg = pcb->unsent; +@@ -1545,7 +1549,7 @@ tcp_output(struct tcp_pcb *pcb) + } else + #endif + { +- while (seg != NULL && ++ while (seg != NULL && send_len < 0xffff && + lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { + LWIP_ASSERT("RST not expected here!", + (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0); +@@ -1560,6 +1564,7 @@ tcp_output(struct tcp_pcb *pcb) + ((pcb->flags & (TF_NAGLEMEMERR | TF_FIN)) == 0)) { + break; + } ++ send_len += seg->len; + #if TCP_CWND_DEBUG + LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_output: snd_wnd %"TCPWNDSIZE_F", cwnd %"TCPWNDSIZE_F", wnd %"U32_F", effwnd %"U32_F", seq %"U32_F", ack %"U32_F", i %"S16_F"\n", + pcb->snd_wnd, pcb->cwnd, wnd, +@@ -1577,6 +1582,8 @@ tcp_output(struct tcp_pcb *pcb) + if (err != ERR_OK) { + /* segment could not be sent, for whatever reason */ + tcp_set_flags(pcb, TF_NAGLEMEMERR); ++ if (pcb->unsent == NULL) ++ pcb->last_unsent = NULL; + return err; + } + #if TCP_OVERSIZE_DBGCHECK +@@ -1596,6 +1603,7 @@ tcp_output(struct tcp_pcb *pcb) + /* unacked list is empty? */ + if (pcb->unacked == NULL) { + pcb->unacked = seg; ++ pcb->last_unacked = seg; + useg = seg; + /* unacked list is not empty? */ + } else { +@@ -1615,6 +1623,7 @@ tcp_output(struct tcp_pcb *pcb) + /* add segment to tail of unacked list */ + useg->next = seg; + useg = useg->next; ++ pcb->last_unacked = seg; + } + } + /* do not queue empty segments on the unacked list */ +@@ -1632,6 +1641,8 @@ tcp_output(struct tcp_pcb *pcb) + #endif /* TCP_OVERSIZE */ + + output_done: ++ if (pcb->unsent == NULL) ++ pcb->last_unsent = NULL; + tcp_clear_flags(pcb, TF_NAGLEMEMERR); + return ERR_OK; + } +@@ -1932,9 +1943,13 @@ tcp_rexmit_rto_prepare(struct tcp_pcb *pcb) + } + #endif /* TCP_OVERSIZE_DBGCHECK */ + /* unsent queue is the concatenated queue (of unacked, unsent) */ ++ if (pcb->unsent == NULL) { ++ pcb->last_unsent = pcb->last_unacked; ++ } + pcb->unsent = pcb->unacked; + /* unacked queue is now empty */ + pcb->unacked = NULL; ++ pcb->last_unacked = NULL; + + /* Mark RTO in-progress */ + tcp_set_flags(pcb, TF_RTO); +@@ -2004,32 +2019,42 @@ tcp_rexmit(struct tcp_pcb *pcb) + } + + seg = pcb->unacked; ++ while (seg) { ++ /* Give up if the segment is still referenced by the netif driver ++ due to deferred transmission. */ ++ if (tcp_output_segment_busy(seg)) { ++ LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_rexmit busy\n")); ++ if (seg == pcb->unacked) ++ return ERR_VAL; ++ else ++ break; ++ } + +- /* Give up if the segment is still referenced by the netif driver +- due to deferred transmission. */ +- if (tcp_output_segment_busy(seg)) { +- LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_rexmit busy\n")); +- return ERR_VAL; +- } +- +- /* Move the first unacked segment to the unsent queue */ +- /* Keep the unsent queue sorted. */ +- pcb->unacked = seg->next; ++ /* Move the first unacked segment to the unsent queue */ ++ /* Keep the unsent queue sorted. */ ++ if (pcb->last_unacked == pcb->unacked) ++ pcb->last_unacked = pcb->unacked->next; ++ pcb->unacked = pcb->unacked->next; + +- cur_seg = &(pcb->unsent); +- while (*cur_seg && +- TCP_SEQ_LT(lwip_ntohl((*cur_seg)->tcphdr->seqno), lwip_ntohl(seg->tcphdr->seqno))) { +- cur_seg = &((*cur_seg)->next ); +- } +- seg->next = *cur_seg; +- *cur_seg = seg; ++ cur_seg = &(pcb->unsent); ++ while (*cur_seg && ++ TCP_SEQ_LT(lwip_ntohl((*cur_seg)->tcphdr->seqno), lwip_ntohl(seg->tcphdr->seqno))) { ++ cur_seg = &((*cur_seg)->next); ++ } ++ if (*cur_seg == NULL) ++ pcb->last_unsent = seg; ++ seg->next = *cur_seg; ++ *cur_seg = seg; + #if TCP_OVERSIZE +- if (seg->next == NULL) { +- /* the retransmitted segment is last in unsent, so reset unsent_oversize */ +- pcb->unsent_oversize = 0; +- } ++ if (seg->next == NULL) { ++ /* the retransmitted segment is last in unsent, so reset unsent_oversize */ ++ pcb->unsent_oversize = 0; ++ } + #endif /* TCP_OVERSIZE */ + ++ seg = pcb->unacked; ++ } ++ + if (pcb->nrtx < 0xFF) { + ++pcb->nrtx; + } +@@ -2207,7 +2232,7 @@ tcp_output_control_segment(const struct tcp_pcb *pcb, struct pbuf *p, + struct tcp_hdr *tcphdr = (struct tcp_hdr *)p->payload; + #if CHECKSUM_GEN_TCP_HW + if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_CKSUM) { +- tcph_cksum_set(p, TCP_HLEN); ++ tcph_cksum_set(p, TCPH_HDRLEN_BYTES(tcphdr)); + tcphdr->chksum = ip_chksum_pseudo_offload(IP_PROTO_TCP, p->tot_len, src, dst); + } else { + tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len, +diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h +index 8294cdd..83e7e93 100644 +--- a/src/include/lwip/opt.h ++++ b/src/include/lwip/opt.h +@@ -1281,7 +1281,7 @@ + * LWIP_TCP_SACK_OUT==1: TCP will support sending selective acknowledgements (SACKs). + */ + #if !defined LWIP_TCP_SACK_OUT || defined __DOXYGEN__ +-#define LWIP_TCP_SACK_OUT 0 ++#define LWIP_TCP_SACK_OUT 1 + #endif + + /** +diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h +index b36bf33..b0ae02c 100644 +--- a/src/include/lwip/tcp.h ++++ b/src/include/lwip/tcp.h +@@ -356,7 +356,9 @@ struct tcp_pcb { + + /* These are ordered by sequence number: */ + struct tcp_seg *unsent; /* Unsent (queued) segments. */ ++ struct tcp_seg *last_unsent; + struct tcp_seg *unacked; /* Sent but unacknowledged segments. */ ++ struct tcp_seg *last_unacked; + #if TCP_QUEUE_OOSEQ + struct tcp_seg *ooseq; /* Received out of sequence segments. */ + #endif /* TCP_QUEUE_OOSEQ */ +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index f919330..bf0d753 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -112,8 +112,6 @@ struct lwip_sock { + struct list_node send_list; + struct pbuf *send_lastdata; + struct pbuf *send_pre_del; +- uint64_t recv_all; +- uint64_t send_all; + + char pad3 __rte_cache_aligned; + /* nerver change */ +-- +2.8.4.windows.1 + diff --git a/0042-expand-recv-win.patch b/0042-expand-recv-win.patch new file mode 100644 index 0000000..38438ac --- /dev/null +++ b/0042-expand-recv-win.patch @@ -0,0 +1,39 @@ +From 288d56ebd68f366d3fa2ee1521120016fb21bf31 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Sat, 17 Dec 2022 19:14:36 +0800 +Subject: [PATCH 1/2] expand recv win + +--- + src/include/lwip/opt.h | 2 +- + src/include/lwipopts.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h +index 9d41a09..718816b 100644 +--- a/src/include/lwip/opt.h ++++ b/src/include/lwip/opt.h +@@ -1483,7 +1483,7 @@ + */ + #if !defined LWIP_WND_SCALE || defined __DOXYGEN__ + #define LWIP_WND_SCALE 1 +-#define TCP_RCV_SCALE 0 ++#define TCP_RCV_SCALE 6 + #endif + + /** +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index d7b9635..907c630 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -95,7 +95,7 @@ + + #define TCP_MSS (FRAME_MTU - IP_HLEN - TCP_HLEN) + +-#define TCP_WND (40 * TCP_MSS) ++#define TCP_WND (2500 * TCP_MSS) + + #define TCP_SND_BUF (2500 * TCP_MSS) + +-- +2.8.4.windows.1 + diff --git a/0043-add-prefetch.patch b/0043-add-prefetch.patch new file mode 100644 index 0000000..082503f --- /dev/null +++ b/0043-add-prefetch.patch @@ -0,0 +1,62 @@ +From 3d63cb611a0b7a3cde0bb9e74b0ec83501966c51 Mon Sep 17 00:00:00 2001 +From: wuchangsheng +Date: Sun, 18 Dec 2022 18:50:33 +0800 +Subject: [PATCH 2/2] add prefetch + +--- + src/core/pbuf.c | 7 +++++++ + src/core/tcp_out.c | 6 ++++++ + 2 files changed, 13 insertions(+) + +diff --git a/src/core/pbuf.c b/src/core/pbuf.c +index 404c8a7..ad75aa6 100644 +--- a/src/core/pbuf.c ++++ b/src/core/pbuf.c +@@ -83,6 +83,9 @@ + #if LWIP_CHECKSUM_ON_COPY + #include "lwip/inet_chksum.h" + #endif ++#if USE_LIBOS ++#include ++#endif + + #include + +@@ -750,6 +753,10 @@ pbuf_free(struct pbuf *p) + /* de-allocate all consecutive pbufs from the head of the chain that + * obtain a zero reference count after decrementing*/ + while (p != NULL) { ++#if USE_LIBOS ++ if (p->next) ++ rte_prefetch0(p->next); ++#endif + LWIP_PBUF_REF_T ref; + SYS_ARCH_DECL_PROTECT(old_level); + /* Since decrementing ref cannot be guaranteed to be a single machine operation +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index 55053d8..3c4dc4b 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -82,6 +82,7 @@ + + #if USE_LIBOS + #include "lwipsock.h" ++#include + #if CHECKSUM_GEN_TCP_HW + #include "dpdk_cksum.h" + #endif +@@ -1762,6 +1763,11 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif + } + #endif + ++#if USE_LIBOS ++ /* pbuf into mbuf. ref dpdk_common.h */ ++ rte_prefetch0((uint8_t *)(seg->p) - sizeof(struct rte_mbuf) - sizeof(uint64_t) * 2); ++#endif ++ + /* Set retransmission timer running if it is not currently enabled + This must be set before checking the route. */ + if (pcb->rtime < 0) { +-- +2.8.4.windows.1 + diff --git a/0044-skip-unnecessary-tcp_route.patch b/0044-skip-unnecessary-tcp_route.patch new file mode 100644 index 0000000..b93b7d5 --- /dev/null +++ b/0044-skip-unnecessary-tcp_route.patch @@ -0,0 +1,103 @@ +From b23520dcddbdf088ededeac7a0a1611db73db191 Mon Sep 17 00:00:00 2001 +From: kircher +Date: Mon, 19 Dec 2022 19:23:42 +0800 +Subject: [PATCH] skip unnecessary tcp_route + +--- + src/core/tcp.c | 1 + + src/core/tcp_out.c | 20 ++++++++++++++++---- + src/include/lwip/tcp.h | 1 + + src/include/lwipsock.h | 1 + + 4 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/src/core/tcp.c b/src/core/tcp.c +index 252f27f..abfcc00 100644 +--- a/src/core/tcp.c ++++ b/src/core/tcp.c +@@ -2294,6 +2294,7 @@ tcp_pcb_purge(struct tcp_pcb *pcb) + tcp_segs_free(pcb->unacked); + pcb->unacked = pcb->unsent = NULL; + pcb->last_unacked = pcb->last_unsent = NULL; ++ pcb->pcb_if = NULL; + #if TCP_OVERSIZE + pcb->unsent_oversize = 0; + #endif /* TCP_OVERSIZE */ +diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c +index 25aeb23..1c5734b 100644 +--- a/src/core/tcp_out.c ++++ b/src/core/tcp_out.c +@@ -1425,7 +1425,12 @@ tcp_output(struct tcp_pcb *pcb) + lwip_ntohl(seg->tcphdr->seqno), pcb->lastack)); + } + +- netif = tcp_route(pcb, &pcb->local_ip, &pcb->remote_ip); ++ if (pcb->pcb_if == NULL) { ++ netif = tcp_route(pcb, &pcb->local_ip, &pcb->remote_ip); ++ pcb->pcb_if = netif; ++ } else { ++ netif = pcb->pcb_if; ++ } + if (netif == NULL) { + return ERR_RTE; + } +@@ -2220,7 +2225,7 @@ tcp_output_fill_options(const struct tcp_pcb *pcb, struct pbuf *p, u8_t optflags + * header checksum and calling ip_output_if while handling netif hints and stats. + */ + static err_t +-tcp_output_control_segment(const struct tcp_pcb *pcb, struct pbuf *p, ++tcp_output_control_segment(struct tcp_pcb *pcb, struct pbuf *p, + const ip_addr_t *src, const ip_addr_t *dst) + { + err_t err; +@@ -2228,7 +2233,14 @@ tcp_output_control_segment(const struct tcp_pcb *pcb, struct pbuf *p, + + LWIP_ASSERT("tcp_output_control_segment: invalid pbuf", p != NULL); + +- netif = tcp_route(pcb, src, dst); ++ if (pcb == NULL || pcb->pcb_if == NULL) { ++ netif = tcp_route(pcb, src, dst); ++ if (pcb) { ++ pcb->pcb_if = netif; ++ } ++ } else { ++ netif = pcb->pcb_if; ++ } + if (netif == NULL) { + err = ERR_RTE; + } else { +@@ -2318,7 +2330,7 @@ tcp_rst(const struct tcp_pcb *pcb, u32_t seqno, u32_t ackno, + + MIB2_STATS_INC(mib2.tcpoutrsts); + +- tcp_output_control_segment(pcb, p, local_ip, remote_ip); ++ tcp_output_control_segment((struct tcp_pcb*)pcb, p, local_ip, remote_ip); + LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_rst: seqno %"U32_F" ackno %"U32_F".\n", seqno, ackno)); + } + +diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h +index b0ae02c..2a61776 100644 +--- a/src/include/lwip/tcp.h ++++ b/src/include/lwip/tcp.h +@@ -408,6 +408,7 @@ struct tcp_pcb { + u8_t snd_scale; + u8_t rcv_scale; + #endif ++ struct netif* pcb_if; + }; + + #if TCP_PCB_HASH +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index 62e5bf1..ec4d78c 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -111,6 +111,7 @@ struct lwip_sock { + /* stack thread all use */ + struct list_node recv_list; + struct list_node send_list; ++ struct pbuf *lwip_lastdata; + struct pbuf *send_lastdata; + struct pbuf *send_pre_del; + +-- +2.33.0 + diff --git a/0045-add-variable-in-struct-sock.patch b/0045-add-variable-in-struct-sock.patch new file mode 100644 index 0000000..8fcb6da --- /dev/null +++ b/0045-add-variable-in-struct-sock.patch @@ -0,0 +1,26 @@ +From 1ede4a00c1eca575314af02374846cb086798c08 Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Tue, 20 Dec 2022 14:37:21 +0800 +Subject: [PATCH] add variable in struct sock + +--- + src/include/lwipsock.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index ec4d78c..8924728 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -105,8 +105,7 @@ struct lwip_sock { + char pad1 __rte_cache_aligned; + /* app and stack thread all use */ + uint32_t in_send; /* avoid sock too much send rpc msg*/ +- pthread_spinlock_t sock_lock; +- ++ bool read_wait; + char pad2 __rte_cache_aligned; + /* stack thread all use */ + struct list_node recv_list; +-- +2.23.0 + diff --git a/0046-add-dataack-when-recv-too-many-acks-with-data.patch b/0046-add-dataack-when-recv-too-many-acks-with-data.patch new file mode 100644 index 0000000..70131e5 --- /dev/null +++ b/0046-add-dataack-when-recv-too-many-acks-with-data.patch @@ -0,0 +1,91 @@ +From 1aa27395a4c4b73b6db472c4ae75ed91637a11bf Mon Sep 17 00:00:00 2001 +From: kircher +Date: Wed, 21 Dec 2022 17:50:50 +0800 +Subject: [PATCH] add dataack when recv too many acks with data + +--- + src/core/tcp_in.c | 22 ++++++++++++++++++++++ + src/include/lwip/tcp.h | 1 + + src/include/lwipopts.h | 2 ++ + 3 files changed, 25 insertions(+) + +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index 78954bd..35ec6d9 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -1260,6 +1260,7 @@ tcp_receive(struct tcp_pcb *pcb) + s16_t m; + u32_t right_wnd_edge; + int found_dupack = 0; ++ int found_dataack = 0; + + LWIP_ASSERT("tcp_receive: invalid pcb", pcb != NULL); + LWIP_ASSERT("tcp_receive: wrong state", pcb->state >= ESTABLISHED); +@@ -1337,11 +1338,31 @@ tcp_receive(struct tcp_pcb *pcb) + } + } + } ++ /* fast rexmit when receive too many acks with data */ ++ if (TCP_SEQ_LT(ackno + 1, pcb->snd_nxt)) { ++ if (pcb->snd_wl2 + pcb->snd_wnd == right_wnd_edge) { ++ if (pcb->rtime >= 0) { ++ if (pcb->lastack == ackno) { ++ found_dataack = 1; ++ ++pcb->dataacks; ++ if (pcb->dataacks > MAX_DATA_ACK_NUM) { ++ if (tcp_rexmit(pcb) == ERR_OK) { ++ pcb->rtime = 0; ++ pcb->dataacks = 0; ++ } ++ } ++ } ++ } ++ } ++ } + /* If Clause (1) or more is true, but not a duplicate ack, reset + * count of consecutive duplicate acks */ + if (!found_dupack) { + pcb->dupacks = 0; + } ++ if (!found_dataack) { ++ pcb->dataacks = 0; ++ } + } else if (TCP_SEQ_BETWEEN(ackno, pcb->lastack + 1, pcb->snd_nxt)) { + /* We come here when the ACK acknowledges new data. */ + tcpwnd_size_t acked; +@@ -1367,6 +1388,7 @@ tcp_receive(struct tcp_pcb *pcb) + /* Reset the fast retransmit variables. */ + pcb->dupacks = 0; + pcb->lastack = ackno; ++ pcb->dataacks = 0; + + /* Update the congestion control variables (cwnd and + ssthresh). */ +diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h +index 2a61776..97cb882 100644 +--- a/src/include/lwip/tcp.h ++++ b/src/include/lwip/tcp.h +@@ -326,6 +326,7 @@ struct tcp_pcb { + + /* fast retransmit/recovery */ + u8_t dupacks; ++ u32_t dataacks; + u32_t lastack; /* Highest acknowledged seqno. */ + + /* congestion avoidance/control variables */ +diff --git a/src/include/lwipopts.h b/src/include/lwipopts.h +index 907c630..405cf11 100644 +--- a/src/include/lwipopts.h ++++ b/src/include/lwipopts.h +@@ -177,6 +177,8 @@ + + #define MIN_TSO_SEG_LEN 256 + ++#define MAX_DATA_ACK_NUM 256 ++ + /* --------------------------------------- + * ------- NIC offloads -------- + * --------------------------------------- +-- +2.33.0 + diff --git a/0047-reduce-struct-pbuf-size.patch b/0047-reduce-struct-pbuf-size.patch new file mode 100644 index 0000000..fed1ba5 --- /dev/null +++ b/0047-reduce-struct-pbuf-size.patch @@ -0,0 +1,25 @@ +From 5527e02b7ae7f27db8964ad55747326b98e33634 Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Wed, 21 Dec 2022 22:47:04 +0800 +Subject: [PATCH] reduce struct pbuf size + +--- + src/include/lwip/pbuf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h +index 380ac8e..1124408 100644 +--- a/src/include/lwip/pbuf.h ++++ b/src/include/lwip/pbuf.h +@@ -229,7 +229,7 @@ struct pbuf { + u64_t l3_len:9; + /* < L4 (TCP/UDP) Header Length. */ + u64_t l4_len:8; +- u16_t header_off; ++ u8_t header_off; + u8_t rexmit; + u8_t in_write; + u8_t head; +-- +2.23.0 + diff --git a/BUILD.gn b/BUILD.gn new file mode 100644 index 0000000..41b4cf6 --- /dev/null +++ b/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import("//build/ohos.gni") +import("//third_party/lwip/lwip.gni") + +install_script = rebase_path("//third_party/lwip/install.py") +lwip_log_path = rebase_path("$target_gen_dir") +install_args = [ + "--gen-dir", + "$lwip_log_path", +] +print("Install OpenEuler Lwip") +print(install_script) +print(install_args) +print(exec_script(install_script, install_args, "string", [])) diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 5f797e7..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,4548 +0,0 @@ -HISTORY - * These are only the most important changes. For a full list, use git log: - http://git.savannah.nongnu.org/cgit/lwip.git - -(git master) - - * [Enter new changes just after this line - do not remove this line] - -(STABLE-2.1.2): - - ++ Bugfixes: - - 2018-11-21: Jens Nielsen - * netbiosns.c: fix expecting too large packet (bug #55069) - - 2018-11-19: Dirk Ziegelmeier - * smtp.c: fix compiling with strict C compatibility because of strnlen (bug #55034) - - 2018-11-12: Simon Goldschmidt - * tcp.c: fix overflow check in tcp_recved triggering invalid assertion (bug #55015) - - 2018-11-12: Simon Goldschmidt - * tcp.c: fix a bug in sending RST segments (sent from port 0) - -(STABLE-2.1.1): - - ++ Bugfixes: - - 2018-11-01: Joan Lledó - * sockets.c: fix bad assertion in lwip_poll_dec_sockets_used() (bug #54933) - - 2018-11-01: Dirk Ziegelmeier - * ip4.c: don't send 127.* to default netif (bug #54670) - - 2018-10-23: David Girault - * altcp_tls_mbedtls.c: fix use-after free (bug #54774) - - 2018-10-23: Ognjen Bjelica, Dirk Ziegelmeier - * snmp_scalar.c: Avoid NULL pointer dereference (bug #54886) - - 2018-10-23: Simon Goldschmidt - * Fix missing standard includes in multiple files - - 2018-10-17: Ivan Warren - * def.h: fix casting htonX and ntohX to u16_t (bug #54850) - - 2018-10-12: Simon Goldschmidt - * Revert "tcp_abandon: no need to buffer pcb->local_port" (fix that source port was 0 for RST - called when aborting a connection) - - 2018-10-11: Jonas Rabenstein - * tcp.c: tcp_recved: check for overflow and warn about too big values (patch #9699) - - 2018-10-06: Joan Lledó - * sockets.c: alloc_socket(): Check for LWIP_SOCKET_POLL when setting select- - related variables (patch #9696) - - 2018-10-04: Spencer - * tcp.c: Update prev pointer when skipping entries in tcp_slowtmr (patch #9694) - - 2018-09-27: Martine Lenders - * lowpan6.c: Fix IEEE 802.15.4 address setting (bug #54749) - -(STABLE-2.1.0): - - ++ New features: - - 2018-06-17: Simon Goldschmidt - * lwiperf: implemented iPerf client mode - - 2018-04-23: Dirk Ziegelmeier - * added cmake build files - - 2018-03-04: Ray Abram - * netbios responder: respond to '*' queries - - 2018-02-23: Benjamin Aigner - * 6lowpan: add 6lowpan-over-BLE netif (based on existing 6lowpan netif) - - 2018-02-22: Simon Goldschmidt - * ipv6: add support for stateless DHCPv6 (to get DNS servers in SLAAC nets) - - 2018-02-16: Simon Goldschmidt - * add raw API http(s) client (with proxy support) - - 2018-02-01: Simon Goldschmidt - * tcp: add hooks to implement additional socket options - - 2018-02-01: Simon Goldschmidt - * tcp: add hooks to implement tcp md5 signatures or similar (see contrib/addons for an example) - - 2018-01-05: Simon Goldschmidt - * Added sys_mbox_trypost_fromisr() and tcpip_callbackmsg_trycallback_fromisr() - These can be used to post preallocated messages from an ISR to the tcpip thread - (e.g. when using FreeRTOS) - - 2018-01-02: Dirk Ziegelmeier - * task #14780: Add debug helper asserts to ensure threading/locking requirements are met - - 2017-11-21: Simon Goldschmidt - * task #14600: tcp_alloc(): kill TF_CLOSEPEND connections before other ESTABLISHED - - 2017-11-21: Simon Goldschmidt - * makefsdata: added option "-ssi:" to control SSI tag checking/insertion - through a list of filenames, not by checking the file extension at runtime - - 2017-11-20: Joel Cunningham - * netconn: add LWIP_HOOK_NETCONN_EXTERNAL_RESOLVE to use external DNS resolver (patch #9427) - - 2017-11-14: Joel Cunningham - * netifapi: Add thread safe ARP cache APIs (task #14724) - - 2017-11-06: Axel Lin - * TCP: kill existing connections with a LOWER priority than the one currently being opened. - Previous implementations also kill existing connections of the SAME priority. - - 2017-09-21: Kalle Olavi Niemitalo - * sockets: add poll() implementation (patch #9450) - - 2017-09-10: Joel Cunningham - * sockets: add readv() implementation (task #14610) - - 2017-08-04: Simon Goldschmidt - * Clean up DHCP a bit: no need keep msg_out and msg_in as members in struct - dhcp - they are used in a call stack only (p_out and options_out_len as well) - - 2017-08-04: Simon Goldschmidt - * pbuf: split pbuf_header(s16_t) into pbuf_add_header(size_t) and - pbuf_remove_header(size_t) - - 2017-07-20: Douglas - * sys: deprecate sys_arch_sem_wait and sys_arch_mbox_fetch returning the - time waited rather they are now defined to return != SYS_ARCH_TIMEOUT - on success. - - 2017-07-03: Jakub Schmidtke - * tcp: added support for sending TCP SACKs - - 2017-06-20: Joel Cunningham - * netconn/netdb: added core locking support to netconn_gethostbyname (task #14523) - - 2017-04-25: Simon Goldschmidt - * dhcp: added two hooks for adding and parsing user defined DHCP options - - 2017-04-25: Joel Cunningham - * sockets: added recvmsg for UDP (together with CMSG and IP_PKTINFO) (task #14247) - - 2017-04-20: Joel Cunningham - * tcp: added Appropriate Byte Counting support (task #14128) - - 2017-04-11: Simon Goldschmidt - * netconn/sockets: remove fatal error handling, fix asynchronous error handling, - ensure data before RST can be received - - 2017-03-30: Simon Goldschmidt - * added "application layered TCP" connection API (altcp) for seamless integration - of TLS or proxy connections - - 2017-03-09: Simon Goldschmidt - * sockets: add recvmsg for TCP - - 2017-03-02: Joel Cunningham - * netconn/sockets: vectorize netconn_write for TCP, treating a vectored I/O write - atomically in regards to TCP segmentation (patch #8882) - - 2017-03-02: Simon Goldschmidt - * netconn: added nonblocking accept/recv to netconn API (task #14396) - - 2017-02-28: Simon Goldschmidt - * Added LWIP_SINGLE_NETIF for small targets with only one netif - - 2017-02-10: David van Moolenbroek - * Implement UDP and RAW multicast support for IPv6 (core API, not netconn/sockets) - - 2017-02-04: David van Moolenbroek - * IPv6 scopes support - - 2017-01-20: Joel Cunningham - * sockets: add interface name/index APIs (task #14314) - - 2017-01-08: David van Moolenbroek - * Extensions to RAW API (patch #9208) - - Connected RAW PCBs - - Add raw_sendto_if_src() - - Support IP_HDRINCL socket option - - ++ Bugfixes: - - 2018-06-19: Simon Goldschmidt - * tcp: fix RTO timer not working if link is down - - 2018-06-15: Sylvain Rochet - * ppp: multiple smaller bugfixes - - 2018-05-17: Simon Goldschmidt - * etharp: arp table can now be bigger than 127 entries - - 2018-04-25: Jens Nielsen - * tftp server: correctly handle retransmissions - - 2018-04-18: Simon Goldschmidt - sockets: fix race conditions when closing full-duplex sockets - - 2018-03-09: Simon Goldschmidt - * 6lowpan: fix to work against contiki; added ZigBee encapsulation netif for tests - - 2018-02-04: Simon Goldschmidt - * sockets: fix inconsistencies on close (inconsistent error codes, double FIN) - - 2018-01-05: Dirk Ziegelmeier - * Fix bug #52748: the bug in timeouts.c by reimplementing timer logic to use - absolute instead of relative timeout values - - 2017-12-31: Dirk Ziegelmeier - * Fix bug #52704: DHCP and bad OFFER: Stop timeout only if offer is accepted - - 2017-11-08: Joel Cunningham - * netif: ensure link and admin states are up in issue reports (bug #52353) - - 2017-09-12: David Lockyer - * select: allocate select_cb from memp for LWIP_MPU_COMPATIBLE = 1 (bug #51990) - - 2017-09-11: Simon Goldschmidt - * tcp_in.c: fix bug #51937 (leaking tcp_pcbs on passive close with unacked data) - - 2017-08-11: Joel Cunningham - * lwip_itoa: fix converting the number 0 (previously converted to '\0') (bug #51729) - - 2017-08-08: Dirk Ziegelmeier - * ip4_route_src: parameter order is reversed: ip4_route_src(dest, src) -> ip4_route_src(src, dest) - to make parameter order consistent with other ip*_route*() functions - Same also applies to LWIP_HOOK_IP4_ROUTE_SRC() parameter order. - - 2017-08-04: Joel Cunningham - * tcp: re-work persist timer to fully close window (details in bug #50837) - - 2017-07-26: Simon Goldschmidt - * snmp_msg.c: fix bug #51578 (SNMP failed to decode some values on non 32bit platforms) - - 2017-07-20: Simon Goldschmidt - * compatibility headers: moved from 'src/include/posix' to 'src/include/compat/posix', - 'src/include/compat/stdc' etc. - - 2017-05-09: Joel Cunningham - * tcp: add zero-window probe timeout (bug #50837) - - 2017-04-11: Simon Goldschmidt - * sockets.c: task #14420 (Remove sys_sem_signal from inside SYS_ARCH_PROTECT - crit section) done for LWIP_TCPIP_CORE_LOCKING==1 - - 2017-02-24: Simon Goldschmidt - * sockets.c: fixed close race conditions in lwip_select (for LWIP_NETCONN_FULLDUPLEX) - - 2017-02-24: Simon Goldschmidt - * sockets.c: fixed that select ignored invalid/not open sockets in the fd_sets (bug #50392) - - 2017-01-11: David van Moolenbroek - * Lots of IPv6 related fixes and improvements - -(STABLE-2.0.3) - - ++ Bugfixes: - - 2017-09-11: Simon Goldschmidt - * tcp_in.c: fix bug #51937 (leaking tcp_pcbs on passive close with unacked data) - - 2017-08-02: Abroz Bizjak/Simon Goldschmidt - * multiple fixes in IPv4 reassembly (leading to corrupted datagrams received) - - 2017-03-30: Simon Goldschmidt - * dhcp.c: return ERR_VAL instead of asserting on offset-out-of-pbuf - - 2017-03-23: Dirk Ziegelmeier - * dhcp.h: fix bug #50618 (dhcp_remove_struct() macro does not work) - -(STABLE-2.0.2) - - ++ New features: - - 2017-02-10: Dirk Ziegelmeier - * Implement task #14367: Hooks need a better place to be defined: - We now have a #define for a header file name that is #included in every .c - file that provides hooks. - - 2017-02-10: Simon Goldschmidt - * tcp_close does not fail on memory error (instead, FIN is sent from tcp_tmr) - - ++ Bugfixes: - - 2017-03-08 - * tcp: do not keep sending SYNs when getting ACKs - - 2017-03-08: Joel Cunningham - * tcp: Initialize ssthresh to TCP_SND_BUF (bug #50476) - - 2017-03-01: Simon Goldschmidt - * httpd: LWIP_HTTPD_POST_MANUAL_WND: fixed double-free when httpd_post_data_recved - is called nested from httpd_post_receive_data() (bug #50424) - - 2017-02-28: David van Moolenbroek/Simon Goldschmidt - * tcp: fixed bug #50418: LWIP_EVENT_API: fix invalid calbacks for SYN_RCVD pcb - - 2017-02-17: Simon Goldschmidt - * dns: Improved DNS_LOCAL_HOSTLIST interface (bug #50325) - - 2017-02-16: Simon Goldschmidt - * LWIP_NETCONN_FULLDUPLEX: fixed shutdown during write (bug #50274) - - 2017-02-13: Simon Goldschmidt/Dirk Ziegelmeier - * For tiny targtes, LWIP_RAND is optional (fix compile time checks) - - 2017-02-10: Simon Goldschmidt - * tcp: Fixed bug #47485 (tcp_close() should not fail on memory error) by retrying - to send FIN from tcp_fasttmr - - 2017-02-09: Simon Goldschmidt - * sockets: Fixed bug #44032 (LWIP_NETCONN_FULLDUPLEX: select might work on - invalid/reused socket) by not allowing to reallocate a socket that has - "select_waiting != 0" - - 2017-02-09: Simon Goldschmidt - * httpd: Fixed bug #50059 (httpd LWIP_HTTPD_SUPPORT_11_KEEPALIVE vs. - LWIP_HTTPD_KILL_OLD_ON_CONNECTIONS_EXCEEDED) - - 2017-02-08: Dirk Ziegelmeier - * Rename "IPv6 mapped IPv4 addresses" to their correct name from RFC4191: - "IPv4-mapped IPv6 address" - - 2017-02-08: Luc Revardel - * mld6.c: Fix bug #50220 (mld6_leavegroup does not send ICMP6_TYPE_MLD, even - if last reporter) - - 2017-02-08: David van Moolenbroek - * ip6.c: Patch #9250: fix source substitution in ip6_output_if() - - 2017-02-08: Simon Goldschmidt - * tcp_out.c: Fixed bug #50090 (last_unsent->oversize_left can become wrong value - in tcp_write error path) - - 2017-02-02: Dirk Ziegelmeier - * Fix bug #50206: UDP Netconn bind to IP6_ADDR_ANY fails - - 2017-01-18: Dirk Ziegelmeier - * Fix zero-copy RX, see bug bug #50064. PBUF_REFs were not supported as ARP requests. - - 2017-01-15: Axel Lin, Dirk Ziegelmeier - * minor bug fixes in mqtt - - 2017-01-11: Knut Andre Tidemann - * sockets/netconn: fix broken default ICMPv6 handling of checksums - -(STABLE-2.0.1) - - ++ New features: - - 2016-12-31: Simon Goldschmidt - * tcp.h/.c: added function tcp_listen_with_backlog_and_err() to get the error - reason when listening fails (bug #49861) - - 2016-12-20: Erik Andersen - * Add MQTT client - - 2016-12-14: Jan Breuer: - * opt.h, ndc.h/.c: add support for RDNSS option (as per RFC 6106) - - 2016-12-14: David van Moolenbroek - * opt.h, nd6.c: Added LWIP_HOOK_ND6_GET_GW() - - 2016-12-09: Dirk Ziegelmeier - * ip6_frag.c: Implemented support for LWIP_NETIF_TX_SINGLE_PBUF - - 2016-12-09: Simon Goldschmidt - * dns.c: added one-shot multicast DNS queries - - 2016-11-24: Ambroz Bizjak, David van Moolenbroek - * tcp_out.c: Optimize passing contiguous nocopy buffers to tcp_write (bug #46290) - - 2016-11-16: Dirk Ziegelmeier - * sockets.c: added support for IPv6 mapped IPv4 addresses - - ++ Bugfixes: - - 2016-12-16: Thomas Mueller - * api_lib.c: fixed race condition in return value of netconn_gethostbyname() - (and thus also lwip_gethostbyname/_r() and lwip_getaddrinfo()) - - 2016-12-15: David van Moolenbroek - * opt.h, tcp: added LWIP_HOOK_TCP_ISN() to implement less predictable initial - sequence numbers (see contrib/addons/tcp_isn for an example implementation) - - 2016-12-05: Dirk Ziegelmeier - * fixed compiling with IPv4 disabled (IPv6 only case) - - 2016-11-28: Simon Goldschmidt - * api_lib.c: fixed bug #49725 (send-timeout: netconn_write() can return - ERR_OK without all bytes being written) - - 2016-11-28: Ambroz Bizjak - * tcpi_in.c: fixed bug #49717 (window size in received SYN and SYN-ACK - assumed scaled) - - 2016-11-25: Simon Goldschmidt - * dhcp.c: fixed bug #49676 (Possible endless loop when parsing dhcp options) - - 2016-11-23: Dirk Ziegelmeier - * udp.c: fixed bug #49662: multicast traffic is now only received on a UDP PCB - (and therefore on a UDP socket/netconn) when the PCB is bound to IP_ADDR_ANY - - 2016-11-16: Dirk Ziegelmeier - * *: Fixed dual-stack behaviour, IPv6 mapped IPv4 support in socket API - - 2016-11-14: Joel Cunningham - * tcp_out.c: fixed bug #49533 (start persist timer when unsent seg can't fit - in window) - - 2016-11-16: Roberto Barbieri Carrera - * autoip.c: fixed bug #49610 (sometimes AutoIP fails to reuse the same address) - - 2016-11-11: Dirk Ziegelmeier - * sockets.c: fixed bug #49578 (dropping multicast membership does not work - with LWIP_SOCKET_OFFSET) - -(STABLE-2.0.0) - - ++ New features: - - 2016-07-27: Simon Goldschmidt - * opt.h, timeouts.h/.c: added LWIP_TIMERS_CUSTOM to override the default - implementation of timeouts - - 2016-07-xx: Dirk Ziegelmeier - * Large overhaul of doxygen documentation - - 2016-04-05: Simon Goldschmidt - * timers.h/.c: prepare for overriding current timeout implementation: all - stack-internal caclic timers are avaliable in the lwip_cyclic_timers array - - 2016-03-23: Simon Goldschmidt - * tcp: call accept-callback with ERR_MEM when allocating a pcb fails on - passive open to inform the application about this error - ATTENTION: applications have to handle NULL pcb in accept callback! - - 2016-02-22: Ivan Delamer - * Initial 6LoWPAN support - - 2016-02-XX to 2016-03-XX: Dirk Ziegelmeier - * Cleanup TCPIP thread sync methods in a way that it is possibe to use them - in arbitrary code that needs things to be done in TCPIP thread. Used to - decouple netconn, netif, ppp and 6LoWPAN from LWIP core. - - 2016-02-XX: Dirk Ziegelmeier - * Implement dual-stack support in RAW, UDP and TCP. Add new IP address - type IPADDR_ANY_TYPE for this. Netconn/Socket API: Dual-stack is - automatically supported when an IPv6 netconn/socket is created. - - 2015-12-26: Martin Hentschel and Dirk Ziegelmeier - * Rewrite SNMP agent. SNMPv2c + MIB compiler. - - 2015-11-12: Dirk Ziegelmeier - * Decouple SNMP stack from lwIP core and move stack to apps/ directory. - Breaking change: Users have to call snmp_init() now! - - 2015-11-12: Dirk Ziegelmeier - * Implement possibility to declare private memory pools. This is useful to - decouple some apps from the core (SNMP stack) or make contrib app usage - simpler (httpserver_raw) - - 2015-10-09: Simon Goldschmidt - * started to move "private" header files containing implementation details to - "lwip/priv/" include directory to seperate the API from the implementation. - - 2015-10-07: Simon Goldschmidt - * added sntp client as first "supported" application layer protocol implementation - added 'apps' folder - - 2015-09-30: Dirk Ziegelmeier - * snmp_structs.h, mib_structs.c, mib2.c: snmp: fixed ugly inheritance - implementation by aggregating the "base class" (struct mib_node) in all - derived node classes to get more type-safe code - - 2015-09-23: Simon Goldschmidt - * netif.h/.c, nd6.c: task #13729: Convert netif addresses (IPv4 & IPv6) to - ip_addr_t (so they can be used without conversion/temporary storage) - - 2015-09-08: Dirk Ziegelmeier - * snmp: Separate mib2 counter/table callbacks from snmp agent. This both cleans - up the code and should allow integration of a 3rd party agent/mib2. Simple - counters are kept in MIB2_STATS, tree/table change function prototypes moved to - snmp_mib2.h. - - 2015-09-03: Simon Goldschmidt - * opt.h, dns.h/.c: DNS/IPv6: added support for AAAA records - - 2015-09-01: Simon Goldschmidt - * task #12178: hardware checksum capabilities can be configured per netif - (use NETIF_SET_CHECKSUM_CTRL() in your netif's init function) - - 2015-08-30: Simon Goldschmidt - * PBUF_REF with "custom" pbufs is now supported for RX pbufs (see pcapif in - contrib for an example, LWIP_SUPPORT_CUSTOM_PBUF is required) - - 2015-08-30: Simon Goldschmidt - * support IPv4 source based routing: define LWIP_HOOK_IP4_ROUTE_SRC to point - to a routing function - - 2015-08-05: Simon Goldschmidt - * many files: allow multicast socket options IP_MULTICAST_TTL, IP_MULTICAST_IF - and IP_MULTICAST_LOOP to be used without IGMP - - 2015-04-24: Simon Goldschmidt - * dhcp.h/c, autoip.h/.c: added functions dhcp/autoip_supplied_address() to - check for the source of address assignment (replacement for NETIF_FLAG_DHCP) - - 2015-04-10: Simon Goldschmidt - * many files: task #13480: added LWIP_IPV4 define - IPv4 can be disabled, - leaving an IPv6-only stack - - 2015-04-09: Simon Goldschmidt - * nearly all files: task #12722 (improve IPv4/v6 address handling): renamed - ip_addr_t to ip4_addr_t, renamed ipX_addr_t to ip_addr_t and added IP - version; ip_addr_t is used for all generic IP addresses for the API, - ip(4/6)_addr_t are only used internally or when initializing netifs or when - calling version-related functions - - 2015-03-24: Simon Goldschmidt - * opt.h, ip4_addr.h, ip4.c, ip6.c: loopif is not required for loopback traffic - any more but passed through any netif (ENABLE_LOOPBACK has to be enabled) - - 2015-03-23: Simon Goldschmidt - * opt.h, etharp.c: with ETHARP_TABLE_MATCH_NETIF== 1, duplicate (Auto)-IP - addresses on multiple netifs should now be working correctly (if correctly - addressed by routing, that is) - - 2015-03-23: Simon Goldschmidt - * etharp.c: Stable etharp entries that are about to expire are now refreshed - using unicast to prevent unnecessary broadcast. Only if no answer is received - after 15 seconds, broadcast is used. - - 2015-03-06: Philip Gladstone - * netif.h/.c: patch #8359 (Provide utility function to add an IPv6 address to - an interface) - - 2015-03-05: Simon Goldschmidt - * netif.c, ip4.c, dhcp.c, autoip.c: fixed bug #37068 (netif up/down handling - is unclear): correclty separated administrative status of a netif (up/down) - from 'valid address' status - ATTENTION: netif_set_up() now always has to be called, even when dhcp/autoip - is used! - - 2015-02-26: patch by TabascoEye - * netif.c, udp.h/.c: fixed bug #40753 (re-bind UDP pcbs on change of IP address) - - 2015-02-22: chrysn, Simon Goldschmidt - * *.*: Changed nearly all functions taking 'ip(X)_addr_t' pointer to take - const pointers (changed user callbacks: raw_recv_fn, udp_recv_fn; changed - port callbacks: netif_output_fn, netif_igmp_mac_filter_fn) - - 2015-02-19: Ivan Delamer - * netif.h, dhcp.c: Removed unused netif flag for DHCP. The preferred way to evaluate - if DHCP is active is through netif->dhcp field. - - 2015-02-19: Ivan Delamer - * netif.h, slipif.c, ppp.c: Removed unused netif flag for point to point connections - - 2015-02-18: Simon Goldschmidt - * api_lib.c: fixed bug #37958 "netconn API doesn't handle correctly - connections half-closed by peer" - - 2015-02-18: Simon Goldschmidt - * tcp.c: tcp_alloc() prefers killing CLOSING/LAST_ACK over active connections - (see bug #39565) - - 2015-02-16: Claudius Zingerli, Sergio Caprile - * opt.h, dhcp.h/.c: patch #8361 "Add support for NTP option in DHCP" - - 2015-02-14: Simon Goldschmidt - * opt.h, snmp*: added support for write-access community and dedicated - community for sending traps - - 2015-02-13: Simon Goldschmidt - * opt.h, memp.c: added hook LWIP_HOOK_MEMP_AVAILABLE() to get informed when - a memp pool was empty and an item is now available - - 2015-02-13: Simon Goldschmidt - * opt.h, pbuf.h/.c, etharp.c: Added the option PBUF_LINK_ENCAPSULATION_HLEN to - allocate additional header space for TX on netifs requiring additional headers - - 2015-02-12: chrysn - * timers.h/.c: introduce sys_timeouts_sleeptime (returns the time left before - the next timeout is due, for NO_SYS==1) - - 2015-02-11: Nick van Ijzendoorn - * opt.h, sockets.h/c: patch #7702 "Include ability to increase the socket number - with defined offset" - - 2015-02-11: Frederick Baksik - * opt.h, def.h, others: patch #8423 "arch/perf.h" should be made an optional item - - 2015-02-11: Simon Goldschmidt - * api_msg.c, opt.h: started to implement fullduplex sockets/netconns - (note that this is highly unstable yet!) - - 2015-01-17: Simon Goldschmidt - * api: allow enabling socket API without (public) netconn API - netconn API is - still used by sockets, but keeping it private (static) should allow better - compiler optimizations - - 2015-01-16: Simon Goldschmidt - * tcp_in.c: fixed bug #20506 "Initial congestion window is very small" again - by implementing the calculation formula from RFC3390 - - 2014-12-10: Simon Goldschmidt - * api: added option LWIP_NETCONN_SEM_PER_THREAD to use a semaphore per thread - instead of using one per netconn and per select call - - 2014-12-08: Simon Goldschmidt - * ip6.h: fixed bug #43778: IPv6 header version not set on 16-bit platform - (macro IP6H_VTCFL_SET()) - - 2014-12-08: Simon Goldschmidt - * icmp.c, ip4.c, pbuf.c, udp.c, pbuf.h: task #11472 Support PBUF_REF for RX - (IPv6 and IPv4/v6 reassembly might not work yet) - - 2014-11-06: Simon Goldschmidt - * sockets.c/.h, init.c: lwip_socket_init() is not needed any more - -> compatibility define - - 2014-09-16: Simon Goldschmidt - * dns.c, opt.h: reduced ram usage by parsing DNS responses in place - - 2014-09-16: Simon Goldschmidt - * pbuf.h/.c: added pbuf_take_at() and pbuf_put_at() - - 2014-09-15: Simon Goldschmidt - * dns.c: added source port randomization to make the DNS client more robust - (see bug #43144) - - 2013-09-02: Simon Goldschmidt - * arch.h and many other files: added optional macros PACK_STRUCT_FLD_8() and - PACK_STRUCT_FLD_S() to prevent gcc 4 from warning about struct members that - do not need packing - - 2013-08-19: Simon Goldschmidt - * netif.h: bug #42998: made NETIF_MAX_HWADDR_LEN overridable for some special - networks - - 2013-03-17: Simon Goldschmidt (patch by Ghobad Emadi) - * opt.h, etharp.c: Added LWIP_HOOK_ETHARP_GET_GW to implement IPv4 routing with - multiple gateways - - 2013-04-20: Fatih Asici - * opt.h, etharp.h/.c: patch #7993: Added support for transmitting packets - with VLAN headers via hook function LWIP_HOOK_VLAN_SET and to check them - via hook function LWIP_HOOK_VLAN_CHECK - - 2014-02-20: Simon Goldschmidt (based on patch by Artem Pisarenko) - * patch #7885: modification of api modules to support FreeRTOS-MPU - (don't pass stack-pointers to other threads) - - 2014-02-05: Simon Goldschmidt (patch by "xtian" and "alex_ab") - * patch #6537/#7858: TCP window scaling support - - 2014-01-17: Jiri Engelthaler - * icmp, icmp6, opt.h: patch #8027: Completed HW checksuming for IPv4 and - IPv6 ICMP's - - 2012-08-22: Sylvain Rochet - * New PPP stack for lwIP, developed in ppp-new branch. - Based from pppd 2.4.5, released 2009-11-17, with huge changes to match - code size and memory requirements for embedded devices, including: - - Gluing together the previous low-level PPP code in lwIP to pppd 2.4.5, which - is more or less what pppd sys-* files are, so that we get something working - using the unix port. - - Merged some patchs from lwIP Git repository which add interesting features - or fix bugs. - - Merged some patchs from Debian pppd package which add interesting features - or fix bugs. - - Ported PPP timeout handling to the lwIP timers system - - Disabled all the PPP code using filesystem access, replaced in necessary cases - to configuration variables. - - Disabled all the PPP code forking processes. - - Removed IPX support, lwIP does not support IPX. - - Ported and improved random module from the previous PPP port. - - Removed samba TDB (file-driven database) usage, because it needs a filesystem. - - MS-CHAP required a DES implementation, we added the latest PolarSSL DES - implementation which is under a BSD-ish license. - - Also switched to PolarSSL MD4,MD5,SHA1 implementations, which are meant to be - used in embedded devices with reduced memory footprint. - - Removed PPP configuration file parsing support. - - Added macro definition EAP_SUPPORT to make EAP support optional. - - Added macro definition CHAP_SUPPORT to make CHAP support optional. - - Added macro definition MSCHAP_SUPPORT to make MSCHAP support optional. - - Added macro definition PAP_SUPPORT to make PAP support optional. - - Cleared all Linux syscall calls. - - Disabled demand support using a macro, so that it can be ported later. - - Disabled ECP support using a macro, so that it can be ported later. - - Disabled CCP support using a macro, so that it can be ported later. - - Disabled CBCP support using a macro, so that it can be ported later. - - Disabled LQR support using a macro, so that it can be ported later. - - Print packet debug feature optional, through PRINTPKT_SUPPORT - - Removed POSIX signal usage. - - Fully ported PPPoS code from the previous port. - - Fully ported PPPoE code from the previous port. - - Fully ported VJ compression protocol code from the previous port. - - Removed all malloc()/free() use from PPP, replaced by stack usage or PBUF. - - Disabled PPP server support using a macro, so that it can be ported later. - - Switched all PPP debug to lwIP debug system. - - Created PPP Control Block (PPP PCB), removed PPP unit integer everywhere, - removed all global variables everywhere, did everything necessary for - the PPP stack to support more than one PPP session (pppd only support - one session per process). - - Removed the statically allocated output buffer, now using PBUF. - - Improved structure size of all PPP modules, deep analyze of code to reduce - variables size to the bare minimum. Switched all boolean type (char type in - most architecture) to compiler generated bitfields. - - Added PPP IPv6 support, glued lwIP IPv6 support to PPP. - - Now using a persistent netif interface which can then be used in lwIP - functions requiring a netif. - - Now initializing PPP in lwip_init() function. - - Reworked completely the PPP state machine, so that we don't end up in - anymore in inconsistent state, especially with PPPoE. - - Improved the way we handle PPP reconnection after disconnect, cleaning - everything required so that we start the PPP connection again from a - clean state. - - Added PPP holdoff support, allow the lwIP user to wait a little bit before - reconnecting, prevents connection flood, especially when using PPPoL2TP. - - Added PPPoL2TP LAC support (a.k.a. UDP tunnels), adding a VPN client - feature to lwIP, L2TP being a widely used tunnel protocol. - - Switched all used PPP types to lwIP types (u8t, u16t, u32t, ...) - - Added PPP API "sequential" thread-safe API, based from NETIFAPI. - - 2011-07-21: Simon Goldschmidt - * sockets.c, opt.h: (bug #30185): added LWIP_FIONREAD_LINUXMODE that makes - ioctl/FIONREAD return the size of the next pending datagram. - - 2011-05-25: Simon Goldschmidt - * again nearly the whole stack, renamed ip.c to ip4.c, ip_addr.c to ip4_addr.c, - combined ipv4/ipv6 inet_chksum.c, added ip.h, ip_addr.h: Combined IPv4 - and IPv6 code where possible, added defines to access IPv4/IPv6 in non-IP - code so that the code is more readable. - - 2011-05-17: Patch by Ivan Delamer (only checked in by Simon Goldschmidt) - * nearly the whole stack: Finally, we got decent IPv6 support, big thanks to - Ivan! (this is work in progress: we're just post release anyway :-) - - - ++ Bugfixes: - - 2016-08-23: Simon Goldschmidt - * etharp: removed ETHARP_TRUST_IP_MAC since it is insecure and we don't need - it any more after implementing unicast ARP renewal towards arp entry timeout - - 2016-07-20: Simon Goldschmidt - * memp.h/.c: fixed bug #48442 (memp stats don't work for MEMP_MEM_MALLOC) - - 2016-07-21: Simon Goldschmidt (patch by Ambroz Bizjak) - * tcp_in.c, tcp_out.c: fixed bug #48543 (TCP sent callback may prematurely - report sent data when only part of a segment is acked) and don't include - SYN/FIN in snd_buf counter - - 2016-07-19: Simon Goldschmidt - * etharp.c: fixed bug #48477 (ARP input packet might update static entry) - - 2016-07-11: Simon Goldschmidt - * tcp_in.c: fixed bug #48476 (TCP sent callback called wrongly due to picking - up old pcb->acked - - 2016-06-30: Simon Goldschmidt (original patch by Fabian Koch) - * tcp_in.c: fixed bug #48170 (Vulnerable to TCP RST spoofing) - - 2016-05-20: Dirk Ziegelmeier - * sntp.h/.c: Fix return value of sntp_getserver() call to return a pointer - - 2016-04-05: Simon Goldschmidt (patch by Philip Gladstone) - * udp.c: patch #8358: allow more combinations of listening PCB for IPv6 - - 2016-04-05: Simon Goldschmidt - * netconn/socket API: fixed bug# 43739 (Accept not reporting errors about - aborted connections): netconn_accept() returns ERR_ABRT (sockets: ECONNABORTED) - for aborted connections, ERR_CLSD (sockets: EINVAL) if the listening netconn - is closed, which better seems to follow the standard. - - 2016-03-23: Florent Matignon - * dhcp.c: fixed bug #38203: DHCP options are not recorded in all DHCP ack messages - - 2016-03-22: Simon Goldschmidt - * tcp: changed accept handling to be done internally: the application does not - have to call tcp_accepted() any more. Instead, when delaying accept (e.g. sockets - do), call tcp_backlog_delayed()/tcp_backlog_accepted() (fixes bug #46696) - - 2016-03-22: Simon Goldschmidt - * dns.c: ignore dns response parsing errors, only abort resolving for correct - responses or error responses from correct server (bug #47459) - - 2016-03-17: Simon Goldschmidt - * api_msg.c: fixed bug #47448 (netconn/socket leak if RST is received during close) - - 2016-03-17: Joel Cunningham - * api_msg.c: don't fail closing a socket/netconn when failing to allocate the - FIN segment; blocking the calling thread for a while is better than risking - leaking a netconn/socket (see bug #46701) - - 2016-03-16: Joel Cunningham - * tcp_out.c: reset rto timer on fast retransmission - - 2016-03-16: Deomid Ryabkov - * tcp_out.c: fixed bug #46384 Segment size calculation bug with MSS != TCP_MSS - - 2016-03-05: Simon Goldschmidt - * err.h/.c, sockets.c: ERR_IF is not necessarily a fatal error - - 2015-11-19: fix by Kerem Hadimli - * sockets.c: fixed bug #46471: lwip_accept() leaks socket descriptors if new - netconn was already closed because of peer behavior - - 2015-11-12: fix by Valery Ushakov - * tcp_in.c: fixed bug #46365 tcp_accept_null() should call tcp_abort() - - 2015-10-02: Dirk Ziegelmeier/Simon Goldschmidt - * snmp: cleaned up snmp structs API (fixed race conditions from bug #46089, - reduce ram/rom usage of tables): incompatible change for private MIBs - - 2015-09-30: Simon Goldschmidt - * ip4_addr.c: fixed bug #46072: ip4addr_aton() does not check the number range - of all address parts - - 2015-08-28: Simon Goldschmidt - * tcp.c, tcp_in.c: fixed bug #44023: TCP ssthresh value is unclear: ssthresh - is set to the full send window for active open, too, and is updated once - after SYN to ensure the correct send window is used - - 2015-08-28: Simon Goldschmidt - * tcp: fixed bug #45559: Window scaling casts u32_t to u16_t without checks - - 2015-08-26: Simon Goldschmidt - * ip6_frag.h/.c: fixed bug bug #41009: IPv6 reassembly broken on 64-bit platforms: - define IPV6_FRAG_COPYHEADER==1 on these platforms to copy the IPv6 header - instead of referencing it, which gives more room for struct ip6_reass_helper - - 2015-08-25: Simon Goldschmidt - * sockets.c: fixed bug #45827: recvfrom: TCP window is updated with MSG_PEEK - - 2015-08-20: Manoj Kumar - * snmp_msg.h, msg_in.c: fixed bug #43790: Sending octet string of Length >255 - from SNMP agent - - 2015-08-19: Jens Nielsen - * icmp.c, ip4.c, tcp_in.c, udp.c, raw.c: fixed bug #45120: Broadcast & multiple - interfaces handling - - 2015-08-19: Simon Goldschmidt (patch by "Sandra") - * dns.c: fixed bug #45004: dns response without answer might be discarded - - 2015-08-18: Chrysn - * timers.c: patch #8704 fix sys_timeouts_sleeptime function - - 2015-07-01: Erik Ekman - * puf.c: fixed bug #45454 (pbuf_take_at() skips write and returns OK if offset - is at start of pbuf in chain) - - 2015-05-19: Simon Goldschmidt - * dhcp.h/.c: fixed bugs #45140 and #45141 (dhcp was not stopped correctly after - fixing bug #38204) - - 2015-03-21: Simon Goldschmidt (patch by Homyak) - * tcp_in.c: fixed bug #44766 (LWIP_WND_SCALE: tcphdr->wnd was not scaled in - two places) - - 2015-03-21: Simon Goldschmidt - * tcp_impl.h, tcp.c, tcp_in.c: fixed bug #41318 (Bad memory ref in tcp_input() - after tcp_close()) - - 2015-03-21: Simon Goldschmidt - * tcp_in.c: fixed bug #38468 (tcp_sent() not called on half-open connection for - data ACKed with the same ack as FIN) - - 2015-03-21: Simon Goldschmidt (patch by Christoffer Lind) - * dhcp.h/.c: fixed bug #38204 (DHCP lease time not handled correctly) - - 2015-03-20: Simon Goldschmidt - * dhcp.c: fixed bug #38714 (Missing option and client address in DHCPRELEASE message) - - 2015-03-19: Simon Goldschmidt - * api.h, tcpip.h, api_lib.c, api_msg.c: fixed race conditions in assigning - netconn->last_err (fixed bugs #38121 and #37676) - - 2015-03-09: Simon Goldschmidt - * ip4.c: fixed the IPv4 part of bug #43904 (ip_route() must detect linkup status) - - 2015-03-04: Simon Goldschmidt - * nd6.c: fixed bug #43784 (a host should send at least one Router Solicitation) - - 2015-03-04: Valery Ushakov - * ip6.c: fixed bug #41094 (Byte-order bug in IPv6 fragmentation header test) - - 2015-03-04: Zach Smith - * nd6.c: fixed bug #38153 (nd6_input() byte order issues) - - 2015-02-26: Simon Goldschmidt - * netif.c, tcp.h/.c: fixed bug #44378 (TCP connections are not aborted on netif - remove) - - 2015-02-25: Simon Goldschmidt - * ip4.c, etharp.c: fixed bug #40177 (System hangs when dealing with corrupted - packets), implemented task #12357 (Ensure that malicious packets don't - assert-fail): improved some pbuf_header calls to not assert-fail. - - 2015-02-25: patch by Joel Cunningham - * udp.h/.c, sockets.c: fixed bug #43028 (IP_MULTICAST_TTL affects unicast - datagrams) - - 2015-02-25: patch by Greg Renda - * ip4_frag.c: fixed bug #38210 (ip reassembly while remove oldest datagram) - - 2015-02-25: Simon Goldschmidt - * sockets.c: fixed bug #38165 (socket with mulicast): ensure igmp membership - are dropped when socket (not netconn!) is closed. - - 2015-02-25: Simon Goldschmidt - * ip4.h/.c, udp.c: fixed bug #38061 (wrong multicast routing in IPv4) by - adding an optional default netif for multicast routing - - 2015-02-25: Simon Goldschmidt - * netconn API: fixed that netconn_connect still used message passing for - LWIP_TCPIP_CORE_LOCKING==1 - - 2015-02-22: patch by Jens Nielsen - * icmp.c: fixed bug #38803 (Source address in broadcast ping reply) - - 2015-02-22: Simon Goldschmidt - * udp.h, sockets.c: added proper accessor functions for pcb->multicast_ip - (previously used by get/setsockopt only) - - 2015-02-18: Simon Goldschmidt - * sockets.c: Fixed select not reporting received FIN as 'readable' in certain - rare cases (bug #43779: select(), close(), and TCP retransmission error) - - 2015-02-17: Simon Goldschmidt - * err.h, sockets.c, api_msg.c: fixed bug #38853 "connect() use a wrong errno": - return ERR_ALREADY/EALRADY during connect, ERR_ISCONN/EISCONN when already - connected - - 2015-02-17: Simon Goldschmidt - * tcp_impl.h, tcp_out.c, tcp.c, api_msg.c: fixed bug #37614 "Errors from - ipX_output are not processed". Now tcp_output(_segment) checks for the return - value of ipX_output and does not try to send more on error. A netif driver - can call tcp_txnow() (from tcpip_thread!) to try to send again if TX buffers - are available again. - - 2015-02-14: patches by Freddie Chopin - * snmp*: made community writable, fixed some const pointers - - 2015-02-13: Simon Goldschmidt - * msg_in.c: fixed bug #22070 "MIB_OBJECT_WRITE_ONLY not implemented in SNMP" - - 2015-02-12: Simon Goldschmidt - * ip.h, ip4.c, ip6.c: fixed bug #36403 "ip4_input() and ip6_input() always pass - inp to higher layers": now the accepting netif is passed up, but the input - netif is available through ip_current_input_netif() if required. - - 2015-02-11: patch by hichard - * tcpip.c: fixed bug #43094 "The function tcpip_input() forget to handle IPv6" - - 2015-02-10: Simon Goldschmidt - * netconn API: fixed that netconn_close/netconn_delete still used message passing - for LWIP_TCPIP_CORE_LOCKING==1 - - 2015-02-10: Simon Goldschmidt - * netconn/socket api: fixed bug #44225 "closing TCP socket should time out - eventually", implemented task #6930 "Implement SO_LINGER": closing TCP sockets - times out after 20 seconds or after the configured SND_TIMEOUT or depending - on the linger settings. - - 2015-01-27: Simon Goldschmidt - * api_msg.c: fixed that SHUT_RD followed by SHUT_WR was different to SHUT_RDWR, - fixed return value of lwip_netconn_do_close on unconnected netconns - - 2015-01-17: Simon Goldschmidt - * sockets.c: fixed bug #43361 select() crashes with stale FDs - - 2015-01-17: Simon Goldschmidt - * sockets.c/.h, memp_std.h: fixed bug #40788 "lwip_setsockopt_internal() crashes" - by rewriting set/getsockopt functions to combine checks with the actual code - and add more NULL checks; this also fixes that CORE_LOCKING used message - passing for set/getsockopt. - - 2014-12-19: Simon Goldschmidt - * opt.h, dhcp.h/.c: prevent dhcp from starting when netif link is down (only - when LWIP_DHCP_CHECK_LINK_UP==1, which is disabled by default for - compatibility reasons) - - 2014-12-17: Simon Goldschmidt - * tcp_out.c: fixed bug #43840 Checksum error for TCP_CHECKSUM_ON_COPY==1 for - no-copy data with odd length - - 2014-12-10: Simon Goldschmidt - * sockets.c, tcp.c, others: fixed bug #43797 set/getsockopt: SO_SNDTIMEO/SO_RCVTIMEO - take int as option but should take timeval (LWIP_SO_SNDRCVTIMEO_STANDARD==0 can - be used to revert to the old 'winsock' style behaviour) - Fixed implementation of SO_ACCEPTCONN to just look at the pcb state - - 2014-12-09: Simon Goldschmidt - * ip4.c: fixed bug #43596 IGMP queries from 0.0.0.0 are discarded - - 2014-10-21: Simon Goldschmidt (patch by Joel Cunningham and Albert Huitsing) - * sockts.c: fixed bugs #41495 Possible threading issue in select() and #43278 - event_callback() handle context switch when calling sys_sem_signal() - - 2014-10-21: Simon Goldschmidt - * api_msg.c: fixed bug #38219 Assert on TCP netconn_write with sndtimeout set - - 2014-09-16: Kevin Cernekee - * dns.c: patch #8480 Fix handling of dns_seqno wraparound - - 2014-09-16: Simon Goldschmidt - * tcp_out.c: fixed bug #43192 tcp_enqueue_flags() should not check TCP_SND_QUEUELEN - when sending FIN - - 2014-09-03: Simon Goldschmidt - * msg_in.c: fixed bug #39355 SNMP Memory Leak in case of error - - 2014-09-02: Simon Goldschmidt - * err.h/.c, sockets.c, api_msg.c: fixed bug #43110 call getpeername() before - listen() will cause a error - - 2014-09-02: Simon Goldschmidt - * sockets.c: fixed bug #42117 lwip_fcntl does not set errno - - 2014-09-02: Simon Goldschmidt - * tcp.c: fixed bug #42299 tcp_abort() leaves freed pcb on tcp_bound_pcbs list - - 2014-08-20: Simon Goldschmidt - * dns.c: fixed bug #42987 lwIP is vulnerable to DNS cache poisoning due to - non-randomized TXIDs - - 2014-06-03: Simon Goldschmidt - * tcp_impl.h, tcp_in.c: fixed bug #37969 SYN packet dropped as short packet in - tcp_input function - - 2014-05-20: Simon Goldschmidt - * tcp_out.c: fixed bug #37184 tcp_write problem for pcbs in the SYN_SENT state - - 2014-05-19: Simon Goldschmidt - * *.h: Fixed bug #35874 reserved identifier violation (removed leading underscores - from header include guards) - - 2014-04-08: Simon Goldschmidt - * tcp.c: Fixed bug #36167 tcp server crash when client closes (maximum window) - - 2014-04-06: Simon Goldschmidt - * tcp_in.c: Fixed bug #36210 lwIP does not elicit an empty ACK when received - unacceptable ACK - - 2014-04-06: Simon Goldschmidt - * dhcp.c, ip4.c/.h, ip6.c/.h, udp.c/.h, ip.h: Fixed bug #41787 DHCP Discovery - is invalid when an IP is set to thet netif. - - 2014-03-14: Simon Goldschmidt - * tcp_out.c: Fixed bug #36153 TCP Cheksum error if LWIP_CHECKSUM_ON_COPY=1 - - 2014-03-11: Simon Goldschmidt (patch by Mason) - * opt.h, sockets.c: fixed bug #35928 BSD sockets functions must set errno for - POSIX-compliance - - 2014-02-27: Simon Goldschmidt - * dhcp.c: fixed bug #40303 DHCP xid renewed when sending a DHCPREQUEST - - 2014-02-27: Simon Goldschmidt - * raw.c: fixed bug #41680 raw socket can not receive IPv6 packet when - IP_SOF_BROADCAST_RECV==1 - - 2014-02-27: Simon Goldschmidt - * api_msg.c, sockets.c: fixed bug #38404 getpeeraddr returns success on - unconnected/listening TCP sockets - - 2014-02-27: Simon Goldschmidt - * sockets.c: fixed bug #41729 Some socket functions return Exyz instead of -1 - - 2014-02-25: Simon Goldschmidt - * ip4.c: fixed bug #39514 ip_route() may return an IPv6-only interface - - 2014-02-25: Simon Goldschmidt, patch by Fatih Asici - * pbuf.c: fixed bug #39356 Wrong increment in pbuf_memfind() - - 2014-02-25: Simon Goldschmidt - * netif.c/.h, udp.c: fixed bug #39225 udp.c uses netif_matches_ip6_addr() incorrectly; - renamed function netif_matches_ip6_addr() to netif_get_ip6_addr_match() - - 2014-02-25: Simon Goldschmidt - * igmp.c: fixed bug #39145 IGMP membership report for 224.0.0.1 - - 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) - * etharp.c, opt.h: fixed bug #34681 Limit ARP queue length by ARP_QUEUE_LEN (=3) - - 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) - * etharp.h/.c: fixed bug #34682 Limit ARP request flood for unresolved entry - - 2014-02-20: Simon Goldschmidt - * tcp_out.c: fixed bug #39683 Assertion "seg->tcphdr not aligned" failed with - MEM_ALIGNMENT = 8 - - 2014-02-20: Simon Goldschmidt - * sockets.c: fixed bug #39882 No function shall set errno to 0 - - 2014-02-20: Simon Goldschmidt - * mib_structs.c: fixed bug #40050 SNMP problem with MIB arrays > 255 - - 2014-02-20: Simon Goldschmidt - * api.h, sockets.c: fixed bug #41499 netconn::recv_avail can overflow - - 2014-01-08: Stathis Voukelatos - * memp_std.h: patch #7928 Fixed size calculation in MALLOC memory pool - creation macro - - 2014-01-18: Brian Fahs - * tcp_out.c: patch #8237: tcp_rexmit_rto fails to update pcb->unsent_oversize - when necessary - - 2014-01-17: Grant Erickson, Jay Logue, Simon Goldschmidt - * ipv6.c, netif.c: patch #7913 Enable Support for IPv6 Loopback - - 2014-01-16: Stathis Voukelatos - * netif.c: patch #7902 Fixed netif_poll() operation when LWIP_LOOPBACK_MAX_PBUFS > 0 - - 2014-01-14: "Freddie Chopin" - * snmp.h, mib2.c: fixed constness and spelling of sysdescr - - 2014-01-14: Simon Goldschmidt (patch by Thomas Faber) - * tcpip.c: patch #8241: Fix implicit declaration of ip_input with - LWIP_TCPIP_CORE_LOCKING_INPUT disabled - - 2014-01-14: chrysn - * timers.c: patch #8244 make timeouts usable reliably from outside of the - timeout routine - - 2014-01-10: Simon Goldschmidt - * ip_frag.c, ip6_frag.c: fixed bug #41041 Potential use-after-free in IPv6 reassembly - - 2014-01-10: Simon Goldschmidt - * memp.c: fixed bug #41188 Alignment error in memp_init() when MEMP_SEPARATE_POOLS==1 - - 2014-01-10: Simon Goldschmidt - * tcp.c: fixed bug #39898 tcp_fasttmr() possible lock due to infinte queue process loop - - 2013-06-29: Simon Goldschmidt - * inet.h, sockets.h: partially fixed bug #37585: IPv6 compatibility (in socket structs) - - 2013-06-29: Simon Goldschmidt - * inet6.h: bug #37585/task #12600: fixed struct in6_addr.s6_addr to conform to spec - - 2013-04-24: patch by Liam - * api_msg.c: patch #8008 Fix a potential null pointer dereference in assert - - 2013-04-24: Simon Goldschmidt - * igmp.c: fixed possible division by zero - - 2013-04-24: Simon Goldschmidt - * ip6.h, some ipv6 C files: fixed bug #38526 Coverity: Recursive Header Inclusion in ip6.h - - 2013-04-24: Simon Goldschmidt (patch by Emil Ljungdahl): - * netif.c: fixed bug #38586 netif_loop_output() "deadlocks" - - 2013-01-15: Simon Goldschmidt - * ip4.c: fixed bug #37665 ip_canforward operates on address in wrong byte order - - 2013-01-15: Simon Goldschmidt - * pbuf.h: fixed bug #38097 pbuf_free_ooseq() warning - - 2013-01-14: Simon Goldschmidt - * dns.c: fixed bug #37705 Possible memory corruption in DNS query - - 2013-01-11: Simon Goldschmidt - * raw.c: fixed bug #38066 Raw pcbs can alter packet without eating it - - 2012-08-22: Simon Goldschmidt - * memp.c: fixed bug #37166: memp_sanity check loops itself - - 2012-08-13: Simon Goldschmidt - * dhcp.c: fixed bug #36645: Calling dhcp_release before dhcp_start - dereferences NULL - - 2012-08-13: Simon Goldschmidt - * msg_out.c: fixed bug #36840 snmp_send_trap() NULL de-reference if traps - configured but no interfaces available - - 2012-08-13: Simon Goldschmidt - * dns.c: fixed bug #36899 DNS TTL 0 is cached for a long time - - 2012-05-11: Simon Goldschmidt (patch by Marty) - * memp.c: fixed bug #36412: memp.c does not compile when - MEMP_OVERFLOW_CHECK > zero and MEMP_SEPARATE_POOLS == 1 - - 2012-05-03: Simon Goldschmidt (patch by Sylvain Rochet) - * ppp.c: fixed bug #36283 (PPP struct used on header size computation and - not packed) - - 2012-05-03: Simon Goldschmidt (patch by David Empson) - * ppp.c: fixed bug #36388 (PPP: checksum-only in last pbuf leads to pbuf with - zero length) - - 2012-03-25: Simon Goldschmidt - * api_msg.c: Fixed bug #35817: do_connect() invalidly signals op_completed - for UDP/RAW with LWIP_TCPIP_CORE_LOCKING==1 - - 2012-03-25: Simon Goldschmidt - * api_msg.h, api_lib.c, api_msg.c, netifapi.c: fixed bug #35931: Name space - pollution in api_msg.c and netifapi.c - - 2011-08-24: Simon Goldschmidt - * inet6.h: fixed bug #34124 struct in6_addr does not conform to the standard - - - -(STABLE-1.4.1) - - ++ New features: - - 2012-03-25: Simon Goldschmidt (idea by Mason) - * posix/*: added posix-compatibility include files posix/netdb.h and posix/sys/socket.h - which are a simple wrapper to the correct lwIP include files. - - 2012-01-16: Simon Goldschmidt - * opt.h, icmp.c: Added option CHECKSUM_GEN_ICMP - - 2011-12-17: Simon Goldschmidt - * ip.h: implemented API functions to access so_options of IP pcbs (UDP, TCP, RAW) - (fixes bug #35061) - - 2011-09-27: Simon Goldschmidt - * opt.h, tcp.c, tcp_in.c: Implemented limiting data on ooseq queue (task #9989) - (define TCP_OOSEQ_MAX_BYTES / TCP_OOSEQ_MAX_PBUFS in lwipopts.h) - - 2011-09-21: Simon Goldschmidt - * opt.h, api.h, api_lib.c, api_msg.h/.c, sockets.c: Implemented timeout on - send (TCP only, bug #33820) - - 2011-09-21: Simon Goldschmidt - * init.c: Converted runtime-sanity-checks into compile-time checks that can - be disabled (since runtime checks can often not be seen on embedded targets) - - 2011-09-11: Simon Goldschmidt - * ppp.h, ppp_impl.h: splitted ppp.h to an internal and external header file - to get a clear separation of which functions an application or port may use - (task #11281) - - 2011-09-11: Simon Goldschmidt - * opt.h, tcp_impl.h, tcp.c, udp.h/.c: Added a config option to randomize - initial local TCP/UDP ports (so that different port ranges are used after - a reboot; bug #33818; this one added tcp_init/udp_init functions again) - - 2011-09-03: Simon Goldschmidt - * dhcp.c: DHCP uses LWIP_RAND() for xid's (bug #30302) - - 2011-08-24: Simon Goldschmidt - * opt.h, netif.h/.c: added netif remove callback (bug #32397) - - 2011-07-26: Simon Goldschmidt - * etharp.c: ETHARP_SUPPORT_VLAN: add support for an external VLAN filter - function instead of only checking for one VLAN (define ETHARP_VLAN_CHECK_FN) - - 2011-07-21: Simon Goldschmidt (patch by hanhui) - * ip4.c, etharp.c, pbuf.h: bug #33634 ip_forward() have a faulty behaviour: - Added pbuf flags to mark incoming packets as link-layer broadcast/multicast. - Also added code to allow ip_forward() to forward non-broadcast packets to - the input netif (set IP_FORWARD_ALLOW_TX_ON_RX_NETIF==1). - - 2011-06-26: Simon Goldschmidt (patch by Cameron Gutman) - * tcp.c, tcp_out.c: bug #33604: added some more asserts to check that - pcb->state != LISTEN - - 2011-05-14: Simon Goldschmidt (patch by Stéphane Lesage) - * tcpip.c/.h: patch #7449 allow tcpip callback from interrupt with static - memory message - - - ++ Bugfixes: - - 2012-09-26: Simon Goldschmidt - * api_msg.c: fixed bug #37405 'err_tcp()' uses already freed 'netconn' object - - 2012-09-26: patch by Henrik Persson - * dhcp.c: patch #7843 Fix corner case with dhcp timeouts - - 2012-09-26: patch by Henrik Persson - * dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet - - 2012-08-22: Simon Goldschmidt - * memp.c: fixed bug #37166: memp_sanity check loops itself - - 2012-05-08: Simon Goldschmidt - * tcp_out.c: fixed bug: #36380 unsent_oversize mismatch in 1.4.1RC1 (this was - a debug-check issue only) - - 2012-03-27: Simon Goldschmidt - * vj.c: fixed bug #35756 header length calculation problem in ppp/vj.c - - 2012-03-27: Simon Goldschmidt (patch by Mason) - * tcp_out.c: fixed bug #35945: SYN packet should provide the recv MSS not the - send MSS - - 2012-03-22: Simon Goldschmidt - * ip4.c: fixed bug #35927: missing refragmentaion in ip_forward - - 2012-03-20: Simon Goldschmidt (patch by Mason) - * netdb.c: fixed bug #35907: lwip_gethostbyname_r returns an invalid h_addr_list - - 2012-03-12: Simon Goldschmidt (patch by Bostjan Meglic) - * ppp.c: fixed bug #35809: PPP GetMask(): Compiler warning on big endian, - possible bug on little endian system - - 2012-02-23: Simon Goldschmidt - * etharp.c: fixed bug #35595: Impossible to send broadcast without a gateway - (introduced when fixing bug# 33551) - - 2012-02-16: Simon Goldschmidt - * ppp.c: fixed pbuf leak when PPP session is aborted through pppSigHUP() - (bug #35541: PPP Memory Leak) - - 2012-02-16: Simon Goldschmidt - * etharp.c: fixed bug #35531: Impossible to send multicast without a gateway - (introduced when fixing bug# 33551) - - 2012-02-16: Simon Goldschmidt (patch by Stéphane Lesage) - * msg_in.c, msg_out.c: fixed bug #35536 SNMP: error too big response is malformed - - 2012-02-15: Simon Goldschmidt - * init.c: fixed bug #35537: MEMP_NUM_* sanity checks should be disabled with - MEMP_MEM_MALLOC==1 - - 2012-02-12: Simon Goldschmidt - * tcp.h, tcp_in.c, tcp_out.c: partly fixed bug #25882: TCP hangs on - MSS > pcb->snd_wnd (by not creating segments bigger than half the window) - - 2012-02-11: Simon Goldschmidt - * tcp.c: fixed bug #35435: No pcb state check before adding it to time-wait - queue while closing - - 2012-01-22: Simon Goldschmidt - * tcp.c, tcp_in.c: fixed bug #35305: pcb may be freed too early on shutdown(WR) - - 2012-01-21: Simon Goldschmidt - * tcp.c: fixed bug #34636: FIN_WAIT_2 - Incorrect shutdown of TCP pcb - - 2012-01-20: Simon Goldschmidt - * dhcp.c: fixed bug #35151: DHCP asserts on incoming option lengths - - 2012-01-20: Simon Goldschmidt - * pbuf.c: fixed bug #35291: NULL pointer in pbuf_copy - - 2011-11-25: Simon Goldschmidt - * tcp.h/.c, tcp_impl.h, tcp_in.c: fixed bug #31177: tcp timers can corrupt - tcp_active_pcbs in some cases - - 2011-11-23: Simon Goldschmidt - * sys.c: fixed bug #34884: sys_msleep() body needs to be surrounded with - '#ifndef sys_msleep' - - 2011-11-22: Simon Goldschmidt - * netif.c, etharp.h/.c: fixed bug #34684: Clear the arp table cache when - netif is brought down - - 2011-10-28: Simon Goldschmidt - * tcp_in.c: fixed bug #34638: Dead code in tcp_receive - pcb->dupacks - - 2011-10-23: Simon Goldschmidt - * mem.c: fixed bug #34429: possible memory corruption with - LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT set to 1 - - 2011-10-18: Simon Goldschmidt - * arch.h, netdb.c: fixed bug #34592: lwip_gethostbyname_r uses nonstandard - error value - - 2011-10-18: Simon Goldschmidt - * opt.h: fixed default values of TCP_SNDLOWAT and TCP_SNDQUEUELOWAT for small - windows (bug #34176 select after non-blocking send times out) - - 2011-10-18: Simon Goldschmidt - * tcp_impl.h, tcp_out.c: fixed bug #34587: TCP_BUILD_MSS_OPTION doesn't - consider netif->mtu, causes slow network - - 2011-10-18: Simon Goldschmidt - * sockets.c: fixed bug #34581 missing parentheses in udplite sockets code - - 2011-10-18: Simon Goldschmidt - * sockets.h: fixed bug #34580 fcntl() is missing in LWIP_COMPAT_SOCKETS - - 2011-10-17: Simon Goldschmidt - * api_msg.c: fixed bug #34569: shutdown(SHUT_WR) crashes netconn/socket api - - 2011-10-13: Simon Goldschmidt - * tcp_in.c, tcp_out.c: fixed bug #34517 (persist timer is started although no - zero window is received) by starting the persist timer when a zero window is - received, not when we have more data queued for sending than fits into the - window - - 2011-10-13: Simon Goldschmidt - * def.h, timers.c: fixed bug #34541: LWIP_U32_DIFF is unnecessarily complex - - 2011-10-13: Simon Goldschmidt - * sockets.c, api_lib.c: fixed bug #34540: compiler error when CORE_LOCKING is - used and not all protocols are enabled - - 2011-10-12: Simon Goldschmidt - * pbuf.c: fixed bug #34534: Error in sending fragmented IP if MEM_ALIGNMENT > 4 - - 2011-10-09: Simon Goldschmidt - * tcp_out.c: fixed bug #34426: tcp_zero_window_probe() transmits incorrect - byte value when pcb->unacked != NULL - - 2011-10-09: Simon Goldschmidt - * ip4.c: fixed bug #34447 LWIP_IP_ACCEPT_UDP_PORT(dst_port) wrong - - 2011-09-27: Simon Goldschmidt - * tcp_in.c, tcp_out.c: Reset pcb->unsent_oversize in 2 more places... - - 2011-09-27: Simon Goldschmidt - * tcp_in.c: fixed bug #28288: Data after FIN in oos queue - - 2011-09-27: Simon Goldschmidt - * dhcp.c: fixed bug #34406 dhcp_option_hostname() can overflow the pbuf - - 2011-09-24: Simon Goldschmidt - * mem.h: fixed bug #34377 MEM_SIZE_F is not defined if MEM_LIBC_MALLOC==1 - - 2011-09-23: Simon Goldschmidt - * pbuf.h, tcp.c, tcp_in.c: fixed bug #33871: rejecting TCP_EVENT_RECV() for - the last packet including FIN can lose data - - 2011-09-22: Simon Goldschmidt - * tcp_impl.h: fixed bug #34355: nagle does not take snd_buf/snd_queuelen into - account - - 2011-09-21: Simon Goldschmidt - * opt.h: fixed default value of TCP_SND_BUF to not violate the sanity checks - in init.c - - 2011-09-20: Simon Goldschmidt - * timers.c: fixed bug #34337 (possible NULL pointer in sys_check_timeouts) - - 2011-09-11: Simon Goldschmidt - * tcp_out.c: use pcb->mss instead of TCP_MSS for preallocate mss-sized pbufs - (bug #34019) - - 2011-09-09: Simon Goldschmidt - * udp.c: fixed bug #34072: UDP broadcast is received from wrong UDP pcb if - udp port matches - - 2011-09-03: Simon Goldschmidt - * tcp_in.c: fixed bug #33952 PUSH flag in incoming packet is lost when packet - is aggregated and sent to application - - 2011-09-01: Simon Goldschmidt - * opt.h: fixed bug #31809 LWIP_EVENT_API in opts.h is inconsistent compared - to other options - - 2011-09-01: Simon Goldschmidt - * tcp_in.c: fixed bug #34111 RST for ACK to listening pcb has wrong seqno - - 2011-08-24: Simon Goldschmidt - * api_msg.c, sockets.c: fixed bug #33956 Wrong error returned when calling - accept() on UDP connections - - 2011-08-24: Simon Goldschmidt - * sockets.h: fixed bug #34057 socklen_t should be a typedef - - 2011-08-24: Simon Goldschmidt - * pbuf.c: fixed bug #34112 Odd check in pbuf_alloced_custom (typo) - - 2011-08-24: Simon Goldschmidt - * dhcp.c: fixed bug #34122 dhcp: hostname can overflow - - 2011-08-24: Simon Goldschmidt - * netif.c: fixed bug #34121 netif_add/netif_set_ipaddr fail on NULL ipaddr - - 2011-08-22: Simon Goldschmidt - * tcp_out.c: fixed bug #33962 TF_FIN not always set after FIN is sent. (This - merely prevents nagle from not transmitting fast after closing.) - - 2011-07-22: Simon Goldschmidt - * api_lib.c, api_msg.c, sockets.c, api.h: fixed bug #31084 (socket API returns - always EMSGSIZE on non-blocking sockets if data size > send buffers) -> now - lwip_send() sends as much as possible for non-blocking sockets - - 2011-07-22: Simon Goldschmidt - * pbuf.c/.h, timers.c: freeing ooseq pbufs when the pbuf pool is empty implemented - for NO_SYS==1: when not using sys_check_timeouts(), call PBUF_CHECK_FREE_OOSEQ() - at regular intervals from main level. - - 2011-07-21: Simon Goldschmidt - * etharp.c: fixed bug #33551 (ARP entries may time out although in use) by - sending an ARP request when an ARP entry is used in the last minute before - it would time out. - - 2011-07-04: Simon Goldschmidt - * sys_arch.txt: Fixed documentation after changing sys arch prototypes for 1.4.0. - - 2011-06-26: Simon Goldschmidt - * tcp.c: fixed bug #31723 (tcp_kill_prio() kills pcbs with the same prio) by - updating its documentation only. - - 2011-06-26: Simon Goldschmidt - * mem.c: fixed bug #33545: With MEM_USE_POOLS==1, mem_malloc can return an - unaligned pointer. - - 2011-06-26: Simon Goldschmidt - * mem.c: fixed bug #33544 "warning in mem.c in lwip 1.4.0 with NO_SYS=1" - - 2011-05-25: Simon Goldschmidt - * tcp.c: fixed bug #33398 (pointless conversion when checking TCP port range) - - - -(STABLE-1.4.0) - - ++ New features: - - 2011-03-27: Simon Goldschmidt - * tcp_impl.h, tcp_in.c, tcp_out.c: Removed 'dataptr' from 'struct tcp_seg' and - calculate it in tcp_zero_window_probe (the only place where it was used). - - 2010-11-21: Simon Goldschmidt - * dhcp.c/.h: Added a function to deallocate the struct dhcp from a netif - (fixes bug #31525). - - 2010-07-12: Simon Goldschmidt (patch by Stephane Lesage) - * ip.c, udp.c/.h, pbuf.h, sockets.c: task #10495: Added support for - IP_MULTICAST_LOOP at socket- and raw-API level. - - 2010-06-16: Simon Goldschmidt - * ip.c: Added an optional define (LWIP_IP_ACCEPT_UDP_PORT) that can allow - link-layer-addressed UDP traffic to be received while a netif is down (just - like DHCP during configuration) - - 2010-05-22: Simon Goldschmidt - * many many files: bug #27352: removed packing from ip_addr_t, the packed - version is now only used in protocol headers. Added global storage for - current src/dest IP address while in input functions. - - 2010-05-16: Simon Goldschmidt - * def.h: task #10391: Add preprocessor-macros for compile-time htonl - calculation (and use them throughout the stack where applicable) - - 2010-05-16: Simon Goldschmidt - * opt.h, memp_std.h, memp.c, ppp_oe.h/.c: PPPoE now uses its own MEMP pool - instead of the heap (moved struct pppoe_softc from ppp_oe.c to ppp_oe.h) - - 2010-05-16: Simon Goldschmidt - * opt.h, memp_std.h, dns.h/.c: DNS_LOCAL_HOSTLIST_IS_DYNAMIC uses its own - MEMP pool instead of the heap - - 2010-05-13: Simon Goldschmidt - * tcp.c, udp.c: task #6995: Implement SO_REUSEADDR (correctly), added - new option SO_REUSE_RXTOALL to pass received UDP broadcast/multicast - packets to more than one pcb. - - 2010-05-02: Simon Goldschmidt - * netbuf.h/.c, sockets.c, api_msg.c: use checksum-on-copy for sending - UDP data for LWIP_NETIF_TX_SINGLE_PBUF==1 - - 2010-04-30: Simon Goldschmidt - * udp.h/.c, pbuf.h/.c: task #6849: added udp_send(_to/_if) functions that - take a precalculated checksum, added pbuf_fill_chksum() to copy data - into a pbuf and at the same time calculating the checksum for that data - - 2010-04-29: Simon Goldschmidt - * ip_addr.h, etharp.h/.c, autoip.c: Create overridable macros for copying - 2-byte-aligned IP addresses and MAC addresses - - 2010-04-28: Patch by Bill Auerbach - * ip.c: Inline generating IP checksum to save a function call - - 2010-04-14: Simon Goldschmidt - * tcpip.h/.c, timers.c: Added an overridable define to get informed when the - tcpip_thread processes messages or timeouts to implement a watchdog. - - 2010-03-28: Simon Goldschmidt - * ip_frag.c: create a new (contiguous) PBUF_RAM for every outgoing - fragment if LWIP_NETIF_TX_SINGLE_PBUF==1 - - 2010-03-27: Simon Goldschmidt - * etharp.c: Speedup TX by moving code from find_entry to etharp_output/ - etharp_query to prevent unnecessary function calls (inspired by - patch #7135). - - 2010-03-20: Simon Goldschmidt - * opt.h, tcpip.c/.h: Added an option to disable tcpip_(un)timeout code - since the linker cannot do this automatically to save space. - - 2010-03-20: Simon Goldschmidt - * opt.h, etharp.c/.h: Added support for static ARP table entries - - 2010-03-14: Simon Goldschmidt - * tcp_impl.h, tcp_out.c, inet_chksum.h/.c: task #6849: Calculate checksum - when creating TCP segments, not when (re-)transmitting them. - - 2010-03-07: Simon Goldschmidt - * sockets.c: bug #28775 (select/event_callback: only check select_cb_list - on change) plus use SYS_LIGHTWEIGHT_PROT to protect the select code. - This should speed up receiving data on sockets as the select code in - event_callback is only executed when select is waiting. - - 2010-03-06: Simon Goldschmidt - * tcp_out.c: task #7013 (Create option to have all packets delivered to - netif->output in one piece): Always copy to try to create single pbufs - in tcp_write. - - 2010-03-06: Simon Goldschmidt - * api.h, api_lib.c, sockets.c: task #10167 (sockets: speed up TCP recv - by not allocating a netbuf): added function netconn_recv_tcp_pbuf() - for tcp netconns to receive pbufs, not netbufs; use that function - for tcp sockets. - - 2010-03-05: Jakob Ole Stoklundsen / Simon Goldschmidt - * opt.h, tcp.h, tcp_impl.h, tcp.c, tcp_in.c, tcp_out.c: task #7040: - Work on tcp_enqueue: Don't waste memory when chaining segments, - added option TCP_OVERSIZE to prevent creating many small pbufs when - calling tcp_write with many small blocks of data. Instead, pbufs are - allocated larger than needed and the space is used for later calls to - tcp_write. - - 2010-02-21: Simon Goldschmidt - * stats.c/.h: Added const char* name to mem- and memp-stats for easier - debugging. - - 2010-02-21: Simon Goldschmidt - * tcp.h (and usages), added tcp_impl.h: Splitted API and internal - implementation of tcp to make API usage cleare to application programmers - - 2010-02-14: Simon Goldschmidt/Stephane Lesage - * ip_addr.h: Improved some defines working on ip addresses, added faster - macro to copy addresses that cannot be NULL - - 2010-02-13: Simon Goldschmidt - * api.h, api_lib.c, api_msg.c, sockets.c: task #7865 (implement non- - blocking send operation) - - 2010-02-12: Simon Goldschmidt - * sockets.c/.h: Added a minimal version of posix fctl() to have a - standardised way to set O_NONBLOCK for nonblocking sockets. - - 2010-02-12: Simon Goldschmidt - * dhcp.c/.h, autoip.c/.h: task #10139 (Prefer statically allocated - memory): added autoip_set_struct() and dhcp_set_struct() to let autoip - and dhcp work with user-allocated structs instead of callin mem_malloc - - 2010-02-12: Simon Goldschmidt/Jeff Barber - * tcp.c/h: patch #6865 (SO_REUSEADDR for TCP): if pcb.so_options has - SOF_REUSEADDR set, allow binding to endpoint in TIME_WAIT - - 2010-02-12: Simon Goldschmidt - * sys layer: task #10139 (Prefer statically allocated memory): converted - mbox and semaphore functions to take pointers to sys_mbox_t/sys_sem_t; - converted sys_mbox_new/sys_sem_new to take pointers and return err_t; - task #7212: Add Mutex concept in sys_arch (define LWIP_COMPAT_MUTEX - to let sys.h use binary semaphores instead of mutexes - as before) - - 2010-02-09: Simon Goldschmidt (Simon Kallweit) - * timers.c/.h: Added function sys_restart_timeouts() from patch #7085 - (Restart system timeout handling) - - 2010-02-09: Simon Goldschmidt - * netif.c/.h, removed loopif.c/.h: task #10153 (Integrate loopif into - netif.c) - loopif does not have to be created by the port any more, - just define LWIP_HAVE_LOOPIF to 1. - - 2010-02-08: Simon Goldschmidt - * inet.h, ip_addr.c/.h: Added reentrant versions of inet_ntoa/ipaddr_ntoa - inet_ntoa_r/ipaddr_ntoa_r - - 2010-02-08: Simon Goldschmidt - * netif.h: Added netif_s/get_igmp_mac_filter() macros - - 2010-02-05: Simon Goldschmidt - * netif.h: Added function-like macros to get/set the hostname on a netif - - 2010-02-04: Simon Goldschmidt - * nearly every file: Replaced struct ip_addr by typedef ip_addr_t to - make changing the actual implementation behind the typedef easier. - - 2010-02-01: Simon Goldschmidt - * opt.h, memp_std.h, dns.h, netdb.c, memp.c: Let netdb use a memp pool - for allocating memory when getaddrinfo() is called. - - 2010-01-31: Simon Goldschmidt - * dhcp.h, dhcp.c: Reworked the code that parses DHCP options: parse - them once instead of parsing for every option. This also removes - the need for mem_malloc from dhcp_recv and makes it possible to - correctly retrieve the BOOTP file. - - 2010-01-30: simon Goldschmidt - * sockets.c: Use SYS_LIGHTWEIGHT_PROT instead of a semaphore to protect - the sockets array. - - 2010-01-29: Simon Goldschmidt (patch by Laura Garrett) - * api.h, api_msg.c, sockets.c: Added except set support in select - (patch #6860) - - 2010-01-29: Simon Goldschmidt (patch by Laura Garrett) - * api.h, sockets.h, err.h, api_lib.c, api_msg.c, sockets.c, err.c: - Add non-blocking support for connect (partly from patch #6860), - plus many cleanups in socket & netconn API. - - 2010-01-27: Simon Goldschmidt - * opt.h, tcp.h, init.c, api_msg.c: Added TCP_SNDQUEUELOWAT corresponding - to TCP_SNDLOWAT and added tcp_sndqueuelen() - this fixes bug #28605 - - 2010-01-26: Simon Goldschmidt - * snmp: Use memp pools for snmp instead of the heap; added 4 new pools. - - 2010-01-14: Simon Goldschmidt - * ppp.c/.h: Fixed bug #27856: PPP: Set netif link- and status-callback - by adding ppp_set_netif_statuscallback()/ppp_set_netif_linkcallback() - - 2010-01-13: Simon Goldschmidt - * mem.c: The heap now may be moved to user-defined memory by defining - LWIP_RAM_HEAP_POINTER as a void pointer to that memory's address - (patch #6966 and bug #26133) - - 2010-01-10: Simon Goldschmidt (Bill Auerbach) - * opt.h, memp.c: patch #6822 (Add option to place memory pools in - separate arrays) - - 2010-01-10: Simon Goldschmidt - * init.c, igmp.c: patch #6463 (IGMP - Adding Random Delay): added define - LWIP_RAND() for lwip-wide randomization (to be defined in cc.h) - - 2009-12-31: Simon Goldschmidt - * tcpip.c, init.c, memp.c, sys.c, memp_std.h, sys.h, tcpip.h - added timers.c/.h: Separated timer implementation from semaphore/mbox - implementation, moved timer implementation to timers.c/.h, timers are - now only called from tcpip_thread or by explicitly checking them. - (TASK#7235) - - 2009-12-27: Simon Goldschmidt - * opt.h, etharp.h/.c, init.c, tcpip.c: Added an additional option - LWIP_ETHERNET to support ethernet without ARP (necessary for pure PPPoE) - - - ++ Bugfixes: - - 2011-04-20: Simon Goldschmidt - * sys_arch.txt: sys_arch_timeouts() is not needed any more. - - 2011-04-13: Simon Goldschmidt - * tcp.c, udp.c: Fixed bug #33048 (Bad range for IP source port numbers) by - using ports in the IANA private/dynamic range (49152 through 65535). - - 2011-03-29: Simon Goldschmidt, patch by Emil Lhungdahl: - * etharp.h/.c: Fixed broken VLAN support. - - 2011-03-27: Simon Goldschmidt - * tcp.c: Fixed bug #32926 (TCP_RMV(&tcp_bound_pcbs) is called on unbound tcp - pcbs) by checking if the pcb was bound (local_port != 0). - - 2011-03-27: Simon Goldschmidt - * ppp.c: Fixed bug #32280 (ppp: a pbuf is freed twice) - - 2011-03-27: Simon Goldschmidt - * sockets.c: Fixed bug #32906: lwip_connect+lwip_send did not work for udp and - raw pcbs with LWIP_TCPIP_CORE_LOCKING==1. - - 2011-03-27: Simon Goldschmidt - * tcp_out.c: Fixed bug #32820 (Outgoing TCP connections created before route - is present never times out) by starting retransmission timer before checking - route. - - 2011-03-22: Simon Goldschmidt - * ppp.c: Fixed bug #32648 (PPP code crashes when terminating a link) by only - calling sio_read_abort() if the file descriptor is valid. - - 2011-03-14: Simon Goldschmidt - * err.h/.c, sockets.c, api_msg.c: fixed bug #31748 (Calling non-blocking connect - more than once can render a socket useless) since it mainly involves changing - "FATAL" classification of error codes: ERR_USE and ERR_ISCONN just aren't fatal. - - 2011-03-13: Simon Goldschmidt - * sockets.c: fixed bug #32769 (ESHUTDOWN is linux-specific) by fixing - err_to_errno_table (ERR_CLSD: ENOTCONN instead of ESHUTDOWN), ERR_ISCONN: - use EALRADY instead of -1 - - 2011-03-13: Simon Goldschmidt - * api_lib.c: netconn_accept: return ERR_ABRT instead of ERR_CLSD if the - connection has been aborted by err_tcp (since this is not a normal closing - procedure). - - 2011-03-13: Simon Goldschmidt - * tcp.c: tcp_bind: return ERR_VAL instead of ERR_ISCONN when trying to bind - with pcb->state != CLOSED - - 2011-02-17: Simon Goldschmidt - * rawapi.txt: Fixed bug #32561 tcp_poll argument definition out-of-order in - documentation - - 2011-02-17: Simon Goldschmidt - * many files: Added missing U/UL modifiers to fix 16-bit-arch portability. - - 2011-01-24: Simon Goldschmidt - * sockets.c: Fixed bug #31741: lwip_select seems to have threading problems - - 2010-12-02: Simon Goldschmidt - * err.h: Fixed ERR_IS_FATAL so that ERR_WOULDBLOCK is not fatal. - - 2010-11-23: Simon Goldschmidt - * api.h, api_lib.c, api_msg.c, sockets.c: netconn.recv_avail is only used for - LWIP_SO_RCVBUF and ioctl/FIONREAD. - - 2010-11-23: Simon Goldschmidt - * etharp.c: Fixed bug #31720: ARP-queueing: RFC 1122 recommends to queue at - least 1 packet -> ARP_QUEUEING==0 now queues the most recent packet. - - 2010-11-23: Simon Goldschmidt - * tcp_in.c: Fixed bug #30577: tcp_input: don't discard ACK-only packets after - refusing 'refused_data' again. - - 2010-11-22: Simon Goldschmidt - * sockets.c: Fixed bug #31590: getsockopt(... SO_ERROR ...) gives EINPROGRESS - after a successful nonblocking connection. - - 2010-11-22: Simon Goldschmidt - * etharp.c: Fixed bug #31722: IP packets sent with an AutoIP source addr - must be sent link-local - - 2010-11-22: Simon Goldschmidt - * timers.c: patch #7329: tcp_timer_needed prototype was ifdef'ed out for - LWIP_TIMERS==0 - - 2010-11-20: Simon Goldschmidt - * sockets.c: Fixed bug #31170: lwip_setsockopt() does not set socket number - - 2010-11-20: Simon Goldschmidt - * sockets.h: Fixed bug #31304: Changed SHUT_RD, SHUT_WR and SHUT_RDWR to - resemble other stacks. - - 2010-11-20: Simon Goldschmidt - * dns.c: Fixed bug #31535: TCP_SND_QUEUELEN must be at least 2 or else - no-copy TCP writes will never succeed. - - 2010-11-20: Simon Goldschmidt - * dns.c: Fixed bug #31701: Error return value from dns_gethostbyname() does - not match documentation: return ERR_ARG instead of ERR_VAL if not - initialized or wrong argument. - - 2010-10-20: Simon Goldschmidt - * sockets.h: Fixed bug #31385: sizeof(struct sockaddr) is 30 but should be 16 - - 2010-10-05: Simon Goldschmidt - * dhcp.c: Once again fixed #30038: DHCP/AutoIP cooperation failed when - replugging the network cable after an AutoIP address was assigned. - - 2010-08-10: Simon Goldschmidt - * tcp.c: Fixed bug #30728: tcp_new_port() did not check listen pcbs - - 2010-08-03: Simon Goldschmidt - * udp.c, raw.c: Don't chain empty pbufs when sending them (fixes bug #30625) - - 2010-08-01: Simon Goldschmidt (patch by Greg Renda) - * ppp.c: Applied patch #7264 (PPP protocols are rejected incorrectly on big - endian architectures) - - 2010-07-28: Simon Goldschmidt - * api_lib.c, api_msg.c, sockets.c, mib2.c: Fixed compilation with TCP or UDP - disabled. - - 2010-07-27: Simon Goldschmidt - * tcp.c: Fixed bug #30565 (tcp_connect() check bound list): that check did no - harm but never did anything - - 2010-07-21: Simon Goldschmidt - * ip.c: Fixed invalid fix for bug #30402 (CHECKSUM_GEN_IP_INLINE does not - add IP options) - - 2010-07-16: Kieran Mansley - * msg_in.c: Fixed SNMP ASN constant defines to not use ! operator - - 2010-07-10: Simon Goldschmidt - * ip.c: Fixed bug #30402: CHECKSUM_GEN_IP_INLINE does not add IP options - - 2010-06-30: Simon Goldschmidt - * api_msg.c: fixed bug #30300 (shutdown parameter was not initialized in - netconn_delete) - - 2010-06-28: Kieran Mansley - * timers.c remove unportable printing of C function pointers - - 2010-06-24: Simon Goldschmidt - * init.c, timers.c/.h, opt.h, memp_std.h: From patch #7221: added flag - NO_SYS_NO_TIMERS to drop timer support for NO_SYS==1 for easier upgrading - - 2010-06-24: Simon Goldschmidt - * api(_lib).c/.h, api_msg.c/.h, sockets.c/.h: Fixed bug #10088: Correctly - implemented shutdown at socket level. - - 2010-06-21: Simon Goldschmidt - * pbuf.c/.h, ip_frag.c/.h, opt.h, memp_std.h: Fixed bug #29361 (ip_frag has - problems with zero-copy DMA MACs) by adding custom pbufs and implementing - custom pbufs that reference other (original) pbufs. Additionally set - IP_FRAG_USES_STATIC_BUF=0 as default to be on the safe side. - - 2010-06-15: Simon Goldschmidt - * dhcp.c: Fixed bug #29970: DHCP endian issue parsing option responses - - 2010-06-14: Simon Goldschmidt - * autoip.c: Fixed bug #30039: AutoIP does not reuse previous addresses - - 2010-06-12: Simon Goldschmidt - * dhcp.c: Fixed bug #30038: dhcp_network_changed doesn't reset AUTOIP coop - state - - 2010-05-17: Simon Goldschmidt - * netdb.c: Correctly NULL-terminate h_addr_list - - 2010-05-16: Simon Goldschmidt - * def.h/.c: changed the semantics of LWIP_PREFIX_BYTEORDER_FUNCS to prevent - "symbol already defined" i.e. when linking to winsock - - 2010-05-05: Simon Goldschmidt - * def.h, timers.c: Fixed bug #29769 (sys_check_timeouts: sys_now() may - overflow) - - 2010-04-21: Simon Goldschmidt - * api_msg.c: Fixed bug #29617 (sometime cause stall on delete listening - connection) - - 2010-03-28: Luca Ceresoli - * ip_addr.c/.h: patch #7143: Add a few missing const qualifiers - - 2010-03-27: Luca Ceresoli - * mib2.c: patch #7130: remove meaningless const qualifiers - - 2010-03-26: Simon Goldschmidt - * tcp_out.c: Make LWIP_NETIF_TX_SINGLE_PBUF work for TCP, too - - 2010-03-26: Simon Goldschmidt - * various files: Fixed compiling with different options disabled (TCP/UDP), - triggered by bug #29345; don't allocate acceptmbox if LWIP_TCP is disabled - - 2010-03-25: Simon Goldschmidt - * sockets.c: Fixed bug #29332: lwip_select() processes readset incorrectly - - 2010-03-25: Simon Goldschmidt - * tcp_in.c, test_tcp_oos.c: Fixed bug #29080: Correctly handle remote side - overrunning our rcv_wnd in ooseq case. - - 2010-03-22: Simon Goldschmidt - * tcp.c: tcp_listen() did not copy the pcb's prio. - - 2010-03-19: Simon Goldschmidt - * snmp_msg.c: Fixed bug #29256: SNMP Trap address was not correctly set - - 2010-03-14: Simon Goldschmidt - * opt.h, etharp.h: Fixed bug #29148 (Incorrect PBUF_POOL_BUFSIZE for ports - where ETH_PAD_SIZE > 0) by moving definition of ETH_PAD_SIZE to opt.h - and basing PBUF_LINK_HLEN on it. - - 2010-03-08: Simon Goldschmidt - * netif.c, ipv4/ip.c: task #10241 (AutoIP: don't break existing connections - when assiging routable address): when checking incoming packets and - aborting existing connection on address change, filter out link-local - addresses. - - 2010-03-06: Simon Goldschmidt - * sockets.c: Fixed LWIP_NETIF_TX_SINGLE_PBUF for LWIP_TCPIP_CORE_LOCKING - - 2010-03-06: Simon Goldschmidt - * ipv4/ip.c: Don't try to forward link-local addresses - - 2010-03-06: Simon Goldschmidt - * etharp.c: Fixed bug #29087: etharp: don't send packets for LinkLocal- - addresses to gw - - 2010-03-05: Simon Goldschmidt - * dhcp.c: Fixed bug #29072: Correctly set ciaddr based on message-type - and state. - - 2010-03-05: Simon Goldschmidt - * api_msg.c: Correctly set TCP_WRITE_FLAG_MORE when netconn_write is split - into multiple calls to tcp_write. - - 2010-02-21: Simon Goldschmidt - * opt.h, mem.h, dns.c: task #10140: Remove DNS_USES_STATIC_BUF (keep - the implementation of DNS_USES_STATIC_BUF==1) - - 2010-02-20: Simon Goldschmidt - * tcp.h, tcp.c, tcp_in.c, tcp_out.c: Task #10088: Correctly implement - close() vs. shutdown(). Now the application does not get any more - recv callbacks after calling tcp_close(). Added tcp_shutdown(). - - 2010-02-19: Simon Goldschmidt - * mem.c/.h, pbuf.c: Renamed mem_realloc() to mem_trim() to prevent - confusion with realloc() - - 2010-02-15: Simon Goldschmidt/Stephane Lesage - * netif.c/.h: Link status does not depend on LWIP_NETIF_LINK_CALLBACK - (fixes bug #28899) - - 2010-02-14: Simon Goldschmidt - * netif.c: Fixed bug #28877 (Duplicate ARP gratuitous packet with - LWIP_NETIF_LINK_CALLBACK set on) by only sending if both link- and - admin-status of a netif are up - - 2010-02-14: Simon Goldschmidt - * opt.h: Disable ETHARP_TRUST_IP_MAC by default since it slows down packet - reception and is not really necessary - - 2010-02-14: Simon Goldschmidt - * etharp.c/.h: Fixed ARP input processing: only add a new entry if a - request was directed as us (RFC 826, Packet Reception), otherwise - only update existing entries; internalized some functions - - 2010-02-14: Simon Goldschmidt - * netif.h, etharp.c, tcpip.c: Fixed bug #28183 (ARP and TCP/IP cannot be - disabled on netif used for PPPoE) by adding a new netif flag - (NETIF_FLAG_ETHERNET) that tells the stack the device is an ethernet - device but prevents usage of ARP (so that ethernet_input can be used - for PPPoE). - - 2010-02-12: Simon Goldschmidt - * netif.c: netif_set_link_up/down: only do something if the link state - actually changes - - 2010-02-12: Simon Goldschmidt/Stephane Lesage - * api_msg.c: Fixed bug #28865 (Cannot close socket/netconn in non-blocking - connect) - - 2010-02-12: Simon Goldschmidt - * mem.h: Fixed bug #28866 (mem_realloc function defined in mem.h) - - 2010-02-09: Simon Goldschmidt - * api_lib.c, api_msg.c, sockets.c, api.h, api_msg.h: Fixed bug #22110 - (recv() makes receive window update for data that wasn't received by - application) - - 2010-02-09: Simon Goldschmidt/Stephane Lesage - * sockets.c: Fixed bug #28853 (lwip_recvfrom() returns 0 on receive time-out - or any netconn_recv() error) - - 2010-02-09: Simon Goldschmidt - * ppp.c: task #10154 (PPP: Update snmp in/out counters for tx/rx packets) - - 2010-02-09: Simon Goldschmidt - * netif.c: For loopback packets, adjust the stats- and snmp-counters - for the loopback netif. - - 2010-02-08: Simon Goldschmidt - * igmp.c/.h, ip.h: Moved most defines from igmp.h to igmp.c for clarity - since they are not used anywhere else. - - 2010-02-08: Simon Goldschmidt (Stéphane Lesage) - * igmp.c, igmp.h, stats.c, stats.h: Improved IGMP stats - (patch from bug #28798) - - 2010-02-08: Simon Goldschmidt (Stéphane Lesage) - * igmp.c: Fixed bug #28798 (Error in "Max Response Time" processing) and - another bug when LWIP_RAND() returns zero. - - 2010-02-04: Simon Goldschmidt - * nearly every file: Use macros defined in ip_addr.h (some of them new) - to work with IP addresses (preparation for bug #27352 - Change ip_addr - from struct to typedef (u32_t) - and better code). - - 2010-01-31: Simon Goldschmidt - * netif.c: Don't call the link-callback from netif_set_up/down() since - this invalidly retriggers DHCP. - - 2010-01-29: Simon Goldschmidt - * ip_addr.h, inet.h, def.h, inet.c, def.c, more: Cleanly separate the - portability file inet.h and its contents from the stack: moved htonX- - functions to def.h (and the new def.c - they are not ipv4 dependent), - let inet.h depend on ip_addr.h and not the other way round. - This fixes bug #28732. - - 2010-01-28: Kieran Mansley - * tcp.c: Ensure ssthresh >= 2*MSS - - 2010-01-27: Simon Goldschmidt - * tcp.h, tcp.c, tcp_in.c: Fixed bug #27871: Calling tcp_abort() in recv - callback can lead to accessing unallocated memory. As a consequence, - ERR_ABRT means the application has called tcp_abort()! - - 2010-01-25: Simon Goldschmidt - * snmp_structs.h, msg_in.c: Partly fixed bug #22070 (MIB_OBJECT_WRITE_ONLY - not implemented in SNMP): write-only or not-accessible are still - returned by getnext (though not by get) - - 2010-01-24: Simon Goldschmidt - * snmp: Renamed the private mib node from 'private' to 'mib_private' to - not use reserved C/C++ keywords - - 2010-01-23: Simon Goldschmidt - * sockets.c: Fixed bug #28716: select() returns 0 after waiting for less - than 1 ms - - 2010-01-21: Simon Goldschmidt - * tcp.c, api_msg.c: Fixed bug #28651 (tcp_connect: no callbacks called - if tcp_enqueue fails) both in raw- and netconn-API - - 2010-01-19: Simon Goldschmidt - * api_msg.c: Fixed bug #27316: netconn: Possible deadlock in err_tcp - - 2010-01-18: Iordan Neshev/Simon Goldschmidt - * src/netif/ppp: reorganised PPP sourcecode to 2.3.11 including some - bugfix backports from 2.4.x. - - 2010-01-18: Simon Goldschmidt - * mem.c: Fixed bug #28679: mem_realloc calculates mem_stats wrong - - 2010-01-17: Simon Goldschmidt - * api_lib.c, api_msg.c, (api_msg.h, api.h, sockets.c, tcpip.c): - task #10102: "netconn: clean up conn->err threading issues" by adding - error return value to struct api_msg_msg - - 2010-01-17: Simon Goldschmidt - * api.h, api_lib.c, sockets.c: Changed netconn_recv() and netconn_accept() - to return err_t (bugs #27709 and #28087) - - 2010-01-14: Simon Goldschmidt - * ...: Use typedef for function prototypes throughout the stack. - - 2010-01-13: Simon Goldschmidt - * api_msg.h/.c, api_lib.c: Fixed bug #26672 (close connection when receive - window = 0) by correctly draining recvmbox/acceptmbox - - 2010-01-11: Simon Goldschmidt - * pap.c: Fixed bug #13315 (PPP PAP authentication can result in - erroneous callbacks) by copying the code from recent pppd - - 2010-01-10: Simon Goldschmidt - * raw.c: Fixed bug #28506 (raw_bind should filter received packets) - - 2010-01-10: Simon Goldschmidt - * tcp.h/.c: bug #28127 (remove call to tcp_output() from tcp_ack(_now)()) - - 2010-01-08: Simon Goldschmidt - * sockets.c: Fixed bug #28519 (lwip_recvfrom bug with len > 65535) - - 2010-01-08: Simon Goldschmidt - * dns.c: Copy hostname for DNS_LOCAL_HOSTLIST_IS_DYNAMIC==1 since string - passed to dns_local_addhost() might be volatile - - 2010-01-07: Simon Goldschmidt - * timers.c, tcp.h: Call tcp_timer_needed() with NO_SYS==1, too - - 2010-01-06: Simon Goldschmidt - * netdb.h: Fixed bug #28496: missing include guards in netdb.h - - 2009-12-31: Simon Goldschmidt - * many ppp files: Reorganised PPP source code from ucip structure to pppd - structure to easily compare our code against the pppd code (around v2.3.1) - - 2009-12-27: Simon Goldschmidt - * tcp_in.c: Another fix for bug #28241 (ooseq processing) and adapted - unit test - - -(STABLE-1.3.2) - - ++ New features: - - 2009-10-27 Simon Goldschmidt/Stephan Lesage - * netifapi.c/.h: Added netifapi_netif_set_addr() - - 2009-10-07 Simon Goldschmidt/Fabian Koch - * api_msg.c, netbuf.c/.h, opt.h: patch #6888: Patch for UDP Netbufs to - support dest-addr and dest-port (optional: LWIP_NETBUF_RECVINFO) - - 2009-08-26 Simon Goldschmidt/Simon Kallweit - * slipif.c/.h: bug #26397: SLIP polling support - - 2009-08-25 Simon Goldschmidt - * opt.h, etharp.h/.c: task #9033: Support IEEE 802.1q tagged frame (VLAN), - New configuration options ETHARP_SUPPORT_VLAN and ETHARP_VLAN_CHECK. - - 2009-08-25 Simon Goldschmidt - * ip_addr.h, netdb.c: patch #6900: added define ip_ntoa(struct ip_addr*) - - 2009-08-24 Jakob Stoklund Olesen - * autoip.c, dhcp.c, netif.c: patch #6725: Teach AutoIP and DHCP to respond - to netif_set_link_up(). - - 2009-08-23 Simon Goldschmidt - * tcp.h/.c: Added function tcp_debug_state_str() to convert a tcp state - to a human-readable string. - - ++ Bugfixes: - - 2009-12-24: Kieran Mansley - * tcp_in.c Apply patches from Oleg Tyshev to improve OOS processing - (BUG#28241) - - 2009-12-06: Simon Goldschmidt - * ppp.h/.c: Fixed bug #27079 (Yet another leak in PPP): outpacket_buf can - be statically allocated (like in ucip) - - 2009-12-04: Simon Goldschmidt (patch by Ioardan Neshev) - * pap.c: patch #6969: PPP: missing PAP authentication UNTIMEOUT - - 2009-12-03: Simon Goldschmidt - * tcp.h, tcp_in.c, tcp_out.c: Fixed bug #28106: dup ack for fast retransmit - could have non-zero length - - 2009-12-02: Simon Goldschmidt - * tcp_in.c: Fixed bug #27904: TCP sends too many ACKs: delay resetting - tcp_input_pcb until after calling the pcb's callbacks - - 2009-11-29: Simon Goldschmidt - * tcp_in.c: Fixed bug #28054: Two segments with FIN flag on the out-of- - sequence queue, also fixed PBUF_POOL leak in the out-of-sequence code - - 2009-11-29: Simon Goldschmidt - * pbuf.c: Fixed bug #28064: pbuf_alloc(PBUF_POOL) is not thread-safe by - queueing a call into tcpip_thread to free ooseq-bufs if the pool is empty - - 2009-11-26: Simon Goldschmidt - * tcp.h: Fixed bug #28098: Nagle can prevent fast retransmit from sending - segment - - 2009-11-26: Simon Goldschmidt - * tcp.h, sockets.c: Fixed bug #28099: API required to disable Nagle - algorithm at PCB level - - 2009-11-22: Simon Goldschmidt - * tcp_out.c: Fixed bug #27905: FIN isn't combined with data on unsent - - 2009-11-22: Simon Goldschmidt (suggested by Bill Auerbach) - * tcp.c: tcp_alloc: prevent increasing stats.err for MEMP_TCP_PCB when - reusing time-wait pcb - - 2009-11-20: Simon Goldschmidt (patch by Albert Bartel) - * sockets.c: Fixed bug #28062: Data received directly after accepting - does not wake up select - - 2009-11-11: Simon Goldschmidt - * netdb.h: Fixed bug #27994: incorrect define for freeaddrinfo(addrinfo) - - 2009-10-30: Simon Goldschmidt - * opt.h: Increased default value for TCP_MSS to 536, updated default - value for TCP_WND to 4*TCP_MSS to keep delayed ACK working. - - 2009-10-28: Kieran Mansley - * tcp_in.c, tcp_out.c, tcp.h: re-work the fast retransmission code - to follow algorithm from TCP/IP Illustrated - - 2009-10-27: Kieran Mansley - * tcp_in.c: fix BUG#27445: grow cwnd with every duplicate ACK - - 2009-10-25: Simon Goldschmidt - * tcp.h: bug-fix in the TCP_EVENT_RECV macro (has to call tcp_recved if - pcb->recv is NULL to keep rcv_wnd correct) - - 2009-10-25: Simon Goldschmidt - * tcp_in.c: Fixed bug #26251: RST process in TIME_WAIT TCP state - - 2009-10-23: Simon Goldschmidt (David Empson) - * tcp.c: Fixed bug #27783: Silly window avoidance for small window sizes - - 2009-10-21: Simon Goldschmidt - * tcp_in.c: Fixed bug #27215: TCP sent() callback gives leading and - trailing 1 byte len (SYN/FIN) - - 2009-10-21: Simon Goldschmidt - * tcp_out.c: Fixed bug #27315: zero window probe and FIN - - 2009-10-19: Simon Goldschmidt - * dhcp.c/.h: Minor code simplification (don't store received pbuf, change - conditional code to assert where applicable), check pbuf length before - testing for valid reply - - 2009-10-19: Simon Goldschmidt - * dhcp.c: Removed most calls to udp_connect since they aren't necessary - when using udp_sendto_if() - always stay connected to IP_ADDR_ANY. - - 2009-10-16: Simon Goldschmidt - * ip.c: Fixed bug #27390: Source IP check in ip_input() causes it to drop - valid DHCP packets -> allow 0.0.0.0 as source address when LWIP_DHCP is - enabled - - 2009-10-15: Simon Goldschmidt (Oleg Tyshev) - * tcp_in.c: Fixed bug #27329: dupacks by unidirectional data transmit - - 2009-10-15: Simon Goldschmidt - * api_lib.c: Fixed bug #27709: conn->err race condition on netconn_recv() - timeout - - 2009-10-15: Simon Goldschmidt - * autoip.c: Fixed bug #27704: autoip starts with wrong address - LWIP_AUTOIP_CREATE_SEED_ADDR() returned address in host byte order instead - of network byte order - - 2009-10-11 Simon Goldschmidt (Jörg Kesten) - * tcp_out.c: Fixed bug #27504: tcp_enqueue wrongly concatenates segments - which are not consecutive when retransmitting unacked segments - - 2009-10-09 Simon Goldschmidt - * opt.h: Fixed default values of some stats to only be enabled if used - Fixes bug #27338: sys_stats is defined when NO_SYS = 1 - - 2009-08-30 Simon Goldschmidt - * ip.c: Fixed bug bug #27345: "ip_frag() does not use the LWIP_NETIF_LOOPBACK - function" by checking for loopback before calling ip_frag - - 2009-08-25 Simon Goldschmidt - * dhcp.c: fixed invalid dependency to etharp_query if DHCP_DOES_ARP_CHECK==0 - - 2009-08-23 Simon Goldschmidt - * ppp.c: bug #27078: Possible memory leak in pppInit() - - 2009-08-23 Simon Goldschmidt - * netdb.c, dns.c: bug #26657: DNS, if host name is "localhost", result - is error. - - 2009-08-23 Simon Goldschmidt - * opt.h, init.c: bug #26649: TCP fails when TCP_MSS > TCP_SND_BUF - Fixed wrong parenthesis, added check in init.c - - 2009-08-23 Simon Goldschmidt - * ppp.c: bug #27266: wait-state debug message in pppMain occurs every ms - - 2009-08-23 Simon Goldschmidt - * many ppp files: bug #27267: Added include to string.h where needed - - 2009-08-23 Simon Goldschmidt - * tcp.h: patch #6843: tcp.h macro optimization patch (for little endian) - - -(STABLE-1.3.1) - - ++ New features: - - 2009-05-10 Simon Goldschmidt - * opt.h, sockets.c, pbuf.c, netbuf.h, pbuf.h: task #7013: Added option - LWIP_NETIF_TX_SINGLE_PBUF to try to create transmit packets from only - one pbuf to help MACs that don't support scatter-gather DMA. - - 2009-05-09 Simon Goldschmidt - * icmp.h, icmp.c: Shrinked ICMP code, added option to NOT check icoming - ECHO pbuf for size (just use it): LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN - - 2009-05-05 Simon Goldschmidt, Jakob Stoklund Olesen - * ip.h, ip.c: Added ip_current_netif() & ip_current_header() to receive - extended info about the currently received packet. - - 2009-04-27 Simon Goldschmidt - * sys.h: Made SYS_LIGHTWEIGHT_PROT and sys_now() work with NO_SYS=1 - - 2009-04-25 Simon Goldschmidt - * mem.c, opt.h: Added option MEM_USE_POOLS_TRY_BIGGER_POOL to try the next - bigger malloc pool if one is empty (only usable with MEM_USE_POOLS). - - 2009-04-21 Simon Goldschmidt - * dns.c, init.c, dns.h, opt.h: task #7507, patch #6786: DNS supports static - hosts table. New configuration options DNS_LOCAL_HOSTLIST and - DNS_LOCAL_HOSTLIST_IS_DYNAMIC. Also, DNS_LOOKUP_LOCAL_EXTERN() can be defined - as an external function for lookup. - - 2009-04-15 Simon Goldschmidt - * dhcp.c: patch #6763: Global DHCP XID can be redefined to something more unique - - 2009-03-31 Kieran Mansley - * tcp.c, tcp_out.c, tcp_in.c, sys.h, tcp.h, opts.h: add support for - TCP timestamp options, off by default. Rework tcp_enqueue() to - take option flags rather than specified option data - - 2009-02-18 Simon Goldschmidt - * cc.h: Added printf formatter for size_t: SZT_F - - 2009-02-16 Simon Goldschmidt (patch by Rishi Khan) - * icmp.c, opt.h: patch #6539: (configurable) response to broadcast- and multicast - pings - - 2009-02-12 Simon Goldschmidt - * init.h: Added LWIP_VERSION to get the current version of the stack - - 2009-02-11 Simon Goldschmidt (suggested by Gottfried Spitaler) - * opt.h, memp.h/.c: added MEMP_MEM_MALLOC to use mem_malloc/mem_free instead - of the pool allocator (can save code size with MEM_LIBC_MALLOC if libc-malloc - is otherwise used) - - 2009-01-28 Jonathan Larmour (suggested by Bill Bauerbach) - * ipv4/inet_chksum.c, ipv4/lwip/inet_chksum.h: inet_chksum_pseudo_partial() - is only used by UDPLITE at present, so conditionalise it. - - 2008-12-03 Simon Goldschmidt (base on patch from Luca Ceresoli) - * autoip.c: checked in (slightly modified) patch #6683: Customizable AUTOIP - "seed" address. This should reduce AUTOIP conflicts if - LWIP_AUTOIP_CREATE_SEED_ADDR is overridden. - - 2008-10-02 Jonathan Larmour and Rishi Khan - * sockets.c (lwip_accept): Return EWOULDBLOCK if would block on non-blocking - socket. - - 2008-06-30 Simon Goldschmidt - * mem.c, opt.h, stats.h: fixed bug #21433: Calling mem_free/pbuf_free from - interrupt context isn't safe: LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT allows - mem_free to run between mem_malloc iterations. Added illegal counter for - mem stats. - - 2008-06-27 Simon Goldschmidt - * stats.h/.c, some other files: patch #6483: stats module improvement: - Added defines to display each module's statistic individually, added stats - defines for MEM, MEMP and SYS modules, removed (unused) rexmit counter. - - 2008-06-17 Simon Goldschmidt - * err.h: patch #6459: Made err_t overridable to use a more efficient type - (define LWIP_ERR_T in cc.h) - - 2008-06-17 Simon Goldschmidt - * slipif.c: patch #6480: Added a configuration option for slipif for symmetry - to loopif - - 2008-06-17 Simon Goldschmidt (patch by Luca Ceresoli) - * netif.c, loopif.c, ip.c, netif.h, loopif.h, opt.h: Checked in slightly - modified version of patch # 6370: Moved loopif code to netif.c so that - loopback traffic is supported on all netifs (all local IPs). - Added option to limit loopback packets for each netifs. - - - ++ Bugfixes: - 2009-08-12 Kieran Mansley - * tcp_in.c, tcp.c: Fix bug #27209: handle trimming of segments when - out of window or out of order properly - - 2009-08-12 Kieran Mansley - * tcp_in.c: Fix bug #27199: use snd_wl2 instead of snd_wl1 - - 2009-07-28 Simon Goldschmidt - * mem.h: Fixed bug #27105: "realloc() cannot replace mem_realloc()"s - - 2009-07-27 Kieran Mansley - * api.h api_msg.h netdb.h sockets.h: add missing #include directives - - 2009-07-09 Kieran Mansley - * api_msg.c, sockets.c, api.h: BUG23240 use signed counters for - recv_avail and don't increment counters until message successfully - sent to mbox - - 2009-06-25 Kieran Mansley - * api_msg.c api.h: BUG26722: initialise netconn write variables - in netconn_alloc - - 2009-06-25 Kieran Mansley - * tcp.h: BUG26879: set ret value in TCP_EVENT macros when function is not set - - 2009-06-25 Kieran Mansley - * tcp.c, tcp_in.c, tcp_out.c, tcp.h: BUG26301 and BUG26267: correct - simultaneous close behaviour, and make snd_nxt have the same meaning - as in the RFCs. - - 2009-05-12 Simon Goldschmidt - * etharp.h, etharp.c, netif.c: fixed bug #26507: "Gratuitous ARP depends on - arp_table / uses etharp_query" by adding etharp_gratuitous() - - 2009-05-12 Simon Goldschmidt - * ip.h, ip.c, igmp.c: bug #26487: Added ip_output_if_opt that can add IP options - to the IP header (used by igmp_ip_output_if) - - 2009-05-06 Simon Goldschmidt - * inet_chksum.c: On little endian architectures, use LWIP_PLATFORM_HTONS (if - defined) for SWAP_BYTES_IN_WORD to speed up checksumming. - - 2009-05-05 Simon Goldschmidt - * sockets.c: bug #26405: Prematurely released semaphore causes lwip_select() - to crash - - 2009-05-04 Simon Goldschmidt - * init.c: snmp was not initialized in lwip_init() - - 2009-05-04 Frédéric Bernon - * dhcp.c, netbios.c: Changes if IP_SOF_BROADCAST is enabled. - - 2009-05-03 Simon Goldschmidt - * tcp.h: bug #26349: Nagle algorithm doesn't send although segment is full - (and unsent->next == NULL) - - 2009-05-02 Simon Goldschmidt - * tcpip.h, tcpip.c: fixed tcpip_untimeout (does not need the time, broken after - 1.3.0 in CVS only) - fixes compilation of ppp_oe.c - - 2009-05-02 Simon Goldschmidt - * msg_in.c: fixed bug #25636: SNMPSET value is ignored for integer fields - - 2009-05-01 Simon Goldschmidt - * pap.c: bug #21680: PPP upap_rauthnak() drops legal NAK packets - - 2009-05-01 Simon Goldschmidt - * ppp.c: bug #24228: Memory corruption with PPP and DHCP - - 2009-04-29 Frédéric Bernon - * raw.c, udp.c, init.c, opt.h, ip.h, sockets.h: bug #26309: Implement the - SO(F)_BROADCAST filter for all API layers. Avoid the unindented reception - of broadcast packets even when this option wasn't set. Port maintainers - which want to enable this filter have to set IP_SOF_BROADCAST=1 in opt.h. - If you want this option also filter broadcast on recv operations, you also - have to set IP_SOF_BROADCAST_RECV=1 in opt.h. - - 2009-04-28 Simon Goldschmidt, Jakob Stoklund Olesen - * dhcp.c: patch #6721, bugs #25575, #25576: Some small fixes to DHCP and - DHCP/AUTOIP cooperation - - 2009-04-25 Simon Goldschmidt, Oleg Tyshev - * tcp_out.c: bug #24212: Deadlocked tcp_retransmit due to exceeded pcb->cwnd - Fixed by sorting the unsent and unacked queues (segments are inserted at the - right place in tcp_output and tcp_rexmit). - - 2009-04-25 Simon Goldschmidt - * memp.c, mem.c, memp.h, mem_std.h: bug #26213 "Problem with memory allocation - when debugging": memp_sizes contained the wrong sizes (including sanity - regions); memp pools for MEM_USE_POOLS were too small - - 2009-04-24 Simon Goldschmidt, Frédéric Bernon - * inet.c: patch #6765: Fix a small problem with the last changes (incorrect - behavior, with with ip address string not ended by a '\0', a space or a - end of line) - - 2009-04-19 Simon Goldschmidt - * rawapi.txt: Fixed bug #26069: Corrected documentation: if tcp_connect fails, - pcb->err is called, not pcb->connected (with an error code). - - 2009-04-19 Simon Goldschmidt - * tcp_out.c: Fixed bug #26236: "TCP options (timestamp) don't work with - no-copy-tcpwrite": deallocate option data, only concat segments with same flags - - 2009-04-19 Simon Goldschmidt - * tcp_out.c: Fixed bug #25094: "Zero-length pbuf" (options are now allocated - in the header pbuf, not the data pbuf) - - 2009-04-18 Simon Goldschmidt - * api_msg.c: fixed bug #25695: Segmentation fault in do_writemore() - - 2009-04-15 Simon Goldschmidt - * sockets.c: tried to fix bug #23559: lwip_recvfrom problem with tcp - - 2009-04-15 Simon Goldschmidt - * dhcp.c: task #9192: mem_free of dhcp->options_in and dhcp->msg_in - - 2009-04-15 Simon Goldschmidt - * ip.c, ip6.c, tcp_out.c, ip.h: patch #6808: Add a utility function - ip_hinted_output() (for smaller code mainly) - - 2009-04-15 Simon Goldschmidt - * inet.c: patch #6765: Supporting new line characters in inet_aton() - - 2009-04-15 Simon Goldschmidt - * dhcp.c: patch #6764: DHCP rebind and renew did not send hostnam option; - Converted constant OPTION_MAX_MSG_SIZE to netif->mtu, check if netif->mtu - is big enough in dhcp_start - - 2009-04-15 Simon Goldschmidt - * netbuf.c: bug #26027: netbuf_chain resulted in pbuf memory leak - - 2009-04-15 Simon Goldschmidt - * sockets.c, ppp.c: bug #25763: corrected 4 occurrences of SMEMCPY to MEMCPY - - 2009-04-15 Simon Goldschmidt - * sockets.c: bug #26121: set_errno can be overridden - - 2009-04-09 Kieran Mansley (patch from Luca Ceresoli ) - * init.c, opt.h: Patch#6774 TCP_QUEUE_OOSEQ breaks compilation when - LWIP_TCP==0 - - 2009-04-09 Kieran Mansley (patch from Roy Lee ) - * tcp.h: Patch#6802 Add do-while-clauses to those function like - macros in tcp.h - - 2009-03-31 Kieran Mansley - * tcp.c, tcp_in.c, tcp_out.c, tcp.h, opt.h: Rework the way window - updates are calculated and sent (BUG20515) - - * tcp_in.c: cope with SYN packets received during established states, - and retransmission of initial SYN. - - * tcp_out.c: set push bit correctly when tcp segments are merged - - 2009-03-27 Kieran Mansley - * tcp_out.c set window correctly on probes (correcting change made - yesterday) - - 2009-03-26 Kieran Mansley - * tcp.c, tcp_in.c, tcp.h: add tcp_abandon() to cope with dropping - connections where no reset required (bug #25622) - - * tcp_out.c: set TCP_ACK flag on keepalive and zero window probes - (bug #20779) - - 2009-02-18 Simon Goldschmidt (Jonathan Larmour and Bill Auerbach) - * ip_frag.c: patch #6528: the buffer used for IP_FRAG_USES_STATIC_BUF could be - too small depending on MEM_ALIGNMENT - - 2009-02-16 Simon Goldschmidt - * sockets.h/.c, api_*.h/.c: fixed arguments of socket functions to match the standard; - converted size argument of netconn_write to 'size_t' - - 2009-02-16 Simon Goldschmidt - * tcp.h, tcp.c: fixed bug #24440: TCP connection close problem on 64-bit host - by moving accept callback function pointer to TCP_PCB_COMMON - - 2009-02-12 Simon Goldschmidt - * dhcp.c: fixed bug #25345 (DHCPDECLINE is sent with "Maximum message size" - option) - - 2009-02-11 Simon Goldschmidt - * dhcp.c: fixed bug #24480 (releasing old udp_pdb and pbuf in dhcp_start) - - 2009-02-11 Simon Goldschmidt - * opt.h, api_msg.c: added configurable default valud for netconn->recv_bufsize: - RECV_BUFSIZE_DEFAULT (fixes bug #23726: pbuf pool exhaustion on slow recv()) - - 2009-02-10 Simon Goldschmidt - * tcp.c: fixed bug #25467: Listen backlog is not reset on timeout in SYN_RCVD: - Accepts_pending is decrease on a corresponding listen pcb when a connection - in state SYN_RCVD is close. - - 2009-01-28 Jonathan Larmour - * pbuf.c: reclaim pbufs from TCP out-of-sequence segments if we run - out of pool pbufs. - - 2008-12-19 Simon Goldschmidt - * many files: patch #6699: fixed some warnings on platform where sizeof(int) == 2 - - 2008-12-10 Tamas Somogyi, Frédéric Bernon - * sockets.c: fixed bug #25051: lwip_recvfrom problem with udp: fromaddr and - port uses deleted netbuf. - - 2008-10-18 Simon Goldschmidt - * tcp_in.c: fixed bug ##24596: Vulnerability on faulty TCP options length - in tcp_parseopt - - 2008-10-15 Simon Goldschmidt - * ip_frag.c: fixed bug #24517: IP reassembly crashes on unaligned IP headers - by packing the struct ip_reass_helper. - - 2008-10-03 David Woodhouse, Jonathan Larmour - * etharp.c (etharp_arp_input): Fix type aliasing problem copying ip address. - - 2008-10-02 Jonathan Larmour - * dns.c: Hard-code structure sizes, to avoid issues on some compilers where - padding is included. - - 2008-09-30 Jonathan Larmour - * sockets.c (lwip_accept): check addr isn't NULL. If it's valid, do an - assertion check that addrlen isn't NULL. - - 2008-09-30 Jonathan Larmour - * tcp.c: Fix bug #24227, wrong error message in tcp_bind. - - 2008-08-26 Simon Goldschmidt - * inet.h, ip_addr.h: fixed bug #24132: Cross-dependency between ip_addr.h and - inet.h -> moved declaration of struct in_addr from ip_addr.h to inet.h - - 2008-08-14 Simon Goldschmidt - * api_msg.c: fixed bug #23847: do_close_internal references freed memory (when - tcp_close returns != ERR_OK) - - 2008-07-08 Frédéric Bernon - * stats.h: Fix some build bugs introduced with patch #6483 (missing some parameters - in macros, mainly if MEM_STATS=0 and MEMP_STATS=0). - - 2008-06-24 Jonathan Larmour - * tcp_in.c: Fix for bug #23693 as suggested by Art R. Ensure cseg is unused - if tcp_seg_copy fails. - - 2008-06-17 Simon Goldschmidt - * inet_chksum.c: Checked in some ideas of patch #6460 (loop optimizations) - and created defines for swapping bytes and folding u32 to u16. - - 2008-05-30 Kieran Mansley - * tcp_in.c Remove redundant "if" statement, and use real rcv_wnd - rather than rcv_ann_wnd when deciding if packets are in-window. - Contributed by - - 2008-05-30 Kieran Mansley - * mem.h: Fix BUG#23254. Change macro definition of mem_* to allow - passing as function pointers when MEM_LIBC_MALLOC is defined. - - 2008-05-09 Jonathan Larmour - * err.h, err.c, sockets.c: Fix bug #23119: Reorder timeout error code to - stop it being treated as a fatal error. - - 2008-04-15 Simon Goldschmidt - * dhcp.c: fixed bug #22804: dhcp_stop doesn't clear NETIF_FLAG_DHCP - (flag now cleared) - - 2008-03-27 Simon Goldschmidt - * mem.c, tcpip.c, tcpip.h, opt.h: fixed bug #21433 (Calling mem_free/pbuf_free - from interrupt context isn't safe): set LWIP_USE_HEAP_FROM_INTERRUPT to 1 - in lwipopts.h or use pbuf_free_callback(p)/mem_free_callback(m) to free pbufs - or heap memory from interrupt context - - 2008-03-26 Simon Goldschmidt - * tcp_in.c, tcp.c: fixed bug #22249: division by zero could occur if a remote - host sent a zero mss as TCP option. - - -(STABLE-1.3.0) - - ++ New features: - - 2008-03-10 Jonathan Larmour - * inet_chksum.c: Allow choice of one of the sample algorithms to be - made from lwipopts.h. Fix comment on how to override LWIP_CHKSUM. - - 2008-01-22 Frédéric Bernon - * tcp.c, tcp_in.c, tcp.h, opt.h: Rename LWIP_CALCULATE_EFF_SEND_MSS in - TCP_CALCULATE_EFF_SEND_MSS to have coherent TCP options names. - - 2008-01-14 Frédéric Bernon - * rawapi.txt, api_msg.c, tcp.c, tcp_in.c, tcp.h: changes for task #7675 "Enable - to refuse data on a TCP_EVENT_RECV call". Important, behavior changes for the - tcp_recv callback (see rawapi.txt). - - 2008-01-14 Frédéric Bernon, Marc Chaland - * ip.c: Integrate patch #6369" ip_input : checking before realloc". - - 2008-01-12 Frédéric Bernon - * tcpip.h, tcpip.c, api.h, api_lib.c, api_msg.c, sockets.c: replace the field - netconn::sem per netconn::op_completed like suggested for the task #7490 - "Add return value to sys_mbox_post". - - 2008-01-12 Frédéric Bernon - * api_msg.c, opt.h: replace DEFAULT_RECVMBOX_SIZE per DEFAULT_TCP_RECVMBOX_SIZE, - DEFAULT_UDP_RECVMBOX_SIZE and DEFAULT_RAW_RECVMBOX_SIZE (to optimize queues - sizes), like suggested for the task #7490 "Add return value to sys_mbox_post". - - 2008-01-10 Frédéric Bernon - * tcpip.h, tcpip.c: add tcpip_callback_with_block function for the task #7490 - "Add return value to sys_mbox_post". tcpip_callback is always defined as - "blocking" ("block" parameter = 1). - - 2008-01-10 Frédéric Bernon - * tcpip.h, tcpip.c, api.h, api_lib.c, api_msg.c, sockets.c: replace the field - netconn::mbox (sys_mbox_t) per netconn::sem (sys_sem_t) for the task #7490 - "Add return value to sys_mbox_post". - - 2008-01-05 Frédéric Bernon - * sys_arch.txt, api.h, api_lib.c, api_msg.h, api_msg.c, tcpip.c, sys.h, opt.h: - Introduce changes for task #7490 "Add return value to sys_mbox_post" with some - modifications in the sys_mbox api: sys_mbox_new take a "size" parameters which - indicate the number of pointers query by the mailbox. There is three defines - in opt.h to indicate sizes for tcpip::mbox, netconn::recvmbox, and for the - netconn::acceptmbox. Port maintainers, you can decide to just add this new - parameter in your implementation, but to ignore it to keep the previous behavior. - The new sys_mbox_trypost function return a value to know if the mailbox is - full or if the message is posted. Take a look to sys_arch.txt for more details. - This new function is used in tcpip_input (so, can be called in an interrupt - context since the function is not blocking), and in recv_udp and recv_raw. - - 2008-01-04 Frédéric Bernon, Simon Goldschmidt, Jonathan Larmour - * rawapi.txt, api.h, api_lib.c, api_msg.h, api_msg.c, sockets.c, tcp.h, tcp.c, - tcp_in.c, init.c, opt.h: rename backlog options with TCP_ prefix, limit the - "backlog" parameter in an u8_t, 0 is interpreted as "smallest queue", add - documentation in the rawapi.txt file. - - 2007-12-31 Kieran Mansley (based on patch from Per-Henrik Lundbolm) - * tcp.c, tcp_in.c, tcp_out.c, tcp.h: Add TCP persist timer - - 2007-12-31 Frédéric Bernon, Luca Ceresoli - * autoip.c, etharp.c: ip_addr.h: Integrate patch #6348: "Broadcast ARP packets - in autoip". The change in etharp_raw could be removed, since all calls to - etharp_raw use ethbroadcast for the "ethdst_addr" parameter. But it could be - wrong in the future. - - 2007-12-30 Frédéric Bernon, Tom Evans - * ip.c: Fix bug #21846 "LwIP doesn't appear to perform any IP Source Address - Filtering" reported by Tom Evans. - - 2007-12-21 Frédéric Bernon, Simon Goldschmidt, Jonathan Larmour - * tcp.h, opt.h, api.h, api_msg.h, tcp.c, tcp_in.c, api_lib.c, api_msg.c, - sockets.c, init.c: task #7252: Implement TCP listen backlog: Warning: raw API - applications have to call 'tcp_accepted(pcb)' in their accept callback to - keep accepting new connections. - - 2007-12-13 Frédéric Bernon - * api_msg.c, err.h, err.c, sockets.c, dns.c, dns.h: replace "enum dns_result" - by err_t type. Add a new err_t code "ERR_INPROGRESS". - - 2007-12-12 Frédéric Bernon - * dns.h, dns.c, opt.h: move DNS options to the "right" place. Most visibles - are the one which have ram usage. - - 2007-12-05 Frédéric Bernon - * netdb.c: add a LWIP_DNS_API_HOSTENT_STORAGE option to decide to use a static - set of variables (=0) or a local one (=1). In this last case, your port should - provide a function "struct hostent* sys_thread_hostent( struct hostent* h)" - which have to do a copy of "h" and return a pointer ont the "per-thread" copy. - - 2007-12-03 Simon Goldschmidt - * ip.c: ip_input: check if a packet is for inp first before checking all other - netifs on netif_list (speeds up packet receiving in most cases) - - 2007-11-30 Simon Goldschmidt - * udp.c, raw.c: task #7497: Sort lists (pcb, netif, ...) for faster access - UDP: move a (connected) pcb selected for input to the front of the list of - pcbs so that it is found faster next time. Same for RAW pcbs that have eaten - a packet. - - 2007-11-28 Simon Goldschmidt - * etharp.c, stats.c, stats.h, opt.h: Introduced ETHARP_STATS - - 2007-11-25 Simon Goldschmidt - * dhcp.c: dhcp_unfold_reply() uses pbuf_copy_partial instead of its own copy - algorithm. - - 2007-11-24 Simon Goldschmidt - * netdb.h, netdb.c, sockets.h/.c: Moved lwip_gethostbyname from sockets.c - to the new file netdb.c; included lwip_getaddrinfo. - - 2007-11-21 Simon Goldschmidt - * tcp.h, opt.h, tcp.c, tcp_in.c: implemented calculating the effective send-mss - based on the MTU of the netif used to send. Enabled by default. Disable by - setting LWIP_CALCULATE_EFF_SEND_MSS to 0. This fixes bug #21492. - - 2007-11-19 Frédéric Bernon - * api_msg.c, dns.h, dns.c: Implement DNS_DOES_NAME_CHECK option (check if name - received match the name query), implement DNS_USES_STATIC_BUF (the place where - copy dns payload to parse the response), return an error if there is no place - for a new query, and fix some minor problems. - - 2007-11-16 Simon Goldschmidt - * new files: ipv4/inet.c, ipv4/inet_chksum.c, ipv6/inet6.c - removed files: core/inet.c, core/inet6.c - Moved inet files into ipv4/ipv6 directory; splitted inet.c/inet.h into - inet and chksum part; changed includes in all lwIP files as appropriate - - 2007-11-16 Simon Goldschmidt - * api.h, api_msg.h, api_lib.c, api_msg.c, socket.h, socket.c: Added sequential - dns resolver function for netconn api (netconn_gethostbyname) and socket api - (gethostbyname/gethostbyname_r). - - 2007-11-15 Jim Pettinato, Frédéric Bernon - * opt.h, init.c, tcpip.c, dhcp.c, dns.h, dns.c: add DNS client for simple name - requests with RAW api interface. Initialization is done in lwip_init() with - build time options. DNS timer is added in tcpip_thread context. DHCP can set - DNS server ip addresses when options are received. You need to set LWIP_DNS=1 - in your lwipopts.h file (LWIP_DNS=0 in opt.h). DNS_DEBUG can be set to get - some traces with LWIP_DEBUGF. Sanity check have been added. There is a "todo" - list with points to improve. - - 2007-11-06 Simon Goldschmidt - * opt.h, mib2.c: Patch #6215: added ifAdminStatus write support (if explicitly - enabled by defining SNMP_SAFE_REQUESTS to 0); added code to check link status - for ifOperStatus if LWIP_NETIF_LINK_CALLBACK is defined. - - 2007-11-06 Simon Goldschmidt - * api.h, api_msg.h and dependent files: Task #7410: Removed the need to include - core header files in api.h (ip/tcp/udp/raw.h) to hide the internal - implementation from netconn api applications. - - 2007-11-03 Frédéric Bernon - * api.h, api_lib.c, api_msg.c, sockets.c, opt.h: add SO_RCVBUF option for UDP & - RAW netconn. You need to set LWIP_SO_RCVBUF=1 in your lwipopts.h (it's disabled - by default). Netconn API users can use the netconn_recv_bufsize macro to access - it. This is a first release which have to be improve for TCP. Note it used the - netconn::recv_avail which need to be more "thread-safe" (note there is already - the problem for FIONREAD with lwip_ioctl/ioctlsocket). - - 2007-11-01 Frédéric Bernon, Marc Chaland - * sockets.h, sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c, tcp.h, tcp_out.c: - Integrate "patch #6250 : MSG_MORE flag for send". MSG_MORE is used at socket api - layer, NETCONN_MORE at netconn api layer, and TCP_WRITE_FLAG_MORE at raw api - layer. This option enable to delayed TCP PUSH flag on multiple "write" calls. - Note that previous "copy" parameter for "write" APIs is now called "apiflags". - - 2007-10-24 Frédéric Bernon - * api.h, api_lib.c, api_msg.c: Add macro API_EVENT in the same spirit than - TCP_EVENT_xxx macros to get a code more readable. It could also help to remove - some code (like we have talk in "patch #5919 : Create compile switch to remove - select code"), but it could be done later. - - 2007-10-08 Simon Goldschmidt - * many files: Changed initialization: many init functions are not needed any - more since we now rely on the compiler initializing global and static - variables to zero! - - 2007-10-06 Simon Goldschmidt - * ip_frag.c, memp.c, mib2.c, ip_frag.h, memp_std.h, opt.h: Changed IP_REASSEMBLY - to enqueue the received pbufs so that multiple packets can be reassembled - simultaneously and no static reassembly buffer is needed. - - 2007-10-05 Simon Goldschmidt - * tcpip.c, etharp.h, etharp.c: moved ethernet_input from tcpip.c to etharp.c so - all netifs (or ports) can use it. - - 2007-10-05 Frédéric Bernon - * netifapi.h, netifapi.c: add function netifapi_netif_set_default. Change the - common function to reduce a little bit the footprint (for all functions using - only the "netif" parameter). - - 2007-10-03 Frédéric Bernon - * netifapi.h, netifapi.c: add functions netifapi_netif_set_up, netifapi_netif_set_down, - netifapi_autoip_start and netifapi_autoip_stop. Use a common function to reduce - a little bit the footprint (for all functions using only the "netif" parameter). - - 2007-09-15 Frédéric Bernon - * udp.h, udp.c, sockets.c: Changes for "#20503 IGMP Improvement". Add IP_MULTICAST_IF - option in socket API, and a new field "multicast_ip" in "struct udp_pcb" (for - netconn and raw API users), only if LWIP_IGMP=1. Add getsockopt processing for - IP_MULTICAST_TTL and IP_MULTICAST_IF. - - 2007-09-10 Frédéric Bernon - * snmp.h, mib2.c: enable to remove SNMP timer (which consumne several cycles - even when it's not necessary). snmp_agent.txt tell to call snmp_inc_sysuptime() - each 10ms (but, it's intrusive if you use sys_timeout feature). Now, you can - decide to call snmp_add_sysuptime(100) each 1000ms (which is bigger "step", but - call to a lower frequency). Or, you can decide to not call snmp_inc_sysuptime() - or snmp_add_sysuptime(), and to define the SNMP_GET_SYSUPTIME(sysuptime) macro. - This one is undefined by default in mib2.c. SNMP_GET_SYSUPTIME is called inside - snmp_get_sysuptime(u32_t *value), and enable to change "sysuptime" value only - when it's queried (any direct call to "sysuptime" is changed by a call to - snmp_get_sysuptime). - - 2007-09-09 Frédéric Bernon, Bill Florac - * igmp.h, igmp.c, netif.h, netif.c, ip.c: To enable to have interfaces with IGMP, - and others without it, there is a new NETIF_FLAG_IGMP flag to set in netif->flags - if you want IGMP on an interface. igmp_stop() is now called inside netif_remove(). - igmp_report_groups() is now called inside netif_set_link_up() (need to have - LWIP_NETIF_LINK_CALLBACK=1) to resend reports once the link is up (avoid to wait - the next query message to receive the matching multicast streams). - - 2007-09-08 Frédéric Bernon - * sockets.c, ip.h, api.h, tcp.h: declare a "struct ip_pcb" which only contains - IP_PCB. Add in the netconn's "pcb" union a "struct ip_pcb *ip;" (no size change). - Use this new field to access to common pcb fields (ttl, tos, so_options, etc...). - Enable to access to these fields with LWIP_TCP=0. - - 2007-09-05 Frédéric Bernon - * udp.c, ipv4/icmp.c, ipv4/ip.c, ipv6/icmp.c, ipv6/ip6.c, ipv4/icmp.h, - ipv6/icmp.h, opt.h: Integrate "task #7272 : LWIP_ICMP option". The new option - LWIP_ICMP enable/disable ICMP module inside the IP stack (enable per default). - Be careful, disabling ICMP make your product non-compliant to RFC1122, but - help to reduce footprint, and to reduce "visibility" on the Internet. - - 2007-09-05 Frédéric Bernon, Bill Florac - * opt.h, sys.h, tcpip.c, slipif.c, ppp.c, sys_arch.txt: Change parameters list - for sys_thread_new (see "task #7252 : Create sys_thread_new_ex()"). Two new - parameters have to be provided: a task name, and a task stack size. For this - one, since it's platform dependant, you could define the best one for you in - your lwipopts.h. For port maintainers, you can just add these new parameters - in your sys_arch.c file, and but it's not mandatory, use them in your OS - specific functions. - - 2007-09-05 Frédéric Bernon - * inet.c, autoip.c, msg_in.c, msg_out.c, init.c: Move some build time checkings - inside init.c for task #7142 "Sanity check user-configurable values". - - 2007-09-04 Frédéric Bernon, Bill Florac - * igmp.h, igmp.c, memp_std.h, memp.c, init.c, opt.h: Replace mem_malloc call by - memp_malloc, and use a new MEMP_NUM_IGMP_GROUP option (see opt.h to define the - value). It will avoid potential fragmentation problems, use a counter to know - how many times a group is used on an netif, and free it when all applications - leave it. MEMP_NUM_IGMP_GROUP got 8 as default value (and init.c got a sanity - check if LWIP_IGMP!=0). - - 2007-09-03 Frédéric Bernon - * igmp.h, igmp.c, sockets.c, api_msg.c: Changes for "#20503 IGMP Improvement". - Initialize igmp_mac_filter to NULL in netif_add (this field should be set in - the netif's "init" function). Use the "imr_interface" field (for socket layer) - and/or the "interface" field (for netconn layer), for join/leave operations. - The igmp_join/leavegroup first parameter change from a netif to an ipaddr. - This field could be a netif's ipaddr, or "any" (same meaning than ip_addr_isany). - - 2007-08-30 Frédéric Bernon - * Add netbuf.h, netbuf.c, Change api.h, api_lib.c: #7249 "Split netbuf functions - from api/api_lib". Now netbuf API is independant of netconn, and can be used - with other API (application based on raw API, or future "socket2" API). Ports - maintainers just have to add src/api/netbuf.c in their makefile/projects. - - 2007-08-30 Frédéric Bernon, Jonathan Larmour - * init.c: Add first version of lwip_sanity_check for task #7142 "Sanity check - user-configurable values". - - 2007-08-29 Frédéric Bernon - * igmp.h, igmp.c, tcpip.c, init.c, netif.c: change igmp_init and add igmp_start. - igmp_start is call inside netif_add. Now, igmp initialization is in the same - spirit than the others modules. Modify some IGMP debug traces. - - 2007-08-29 Frédéric Bernon - * Add init.h, init.c, Change opt.h, tcpip.c: Task #7213 "Add a lwip_init function" - Add lwip_init function to regroup all modules initializations, and to provide - a place to add code for task #7142 "Sanity check user-configurable values". - Ports maintainers should remove direct initializations calls from their code, - and add init.c in their makefiles. Note that lwip_init() function is called - inside tcpip_init, but can also be used by raw api users since all calls are - disabled when matching options are disabled. Also note that their is new options - in opt.h, you should configure in your lwipopts.h (they are enabled per default). - - 2007-08-26 Marc Boucher - * api_msg.c: do_close_internal(): Reset the callbacks and arg (conn) to NULL - since they can under certain circumstances be called with an invalid conn - pointer after the connection has been closed (and conn has been freed). - - 2007-08-25 Frédéric Bernon (Artem Migaev's Patch) - * netif.h, netif.c: Integrate "patch #6163 : Function to check if link layer is up". - Add a netif_is_link_up() function if LWIP_NETIF_LINK_CALLBACK option is set. - - 2007-08-22 Frédéric Bernon - * netif.h, netif.c, opt.h: Rename LWIP_NETIF_CALLBACK in LWIP_NETIF_STATUS_CALLBACK - to be coherent with new LWIP_NETIF_LINK_CALLBACK option before next release. - - 2007-08-22 Frédéric Bernon - * tcpip.h, tcpip.c, ethernetif.c, opt.h: remove options ETHARP_TCPIP_INPUT & - ETHARP_TCPIP_ETHINPUT, now, only "ethinput" code is supported, even if the - name is tcpip_input (we keep the name of 1.2.0 function). - - 2007-08-17 Jared Grubb - * memp_std.h, memp.h, memp.c, mem.c, stats.c: (Task #7136) Centralize mempool - settings into new memp_std.h and optional user file lwippools.h. This adds - more dynamic mempools, and allows the user to create an arbitrary number of - mempools for mem_malloc. - - 2007-08-16 Marc Boucher - * api_msg.c: Initialize newconn->state to NETCONN_NONE in accept_function; - otherwise it was left to NETCONN_CLOSE and sent_tcp() could prematurely - close the connection. - - 2007-08-16 Marc Boucher - * sockets.c: lwip_accept(): check netconn_peer() error return. - - 2007-08-16 Marc Boucher - * mem.c, mem.h: Added mem_calloc(). - - 2007-08-16 Marc Boucher - * tcpip.c, tcpip.h memp.c, memp.h: Added distinct memp (MEMP_TCPIP_MSG_INPKT) - for input packets to prevent floods from consuming all of MEMP_TCPIP_MSG - and starving other message types. - Renamed MEMP_TCPIP_MSG to MEMP_TCPIP_MSG_API - - 2007-08-16 Marc Boucher - * pbuf.c, pbuf.h, etharp.c, tcp_in.c, sockets.c: Split pbuf flags in pbuf - type and flgs (later renamed to flags). - Use enum pbuf_flag as pbuf_type. Renumber PBUF_FLAG_*. - Improved lwip_recvfrom(). TCP push now propagated. - - 2007-08-16 Marc Boucher - * ethernetif.c, contrib/ports/various: ethbroadcast now a shared global - provided by etharp. - - 2007-08-16 Marc Boucher - * ppp_oe.c ppp_oe.h, auth.c chap.c fsm.c lcp.c ppp.c ppp.h, - etharp.c ethernetif.c, etharp.h, opt.h tcpip.h, tcpip.c: - Added PPPoE support and various PPP improvements. - - 2007-07-25 Simon Goldschmidt - * api_lib.c, ip_frag.c, pbuf.c, api.h, pbuf.h: Introduced pbuf_copy_partial, - making netbuf_copy_partial use this function. - - 2007-07-25 Simon Goldschmidt - * tcp_in.c: Fix bug #20506: Slow start / initial congestion window starts with - 2 * mss (instead of 1 * mss previously) to comply with some newer RFCs and - other stacks. - - 2007-07-13 Jared Grubb (integrated by Frédéric Bernon) - * opt.h, netif.h, netif.c, ethernetif.c: Add new configuration option to add - a link callback in the netif struct, and functions to handle it. Be carefull - for port maintainers to add the NETIF_FLAG_LINK_UP flag (like in ethernetif.c) - if you want to be sure to be compatible with future changes... - - 2007-06-30 Frédéric Bernon - * sockets.h, sockets.c: Implement MSG_PEEK flag for recv/recvfrom functions. - - 2007-06-21 Simon Goldschmidt - * etharp.h, etharp.c: Combined etharp_request with etharp_raw for both - LWIP_AUTOIP =0 and =1 to remove redundant code. - - 2007-06-21 Simon Goldschmidt - * mem.c, memp.c, mem.h, memp.h, opt.h: task #6863: Introduced the option - MEM_USE_POOLS to use 4 pools with different sized elements instead of a - heap. This both prevents memory fragmentation and gives a higher speed - at the cost of more memory consumption. Turned off by default. - - 2007-06-21 Simon Goldschmidt - * api_lib.c, api_msg.c, api.h, api_msg.h: Converted the length argument of - netconn_write (and therefore also api_msg_msg.msg.w.len) from u16_t into - int to be able to send a bigger buffer than 64K with one time (mainly - used from lwip_send). - - 2007-06-21 Simon Goldschmidt - * tcp.h, api_msg.c: Moved the nagle algorithm from netconn_write/do_write - into a define (tcp_output_nagle) in tcp.h to provide it to raw api users, too. - - 2007-06-21 Simon Goldschmidt - * api.h, api_lib.c, api_msg.c: Fixed bug #20021: Moved sendbuf-processing in - netconn_write from api_lib.c to api_msg.c to also prevent multiple context- - changes on low memory or empty send-buffer. - - 2007-06-18 Simon Goldschmidt - * etharp.c, etharp.h: Changed etharp to use a defined hardware address length - of 6 to avoid loading netif->hwaddr_len every time (since this file is only - used for ethernet and struct eth_addr already had a defined length of 6). - - 2007-06-17 Simon Goldschmidt - * sockets.c, sockets.h: Implemented socket options SO_NO_CHECK for UDP sockets - to disable UDP checksum generation on transmit. - - 2007-06-13 Frédéric Bernon, Simon Goldschmidt - * debug.h, api_msg.c: change LWIP_ERROR to use it to check errors like invalid - pointers or parameters, and let the possibility to redefined it in cc.h. Use - this macro to check "conn" parameter in api_msg.c functions. - - 2007-06-11 Simon Goldschmidt - * sockets.c, sockets.h: Added UDP lite support for sockets - - 2007-06-10 Simon Goldschmidt - * udp.h, opt.h, api_msg.c, ip.c, udp.c: Included switch LWIP_UDPLITE (enabled - by default) to switch off UDP-Lite support if not needed (reduces udp.c code - size) - - 2007-06-09 Dominik Spies (integrated by Frédéric Bernon) - * autoip.h, autoip.c, dhcp.h, dhcp.c, netif.h, netif.c, etharp.h, etharp.c, opt.h: - AutoIP implementation available for IPv4, with new options LWIP_AUTOIP and - LWIP_DHCP_AUTOIP_COOP if you want to cooperate with DHCP. Some tips to adapt - (see TODO mark in the source code). - - 2007-06-09 Simon Goldschmidt - * etharp.h, etharp.c, ethernetif.c: Modified order of parameters for - etharp_output() to match netif->output so etharp_output() can be used - directly as netif->output to save one function call. - - 2007-06-08 Simon Goldschmidt - * netif.h, ethernetif.c, slipif.c, loopif.c: Added define - NETIF_INIT_SNMP(netif, type, speed) to initialize per-netif snmp variables, - added initialization of those to ethernetif, slipif and loopif. - - 2007-05-18 Simon Goldschmidt - * opt.h, ip_frag.c, ip_frag.h, ip.c: Added option IP_FRAG_USES_STATIC_BUF - (defaulting to off for now) that can be set to 0 to send fragmented - packets by passing PBUF_REFs down the stack. - - 2007-05-23 Frédéric Bernon - * api_lib.c: Implement SO_RCVTIMEO for accept and recv on TCP - connections, such present in patch #5959. - - 2007-05-23 Frédéric Bernon - * api.h, api_lib.c, api_msg.c, sockets.c: group the different NETCONN_UDPxxx - code in only one part... - - 2007-05-18 Simon Goldschmidt - * opt.h, memp.h, memp.c: Added option MEMP_OVERFLOW_CHECK to check for memp - elements to overflow. This is achieved by adding some bytes before and after - each pool element (increasing their size, of course), filling them with a - prominent value and checking them on freeing the element. - Set it to 2 to also check every element in every pool each time memp_malloc() - or memp_free() is called (slower but more helpful). - - 2007-05-10 Simon Goldschmidt - * opt.h, memp.h, memp.c, pbuf.c (see task #6831): use a new memp pool for - PBUF_POOL pbufs instead of the old pool implementation in pbuf.c to reduce - code size. - - 2007-05-11 Frédéric Bernon - * sockets.c, api_lib.c, api_msg.h, api_msg.c, netifapi.h, netifapi.c, tcpip.c: - Include a function pointer instead of a table index in the message to reduce - footprint. Disable some part of lwip_send and lwip_sendto if some options are - not set (LWIP_TCP, LWIP_UDP, LWIP_RAW). - - 2007-05-10 Simon Goldschmidt - * *.h (except netif/ppp/*.h): Included patch #5448: include '#ifdef __cplusplus - \ extern "C" {' in all header files. Now you can write your application using - the lwIP stack in C++ and simply #include the core files. Note I have left - out the netif/ppp/*h header files for now, since I don't know which files are - included by applications and which are for internal use only. - - 2007-05-09 Simon Goldschmidt - * opt.h, *.c/*.h: Included patch #5920: Create define to override C-library - memcpy. 2 Defines are created: MEMCPY() for normal memcpy, SMEMCPY() for - situations where some compilers might inline the copy and save a function - call. Also replaced all calls to memcpy() with calls to (S)MEMCPY(). - - 2007-05-08 Simon Goldschmidt - * mem.h: If MEM_LIBC_MALLOC==1, allow the defines (e.g. mem_malloc() -> malloc()) - to be overriden in case the C-library malloc implementation is not protected - against concurrent access. - - 2007-05-04 Simon Goldschmidt (Atte Kojo) - * etharp.c: Introduced fast one-entry-cache to speed up ARP lookup when sending - multiple packets to the same host. - - 2007-05-04 Frédéric Bernon, Jonathan Larmour - * sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c: Fix bug #19162 "lwip_sento: a possible - to corrupt remote addr/port connection state". Reduce problems "not enought memory" with - netbuf (if we receive lot of datagrams). Improve lwip_sendto (only one exchange between - sockets api and api_msg which run in tcpip_thread context). Add netconn_sento function. - Warning, if you directly access to "fromaddr" & "fromport" field from netbuf struct, - these fields are now renamed "addr" & "port". - - 2007-04-11 Jonathan Larmour - * sys.h, api_lib.c: Provide new sys_mbox_tryfetch function. Require ports to provide new - sys_arch_mbox_tryfetch function to get a message if one is there, otherwise return - with SYS_MBOX_EMPTY. sys_arch_mbox_tryfetch can be implemented as a function-like macro - by the port in sys_arch.h if desired. - - 2007-04-06 Frédéric Bernon, Simon Goldschmidt - * opt.h, tcpip.h, tcpip.c, netifapi.h, netifapi.c: New configuration option LWIP_NETIF_API - allow to use thread-safe functions to add/remove netif in list, and to start/stop dhcp - clients, using new functions from netifapi.h. Disable as default (no port change to do). - - 2007-04-05 Frédéric Bernon - * sockets.c: remplace ENOBUFS errors on alloc_socket by ENFILE to be more BSD compliant. - - 2007-04-04 Simon Goldschmidt - * arch.h, api_msg.c, dhcp.c, msg_in.c, sockets.c: Introduced #define LWIP_UNUSED_ARG(x) - use this for and architecture-independent form to tell the compiler you intentionally - are not using this variable. Can be overriden in cc.h. - - 2007-03-28 Frédéric Bernon - * opt.h, netif.h, dhcp.h, dhcp.c: New configuration option LWIP_NETIF_HOSTNAME allow to - define a hostname in netif struct (this is just a pointer, so, you can use a hardcoded - string, point on one of your's ethernetif field, or alloc a string you will free yourself). - It will be used by DHCP to register a client hostname, but can also be use when you call - snmp_set_sysname. - - 2007-03-28 Frédéric Bernon - * netif.h, netif.c: A new NETIF_FLAG_ETHARP flag is defined in netif.h, to allow to - initialize a network interface's flag with. It tell this interface is an ethernet - device, and we can use ARP with it to do a "gratuitous ARP" (RFC 3220 "IP Mobility - Support for IPv4" section 4.6) when interface is "up" with netif_set_up(). - - 2007-03-26 Frédéric Bernon, Jonathan Larmour - * opt.h, tcpip.c: New configuration option LWIP_ARP allow to disable ARP init at build - time if you only use PPP or SLIP. The default is enable. Note we don't have to call - etharp_init in your port's initilization sequence if you use tcpip.c, because this call - is done in tcpip_init function. - - 2007-03-22 Frédéric Bernon - * stats.h, stats.c, msg_in.c: Stats counters can be change to u32_t if necessary with the - new option LWIP_STATS_LARGE. If you need this option, define LWIP_STATS_LARGE to 1 in - your lwipopts.h. More, unused counters are not defined in the stats structs, and not - display by stats_display(). Note that some options (SYS_STATS and RAW_STATS) are defined - but never used. Fix msg_in.c with the correct #if test for a stat display. - - 2007-03-21 Kieran Mansley - * netif.c, netif.h: Apply patch#4197 with some changes (originator: rireland@hmgsl.com). - Provides callback on netif up/down state change. - - 2007-03-11 Frédéric Bernon, Mace Gael, Steve Reynolds - * sockets.h, sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c, igmp.h, igmp.c, - ip.c, netif.h, tcpip.c, opt.h: - New configuration option LWIP_IGMP to enable IGMP processing. Based on only one - filter per all network interfaces. Declare a new function in netif to enable to - control the MAC filter (to reduce lwIP traffic processing). - - 2007-03-11 Frédéric Bernon - * tcp.h, tcp.c, sockets.c, tcp_out.c, tcp_in.c, opt.h: Keepalive values can - be configured at run time with LWIP_TCP_KEEPALIVE, but don't change this - unless you know what you're doing (default are RFC1122 compliant). Note - that TCP_KEEPIDLE and TCP_KEEPINTVL have to be set in seconds. - - 2007-03-08 Frédéric Bernon - * tcp.h: Keepalive values can be configured at compile time, but don't change - this unless you know what you're doing (default are RFC1122 compliant). - - 2007-03-08 Frédéric Bernon - * sockets.c, api.h, api_lib.c, tcpip.c, sys.h, sys.c, err.c, opt.h: - Implement LWIP_SO_RCVTIMEO configuration option to enable/disable SO_RCVTIMEO - on UDP sockets/netconn. - - 2007-03-08 Simon Goldschmidt - * snmp_msg.h, msg_in.c: SNMP UDP ports can be configured at compile time. - - 2007-03-06 Frédéric Bernon - * api.h, api_lib.c, sockets.h, sockets.c, tcpip.c, sys.h, sys.c, err.h: - Implement SO_RCVTIMEO on UDP sockets/netconn. - - 2007-02-28 Kieran Mansley (based on patch from Simon Goldschmidt) - * api_lib.c, tcpip.c, memp.c, memp.h: make API msg structs allocated - on the stack and remove the API msg type from memp - - 2007-02-26 Jonathan Larmour (based on patch from Simon Goldschmidt) - * sockets.h, sockets.c: Move socket initialization to new - lwip_socket_init() function. - NOTE: this changes the API with ports. Ports will have to be - updated to call lwip_socket_init() now. - - 2007-02-26 Jonathan Larmour (based on patch from Simon Goldschmidt) - * api_lib.c: Use memcpy in netbuf_copy_partial. - - - ++ Bug fixes: - - 2008-03-17 Frédéric Bernon, Ed Kerekes - * igmp.h, igmp.c: Fix bug #22613 "IGMP iphdr problem" (could have - some problems to fill the IP header on some targets, use now the - ip.h macros to do it). - - 2008-03-13 Frédéric Bernon - * sockets.c: Fix bug #22435 "lwip_recvfrom with TCP break;". Using - (lwip_)recvfrom with valid "from" and "fromlen" parameters, on a - TCP connection caused a crash. Note that using (lwip_)recvfrom - like this is a bit slow and that using (lwip)getpeername is the - good lwip way to do it (so, using recv is faster on tcp sockets). - - 2008-03-12 Frédéric Bernon, Jonathan Larmour - * api_msg.c, contrib/apps/ping.c: Fix bug #22530 "api_msg.c's - recv_raw() does not consume data", and the ping sample (with - LWIP_SOCKET=1, the code did the wrong supposition that lwip_recvfrom - returned the IP payload, without the IP header). - - 2008-03-04 Jonathan Larmour - * mem.c, stats.c, mem.h: apply patch #6414 to avoid compiler errors - and/or warnings on some systems where mem_size_t and size_t differ. - * pbuf.c, ppp.c: Fix warnings on some systems with mem_malloc. - - 2008-03-04 Kieran Mansley (contributions by others) - * Numerous small compiler error/warning fixes from contributions to - mailing list after 1.3.0 release candidate made. - - 2008-01-25 Cui hengbin (integrated by Frédéric Bernon) - * dns.c: Fix bug #22108 "DNS problem" caused by unaligned structures. - - 2008-01-15 Kieran Mansley - * tcp_out.c: BUG20511. Modify persist timer to start when we are - prevented from sending by a small send window, not just a zero - send window. - - 2008-01-09 Jonathan Larmour - * opt.h, ip.c: Rename IP_OPTIONS define to IP_OPTIONS_ALLOWED to avoid - conflict with Linux system headers. - - 2008-01-06 Jonathan Larmour - * dhcp.c: fix bug #19927: "DHCP NACK problem" by clearing any existing set IP - address entirely on receiving a DHCPNAK, and restarting discovery. - - 2007-12-21 Simon Goldschmidt - * sys.h, api_lib.c, api_msg.c, sockets.c: fix bug #21698: "netconn->recv_avail - is not protected" by using new macros for interlocked access to modify/test - netconn->recv_avail. - - 2007-12-20 Kieran Mansley (based on patch from Oleg Tyshev) - * tcp_in.c: fix bug# 21535 (nrtx not reset correctly in SYN_SENT state) - - 2007-12-20 Kieran Mansley (based on patch from Per-Henrik Lundbolm) - * tcp.c, tcp_in.c, tcp_out.c, tcp.h: fix bug #20199 (better handling - of silly window avoidance and prevent lwIP from shrinking the window) - - 2007-12-04 Simon Goldschmidt - * tcp.c, tcp_in.c: fix bug #21699 (segment leak in ooseq processing when last - data packet was lost): add assert that all segment lists are empty in - tcp_pcb_remove before setting pcb to CLOSED state; don't directly set CLOSED - state from LAST_ACK in tcp_process - - 2007-12-02 Simon Goldschmidt - * sockets.h: fix bug #21654: exclude definition of struct timeval from #ifndef FD_SET - If including for system-struct timeval, LWIP_TIMEVAL_PRIVATE now - has to be set to 0 in lwipopts.h - - 2007-12-02 Simon Goldschmidt - * api_msg.c, api_lib.c: fix bug #21656 (recvmbox problem in netconn API): always - allocate a recvmbox in netconn_new_with_proto_and_callback. For a tcp-listen - netconn, this recvmbox is later freed and a new mbox is allocated for acceptmbox. - This is a fix for thread-safety and allocates all items needed for a netconn - when the netconn is created. - - 2007-11-30 Simon Goldschmidt - * udp.c: first attempt to fix bug #21655 (DHCP doesn't work reliably with multiple - netifs): if LWIP_DHCP is enabled, UDP packets to DHCP_CLIENT_PORT are passed - to netif->dhcp->pcb only (if that exists) and not to any other pcb for the same - port (only solution to let UDP pcbs 'bind' to a netif instead of an IP address) - - 2007-11-27 Simon Goldschmidt - * ip.c: fixed bug #21643 (udp_send/raw_send don't fail if netif is down) by - letting ip_route only use netifs that are up. - - 2007-11-27 Simon Goldschmidt - * err.h, api_lib.c, api_msg.c, sockets.c: Changed error handling: ERR_MEM, ERR_BUF - and ERR_RTE are seen as non-fatal, all other errors are fatal. netconns and - sockets block most operations once they have seen a fatal error. - - 2007-11-27 Simon Goldschmidt - * udp.h, udp.c, dhcp.c: Implemented new function udp_sendto_if which takes the - netif to send as an argument (to be able to send on netifs that are down). - - 2007-11-26 Simon Goldschmidt - * tcp_in.c: Fixed bug #21582: pcb->acked accounting can be wrong when ACKs - arrive out-of-order - - 2007-11-21 Simon Goldschmidt - * tcp.h, tcp_out.c, api_msg.c: Fixed bug #20287: tcp_output_nagle sends too early - Fixed the nagle algorithm; nagle now also works for all raw API applications - and has to be explicitly disabled with 'tcp_pcb->flags |= TF_NODELAY' - - 2007-11-12 Frédéric Bernon - * sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c: Fixed bug #20900. Now, most - of the netconn_peer and netconn_addr processing is done inside tcpip_thread - context in do_getaddr. - - 2007-11-10 Simon Goldschmidt - * etharp.c: Fixed bug: assert fired when MEMP_ARP_QUEUE was empty (which can - happen any time). Now the packet simply isn't enqueued when out of memory. - - 2007-11-01 Simon Goldschmidt - * tcp.c, tcp_in.c: Fixed bug #21494: The send mss (pcb->mss) is set to 536 (or - TCP_MSS if that is smaller) as long as no MSS option is received from the - remote host. - - 2007-11-01 Simon Goldschmidt - * tcp.h, tcp.c, tcp_in.c: Fixed bug #21491: The MSS option sent (with SYN) - is now based on TCP_MSS instead of pcb->mss (on passive open now effectively - sending our configured TCP_MSS instead of the one received). - - 2007-11-01 Simon Goldschmidt - * tcp_in.c: Fixed bug #21181: On active open, the initial congestion window was - calculated based on the configured TCP_MSS, not on the MSS option received - with SYN+ACK. - - 2007-10-09 Simon Goldschmidt - * udp.c, inet.c, inet.h: Fixed UDPLite: send: Checksum was always generated too - short and also was generated wrong if checksum coverage != tot_len; - receive: checksum was calculated wrong if checksum coverage != tot_len - - 2007-10-08 Simon Goldschmidt - * mem.c: lfree was not updated in mem_realloc! - - 2007-10-07 Frédéric Bernon - * sockets.c, api.h, api_lib.c: First step to fix "bug #20900 : Potential - crash error problem with netconn_peer & netconn_addr". VERY IMPORTANT: - this change cause an API breakage for netconn_addr, since a parameter - type change. Any compiler should cause an error without any changes in - yours netconn_peer calls (so, it can't be a "silent change"). It also - reduce a little bit the footprint for socket layer (lwip_getpeername & - lwip_getsockname use now a common lwip_getaddrname function since - netconn_peer & netconn_addr have the same parameters). - - 2007-09-20 Simon Goldschmidt - * tcp.c: Fixed bug #21080 (tcp_bind without check pcbs in TIME_WAIT state) - by checking tcp_tw_pcbs also - - 2007-09-19 Simon Goldschmidt - * icmp.c: Fixed bug #21107 (didn't reset IP TTL in ICMP echo replies) - - 2007-09-15 Mike Kleshov - * mem.c: Fixed bug #21077 (inaccuracy in calculation of lwip_stat.mem.used) - - 2007-09-06 Frédéric Bernon - * several-files: replace some #include "arch/cc.h" by "lwip/arch.h", or simply remove - it as long as "lwip/opt.h" is included before (this one include "lwip/debug.h" which - already include "lwip/arch.h"). Like that, default defines are provided by "lwip/arch.h" - if they are not defined in cc.h, in the same spirit than "lwip/opt.h" for lwipopts.h. - - 2007-08-30 Frédéric Bernon - * igmp.h, igmp.c: Some changes to remove some redundant code, add some traces, - and fix some coding style. - - 2007-08-28 Frédéric Bernon - * tcpip.c: Fix TCPIP_MSG_INPKT processing: now, tcpip_input can be used for any - kind of packets. These packets are considered like Ethernet packets (payload - pointing to ethhdr) if the netif got the NETIF_FLAG_ETHARP flag. Else, packets - are considered like IP packets (payload pointing to iphdr). - - 2007-08-27 Frédéric Bernon - * api.h, api_lib.c, api_msg.c: First fix for "bug #20900 : Potential crash error - problem with netconn_peer & netconn_addr". Introduce NETCONN_LISTEN netconn_state - and remove obsolete ones (NETCONN_RECV & NETCONN_ACCEPT). - - 2007-08-24 Kieran Mansley - * inet.c Modify (acc >> 16) test to ((acc >> 16) != 0) to help buggy - compiler (Paradigm C++) - - 2007-08-09 Frédéric Bernon, Bill Florac - * stats.h, stats.c, igmp.h, igmp.c, opt.h: Fix for bug #20503 : IGMP Improvement. - Introduce IGMP_STATS to centralize statistics management. - - 2007-08-09 Frédéric Bernon, Bill Florac - * udp.c: Fix for bug #20503 : IGMP Improvement. Enable to receive a multicast - packet on a udp pcb binded on an netif's IP address, and not on "any". - - 2007-08-09 Frédéric Bernon, Bill Florac - * igmp.h, igmp.c, ip.c: Fix minor changes from bug #20503 : IGMP Improvement. - This is mainly on using lookup/lookfor, and some coding styles... - - 2007-07-26 Frédéric Bernon (and "thedoctor") - * igmp.c: Fix bug #20595 to accept IGMPv3 "Query" messages. - - 2007-07-25 Simon Goldschmidt - * api_msg.c, tcp.c: Another fix for bug #20021: by not returning an error if - tcp_output fails in tcp_close, the code in do_close_internal gets simpler - (tcp_output is called again later from tcp timers). - - 2007-07-25 Simon Goldschmidt - * ip_frag.c: Fixed bug #20429: use the new pbuf_copy_partial instead of the old - copy_from_pbuf, which illegally modified the given pbuf. - - 2007-07-25 Simon Goldschmidt - * tcp_out.c: tcp_enqueue: pcb->snd_queuelen didn't work for chaine PBUF_RAMs: - changed snd_queuelen++ to snd_queuelen += pbuf_clen(p). - - 2007-07-24 Simon Goldschmidt - * api_msg.c, tcp.c: Fix bug #20480: Check the pcb passed to tcp_listen() for the - correct state (must be CLOSED). - - 2007-07-13 Thomas Taranowski (commited by Jared Grubb) - * memp.c: Fix bug #20478: memp_malloc returned NULL+MEMP_SIZE on failed - allocation. It now returns NULL. - - 2007-07-13 Frédéric Bernon - * api_msg.c: Fix bug #20318: api_msg "recv" callbacks don't call pbuf_free in - all error cases. - - 2007-07-13 Frédéric Bernon - * api_msg.c: Fix bug #20315: possible memory leak problem if tcp_listen failed, - because current code doesn't follow rawapi.txt documentation. - - 2007-07-13 Kieran Mansley - * src/core/tcp_in.c Apply patch#5741 from Oleg Tyshev to fix bug in - out of sequence processing of received packets - - 2007-07-03 Simon Goldschmidt - * nearly-all-files: Added assertions where PBUF_RAM pbufs are used and an - assumption is made that this pbuf is in one piece (i.e. not chained). These - assumptions clash with the possibility of converting to fully pool-based - pbuf implementations, where PBUF_RAM pbufs might be chained. - - 2007-07-03 Simon Goldschmidt - * api.h, api_lib.c, api_msg.c: Final fix for bug #20021 and some other problems - when closing tcp netconns: removed conn->sem, less context switches when - closing, both netconn_close and netconn_delete should safely close tcp - connections. - - 2007-07-02 Simon Goldschmidt - * ipv4/ip.h, ipv6/ip.h, opt.h, netif.h, etharp.h, ipv4/ip.c, netif.c, raw.c, - tcp_out.c, udp.c, etharp.c: Added option LWIP_NETIF_HWADDRHINT (default=off) - to cache ARP table indices with each pcb instead of single-entry cache for - the complete stack. - - 2007-07-02 Simon Goldschmidt - * tcp.h, tcp.c, tcp_in.c, tcp_out.c: Added some ASSERTS and casts to prevent - warnings when assigning to smaller types. - - 2007-06-28 Simon Goldschmidt - * tcp_out.c: Added check to prevent tcp_pcb->snd_queuelen from overflowing. - - 2007-06-28 Simon Goldschmidt - * tcp.h: Fixed bug #20287: Fixed nagle algorithm (sending was done too early if - a segment contained chained pbufs) - - 2007-06-28 Frédéric Bernon - * autoip.c: replace most of rand() calls by a macro LWIP_AUTOIP_RAND which compute - a "pseudo-random" value based on netif's MAC and some autoip fields. It's always - possible to define this macro in your own lwipopts.h to always use C library's - rand(). Note that autoip_create_rand_addr doesn't use this macro. - - 2007-06-28 Frédéric Bernon - * netifapi.h, netifapi.c, tcpip.h, tcpip.c: Update code to handle the option - LWIP_TCPIP_CORE_LOCKING, and do some changes to be coherent with last modifications - in api_lib/api_msg (use pointers and not type with table, etc...) - - 2007-06-26 Simon Goldschmidt - * udp.h: Fixed bug #20259: struct udp_hdr was lacking the packin defines. - - 2007-06-25 Simon Goldschmidt - * udp.c: Fixed bug #20253: icmp_dest_unreach was called with a wrong p->payload - for udp packets with no matching pcb. - - 2007-06-25 Simon Goldschmidt - * udp.c: Fixed bug #20220: UDP PCB search in udp_input(): a non-local match - could get udp input packets if the remote side matched. - - 2007-06-13 Simon Goldschmidt - * netif.c: Fixed bug #20180 (TCP pcbs listening on IP_ADDR_ANY could get - changed in netif_set_ipaddr if previous netif->ip_addr.addr was 0. - - 2007-06-13 Simon Goldschmidt - * api_msg.c: pcb_new sets conn->err if protocol is not implemented - -> netconn_new_..() does not allocate a new connection for unsupported - protocols. - - 2007-06-13 Frédéric Bernon, Simon Goldschmidt - * api_lib.c: change return expression in netconn_addr and netconn_peer, because - conn->err was reset to ERR_OK without any reasons (and error was lost)... - - 2007-06-13 Frédéric Bernon, Matthias Weisser - * opt.h, mem.h, mem.c, memp.c, pbuf.c, ip_frag.c, vj.c: Fix bug #20162. Rename - MEM_ALIGN in LWIP_MEM_ALIGN and MEM_ALIGN_SIZE in LWIP_MEM_ALIGN_SIZE to avoid - some macro names collision with some OS macros. - - 2007-06-11 Simon Goldschmidt - * udp.c: UDP Lite: corrected the use of chksum_len (based on RFC3828: if it's 0, - create checksum over the complete packet. On RX, if it's < 8 (and not 0), - discard the packet. Also removed the duplicate 'udphdr->chksum = 0' for both - UDP & UDP Lite. - - 2007-06-11 Srinivas Gollakota & Oleg Tyshev - * tcp_out.c: Fix for bug #20075 : "A problem with keep-alive timer and TCP flags" - where TCP flags wasn't initialized in tcp_keepalive. - - 2007-06-03 Simon Goldschmidt - * udp.c: udp_input(): Input pbuf was not freed if pcb had no recv function - registered, p->payload was modified without modifying p->len if sending - icmp_dest_unreach() (had no negative effect but was definitively wrong). - - 2007-06-03 Simon Goldschmidt - * icmp.c: Corrected bug #19937: For responding to an icmp echo request, icmp - re-used the input pbuf even if that didn't have enough space to include the - link headers. Now the space is tested and a new pbuf is allocated for the - echo response packet if the echo request pbuf isn't big enough. - - 2007-06-01 Simon Goldschmidt - * sockets.c: Checked in patch #5914: Moved sockopt processing into tcpip_thread. - - 2007-05-23 Frédéric Bernon - * api_lib.c, sockets.c: Fixed bug #5958 for netconn_listen (acceptmbox only - allocated by do_listen if success) and netconn_accept errors handling. In - most of api_lib functions, we replace some errors checkings like "if (conn==NULL)" - by ASSERT, except for netconn_delete. - - 2007-05-23 Frédéric Bernon - * api_lib.c: Fixed bug #5957 "Safe-thread problem inside netconn_recv" to return - an error code if it's impossible to fetch a pbuf on a TCP connection (and not - directly close the recvmbox). - - 2007-05-22 Simon Goldschmidt - * tcp.c: Fixed bug #1895 (tcp_bind not correct) by introducing a list of - bound but unconnected (and non-listening) tcp_pcbs. - - 2007-05-22 Frédéric Bernon - * sys.h, sys.c, api_lib.c, tcpip.c: remove sys_mbox_fetch_timeout() (was only - used for LWIP_SO_RCVTIMEO option) and use sys_arch_mbox_fetch() instead of - sys_mbox_fetch() in api files. Now, users SHOULD NOT use internal lwIP features - like "sys_timeout" in their application threads. - - 2007-05-22 Frédéric Bernon - * api.h, api_lib.c, api_msg.h, api_msg.c: change the struct api_msg_msg to see - which parameters are used by which do_xxx function, and to avoid "misusing" - parameters (patch #5938). - - 2007-05-22 Simon Goldschmidt - * api_lib.c, api_msg.c, raw.c, api.h, api_msg.h, raw.h: Included patch #5938: - changed raw_pcb.protocol from u16_t to u8_t since for IPv4 and IPv6, proto - is only 8 bits wide. This affects the api, as there, the protocol was - u16_t, too. - - 2007-05-18 Simon Goldschmidt - * memp.c: addition to patch #5913: smaller pointer was returned but - memp_memory was the same size -> did not save memory. - - 2007-05-16 Simon Goldschmidt - * loopif.c, slipif.c: Fix bug #19729: free pbuf if netif->input() returns - != ERR_OK. - - 2007-05-16 Simon Goldschmidt - * api_msg.c, udp.c: If a udp_pcb has a local_ip set, check if it is the same - as the one of the netif used for sending to prevent sending from old - addresses after a netif address gets changed (partly fixes bug #3168). - - 2007-05-16 Frédéric Bernon - * tcpip.c, igmp.h, igmp.c: Fixed bug "#19800 : IGMP: igmp_tick() will not work - with NO_SYS=1". Note that igmp_init is always in tcpip_thread (and not in - tcpip_init) because we have to be sure that network interfaces are already - added (mac filter is updated only in igmp_init for the moment). - - 2007-05-16 Simon Goldschmidt - * mem.c, memp.c: Removed semaphores from memp, changed sys_sem_wait calls - into sys_arch_sem_wait calls to prevent timers from running while waiting - for the heap. This fixes bug #19167. - - 2007-05-13 Simon Goldschmidt - * tcp.h, sockets.h, sockets.c: Fixed bug from patch #5865 by moving the defines - for socket options (lwip_set/-getsockopt) used with level IPPROTO_TCP from - tcp.h to sockets.h. - - 2007-05-07 Simon Goldschmidt - * mem.c: Another attempt to fix bug #17922. - - 2007-05-04 Simon Goldschmidt - * pbuf.c, pbuf.h, etharp.c: Further update to ARP queueing: Changed pbuf_copy() - implementation so that it can be reused (don't allocate the target - pbuf inside pbuf_copy()). - - 2007-05-04 Simon Goldschmidt - * memp.c: checked in patch #5913: in memp_malloc() we can return memp as mem - to save a little RAM (next pointer of memp is not used while not in pool). - - 2007-05-03 "maq" - * sockets.c: Fix ioctl FIONREAD when some data remains from last recv. - (patch #3574). - - 2007-04-23 Simon Goldschmidt - * loopif.c, loopif.h, opt.h, src/netif/FILES: fix bug #2595: "loopif results - in NULL reference for incoming TCP packets". Loopif has to be configured - (using LWIP_LOOPIF_MULTITHREADING) to directly call netif->input() - (multithreading environments, e.g. netif->input() = tcpip_input()) or - putting packets on a list that is fed to the stack by calling loopif_poll() - (single-thread / NO_SYS / polling environment where e.g. - netif->input() = ip_input). - - 2007-04-17 Jonathan Larmour - * pbuf.c: Use s32_t in pbuf_realloc(), as an s16_t can't reliably hold - the difference between two u16_t's. - * sockets.h: FD_SETSIZE needs to match number of sockets, which is - MEMP_NUM_NETCONN in sockets.c right now. - - 2007-04-12 Jonathan Larmour - * icmp.c: Reset IP header TTL in ICMP ECHO responses (bug #19580). - - 2007-04-12 Kieran Mansley - * tcp.c, tcp_in.c, tcp_out.c, tcp.h: Modify way the retransmission - timer is reset to fix bug#19434, with help from Oleg Tyshev. - - 2007-04-11 Simon Goldschmidt - * etharp.c, pbuf.c, pbuf.h: 3rd fix for bug #11400 (arp-queuing): More pbufs than - previously thought need to be copied (everything but PBUF_ROM!). Cleaned up - pbuf.c: removed functions no needed any more (by etharp). - - 2007-04-11 Kieran Mansley - * inet.c, ip_addr.h, sockets.h, sys.h, tcp.h: Apply patch #5745: Fix - "Constant is long" warnings with 16bit compilers. Contributed by - avatar@mmlab.cse.yzu.edu.tw - - 2007-04-05 Frédéric Bernon, Jonathan Larmour - * api_msg.c: Fix bug #16830: "err_tcp() posts to connection mailbox when no pend on - the mailbox is active". Now, the post is only done during a connect, and do_send, - do_write and do_join_leave_group don't do anything if a previous error was signaled. - - 2007-04-03 Frédéric Bernon - * ip.c: Don't set the IP_DF ("Don't fragment") flag in the IP header in IP output - packets. See patch #5834. - - 2007-03-30 Frédéric Bernon - * api_msg.c: add a "pcb_new" helper function to avoid redundant code, and to add - missing pcb allocations checking (in do_bind, and for each raw_new). Fix style. - - 2007-03-30 Frédéric Bernon - * most of files: prefix all debug.h define with "LWIP_" to avoid any conflict with - others environment defines (these were too "generic"). - - 2007-03-28 Frédéric Bernon - * api.h, api_lib.c, sockets.c: netbuf_ref doesn't check its internal pbuf_alloc call - result and can cause a crash. lwip_send now check netbuf_ref result. - - 2007-03-28 Simon Goldschmidt - * sockets.c Remove "#include " from sockets.c to avoid multiple - definition of macros (in errno.h and lwip/arch.h) if LWIP_PROVIDE_ERRNO is - defined. This is the way it should have been already (looking at - doc/sys_arch.txt) - - 2007-03-28 Kieran Mansley - * opt.h Change default PBUF_POOL_BUFSIZE (again) to accomodate default MSS + - IP and TCP headers *and* physical link headers - - 2007-03-26 Frédéric Bernon (based on patch from Dmitry Potapov) - * api_lib.c: patch for netconn_write(), fixes a possible race condition which cause - to send some garbage. It is not a definitive solution, but the patch does solve - the problem for most cases. - - 2007-03-22 Frédéric Bernon - * api_msg.h, api_msg.c: Remove obsolete API_MSG_ACCEPT and do_accept (never used). - - 2007-03-22 Frédéric Bernon - * api_lib.c: somes resources couldn't be freed if there was errors during - netconn_new_with_proto_and_callback. - - 2007-03-22 Frédéric Bernon - * ethernetif.c: update netif->input calls to check return value. In older ports, - it's a good idea to upgrade them, even if before, there could be another problem - (access to an uninitialized mailbox). - - 2007-03-21 Simon Goldschmidt - * sockets.c: fixed bug #5067 (essentialy a signed/unsigned warning fixed - by casting to unsigned). - - 2007-03-21 Frédéric Bernon - * api_lib.c, api_msg.c, tcpip.c: integrate sys_mbox_fetch(conn->mbox, NULL) calls from - api_lib.c to tcpip.c's tcpip_apimsg(). Now, use a local variable and not a - dynamic one from memp to send tcpip_msg to tcpip_thread in a synchrone call. - Free tcpip_msg from tcpip_apimsg is not done in tcpip_thread. This give a - faster and more reliable communication between api_lib and tcpip. - - 2007-03-21 Frédéric Bernon - * opt.h: Add LWIP_NETIF_CALLBACK (to avoid compiler warning) and set it to 0. - - 2007-03-21 Frédéric Bernon - * api_msg.c, igmp.c, igmp.h: Fix C++ style comments - - 2007-03-21 Kieran Mansley - * opt.h Change default PBUF_POOL_BUFSIZE to accomodate default MSS + - IP and TCP headers - - 2007-03-21 Kieran Mansley - * Fix all uses of pbuf_header to check the return value. In some - cases just assert if it fails as I'm not sure how to fix them, but - this is no worse than before when they would carry on regardless - of the failure. - - 2007-03-21 Kieran Mansley - * sockets.c, igmp.c, igmp.h, memp.h: Fix C++ style comments and - comment out missing header include in icmp.c - - 2007-03-20 Frédéric Bernon - * memp.h, stats.c: Fix stats_display function where memp_names table wasn't - synchronized with memp.h. - - 2007-03-20 Frédéric Bernon - * tcpip.c: Initialize tcpip's mbox, and verify if initialized in tcpip_input, - tcpip_ethinput, tcpip_callback, tcpip_apimsg, to fix a init problem with - network interfaces. Also fix a compiler warning. - - 2007-03-20 Kieran Mansley - * udp.c: Only try and use pbuf_header() to make space for headers if - not a ROM or REF pbuf. - - 2007-03-19 Frédéric Bernon - * api_msg.h, api_msg.c, tcpip.h, tcpip.c: Add return types to tcpip_apimsg() - and api_msg_post(). - - 2007-03-19 Frédéric Bernon - * Remove unimplemented "memp_realloc" function from memp.h. - - 2007-03-11 Simon Goldschmidt - * pbuf.c: checked in patch #5796: pbuf_alloc: len field claculation caused - memory corruption. - - 2007-03-11 Simon Goldschmidt (based on patch from Dmitry Potapov) - * api_lib.c, sockets.c, api.h, api_msg.h, sockets.h: Fixed bug #19251 - (missing `const' qualifier in socket functions), to get more compatible to - standard POSIX sockets. - - 2007-03-11 Frédéric Bernon (based on patch from Dmitry Potapov) - * sockets.c: Add asserts inside bind, connect and sendto to check input - parameters. Remove excessive set_errno() calls after get_socket(), because - errno is set inside of get_socket(). Move last sock_set_errno() inside - lwip_close. - - 2007-03-09 Simon Goldschmidt - * memp.c: Fixed bug #11400: New etharp queueing introduced bug: memp_memory - was allocated too small. - - 2007-03-06 Simon Goldschmidt - * tcpip.c: Initialize dhcp timers in tcpip_thread (if LWIP_DHCP) to protect - the stack from concurrent access. - - 2007-03-06 Frédéric Bernon, Dmitry Potapov - * tcpip.c, ip_frag.c, ethernetif.c: Fix some build problems, and a redundancy - call to "lwip_stats.link.recv++;" in low_level_input() & ethernetif_input(). - - 2007-03-06 Simon Goldschmidt - * ip_frag.c, ip_frag.h: Reduce code size: don't include code in those files - if IP_FRAG == 0 and IP_REASSEMBLY == 0 - - 2007-03-06 Frédéric Bernon, Simon Goldschmidt - * opt.h, ip_frag.h, tcpip.h, tcpip.c, ethernetif.c: add new configuration - option named ETHARP_TCPIP_ETHINPUT, which enable the new tcpip_ethinput. - Allow to do ARP processing for incoming packets inside tcpip_thread - (protecting ARP layer against concurrent access). You can also disable - old code using tcp_input with new define ETHARP_TCPIP_INPUT set to 0. - Older ports have to use tcpip_ethinput. - - 2007-03-06 Simon Goldschmidt (based on patch from Dmitry Potapov) - * err.h, err.c: fixed compiler warning "initialization dircards qualifiers - from pointer target type" - - 2007-03-05 Frédéric Bernon - * opt.h, sockets.h: add new configuration options (LWIP_POSIX_SOCKETS_IO_NAMES, - ETHARP_TRUST_IP_MAC, review SO_REUSE) - - 2007-03-04 Frédéric Bernon - * api_msg.c: Remove some compiler warnings : parameter "pcb" was never - referenced. - - 2007-03-04 Frédéric Bernon - * api_lib.c: Fix "[patch #5764] api_lib.c cleanup: after patch #5687" (from - Dmitry Potapov). - The api_msg struct stay on the stack (not moved to netconn struct). - - 2007-03-04 Simon Goldschmidt (based on patch from Dmitry Potapov) - * pbuf.c: Fix BUG#19168 - pbuf_free can cause deadlock (if - SYS_LIGHTWEIGHT_PROT=1 & freeing PBUF_RAM when mem_sem is not available) - Also fixed cast warning in pbuf_alloc() - - 2007-03-04 Simon Goldschmidt - * etharp.c, etharp.h, memp.c, memp.h, opt.h: Fix BUG#11400 - don't corrupt - existing pbuf chain when enqueuing multiple pbufs to a pending ARP request - - 2007-03-03 Frédéric Bernon - * udp.c: remove obsolete line "static struct udp_pcb *pcb_cache = NULL;" - It is static, and never used in udp.c except udp_init(). - - 2007-03-02 Simon Goldschmidt - * tcpip.c: Moved call to ip_init(), udp_init() and tcp_init() from - tcpip_thread() to tcpip_init(). This way, raw API connections can be - initialized before tcpip_thread is running (e.g. before OS is started) - - 2007-03-02 Frédéric Bernon - * rawapi.txt: Fix documentation mismatch with etharp.h about etharp_tmr's call - interval. - - 2007-02-28 Kieran Mansley - * pbuf.c: Fix BUG#17645 - ensure pbuf payload pointer is not moved - outside the region of the pbuf by pbuf_header() - - 2007-02-28 Kieran Mansley - * sockets.c: Fix BUG#19161 - ensure milliseconds timeout is non-zero - when supplied timeout is also non-zero - -(STABLE-1.2.0) - - 2006-12-05 Leon Woestenberg - * CHANGELOG: Mention STABLE-1.2.0 release. - - ++ New features: - - 2006-12-01 Christiaan Simons - * mem.h, opt.h: Added MEM_LIBC_MALLOC option. - Note this is a workaround. Currently I have no other options left. - - 2006-10-26 Christiaan Simons (accepted patch by Jonathan Larmour) - * ipv4/ip_frag.c: rename MAX_MTU to IP_FRAG_MAX_MTU and move define - to include/lwip/opt.h. - * ipv4/lwip/ip_frag.h: Remove unused IP_REASS_INTERVAL. - Move IP_REASS_MAXAGE and IP_REASS_BUFSIZE to include/lwip/opt.h. - * opt.h: Add above new options. - - 2006-08-18 Christiaan Simons - * tcp_{in,out}.c: added SNMP counters. - * ipv4/ip.c: added SNMP counters. - * ipv4/ip_frag.c: added SNMP counters. - - 2006-08-08 Christiaan Simons - * etharp.{c,h}: added etharp_find_addr() to read - (stable) ethernet/IP address pair from ARP table - - 2006-07-14 Christiaan Simons - * mib_structs.c: added - * include/lwip/snmp_structs.h: added - * netif.{c,h}, netif/ethernetif.c: added SNMP statistics to netif struct - - 2006-07-06 Christiaan Simons - * snmp/asn1_{enc,dec}.c added - * snmp/mib2.c added - * snmp/msg_{in,out}.c added - * include/lwip/snmp_asn1.h added - * include/lwip/snmp_msg.h added - * doc/snmp_agent.txt added - - 2006-03-29 Christiaan Simons - * inet.c, inet.h: Added platform byteswap support. - Added LWIP_PLATFORM_BYTESWAP define (defaults to 0) and - optional LWIP_PLATFORM_HTONS(), LWIP_PLATFORM_HTONL() macros. - - ++ Bug fixes: - - 2006-11-30 Christiaan Simons - * dhcp.c: Fixed false triggers of request_timeout. - - 2006-11-28 Christiaan Simons - * netif.c: In netif_add() fixed missing clear of ip_addr, netmask, gw and flags. - - 2006-10-11 Christiaan Simons - * api_lib.c etharp.c, ip.c, memp.c, stats.c, sys.{c,h} tcp.h: - Partially accepted patch #5449 for ANSI C compatibility / build fixes. - * ipv4/lwip/ip.h ipv6/lwip/ip.h: Corrected UDP-Lite protocol - identifier from 170 to 136 (bug #17574). - - 2006-10-10 Christiaan Simons - * api_msg.c: Fixed Nagle algorithm as reported by Bob Grice. - - 2006-08-17 Christiaan Simons - * udp.c: Fixed bug #17200, added check for broadcast - destinations for PCBs bound to a unicast address. - - 2006-08-07 Christiaan Simons - * api_msg.c: Flushing TCP output in do_close() (bug #15926). - - 2006-06-27 Christiaan Simons - * api_msg.c: Applied patch for cold case (bug #11135). - In accept_function() ensure newconn->callback is always initialized. - - 2006-06-15 Christiaan Simons - * mem.h: added MEM_SIZE_F alias to fix an ancient cold case (bug #1748), - facilitate printing of mem_size_t and u16_t statistics. - - 2006-06-14 Christiaan Simons - * api_msg.c: Applied patch #5146 to handle allocation failures - in accept() by Kevin Lawson. - - 2006-05-26 Christiaan Simons - * api_lib.c: Removed conn->sem creation and destruction - from netconn_write() and added sys_sem_new to netconn_new_*. - -(STABLE-1_1_1) - - 2006-03-03 Christiaan Simons - * ipv4/ip_frag.c: Added bound-checking assertions on ip_reassbitmap - access and added pbuf_alloc() return value checks. - - 2006-01-01 Leon Woestenberg - * tcp_{in,out}.c, tcp_out.c: Removed 'even sndbuf' fix in TCP, which is - now handled by the checksum routine properly. - - 2006-02-27 Leon Woestenberg - * pbuf.c: Fix alignment; pbuf_init() would not work unless - pbuf_pool_memory[] was properly aligned. (Patch by Curt McDowell.) - - 2005-12-20 Leon Woestenberg - * tcp.c: Remove PCBs which stay in LAST_ACK state too long. Patch - submitted by Mitrani Hiroshi. - - 2005-12-15 Christiaan Simons - * inet.c: Disabled the added summing routine to preserve code space. - - 2005-12-14 Leon Woestenberg - * tcp_in.c: Duplicate FIN ACK race condition fix by Kelvin Lawson. - Added Curt McDowell's optimized checksumming routine for future - inclusion. Need to create test case for unaliged, aligned, odd, - even length combination of cases on various endianess machines. - - 2005-12-09 Christiaan Simons - * inet.c: Rewrote standard checksum routine in proper portable C. - - 2005-11-25 Christiaan Simons - * udp.c tcp.c: Removed SO_REUSE hack. Should reside in socket code only. - * *.c: introduced cc.h LWIP_DEBUG formatters matching the u16_t, s16_t, - u32_t, s32_t typedefs. This solves most debug word-length assumes. - - 2005-07-17 Leon Woestenberg - * inet.c: Fixed unaligned 16-bit access in the standard checksum - routine by Peter Jolasson. - * slipif.c: Fixed implementation assumption of single-pbuf datagrams. - - 2005-02-04 Leon Woestenberg - * tcp_out.c: Fixed uninitialized 'queue' referenced in memerr branch. - * tcp_{out|in}.c: Applied patch fixing unaligned access. - - 2005-01-04 Leon Woestenberg - * pbuf.c: Fixed missing semicolon after LWIP_DEBUG statement. - - 2005-01-03 Leon Woestenberg - * udp.c: UDP pcb->recv() was called even when it was NULL. - -(STABLE-1_1_0) - - 2004-12-28 Leon Woestenberg - * etharp.*: Disabled multiple packets on the ARP queue. - This clashes with TCP queueing. - - 2004-11-28 Leon Woestenberg - * etharp.*: Fixed race condition from ARP request to ARP timeout. - Halved the ARP period, doubled the period counts. - ETHARP_MAX_PENDING now should be at least 2. This prevents - the counter from reaching 0 right away (which would allow - too little time for ARP responses to be received). - - 2004-11-25 Leon Woestenberg - * dhcp.c: Decline messages were not multicast but unicast. - * etharp.c: ETHARP_CREATE is renamed to ETHARP_TRY_HARD. - Do not try hard to insert arbitrary packet's source address, - etharp_ip_input() now calls etharp_update() without ETHARP_TRY_HARD. - etharp_query() now always DOES call ETHARP_TRY_HARD so that users - querying an address will see it appear in the cache (DHCP could - suffer from this when a server invalidly gave an in-use address.) - * ipv4/ip_addr.h: Renamed ip_addr_maskcmp() to _netcmp() as we are - comparing network addresses (identifiers), not the network masks - themselves. - * ipv4/ip_addr.c: ip_addr_isbroadcast() now checks that the given - IP address actually belongs to the network of the given interface. - - 2004-11-24 Kieran Mansley - * tcp.c: Increment pcb->snd_buf when ACK is received in SYN_SENT state. - -(STABLE-1_1_0-RC1) - - 2004-10-16 Kieran Mansley - * tcp.c: Add code to tcp_recved() to send an ACK (window update) immediately, - even if one is already pending, if the rcv_wnd is above a threshold - (currently TCP_WND/2). This avoids waiting for a timer to expire to send a - delayed ACK in order to open the window if the stack is only receiving data. - - 2004-09-12 Kieran Mansley - * tcp*.*: Retransmit time-out handling improvement by Sam Jansen. - - 2004-08-20 Tony Mountifield - * etharp.c: Make sure the first pbuf queued on an ARP entry - is properly ref counted. - - 2004-07-27 Tony Mountifield - * debug.h: Added (int) cast in LWIP_DEBUGF() to avoid compiler - warnings about comparison. - * pbuf.c: Stopped compiler complaining of empty if statement - when LWIP_DEBUGF() empty. Closed an unclosed comment. - * tcp.c: Stopped compiler complaining of empty if statement - when LWIP_DEBUGF() empty. - * ip.h Corrected IPH_TOS() macro: returns a byte, so doesn't need htons(). - * inet.c: Added a couple of casts to quiet the compiler. - No need to test isascii(c) before isdigit(c) or isxdigit(c). - - 2004-07-22 Tony Mountifield - * inet.c: Made data types consistent in inet_ntoa(). - Added casts for return values of checksum routines, to pacify compiler. - * ip_frag.c, tcp_out.c, sockets.c, pbuf.c - Small corrections to some debugging statements, to pacify compiler. - - 2004-07-21 Tony Mountifield - * etharp.c: Removed spurious semicolon and added missing end-of-comment. - * ethernetif.c Updated low_level_output() to match prototype for - netif->linkoutput and changed low_level_input() similarly for consistency. - * api_msg.c: Changed recv_raw() from int to u8_t, to match prototype - of raw_recv() in raw.h and so avoid compiler error. - * sockets.c: Added trivial (int) cast to keep compiler happier. - * ip.c, netif.c Changed debug statements to use the tidier ip4_addrN() macros. - -(STABLE-1_0_0) - - ++ Changes: - - 2004-07-05 Leon Woestenberg - * sockets.*: Restructured LWIP_PRIVATE_TIMEVAL. Make sure - your cc.h file defines this either 1 or 0. If non-defined, - defaults to 1. - * .c: Added and includes where used. - * etharp.c: Made some array indices unsigned. - - 2004-06-27 Leon Woestenberg - * netif.*: Added netif_set_up()/down(). - * dhcp.c: Changes to restart program flow. - - 2004-05-07 Leon Woestenberg - * etharp.c: In find_entry(), instead of a list traversal per candidate, do a - single-pass lookup for different candidates. Should exploit locality. - - 2004-04-29 Leon Woestenberg - * tcp*.c: Cleaned up source comment documentation for Doxygen processing. - * opt.h: ETHARP_ALWAYS_INSERT option removed to comply with ARP RFC. - * etharp.c: update_arp_entry() only adds new ARP entries when adviced to by - the caller. This deprecates the ETHARP_ALWAYS_INSERT overrule option. - - ++ Bug fixes: - - 2004-04-27 Leon Woestenberg - * etharp.c: Applied patch of bug #8708 by Toni Mountifield with a solution - suggested by Timmy Brolin. Fix for 32-bit processors that cannot access - non-aligned 32-bit words, such as soms 32-bit TCP/IP header fields. Fix - is to prefix the 14-bit Ethernet headers with two padding bytes. - - 2004-04-23 Leon Woestenberg - * ip_addr.c: Fix in the ip_addr_isbroadcast() check. - * etharp.c: Fixed the case where the packet that initiates the ARP request - is not queued, and gets lost. Fixed the case where the packets destination - address is already known; we now always queue the packet and perform an ARP - request. - -(STABLE-0_7_0) - - ++ Bug fixes: - - * Fixed TCP bug for SYN_SENT to ESTABLISHED state transition. - * Fixed TCP bug in dequeueing of FIN from out of order segment queue. - * Fixed two possible NULL references in rare cases. - -(STABLE-0_6_6) - - ++ Bug fixes: - - * Fixed DHCP which did not include the IP address in DECLINE messages. - - ++ Changes: - - * etharp.c has been hauled over a bit. - -(STABLE-0_6_5) - - ++ Bug fixes: - - * Fixed TCP bug induced by bad window resizing with unidirectional TCP traffic. - * Packets sent from ARP queue had invalid source hardware address. - - ++ Changes: - - * Pass-by ARP requests do now update the cache. - - ++ New features: - - * No longer dependent on ctype.h. - * New socket options. - * Raw IP pcb support. - -(STABLE-0_6_4) - - ++ Bug fixes: - - * Some debug formatters and casts fixed. - * Numereous fixes in PPP. - - ++ Changes: - - * DEBUGF now is LWIP_DEBUGF - * pbuf_dechain() has been re-enabled. - * Mentioned the changed use of CVS branches in README. - -(STABLE-0_6_3) - - ++ Bug fixes: - - * Fixed pool pbuf memory leak in pbuf_alloc(). - Occured if not enough PBUF_POOL pbufs for a packet pbuf chain. - Reported by Savin Zlobec. - - * PBUF_POOL chains had their tot_len field not set for non-first - pbufs. Fixed in pbuf_alloc(). - - ++ New features: - - * Added PPP stack contributed by Marc Boucher - - ++ Changes: - - * Now drops short packets for ICMP/UDP/TCP protocols. More robust. - - * ARP queueuing now queues the latest packet instead of the first. - This is the RFC recommended behaviour, but can be overridden in - lwipopts.h. - -(0.6.2) - - ++ Bugfixes: - - * TCP has been fixed to deal with the new use of the pbuf->ref - counter. - - * DHCP dhcp_inform() crash bug fixed. - - ++ Changes: - - * Removed pbuf_pool_free_cache and pbuf_pool_alloc_cache. Also removed - pbuf_refresh(). This has sped up pbuf pool operations considerably. - Implemented by David Haas. - -(0.6.1) - - ++ New features: - - * The packet buffer implementation has been enhanced to support - zero-copy and copy-on-demand for packet buffers which have their - payloads in application-managed memory. - Implemented by David Haas. - - Use PBUF_REF to make a pbuf refer to RAM. lwIP will use zero-copy - if an outgoing packet can be directly sent on the link, or perform - a copy-on-demand when necessary. - - The application can safely assume the packet is sent, and the RAM - is available to the application directly after calling udp_send() - or similar function. - - ++ Bugfixes: - - * ARP_QUEUEING should now correctly work for all cases, including - PBUF_REF. - Implemented by Leon Woestenberg. - - ++ Changes: - - * IP_ADDR_ANY is no longer a NULL pointer. Instead, it is a pointer - to a '0.0.0.0' IP address. - - * The packet buffer implementation is changed. The pbuf->ref counter - meaning has changed, and several pbuf functions have been - adapted accordingly. - - * netif drivers have to be changed to set the hardware address length field - that must be initialized correctly by the driver (hint: 6 for Ethernet MAC). - See the contrib/ports/c16x cs8900 driver as a driver example. - - * netif's have a dhcp field that must be initialized to NULL by the driver. - See the contrib/ports/c16x cs8900 driver as a driver example. - -(0.5.x) This file has been unmaintained up to 0.6.1. All changes are - logged in CVS but have not been explained here. - -(0.5.3) Changes since version 0.5.2 - - ++ Bugfixes: - - * memp_malloc(MEMP_API_MSG) could fail with multiple application - threads because it wasn't protected by semaphores. - - ++ Other changes: - - * struct ip_addr now packed. - - * The name of the time variable in arp.c has been changed to ctime - to avoid conflicts with the time() function. - -(0.5.2) Changes since version 0.5.1 - - ++ New features: - - * A new TCP function, tcp_tmr(), now handles both TCP timers. - - ++ Bugfixes: - - * A bug in tcp_parseopt() could cause the stack to hang because of a - malformed TCP option. - - * The address of new connections in the accept() function in the BSD - socket library was not handled correctly. - - * pbuf_dechain() did not update the ->tot_len field of the tail. - - * Aborted TCP connections were not handled correctly in all - situations. - - ++ Other changes: - - * All protocol header structs are now packed. - - * The ->len field in the tcp_seg structure now counts the actual - amount of data, and does not add one for SYN and FIN segments. - -(0.5.1) Changes since version 0.5.0 - - ++ New features: - - * Possible to run as a user process under Linux. - - * Preliminary support for cross platform packed structs. - - * ARP timer now implemented. - - ++ Bugfixes: - - * TCP output queue length was badly initialized when opening - connections. - - * TCP delayed ACKs were not sent correctly. - - * Explicit initialization of BSS segment variables. - - * read() in BSD socket library could drop data. - - * Problems with memory alignment. - - * Situations when all TCP buffers were used could lead to - starvation. - - * TCP MSS option wasn't parsed correctly. - - * Problems with UDP checksum calculation. - - * IP multicast address tests had endianess problems. - - * ARP requests had wrong destination hardware address. - - ++ Other changes: - - * struct eth_addr changed from u16_t[3] array to u8_t[6]. - - * A ->linkoutput() member was added to struct netif. - - * TCP and UDP ->dest_* struct members where changed to ->remote_*. - - * ntoh* macros are now null definitions for big endian CPUs. - -(0.5.0) Changes since version 0.4.2 - - ++ New features: - - * Redesigned operating system emulation layer to make porting easier. - - * Better control over TCP output buffers. - - * Documenation added. - - ++ Bugfixes: - - * Locking issues in buffer management. - - * Bugfixes in the sequential API. - - * IP forwarding could cause memory leakage. This has been fixed. - - ++ Other changes: - - * Directory structure somewhat changed; the core/ tree has been - collapsed. - -(0.4.2) Changes since version 0.4.1 - - ++ New features: - - * Experimental ARP implementation added. - - * Skeleton Ethernet driver added. - - * Experimental BSD socket API library added. - - ++ Bugfixes: - - * In very intense situations, memory leakage could occur. This has - been fixed. - - ++ Other changes: - - * Variables named "data" and "code" have been renamed in order to - avoid name conflicts in certain compilers. - - * Variable++ have in appliciable cases been translated to ++variable - since some compilers generate better code in the latter case. - -(0.4.1) Changes since version 0.4 - - ++ New features: - - * TCP: Connection attempts time out earlier than data - transmissions. Nagle algorithm implemented. Push flag set on the - last segment in a burst. - - * UDP: experimental support for UDP-Lite extensions. - - ++ Bugfixes: - - * TCP: out of order segments were in some cases handled incorrectly, - and this has now been fixed. Delayed acknowledgements was broken - in 0.4, has now been fixed. Binding to an address that is in use - now results in an error. Reset connections sometimes hung an - application; this has been fixed. - - * Checksum calculation sometimes failed for chained pbufs with odd - lengths. This has been fixed. - - * API: a lot of bug fixes in the API. The UDP API has been improved - and tested. Error reporting and handling has been - improved. Logical flaws and race conditions for incoming TCP - connections has been found and removed. - - * Memory manager: alignment issues. Reallocating memory sometimes - failed, this has been fixed. - - * Generic library: bcopy was flawed and has been fixed. - - ++ Other changes: - - * API: all datatypes has been changed from generic ones such as - ints, to specified ones such as u16_t. Functions that return - errors now have the correct type (err_t). - - * General: A lot of code cleaned up and debugging code removed. Many - portability issues have been fixed. - - * The license was changed; the advertising clause was removed. - - * C64 port added. - - * Thanks: Huge thanks go to Dagan Galarneau, Horst Garnetzke, Petri - Kosunen, Mikael Caleres, and Frits Wilmink for reporting and - fixing bugs! - -(0.4) Changes since version 0.3.1 - - * Memory management has been radically changed; instead of - allocating memory from a shared heap, memory for objects that are - rapidly allocated and deallocated is now kept in pools. Allocation - and deallocation from those memory pools is very fast. The shared - heap is still present but is used less frequently. - - * The memory, memory pool, and packet buffer subsystems now support - 4-, 2-, or 1-byte alignment. - - * "Out of memory" situations are handled in a more robust way. - - * Stack usage has been reduced. - - * Easier configuration of lwIP parameters such as memory usage, - TTLs, statistics gathering, etc. All configuration parameters are - now kept in a single header file "lwipopts.h". - - * The directory structure has been changed slightly so that all - architecture specific files are kept under the src/arch - hierarchy. - - * Error propagation has been improved, both in the protocol modules - and in the API. - - * The code for the RTXC architecture has been implemented, tested - and put to use. - - * Bugs have been found and corrected in the TCP, UDP, IP, API, and - the Internet checksum modules. - - * Bugs related to porting between a 32-bit and a 16-bit architecture - have been found and corrected. - - * The license has been changed slightly to conform more with the - original BSD license, including the advertisement clause. - -(0.3.1) Changes since version 0.3 - - * Fix of a fatal bug in the buffer management. Pbufs with allocated - RAM never returned the RAM when the pbuf was deallocated. - - * TCP congestion control, window updates and retransmissions did not - work correctly. This has now been fixed. - - * Bugfixes in the API. - -(0.3) Changes since version 0.2 - - * New and improved directory structure. All include files are now - kept in a dedicated include/ directory. - - * The API now has proper error handling. A new function, - netconn_err(), now returns an error code for the connection in - case of errors. - - * Improvements in the memory management subsystem. The system now - keeps a pointer to the lowest free memory block. A new function, - mem_malloc2() tries to allocate memory once, and if it fails tries - to free some memory and retry the allocation. - - * Much testing has been done with limited memory - configurations. lwIP now does a better job when overloaded. - - * Some bugfixes and improvements to the buffer (pbuf) subsystem. - - * Many bugfixes in the TCP code: - - - Fixed a bug in tcp_close(). - - - The TCP receive window was incorrectly closed when out of - sequence segments was received. This has been fixed. - - - Connections are now timed-out of the FIN-WAIT-2 state. - - - The initial congestion window could in some cases be too - large. This has been fixed. - - - The retransmission queue could in some cases be screwed up. This - has been fixed. - - - TCP RST flag now handled correctly. - - - Out of sequence data was in some cases never delivered to the - application. This has been fixed. - - - Retransmitted segments now contain the correct acknowledgment - number and advertised window. - - - TCP retransmission timeout backoffs are not correctly computed - (ala BSD). After a number of retransmissions, TCP now gives up - the connection. - - * TCP connections now are kept on three lists, one for active - connections, one for listening connections, and one for - connections that are in TIME-WAIT. This greatly speeds up the fast - timeout processing for sending delayed ACKs. - - * TCP now provides proper feedback to the application when a - connection has been successfully set up. - - * More comments have been added to the code. The code has also been - somewhat cleaned up. - -(0.2) Initial public release. diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index f05c0f6..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.7) - -project(lwIP) - -set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -include(src/Filelists.cmake) - -# Package generation -set(CPACK_SOURCE_GENERATOR "ZIP") -set(CPACK_SOURCE_PACKAGE_DESCRIPTION_SUMMARY "lwIP lightweight IP stack") -set(CPACK_PACKAGE_VERSION_MAJOR "${LWIP_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${LWIP_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${LWIP_VERSION_REVISION}") -set(CPACK_SOURCE_IGNORE_FILES "/build/;${CPACK_SOURCE_IGNORE_FILES};.git") -set(CPACK_SOURCE_PACKAGE_FILE_NAME "lwip-${LWIP_VERSION_MAJOR}.${LWIP_VERSION_MINOR}.${LWIP_VERSION_REVISION}") -include(CPack) - -# Target for package generation -add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) -add_dependencies(dist lwipdocs) diff --git a/COPYING b/COPYING deleted file mode 100644 index e23898b..0000000 --- a/COPYING +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2001, 2002 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 - * - */ - - diff --git a/FEATURES b/FEATURES deleted file mode 100644 index a50c5a5..0000000 --- a/FEATURES +++ /dev/null @@ -1,11 +0,0 @@ -lwIP is a small independent implementation of the TCP/IP protocol suite targeted at embedded systems. - -The focus of the lwIP TCP/IP implementation is to reduce resource usage while still having a full scale TCP. This makes lwIP suitable for use in embedded systems with tens of kilobytes of free RAM and room for around 40 kilobytes of code ROM. - -Main features include: -- Protocols: IP, IPv6, ICMP, ND, MLD, UDP, TCP, IGMP, ARP, PPPoS, PPPoE, 6LowPAN (via IEEE 802.15.4, BLE or ZEP; since v2.1.0) -- DHCP client, stateless DHCPv6 (since v2.1.0), DNS client (incl. mDNS hostname resolver), AutoIP/APIPA (Zeroconf), SNMP agent (v1, v2c, v3 (since v2.1.0), private MIB support & MIB compiler) -- APIs: specialized APIs for enhanced performance & zero copy, optional Berkeley-alike socket API -- Extended features: IP forwarding over multiple network interfaces -- Extended TCP features: congestion control, RTT estimation and fast recovery/fast retransmit, sending SACKs (since v2.1.0), "altcp": nearly transparent TLS for any tcp pcb (since v2.1.0) -- Addon applications: HTTP server (HTTPS via altcp), HTTP(S) client (since v2.1.0), SNTP client, SMTP client (SMTPS via altcp), ping, NetBIOS nameserver, mDNS responder, MQTT client (TLS support since v2.1.0), TFTP server, iPerf2 counterpart diff --git a/FILES b/FILES deleted file mode 100644 index e6e0998..0000000 --- a/FILES +++ /dev/null @@ -1,5 +0,0 @@ -src/ - The source code for the lwIP TCP/IP stack. -doc/ - The documentation for lwIP. -test/ - Some code to test whether the sources do what they should. - -See also the FILES file in each subdirectory. diff --git a/README b/README deleted file mode 100644 index b95f155..0000000 --- a/README +++ /dev/null @@ -1,106 +0,0 @@ -INTRODUCTION - -lwIP is a small independent implementation of the TCP/IP protocol suite. - -The focus of the lwIP TCP/IP implementation is to reduce the RAM usage -while still having a full scale TCP. This making lwIP suitable for use -in embedded systems with tens of kilobytes of free RAM and room for -around 40 kilobytes of code ROM. - -lwIP was originally developed by Adam Dunkels at the Computer and Networks -Architectures (CNA) lab at the Swedish Institute of Computer Science (SICS) -and is now developed and maintained by a worldwide network of developers. - -FEATURES - - * IP (Internet Protocol, IPv4 and IPv6) including packet forwarding over - multiple network interfaces - * ICMP (Internet Control Message Protocol) for network maintenance and debugging - * IGMP (Internet Group Management Protocol) for multicast traffic management - * MLD (Multicast listener discovery for IPv6). Aims to be compliant with - RFC 2710. No support for MLDv2 - * ND (Neighbor discovery and stateless address autoconfiguration for IPv6). - Aims to be compliant with RFC 4861 (Neighbor discovery) and RFC 4862 - (Address autoconfiguration) - * DHCP, AutoIP/APIPA (Zeroconf) and (stateless) DHCPv6 - * UDP (User Datagram Protocol) including experimental UDP-lite extensions - * TCP (Transmission Control Protocol) with congestion control, RTT estimation - fast recovery/fast retransmit and sending SACKs - * raw/native API for enhanced performance - * Optional Berkeley-like socket API - * TLS: optional layered TCP ("altcp") for nearly transparent TLS for any - TCP-based protocol (ported to mbedTLS) (see changelog for more info) - * PPPoS and PPPoE (Point-to-point protocol over Serial/Ethernet) - * DNS (Domain name resolver incl. mDNS) - * 6LoWPAN (via IEEE 802.15.4, BLE or ZEP) - - -APPLICATIONS - - * HTTP server with SSI and CGI (HTTPS via altcp) - * SNMPv2c agent with MIB compiler (Simple Network Management Protocol), v3 via altcp - * SNTP (Simple network time protocol) - * NetBIOS name service responder - * MDNS (Multicast DNS) responder - * iPerf server implementation - * MQTT client (TLS support via altcp) - - -LICENSE - -lwIP is freely available under a BSD license. - - -DEVELOPMENT - -lwIP has grown into an excellent TCP/IP stack for embedded devices, -and developers using the stack often submit bug fixes, improvements, -and additions to the stack to further increase its usefulness. - -Development of lwIP is hosted on Savannah, a central point for -software development, maintenance and distribution. Everyone can -help improve lwIP by use of Savannah's interface, Git and the -mailing list. A core team of developers will commit changes to the -Git source tree. - -The lwIP TCP/IP stack is maintained in the 'lwip' Git module and -contributions (such as platform ports) are in the 'contrib' Git module. - -See doc/savannah.txt for details on Git server access for users and -developers. - -The current Git trees are web-browsable: - http://git.savannah.gnu.org/cgit/lwip.git - http://git.savannah.gnu.org/cgit/lwip/lwip-contrib.git - -Submit patches and bugs via the lwIP project page: - http://savannah.nongnu.org/projects/lwip/ - -Continuous integration builds (GCC, clang): - https://travis-ci.org/yarrick/lwip-merged - - -DOCUMENTATION - -Self documentation of the source code is regularly extracted from the current -Git sources and is available from this web page: - http://www.nongnu.org/lwip/ - -There is now a constantly growing wiki about lwIP at - http://lwip.wikia.com/wiki/LwIP_Wiki - -Also, there are mailing lists you can subscribe at - http://savannah.nongnu.org/mail/?group=lwip -plus searchable archives: - http://lists.nongnu.org/archive/html/lwip-users/ - http://lists.nongnu.org/archive/html/lwip-devel/ - -lwIP was originally written by Adam Dunkels: - http://dunkels.com/adam/ - -Reading Adam's papers, the files in docs/, browsing the source code -documentation and browsing the mailing list archives is a good way to -become familiar with the design of lwIP. - -Adam Dunkels -Leon Woestenberg diff --git a/UPGRADING b/UPGRADING deleted file mode 100644 index 21ad8cc..0000000 --- a/UPGRADING +++ /dev/null @@ -1,278 +0,0 @@ -This file lists major changes between release versions that require -ports or applications to be changed. Use it to update a port or an -application written for an older version of lwIP to correctly work -with newer versions. - - -(git master) - - * [Enter new changes just after this line - do not remove this line] - -(2.1.0) - - ++ Application changes: - - * Use the new altcp API for seamless TLS integration into existing TCP applications (see changelog) - * TCP only kills existing connections with a LOWER priority than the one currently being opened. - Previous implementations also kill existing connections of the SAME priority. - * ip4_route_src: parameter order is reversed: ip4_route_src(dest, src) -> ip4_route_src(src, dest) - to make parameter order consistent with other ip*_route*() functions. - Same also applies to LWIP_HOOK_IP4_ROUTE_SRC() parameter order. - * pbuf API: pbuf->type (an u8_t holding the enum 'pbuf_type') has changed to only hold a - description of the pbuf (e.g. data following pbuf struct, data volatile, allocation - source heap/pool/etc.). As a consequence, applications can't test pbuf->type any more. - Use pbuf_match_type(pbuf, type) instead. - * socket API: according to the standard, SO_ERROR now only returns asynchronous errors. - All other/normal/synchronous errors are (and always were) available via 'errno'. - LWIP_SOCKET_SET_ERRNO has been removed - 'errno' is always set - and required! - * httpd LWIP_HTTPD_CGI_SSI: httpd_cgi_handler() has an additional parameter "struct fs_file *" - - ++ Port changes: - - * tcpip_trycallback() was renamed to tcpip_callbackmsg_trycallback() to avoid confusion - with tcpip_try_callback() - * compatibility headers: moved from 'src/include/posix' to 'src/include/compat/posix', - 'src/include/compat/stdc' etc. - * The IPv6 implementation now supports address scopes. (See LWIP_IPV6_SCOPES documentation - and ip6_zone.h for more documentation) - * LWIP_HOOK_DHCP_APPEND_OPTIONS() has changed, see description in opt.h (options_out_len is not - available in struct dhcp any more) - * Added debug helper asserts to ensure threading/locking requirements are met (define - LWIP_MARK_TCPIP_THREAD() and LWIP_ASSERT_CORE_LOCKED()). - * Added sys_mbox_trypost_fromisr() and tcpip_callbackmsg_trycallback_fromisr() - These can be used to post preallocated messages from an ISR to the tcpip thread - (e.g. when using FreeRTOS) - -(2.0.2) - - ++ Application changes: - - * slipif: The way to pass serial port number has changed. netif->num is not - supported any more, netif->state is interpreted as an u8_t port number now - (it's not a POINTER to an u8_t any more!) - -(2.0.1) - - ++ Application changes: - - * UDP does NOT receive multicast traffic from ALL netifs on an UDP PCB bound to a specific - netif any more. Users need to bind to IP_ADDR_ANY to receive multicast traffic and compare - ip_current_netif() to the desired netif for every packet. - See bug #49662 for an explanation. - -(2.0.0) - - ++ Application changes: - - * Changed netif "up" flag handling to be an administrative flag (as opposed to the previous meaning of - "ip4-address-valid", a netif will now not be used for transmission if not up) -> even a DHCP netif - has to be set "up" before starting the DHCP client - * Added IPv6 support (dual-stack or IPv4/IPv6 only) - * Changed ip_addr_t to be a union in dual-stack mode (use ip4_addr_t where referring to IPv4 only). - * Major rewrite of SNMP (added MIB parser that creates code stubs for custom MIBs); - supports SNMPv2c (experimental v3 support) - * Moved some core applications from contrib repository to src/apps (and include/lwip/apps) - - +++ Raw API: - * Changed TCP listen backlog: removed tcp_accepted(), added the function pair tcp_backlog_delayed()/ - tcp_backlog_accepted() to explicitly delay backlog handling on a connection pcb - - +++ Socket API: - * Added an implementation for posix sendmsg() - * Added LWIP_FIONREAD_LINUXMODE that makes ioctl/FIONREAD return the size of the next pending datagram - - ++ Port changes - - +++ new files: - * MANY new and moved files! - * Added src/Filelists.mk for use in Makefile projects - * Continued moving stack-internal parts from abc.h to abc_priv.h in sub-folder "priv" - to let abc.h only contain the actual application programmer's API - - +++ sys layer: - * Made LWIP_TCPIP_CORE_LOCKING==1 the default as it usually performs better than - the traditional message passing (although with LWIP_COMPAT_MUTEX you are still - open to priority inversion, so this is not recommended any more) - * Added LWIP_NETCONN_SEM_PER_THREAD to use one "op_completed" semaphore per thread - instead of using one per netconn (these semaphores are used even with core locking - enabled as some longer lasting functions like big writes still need to delay) - * Added generalized abstraction for itoa(), strnicmp(), stricmp() and strnstr() - in def.h (to be overridden in cc.h) instead of config - options for netbiosns, httpd, dns, etc. ... - * New abstraction for hton* and ntoh* functions in def.h. - To override them, use the following in cc.h: - #define lwip_htons(x) - #define lwip_htonl(x) - - +++ new options: - * TODO - - +++ new pools: - * Added LWIP_MEMPOOL_* (declare/init/alloc/free) to declare private memp pools - that share memp.c code but do not have to be made global via lwippools.h - * Added pools for IPv6, MPU_COMPATIBLE, dns-api, netif-api, etc. - * added hook LWIP_HOOK_MEMP_AVAILABLE() to get informed when a memp pool was empty and an item - is now available - - * Signature of LWIP_HOOK_VLAN_SET macro was changed - - * LWIP_DECLARE_MEMORY_ALIGNED() may be used to declare aligned memory buffers (mem/memp) - or to move buffers to dedicated memory using compiler attributes - - * Standard C headers are used to define sized types and printf formatters - (disable by setting LWIP_NO_STDINT_H=1 or LWIP_NO_INTTYPES_H=1 if your compiler - does not support these) - - - ++ Major bugfixes/improvements - - * Added IPv6 support (dual-stack or IPv4/IPv6 only) - * Major rewrite of PPP (incl. keep-up with apache pppd) - see doc/ppp.txt for an upgrading how-to - * Major rewrite of SNMP (incl. MIB parser) - * Fixed timing issues that might have lead to losing a DHCP lease - * Made rx processing path more robust against crafted errors - * TCP window scaling support - * modification of api modules to support FreeRTOS-MPU (don't pass stack-pointers to other threads) - * made DNS client more robust - * support PBUF_REF for RX packets - * LWIP_NETCONN_FULLDUPLEX allows netconn/sockets to be used for reading/writing from separate - threads each (needs LWIP_NETCONN_SEM_PER_THREAD) - * Moved and reordered stats (mainly memp/mib2) - -(1.4.0) - - ++ Application changes: - - * Replaced struct ip_addr by typedef ip_addr_t (struct ip_addr is kept for - compatibility to old applications, but will be removed in the future). - - * Renamed mem_realloc() to mem_trim() to prevent confusion with realloc() - - +++ Raw API: - * Changed the semantics of tcp_close() (since it was rather a - shutdown before): Now the application does *NOT* get any calls to the recv - callback (aside from NULL/closed) after calling tcp_close() - - * When calling tcp_abort() from a raw API TCP callback function, - make sure you return ERR_ABRT to prevent accessing unallocated memory. - (ERR_ABRT now means the applicaiton has called tcp_abort!) - - +++ Netconn API: - * Changed netconn_receive() and netconn_accept() to return - err_t, not a pointer to new data/netconn. - - +++ Socket API: - * LWIP_SO_RCVTIMEO: when accept() or recv() time out, they - now set errno to EWOULDBLOCK/EAGAIN, not ETIMEDOUT. - - * Added a minimal version of posix fctl() to have a - standardised way to set O_NONBLOCK for nonblocking sockets. - - +++ all APIs: - * correctly implemented SO(F)_REUSEADDR - - ++ Port changes - - +++ new files: - - * Added 4 new files: def.c, timers.c, timers.h, tcp_impl.h: - - * Moved stack-internal parts of tcp.h to tcp_impl.h, tcp.h now only contains - the actual application programmer's API - - * Separated timer implementation from sys.h/.c, moved to timers.h/.c; - Added timer implementation for NO_SYS==1, set NO_SYS_NO_TIMERS==1 if you - still want to use your own timer implementation for NO_SYS==0 (as before). - - +++ sys layer: - - * Converted mbox- and semaphore-functions to take pointers to sys_mbox_t/ - sys_sem_t; - - * Converted sys_mbox_new/sys_sem_new to take pointers and return err_t; - - * Added Mutex concept in sys_arch (define LWIP_COMPAT_MUTEX to let sys.h use - binary semaphores instead of mutexes - as before) - - +++ new options: - - * Don't waste memory when chaining segments, added option TCP_OVERSIZE to - prevent creating many small pbufs when calling tcp_write with many small - blocks of data. Instead, pbufs are allocated larger than needed and the - space is used for later calls to tcp_write. - - * Added LWIP_NETIF_TX_SINGLE_PBUF to always copy to try to create single pbufs - in tcp_write/udp_send. - - * Added an additional option LWIP_ETHERNET to support ethernet without ARP - (necessary for pure PPPoE) - - * Add MEMP_SEPARATE_POOLS to place memory pools in separate arrays. This may - be used to place these pools into user-defined memory by using external - declaration. - - * Added TCP_SNDQUEUELOWAT corresponding to TCP_SNDLOWAT - - +++ new pools: - - * Netdb uses a memp pool for allocating memory when getaddrinfo() is called, - so MEMP_NUM_NETDB has to be set accordingly. - - * DNS_LOCAL_HOSTLIST_IS_DYNAMIC uses a memp pool instead of the heap, so - MEMP_NUM_LOCALHOSTLIST has to be set accordingly. - - * Snmp-agent uses a memp pools instead of the heap, so MEMP_NUM_SNMP_* have - to be set accordingly. - - * PPPoE uses a MEMP pool instead of the heap, so MEMP_NUM_PPPOE_INTERFACES - has to be set accordingly - - * Integrated loopif into netif.c - loopif does not have to be created by the - port any more, just define LWIP_HAVE_LOOPIF to 1. - - * Added define LWIP_RAND() for lwip-wide randomization (needs to be defined - in cc.h, e.g. used by igmp) - - * Added printf-formatter X8_F to printf u8_t as hex - - * The heap now may be moved to user-defined memory by defining - LWIP_RAM_HEAP_POINTER as a void pointer to that memory's address - - * added autoip_set_struct() and dhcp_set_struct() to let autoip and dhcp work - with user-allocated structs instead of calling mem_malloc - - * Added const char* name to mem- and memp-stats for easier debugging. - - * Calculate the TCP/UDP checksum while copying to only fetch data once: - Define LWIP_CHKSUM_COPY to a memcpy-like function that returns the checksum - - * Added SO_REUSE_RXTOALL to pass received UDP broadcast/multicast packets to - more than one pcb. - - * Changed the semantics of ARP_QUEUEING==0: ARP_QUEUEING now cannot be turned - off any more, if this is set to 0, only one packet (the most recent one) is - queued (like demanded by RFC 1122). - - - ++ Major bugfixes/improvements - - * Implemented tcp_shutdown() to only shut down one end of a connection - * Implemented shutdown() at socket- and netconn-level - * Added errorset support to select() + improved select speed overhead - * Merged pppd to v2.3.11 (including some backported bugfixes from 2.4.x) - * Added timer implementation for NO_SYS==1 (may be disabled with NO_SYS_NO_TIMERS==1 - * Use macros defined in ip_addr.h to work with IP addresses - * Implemented many nonblocking socket/netconn functions - * Fixed ARP input processing: only add a new entry if a request was directed as us - * mem_realloc() to mem_trim() to prevent confusion with realloc() - * Some improvements for AutoIP (don't route/forward link-local addresses, don't break - existing connections when assigning a routable address) - * Correctly handle remote side overrunning our rcv_wnd in ooseq case - * Removed packing from ip_addr_t, the packed version is now only used in protocol headers - * Corrected PBUF_POOL_BUFSIZE for ports where ETH_PAD_SIZE > 0 - * Added support for static ARP table entries - -(STABLE-1.3.2) - - * initial version of this file diff --git a/backport-tcp-fix-sequence-number-comparison.patch b/backport-tcp-fix-sequence-number-comparison.patch new file mode 100644 index 0000000..e4af189 --- /dev/null +++ b/backport-tcp-fix-sequence-number-comparison.patch @@ -0,0 +1,36 @@ +From 003d34eebd223c16a3dbf6a970bb6e23cb7d1a24 Mon Sep 17 00:00:00 2001 +From: Simon Goldschmidt +Date: Fri, 27 Mar 2020 22:59:05 +0100 +Subject: [PATCH] tcp: fix sequence number comparison +This fixes both undefined behavior (see bug #51447) as well as a possible bug +where sequence numbers in 31 bit distance may come through. +Conflict: NA +Reference: https://git.savannah.gnu.org/cgit/lwip.git/commit/?id=003d34eebd223c16a3dbf6a970bb6e23cb7d1a24 +--- + src/include/lwip/priv/tcp_priv.h | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) +diff --git a/src/include/lwip/priv/tcp_priv.h b/src/include/lwip/priv/tcp_priv.h +index 72f9126d..c84b5be8 100644 +--- a/src/include/lwip/priv/tcp_priv.h ++++ b/src/include/lwip/priv/tcp_priv.h +@@ -106,14 +106,11 @@ err_t tcp_process_refused_data(struct tcp_pcb *pcb); + #define tcp_output_nagle(tpcb) (tcp_do_output_nagle(tpcb) ? tcp_output(tpcb) : ERR_OK) + + +-#define TCP_SEQ_LT(a,b) ((s32_t)((u32_t)(a) - (u32_t)(b)) < 0) +-#define TCP_SEQ_LEQ(a,b) ((s32_t)((u32_t)(a) - (u32_t)(b)) <= 0) +-#define TCP_SEQ_GT(a,b) ((s32_t)((u32_t)(a) - (u32_t)(b)) > 0) +-#define TCP_SEQ_GEQ(a,b) ((s32_t)((u32_t)(a) - (u32_t)(b)) >= 0) ++#define TCP_SEQ_LT(a,b) (((u32_t)((u32_t)(a) - (u32_t)(b)) & 0x80000000u) != 0) ++#define TCP_SEQ_LEQ(a,b) (!(TCP_SEQ_LT(b,a))) ++#define TCP_SEQ_GT(a,b) TCP_SEQ_LT(b,a) ++#define TCP_SEQ_GEQ(a,b) TCP_SEQ_LEQ(b,a) + /* is b<=a<=c? */ +-#if 0 /* see bug #10548 */ +-#define TCP_SEQ_BETWEEN(a,b,c) ((c)-(b) >= (a)-(b)) +-#endif + #define TCP_SEQ_BETWEEN(a,b,c) (TCP_SEQ_GEQ(a,b) && TCP_SEQ_LEQ(a,c)) + + #ifndef TCP_TMR_INTERVAL +-- +2.28.0.windows.1 diff --git a/backport-tcp-tighten-up-checks-for-received-SYN.patch b/backport-tcp-tighten-up-checks-for-received-SYN.patch new file mode 100644 index 0000000..533e6a8 --- /dev/null +++ b/backport-tcp-tighten-up-checks-for-received-SYN.patch @@ -0,0 +1,58 @@ +From adbc5b5f716d108966bcf606e61de60b83f525a5 Mon Sep 17 00:00:00 2001 +From: Simon Goldschmidt +Date: Thu, 5 Mar 2020 21:20:35 +0100 +Subject: [PATCH] tcp: tighten up checks for received SYN +Any malicous segment could contain a SYN up to now (no check). +A SYN in the wrong segment could break OOSEQ queueing. +Fix this by allowing SYN only in states where it is required. +See bug #56397: Assert "tcp_receive: ooseq tcplen > rcv_wnd" +Signed-off-by: Simon Goldschmidt +Conflict: NA +Reference: https://git.savannah.gnu.org/cgit/lwip.git/commit/?id=adbc5b5f716d108966bcf606e61de60b83f525a5 +--- + src/core/tcp_in.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) +diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c +index 4bfba85f..90061281 100644 +--- a/src/core/tcp_in.c ++++ b/src/core/tcp_in.c +@@ -852,6 +852,13 @@ tcp_process(struct tcp_pcb *pcb) + + tcp_parseopt(pcb); + ++ if (flags & TCP_SYN) { ++ /* accept SYN only in 2 states: */ ++ if ((pcb->state != SYN_SENT) && (pcb->state != SYN_RCVD)) { ++ return ERR_OK; ++ } ++ } ++ + /* Do different things depending on the TCP state. */ + switch (pcb->state) { + case SYN_SENT: +@@ -924,7 +931,12 @@ tcp_process(struct tcp_pcb *pcb) + } + break; + case SYN_RCVD: +- if (flags & TCP_ACK) { ++ if (flags & TCP_SYN) { ++ if (seqno == pcb->rcv_nxt - 1) { ++ /* Looks like another copy of the SYN - retransmit our SYN-ACK */ ++ tcp_rexmit(pcb); ++ } ++ } else if (flags & TCP_ACK) { + /* expected ACK number? */ + if (TCP_SEQ_BETWEEN(ackno, pcb->lastack + 1, pcb->snd_nxt)) { + pcb->state = ESTABLISHED; +@@ -975,9 +987,6 @@ tcp_process(struct tcp_pcb *pcb) + tcp_rst(pcb, ackno, seqno + tcplen, ip_current_dest_addr(), + ip_current_src_addr(), tcphdr->dest, tcphdr->src); + } +- } else if ((flags & TCP_SYN) && (seqno == pcb->rcv_nxt - 1)) { +- /* Looks like another copy of the SYN - retransmit our SYN-ACK */ +- tcp_rexmit(pcb); + } + break; + case CLOSE_WAIT: +-- +2.28.0.windows.1 diff --git a/doc/FILES b/doc/FILES deleted file mode 100644 index e588575..0000000 --- a/doc/FILES +++ /dev/null @@ -1,9 +0,0 @@ -doxygen/ - Configuration files and scripts to create the lwIP doxygen source - documentation (found at http://www.nongnu.org/lwip/) - -savannah.txt - How to obtain the current development source code. -contrib.txt - How to contribute to lwIP as a developer. -rawapi.txt - The documentation for the core API of lwIP. - Also provides an overview about the other APIs and multithreading. -sys_arch.txt - The documentation for a system abstraction layer of lwIP. -ppp.txt - Documentation of the PPP interface for lwIP. diff --git a/doc/NO_SYS_SampleCode.c b/doc/NO_SYS_SampleCode.c deleted file mode 100644 index 71f1c9f..0000000 --- a/doc/NO_SYS_SampleCode.c +++ /dev/null @@ -1,122 +0,0 @@ -void -eth_mac_irq() -{ - /* Service MAC IRQ here */ - - /* Allocate pbuf from pool (avoid using heap in interrupts) */ - struct pbuf* p = pbuf_alloc(PBUF_RAW, eth_data_count, PBUF_POOL); - - if(p != NULL) { - /* Copy ethernet frame into pbuf */ - pbuf_take(p, eth_data, eth_data_count); - - /* Put in a queue which is processed in main loop */ - if(!queue_try_put(&queue, p)) { - /* queue is full -> packet loss */ - pbuf_free(p); - } - } -} - -static err_t -netif_output(struct netif *netif, struct pbuf *p) -{ - LINK_STATS_INC(link.xmit); - - /* Update SNMP stats (only if you use SNMP) */ - MIB2_STATS_NETIF_ADD(netif, ifoutoctets, p->tot_len); - int unicast = ((p->payload[0] & 0x01) == 0); - if (unicast) { - MIB2_STATS_NETIF_INC(netif, ifoutucastpkts); - } else { - MIB2_STATS_NETIF_INC(netif, ifoutnucastpkts); - } - - lock_interrupts(); - pbuf_copy_partial(p, mac_send_buffer, p->tot_len, 0); - /* Start MAC transmit here */ - unlock_interrupts(); - - return ERR_OK; -} - -static void -netif_status_callback(struct netif *netif) -{ - printf("netif status changed %s\n", ip4addr_ntoa(netif_ip4_addr(netif))); -} - -static err_t -netif_init(struct netif *netif) -{ - netif->linkoutput = netif_output; - netif->output = etharp_output; - netif->output_ip6 = ethip6_output; - netif->mtu = ETHERNET_MTU; - netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP | NETIF_FLAG_MLD6; - MIB2_INIT_NETIF(netif, snmp_ifType_ethernet_csmacd, 100000000); - - SMEMCPY(netif->hwaddr, your_mac_address_goes_here, ETH_HWADDR_LEN); - netif->hwaddr_len = ETH_HWADDR_LEN; - - return ERR_OK; -} - -void -main(void) -{ - struct netif netif; - - lwip_init(); - - netif_add(&netif, IP4_ADDR_ANY, IP4_ADDR_ANY, IP4_ADDR_ANY, NULL, netif_init, netif_input); - netif.name[0] = 'e'; - netif.name[1] = '0'; - netif_create_ip6_linklocal_address(&netif, 1); - netif.ip6_autoconfig_enabled = 1; - netif_set_status_callback(&netif, netif_status_callback); - netif_set_default(&netif); - netif_set_up(&netif); - - /* Start DHCP and HTTPD */ - dhcp_start(&netif ); - httpd_init(); - - while(1) { - /* Check link state, e.g. via MDIO communication with PHY */ - if(link_state_changed()) { - if(link_is_up()) { - netif_set_link_up(&netif); - } else { - netif_set_link_down(&netif); - } - } - - /* Check for received frames, feed them to lwIP */ - lock_interrupts(); - struct pbuf* p = queue_try_get(&queue); - unlock_interrupts(); - - if(p != NULL) { - LINK_STATS_INC(link.recv); - - /* Update SNMP stats (only if you use SNMP) */ - MIB2_STATS_NETIF_ADD(netif, ifinoctets, p->tot_len); - int unicast = ((p->payload[0] & 0x01) == 0); - if (unicast) { - MIB2_STATS_NETIF_INC(netif, ifinucastpkts); - } else { - MIB2_STATS_NETIF_INC(netif, ifinnucastpkts); - } - - if(netif.input(p, &netif) != ERR_OK) { - pbuf_free(p); - } - } - - /* Cyclic lwIP timers check */ - sys_check_timeouts(); - - /* your application goes here */ - } -} diff --git a/doc/ZeroCopyRx.c b/doc/ZeroCopyRx.c deleted file mode 100644 index 0e8219b..0000000 --- a/doc/ZeroCopyRx.c +++ /dev/null @@ -1,45 +0,0 @@ -typedef struct my_custom_pbuf -{ - struct pbuf_custom p; - void* dma_descriptor; -} my_custom_pbuf_t; - -LWIP_MEMPOOL_DECLARE(RX_POOL, 10, sizeof(my_custom_pbuf_t), "Zero-copy RX PBUF pool"); - -void my_pbuf_free_custom(void* p) -{ - SYS_ARCH_DECL_PROTECT(old_level); - - my_custom_pbuf_t* my_puf = (my_custom_pbuf_t*)p; - - // invalidate data cache here - lwIP and/or application may have written into buffer! - // (invalidate is faster than flushing, and noone needs the correct data in the buffer) - invalidate_cpu_cache(p->payload, p->tot_len); - - SYS_ARCH_PROTECT(old_level); - free_rx_dma_descriptor(my_pbuf->dma_descriptor); - LWIP_MEMPOOL_FREE(RX_POOL, my_pbuf); - SYS_ARCH_UNPROTECT(old_level); -} - -void eth_rx_irq() -{ - dma_descriptor* dma_desc = get_RX_DMA_descriptor_from_ethernet(); - my_custom_pbuf_t* my_pbuf = (my_custom_pbuf_t*)LWIP_MEMPOOL_ALLOC(RX_POOL); - - my_pbuf->p.custom_free_function = my_pbuf_free_custom; - my_pbuf->dma_descriptor = dma_desc; - - invalidate_cpu_cache(dma_desc->rx_data, dma_desc->rx_length); - - struct pbuf* p = pbuf_alloced_custom(PBUF_RAW, - dma_desc->rx_length, - PBUF_REF, - &my_pbuf->p, - dma_desc->rx_data, - dma_desc->max_buffer_size); - - if(netif->input(p, netif) != ERR_OK) { - pbuf_free(p); - } -} diff --git a/doc/contrib.txt b/doc/contrib.txt deleted file mode 100644 index 6f0d7bc..0000000 --- a/doc/contrib.txt +++ /dev/null @@ -1,58 +0,0 @@ -1 Introduction - -This document describes some guidelines for people participating -in lwIP development. - -2 How to contribute to lwIP - -Here is a short list of suggestions to anybody working with lwIP and -trying to contribute bug reports, fixes, enhancements, platform ports etc. -First of all as you may already know lwIP is a volunteer project so feedback -to fixes or questions might often come late. Hopefully the bug and patch tracking -features of Savannah help us not lose users' input. - -2.1 Source code style: - -1. do not use tabs. -2. indentation is two spaces per level (i.e. per tab). -3. end debug messages with a trailing newline (\n). -4. one space between keyword and opening bracket. -5. no space between function and opening bracket. -6. one space and no newline before opening curly braces of a block. -7. closing curly brace on a single line. -8. spaces surrounding assignment and comparisons. -9. don't initialize static and/or global variables to zero, the compiler takes care of that. -10. use current source code style as further reference. - -2.2 Source code documentation style: - -1. JavaDoc compliant and Doxygen compatible. -2. Function documentation above functions in .c files, not .h files. - (This forces you to synchronize documentation and implementation.) -3. Use current documentation style as further reference. - -2.3 Bug reports and patches: - -1. Make sure you are reporting bugs or send patches against the latest - sources. (From the latest release and/or the current Git sources.) -2. If you think you found a bug make sure it's not already filed in the - bugtracker at Savannah. -3. If you have a fix put the patch on Savannah. If it is a patch that affects - both core and arch specific stuff please separate them so that the core can - be applied separately while leaving the other patch 'open'. The preferred way - is to NOT touch archs you can't test and let maintainers take care of them. - This is a good way to see if they are used at all - the same goes for unix - netifs except tapif. -4. Do not file a bug and post a fix to it to the patch area. Either a bug report - or a patch will be enough. - If you correct an existing bug then attach the patch to the bug rather than creating a new entry in the patch area. -5. Patches should be specific to a single change or to related changes. Do not mix bugfixes with spelling and other - trivial fixes unless the bugfix is trivial too. Do not reorganize code and rename identifiers in the same patch you - change behaviour if not necessary. A patch is easier to read and understand if it's to the point and short than - if it's not to the point and long :) so the chances for it to be applied are greater. - -2.4 Platform porters: - -1. If you have ported lwIP to a platform (an OS, a uC/processor or a combination of these) and - you think it could benefit others[1] you might want discuss this on the mailing list. You - can also ask for Git access to submit and maintain your port in the contrib Git module. diff --git a/doc/doxygen/generate.bat b/doc/doxygen/generate.bat deleted file mode 100644 index 99afb12..0000000 --- a/doc/doxygen/generate.bat +++ /dev/null @@ -1 +0,0 @@ -doxygen lwip.Doxyfile diff --git a/doc/doxygen/generate.sh b/doc/doxygen/generate.sh deleted file mode 100755 index 89344b0..0000000 --- a/doc/doxygen/generate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -doxygen lwip.Doxyfile diff --git a/doc/doxygen/lwip.Doxyfile b/doc/doxygen/lwip.Doxyfile deleted file mode 100644 index 3477722..0000000 --- a/doc/doxygen/lwip.Doxyfile +++ /dev/null @@ -1,2531 +0,0 @@ -# Doxyfile 1.8.13 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "lwIP" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = "2.1.3" - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = "Lightweight IP stack" - -# With the PROJECT_LOGO tag one can specify a logo or an icon that is included -# in the documentation. The maximum height of the logo should not exceed 55 -# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy -# the logo to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = "output" - -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = "The $name class " \ - "The $name widget " \ - "The $name file " \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = YES - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = ../../ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new -# page for each member. If set to NO, the documentation of a member will be part -# of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. - -ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = YES - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. -# -# Note: For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 0. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 0 - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# If one adds a struct or class to a group and this option is enabled, then also -# any nested class or struct is added to the same group. By default this option -# is disabled and one has to add nested compounds explicitly via \ingroup. -# The default value is: NO. - -GROUP_NESTED_COMPOUNDS = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO, -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. If set to YES, local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO, only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = YES - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO, these declarations will be -# included in the documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO, these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES, upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES, the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will -# append additional text to a page's title, such as Class Reference. If set to -# YES the compound reference will be hidden. -# The default value is: NO. - -HIDE_COMPOUND_REFERENCE= NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo -# list. This list is created by putting \todo commands in the documentation. -# The default value is: YES. - -GENERATE_TODOLIST = NO - -# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test -# list. This list is created by putting \test commands in the documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES, the -# list will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO, doxygen will only warn about wrong or incomplete -# parameter documentation, but not about the absence of documentation. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when -# a warning is encountered. -# The default value is: NO. - -WARN_AS_ERROR = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text " - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING -# Note: If this tag is empty the current directory is searched. - -INPUT = main_page.h \ - ../../src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of -# possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# read by doxygen. -# -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, -# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, -# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.inc \ - *.m \ - *.mm \ - *.dox - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = ../../src/include/netif/ppp/polarssl - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = ../ \ - ../../ - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = main_page.h - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = NO - -# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. -# Note: The availability of this option depends on whether or not doxygen was -# generated with the -Duse-libclang=ON option for CMake. -# The default value is: NO. - -CLANG_ASSISTED_PARSING = NO - -# If clang assisted parsing is enabled you can provide the compiler with command -# line options that you would normally use when invoking the compiler. Note that -# the include paths will already be set by doxygen for the files and directories -# specified with INPUT and INCLUDE_PATH. -# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. - -CLANG_OPTIONS = - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = NO - -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefore more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra style sheet files is of importance (e.g. the last -# style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the style sheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = lwip.chm - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler (hhc.exe). If non-empty, -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the master .chm file (NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated -# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = YES - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /