mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-20 19:41:58 +00:00
Reimplement BSD layer
This commit is contained in:
1 parent
bc5afa4519
commit
fdf12844e3
28 files changed
+3653
-1746
No files matched your search
@@ -303,6 +303,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
|
target: [bsd, bsd_nortos]
|
||||||
cc: [gcc, clang, g++, clang++]
|
cc: [gcc, clang, g++, clang++]
|
||||||
name: bsd CC=${{ matrix.cc }}
|
name: bsd CC=${{ matrix.cc }}
|
||||||
steps:
|
steps:
|
||||||
@@ -316,7 +317,7 @@ jobs:
|
|||||||
make -C test/bsd shm_tap_bridge
|
make -C test/bsd shm_tap_bridge
|
||||||
test/bsd/shm_tap_bridge &
|
test/bsd/shm_tap_bridge &
|
||||||
sleep 2
|
sleep 2
|
||||||
make -C test/bsd CC=${{ matrix.cc }} > log
|
make -C test/bsd ${{ matrix.target }} CC=${{ matrix.cc }} > log
|
||||||
- if: success() || failure()
|
- if: success() || failure()
|
||||||
run: |
|
run: |
|
||||||
cat log
|
cat log
|
||||||
@@ -589,10 +590,12 @@ jobs:
|
|||||||
stm32/nucleo-f746zg/minimal
|
stm32/nucleo-f746zg/minimal
|
||||||
stm32/nucleo-f746zg/minimal-pppoe
|
stm32/nucleo-f746zg/minimal-pppoe
|
||||||
stm32/nucleo-f756zg/minimal
|
stm32/nucleo-f756zg/minimal
|
||||||
stm32/nucleo-h563zi/minimal
|
|
||||||
stm32/nucleo-h723zg/minimal
|
stm32/nucleo-h723zg/minimal
|
||||||
|
stm32/nucleo-h723zg/minimal-bsd-baremetal
|
||||||
|
stm32/nucleo-h723zg/minimal-bsd-freertos
|
||||||
- group: stm32-2
|
- group: stm32-2
|
||||||
examples: |
|
examples: |
|
||||||
|
stm32/nucleo-h563zi/minimal
|
||||||
stm32/nucleo-h743zi/minimal
|
stm32/nucleo-h743zi/minimal
|
||||||
stm32/nucleo-n657x0-q/minimal
|
stm32/nucleo-n657x0-q/minimal
|
||||||
stm32/nucleo-u5a5zj-q/minimal
|
stm32/nucleo-u5a5zj-q/minimal
|
||||||
|
|||||||
@@ -158,7 +158,8 @@ jobs:
|
|||||||
- path: stm32/nucleo-f746zg/minimal
|
- path: stm32/nucleo-f746zg/minimal
|
||||||
- path: stm32/nucleo-h563zi/minimal
|
- path: stm32/nucleo-h563zi/minimal
|
||||||
- path: stm32/nucleo-h723zg/minimal
|
- path: stm32/nucleo-h723zg/minimal
|
||||||
- path: stm32/nucleo-h723zg/minimal-bsd
|
- path: stm32/nucleo-h723zg/minimal-bsd-baremetal
|
||||||
|
- path: stm32/nucleo-h723zg/minimal-bsd-freertos
|
||||||
- path: stm32/nucleo-h743zi/minimal
|
- path: stm32/nucleo-h743zi/minimal
|
||||||
- path: stm32/stm32h573i-dk/minimal
|
- path: stm32/stm32h573i-dk/minimal
|
||||||
- path: ti/ek-tm4c1294xl-make-baremetal-builtin
|
- path: ti/ek-tm4c1294xl-make-baremetal-builtin
|
||||||
|
|||||||
+872
-709
File diff suppressed because it is too large.
Load diff
+160
-116
@@ -2494,6 +2494,7 @@ struct mg_connection {
|
|||||||
unsigned is_tls_throttled : 1; // TLS write was throttled; retry pending
|
unsigned is_tls_throttled : 1; // TLS write was throttled; retry pending
|
||||||
unsigned is_readable : 1; // Socket is ready to read (epoll/select)
|
unsigned is_readable : 1; // Socket is ready to read (epoll/select)
|
||||||
unsigned is_writable : 1; // Socket is ready to write (epoll/select)
|
unsigned is_writable : 1; // Socket is ready to write (epoll/select)
|
||||||
|
unsigned is_bsd : 1; // Built-in TCP/IP stack BSD socket
|
||||||
};
|
};
|
||||||
|
|
||||||
// Runs one iteration of the event loop.
|
// Runs one iteration of the event loop.
|
||||||
@@ -5368,92 +5369,12 @@ struct mg_tcpip_spi {
|
|||||||
|
|
||||||
|
|
||||||
#if MG_ENABLE_BSD_SOCKETS
|
#if MG_ENABLE_BSD_SOCKETS
|
||||||
|
void mg_bsd_init(struct mg_mgr *);
|
||||||
|
void mg_bsd_poll(struct mg_mgr *);
|
||||||
|
|
||||||
#ifndef MG_ENABLE_BSD_PROTOTYPES
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <netdb.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <netinet/tcp.h>
|
|
||||||
#include <poll.h>
|
|
||||||
#include <sys/select.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/un.h>
|
|
||||||
#else
|
|
||||||
#include <errno.h>
|
|
||||||
typedef unsigned int socklen_t;
|
|
||||||
typedef uint32_t in_addr_t;
|
|
||||||
struct in_addr { in_addr_t s_addr; };
|
|
||||||
struct in6_addr { uint8_t s6_addr[16]; };
|
|
||||||
struct sockaddr { uint16_t sa_family; char sa_data[14]; };
|
|
||||||
struct sockaddr_in {
|
|
||||||
uint16_t sin_family;
|
|
||||||
uint16_t sin_port;
|
|
||||||
struct in_addr sin_addr;
|
|
||||||
char sin_zero[8];
|
|
||||||
};
|
|
||||||
struct sockaddr_in6 {
|
|
||||||
uint16_t sin6_family;
|
|
||||||
uint16_t sin6_port;
|
|
||||||
uint32_t sin6_flowinfo;
|
|
||||||
struct in6_addr sin6_addr;
|
|
||||||
uint32_t sin6_scope_id;
|
|
||||||
};
|
|
||||||
struct sockaddr_storage { uint16_t ss_family; char __ss_pad[126]; };
|
|
||||||
struct hostent {
|
|
||||||
char *h_name;
|
|
||||||
char **h_aliases;
|
|
||||||
int h_addrtype;
|
|
||||||
int h_length;
|
|
||||||
char **h_addr_list;
|
|
||||||
};
|
|
||||||
#define h_addr h_addr_list[0]
|
|
||||||
struct addrinfo {
|
|
||||||
int ai_flags;
|
|
||||||
int ai_family;
|
|
||||||
int ai_socktype;
|
|
||||||
int ai_protocol;
|
|
||||||
socklen_t ai_addrlen;
|
|
||||||
struct sockaddr *ai_addr;
|
|
||||||
char *ai_canonname;
|
|
||||||
struct addrinfo *ai_next;
|
|
||||||
};
|
|
||||||
struct pollfd { int fd; short events; short revents; };
|
|
||||||
#define AF_INET 2
|
|
||||||
#define AF_INET6 10
|
|
||||||
#define AF_UNSPEC 0
|
|
||||||
#define PF_INET AF_INET
|
|
||||||
#define PF_INET6 AF_INET6
|
|
||||||
#define PF_UNSPEC AF_UNSPEC
|
|
||||||
#define SOCK_STREAM 1
|
|
||||||
#define SOCK_DGRAM 2
|
|
||||||
#define IPPROTO_TCP 6
|
|
||||||
#define IPPROTO_UDP 17
|
|
||||||
#define INADDR_ANY 0
|
|
||||||
#define INADDR_LOOPBACK 0x7f000001
|
|
||||||
#define SOL_SOCKET 0xffff
|
|
||||||
#define SO_REUSEADDR 2
|
|
||||||
#define SO_REUSEPORT 15
|
|
||||||
#define SO_KEEPALIVE 9
|
|
||||||
#define SO_ERROR 4
|
|
||||||
#define SO_BROADCAST 6
|
|
||||||
#define SO_RCVBUF 8
|
|
||||||
#define SO_SNDBUF 7
|
|
||||||
#define TCP_NODELAY 1
|
|
||||||
#define MSG_DONTWAIT 0x40
|
|
||||||
#define MSG_NOSIGNAL 0x4000
|
|
||||||
#define MSG_PEEK 0x02
|
|
||||||
#define F_GETFL 3
|
|
||||||
#define F_SETFL 4
|
|
||||||
#define O_NONBLOCK 0x0004
|
|
||||||
#define SHUT_RD 0
|
|
||||||
#define SHUT_WR 1
|
|
||||||
#define SHUT_RDWR 2
|
|
||||||
#define AI_PASSIVE 0x0001
|
|
||||||
#define NI_MAXHOST 1025
|
|
||||||
#define NI_MAXSERV 32
|
|
||||||
#ifndef EAGAIN
|
#ifndef EAGAIN
|
||||||
#define EAGAIN 11
|
#define EAGAIN 11
|
||||||
#endif
|
#endif
|
||||||
@@ -5478,42 +5399,148 @@ struct pollfd { int fd; short events; short revents; };
|
|||||||
#ifndef ETIMEDOUT
|
#ifndef ETIMEDOUT
|
||||||
#define ETIMEDOUT 110
|
#define ETIMEDOUT 110
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef EBADF
|
||||||
|
#define EBADF 9
|
||||||
|
#endif
|
||||||
|
#ifndef EMFILE
|
||||||
|
#define EMFILE 24
|
||||||
|
#endif
|
||||||
|
#ifndef ENOMEM
|
||||||
|
#define ENOMEM 12
|
||||||
|
#endif
|
||||||
|
#ifndef EIO
|
||||||
|
#define EIO 5
|
||||||
|
#endif
|
||||||
|
#ifndef EINVAL
|
||||||
|
#define EINVAL 22
|
||||||
|
#endif
|
||||||
|
#ifndef EPERM
|
||||||
|
#define EPERM 1
|
||||||
|
#endif
|
||||||
|
#ifndef EPIPE
|
||||||
|
#define EPIPE 32
|
||||||
|
#endif
|
||||||
|
#ifndef EPROTONOSUPPORT
|
||||||
|
#define EPROTONOSUPPORT 93
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if MG_ENABLE_BSD_PROTOTYPES
|
||||||
|
#if defined(FD_SET) || defined(FD_ZERO) || defined(FD_ISSET)
|
||||||
|
#error "Include mongoose.h before system select headers"
|
||||||
|
#endif
|
||||||
|
typedef unsigned int socklen_t;
|
||||||
|
typedef unsigned long nfds_t;
|
||||||
|
typedef uint32_t in_addr_t;
|
||||||
|
typedef unsigned long __fd_mask;
|
||||||
|
struct in_addr { in_addr_t s_addr; };
|
||||||
|
struct in6_addr { uint8_t s6_addr[16]; };
|
||||||
|
struct sockaddr { uint16_t sa_family; char sa_data[14]; };
|
||||||
|
struct sockaddr_in {
|
||||||
|
uint16_t sin_family;
|
||||||
|
uint16_t sin_port;
|
||||||
|
struct in_addr sin_addr;
|
||||||
|
char sin_zero[8];
|
||||||
|
};
|
||||||
|
struct sockaddr_in6 {
|
||||||
|
uint16_t sin6_family;
|
||||||
|
uint16_t sin6_port;
|
||||||
|
uint32_t sin6_flowinfo;
|
||||||
|
struct in6_addr sin6_addr;
|
||||||
|
uint32_t sin6_scope_id;
|
||||||
|
};
|
||||||
|
struct sockaddr_storage { uint16_t ss_family; char __ss_pad[126]; };
|
||||||
|
struct hostent {
|
||||||
|
char *h_name;
|
||||||
|
char **h_aliases;
|
||||||
|
int h_addrtype;
|
||||||
|
int h_length;
|
||||||
|
char **h_addr_list;
|
||||||
|
};
|
||||||
|
struct addrinfo {
|
||||||
|
int ai_flags;
|
||||||
|
int ai_family;
|
||||||
|
int ai_socktype;
|
||||||
|
int ai_protocol;
|
||||||
|
socklen_t ai_addrlen;
|
||||||
|
struct sockaddr *ai_addr;
|
||||||
|
char *ai_canonname;
|
||||||
|
struct addrinfo *ai_next;
|
||||||
|
};
|
||||||
|
struct pollfd { int fd; short events; short revents; };
|
||||||
|
|
||||||
|
#ifndef FD_SETSIZE
|
||||||
|
#define FD_SETSIZE 64
|
||||||
|
#endif
|
||||||
|
#define _NFDBITS ((int) sizeof(__fd_mask) * 8)
|
||||||
|
#define _howmany(x, y) (((x) + ((y) - 1)) / (y))
|
||||||
|
typedef struct fd_set {
|
||||||
|
__fd_mask __fds_bits[_howmany(FD_SETSIZE, _NFDBITS)];
|
||||||
|
} fd_set;
|
||||||
|
#define __fdset_mask(n) ((__fd_mask) 1 << ((n) % _NFDBITS))
|
||||||
|
#define FD_CLR(n, p) ((p)->__fds_bits[(n) / _NFDBITS] &= ~__fdset_mask(n))
|
||||||
|
#define FD_ISSET(n, p) \
|
||||||
|
(((p)->__fds_bits[(n) / _NFDBITS] & __fdset_mask(n)) != 0)
|
||||||
|
#define FD_SET(n, p) ((p)->__fds_bits[(n) / _NFDBITS] |= __fdset_mask(n))
|
||||||
|
#define FD_ZERO(p) \
|
||||||
|
do { \
|
||||||
|
fd_set *_p = (p); \
|
||||||
|
size_t _n = _howmany(FD_SETSIZE, _NFDBITS); \
|
||||||
|
while (_n > 0) _p->__fds_bits[--_n] = 0; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define h_addr h_addr_list[0]
|
||||||
|
#define AF_INET 2
|
||||||
|
#define AF_INET6 10
|
||||||
|
#define AF_UNSPEC 0
|
||||||
|
#define PF_INET AF_INET
|
||||||
|
#define PF_INET6 AF_INET6
|
||||||
|
#define PF_UNSPEC AF_UNSPEC
|
||||||
|
#define SOCK_STREAM 1
|
||||||
|
#define SOCK_DGRAM 2
|
||||||
|
#define IPPROTO_TCP 6
|
||||||
|
#define IPPROTO_UDP 17
|
||||||
|
#define INADDR_ANY 0
|
||||||
|
#define INADDR_LOOPBACK 0x7f000001
|
||||||
|
#define INET_ADDRSTRLEN 16
|
||||||
|
#define SOL_SOCKET 0xffff
|
||||||
|
#define SO_REUSEADDR 2
|
||||||
|
#define SO_REUSEPORT 15
|
||||||
|
#define SO_KEEPALIVE 9
|
||||||
|
#define SO_ERROR 4
|
||||||
|
#define SO_BROADCAST 6
|
||||||
|
#define SO_RCVBUF 8
|
||||||
|
#define SO_SNDBUF 7
|
||||||
|
#define SO_NOSIGPIPE 0x1022
|
||||||
|
#define TCP_NODELAY 1
|
||||||
|
#define MSG_DONTWAIT 0x40
|
||||||
|
#define MSG_NOSIGNAL 0x4000
|
||||||
|
#define MSG_PEEK 0x02
|
||||||
|
#ifndef F_GETFL
|
||||||
|
#define F_GETFL 3
|
||||||
|
#endif
|
||||||
|
#ifndef F_SETFL
|
||||||
|
#define F_SETFL 4
|
||||||
|
#endif
|
||||||
|
#ifndef O_NONBLOCK
|
||||||
|
#define O_NONBLOCK 0x4000
|
||||||
|
#endif
|
||||||
|
#define SHUT_RD 0
|
||||||
|
#define SHUT_WR 1
|
||||||
|
#define SHUT_RDWR 2
|
||||||
|
#define AI_PASSIVE 0x0001
|
||||||
|
#define NI_MAXHOST 1025
|
||||||
|
#define NI_MAXSERV 32
|
||||||
#define POLLIN 0x001
|
#define POLLIN 0x001
|
||||||
#define POLLOUT 0x004
|
#define POLLOUT 0x004
|
||||||
#define POLLERR 0x008
|
#define POLLERR 0x008
|
||||||
#define POLLHUP 0x010
|
#define POLLHUP 0x010
|
||||||
#define POLLNVAL 0x020
|
#define POLLNVAL 0x020
|
||||||
uint16_t htons(uint16_t);
|
|
||||||
uint16_t ntohs(uint16_t);
|
|
||||||
uint32_t htonl(uint32_t);
|
|
||||||
uint32_t ntohl(uint32_t);
|
|
||||||
#endif // MG_ENABLE_BSD_PROTOTYPES
|
|
||||||
|
|
||||||
#define closesocket(a) close(a)
|
#define htons(x) mg_ntohs(x)
|
||||||
|
#define ntohs(x) mg_ntohs(x)
|
||||||
|
#define htonl(x) mg_ntohl(x)
|
||||||
|
#define ntohl(x) mg_ntohl(x)
|
||||||
|
|
||||||
#ifndef MG_BSD_BACKLOG
|
|
||||||
#define MG_BSD_BACKLOG 5
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MG_BSD_CONNECT_TIMEOUT_MS
|
|
||||||
#define MG_BSD_CONNECT_TIMEOUT_MS 10000
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Mongoose-specific API
|
|
||||||
void mg_bsd_init(void); // must be called before socket()
|
|
||||||
void mg_bsd_poll(struct mg_mgr *); // process pending BSD commands
|
|
||||||
|
|
||||||
// Transport backend: implement these OR define MG_ENABLE_FREERTOS for the built-in backend
|
|
||||||
void *mg_bsd_transport_new(int domain, int type, int proto);
|
|
||||||
void mg_bsd_transport_free(void *t);
|
|
||||||
int mg_bsd_transport_listen(void *t, const struct sockaddr_in *addr);
|
|
||||||
void *mg_bsd_transport_accept(void *t, struct sockaddr_in *peer, bool nonblock);
|
|
||||||
ssize_t mg_bsd_transport_recv(void *t, void *buf, size_t len, bool nonblock);
|
|
||||||
ssize_t mg_bsd_transport_send(void *t, const void *buf, size_t len, bool nonblock);
|
|
||||||
int mg_bsd_transport_connect(void *t, const struct sockaddr_in *addr, bool nonblock);
|
|
||||||
void mg_bsd_transport_close(void *t);
|
|
||||||
|
|
||||||
// Standard BSD socket API
|
|
||||||
int socket(int, int, int);
|
int socket(int, int, int);
|
||||||
int bind(int, const struct sockaddr *, socklen_t);
|
int bind(int, const struct sockaddr *, socklen_t);
|
||||||
int listen(int, int);
|
int listen(int, int);
|
||||||
@@ -5521,25 +5548,42 @@ int accept(int, struct sockaddr *, socklen_t *);
|
|||||||
int connect(int, const struct sockaddr *, socklen_t);
|
int connect(int, const struct sockaddr *, socklen_t);
|
||||||
ssize_t send(int, const void *, size_t, int);
|
ssize_t send(int, const void *, size_t, int);
|
||||||
ssize_t recv(int, void *, size_t, int);
|
ssize_t recv(int, void *, size_t, int);
|
||||||
ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t);
|
ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *,
|
||||||
|
socklen_t);
|
||||||
ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
|
ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
|
||||||
int close(int);
|
int close(int);
|
||||||
int shutdown(int, int);
|
int shutdown(int, int);
|
||||||
int fcntl(int, int, int);
|
|
||||||
int setsockopt(int, int, int, const void *, socklen_t);
|
int setsockopt(int, int, int, const void *, socklen_t);
|
||||||
int getsockopt(int, int, int, void *, socklen_t *);
|
int getsockopt(int, int, int, void *, socklen_t *);
|
||||||
int getsockname(int, struct sockaddr *, socklen_t *);
|
int getsockname(int, struct sockaddr *, socklen_t *);
|
||||||
int getpeername(int, struct sockaddr *, socklen_t *);
|
int getpeername(int, struct sockaddr *, socklen_t *);
|
||||||
int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
|
int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
|
||||||
int poll(struct pollfd *, unsigned int, int);
|
int poll(struct pollfd *, nfds_t, int);
|
||||||
struct hostent *gethostbyname(const char *);
|
struct hostent *gethostbyname(const char *);
|
||||||
int getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **);
|
int getaddrinfo(const char *, const char *, const struct addrinfo *,
|
||||||
|
struct addrinfo **);
|
||||||
void freeaddrinfo(struct addrinfo *);
|
void freeaddrinfo(struct addrinfo *);
|
||||||
int inet_pton(int, const char *, void *);
|
int inet_pton(int, const char *, void *);
|
||||||
const char *inet_ntop(int, const void *, char *, socklen_t);
|
const char *inet_ntop(int, const void *, char *, socklen_t);
|
||||||
in_addr_t inet_addr(const char *);
|
in_addr_t inet_addr(const char *);
|
||||||
char *inet_ntoa(struct in_addr);
|
char *inet_ntoa(struct in_addr);
|
||||||
|
#else
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <netinet/tcp.h>
|
||||||
|
#include <poll.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif // MG_ENABLE_BSD_PROTOTYPES
|
||||||
|
|
||||||
|
#include <sys/time.h>
|
||||||
|
|
||||||
|
#else
|
||||||
|
#define mg_bsd_init(mgr)
|
||||||
|
#define mg_bsd_poll(mgr)
|
||||||
#endif // MG_ENABLE_BSD_SOCKETS
|
#endif // MG_ENABLE_BSD_SOCKETS
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,92 +4,12 @@
|
|||||||
#include "net_builtin.h"
|
#include "net_builtin.h"
|
||||||
|
|
||||||
#if MG_ENABLE_BSD_SOCKETS
|
#if MG_ENABLE_BSD_SOCKETS
|
||||||
|
void mg_bsd_init(struct mg_mgr *);
|
||||||
|
void mg_bsd_poll(struct mg_mgr *);
|
||||||
|
|
||||||
#ifndef MG_ENABLE_BSD_PROTOTYPES
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <netdb.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <netinet/tcp.h>
|
|
||||||
#include <poll.h>
|
|
||||||
#include <sys/select.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/un.h>
|
|
||||||
#else
|
|
||||||
#include <errno.h>
|
|
||||||
typedef unsigned int socklen_t;
|
|
||||||
typedef uint32_t in_addr_t;
|
|
||||||
struct in_addr { in_addr_t s_addr; };
|
|
||||||
struct in6_addr { uint8_t s6_addr[16]; };
|
|
||||||
struct sockaddr { uint16_t sa_family; char sa_data[14]; };
|
|
||||||
struct sockaddr_in {
|
|
||||||
uint16_t sin_family;
|
|
||||||
uint16_t sin_port;
|
|
||||||
struct in_addr sin_addr;
|
|
||||||
char sin_zero[8];
|
|
||||||
};
|
|
||||||
struct sockaddr_in6 {
|
|
||||||
uint16_t sin6_family;
|
|
||||||
uint16_t sin6_port;
|
|
||||||
uint32_t sin6_flowinfo;
|
|
||||||
struct in6_addr sin6_addr;
|
|
||||||
uint32_t sin6_scope_id;
|
|
||||||
};
|
|
||||||
struct sockaddr_storage { uint16_t ss_family; char __ss_pad[126]; };
|
|
||||||
struct hostent {
|
|
||||||
char *h_name;
|
|
||||||
char **h_aliases;
|
|
||||||
int h_addrtype;
|
|
||||||
int h_length;
|
|
||||||
char **h_addr_list;
|
|
||||||
};
|
|
||||||
#define h_addr h_addr_list[0]
|
|
||||||
struct addrinfo {
|
|
||||||
int ai_flags;
|
|
||||||
int ai_family;
|
|
||||||
int ai_socktype;
|
|
||||||
int ai_protocol;
|
|
||||||
socklen_t ai_addrlen;
|
|
||||||
struct sockaddr *ai_addr;
|
|
||||||
char *ai_canonname;
|
|
||||||
struct addrinfo *ai_next;
|
|
||||||
};
|
|
||||||
struct pollfd { int fd; short events; short revents; };
|
|
||||||
#define AF_INET 2
|
|
||||||
#define AF_INET6 10
|
|
||||||
#define AF_UNSPEC 0
|
|
||||||
#define PF_INET AF_INET
|
|
||||||
#define PF_INET6 AF_INET6
|
|
||||||
#define PF_UNSPEC AF_UNSPEC
|
|
||||||
#define SOCK_STREAM 1
|
|
||||||
#define SOCK_DGRAM 2
|
|
||||||
#define IPPROTO_TCP 6
|
|
||||||
#define IPPROTO_UDP 17
|
|
||||||
#define INADDR_ANY 0
|
|
||||||
#define INADDR_LOOPBACK 0x7f000001
|
|
||||||
#define SOL_SOCKET 0xffff
|
|
||||||
#define SO_REUSEADDR 2
|
|
||||||
#define SO_REUSEPORT 15
|
|
||||||
#define SO_KEEPALIVE 9
|
|
||||||
#define SO_ERROR 4
|
|
||||||
#define SO_BROADCAST 6
|
|
||||||
#define SO_RCVBUF 8
|
|
||||||
#define SO_SNDBUF 7
|
|
||||||
#define TCP_NODELAY 1
|
|
||||||
#define MSG_DONTWAIT 0x40
|
|
||||||
#define MSG_NOSIGNAL 0x4000
|
|
||||||
#define MSG_PEEK 0x02
|
|
||||||
#define F_GETFL 3
|
|
||||||
#define F_SETFL 4
|
|
||||||
#define O_NONBLOCK 0x0004
|
|
||||||
#define SHUT_RD 0
|
|
||||||
#define SHUT_WR 1
|
|
||||||
#define SHUT_RDWR 2
|
|
||||||
#define AI_PASSIVE 0x0001
|
|
||||||
#define NI_MAXHOST 1025
|
|
||||||
#define NI_MAXSERV 32
|
|
||||||
#ifndef EAGAIN
|
#ifndef EAGAIN
|
||||||
#define EAGAIN 11
|
#define EAGAIN 11
|
||||||
#endif
|
#endif
|
||||||
@@ -114,42 +34,148 @@ struct pollfd { int fd; short events; short revents; };
|
|||||||
#ifndef ETIMEDOUT
|
#ifndef ETIMEDOUT
|
||||||
#define ETIMEDOUT 110
|
#define ETIMEDOUT 110
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef EBADF
|
||||||
|
#define EBADF 9
|
||||||
|
#endif
|
||||||
|
#ifndef EMFILE
|
||||||
|
#define EMFILE 24
|
||||||
|
#endif
|
||||||
|
#ifndef ENOMEM
|
||||||
|
#define ENOMEM 12
|
||||||
|
#endif
|
||||||
|
#ifndef EIO
|
||||||
|
#define EIO 5
|
||||||
|
#endif
|
||||||
|
#ifndef EINVAL
|
||||||
|
#define EINVAL 22
|
||||||
|
#endif
|
||||||
|
#ifndef EPERM
|
||||||
|
#define EPERM 1
|
||||||
|
#endif
|
||||||
|
#ifndef EPIPE
|
||||||
|
#define EPIPE 32
|
||||||
|
#endif
|
||||||
|
#ifndef EPROTONOSUPPORT
|
||||||
|
#define EPROTONOSUPPORT 93
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if MG_ENABLE_BSD_PROTOTYPES
|
||||||
|
#if defined(FD_SET) || defined(FD_ZERO) || defined(FD_ISSET)
|
||||||
|
#error "Include mongoose.h before system select headers"
|
||||||
|
#endif
|
||||||
|
typedef unsigned int socklen_t;
|
||||||
|
typedef unsigned long nfds_t;
|
||||||
|
typedef uint32_t in_addr_t;
|
||||||
|
typedef unsigned long __fd_mask;
|
||||||
|
struct in_addr { in_addr_t s_addr; };
|
||||||
|
struct in6_addr { uint8_t s6_addr[16]; };
|
||||||
|
struct sockaddr { uint16_t sa_family; char sa_data[14]; };
|
||||||
|
struct sockaddr_in {
|
||||||
|
uint16_t sin_family;
|
||||||
|
uint16_t sin_port;
|
||||||
|
struct in_addr sin_addr;
|
||||||
|
char sin_zero[8];
|
||||||
|
};
|
||||||
|
struct sockaddr_in6 {
|
||||||
|
uint16_t sin6_family;
|
||||||
|
uint16_t sin6_port;
|
||||||
|
uint32_t sin6_flowinfo;
|
||||||
|
struct in6_addr sin6_addr;
|
||||||
|
uint32_t sin6_scope_id;
|
||||||
|
};
|
||||||
|
struct sockaddr_storage { uint16_t ss_family; char __ss_pad[126]; };
|
||||||
|
struct hostent {
|
||||||
|
char *h_name;
|
||||||
|
char **h_aliases;
|
||||||
|
int h_addrtype;
|
||||||
|
int h_length;
|
||||||
|
char **h_addr_list;
|
||||||
|
};
|
||||||
|
struct addrinfo {
|
||||||
|
int ai_flags;
|
||||||
|
int ai_family;
|
||||||
|
int ai_socktype;
|
||||||
|
int ai_protocol;
|
||||||
|
socklen_t ai_addrlen;
|
||||||
|
struct sockaddr *ai_addr;
|
||||||
|
char *ai_canonname;
|
||||||
|
struct addrinfo *ai_next;
|
||||||
|
};
|
||||||
|
struct pollfd { int fd; short events; short revents; };
|
||||||
|
|
||||||
|
#ifndef FD_SETSIZE
|
||||||
|
#define FD_SETSIZE 64
|
||||||
|
#endif
|
||||||
|
#define _NFDBITS ((int) sizeof(__fd_mask) * 8)
|
||||||
|
#define _howmany(x, y) (((x) + ((y) - 1)) / (y))
|
||||||
|
typedef struct fd_set {
|
||||||
|
__fd_mask __fds_bits[_howmany(FD_SETSIZE, _NFDBITS)];
|
||||||
|
} fd_set;
|
||||||
|
#define __fdset_mask(n) ((__fd_mask) 1 << ((n) % _NFDBITS))
|
||||||
|
#define FD_CLR(n, p) ((p)->__fds_bits[(n) / _NFDBITS] &= ~__fdset_mask(n))
|
||||||
|
#define FD_ISSET(n, p) \
|
||||||
|
(((p)->__fds_bits[(n) / _NFDBITS] & __fdset_mask(n)) != 0)
|
||||||
|
#define FD_SET(n, p) ((p)->__fds_bits[(n) / _NFDBITS] |= __fdset_mask(n))
|
||||||
|
#define FD_ZERO(p) \
|
||||||
|
do { \
|
||||||
|
fd_set *_p = (p); \
|
||||||
|
size_t _n = _howmany(FD_SETSIZE, _NFDBITS); \
|
||||||
|
while (_n > 0) _p->__fds_bits[--_n] = 0; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define h_addr h_addr_list[0]
|
||||||
|
#define AF_INET 2
|
||||||
|
#define AF_INET6 10
|
||||||
|
#define AF_UNSPEC 0
|
||||||
|
#define PF_INET AF_INET
|
||||||
|
#define PF_INET6 AF_INET6
|
||||||
|
#define PF_UNSPEC AF_UNSPEC
|
||||||
|
#define SOCK_STREAM 1
|
||||||
|
#define SOCK_DGRAM 2
|
||||||
|
#define IPPROTO_TCP 6
|
||||||
|
#define IPPROTO_UDP 17
|
||||||
|
#define INADDR_ANY 0
|
||||||
|
#define INADDR_LOOPBACK 0x7f000001
|
||||||
|
#define INET_ADDRSTRLEN 16
|
||||||
|
#define SOL_SOCKET 0xffff
|
||||||
|
#define SO_REUSEADDR 2
|
||||||
|
#define SO_REUSEPORT 15
|
||||||
|
#define SO_KEEPALIVE 9
|
||||||
|
#define SO_ERROR 4
|
||||||
|
#define SO_BROADCAST 6
|
||||||
|
#define SO_RCVBUF 8
|
||||||
|
#define SO_SNDBUF 7
|
||||||
|
#define SO_NOSIGPIPE 0x1022
|
||||||
|
#define TCP_NODELAY 1
|
||||||
|
#define MSG_DONTWAIT 0x40
|
||||||
|
#define MSG_NOSIGNAL 0x4000
|
||||||
|
#define MSG_PEEK 0x02
|
||||||
|
#ifndef F_GETFL
|
||||||
|
#define F_GETFL 3
|
||||||
|
#endif
|
||||||
|
#ifndef F_SETFL
|
||||||
|
#define F_SETFL 4
|
||||||
|
#endif
|
||||||
|
#ifndef O_NONBLOCK
|
||||||
|
#define O_NONBLOCK 0x4000
|
||||||
|
#endif
|
||||||
|
#define SHUT_RD 0
|
||||||
|
#define SHUT_WR 1
|
||||||
|
#define SHUT_RDWR 2
|
||||||
|
#define AI_PASSIVE 0x0001
|
||||||
|
#define NI_MAXHOST 1025
|
||||||
|
#define NI_MAXSERV 32
|
||||||
#define POLLIN 0x001
|
#define POLLIN 0x001
|
||||||
#define POLLOUT 0x004
|
#define POLLOUT 0x004
|
||||||
#define POLLERR 0x008
|
#define POLLERR 0x008
|
||||||
#define POLLHUP 0x010
|
#define POLLHUP 0x010
|
||||||
#define POLLNVAL 0x020
|
#define POLLNVAL 0x020
|
||||||
uint16_t htons(uint16_t);
|
|
||||||
uint16_t ntohs(uint16_t);
|
|
||||||
uint32_t htonl(uint32_t);
|
|
||||||
uint32_t ntohl(uint32_t);
|
|
||||||
#endif // MG_ENABLE_BSD_PROTOTYPES
|
|
||||||
|
|
||||||
#define closesocket(a) close(a)
|
#define htons(x) mg_ntohs(x)
|
||||||
|
#define ntohs(x) mg_ntohs(x)
|
||||||
|
#define htonl(x) mg_ntohl(x)
|
||||||
|
#define ntohl(x) mg_ntohl(x)
|
||||||
|
|
||||||
#ifndef MG_BSD_BACKLOG
|
|
||||||
#define MG_BSD_BACKLOG 5
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MG_BSD_CONNECT_TIMEOUT_MS
|
|
||||||
#define MG_BSD_CONNECT_TIMEOUT_MS 10000
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Mongoose-specific API
|
|
||||||
void mg_bsd_init(void); // must be called before socket()
|
|
||||||
void mg_bsd_poll(struct mg_mgr *); // process pending BSD commands
|
|
||||||
|
|
||||||
// Transport backend: implement these OR define MG_ENABLE_FREERTOS for the built-in backend
|
|
||||||
void *mg_bsd_transport_new(int domain, int type, int proto);
|
|
||||||
void mg_bsd_transport_free(void *t);
|
|
||||||
int mg_bsd_transport_listen(void *t, const struct sockaddr_in *addr);
|
|
||||||
void *mg_bsd_transport_accept(void *t, struct sockaddr_in *peer, bool nonblock);
|
|
||||||
ssize_t mg_bsd_transport_recv(void *t, void *buf, size_t len, bool nonblock);
|
|
||||||
ssize_t mg_bsd_transport_send(void *t, const void *buf, size_t len, bool nonblock);
|
|
||||||
int mg_bsd_transport_connect(void *t, const struct sockaddr_in *addr, bool nonblock);
|
|
||||||
void mg_bsd_transport_close(void *t);
|
|
||||||
|
|
||||||
// Standard BSD socket API
|
|
||||||
int socket(int, int, int);
|
int socket(int, int, int);
|
||||||
int bind(int, const struct sockaddr *, socklen_t);
|
int bind(int, const struct sockaddr *, socklen_t);
|
||||||
int listen(int, int);
|
int listen(int, int);
|
||||||
@@ -157,23 +183,40 @@ int accept(int, struct sockaddr *, socklen_t *);
|
|||||||
int connect(int, const struct sockaddr *, socklen_t);
|
int connect(int, const struct sockaddr *, socklen_t);
|
||||||
ssize_t send(int, const void *, size_t, int);
|
ssize_t send(int, const void *, size_t, int);
|
||||||
ssize_t recv(int, void *, size_t, int);
|
ssize_t recv(int, void *, size_t, int);
|
||||||
ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t);
|
ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *,
|
||||||
|
socklen_t);
|
||||||
ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
|
ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
|
||||||
int close(int);
|
int close(int);
|
||||||
int shutdown(int, int);
|
int shutdown(int, int);
|
||||||
int fcntl(int, int, int);
|
|
||||||
int setsockopt(int, int, int, const void *, socklen_t);
|
int setsockopt(int, int, int, const void *, socklen_t);
|
||||||
int getsockopt(int, int, int, void *, socklen_t *);
|
int getsockopt(int, int, int, void *, socklen_t *);
|
||||||
int getsockname(int, struct sockaddr *, socklen_t *);
|
int getsockname(int, struct sockaddr *, socklen_t *);
|
||||||
int getpeername(int, struct sockaddr *, socklen_t *);
|
int getpeername(int, struct sockaddr *, socklen_t *);
|
||||||
int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
|
int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
|
||||||
int poll(struct pollfd *, unsigned int, int);
|
int poll(struct pollfd *, nfds_t, int);
|
||||||
struct hostent *gethostbyname(const char *);
|
struct hostent *gethostbyname(const char *);
|
||||||
int getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **);
|
int getaddrinfo(const char *, const char *, const struct addrinfo *,
|
||||||
|
struct addrinfo **);
|
||||||
void freeaddrinfo(struct addrinfo *);
|
void freeaddrinfo(struct addrinfo *);
|
||||||
int inet_pton(int, const char *, void *);
|
int inet_pton(int, const char *, void *);
|
||||||
const char *inet_ntop(int, const void *, char *, socklen_t);
|
const char *inet_ntop(int, const void *, char *, socklen_t);
|
||||||
in_addr_t inet_addr(const char *);
|
in_addr_t inet_addr(const char *);
|
||||||
char *inet_ntoa(struct in_addr);
|
char *inet_ntoa(struct in_addr);
|
||||||
|
#else
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <netinet/tcp.h>
|
||||||
|
#include <poll.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif // MG_ENABLE_BSD_PROTOTYPES
|
||||||
|
|
||||||
|
#include <sys/time.h>
|
||||||
|
|
||||||
|
#else
|
||||||
|
#define mg_bsd_init(mgr)
|
||||||
|
#define mg_bsd_poll(mgr)
|
||||||
#endif // MG_ENABLE_BSD_SOCKETS
|
#endif // MG_ENABLE_BSD_SOCKETS
|
||||||
@@ -97,6 +97,7 @@ struct mg_connection {
|
|||||||
unsigned is_tls_throttled : 1; // TLS write was throttled; retry pending
|
unsigned is_tls_throttled : 1; // TLS write was throttled; retry pending
|
||||||
unsigned is_readable : 1; // Socket is ready to read (epoll/select)
|
unsigned is_readable : 1; // Socket is ready to read (epoll/select)
|
||||||
unsigned is_writable : 1; // Socket is ready to write (epoll/select)
|
unsigned is_writable : 1; // Socket is ready to write (epoll/select)
|
||||||
|
unsigned is_bsd : 1; // Built-in TCP/IP stack BSD socket
|
||||||
};
|
};
|
||||||
|
|
||||||
// Runs one iteration of the event loop.
|
// Runs one iteration of the event loop.
|
||||||
|
|||||||
+15
-12
@@ -1,4 +1,5 @@
|
|||||||
#include "net_builtin.h"
|
#include "net_builtin.h"
|
||||||
|
#include "bsd.h"
|
||||||
#include "profile.h"
|
#include "profile.h"
|
||||||
|
|
||||||
#if MG_ENABLE_TCPIP
|
#if MG_ENABLE_TCPIP
|
||||||
@@ -31,16 +32,16 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct connstate {
|
struct connstate {
|
||||||
uint32_t seq, ack; // TCP seq/ack counters
|
uint32_t seq, ack; // TCP seq/ack counters
|
||||||
uint64_t timer; // TCP timer (see 'ttype' below)
|
uint64_t timer; // TCP timer (see 'ttype' below)
|
||||||
uint64_t txq_timer; // TCP retransmission timer (RFC-6298, 5)
|
uint64_t txq_timer; // TCP retransmission timer (RFC-6298, 5)
|
||||||
uint32_t acked; // Last ACK-ed number
|
uint32_t acked; // Last ACK-ed number
|
||||||
size_t unacked; // Not acked bytes
|
size_t unacked; // Not acked bytes
|
||||||
uint32_t maxseq; // Max send seq (ack + window)
|
uint32_t maxseq; // Max send seq (ack + window)
|
||||||
uint32_t txq_seq; // Sequence of first txq record (RFC-9293, 3.8)
|
uint32_t txq_seq; // Sequence of first txq record (RFC-9293, 3.8)
|
||||||
uint32_t txq_una; // Oldest unacknowledged sequence (RFC-9293, 3.4)
|
uint32_t txq_una; // Oldest unacknowledged sequence (RFC-9293, 3.4)
|
||||||
uint16_t win; // destination current window size
|
uint16_t win; // destination current window size
|
||||||
uint16_t dmss; // destination MSS (from TCP opts)
|
uint16_t dmss; // destination MSS (from TCP opts)
|
||||||
uint8_t mac[sizeof(struct mg_l2addr)]; // Peer hw address
|
uint8_t mac[sizeof(struct mg_l2addr)]; // Peer hw address
|
||||||
uint8_t ttype; // Timer type:
|
uint8_t ttype; // Timer type:
|
||||||
#define MIP_TTYPE_KEEPALIVE 0 // Connection is idle for long, send keepalive
|
#define MIP_TTYPE_KEEPALIVE 0 // Connection is idle for long, send keepalive
|
||||||
@@ -807,7 +808,7 @@ static struct ip6 *tx_ip6(struct mg_tcpip_if *ifp, uint8_t *l2_dst,
|
|||||||
struct ip6 *ip6 = (struct ip6 *) mg_l2_header(ifp, MG_TCPIP_L2PROTO_IPV6,
|
struct ip6 *ip6 = (struct ip6 *) mg_l2_header(ifp, MG_TCPIP_L2PROTO_IPV6,
|
||||||
ifp->mac, l2_dst, l2p);
|
ifp->mac, l2_dst, l2p);
|
||||||
memset(ip6, 0, sizeof(*ip6));
|
memset(ip6, 0, sizeof(*ip6));
|
||||||
ip6->ver = (uint8_t) (0x60 | (dscp >> 2)); // Version 6, traffic class
|
ip6->ver = (uint8_t) (0x60 | (dscp >> 2)); // Version 6, traffic class
|
||||||
ip6->label[0] = (uint8_t) (dscp << 6);
|
ip6->label[0] = (uint8_t) (dscp << 6);
|
||||||
ip6->plen = mg_htons((uint16_t) plen);
|
ip6->plen = mg_htons((uint16_t) plen);
|
||||||
ip6->next = next;
|
ip6->next = next;
|
||||||
@@ -1276,7 +1277,7 @@ static size_t tx_tcp(struct mg_tcpip_if *ifp, uint8_t *l2_dst,
|
|||||||
tcp->off = (uint8_t) (hlen / 4 << 4);
|
tcp->off = (uint8_t) (hlen / 4 << 4);
|
||||||
#if MG_ENABLE_IPV6
|
#if MG_ENABLE_IPV6
|
||||||
if (ip_dst->is_ip6) {
|
if (ip_dst->is_ip6) {
|
||||||
tcp->csum = p6csum(ip6, tcp, 6, hlen + len);
|
tcp->csum = p6csum(ip6, tcp, 6, hlen + len);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
@@ -2266,6 +2267,7 @@ void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) {
|
|||||||
MG_DEBUG(("Builtin TCP/IP init done. Queue size: %zu, extra conn size: %zu",
|
MG_DEBUG(("Builtin TCP/IP init done. Queue size: %zu, extra conn size: %zu",
|
||||||
ifp->recv_queue.size, mgr->extraconnsize));
|
ifp->recv_queue.size, mgr->extraconnsize));
|
||||||
}
|
}
|
||||||
|
mg_bsd_init(mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void mg_tcpip_free(struct mg_tcpip_if *ifp) {
|
void mg_tcpip_free(struct mg_tcpip_if *ifp) {
|
||||||
@@ -2436,6 +2438,7 @@ void mg_mgr_poll(struct mg_mgr *mgr, int ms) {
|
|||||||
c->is_closing = 1;
|
c->is_closing = 1;
|
||||||
if (c->is_closing) close_conn(c);
|
if (c->is_closing) close_conn(c);
|
||||||
}
|
}
|
||||||
|
mg_bsd_poll(mgr);
|
||||||
(void) ms;
|
(void) ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+28
-5
@@ -13,18 +13,21 @@ else
|
|||||||
C_WARN ?= -Wno-deprecated
|
C_WARN ?= -Wno-deprecated
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: all bsd_test bsd_client shm_tap_bridge shm_port_bridge bsd_s390 clean
|
.PHONY: all bsd bsd_test bsd_client bsd_nortos bsd_nortos_test shm_tap_bridge \
|
||||||
|
shm_port_bridge bsd_s390 bsd_nortos_s390 clean
|
||||||
|
|
||||||
TEST_SOURCES = bsd_shm_test.c
|
TEST_SOURCES = bsd_shm_test.c
|
||||||
# A C++ application compiles its sources as C++, linking Mongoose and FreeRTOS as C.
|
# A C++ application compiles its sources as C++, linking Mongoose and FreeRTOS as C.
|
||||||
# FreeRTOS does not build as C++, so C sources are compiled separately.
|
# FreeRTOS does not build as C++, so C sources are compiled separately.
|
||||||
C_SOURCES = ../../mongoose.c
|
C_SOURCES = ../../mongoose.c
|
||||||
C_SOURCES += FreeRTOS-Kernel/portable/MemMang/heap_4.c
|
FREERTOS_SOURCES = FreeRTOS-Kernel/portable/MemMang/heap_4.c
|
||||||
C_SOURCES += FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix/port.c
|
FREERTOS_SOURCES += FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix/port.c
|
||||||
C_SOURCES += FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix/utils/wait_for_event.c
|
FREERTOS_SOURCES += FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix/utils/wait_for_event.c
|
||||||
C_SOURCES += $(wildcard FreeRTOS-Kernel/*.c)
|
FREERTOS_SOURCES += $(wildcard FreeRTOS-Kernel/*.c)
|
||||||
C_OBJECTS = $(notdir $(C_SOURCES:.c=.o))
|
C_OBJECTS = $(notdir $(C_SOURCES:.c=.o))
|
||||||
|
FREERTOS_OBJECTS = $(notdir $(FREERTOS_SOURCES:.c=.o))
|
||||||
C_INPUTS = $(foreach S,$(C_SOURCES),-x c $(S))
|
C_INPUTS = $(foreach S,$(C_SOURCES),-x c $(S))
|
||||||
|
FREERTOS_INPUTS = $(foreach S,$(FREERTOS_SOURCES),-x c $(S))
|
||||||
CFLAGS += -IFreeRTOS-Kernel/include
|
CFLAGS += -IFreeRTOS-Kernel/include
|
||||||
CFLAGS += -IFreeRTOS-Kernel/portable/ThirdParty/GCC/Posix -Wno-conversion -Wno-undef
|
CFLAGS += -IFreeRTOS-Kernel/portable/ThirdParty/GCC/Posix -Wno-conversion -Wno-undef
|
||||||
|
|
||||||
@@ -47,8 +50,19 @@ CFLAGS_MONGOOSE += -DMG_ARCH=MG_ARCH_CUSTOM
|
|||||||
all bsd: shm_tap_bridge bsd_client FreeRTOS-Kernel bsd_test
|
all bsd: shm_tap_bridge bsd_client FreeRTOS-Kernel bsd_test
|
||||||
ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_test $(ARGS)
|
ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_test $(ARGS)
|
||||||
|
|
||||||
|
# also
|
||||||
|
bsd_nortos: shm_tap_bridge bsd_client bsd_nortos_test
|
||||||
|
ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_nortos_test $(ARGS)
|
||||||
|
|
||||||
# requires shm_tap_bridge to be running
|
# requires shm_tap_bridge to be running
|
||||||
|
bsd_test: CFLAGS_MONGOOSE += -DMG_ENABLE_FREERTOS=1
|
||||||
bsd_test: FreeRTOS-Kernel
|
bsd_test: FreeRTOS-Kernel
|
||||||
|
$(CC) $(C_INPUTS) $(FREERTOS_INPUTS) -c $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA)
|
||||||
|
$(CC) -x $(TEST_LANGUAGE) -c $(TEST_SOURCES) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA)
|
||||||
|
$(CC) $(C_OBJECTS) $(FREERTOS_OBJECTS) $(TEST_SOURCES:.c=.o) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) -o $@
|
||||||
|
|
||||||
|
bsd_nortos_test: CFLAGS_MONGOOSE += -DMG_ENABLE_FREERTOS=0
|
||||||
|
bsd_nortos_test:
|
||||||
$(CC) $(C_INPUTS) -c $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA)
|
$(CC) $(C_INPUTS) -c $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA)
|
||||||
$(CC) -x $(TEST_LANGUAGE) -c $(TEST_SOURCES) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA)
|
$(CC) -x $(TEST_LANGUAGE) -c $(TEST_SOURCES) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA)
|
||||||
$(CC) $(C_OBJECTS) $(TEST_SOURCES:.c=.o) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) -o $@
|
$(CC) $(C_OBJECTS) $(TEST_SOURCES:.c=.o) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) -o $@
|
||||||
@@ -61,12 +75,21 @@ shm_tap_bridge: shm_tap_bridge.c shm_queue.h
|
|||||||
$(CC) shm_tap_bridge.c -pthread -o $@
|
$(CC) shm_tap_bridge.c -pthread -o $@
|
||||||
|
|
||||||
# requires test/port_tap_bridge to be running
|
# requires test/port_tap_bridge to be running
|
||||||
|
bsd_s390: CFLAGS_MONGOOSE += -DMG_ENABLE_BSD_PROTOTYPES=0
|
||||||
bsd_s390: ASAN=
|
bsd_s390: ASAN=
|
||||||
bsd_s390: CC = $(DOCKER) mdashnet/s390 cc
|
bsd_s390: CC = $(DOCKER) mdashnet/s390 cc
|
||||||
bsd_s390: RUN = $(DOCKER) --init mdashnet/s390
|
bsd_s390: RUN = $(DOCKER) --init mdashnet/s390
|
||||||
bsd_s390: shm_port_bridge bsd_client FreeRTOS-Kernel bsd_test
|
bsd_s390: shm_port_bridge bsd_client FreeRTOS-Kernel bsd_test
|
||||||
$(RUN) sh -c './shm_port_bridge & pid=$$!; sleep 1; ./bsd_test; rc=$$?; kill $$pid >/dev/null 2>&1; wait $$pid >/dev/null 2>&1; exit $$rc'
|
$(RUN) sh -c './shm_port_bridge & pid=$$!; sleep 1; ./bsd_test; rc=$$?; kill $$pid >/dev/null 2>&1; wait $$pid >/dev/null 2>&1; exit $$rc'
|
||||||
|
|
||||||
|
#also
|
||||||
|
bsd_nortos_s390: CFLAGS_MONGOOSE += -DMG_ENABLE_BSD_PROTOTYPES=0
|
||||||
|
bsd_nortos_s390: ASAN=
|
||||||
|
bsd_nortos_s390: CC = $(DOCKER) mdashnet/s390 cc
|
||||||
|
bsd_nortos_s390: RUN = $(DOCKER) --init mdashnet/s390
|
||||||
|
bsd_nortos_s390: shm_port_bridge bsd_client bsd_nortos_test
|
||||||
|
$(RUN) sh -c './shm_port_bridge & pid=$$!; sleep 1; ./bsd_nortos_test; rc=$$?; kill $$pid >/dev/null 2>&1; wait $$pid >/dev/null 2>&1; exit $$rc'
|
||||||
|
|
||||||
shm_port_bridge: shm_port_bridge.c shm_queue.h
|
shm_port_bridge: shm_port_bridge.c shm_queue.h
|
||||||
$(CC) shm_port_bridge.c $(CFLAGS) -pthread -o $@
|
$(CC) shm_port_bridge.c $(CFLAGS) -pthread -o $@
|
||||||
|
|
||||||
|
|||||||
+64
-5
@@ -1,4 +1,5 @@
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -91,22 +92,80 @@ fail:
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum wait_mode { WAIT_ABORT, WAIT_DRAIN, WAIT_HOLD, WAIT_CLOSE };
|
||||||
|
|
||||||
|
// Wait for output, optionally draining through the final marker.
|
||||||
|
static int wait_data(const char *host, enum wait_mode mode) {
|
||||||
|
struct sockaddr_in sa;
|
||||||
|
struct timeval timeout;
|
||||||
|
char buf[512];
|
||||||
|
ssize_t n;
|
||||||
|
size_t i;
|
||||||
|
int fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
|
||||||
|
if (fd < 0) return 1;
|
||||||
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
sa.sin_family = AF_INET;
|
||||||
|
sa.sin_port = htons(PORT);
|
||||||
|
if (inet_pton(AF_INET, host, &sa.sin_addr) != 1) goto fail;
|
||||||
|
timeout.tv_sec = 5, timeout.tv_usec = 0;
|
||||||
|
if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) != 0)
|
||||||
|
goto fail;
|
||||||
|
if (connect(fd, (struct sockaddr *) &sa, sizeof(sa)) != 0) goto fail;
|
||||||
|
if (mode == WAIT_HOLD) {
|
||||||
|
usleep(100000); // Keep the peer connected while the server fails TX
|
||||||
|
close(fd);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (mode == WAIT_CLOSE) {
|
||||||
|
n = recv(fd, buf, sizeof(buf), 0);
|
||||||
|
close(fd);
|
||||||
|
return n == 0 || (n < 0 && errno == ECONNRESET) ? 0 : 1;
|
||||||
|
}
|
||||||
|
for (;;) {
|
||||||
|
n = recv(fd, buf, sizeof(buf), 0);
|
||||||
|
if (n <= 0) goto fail;
|
||||||
|
if (mode == WAIT_ABORT) break;
|
||||||
|
for (i = 0; i < (size_t) n; i++) {
|
||||||
|
if (buf[i] == '\1') break;
|
||||||
|
}
|
||||||
|
if (i < (size_t) n) break;
|
||||||
|
}
|
||||||
|
close(fd);
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
close(fd);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
pthread_t threads[NUM_CONNECTIONS];
|
pthread_t threads[NUM_CONNECTIONS];
|
||||||
int i;
|
int connections = NUM_CONNECTIONS, i;
|
||||||
|
|
||||||
if (argc != 2) {
|
if (argc == 3 && strcmp(argv[2], "waitandabort") == 0)
|
||||||
fprintf(stderr, "usage: %s IP\n", argv[0]);
|
return wait_data(argv[1], WAIT_ABORT);
|
||||||
|
if (argc == 3 && strcmp(argv[2], "waitanddrain") == 0)
|
||||||
|
return wait_data(argv[1], WAIT_DRAIN);
|
||||||
|
if (argc == 3 && strcmp(argv[2], "hold") == 0)
|
||||||
|
return wait_data(argv[1], WAIT_HOLD);
|
||||||
|
if (argc == 3 && strcmp(argv[2], "expectclose") == 0)
|
||||||
|
return wait_data(argv[1], WAIT_CLOSE);
|
||||||
|
if (argc == 3) connections = atoi(argv[2]);
|
||||||
|
if ((argc != 2 && argc != 3) || connections < 1 ||
|
||||||
|
connections > NUM_CONNECTIONS) {
|
||||||
|
fprintf(stderr, "usage: %s IP [connections|waitandabort|waitanddrain|hold|expectclose]\n",
|
||||||
|
argv[0]);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
srandom(1);
|
srandom(1);
|
||||||
|
|
||||||
for (i = 0; i < NUM_CONNECTIONS; i++) {
|
for (i = 0; i < connections; i++) {
|
||||||
if (pthread_create(&threads[i], NULL, worker, argv[1]) != 0) return 1;
|
if (pthread_create(&threads[i], NULL, worker, argv[1]) != 0) return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < NUM_CONNECTIONS; i++) {
|
for (i = 0; i < connections; i++) {
|
||||||
if (pthread_join(threads[i], NULL) != 0) return 1;
|
if (pthread_join(threads[i], NULL) != 0) return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+814
-71
@@ -1,11 +1,11 @@
|
|||||||
#define BSDTEST_USING_DHCP 1
|
#define BSDTEST_USING_DHCP 1
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
#include <spawn.h>
|
#include <spawn.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
|
|
||||||
static int s_num_tests = 0;
|
static int s_num_tests = 0;
|
||||||
static bool s_error = false;
|
static bool s_error = false;
|
||||||
static volatile bool s_done = false, s_wait;
|
|
||||||
|
|
||||||
#ifdef NO_ABORT
|
#ifdef NO_ABORT
|
||||||
static int s_abort = 0;
|
static int s_abort = 0;
|
||||||
@@ -30,15 +30,177 @@ static int s_abort = 0;
|
|||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
#define DASHBOARD(x) \
|
||||||
|
printf("HEALTH_DASHBOARD\t\"%s\": %s,\n", x, s_error ? "false" : "true")
|
||||||
|
|
||||||
|
static pid_t start_client(const char *ip, const char *connections) {
|
||||||
|
char *cmd[4];
|
||||||
|
pid_t pid;
|
||||||
|
extern char **environ;
|
||||||
|
|
||||||
|
cmd[0] = (char *) "./bsd_client";
|
||||||
|
cmd[1] = (char *) ip;
|
||||||
|
cmd[2] = (char *) connections;
|
||||||
|
cmd[3] = NULL;
|
||||||
|
ASSERT(posix_spawn(&pid, cmd[0], NULL, NULL, cmd, environ) == 0);
|
||||||
|
return pid;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool client_done(pid_t pid, int *status) {
|
||||||
|
pid_t r = waitpid(pid, status, WNOHANG);
|
||||||
|
ASSERT(r >= 0);
|
||||||
|
return r == pid;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void check_client(int status) {
|
||||||
|
ASSERT(WIFEXITED(status));
|
||||||
|
ASSERT(WEXITSTATUS(status) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int open_listener(int backlog, bool nonblock) {
|
||||||
|
int lfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
struct sockaddr_in sa;
|
||||||
|
|
||||||
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
sa.sin_family = AF_INET;
|
||||||
|
sa.sin_port = htons(1234);
|
||||||
|
sa.sin_addr.s_addr = INADDR_ANY;
|
||||||
|
ASSERT(lfd >= 0);
|
||||||
|
ASSERT(bind(lfd, (struct sockaddr *) &sa, sizeof(sa)) == 0);
|
||||||
|
ASSERT(listen(lfd, backlog) == 0);
|
||||||
|
if (nonblock) ASSERT(fcntl(lfd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
else ASSERT((fcntl(lfd, F_GETFL, 0) & O_NONBLOCK) == 0);
|
||||||
|
MG_INFO(("BSD echo server on :1234"));
|
||||||
|
return lfd;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void wait_ready(struct mg_mgr *mgr) {
|
||||||
|
// Stack initialization, Network configuration (DHCP lease, ...)
|
||||||
|
#if BSDTEST_USING_DHCP == 0
|
||||||
|
MG_INFO(("MIF configuration: Static IP"));
|
||||||
|
ASSERT(mgr->ifp->ip != 0); // Check we have a satic IP assigned
|
||||||
|
mg_mgr_poll(mgr, 0); // For initialisation
|
||||||
|
#else
|
||||||
|
MG_INFO(("MIF configuration: DHCP"));
|
||||||
|
ASSERT(mgr->ifp->ip == 0); // Check we are set for DHCP
|
||||||
|
while (mgr->ifp->ip == 0 && mg_millis() < 5000) mg_mgr_poll(mgr, 0);
|
||||||
|
if (mgr->ifp->ip == 0) MG_ERROR(("No ip assigned (DHCP lease may have failed).\n"));
|
||||||
|
ASSERT(mgr->ifp->ip != 0); // We have an IP (lease or static)
|
||||||
|
#endif
|
||||||
|
while (mgr->ifp->state != MG_TCPIP_STATE_READY) mg_mgr_poll(mgr, 0);
|
||||||
|
MG_INFO(("Interface started, starting main loop"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !MG_ENABLE_FREERTOS
|
||||||
|
static bool s_fail_alloc;
|
||||||
|
|
||||||
|
void *mg_calloc(size_t count, size_t size) {
|
||||||
|
return s_fail_alloc ? NULL : calloc(count, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void mg_free(void *ptr) {
|
||||||
|
free(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint64_t s_bootmillis = 0;
|
||||||
|
|
||||||
|
uint64_t mg_millis(void) {
|
||||||
|
struct timespec ts = {0, 0};
|
||||||
|
// See #1615 - prefer monotonic clock
|
||||||
|
#if defined(CLOCK_MONOTONIC_RAW)
|
||||||
|
// Raw hardware-based time that is not subject to NTP adjustment
|
||||||
|
clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
|
||||||
|
#elif defined(CLOCK_MONOTONIC)
|
||||||
|
// Affected by the incremental adjustments performed by adjtime and NTP
|
||||||
|
clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||||
|
#else
|
||||||
|
// Affected by discontinuous jumps in the system time and by the incremental
|
||||||
|
// adjustments performed by adjtime and NTP
|
||||||
|
clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
|
#endif
|
||||||
|
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000) - s_bootmillis;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if MG_ENABLE_FREERTOS
|
||||||
|
static volatile bool s_done = false, s_wait, s_accept_waiting;
|
||||||
|
static volatile bool s_accept_done, s_dontwait_done, s_nonblock_done;
|
||||||
|
static volatile bool s_select_waiting, s_select_done;
|
||||||
|
static volatile bool s_poll_waiting, s_poll_done;
|
||||||
|
static volatile bool s_ready_waiting, s_ready_done;
|
||||||
|
static volatile bool s_backlog_ready, s_backlog_full, s_backlog_accept;
|
||||||
|
static volatile bool s_tx_held, s_tx_waits, s_tx_fail, s_tx_error;
|
||||||
|
static volatile bool s_send_waiting;
|
||||||
|
static volatile bool s_send_done, s_send_expect_error;
|
||||||
|
static volatile bool s_recv_start, s_recv_waiting, s_recv_done;
|
||||||
|
static volatile bool s_recv_expect_error;
|
||||||
|
static size_t (*s_tx)(const void *, size_t, struct mg_tcpip_if *);
|
||||||
|
|
||||||
struct client_data {
|
struct client_data {
|
||||||
char hostname[64];
|
char hostname[64];
|
||||||
uint32_t ip;
|
uint32_t ip;
|
||||||
bool done;
|
bool done;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void echo_task(void *args);
|
||||||
|
static void echo_dontwait_task(void *args);
|
||||||
|
static void echo_nonblock_task(void *args);
|
||||||
|
static void send_task(void *args);
|
||||||
|
static void recv_wait_task(void *args);
|
||||||
|
static void select_task(void *args);
|
||||||
|
static void readiness_task(void *args);
|
||||||
|
static void backlog_task(void *args);
|
||||||
|
static void tx_gate_task(void *args);
|
||||||
|
|
||||||
|
struct atask_args {
|
||||||
|
bool listener_nonblock;
|
||||||
|
bool worker_nonblock;
|
||||||
|
bool once;
|
||||||
|
bool receiver;
|
||||||
|
TaskFunction_t task;
|
||||||
|
TaskFunction_t gate;
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct atask_args s_echo_server = {true, false, false,
|
||||||
|
false, echo_task, NULL};
|
||||||
|
static const struct atask_args s_accept_server = {false, false, true,
|
||||||
|
false, echo_task, NULL};
|
||||||
|
static const struct atask_args s_nonblock_accept_server = {
|
||||||
|
true, false, true, false, echo_task, NULL};
|
||||||
|
static const struct atask_args s_dontwait_server = {
|
||||||
|
true, false, false, false, echo_dontwait_task, NULL};
|
||||||
|
static const struct atask_args s_nonblock_server = {
|
||||||
|
true, true, false, false, echo_nonblock_task, NULL};
|
||||||
|
static const struct atask_args s_send_server = {true, false, false,
|
||||||
|
true, send_task, tx_gate_task};
|
||||||
|
static const struct atask_args s_send_error_server = {
|
||||||
|
true, false, false, false, send_task, tx_gate_task};
|
||||||
|
|
||||||
|
static size_t tx_gate(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
|
||||||
|
if (s_tx_fail) return (size_t) -1; // Force MG_IO_ERR after send() waits
|
||||||
|
if (s_tx_held) {
|
||||||
|
s_tx_waits = true;
|
||||||
|
return 0; // Gate TX: MG_IO_WAIT leaves c->send queued
|
||||||
|
}
|
||||||
|
return s_tx(buf, len, ifp);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void run_client(const char *ip, const char *connections) {
|
||||||
|
int status;
|
||||||
|
pid_t pid = start_client(ip, connections);
|
||||||
|
|
||||||
|
while (!client_done(pid, &status)) {
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
}
|
||||||
|
check_client(status);
|
||||||
|
}
|
||||||
|
|
||||||
// client_task: connects to hostname:80, fetches "/", logs response length.
|
// client_task: connects to hostname:80, fetches "/", logs response length.
|
||||||
static void client_task(void *args) {
|
static void client_task(void *args) {
|
||||||
int fd, c;
|
fd_set w, e;
|
||||||
|
struct pollfd p;
|
||||||
|
int fd;
|
||||||
struct client_data *d = (struct client_data *) args;
|
struct client_data *d = (struct client_data *) args;
|
||||||
char req[256];
|
char req[256];
|
||||||
fd = socket(AF_INET, SOCK_STREAM, 0);
|
fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
@@ -47,14 +209,20 @@ static void client_task(void *args) {
|
|||||||
sa.sin_family = AF_INET;
|
sa.sin_family = AF_INET;
|
||||||
sa.sin_port = htons(80);
|
sa.sin_port = htons(80);
|
||||||
memcpy(&sa.sin_addr, &d->ip, 4);
|
memcpy(&sa.sin_addr, &d->ip, 4);
|
||||||
c = connect(fd, (struct sockaddr *) &sa, sizeof(sa));
|
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
ASSERT(c >= 0);
|
ASSERT(connect(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0 &&
|
||||||
if (c < 0) {
|
errno == EINPROGRESS);
|
||||||
MG_ERROR(("connect failed"));
|
FD_ZERO(&w);
|
||||||
close(fd);
|
FD_ZERO(&e);
|
||||||
vTaskDelete(NULL);
|
FD_SET(fd, &w);
|
||||||
return;
|
FD_SET(fd, &e);
|
||||||
}
|
ASSERT(select(fd + 1, NULL, &w, &e, NULL) == 1);
|
||||||
|
ASSERT(FD_ISSET(fd, &w));
|
||||||
|
ASSERT(!FD_ISSET(fd, &e));
|
||||||
|
p.fd = fd, p.events = POLLOUT, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 0) == 1);
|
||||||
|
ASSERT(p.revents == POLLOUT);
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, 0) == 0);
|
||||||
snprintf(req, sizeof(req),"GET / HTTP/1.0\r\nHost: %s\r\n\r\n", d->hostname);
|
snprintf(req, sizeof(req),"GET / HTTP/1.0\r\nHost: %s\r\n\r\n", d->hostname);
|
||||||
send(fd, req, strlen(req), 0);
|
send(fd, req, strlen(req), 0);
|
||||||
size_t total = 0;
|
size_t total = 0;
|
||||||
@@ -69,84 +237,475 @@ static void client_task(void *args) {
|
|||||||
(void) args;
|
(void) args;
|
||||||
}
|
}
|
||||||
|
|
||||||
// echo_task: one per accepted connection. Echoes data back.
|
// Echo data back from one accepted connection.
|
||||||
static void echo_task(void *args) {
|
static void echo_task_common(int fd, int flags, volatile bool *done) {
|
||||||
int fd = (int) (uintptr_t) args;
|
bool nonblock = (fcntl(fd, F_GETFL, 0) & O_NONBLOCK) != 0;
|
||||||
|
bool dontwait = (flags & MSG_DONTWAIT) != 0;
|
||||||
|
bool echoed = false, eagain = false;
|
||||||
static const size_t sizes[] = {1, 7, 17, 255, 256, 257, 511, 512};
|
static const size_t sizes[] = {1, 7, 17, 255, 256, 257, 511, 512};
|
||||||
char buf[512];
|
char buf[512];
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
ssize_t n;
|
ssize_t n;
|
||||||
|
|
||||||
MG_INFO(("Echo task started: %d", fd));
|
MG_INFO(("Echo task started: %d", fd));
|
||||||
while ((n = recv(fd, buf, sizes[i++ % (sizeof(sizes) / sizeof(sizes[0]))], 0)) > 0)
|
for (;;) {
|
||||||
send(fd, buf, (size_t) n, 0);
|
n = recv(fd, buf, sizes[i++ % (sizeof(sizes) / sizeof(sizes[0]))], flags);
|
||||||
|
if (n > 0) {
|
||||||
|
if (!nonblock) {
|
||||||
|
ssize_t w = send(fd, buf, (size_t) n, 0);
|
||||||
|
if (done != NULL) ASSERT(w == n);
|
||||||
|
echoed = w == n;
|
||||||
|
} else {
|
||||||
|
size_t sent = 0;
|
||||||
|
while (sent < (size_t) n) {
|
||||||
|
ssize_t w = send(fd, buf + sent, (size_t) n - sent, 0);
|
||||||
|
if (w > 0) sent += (size_t) w;
|
||||||
|
else if (w < 0 && errno == EAGAIN) vTaskDelay(1);
|
||||||
|
else {
|
||||||
|
ASSERT(w > 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (sent != (size_t) n) break;
|
||||||
|
echoed = true;
|
||||||
|
}
|
||||||
|
} else if ((nonblock || dontwait) && n < 0 && errno == EAGAIN) {
|
||||||
|
if (echoed) eagain = true;
|
||||||
|
vTaskDelay(1);
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (done != NULL) {
|
||||||
|
ASSERT(eagain);
|
||||||
|
*done = true;
|
||||||
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void echo_task(void *args) {
|
||||||
|
echo_task_common((int) (uintptr_t) args, 0, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void echo_dontwait_task(void *args) {
|
||||||
|
echo_task_common((int) (uintptr_t) args, MSG_DONTWAIT, &s_dontwait_done);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void echo_nonblock_task(void *args) {
|
||||||
|
echo_task_common((int) (uintptr_t) args, 0, &s_nonblock_done);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void tx_gate_task(void *args) {
|
||||||
|
// receiver/sender > network task > gate: final send is waiting
|
||||||
|
while (!s_send_waiting) vTaskDelay(1);
|
||||||
|
ASSERT(!s_send_done);
|
||||||
|
if (s_send_expect_error) s_tx_error = s_tx_fail = true;
|
||||||
|
else s_tx_held = false;
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
(void) args;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void recv_wait_task(void *args) {
|
||||||
|
char buf;
|
||||||
|
int fd = (int) (uintptr_t) args;
|
||||||
|
ssize_t n;
|
||||||
|
|
||||||
|
while (!s_recv_start) vTaskDelay(1);
|
||||||
|
s_recv_waiting = true; // send_task starts after recv() is waiting
|
||||||
|
n = recv(fd, &buf, sizeof(buf), 0);
|
||||||
|
if (s_recv_expect_error) {
|
||||||
|
ASSERT(n < 0 && errno == EIO); // bsd_client aborts with unread data
|
||||||
|
} else {
|
||||||
|
ASSERT(n == 0); // bsd_client drains, then closes
|
||||||
|
}
|
||||||
|
s_recv_done = true;
|
||||||
|
close(fd); // Receiver owns the shared socket close
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void send_task(void *args) {
|
||||||
|
static const char buf[512] = {0};
|
||||||
|
static const char marker = '\1';
|
||||||
|
int fd = (int) (uintptr_t) args;
|
||||||
|
ssize_t n;
|
||||||
|
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
s_tx_held = true; // Gate TX until c->send fills
|
||||||
|
do {
|
||||||
|
n = send(fd, buf, sizeof(buf), 0);
|
||||||
|
} while (n == (ssize_t) sizeof(buf));
|
||||||
|
ASSERT(n < 0 && errno == EAGAIN); // Full c->send: O_NONBLOCK
|
||||||
|
while (!s_tx_waits) vTaskDelay(1); // Next write_conn hits the gate
|
||||||
|
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, 0) == 0);
|
||||||
|
n = send(fd, buf, sizeof(buf), MSG_DONTWAIT);
|
||||||
|
ASSERT(n < 0 && errno == EAGAIN); // Same full c->send: MSG_DONTWAIT
|
||||||
|
|
||||||
|
if (!s_send_expect_error) {
|
||||||
|
s_recv_start = true; // O_NONBLOCK is per socket; now start the receiver
|
||||||
|
while (!s_recv_waiting) vTaskDelay(1);
|
||||||
|
}
|
||||||
|
s_send_waiting = true; // Gate task releases TX after this send blocks
|
||||||
|
n = send(fd, &marker, sizeof(marker), 0);
|
||||||
|
if (s_send_expect_error) ASSERT(n < 0 && errno == EPIPE);
|
||||||
|
else ASSERT(n == (ssize_t) sizeof(marker));
|
||||||
|
s_send_done = true;
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
// accept loop. Waits for incoming connections on port 1234 and spawns
|
// accept loop. Waits for incoming connections on port 1234 and spawns
|
||||||
// an echo_task for each one, allowing concurrent clients.
|
// an echo_task for each one, allowing concurrent clients.
|
||||||
static void atask(void *args) {
|
static void atask(void *args) {
|
||||||
|
const struct atask_args *cfg = (const struct atask_args *) args;
|
||||||
BaseType_t result;
|
BaseType_t result;
|
||||||
mg_bsd_init();
|
int lfd = open_listener(5, cfg->listener_nonblock);
|
||||||
int lfd = socket(AF_INET, SOCK_STREAM, 0);
|
if (cfg->once && cfg->listener_nonblock) {
|
||||||
struct sockaddr_in sa;
|
ASSERT(accept(lfd, NULL, NULL) < 0 && errno == EAGAIN);
|
||||||
memset(&sa, 0, sizeof(sa));
|
s_accept_waiting = true;
|
||||||
sa.sin_family = AF_INET;
|
}
|
||||||
sa.sin_port = htons(1234);
|
|
||||||
sa.sin_addr.s_addr = INADDR_ANY;
|
|
||||||
bind(lfd, (struct sockaddr *) &sa, sizeof(sa));
|
|
||||||
listen(lfd, 5);
|
|
||||||
fcntl(lfd, F_SETFL, O_NONBLOCK);
|
|
||||||
MG_INFO(("BSD echo server on :1234"));
|
|
||||||
while (!s_wait) {
|
while (!s_wait) {
|
||||||
int fd = accept(lfd, NULL, NULL);
|
int fd;
|
||||||
if (fd < 0) { vTaskDelay(pdMS_TO_TICKS(10)); continue; }
|
|
||||||
// echo_task at higher priority than task1
|
if (cfg->once && !cfg->listener_nonblock) s_accept_waiting = true;
|
||||||
result = xTaskCreate(echo_task, "echo", 512, (void *) (uintptr_t) fd,
|
fd = accept(lfd, NULL, NULL);
|
||||||
|
if (fd < 0) {
|
||||||
|
if (!cfg->listener_nonblock) {
|
||||||
|
ASSERT(fd >= 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// Accepted sockets start blocking, regardless of listener flags
|
||||||
|
ASSERT((fcntl(fd, F_GETFL, 0) & O_NONBLOCK) == 0);
|
||||||
|
if (cfg->worker_nonblock) ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
// Worker tasks run at higher priority than task1
|
||||||
|
if (cfg->receiver) {
|
||||||
|
result = xTaskCreate(recv_wait_task, "recv", 512,
|
||||||
|
(void *) (uintptr_t) fd,
|
||||||
|
configMAX_PRIORITIES - 1, NULL);
|
||||||
|
ASSERT(result == pdPASS);
|
||||||
|
}
|
||||||
|
if (cfg->gate != NULL) {
|
||||||
|
result = xTaskCreate(cfg->gate, "gate", 256, NULL,
|
||||||
|
configMAX_PRIORITIES - 3, NULL);
|
||||||
|
ASSERT(result == pdPASS);
|
||||||
|
}
|
||||||
|
result = xTaskCreate(cfg->task, "echo", 512, (void *) (uintptr_t) fd,
|
||||||
configMAX_PRIORITIES - 1, NULL);
|
configMAX_PRIORITIES - 1, NULL);
|
||||||
MG_INFO(("Echo task %d: %s", fd, result == pdPASS ? "created" : "FAILED"));
|
MG_INFO(("Echo task %d: %s", fd, result == pdPASS ? "created" : "FAILED"));
|
||||||
ASSERT(result == pdPASS);
|
ASSERT(result == pdPASS);
|
||||||
|
if (cfg->once) break;
|
||||||
}
|
}
|
||||||
close(lfd);
|
close(lfd);
|
||||||
s_wait = false;
|
if (cfg->once) s_accept_done = true;
|
||||||
|
else s_wait = false;
|
||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
(void) args;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void select_task(void *args) {
|
||||||
|
struct timeval zero = {0, 0};
|
||||||
|
fd_set r, w, e;
|
||||||
|
int fd, lfd, n;
|
||||||
|
|
||||||
|
(void) args;
|
||||||
|
lfd = open_listener(5, true);
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_SET(lfd, &r);
|
||||||
|
ASSERT(select(lfd, &r, NULL, NULL, &zero) == 0);
|
||||||
|
ASSERT(!FD_ISSET(lfd, &r));
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_SET(lfd + 1, &r);
|
||||||
|
ASSERT(select(lfd + 2, &r, NULL, NULL, &zero) < 0 && errno == EBADF);
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_ZERO(&w);
|
||||||
|
FD_ZERO(&e);
|
||||||
|
FD_SET(lfd, &r);
|
||||||
|
FD_SET(lfd, &w);
|
||||||
|
FD_SET(lfd, &e);
|
||||||
|
s_select_waiting = true;
|
||||||
|
n = select(lfd + 1, &r, &w, &e, NULL);
|
||||||
|
ASSERT(n == 1);
|
||||||
|
ASSERT(FD_ISSET(lfd, &r));
|
||||||
|
ASSERT(!FD_ISSET(lfd, &w));
|
||||||
|
ASSERT(!FD_ISSET(lfd, &e));
|
||||||
|
fd = accept(lfd, NULL, NULL);
|
||||||
|
ASSERT(fd >= 0);
|
||||||
|
ASSERT(close(fd) == 0);
|
||||||
|
ASSERT(close(lfd) == 0);
|
||||||
|
s_select_done = true;
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void poll_task(void *args) {
|
||||||
|
struct pollfd p;
|
||||||
|
int fd, lfd;
|
||||||
|
|
||||||
|
(void) args;
|
||||||
|
lfd = open_listener(5, true);
|
||||||
|
p.fd = lfd, p.events = POLLIN, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 0) == 0);
|
||||||
|
ASSERT(p.revents == 0);
|
||||||
|
p.fd = lfd + 1, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 0) == 1);
|
||||||
|
ASSERT(p.revents == POLLNVAL);
|
||||||
|
p.fd = lfd, p.revents = 0;
|
||||||
|
s_poll_waiting = true;
|
||||||
|
ASSERT(poll(&p, 1, -1) == 1);
|
||||||
|
ASSERT(p.revents == POLLIN);
|
||||||
|
fd = accept(lfd, NULL, NULL);
|
||||||
|
ASSERT(fd >= 0);
|
||||||
|
ASSERT(close(fd) == 0);
|
||||||
|
ASSERT(close(lfd) == 0);
|
||||||
|
s_poll_done = true;
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void readiness_task(void *args) {
|
||||||
|
struct pollfd p;
|
||||||
|
fd_set r, w;
|
||||||
|
int fd, lfd;
|
||||||
|
|
||||||
|
(void) args;
|
||||||
|
lfd = open_listener(5, true);
|
||||||
|
s_ready_waiting = true;
|
||||||
|
while ((fd = accept(lfd, NULL, NULL)) < 0) {
|
||||||
|
ASSERT(errno == EAGAIN);
|
||||||
|
vTaskDelay(1);
|
||||||
|
}
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_SET(fd, &r);
|
||||||
|
ASSERT(select(fd + 1, &r, NULL, NULL, NULL) == 1);
|
||||||
|
ASSERT(FD_ISSET(fd, &r));
|
||||||
|
p.fd = fd, p.events = POLLIN, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 0) == 1);
|
||||||
|
ASSERT(p.revents == POLLIN);
|
||||||
|
FD_ZERO(&w);
|
||||||
|
FD_SET(fd, &w);
|
||||||
|
ASSERT(select(fd + 1, NULL, &w, NULL, NULL) == 1);
|
||||||
|
ASSERT(FD_ISSET(fd, &w));
|
||||||
|
p.events = POLLOUT, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 0) == 1);
|
||||||
|
ASSERT(p.revents == POLLOUT);
|
||||||
|
ASSERT(close(lfd) == 0);
|
||||||
|
echo_task_common(fd, 0, &s_ready_done);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void backlog_task(void *args) {
|
||||||
|
struct pollfd p;
|
||||||
|
BaseType_t result;
|
||||||
|
int fd, lfd;
|
||||||
|
|
||||||
|
(void) args;
|
||||||
|
lfd = open_listener(1, true);
|
||||||
|
p.fd = lfd, p.events = POLLIN, p.revents = 0;
|
||||||
|
s_backlog_ready = true;
|
||||||
|
while (poll(&p, 1, 0) == 0) vTaskDelay(1);
|
||||||
|
ASSERT(p.revents == POLLIN);
|
||||||
|
s_backlog_full = true; // One orphan occupies the BSD backlog
|
||||||
|
while (!s_backlog_accept) vTaskDelay(1);
|
||||||
|
ASSERT((fd = accept(lfd, NULL, NULL)) >= 0);
|
||||||
|
result = xTaskCreate(echo_task, "echo", 512, (void *) (uintptr_t) fd,
|
||||||
|
configMAX_PRIORITIES - 1, NULL);
|
||||||
|
ASSERT(result == pdPASS);
|
||||||
|
ASSERT(close(lfd) == 0);
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
// task2: tests owner.
|
// task2: tests owner.
|
||||||
static void task2(void *args) {
|
static void task2(void *args) {
|
||||||
struct mg_mgr *mgr = (struct mg_mgr *)args; // Event manager
|
struct mg_mgr *mgr = (struct mg_mgr *)args; // Event manager
|
||||||
char *ip, *cmd[3];
|
char *ip;
|
||||||
pid_t pid;
|
|
||||||
int status;
|
int status;
|
||||||
extern char **environ;
|
pid_t first, second;
|
||||||
|
|
||||||
#define DASHBOARD(x) printf("HEALTH_DASHBOARD\t\"%s\": %s,\n", x, s_error ? "false":"true");
|
|
||||||
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms
|
vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms
|
||||||
s_error = false;
|
s_error = false;
|
||||||
s_wait = false;
|
s_wait = false;
|
||||||
// atask at higher priority than task1
|
|
||||||
xTaskCreate(atask, "atask", 256, NULL, configMAX_PRIORITIES - 1, NULL);
|
|
||||||
ip = mg_mprintf("%M", mg_print_ip4, &mgr->ifp->ip);
|
ip = mg_mprintf("%M", mg_print_ip4, &mgr->ifp->ip);
|
||||||
cmd[0] = (char *) "./bsd_client";
|
s_poll_waiting = s_poll_done = false;
|
||||||
cmd[1] = ip;
|
ASSERT(xTaskCreate(poll_task, "poll", 512, NULL,
|
||||||
cmd[2] = NULL;
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
ASSERT(posix_spawn(&pid, cmd[0], NULL, NULL, cmd, environ) == 0);
|
while (!s_poll_waiting) vTaskDelay(1);
|
||||||
for (;;) {
|
ASSERT(!s_poll_done);
|
||||||
pid_t r = waitpid(pid, &status, WNOHANG);
|
run_client(ip, "hold");
|
||||||
ASSERT(r >= 0);
|
while (!s_poll_done) vTaskDelay(1);
|
||||||
if (r == pid) break;
|
DASHBOARD("poll_read");
|
||||||
vTaskDelay(pdMS_TO_TICKS(10));
|
|
||||||
}
|
s_select_waiting = s_select_done = false;
|
||||||
ASSERT(WIFEXITED(status));
|
ASSERT(xTaskCreate(select_task, "select", 512, NULL,
|
||||||
ASSERT(WEXITSTATUS(status) == 0);
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
mg_free(ip);
|
while (!s_select_waiting) vTaskDelay(1);
|
||||||
|
ASSERT(!s_select_done);
|
||||||
|
run_client(ip, "hold");
|
||||||
|
while (!s_select_done) vTaskDelay(1);
|
||||||
|
DASHBOARD("select_read");
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_ready_waiting = s_ready_done = false;
|
||||||
|
ASSERT(xTaskCreate(readiness_task, "ready", 512, NULL,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
while (!s_ready_waiting) vTaskDelay(1);
|
||||||
|
run_client(ip, "1");
|
||||||
|
while (!s_ready_done) vTaskDelay(1);
|
||||||
|
DASHBOARD("select_child_read");
|
||||||
|
DASHBOARD("poll_child_read");
|
||||||
|
DASHBOARD("select_child_write");
|
||||||
|
DASHBOARD("poll_child_write");
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
s_error = false;
|
||||||
|
s_backlog_ready = s_backlog_full = s_backlog_accept = false;
|
||||||
|
ASSERT(xTaskCreate(backlog_task, "backlog", 512, NULL,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
while (!s_backlog_ready) vTaskDelay(1);
|
||||||
|
first = start_client(ip, "1"); // Fills listen(fd, 1)'s pending accept
|
||||||
|
while (!s_backlog_full) vTaskDelay(1);
|
||||||
|
second = start_client(ip, "expectclose"); // Rejected over the backlog
|
||||||
|
while (!client_done(second, &status)) vTaskDelay(1);
|
||||||
|
check_client(status);
|
||||||
|
s_backlog_accept = true;
|
||||||
|
while (!client_done(first, &status)) vTaskDelay(1);
|
||||||
|
check_client(status);
|
||||||
|
DASHBOARD("listen_backlog");
|
||||||
|
#else
|
||||||
|
(void) first;
|
||||||
|
(void) second;
|
||||||
|
(void) status;
|
||||||
|
(void) backlog_task;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
// atask at higher priority than task1
|
||||||
|
s_accept_waiting = s_accept_done = false;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_accept_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
while (!s_accept_waiting) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
ASSERT(!s_accept_done);
|
||||||
|
run_client(ip, "1");
|
||||||
|
while (!s_accept_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
DASHBOARD("blocking_accept");
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = false;
|
||||||
|
s_accept_waiting = s_accept_done = false;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_nonblock_accept_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
while (!s_accept_waiting) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
run_client(ip, "1");
|
||||||
|
while (!s_accept_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
DASHBOARD("nonblocking_accept");
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = false;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_echo_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
run_client(ip, NULL);
|
||||||
s_wait = true;
|
s_wait = true;
|
||||||
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
DASHBOARD("accept");
|
DASHBOARD("accept");
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = false;
|
||||||
|
s_dontwait_done = false;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_dontwait_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
run_client(ip, "1");
|
||||||
|
while (!s_dontwait_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
s_wait = true;
|
||||||
|
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
DASHBOARD("dontwait_recv");
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = false;
|
||||||
|
s_nonblock_done = false;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_nonblock_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
run_client(ip, "1");
|
||||||
|
while (!s_nonblock_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
s_wait = true;
|
||||||
|
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
DASHBOARD("nonblocking_recv");
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = s_tx_held = s_tx_waits = s_tx_fail = s_tx_error = false;
|
||||||
|
s_send_waiting = false;
|
||||||
|
s_send_done = s_send_expect_error = false;
|
||||||
|
s_recv_start = s_recv_waiting = s_recv_done = s_recv_expect_error = false;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_send_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
run_client(ip, "waitanddrain"); // Peer drains through the final marker
|
||||||
|
ASSERT(s_send_done);
|
||||||
|
DASHBOARD("nonblocking_send");
|
||||||
|
DASHBOARD("blocking_send");
|
||||||
|
while (!s_recv_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
DASHBOARD("blocking_recv");
|
||||||
|
DASHBOARD("shared_socket");
|
||||||
|
s_wait = true;
|
||||||
|
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = s_tx_held = s_tx_waits = s_tx_fail = s_tx_error = false;
|
||||||
|
s_send_waiting = false;
|
||||||
|
s_send_done = s_send_expect_error = false;
|
||||||
|
s_recv_start = s_recv_waiting = s_recv_done = false;
|
||||||
|
s_recv_expect_error = true;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_send_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
run_client(ip, "waitandabort"); // Peer leaves data unread and sends RST
|
||||||
|
ASSERT(s_send_done);
|
||||||
|
while (!s_recv_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
DASHBOARD("error_wakeup");
|
||||||
|
s_wait = true;
|
||||||
|
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
s_wait = s_tx_held = s_tx_waits = s_tx_fail = s_tx_error = false;
|
||||||
|
s_send_waiting = false;
|
||||||
|
s_send_done = false;
|
||||||
|
s_send_expect_error = true;
|
||||||
|
ASSERT(xTaskCreate(atask, "atask", 256, (void *) &s_send_error_server,
|
||||||
|
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||||
|
run_client(ip, "hold"); // Peer stays connected while the driver fails TX
|
||||||
|
while (!s_tx_error) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
ASSERT(s_send_done);
|
||||||
|
DASHBOARD("send_error_wakeup");
|
||||||
|
s_wait = true;
|
||||||
|
while (s_wait) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
s_tx_held = s_tx_fail = s_tx_error = s_send_expect_error = false;
|
||||||
|
|
||||||
|
mg_free(ip);
|
||||||
|
|
||||||
|
s_error = false;
|
||||||
|
{
|
||||||
|
fd_set e;
|
||||||
|
struct pollfd p;
|
||||||
|
int fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
struct sockaddr_in sa;
|
||||||
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
sa.sin_family = AF_INET;
|
||||||
|
sa.sin_port = htons(1234);
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
ASSERT(connect(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0 &&
|
||||||
|
errno == EINPROGRESS);
|
||||||
|
FD_ZERO(&e);
|
||||||
|
FD_SET(fd, &e);
|
||||||
|
ASSERT(select(fd + 1, NULL, NULL, &e, NULL) == 1);
|
||||||
|
ASSERT(FD_ISSET(fd, &e));
|
||||||
|
p.fd = fd, p.events = 0, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, -1) == 1);
|
||||||
|
ASSERT((p.revents & POLLERR) != 0);
|
||||||
|
p.events = POLLOUT, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 0) == 1);
|
||||||
|
ASSERT((p.revents & POLLERR) != 0);
|
||||||
|
ASSERT((p.revents & POLLOUT) == 0);
|
||||||
|
ASSERT(close(fd) == 0);
|
||||||
|
}
|
||||||
|
DASHBOARD("select_error");
|
||||||
|
DASHBOARD("poll_error");
|
||||||
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms
|
vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms
|
||||||
s_error = false;
|
s_error = false;
|
||||||
{
|
{
|
||||||
@@ -188,6 +747,7 @@ static void task2(void *args) {
|
|||||||
while (!cd[0].done || !cd[1].done || !cd[2].done) vTaskDelay(pdMS_TO_TICKS(10));
|
while (!cd[0].done || !cd[1].done || !cd[2].done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
}
|
}
|
||||||
DASHBOARD("connect");
|
DASHBOARD("connect");
|
||||||
|
DASHBOARD("select_write");
|
||||||
// End task 1
|
// End task 1
|
||||||
s_done = true;
|
s_done = true;
|
||||||
while (s_done) vTaskDelay(pdMS_TO_TICKS(10));
|
while (s_done) vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
@@ -206,35 +766,205 @@ static void task2(void *args) {
|
|||||||
static void task1(void *args) {
|
static void task1(void *args) {
|
||||||
struct mg_mgr *mgr = (struct mg_mgr *)args; // Event manager
|
struct mg_mgr *mgr = (struct mg_mgr *)args; // Event manager
|
||||||
|
|
||||||
// Stack initialization, Network configuration (DHCP lease, ...)
|
wait_ready(mgr);
|
||||||
#if BSDTEST_USING_DHCP == 0
|
|
||||||
MG_INFO(("MIF configuration: Static IP"));
|
|
||||||
ASSERT(mif.ip != 0); // Check we have a satic IP assigned
|
|
||||||
mg_mgr_poll(&mgr, 0); // For initialisation
|
|
||||||
#else
|
|
||||||
MG_INFO(("MIF configuration: DHCP"));
|
|
||||||
ASSERT(mgr->ifp->ip == 0); // Check we are set for DHCP
|
|
||||||
while (mgr->ifp->ip == 0 && mg_millis() < 5000) {
|
|
||||||
mg_mgr_poll(mgr, 0);
|
|
||||||
}
|
|
||||||
if (mgr->ifp->ip == 0) MG_ERROR(("No ip assigned (DHCP lease may have failed).\n"));
|
|
||||||
ASSERT(mgr->ifp->ip != 0); // We have an IP (lease or static)
|
|
||||||
#endif
|
|
||||||
while (mgr->ifp->state != MG_TCPIP_STATE_READY) {
|
|
||||||
mg_mgr_poll(mgr, 0);
|
|
||||||
}
|
|
||||||
MG_INFO(("Interface started, starting main loop"));
|
|
||||||
xTaskCreate(task2, "task2", 256, mgr, configMAX_PRIORITIES - 2, NULL);
|
xTaskCreate(task2, "task2", 256, mgr, configMAX_PRIORITIES - 2, NULL);
|
||||||
|
|
||||||
while (!s_done) {
|
while (!s_done) {
|
||||||
mg_mgr_poll(mgr, 0);
|
mg_mgr_poll(mgr, 0);
|
||||||
mg_bsd_poll(mgr);
|
|
||||||
vTaskDelay(1); // Let idle reclaim deleted echo tasks
|
vTaskDelay(1); // Let idle reclaim deleted echo tasks
|
||||||
}
|
}
|
||||||
s_done = false;
|
s_done = false;
|
||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#define NORTOS_ECHO_CLIENTS 3
|
||||||
|
|
||||||
|
struct nortos_echo_client {
|
||||||
|
int fd;
|
||||||
|
size_t len, sent;
|
||||||
|
bool eof;
|
||||||
|
char buf[512];
|
||||||
|
};
|
||||||
|
|
||||||
|
static int nortos_accept(struct mg_mgr *mgr, int lfd) {
|
||||||
|
int fd;
|
||||||
|
|
||||||
|
while ((fd = accept(lfd, NULL, NULL)) < 0) {
|
||||||
|
ASSERT(errno == EAGAIN);
|
||||||
|
mg_mgr_poll(mgr, 0);
|
||||||
|
}
|
||||||
|
return fd;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void nortos_wait_client(struct mg_mgr *mgr, pid_t pid) {
|
||||||
|
int status;
|
||||||
|
|
||||||
|
while (!client_done(pid, &status)) mg_mgr_poll(mgr, 0);
|
||||||
|
check_client(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void nortos_echo(struct mg_mgr *mgr, struct nortos_echo_client *clients,
|
||||||
|
size_t count, pid_t pid) {
|
||||||
|
struct pollfd p[NORTOS_ECHO_CLIENTS];
|
||||||
|
fd_set r;
|
||||||
|
size_t i, live = count;
|
||||||
|
int maxfd, result;
|
||||||
|
ssize_t n;
|
||||||
|
|
||||||
|
while (live > 0) {
|
||||||
|
for (i = 0; i < count; i++) {
|
||||||
|
struct nortos_echo_client *c = &clients[i];
|
||||||
|
if (!c->eof && c->sent < c->len) {
|
||||||
|
n = send(c->fd, c->buf + c->sent, c->len - c->sent, 0);
|
||||||
|
if (n > 0) c->sent += (size_t) n;
|
||||||
|
else ASSERT(n < 0 && errno == EAGAIN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FD_ZERO(&r);
|
||||||
|
maxfd = -1;
|
||||||
|
for (i = 0; i < count; i++) {
|
||||||
|
struct nortos_echo_client *c = &clients[i];
|
||||||
|
p[i].fd = -1, p[i].events = POLLIN, p[i].revents = 0;
|
||||||
|
if (!c->eof && c->sent == c->len) {
|
||||||
|
p[i].fd = c->fd;
|
||||||
|
FD_SET(c->fd, &r);
|
||||||
|
if (c->fd > maxfd) maxfd = c->fd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (maxfd >= 0) {
|
||||||
|
result = poll(p, (nfds_t) count, 0);
|
||||||
|
ASSERT(result >= 0);
|
||||||
|
if (result > 0) {
|
||||||
|
ASSERT(select(maxfd + 1, &r, NULL, NULL, NULL) == result);
|
||||||
|
for (i = 0; i < count; i++) {
|
||||||
|
struct nortos_echo_client *c = &clients[i];
|
||||||
|
bool readable = (p[i].revents & POLLIN) != 0;
|
||||||
|
|
||||||
|
ASSERT(p[i].revents == (readable ? POLLIN : 0));
|
||||||
|
ASSERT(FD_ISSET(c->fd, &r) == readable);
|
||||||
|
if (readable) {
|
||||||
|
n = recv(c->fd, c->buf, sizeof(c->buf), 0);
|
||||||
|
ASSERT(n >= 0);
|
||||||
|
if (n > 0) c->len = (size_t) n, c->sent = 0;
|
||||||
|
else c->eof = true, live--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mg_mgr_poll(mgr, 0);
|
||||||
|
}
|
||||||
|
nortos_wait_client(mgr, pid);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void nortos_test(struct mg_mgr *mgr) {
|
||||||
|
static const char bootstrap = '\0';
|
||||||
|
static const char grow[512] = {0};
|
||||||
|
static const char marker = '\1';
|
||||||
|
struct sockaddr_in sa;
|
||||||
|
struct timeval zero = {0, 0};
|
||||||
|
struct pollfd p;
|
||||||
|
fd_set r, w, e;
|
||||||
|
char buf;
|
||||||
|
char *ip;
|
||||||
|
pid_t pid;
|
||||||
|
size_t i, j;
|
||||||
|
int fd, lfd, n;
|
||||||
|
struct nortos_echo_client clients[NORTOS_ECHO_CLIENTS];
|
||||||
|
|
||||||
|
ip = mg_mprintf("%M", mg_print_ip4, &mgr->ifp->ip);
|
||||||
|
ASSERT(ip != NULL);
|
||||||
|
lfd = open_listener(5, true);
|
||||||
|
p.fd = lfd, p.events = POLLIN, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 10) == 0);
|
||||||
|
ASSERT(p.revents == 0);
|
||||||
|
p.fd = lfd + 1, p.revents = 0;
|
||||||
|
ASSERT(poll(&p, 1, 10) == 1);
|
||||||
|
ASSERT(p.revents == POLLNVAL);
|
||||||
|
p.fd = lfd, p.revents = 0;
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_SET(lfd, &r);
|
||||||
|
ASSERT(select(lfd, &r, NULL, NULL, &zero) == 0);
|
||||||
|
ASSERT(!FD_ISSET(lfd, &r));
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_SET(lfd + 1, &r);
|
||||||
|
ASSERT(select(lfd + 2, &r, NULL, NULL, &zero) < 0 && errno == EBADF);
|
||||||
|
ASSERT(accept(lfd, NULL, NULL) < 0 && errno == EAGAIN);
|
||||||
|
DASHBOARD("nortos_nonblocking_accept");
|
||||||
|
|
||||||
|
pid = start_client(ip, "waitanddrain");
|
||||||
|
do {
|
||||||
|
p.revents = 0;
|
||||||
|
n = poll(&p, 1, 10);
|
||||||
|
if (n == 0) mg_mgr_poll(mgr, 0);
|
||||||
|
} while (n == 0);
|
||||||
|
ASSERT(n == 1);
|
||||||
|
ASSERT(p.revents == POLLIN);
|
||||||
|
DASHBOARD("nortos_poll_read");
|
||||||
|
do {
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_ZERO(&w);
|
||||||
|
FD_ZERO(&e);
|
||||||
|
FD_SET(lfd, &r);
|
||||||
|
FD_SET(lfd, &w);
|
||||||
|
FD_SET(lfd, &e);
|
||||||
|
n = select(lfd + 1, &r, &w, &e, NULL);
|
||||||
|
if (n == 0) mg_mgr_poll(mgr, 0);
|
||||||
|
} while (n == 0);
|
||||||
|
ASSERT(n == 1);
|
||||||
|
ASSERT(FD_ISSET(lfd, &r));
|
||||||
|
ASSERT(!FD_ISSET(lfd, &w));
|
||||||
|
ASSERT(!FD_ISSET(lfd, &e));
|
||||||
|
DASHBOARD("nortos_select_read");
|
||||||
|
fd = nortos_accept(mgr, lfd);
|
||||||
|
ASSERT(recv(fd, &buf, sizeof(buf), MSG_DONTWAIT) < 0 && errno == EAGAIN);
|
||||||
|
DASHBOARD("nortos_dontwait_recv");
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
ASSERT(recv(fd, &buf, sizeof(buf), 0) < 0 && errno == EAGAIN);
|
||||||
|
DASHBOARD("nortos_nonblocking_recv");
|
||||||
|
|
||||||
|
ASSERT(send(fd, &bootstrap, sizeof(bootstrap), 0) ==
|
||||||
|
(ssize_t) sizeof(bootstrap));
|
||||||
|
s_fail_alloc = true; // Fail growth after c->send has been bootstrapped
|
||||||
|
ASSERT(send(fd, grow, sizeof(grow), 0) < 0 && errno == EAGAIN);
|
||||||
|
s_fail_alloc = false;
|
||||||
|
ASSERT(send(fd, &marker, sizeof(marker), 0) == (ssize_t) sizeof(marker));
|
||||||
|
nortos_wait_client(mgr, pid);
|
||||||
|
ASSERT(close(fd) == 0);
|
||||||
|
DASHBOARD("nortos_nonblocking_send");
|
||||||
|
|
||||||
|
memset(clients, 0, sizeof(clients));
|
||||||
|
pid = start_client(ip, "3");
|
||||||
|
for (i = 0; i < NORTOS_ECHO_CLIENTS; i++) {
|
||||||
|
clients[i].fd = nortos_accept(mgr, lfd);
|
||||||
|
ASSERT(fcntl(clients[i].fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
for (j = 0; j < i; j++) ASSERT(clients[i].fd != clients[j].fd);
|
||||||
|
}
|
||||||
|
nortos_echo(mgr, clients, NORTOS_ECHO_CLIENTS, pid);
|
||||||
|
for (i = 0; i < NORTOS_ECHO_CLIENTS; i++)
|
||||||
|
ASSERT(close(clients[i].fd) == 0);
|
||||||
|
ASSERT(close(lfd) == 0);
|
||||||
|
DASHBOARD("nortos_select_children");
|
||||||
|
DASHBOARD("nortos_poll_children");
|
||||||
|
DASHBOARD("nortos_echo");
|
||||||
|
|
||||||
|
fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
sa.sin_family = AF_INET;
|
||||||
|
sa.sin_port = htons(1234);
|
||||||
|
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||||
|
ASSERT(connect(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0 &&
|
||||||
|
errno == EINPROGRESS);
|
||||||
|
ASSERT(close(fd) == 0);
|
||||||
|
mg_mgr_poll(mgr, 0);
|
||||||
|
DASHBOARD("nortos_nonblocking_connect");
|
||||||
|
mg_free(ip);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // MG_ENABLE_FREERTOS
|
||||||
|
|
||||||
static bool bsd_x_test(struct mg_tcpip_driver *driver, void *driver_data, const char *mac, const char *debug_level) {
|
static bool bsd_x_test(struct mg_tcpip_driver *driver, void *driver_data, const char *mac, const char *debug_level) {
|
||||||
if (debug_level == NULL) debug_level = "3";
|
if (debug_level == NULL) debug_level = "3";
|
||||||
mg_log_set(atoi(debug_level));
|
mg_log_set(atoi(debug_level));
|
||||||
@@ -263,8 +993,21 @@ static bool bsd_x_test(struct mg_tcpip_driver *driver, void *driver_data, const
|
|||||||
MG_INFO(("Init done, starting interface"));
|
MG_INFO(("Init done, starting interface"));
|
||||||
usleep(200000); // 200 ms
|
usleep(200000); // 200 ms
|
||||||
|
|
||||||
|
#if MG_ENABLE_FREERTOS
|
||||||
|
s_tx = driver->tx;
|
||||||
|
driver->tx = tx_gate;
|
||||||
xTaskCreate(task1, "task1", 2048, &mgr, configMAX_PRIORITIES - 2, NULL);
|
xTaskCreate(task1, "task1", 2048, &mgr, configMAX_PRIORITIES - 2, NULL);
|
||||||
vTaskStartScheduler();
|
vTaskStartScheduler();
|
||||||
|
driver->tx = s_tx;
|
||||||
|
#else
|
||||||
|
s_bootmillis = mg_millis();
|
||||||
|
wait_ready(&mgr);
|
||||||
|
nortos_test(&mgr);
|
||||||
|
s_error = false;
|
||||||
|
mg_mgr_free(&mgr);
|
||||||
|
ASSERT(mgr.conns == NULL);
|
||||||
|
printf("HEALTH_DASHBOARD\t\"cleanup\": %s\n", s_error ? "false" : "true");
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NO_ABORT
|
#ifdef NO_ABORT
|
||||||
if (s_abort != 0) return false;
|
if (s_abort != 0) return false;
|
||||||
|
|||||||
@@ -1,18 +1,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// See https://mongoose.ws/documentation/#build-options
|
// See https://mongoose.ws/documentation/#build-options
|
||||||
//#undef MG_ARCH
|
|
||||||
//#define MG_ARCH MG_ARCH_UNIX
|
|
||||||
#define MG_ENABLE_FREERTOS 1
|
|
||||||
|
|
||||||
#define MG_ENABLE_TCPIP 1
|
#define MG_ENABLE_TCPIP 1
|
||||||
#define MG_ENABLE_TCPIP_DRIVER_INIT 0
|
#define MG_ENABLE_TCPIP_DRIVER_INIT 0
|
||||||
#define MG_ENABLE_BSD_SOCKETS 1
|
#define MG_ENABLE_BSD_SOCKETS 1
|
||||||
#define MG_ENABLE_BSD_LOG 1
|
|
||||||
#define MG_ENABLE_LINES 1
|
#define MG_ENABLE_LINES 1
|
||||||
#define MG_ENABLE_CUSTOM_RANDOM 1
|
#define MG_ENABLE_CUSTOM_RANDOM 1
|
||||||
|
|
||||||
//#include <ctype.h>
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
@@ -24,7 +19,16 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#if MG_ENABLE_FREERTOS
|
||||||
|
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#define MG_ENABLE_CUSTOM_CALLOC 1
|
||||||
|
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# Copyright (c) 2026 Cesanta Software Limited
|
||||||
|
# Environment setup: https://mongoose.ws/docs/getting-started/build-environment/
|
||||||
|
|
||||||
|
CFLAGS = -W -Wall -Wextra -Wundef -Wshadow -Wdouble-promotion
|
||||||
|
CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion
|
||||||
|
CFLAGS += -g3 -Os -ffunction-sections -fdata-sections
|
||||||
|
CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_h7/Include -Imongoose
|
||||||
|
CFLAGS += -mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=fpv5-d16 $(CFLAGS_EXTRA)
|
||||||
|
LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nosys.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
|
||||||
|
|
||||||
|
SOURCES = main.c hal.c echo.c
|
||||||
|
SOURCES += cmsis_h7/Source/Templates/gcc/startup_stm32h723xx.s
|
||||||
|
SOURCES += mongoose/mongoose.c
|
||||||
|
|
||||||
|
all build example: firmware.bin
|
||||||
|
|
||||||
|
mongoose/mongoose.c mongoose/mongoose.h:
|
||||||
|
cp ../../../../mongoose.[ch] mongoose/
|
||||||
|
|
||||||
|
firmware.elf: cmsis_core cmsis_h7 hal.h link.ld Makefile $(SOURCES) mongoose/mongoose.h
|
||||||
|
arm-none-eabi-gcc $(SOURCES) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
|
||||||
|
|
||||||
|
firmware.bin: firmware.elf
|
||||||
|
arm-none-eabi-objcopy -O binary $< $@
|
||||||
|
@echo
|
||||||
|
@echo "To flash, run 'make flash', or use STM32CubeProgrammer"
|
||||||
|
|
||||||
|
flash: firmware.bin
|
||||||
|
STM32_Programmer_CLI -c port=swd -w firmware.elf -hardRst
|
||||||
|
|
||||||
|
cmsis_core:
|
||||||
|
git clone -q -c advice.detachedHead=false --depth 1 -b 5.9.0 https://github.com/ARM-software/CMSIS_5 $@
|
||||||
|
|
||||||
|
cmsis_h7:
|
||||||
|
git clone -q -c advice.detachedHead=false --depth 1 -b v1.10.6 https://github.com/STMicroelectronics/cmsis_device_h7 $@
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf firmware.* cmsis_* mongoose/mongoose.*
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
// Copyright (c) 2026 Cesanta Software Limited
|
||||||
|
// All rights reserved
|
||||||
|
//
|
||||||
|
// This is an implementation of the simple TCP echo server which supports
|
||||||
|
// multiple concurrent connections, using BSD sockets API.
|
||||||
|
|
||||||
|
#include "mongoose.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
struct echo_server {
|
||||||
|
int sock;
|
||||||
|
struct echo_client {
|
||||||
|
struct echo_client *next;
|
||||||
|
int sock;
|
||||||
|
size_t len, sent;
|
||||||
|
char buf[128];
|
||||||
|
} *clients;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct echo_server s_server = {-1, NULL};
|
||||||
|
|
||||||
|
static int echo_nonblock(int fd) {
|
||||||
|
int flags = fcntl(fd, F_GETFL, 0);
|
||||||
|
return flags >= 0 && fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void echo_remove(struct echo_client **p) {
|
||||||
|
struct echo_client *c = *p;
|
||||||
|
*p = c->next;
|
||||||
|
close(c->sock);
|
||||||
|
free(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
int echo_init(uint16_t port) {
|
||||||
|
struct sockaddr_in sa = {
|
||||||
|
.sin_family = AF_INET,
|
||||||
|
.sin_port = htons(port),
|
||||||
|
.sin_addr = {.s_addr = INADDR_ANY},
|
||||||
|
};
|
||||||
|
int fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
|
||||||
|
if (fd < 0 || !echo_nonblock(fd) ||
|
||||||
|
bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0 || listen(fd, 3) < 0) {
|
||||||
|
printf("BSD echo init: %d\n", errno);
|
||||||
|
if (fd >= 0) close(fd);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
s_server.sock = fd;
|
||||||
|
printf("BSD echo server on port %hu\n", port);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void echo_poll(void) {
|
||||||
|
struct echo_server *s = &s_server;
|
||||||
|
struct echo_client *c, **p;
|
||||||
|
int maxfd, n;
|
||||||
|
fd_set r, w;
|
||||||
|
|
||||||
|
if (s->sock < 0) return;
|
||||||
|
maxfd = s->sock;
|
||||||
|
FD_ZERO(&r);
|
||||||
|
FD_ZERO(&w);
|
||||||
|
FD_SET(s->sock, &r);
|
||||||
|
for (c = s->clients; c != NULL; c = c->next) {
|
||||||
|
if (c->len == c->sent)
|
||||||
|
FD_SET(c->sock, &r);
|
||||||
|
else
|
||||||
|
FD_SET(c->sock, &w);
|
||||||
|
if (c->sock > maxfd) maxfd = c->sock;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (select(maxfd + 1, &r, &w, NULL, NULL) <= 0) return;
|
||||||
|
|
||||||
|
if (FD_ISSET(s->sock, &r)) {
|
||||||
|
struct sockaddr_in sa;
|
||||||
|
socklen_t len = sizeof(sa);
|
||||||
|
int fd = accept(s->sock, (struct sockaddr *) &sa, &len);
|
||||||
|
if (fd >= 0) {
|
||||||
|
c = (struct echo_client *) calloc(1, sizeof(*c));
|
||||||
|
if (c == NULL || !echo_nonblock(fd)) {
|
||||||
|
printf("BSD echo accept: %d\n", c == NULL ? ENOMEM : errno);
|
||||||
|
close(fd);
|
||||||
|
free(c);
|
||||||
|
} else {
|
||||||
|
c->sock = fd;
|
||||||
|
c->next = s->clients;
|
||||||
|
s->clients = c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
p = &s->clients;
|
||||||
|
while (*p != NULL) {
|
||||||
|
c = *p;
|
||||||
|
if (c->sent < c->len && FD_ISSET(c->sock, &w)) {
|
||||||
|
n = (int) send(c->sock, c->buf + c->sent, c->len - c->sent, 0);
|
||||||
|
if (n > 0) c->sent += (size_t) n;
|
||||||
|
if (n < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
|
||||||
|
echo_remove(p);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (c->sent == c->len && FD_ISSET(c->sock, &r)) {
|
||||||
|
n = (int) recv(c->sock, c->buf, sizeof(c->buf), 0);
|
||||||
|
if (n > 0) c->len = (size_t) n, c->sent = 0;
|
||||||
|
if (n == 0 || (n < 0 && errno != EAGAIN && errno != EWOULDBLOCK)) {
|
||||||
|
echo_remove(p);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (c->sent == c->len) c->len = c->sent = 0;
|
||||||
|
p = &c->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
// Copyright (c) 2026 Cesanta Software Limited
|
||||||
|
// All rights reserved
|
||||||
|
|
||||||
|
#include "hal.h"
|
||||||
|
|
||||||
|
bool hal_timer_expired(volatile uint64_t *t, uint64_t period, uint64_t now) {
|
||||||
|
uint64_t diff = now - *t; // Wrap-safe elapsed time since last expiry
|
||||||
|
if (period == 0) return false; // Avoid division by zero
|
||||||
|
if (diff < period) return false; // Period has not elapsed yet
|
||||||
|
*t += (diff / period) * period; // Preserve cadence, skip missed periods
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static volatile uint64_t s_ticks; // Milliseconds since boot
|
||||||
|
void SysTick_Handler(void) { // SyStick IRQ handler, triggered every 1ms
|
||||||
|
s_ticks++;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t hal_get_tick(void) {
|
||||||
|
return s_ticks;
|
||||||
|
};
|
||||||
|
|
||||||
|
uint32_t SystemCoreClock = 160000000;
|
||||||
|
void SystemInit(void) { // Called automatically by startup code
|
||||||
|
hal_system_init(); // Enable FPU
|
||||||
|
hal_clock_init();
|
||||||
|
SysTick_Config(SystemCoreClock / 1000); // Sys tick every 1ms
|
||||||
|
}
|
||||||
|
|
||||||
|
void ExitRun0Mode(void) {
|
||||||
|
}
|
||||||
|
|
||||||
|
struct stat;
|
||||||
|
__attribute__((weak)) int _fstat(int fd, struct stat *st) {
|
||||||
|
(void) fd, (void) st;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
extern unsigned char _end[]; // End of data section, start of heap. See link.ld
|
||||||
|
static unsigned char *s_current_heap_end = _end;
|
||||||
|
|
||||||
|
size_t hal_ram_used(void) {
|
||||||
|
return (size_t) (s_current_heap_end - _end);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t hal_ram_free(void) {
|
||||||
|
unsigned char endofstack;
|
||||||
|
return (size_t) (&endofstack - s_current_heap_end);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *_sbrk(int incr) {
|
||||||
|
unsigned char *prev_heap;
|
||||||
|
unsigned char *heap_end = (unsigned char *) ((size_t) &heap_end - 256);
|
||||||
|
prev_heap = s_current_heap_end;
|
||||||
|
// Check how much space we got from the heap end to the stack end
|
||||||
|
if (s_current_heap_end + incr > heap_end) return (void *) -1;
|
||||||
|
s_current_heap_end += incr;
|
||||||
|
return prev_heap;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _open(const char *path) {
|
||||||
|
(void) path;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _close(int fd) {
|
||||||
|
(void) fd;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _isatty(int fd) {
|
||||||
|
(void) fd;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _lseek(int fd, int ptr, int dir) {
|
||||||
|
(void) fd, (void) ptr, (void) dir;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) void _exit(int status) {
|
||||||
|
(void) status;
|
||||||
|
for (;;) asm volatile("BKPT #0");
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) void _kill(int pid, int sig) {
|
||||||
|
(void) pid, (void) sig;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _getpid(void) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _write(int fd, char *ptr, int len) {
|
||||||
|
(void) fd, (void) ptr, (void) len;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _read(int fd, char *ptr, int len) {
|
||||||
|
(void) fd, (void) ptr, (void) len;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _link(const char *a, const char *b) {
|
||||||
|
(void) a, (void) b;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _unlink(const char *a) {
|
||||||
|
(void) a;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int _stat(const char *path, struct stat *st) {
|
||||||
|
(void) path, (void) st;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) int mkdir(const char *path, int mode) {
|
||||||
|
(void) path, (void) mode;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) void _init(void) {
|
||||||
|
}
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
// Copyright (c) 2022-2026 Cesanta Software Limited
|
||||||
|
// Datasheet: RM0468, devboard manual: UM2407
|
||||||
|
// https://www.st.com/resource/en/reference_manual/rm0468-stm32h723733-stm32h725735-and-stm32h730-value-line-advanced-armbased-32bit-mcus-stmicroelectronics.pdf
|
||||||
|
// https://www.st.com/resource/en/user_manual/um2407-stm32h7-nucleo144-boards-mb1364-stmicroelectronics.pdf
|
||||||
|
// Alternate functions: https://www.st.com/resource/en/datasheet/stm32h723.pdf
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stm32h723xx.h>
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
extern bool hal_timer_expired(volatile uint64_t *t, uint64_t prd, uint64_t now);
|
||||||
|
extern uint64_t hal_get_tick(void);
|
||||||
|
extern size_t hal_ram_free(void);
|
||||||
|
extern size_t hal_ram_used(void);
|
||||||
|
extern uint32_t SystemCoreClock;
|
||||||
|
|
||||||
|
#define BIT(x) (1UL << (x))
|
||||||
|
#define CLRSET(reg, clear, set) ((reg) = ((reg) & ~(clear)) | (set))
|
||||||
|
#define PIN(bank, num) ((((bank) - 'A') << 8) | (num))
|
||||||
|
#define PINNO(pin) (pin & 255)
|
||||||
|
#define PINBANK(pin) (pin >> 8)
|
||||||
|
|
||||||
|
#define HAL_ETH_PINS PIN('A', 1), PIN('A', 2), PIN('A', 7), \
|
||||||
|
PIN('B', 13), PIN('C', 1), PIN('C', 4), \
|
||||||
|
PIN('C', 5), PIN('G', 11), PIN('G', 13)
|
||||||
|
|
||||||
|
// System clock (2.1, Figure 1; 8.5, Figure 45; 8.5.5, Figure 47; 8.5.6, Figure
|
||||||
|
// 49; 8.5.8 Table 56; datasheet) CPU_FREQUENCY <= 550 MHz; hclk = CPU_FREQUENCY
|
||||||
|
// / HAL_HPRE ; hclk <= 275 MHz; APB clocks <= 137.5 MHz. D1 domain bus matrix (and
|
||||||
|
// so flash) runs at hclk frequency. Configure flash latency (WS) in accordance
|
||||||
|
// to hclk freq (4.3.8, Table 16) The Ethernet controller is in D2 domain and
|
||||||
|
// runs at hclk frequency
|
||||||
|
enum {
|
||||||
|
HAL_D1CPRE = 1, // actual divisor value
|
||||||
|
HAL_HPRE = 2, // actual divisor value
|
||||||
|
HAL_D1PPRE = 4, // register values, divisor value = BIT(value - 3) = / 2
|
||||||
|
HAL_D2PPRE1 = 4,
|
||||||
|
HAL_D2PPRE2 = 4,
|
||||||
|
HAL_D3PPRE = 4
|
||||||
|
};
|
||||||
|
// PLL1_P: odd division factors are not allowed (8.7.12) (except for '1')
|
||||||
|
enum { PLL1_HSI = 64, PLL1_M = 32, PLL1_N = 225, PLL1_P = 1 };
|
||||||
|
#define HAL_FLASH_LATENCY 0x33 // WRHIGHFREQ LATENCY
|
||||||
|
#define SYS_FREQUENCY ((PLL1_HSI * PLL1_N / PLL1_M / PLL1_P / HAL_D1CPRE) * 1000000)
|
||||||
|
#define AHB_FREQUENCY (SYS_FREQUENCY / HAL_HPRE)
|
||||||
|
#define APB2_FREQUENCY (AHB_FREQUENCY / (BIT(HAL_D2PPRE2 - 3)))
|
||||||
|
#define APB1_FREQUENCY (AHB_FREQUENCY / (BIT(HAL_D2PPRE1 - 3)))
|
||||||
|
|
||||||
|
|
||||||
|
enum { HAL_GPIO_MODE_INPUT, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_MODE_AF, HAL_GPIO_MODE_ANALOG };
|
||||||
|
enum { HAL_GPIO_OTYPE_PUSH_PULL, HAL_GPIO_OTYPE_OPEN_DRAIN };
|
||||||
|
enum { HAL_GPIO_SPEED_LOW, HAL_GPIO_SPEED_MEDIUM, HAL_GPIO_SPEED_HIGH, HAL_GPIO_SPEED_INSANE };
|
||||||
|
enum { HAL_GPIO_PULL_NONE, HAL_GPIO_PULL_UP, HAL_GPIO_PULL_DOWN };
|
||||||
|
|
||||||
|
#define HAL_GPIO(N) ((GPIO_TypeDef *) (0x40000000 + 0x18020000UL + 0x400 * (N)))
|
||||||
|
|
||||||
|
static GPIO_TypeDef *hal_gpio_bank(uint16_t pin) {
|
||||||
|
return HAL_GPIO(PINBANK(pin));
|
||||||
|
}
|
||||||
|
static inline void hal_gpio_toggle(uint16_t pin) {
|
||||||
|
GPIO_TypeDef *gpio = hal_gpio_bank(pin);
|
||||||
|
uint32_t mask = BIT(PINNO(pin));
|
||||||
|
gpio->BSRR = mask << (gpio->ODR & mask ? 16 : 0);
|
||||||
|
}
|
||||||
|
static inline int hal_gpio_read(uint16_t pin) {
|
||||||
|
return hal_gpio_bank(pin)->IDR & BIT(PINNO(pin)) ? 1 : 0;
|
||||||
|
}
|
||||||
|
static inline void hal_gpio_write(uint16_t pin, bool val) {
|
||||||
|
GPIO_TypeDef *gpio = hal_gpio_bank(pin);
|
||||||
|
gpio->BSRR = BIT(PINNO(pin)) << (val ? 0 : 16);
|
||||||
|
}
|
||||||
|
static inline void hal_gpio_init(uint16_t pin, uint8_t mode, uint8_t type,
|
||||||
|
uint8_t speed, uint8_t pull, uint8_t af) {
|
||||||
|
GPIO_TypeDef *gpio = hal_gpio_bank(pin);
|
||||||
|
uint8_t n = (uint8_t) (PINNO(pin));
|
||||||
|
RCC->AHB4ENR |= BIT(PINBANK(pin)); // Enable GPIO clock
|
||||||
|
CLRSET(gpio->OTYPER, 1UL << n, ((uint32_t) type) << n);
|
||||||
|
CLRSET(gpio->OSPEEDR, 3UL << (n * 2), ((uint32_t) speed) << (n * 2));
|
||||||
|
CLRSET(gpio->PUPDR, 3UL << (n * 2), ((uint32_t) pull) << (n * 2));
|
||||||
|
CLRSET(gpio->AFR[n >> 3], 15UL << ((n & 7) * 4),
|
||||||
|
((uint32_t) af) << ((n & 7) * 4));
|
||||||
|
CLRSET(gpio->MODER, 3UL << (n * 2), ((uint32_t) mode) << (n * 2));
|
||||||
|
}
|
||||||
|
static inline void hal_gpio_input(uint16_t pin) {
|
||||||
|
hal_gpio_init(pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_OTYPE_PUSH_PULL, HAL_GPIO_SPEED_HIGH,
|
||||||
|
HAL_GPIO_PULL_NONE, 0);
|
||||||
|
}
|
||||||
|
static inline void hal_gpio_output(uint16_t pin) {
|
||||||
|
hal_gpio_init(pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_OTYPE_PUSH_PULL, HAL_GPIO_SPEED_HIGH,
|
||||||
|
HAL_GPIO_PULL_NONE, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// D2 Kernel clock (8.7.21) USART1 defaults to pclk2 (APB2), while USART2,3
|
||||||
|
// default to pclk1 (APB1). Even if using other kernel clocks, the APBx clocks
|
||||||
|
// must be enabled for CPU access, as the kernel clock drives the BRR, not the
|
||||||
|
// APB bus interface
|
||||||
|
static inline void hal_uart_init(USART_TypeDef *uart, uint16_t tx,
|
||||||
|
uint16_t rx, unsigned long baud) {
|
||||||
|
uint8_t af = 7; // Alternate function
|
||||||
|
uint32_t freq = 0; // Bus frequency. UART1 is on APB2, rest on APB1
|
||||||
|
|
||||||
|
if (uart == USART1) freq = APB2_FREQUENCY, RCC->APB2ENR |= BIT(4);
|
||||||
|
if (uart == USART2) freq = APB1_FREQUENCY, RCC->APB1LENR |= BIT(17);
|
||||||
|
if (uart == USART3) freq = APB1_FREQUENCY, RCC->APB1LENR |= BIT(18);
|
||||||
|
|
||||||
|
#if 0 // CONSTANT BAUD RATE FOR REMOTE DEBUGGING WHILE SETTING THE PLL
|
||||||
|
CLRSET(RCC->D2CCIP2R, 7 << 3, 3 << 3); // use HSI for UART1
|
||||||
|
freq = 64000000;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
hal_gpio_init(tx, HAL_GPIO_MODE_AF, HAL_GPIO_OTYPE_PUSH_PULL, HAL_GPIO_SPEED_HIGH, 0, af);
|
||||||
|
hal_gpio_init(rx, HAL_GPIO_MODE_AF, HAL_GPIO_OTYPE_PUSH_PULL, HAL_GPIO_SPEED_HIGH, 0, af);
|
||||||
|
uart->CR1 = 0; // Disable this UART
|
||||||
|
uart->BRR = freq / baud; // Set baud rate
|
||||||
|
uart->CR1 = BIT(0) | BIT(2) | BIT(3); // Set UE, RE, TE
|
||||||
|
}
|
||||||
|
static inline void hal_uart_write_byte(USART_TypeDef *uart, uint8_t byte) {
|
||||||
|
uart->TDR = byte;
|
||||||
|
while ((uart->ISR & USART_ISR_TXE_TXFNF) == 0) (void) 0;
|
||||||
|
}
|
||||||
|
static inline void hal_uart_write_buf(USART_TypeDef *uart, char *buf, size_t len) {
|
||||||
|
while (len-- > 0) hal_uart_write_byte(uart, *(uint8_t *) buf++);
|
||||||
|
}
|
||||||
|
static inline int hal_uart_read_ready(USART_TypeDef *uart) {
|
||||||
|
return uart->ISR & BIT(5); // If RXNE bit is set, data is ready
|
||||||
|
}
|
||||||
|
static inline uint8_t hal_uart_read_byte(USART_TypeDef *uart) {
|
||||||
|
return (uint8_t) (uart->RDR & 255);
|
||||||
|
}
|
||||||
|
|
||||||
|
// RNG clock (rng_clk) defaults to HSI48 and is characterized at this frequency.
|
||||||
|
// Enable at SystemInit. (STM32CubeMX) It won't work with a 275MHz (AHB)
|
||||||
|
static inline void hal_rng_init(void) {
|
||||||
|
RCC->AHB2ENR |= RCC_AHB2ENR_RNGEN; // Enable RNG AHB clock (hal_rng_hclk)
|
||||||
|
// 39.6.2 Table 320 init
|
||||||
|
RNG->CR = RNG_CR_CONDRST | (0x0F << RNG_CR_RNG_CONFIG1_Pos) |
|
||||||
|
(0 << RNG_CR_RNG_CONFIG2_Pos) | (0xD << RNG_CR_RNG_CONFIG3_Pos);
|
||||||
|
RNG->HTCR = 0x17590abc;
|
||||||
|
RNG->HTCR = 0xaa74;
|
||||||
|
RNG->CR &= ~RNG_CR_CONDRST ;
|
||||||
|
while (RNG->CR & RNG_CR_CONDRST) (void) 0; // 39.7.1
|
||||||
|
RNG->CR |= RNG_CR_RNGEN; // Enable RNG
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline uint32_t hal_rng_read(void) {
|
||||||
|
while ((RNG->SR & RNG_SR_DRDY) == 0) (void) 0;
|
||||||
|
return RNG->DR;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hw pull-ups on PHY RXD0,1,DV to enable autonegotiation
|
||||||
|
static inline void hal_ethernet_init(void) {
|
||||||
|
// Initialise Ethernet. Enable MAC GPIO pins, see
|
||||||
|
// https://www.st.com/resource/en/user_manual/um2407-stm32h7-nucleo144-boards-mb1364-stmicroelectronics.pdf
|
||||||
|
uint16_t pins[] = {HAL_ETH_PINS};
|
||||||
|
for (size_t i = 0; i < sizeof(pins) / sizeof(pins[0]); i++) {
|
||||||
|
hal_gpio_init(pins[i], HAL_GPIO_MODE_AF, HAL_GPIO_OTYPE_PUSH_PULL, HAL_GPIO_SPEED_INSANE,
|
||||||
|
HAL_GPIO_PULL_NONE, 11); // 11 is the Ethernet function
|
||||||
|
}
|
||||||
|
NVIC_EnableIRQ(ETH_IRQn); // Setup Ethernet IRQ handler
|
||||||
|
CLRSET(SYSCFG->PMCR, 7 << 21, 4 << 21); // Use RMII (12.3.1)
|
||||||
|
RCC->AHB1ENR |= BIT(15) | BIT(16) | BIT(17); // Enable Ethernet clocks
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline unsigned int hal_div2prescval(unsigned int div) {
|
||||||
|
// 0 --> /1; 8 --> /2 ... 11 --> /16; 12 --> /64 ... 15 --> /512
|
||||||
|
if (div == 1) return 0;
|
||||||
|
if (div > 16) div /= 2;
|
||||||
|
unsigned int val = 7;
|
||||||
|
while (div >>= 1) ++val;
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline unsigned int hal_pllrge(unsigned int f) {
|
||||||
|
unsigned int val = 0;
|
||||||
|
while (f >>= 1) ++val;
|
||||||
|
return val - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enable RTC/BKP APB clock and backup domain write access.
|
||||||
|
// Must be called before accessing RTC backup registers or IWDG.
|
||||||
|
static inline void hal_backup_domain_init(void) {
|
||||||
|
RCC->APB4ENR |= RCC_APB4ENR_RTCAPBEN; // enable RTC/BKP APB clock
|
||||||
|
PWR->CR1 |= PWR_CR1_DBP; // enable backup domain write access
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void hal_clock_init(void) {
|
||||||
|
hal_backup_domain_init();
|
||||||
|
PWR->CR3 |= PWR_CR3_LDOEN; // select LDO (reset value)
|
||||||
|
while ((PWR->CSR1 & PWR_CSR1_ACTVOSRDY) == 0) (void) 0; // ACTVOSRDY
|
||||||
|
PWR->D3CR &= ~PWR_D3CR_VOS_Msk; // Select VOS0
|
||||||
|
while ((PWR->D3CR & PWR_D3CR_VOSRDY) == 0) (void) 0; // VOSRDY
|
||||||
|
CLRSET(
|
||||||
|
RCC->D1CFGR, (0x0F << 8) | (7 << 4) | (0x0F << 0),
|
||||||
|
(hal_div2prescval(HAL_D1CPRE) << 8) | (HAL_D1PPRE << 4) | (hal_div2prescval(HAL_HPRE) << 0));
|
||||||
|
RCC->D2CFGR = (HAL_D2PPRE2 << 8) | (HAL_D2PPRE1 << 4);
|
||||||
|
RCC->D3CFGR = (HAL_D3PPRE << 4);
|
||||||
|
CLRSET(RCC->PLLCFGR, 3 << 2,
|
||||||
|
hal_pllrge(PLL1_HSI / PLL1_M)
|
||||||
|
<< 2); // keep reset config (DIVP1EN, !PLL1VCOSEL), PLL1RGE
|
||||||
|
CLRSET(RCC->PLL1DIVR, (0x7F << 9) | (0x1FF << 0),
|
||||||
|
((PLL1_P - 1) << 9) | ((PLL1_N - 1) << 0)); // Set PLL1_P PLL1_N
|
||||||
|
CLRSET(RCC->PLLCKSELR, 0x3F << 4,
|
||||||
|
PLL1_M << 4); // Set PLL1_M (source defaults to HSI)
|
||||||
|
RCC->CR |= RCC_CR_PLL1ON | RCC_CR_HSI48ON; // Enable PLL1 and HSI48 (for RNG)
|
||||||
|
while ((RCC->CR & RCC_CR_PLL1RDY) == 0) (void) 0; // Wait until done
|
||||||
|
RCC->CFGR |= (3 << 0); // Set clock source to PLL1
|
||||||
|
while ((RCC->CFGR & (7 << 3)) != (3 << 3)) (void) 0; // Wait until done
|
||||||
|
FLASH->ACR = HAL_FLASH_LATENCY; // default is larger
|
||||||
|
RCC->APB4ENR |= RCC_APB4ENR_SYSCFGEN; // Enable SYSCFG
|
||||||
|
while ((RCC->CR & RCC_CR_HSI48RDY) == 0) (void) 0; // Make sure HSI48 is ready
|
||||||
|
SystemCoreClock = SYS_FREQUENCY; // Update SystemCoreClock global var
|
||||||
|
SysTick_Config(SystemCoreClock / 1000); // Sys tick every 1ms
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static inline void hal_system_init(void) {
|
||||||
|
SCB->CPACR |= ((3UL << 10 * 2) | (3UL << 11 * 2)); // Enable FPU
|
||||||
|
__DSB();
|
||||||
|
__ISB();
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
ENTRY(Reset_Handler);
|
||||||
|
MEMORY {
|
||||||
|
flash(rx) : ORIGIN = 0x08000000, LENGTH = 1024k
|
||||||
|
|
||||||
|
dtcmram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K
|
||||||
|
ram_d1 (rwx) : ORIGIN = 0x24000000, LENGTH = 320K
|
||||||
|
ram_d2 (rwx) : ORIGIN = 0x30000000, LENGTH = 32K
|
||||||
|
ram_d3 (rwx) : ORIGIN = 0x38000000, LENGTH = 16K
|
||||||
|
itcmram (rwx) : ORIGIN = 0x00000000, LENGTH = 64K
|
||||||
|
}
|
||||||
|
_estack = ORIGIN(ram_d1) + LENGTH(ram_d1);
|
||||||
|
|
||||||
|
SECTIONS {
|
||||||
|
.vectors : { KEEP(*(.isr_vector)) } > flash
|
||||||
|
.text : { *(.text* .text.*) } > flash
|
||||||
|
.rodata : { *(.rodata*) } > flash
|
||||||
|
|
||||||
|
/* Note the .iram section, for functions copied to RAM. Required for MG_IRAM OTA support */
|
||||||
|
.data : { _sdata = .; *(.first_data) *(.iram .iram* .iram.*) *(.data SORT(.data.*)) _edata = .; } > ram_d1 AT > flash
|
||||||
|
_sidata = LOADADDR(.data);
|
||||||
|
|
||||||
|
.bss : { _sbss = .; *(.bss SORT(.bss.*) COMMON) _ebss = .; } > ram_d1
|
||||||
|
|
||||||
|
.eth_ram : { *(.eth_ram .eth_ram*) } > ram_d1 AT > flash
|
||||||
|
|
||||||
|
/* Health record. NOLOAD and in unused DTCM, so startup code neither copies
|
||||||
|
nor zeroes it and the contents survive a warm reset */
|
||||||
|
.mg_health (NOLOAD) : { KEEP(*(.mg_health .mg_health*)) } > dtcmram
|
||||||
|
|
||||||
|
. = ALIGN(8);
|
||||||
|
_end = .;
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
// Copyright (c) 2026 Cesanta Software Limited
|
||||||
|
// All rights reserved
|
||||||
|
|
||||||
|
#include "hal.h"
|
||||||
|
#include "mongoose.h"
|
||||||
|
|
||||||
|
int echo_init(uint16_t port);
|
||||||
|
void echo_poll(void);
|
||||||
|
|
||||||
|
#ifndef UART_DEBUG
|
||||||
|
#define UART_DEBUG USART3
|
||||||
|
#define UART_DEBUG_TX_PIN PIN('D', 8)
|
||||||
|
#define UART_DEBUG_RX_PIN PIN('D', 9)
|
||||||
|
#else
|
||||||
|
#define UART_DEBUG_TX_PIN PIN('A', 9)
|
||||||
|
#define UART_DEBUG_RX_PIN PIN('A', 10)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define LED1 PIN('B', 0)
|
||||||
|
#define LED2 PIN('E', 1)
|
||||||
|
#define LED3 PIN('B', 14)
|
||||||
|
|
||||||
|
static void log_fn(char ch, void *param) {
|
||||||
|
hal_uart_write_buf(param, &ch, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void blink_task(void) {
|
||||||
|
static uint64_t blink_timer = 0;
|
||||||
|
if (hal_timer_expired(&blink_timer, 500, hal_get_tick())) {
|
||||||
|
hal_gpio_toggle(LED2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t mg_millis(void) {
|
||||||
|
return hal_get_tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool mg_random(void *buf, size_t len) {
|
||||||
|
for (size_t n = 0; n < len; n += sizeof(uint32_t)) {
|
||||||
|
uint32_t r = hal_rng_read();
|
||||||
|
memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void http_ev_handler(struct mg_connection *c, int ev, void *ev_data) {
|
||||||
|
if (ev == MG_EV_HTTP_MSG) {
|
||||||
|
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
|
||||||
|
if (mg_match(hm->uri, mg_str("/api/tick"), NULL)) {
|
||||||
|
mg_http_reply(c, 200, "", "{%m:%llu}\n", MG_ESC("tick"), hal_get_tick());
|
||||||
|
} else {
|
||||||
|
mg_http_reply(c, 200, "", "Hi from Mongoose, tick %llu\n",
|
||||||
|
hal_get_tick());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(void) {
|
||||||
|
hal_clock_init();
|
||||||
|
hal_uart_init(UART_DEBUG, UART_DEBUG_TX_PIN, UART_DEBUG_RX_PIN, 115200);
|
||||||
|
mg_log_set_fn(log_fn, UART_DEBUG);
|
||||||
|
hal_rng_init();
|
||||||
|
hal_ethernet_init();
|
||||||
|
hal_gpio_output(LED1);
|
||||||
|
hal_gpio_output(LED2);
|
||||||
|
hal_gpio_output(LED3);
|
||||||
|
|
||||||
|
MG_INFO(("Initialised. CPU clock: %lu MHz", SystemCoreClock / 1000000));
|
||||||
|
|
||||||
|
// Mongoose event manager processes both Mongoose API and BSD sockets API
|
||||||
|
struct mg_mgr mgr;
|
||||||
|
mg_mgr_init(&mgr);
|
||||||
|
|
||||||
|
// This is Mongoose-API HTTP server
|
||||||
|
mg_http_listen(&mgr, "http://0.0.0.0", http_ev_handler, NULL);
|
||||||
|
|
||||||
|
// This is BSD sockets API tcp echo server that handles multiple concurrent
|
||||||
|
// connections. Note - baremetal implementation is non-blocking only.
|
||||||
|
echo_init(1234);
|
||||||
|
|
||||||
|
// Baremetal superloop. Each function in the loop must not block
|
||||||
|
for (;;) {
|
||||||
|
mg_mgr_poll(&mgr, 0);
|
||||||
|
echo_poll();
|
||||||
|
blink_task();
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
../../../../mongoose.c
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
../../../../mongoose.h
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "hal.h"
|
||||||
|
|
||||||
|
// See https://mongoose.ws/docs/getting-started/build-options/
|
||||||
|
#define MG_ARCH MG_ARCH_ARMGCC
|
||||||
|
#define MG_TLS MG_TLS_BUILTIN
|
||||||
|
#define MG_OTA MG_OTA_STM32H7
|
||||||
|
|
||||||
|
#define MG_ENABLE_TCPIP 1
|
||||||
|
#define MG_ENABLE_BSD_SOCKETS 1
|
||||||
|
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||||
|
#define MG_ENABLE_CUSTOM_RANDOM 1
|
||||||
|
#define MG_ENABLE_DRIVER_STM32H 1
|
||||||
|
#define MG_ENABLE_PACKED_FS 1
|
||||||
|
#define MG_ETH_RAM __attribute__((section(".eth_ram")))
|
||||||
|
|
||||||
|
// #define MG_DRIVER_MDC_CR 4 // RMII MDC clock divider, from 0 to 5
|
||||||
|
// #define MG_TCPIP_PHY_ADDR 0 // PHY address
|
||||||
|
|
||||||
|
// For static IP configuration, define MG_TCPIP_{IP,MASK,GW}
|
||||||
|
// By default, those are set to zero, meaning that DHCP is used
|
||||||
|
//
|
||||||
|
// #define MG_TCPIP_IP MG_IPV4(192, 168, 0, 10) // IP
|
||||||
|
// #define MG_TCPIP_GW MG_IPV4(192, 168, 0, 1) // Gateway
|
||||||
|
// #define MG_TCPIP_MASK MG_IPV4(255, 255, 255, 0) // Netmask
|
||||||
|
|
||||||
|
// Construct MAC address from the MCU unique ID
|
||||||
|
#define MGUID ((uint32_t *) UID_BASE)
|
||||||
|
#define MG_SET_MAC_ADDRESS(mac) \
|
||||||
|
do { \
|
||||||
|
mac[0] = 2; \
|
||||||
|
mac[1] = MGUID[0] & 255; \
|
||||||
|
mac[2] = (MGUID[0] >> 10) & 255; \
|
||||||
|
mac[3] = (MGUID[0] >> 19) & 255; \
|
||||||
|
mac[4] = MGUID[1] & 255; \
|
||||||
|
mac[5] = MGUID[2] & 255; \
|
||||||
|
} while (0)
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
-4
@@ -60,8 +60,7 @@ static void http_ev_handler(struct mg_connection *c, int ev, void *ev_data) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// task1: network owner. Runs the Mongoose event loop (mg_bsd_poll drives both
|
// task1: network owner. Runs the Mongoose event loop and blinks the LED.
|
||||||
// the TCP/IP stack and the BSD command queue) and blinks the LED.
|
|
||||||
static void task1(void *args) {
|
static void task1(void *args) {
|
||||||
static struct mg_mgr mgr;
|
static struct mg_mgr mgr;
|
||||||
mg_mgr_init(&mgr);
|
mg_mgr_init(&mgr);
|
||||||
@@ -72,7 +71,6 @@ static void task1(void *args) {
|
|||||||
MG_INFO(("Crash record: %M", mg_print_crash_record));
|
MG_INFO(("Crash record: %M", mg_print_crash_record));
|
||||||
for (;;) {
|
for (;;) {
|
||||||
mg_mgr_poll(&mgr, 0);
|
mg_mgr_poll(&mgr, 0);
|
||||||
mg_bsd_poll(&mgr);
|
|
||||||
blink_task();
|
blink_task();
|
||||||
}
|
}
|
||||||
(void) args;
|
(void) args;
|
||||||
@@ -119,7 +117,6 @@ static void echo_task(void *args) {
|
|||||||
// task2: accept loop. Waits for incoming connections on port 1234 and spawns
|
// task2: accept loop. Waits for incoming connections on port 1234 and spawns
|
||||||
// an echo_task for each one, allowing concurrent clients.
|
// an echo_task for each one, allowing concurrent clients.
|
||||||
static void task2(void *args) {
|
static void task2(void *args) {
|
||||||
mg_bsd_init();
|
|
||||||
int lfd = socket(AF_INET, SOCK_STREAM, 0);
|
int lfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
struct sockaddr_in sa = {.sin_family = AF_INET, .sin_port = htons(1234), .sin_addr = {INADDR_ANY}};
|
struct sockaddr_in sa = {.sin_family = AF_INET, .sin_port = htons(1234), .sin_addr = {INADDR_ANY}};
|
||||||
bind(lfd, (struct sockaddr *) &sa, sizeof(sa));
|
bind(lfd, (struct sockaddr *) &sa, sizeof(sa));
|
||||||
-1
@@ -11,7 +11,6 @@
|
|||||||
#define MG_ENABLE_CUSTOM_MILLIS 1
|
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||||
#define MG_ENABLE_CUSTOM_RANDOM 1
|
#define MG_ENABLE_CUSTOM_RANDOM 1
|
||||||
#define MG_ENABLE_DRIVER_STM32H 1
|
#define MG_ENABLE_DRIVER_STM32H 1
|
||||||
#define MG_ENABLE_PACKED_FS 1
|
|
||||||
#define MG_ETH_RAM __attribute__((section(".eth_ram")))
|
#define MG_ETH_RAM __attribute__((section(".eth_ram")))
|
||||||
|
|
||||||
// #define MG_DRIVER_MDC_CR 4 // RMII MDC clock divider, from 0 to 5
|
// #define MG_DRIVER_MDC_CR 4 // RMII MDC clock divider, from 0 to 5
|
||||||
Reference in new issue
Block a user