mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-07 17:42:30 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Handle SimpleLink restarts in Mongoose

Browse Source 
SimpleLink restart invalidates all sockets.
Listeners are restarted, outgoing connections are closed.

PUBLISHED_FROM=15567dfb822bffbd44d39ba0e69a7ac64fd7a1c8
This commit is contained in:
Deomid Ryabkov 2016-07-06 15:55:00 +03:00 committed by Cesanta Bot
parent 0e0c6b8357
commit 29b3950ee7
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mongoose.c
View File

@ -10428,9 +10428,6 @@ int sl_set_ssl_opts(struct mg_connection *nc) {
strlen(nc->ssl_key)); strlen(nc->ssl_key));
DBG(("PRIVATE_KEY_FILE_NAME %s -> %d", nc->ssl_key, nc->err)); DBG(("PRIVATE_KEY_FILE_NAME %s -> %d", nc->ssl_key, nc->err));
if (err != 0) return err; if (err != 0) return err;
MG_FREE(nc->ssl_cert);
MG_FREE(nc->ssl_key);
nc->ssl_cert = nc->ssl_key = NULL;
} }
if (nc->ssl_ca_cert != NULL) { if (nc->ssl_ca_cert != NULL) {
if (nc->ssl_ca_cert[0] != '\0') { if (nc->ssl_ca_cert[0] != '\0') {
@ -10440,8 +10437,6 @@ int sl_set_ssl_opts(struct mg_connection *nc) {
DBG(("CA_FILE_NAME %s -> %d", nc->ssl_ca_cert, err)); DBG(("CA_FILE_NAME %s -> %d", nc->ssl_ca_cert, err));
if (err != 0) return err; if (err != 0) return err;
} }
MG_FREE(nc->ssl_ca_cert);
nc->ssl_ca_cert = NULL;
} }
if (nc->ssl_server_name != NULL) { if (nc->ssl_server_name != NULL) {
err = sl_SetSockOpt(nc->sock, SL_SOL_SOCKET, err = sl_SetSockOpt(nc->sock, SL_SOL_SOCKET,
@ -10452,8 +10447,6 @@ int sl_set_ssl_opts(struct mg_connection *nc) {
* return SL_ENOPROTOOPT. There isn't much we can do about it, so we ignore * return SL_ENOPROTOOPT. There isn't much we can do about it, so we ignore
* the error. */ * the error. */
if (err != 0 && err != SL_ENOPROTOOPT) return err; if (err != 0 && err != SL_ENOPROTOOPT) return err;
MG_FREE(nc->ssl_server_name);
nc->ssl_server_name = NULL;
} }
return 0; return 0;
} }
@ -10485,7 +10478,8 @@ void mg_if_connect_tcp(struct mg_connection *nc,
#endif #endif
nc->err = sl_Connect(sock, &sa->sa, sizeof(sa->sin)); nc->err = sl_Connect(sock, &sa->sa, sizeof(sa->sin));
out: out:
DBG(("%p sock %d err %d", nc, nc->sock, nc->err)); DBG(("%p to %s:%d sock %d err %d", nc, inet_ntoa(sa->sin.sin_addr),
ntohs(sa->sin.sin_port), nc->sock, nc->err));
} }
void mg_if_connect_udp(struct mg_connection *nc) { void mg_if_connect_udp(struct mg_connection *nc) {
@ -10814,8 +10808,8 @@ time_t mg_mgr_poll(struct mg_mgr *mgr, int timeout_ms) {
num_ev = sl_Select((int) max_fd + 1, &read_set, &write_set, &err_set, &tv); num_ev = sl_Select((int) max_fd + 1, &read_set, &write_set, &err_set, &tv);
now = mg_time(); now = mg_time();
DBG(("sl_Select @ %ld num_ev=%d of %d, timeout=%d", (long) now, num_ev, num_fds, DBG(("sl_Select @ %ld num_ev=%d of %d, timeout=%d", (long) now, num_ev,
timeout_ms)); num_fds, timeout_ms));
for (nc = mgr->active_connections; nc != NULL; nc = tmp) { for (nc = mgr->active_connections; nc != NULL; nc = tmp) {
int fd_flags = 0; int fd_flags = 0;
@ -10856,4 +10850,29 @@ void mg_if_get_conn_addr(struct mg_connection *nc, int remote,
if (remote) memcpy(sa, &nc->sa, sizeof(*sa)); if (remote) memcpy(sa, &nc->sa, sizeof(*sa));
} }
void sl_restart_cb(struct mg_mgr *mgr) {
/*
* SimpleLink has been restarted, meaning all sockets have been invalidated.
* We try our best - we'll restart the listeners, but for outgoing
* connections we have no option but to terminate.
*/
struct mg_connection *nc;
for (nc = mg_next(mgr, NULL); nc != NULL; nc = mg_next(mgr, nc)) {
if (nc->sock == INVALID_SOCKET) continue; /* Could be a timer */
if (nc->flags & MG_F_LISTENING) {
DBG(("restarting %p %s:%d", nc, inet_ntoa(nc->sa.sin.sin_addr),
ntohs(nc->sa.sin.sin_port)));
int res = (nc->flags & MG_F_UDP ? mg_if_listen_udp(nc, &nc->sa)
: mg_if_listen_tcp(nc, &nc->sa));
if (res == 0) continue;
/* Well, we tried and failed. Fall through to closing. */
}
nc->sock = INVALID_SOCKET;
DBG(("terminating %p %s:%d", nc, inet_ntoa(nc->sa.sin.sin_addr),
ntohs(nc->sa.sin.sin_port)));
/* TODO(rojer): Outgoing UDP? */
nc->flags |= MG_F_CLOSE_IMMEDIATELY;
}
}
#endif /* !defined(MG_DISABLE_SOCKET_IF) && defined(MG_SOCKET_SIMPLELINK) */ #endif /* !defined(MG_DISABLE_SOCKET_IF) && defined(MG_SOCKET_SIMPLELINK) */

2
mongoose.h
View File

@ -740,6 +740,8 @@ void mg_run_in_task(void (*cb)(struct mg_mgr *mgr, void *arg), void *cb_arg);
int sl_fs_init(); int sl_fs_init();
void sl_restart_cb(struct mg_mgr *mgr);
int sl_set_ssl_opts(struct mg_connection *nc); int sl_set_ssl_opts(struct mg_connection *nc);
#ifdef __cplusplus #ifdef __cplusplus