added mio_bchars_to_intmax(), mio_uchars_to_intmax().
coded the first working thread interface for the http server
This commit is contained in:
parent
b112280225
commit
4f8abcf0c5
@ -662,7 +662,7 @@ static void thr_on_close (mio_dev_thr_t* dev, mio_dev_thr_sid_t sid)
|
||||
MIO_INFO1 (dev->mio, "THR[%d] CLOSED \n", (int)sid);
|
||||
}
|
||||
|
||||
static void thr_func (mio_t* mio, mio_dev_thr_iopair_t* iop, void* cx)
|
||||
static void thr_func (mio_t* mio, mio_dev_thr_iopair_t* iop, void* ctx)
|
||||
{
|
||||
mio_bch_t buf[5];
|
||||
ssize_t n;
|
||||
@ -818,6 +818,23 @@ static void on_dnc_resolve_brief (mio_svc_dnc_t* dnc, mio_dns_msg_t* reqmsg, mio
|
||||
}
|
||||
}
|
||||
|
||||
static void on_htts_thr_request (mio_t* mio, mio_dev_thr_iopair_t* iop, mio_svc_htts_thr_func_info_t* tfi, void* ctx)
|
||||
{
|
||||
FILE* fp;
|
||||
int i;
|
||||
|
||||
fp = fdopen(iop->wfd, "w");
|
||||
fprintf (fp, "Status: 201\r\n");
|
||||
fprintf (fp, "Content-Type: text/html\r\n\r\n");
|
||||
|
||||
fprintf (fp, "request path = %s\n", tfi->req_path);
|
||||
if (tfi->req_param) fprintf (fp, "request param = %s\n", tfi->req_param);
|
||||
for (i = 0; i < 100; i++) fprintf (fp, "%d * %d => %d\n", i, i, i * i);
|
||||
|
||||
fclose (fp);
|
||||
iop->wfd = MIO_SYSHND_INVALID;
|
||||
}
|
||||
|
||||
/* ========================================================================= */
|
||||
int process_http_request (mio_svc_htts_t* htts, mio_dev_sck_t* csck, mio_htre_t* req)
|
||||
{
|
||||
@ -904,8 +921,13 @@ if (mio_htre_getcontentlen(req) > 0)
|
||||
|
||||
{
|
||||
#endif
|
||||
/*const mio_bch_t* qpath = mio_htre_getqpath(req);*/
|
||||
if (mio_svc_htts_docgi(htts, csck, req, "", mio_htre_getqpath(req)) <= -1) goto oops;
|
||||
const mio_bch_t* qpath = mio_htre_getqpath(req);
|
||||
int x;
|
||||
if (mio_comp_bcstr_limited(qpath, "/thr/", 5, 1) == 0)
|
||||
x = mio_svc_htts_dothr(htts, csck, req, on_htts_thr_request, MIO_NULL);
|
||||
else
|
||||
x = mio_svc_htts_docgi(htts, csck, req, "", mio_htre_getqpath(req));
|
||||
if (x <= -1) goto oops;
|
||||
|
||||
return 0;
|
||||
|
||||
|
@ -446,7 +446,7 @@ static int cgi_peer_htrd_peek (mio_htrd_t* htrd, mio_htre_t* req)
|
||||
cgi_state_t* cgi_state = cgi_peer->state;
|
||||
mio_svc_htts_cli_t* cli = cgi_state->client;
|
||||
mio_bch_t dtbuf[64];
|
||||
int status_code;
|
||||
int status_code = 200;
|
||||
|
||||
if (req->attr.content_length)
|
||||
{
|
||||
@ -456,12 +456,13 @@ static int cgi_peer_htrd_peek (mio_htrd_t* htrd, mio_htre_t* req)
|
||||
|
||||
if (req->attr.status)
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
int is_sober;
|
||||
const mio_bch_t* endptr;
|
||||
mio_intmax_t v;
|
||||
|
||||
status_code = 200;
|
||||
v = mio_bchars_to_intmax(req->attr.status, mio_count_bcstr(req->attr.status), MIO_BCHARS_TO_INTMAX_MAKE_OPTION(0,0,10), &endptr, &is_sober);
|
||||
if (*endptr == '\0' && is_sober && v > 0 && v <= MIO_TYPE_MAX(int)) status_code = v;
|
||||
}
|
||||
|
||||
printf ("CGI PEER HTRD PEEK...\n");
|
||||
mio_svc_htts_fmtgmtime (cli->htts, MIO_NULL, dtbuf, MIO_COUNTOF(dtbuf));
|
||||
|
@ -30,52 +30,953 @@
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
#define THR_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH
|
||||
|
||||
enum thr_state_res_mode_t
|
||||
{
|
||||
THR_STATE_RES_MODE_CHUNKED,
|
||||
THR_STATE_RES_MODE_CLOSE,
|
||||
THR_STATE_RES_MODE_LENGTH
|
||||
};
|
||||
typedef enum thr_state_res_mode_t thr_state_res_mode_t;
|
||||
|
||||
#define THR_STATE_PENDING_IO_THRESHOLD 5
|
||||
|
||||
#define THR_STATE_OVER_READ_FROM_CLIENT (1 << 0)
|
||||
#define THR_STATE_OVER_READ_FROM_PEER (1 << 1)
|
||||
#define THR_STATE_OVER_WRITE_TO_CLIENT (1 << 2)
|
||||
#define THR_STATE_OVER_WRITE_TO_PEER (1 << 3)
|
||||
#define THR_STATE_OVER_ALL (THR_STATE_OVER_READ_FROM_CLIENT | THR_STATE_OVER_READ_FROM_PEER | THR_STATE_OVER_WRITE_TO_CLIENT | THR_STATE_OVER_WRITE_TO_PEER)
|
||||
|
||||
struct thr_func_start_t
|
||||
{
|
||||
mio_t* mio;
|
||||
mio_svc_htts_thr_func_t thr_func;
|
||||
void* thr_ctx;
|
||||
mio_svc_htts_thr_func_info_t tfi;
|
||||
};
|
||||
typedef struct thr_func_start_t thr_func_start_t;
|
||||
|
||||
struct thr_state_t
|
||||
{
|
||||
MIO_SVC_HTTS_RSRC_HEADER;
|
||||
pthread_t thr;
|
||||
mio_svc_htts_thr_func_t func;
|
||||
mio_dev_t* p1; /* change it to pipe */
|
||||
};
|
||||
|
||||
mio_oow_t num_pending_writes_to_client;
|
||||
mio_oow_t num_pending_writes_to_peer;
|
||||
mio_dev_thr_t* peer;
|
||||
mio_htrd_t* peer_htrd;
|
||||
mio_svc_htts_cli_t* client;
|
||||
mio_http_version_t req_version; /* client request */
|
||||
|
||||
unsigned int over: 4; /* must be large enough to accomodate THR_STATE_OVER_ALL */
|
||||
unsigned int keep_alive: 1;
|
||||
unsigned int req_content_length_unlimited: 1;
|
||||
unsigned int ever_attempted_to_write_to_client: 1;
|
||||
unsigned int client_disconnected: 1;
|
||||
mio_oow_t req_content_length; /* client request content length */
|
||||
thr_state_res_mode_t res_mode_to_cli;
|
||||
|
||||
mio_dev_sck_on_read_t client_org_on_read;
|
||||
mio_dev_sck_on_write_t client_org_on_write;
|
||||
mio_dev_sck_on_disconnect_t client_org_on_disconnect;
|
||||
mio_htrd_recbs_t client_htrd_org_recbs;
|
||||
|
||||
|
||||
|
||||
};
|
||||
typedef struct thr_state_t thr_state_t;
|
||||
|
||||
struct thr_peer_xtn_t
|
||||
{
|
||||
thr_state_t* state;
|
||||
};
|
||||
typedef struct thr_peer_xtn_t thr_peer_xtn_t;
|
||||
|
||||
static void thr_state_halt_participating_devices (thr_state_t* thr_state)
|
||||
{
|
||||
MIO_ASSERT (thr_state->client->htts->mio, thr_state->client != MIO_NULL);
|
||||
MIO_ASSERT (thr_state->client->htts->mio, thr_state->client->sck != MIO_NULL);
|
||||
|
||||
MIO_DEBUG4 (thr_state->client->htts->mio, "HTTS(%p) - Halting participating devices in thr state %p(client=%p,peer=%p)\n", thr_state->client->htts, thr_state, thr_state->client->sck, thr_state->peer);
|
||||
|
||||
|
||||
mio_dev_sck_halt (thr_state->client->sck);
|
||||
/* check for peer as it may not have been started */
|
||||
if (thr_state->peer) mio_dev_thr_halt (thr_state->peer);
|
||||
}
|
||||
|
||||
static int thr_state_write_to_client (thr_state_t* thr_state, const void* data, mio_iolen_t dlen)
|
||||
{
|
||||
thr_state->ever_attempted_to_write_to_client = 1;
|
||||
|
||||
thr_state->num_pending_writes_to_client++;
|
||||
if (mio_dev_sck_write(thr_state->client->sck, data, dlen, MIO_NULL, MIO_NULL) <= -1)
|
||||
{
|
||||
thr_state->num_pending_writes_to_client--;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (thr_state->num_pending_writes_to_client > THR_STATE_PENDING_IO_THRESHOLD)
|
||||
{
|
||||
if (mio_dev_thr_read(thr_state->peer, 0) <= -1) return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_state_writev_to_client (thr_state_t* thr_state, mio_iovec_t* iov, mio_iolen_t iovcnt)
|
||||
{
|
||||
thr_state->ever_attempted_to_write_to_client = 1;
|
||||
|
||||
thr_state->num_pending_writes_to_client++;
|
||||
if (mio_dev_sck_writev(thr_state->client->sck, iov, iovcnt, MIO_NULL, MIO_NULL) <= -1)
|
||||
{
|
||||
thr_state->num_pending_writes_to_client--;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (thr_state->num_pending_writes_to_client > THR_STATE_PENDING_IO_THRESHOLD)
|
||||
{
|
||||
if (mio_dev_thr_read(thr_state->peer, 0) <= -1) return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_state_send_final_status_to_client (thr_state_t* thr_state, int status_code, int force_close)
|
||||
{
|
||||
mio_svc_htts_cli_t* cli = thr_state->client;
|
||||
mio_bch_t dtbuf[64];
|
||||
|
||||
mio_svc_htts_fmtgmtime (cli->htts, MIO_NULL, dtbuf, MIO_COUNTOF(dtbuf));
|
||||
|
||||
if (!force_close) force_close = !thr_state->keep_alive;
|
||||
if (mio_becs_fmt(cli->sbuf, "HTTP/%d.%d %d %hs\r\nServer: %hs\r\nDate: %s\r\nConnection: %hs\r\nContent-Length: 0\r\n\r\n",
|
||||
thr_state->req_version.major, thr_state->req_version.minor,
|
||||
status_code, mio_http_status_to_bcstr(status_code),
|
||||
cli->htts->server_name, dtbuf,
|
||||
(force_close? "close": "keep-alive")) == (mio_oow_t)-1) return -1;
|
||||
|
||||
return (thr_state_write_to_client(thr_state, MIO_BECS_PTR(cli->sbuf), MIO_BECS_LEN(cli->sbuf)) <= -1 ||
|
||||
(force_close && thr_state_write_to_client(thr_state, MIO_NULL, 0) <= -1))? -1: 0;
|
||||
}
|
||||
|
||||
|
||||
static int thr_state_write_last_chunk_to_client (thr_state_t* thr_state)
|
||||
{
|
||||
if (!thr_state->ever_attempted_to_write_to_client)
|
||||
{
|
||||
if (thr_state_send_final_status_to_client(thr_state, 500, 0) <= -1) return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (thr_state->res_mode_to_cli == THR_STATE_RES_MODE_CHUNKED &&
|
||||
thr_state_write_to_client(thr_state, "0\r\n\r\n", 5) <= -1) return -1;
|
||||
}
|
||||
|
||||
if (!thr_state->keep_alive && thr_state_write_to_client(thr_state, MIO_NULL, 0) <= -1) return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_state_write_to_peer (thr_state_t* thr_state, const void* data, mio_iolen_t dlen)
|
||||
{
|
||||
thr_state->num_pending_writes_to_peer++;
|
||||
if (mio_dev_thr_write(thr_state->peer, data, dlen, MIO_NULL) <= -1)
|
||||
{
|
||||
thr_state->num_pending_writes_to_peer--;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* TODO: check if it's already finished or something.. */
|
||||
if (thr_state->num_pending_writes_to_peer > THR_STATE_PENDING_IO_THRESHOLD)
|
||||
{
|
||||
if (mio_dev_sck_read(thr_state->client->sck, 0) <= -1) return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static MIO_INLINE void thr_state_mark_over (thr_state_t* thr_state, int over_bits)
|
||||
{
|
||||
unsigned int old_over;
|
||||
|
||||
old_over = thr_state->over;
|
||||
thr_state->over |= over_bits;
|
||||
|
||||
MIO_DEBUG5 (thr_state->htts->mio, "HTTS(%p) - client=%p peer=%p new-bits=%x over=%x\n", thr_state->htts, thr_state->client->sck, thr_state->peer, (int)over_bits, (int)thr_state->over);
|
||||
|
||||
if (!(old_over & THR_STATE_OVER_READ_FROM_CLIENT) && (thr_state->over & THR_STATE_OVER_READ_FROM_CLIENT))
|
||||
{
|
||||
if (mio_dev_sck_read(thr_state->client->sck, 0) <= -1)
|
||||
{
|
||||
MIO_DEBUG2 (thr_state->htts->mio, "HTTS(%p) - halting client(%p) for failure to disable input watching\n", thr_state->htts, thr_state->client->sck);
|
||||
mio_dev_sck_halt (thr_state->client->sck);
|
||||
}
|
||||
}
|
||||
|
||||
if (!(old_over & THR_STATE_OVER_READ_FROM_PEER) && (thr_state->over & THR_STATE_OVER_READ_FROM_PEER))
|
||||
{
|
||||
if (thr_state->peer && mio_dev_thr_read(thr_state->peer, 0) <= -1)
|
||||
{
|
||||
MIO_DEBUG2 (thr_state->htts->mio, "HTTS(%p) - halting peer(%p) for failure to disable input watching\n", thr_state->htts, thr_state->peer);
|
||||
mio_dev_thr_halt (thr_state->peer);
|
||||
}
|
||||
}
|
||||
|
||||
if (old_over != THR_STATE_OVER_ALL && thr_state->over == THR_STATE_OVER_ALL)
|
||||
{
|
||||
/* ready to stop */
|
||||
if (thr_state->peer)
|
||||
{
|
||||
MIO_DEBUG2 (thr_state->htts->mio, "HTTS(%p) - halting peer(%p) as it is unneeded\n", thr_state->htts, thr_state->peer);
|
||||
mio_dev_thr_halt (thr_state->peer);
|
||||
}
|
||||
|
||||
if (thr_state->keep_alive)
|
||||
{
|
||||
/* how to arrange to delete this thr_state object and put the socket back to the normal waiting state??? */
|
||||
MIO_ASSERT (thr_state->htts->mio, thr_state->client->rsrc == (mio_svc_htts_rsrc_t*)thr_state);
|
||||
|
||||
printf ("DETACHING FROM THE MAIN CLIENT RSRC... state -> %p\n", thr_state->client->rsrc);
|
||||
MIO_SVC_HTTS_RSRC_DETACH (thr_state->client->rsrc);
|
||||
/* thr_state must not be access from here down as it could have been destroyed */
|
||||
}
|
||||
else
|
||||
{
|
||||
MIO_DEBUG2 (thr_state->htts->mio, "HTTS(%p) - halting client(%p) for no keep-alive\n", thr_state->htts, thr_state->client->sck);
|
||||
mio_dev_sck_shutdown (thr_state->client->sck, MIO_DEV_SCK_SHUTDOWN_WRITE);
|
||||
mio_dev_sck_halt (thr_state->client->sck);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void thr_state_on_kill (thr_state_t* thr_state)
|
||||
{
|
||||
}
|
||||
|
||||
static void* thr_state_run_func (void* arg)
|
||||
{
|
||||
thr_state_t* thr_state = (thr_state_t*)arg;
|
||||
|
||||
// thr_state->func (thr_state->XXX, thr_state->p1->fd); /* pass the pointer to data that can be accessed safely inside a thread. mostly these must be duplicates of core data */
|
||||
return MIO_NULL;
|
||||
}
|
||||
|
||||
int mio_svc_htts_dothr (mio_svc_htts_t* htts, mio_dev_sck_t* csck, mio_htre_t* req, mio_svc_htts_thr_func_t func)
|
||||
{
|
||||
/*mio_t* mio = htts->mio;*/
|
||||
// mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(csck);
|
||||
thr_state_t* thr_state = MIO_NULL;
|
||||
|
||||
thr_state = (thr_state_t*)mio_svc_htts_rsrc_make(htts, MIO_SIZEOF(*thr_state), thr_state_on_kill);
|
||||
if (MIO_UNLIKELY(!thr_state)) goto oops;
|
||||
|
||||
thr_state->func = func;
|
||||
|
||||
#if 0
|
||||
thr_state->p1 = mio_dev_pipe_make(mio);
|
||||
if (MIO_UNLIKELY(!thr_state->p1)) goto oops;
|
||||
#endif
|
||||
|
||||
if (pthread_create(&thr_state->thr, MIO_NULL, thr_state_run_func, thr_state) != 0)
|
||||
printf ("**** THR_STATE_ON_KILL \n");
|
||||
if (thr_state->peer)
|
||||
{
|
||||
thr_peer_xtn_t* thr_peer = mio_dev_thr_getxtn(thr_state->peer);
|
||||
thr_peer->state = MIO_NULL; /* thr_peer->state many not be NULL if the resource is killed regardless of the reference count */
|
||||
|
||||
mio_dev_thr_kill (thr_state->peer);
|
||||
thr_state->peer = MIO_NULL;
|
||||
}
|
||||
|
||||
if (thr_state->peer_htrd)
|
||||
{
|
||||
thr_peer_xtn_t* thr_peer = mio_htrd_getxtn(thr_state->peer_htrd);
|
||||
thr_peer->state = MIO_NULL; /* thr_peer->state many not be NULL if the resource is killed regardless of the reference count */
|
||||
|
||||
mio_htrd_close (thr_state->peer_htrd);
|
||||
thr_state->peer_htrd = MIO_NULL;
|
||||
}
|
||||
|
||||
if (thr_state->client_org_on_read)
|
||||
{
|
||||
thr_state->client->sck->on_read = thr_state->client_org_on_read;
|
||||
thr_state->client_org_on_read = MIO_NULL;
|
||||
}
|
||||
|
||||
if (thr_state->client_org_on_write)
|
||||
{
|
||||
thr_state->client->sck->on_write = thr_state->client_org_on_write;
|
||||
thr_state->client_org_on_write = MIO_NULL;
|
||||
}
|
||||
|
||||
|
||||
if (thr_state->client_org_on_disconnect)
|
||||
{
|
||||
thr_state->client->sck->on_disconnect = thr_state->client_org_on_disconnect;
|
||||
thr_state->client_org_on_disconnect = MIO_NULL;
|
||||
}
|
||||
|
||||
mio_htrd_setrecbs (thr_state->client->htrd, &thr_state->client_htrd_org_recbs); /* restore the callbacks */
|
||||
|
||||
if (!thr_state->client_disconnected)
|
||||
{
|
||||
printf ("ENABLING INPUT WATCHING on CLIENT %p. \n", thr_state->client->sck);
|
||||
if (!thr_state->keep_alive || mio_dev_sck_read(thr_state->client->sck, 1) <= -1)
|
||||
{
|
||||
MIO_DEBUG2 (thr_state->htts->mio, "HTTS(%p) - halting client(%p) for failure to enable input watching\n", thr_state->htts, thr_state->client->sck);
|
||||
mio_dev_sck_halt (thr_state->client->sck);
|
||||
}
|
||||
}
|
||||
|
||||
printf ("**** THR_STATE_ON_KILL DONE\n");
|
||||
}
|
||||
|
||||
static void thr_peer_on_close (mio_dev_thr_t* thr, mio_dev_thr_sid_t sid)
|
||||
{
|
||||
mio_t* mio = thr->mio;
|
||||
thr_peer_xtn_t* thr_peer = (thr_peer_xtn_t*)mio_dev_thr_getxtn(thr);
|
||||
thr_state_t* thr_state = thr_peer->state;
|
||||
|
||||
if (!thr_state) return; /* thr state already gone */
|
||||
|
||||
switch (sid)
|
||||
{
|
||||
case MIO_DEV_THR_MASTER:
|
||||
MIO_DEBUG2 (mio, "HTTS(%p) - peer %p closing master\n", thr_state->client->htts, thr);
|
||||
thr_state->peer = MIO_NULL; /* clear this peer from the state */
|
||||
|
||||
MIO_ASSERT (mio, thr_peer->state != MIO_NULL);
|
||||
printf ("DETACHING FROM THR PEER DEVICE.....................%p %d\n", thr_peer->state, (int)thr_peer->state->rsrc_refcnt);
|
||||
MIO_SVC_HTTS_RSRC_DETACH (thr_peer->state);
|
||||
|
||||
if (thr_state->peer_htrd)
|
||||
{
|
||||
/* once this peer device is closed, peer's htrd is also never used.
|
||||
* it's safe to detach the extra information attached on the htrd object. */
|
||||
thr_peer = mio_htrd_getxtn(thr_state->peer_htrd);
|
||||
MIO_ASSERT (mio, thr_peer->state != MIO_NULL);
|
||||
printf ("DETACHING FROM THR PEER HTRD.....................%p %d\n", thr_peer->state, (int)thr_peer->state->rsrc_refcnt);
|
||||
MIO_SVC_HTTS_RSRC_DETACH (thr_peer->state);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case MIO_DEV_THR_OUT:
|
||||
MIO_ASSERT (mio, thr_state->peer == thr);
|
||||
MIO_DEBUG3 (mio, "HTTS(%p) - peer %p closing slave[%d]\n", thr_state->client->htts, thr, sid);
|
||||
|
||||
if (!(thr_state->over & THR_STATE_OVER_READ_FROM_PEER))
|
||||
{
|
||||
if (thr_state_write_last_chunk_to_client(thr_state) <= -1)
|
||||
thr_state_halt_participating_devices (thr_state);
|
||||
else
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_READ_FROM_PEER);
|
||||
}
|
||||
break;
|
||||
|
||||
case MIO_DEV_THR_IN:
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_WRITE_TO_PEER);
|
||||
break;
|
||||
|
||||
default:
|
||||
MIO_DEBUG3 (mio, "HTTS(%p) - peer %p closing slave[%d]\n", thr_state->client->htts, thr, sid);
|
||||
/* do nothing */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int thr_peer_on_read (mio_dev_thr_t* thr, const void* data, mio_iolen_t dlen)
|
||||
{
|
||||
mio_t* mio = thr->mio;
|
||||
thr_peer_xtn_t* thr_peer = (thr_peer_xtn_t*)mio_dev_thr_getxtn(thr);
|
||||
thr_state_t* thr_state = thr_peer->state;
|
||||
|
||||
MIO_ASSERT (mio, thr_state != MIO_NULL);
|
||||
|
||||
if (dlen <= -1)
|
||||
{
|
||||
MIO_DEBUG2 (mio, "HTTPS(%p) - read error from peer %p\n", thr_state->client->htts, thr);
|
||||
goto oops;
|
||||
}
|
||||
|
||||
if (dlen == 0)
|
||||
{
|
||||
MIO_DEBUG2 (mio, "HTTPS(%p) - EOF from peer %p\n", thr_state->client->htts, thr);
|
||||
|
||||
if (!(thr_state->over & THR_STATE_OVER_READ_FROM_PEER))
|
||||
{
|
||||
/* the thr script could be misbehaviing.
|
||||
* it still has to read more but EOF is read.
|
||||
* otherwise client_peer_htrd_poke() should have been called */
|
||||
if (thr_state_write_last_chunk_to_client(thr_state) <= -1) goto oops;
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_READ_FROM_PEER);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mio_oow_t rem;
|
||||
|
||||
MIO_ASSERT (mio, !(thr_state->over & THR_STATE_OVER_READ_FROM_PEER));
|
||||
|
||||
if (mio_htrd_feed(thr_state->peer_htrd, data, dlen, &rem) <= -1)
|
||||
{
|
||||
MIO_DEBUG2 (mio, "HTTPS(%p) - unable to feed peer into to htrd - peer %p\n", thr_state->htts, thr);
|
||||
|
||||
if (!thr_state->ever_attempted_to_write_to_client &&
|
||||
!(thr_state->over & THR_STATE_OVER_WRITE_TO_CLIENT))
|
||||
{
|
||||
thr_state_send_final_status_to_client (thr_state, 500, 1); /* don't care about error because it jumps to oops below anyway */
|
||||
}
|
||||
|
||||
goto oops;
|
||||
}
|
||||
|
||||
if (rem > 0)
|
||||
{
|
||||
/* If the script specifies Content-Length and produces longer data, it will come here */
|
||||
printf ("AAAAAAAAAAAAAAAAAa EEEEEXcessive DATA..................\n");
|
||||
/* TODO: or drop this request?? */
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
oops:
|
||||
thr_state_halt_participating_devices (thr_state);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_peer_capture_response_header (mio_htre_t* req, const mio_bch_t* key, const mio_htre_hdrval_t* val, void* ctx)
|
||||
{
|
||||
mio_svc_htts_cli_t* cli = (mio_svc_htts_cli_t*)ctx;
|
||||
|
||||
/* capture a header except Status, Connection, Transfer-Encoding, and Server */
|
||||
if (mio_comp_bcstr(key, "Status", 1) != 0 &&
|
||||
mio_comp_bcstr(key, "Connection", 1) != 0 &&
|
||||
mio_comp_bcstr(key, "Transfer-Encoding", 1) != 0 &&
|
||||
mio_comp_bcstr(key, "Server", 1) != 0 &&
|
||||
mio_comp_bcstr(key, "Date", 1) != 0)
|
||||
{
|
||||
do
|
||||
{
|
||||
if (mio_becs_cat(cli->sbuf, key) == (mio_oow_t)-1 ||
|
||||
mio_becs_cat(cli->sbuf, ": ") == (mio_oow_t)-1 ||
|
||||
mio_becs_cat(cli->sbuf, val->ptr) == (mio_oow_t)-1 ||
|
||||
mio_becs_cat(cli->sbuf, "\r\n") == (mio_oow_t)-1)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
val = val->next;
|
||||
}
|
||||
while (val);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_peer_htrd_peek (mio_htrd_t* htrd, mio_htre_t* req)
|
||||
{
|
||||
thr_peer_xtn_t* thr_peer = mio_htrd_getxtn(htrd);
|
||||
thr_state_t* thr_state = thr_peer->state;
|
||||
mio_svc_htts_cli_t* cli = thr_state->client;
|
||||
mio_bch_t dtbuf[64];
|
||||
int status_code = 200;
|
||||
|
||||
if (req->attr.content_length)
|
||||
{
|
||||
// TOOD: remove content_length if content_length is negative or not numeric.
|
||||
thr_state->res_mode_to_cli = THR_STATE_RES_MODE_LENGTH;
|
||||
}
|
||||
|
||||
if (req->attr.status)
|
||||
{
|
||||
int is_sober;
|
||||
const mio_bch_t* endptr;
|
||||
mio_intmax_t v;
|
||||
|
||||
v = mio_bchars_to_intmax(req->attr.status, mio_count_bcstr(req->attr.status), MIO_BCHARS_TO_INTMAX_MAKE_OPTION(0,0,10), &endptr, &is_sober);
|
||||
if (*endptr == '\0' && is_sober && v > 0 && v <= MIO_TYPE_MAX(int)) status_code = v;
|
||||
}
|
||||
|
||||
printf ("THR PEER HTRD PEEK...\n");
|
||||
mio_svc_htts_fmtgmtime (cli->htts, MIO_NULL, dtbuf, MIO_COUNTOF(dtbuf));
|
||||
|
||||
if (mio_becs_fmt(cli->sbuf, "HTTP/%d.%d %d %hs\r\nServer: %hs\r\nDate: %hs\r\n",
|
||||
thr_state->req_version.major, thr_state->req_version.minor,
|
||||
status_code, mio_http_status_to_bcstr(status_code),
|
||||
cli->htts->server_name, dtbuf) == (mio_oow_t)-1) return -1;
|
||||
|
||||
if (mio_htre_walkheaders(req, thr_peer_capture_response_header, cli) <= -1) return -1;
|
||||
|
||||
switch (thr_state->res_mode_to_cli)
|
||||
{
|
||||
case THR_STATE_RES_MODE_CHUNKED:
|
||||
if (mio_becs_cat(cli->sbuf, "Transfer-Encoding: chunked\r\n") == (mio_oow_t)-1) return -1;
|
||||
/*if (mio_becs_cat(cli->sbuf, "Connection: keep-alive\r\n") == (mio_oow_t)-1) return -1;*/
|
||||
break;
|
||||
|
||||
case THR_STATE_RES_MODE_CLOSE:
|
||||
if (mio_becs_cat(cli->sbuf, "Connection: close\r\n") == (mio_oow_t)-1) return -1;
|
||||
break;
|
||||
|
||||
case THR_STATE_RES_MODE_LENGTH:
|
||||
if (mio_becs_cat(cli->sbuf, (thr_state->keep_alive? "Connection: keep-alive\r\n": "Connection: close\r\n")) == (mio_oow_t)-1) return -1;
|
||||
}
|
||||
|
||||
if (mio_becs_cat(cli->sbuf, "\r\n") == (mio_oow_t)-1) return -1;
|
||||
|
||||
return thr_state_write_to_client(thr_state, MIO_BECS_PTR(cli->sbuf), MIO_BECS_LEN(cli->sbuf));
|
||||
}
|
||||
|
||||
static int thr_peer_htrd_poke (mio_htrd_t* htrd, mio_htre_t* req)
|
||||
{
|
||||
/* client request got completed */
|
||||
thr_peer_xtn_t* thr_peer = mio_htrd_getxtn(htrd);
|
||||
thr_state_t* thr_state = thr_peer->state;
|
||||
|
||||
printf (">> PEER RESPONSE COMPLETED\n");
|
||||
|
||||
if (thr_state_write_last_chunk_to_client(thr_state) <= -1) return -1;
|
||||
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_READ_FROM_PEER);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_peer_htrd_push_content (mio_htrd_t* htrd, mio_htre_t* req, const mio_bch_t* data, mio_oow_t dlen)
|
||||
{
|
||||
thr_peer_xtn_t* thr_peer = mio_htrd_getxtn(htrd);
|
||||
thr_state_t* thr_state = thr_peer->state;
|
||||
|
||||
MIO_ASSERT (thr_state->client->htts->mio, htrd == thr_state->peer_htrd);
|
||||
|
||||
switch (thr_state->res_mode_to_cli)
|
||||
{
|
||||
case THR_STATE_RES_MODE_CHUNKED:
|
||||
{
|
||||
mio_iovec_t iov[3];
|
||||
mio_bch_t lbuf[16];
|
||||
mio_oow_t llen;
|
||||
|
||||
/* mio_fmt_uintmax_to_bcstr() null-terminates the output. only MIO_COUNTOF(lbuf) - 1
|
||||
* is enough to hold '\r' and '\n' at the back without '\0'. */
|
||||
llen = mio_fmt_uintmax_to_bcstr(lbuf, MIO_COUNTOF(lbuf) - 1, dlen, 16 | MIO_FMT_UINTMAX_UPPERCASE, 0, '\0', MIO_NULL);
|
||||
lbuf[llen++] = '\r';
|
||||
lbuf[llen++] = '\n';
|
||||
|
||||
iov[0].iov_ptr = lbuf;
|
||||
iov[0].iov_len = llen;
|
||||
iov[1].iov_ptr = (void*)data;
|
||||
iov[1].iov_len = dlen;
|
||||
iov[2].iov_ptr = "\r\n";
|
||||
iov[2].iov_len = 2;
|
||||
|
||||
if (thr_state_writev_to_client(thr_state, iov, MIO_COUNTOF(iov)) <= -1) goto oops;
|
||||
break;
|
||||
}
|
||||
|
||||
case THR_STATE_RES_MODE_CLOSE:
|
||||
case THR_STATE_RES_MODE_LENGTH:
|
||||
if (thr_state_write_to_client(thr_state, data, dlen) <= -1) goto oops;
|
||||
break;
|
||||
}
|
||||
|
||||
if (thr_state->num_pending_writes_to_client > THR_STATE_PENDING_IO_THRESHOLD)
|
||||
{
|
||||
if (mio_dev_thr_read(thr_state->peer, 0) <= -1) goto oops;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
oops:
|
||||
//if (thr_state) thr_state_halt_particiapting_devices (thr_state);
|
||||
return -1;
|
||||
}
|
||||
|
||||
static mio_htrd_recbs_t thr_peer_htrd_recbs =
|
||||
{
|
||||
thr_peer_htrd_peek,
|
||||
thr_peer_htrd_poke,
|
||||
thr_peer_htrd_push_content
|
||||
};
|
||||
|
||||
static int thr_client_htrd_poke (mio_htrd_t* htrd, mio_htre_t* req)
|
||||
{
|
||||
/* client request got completed */
|
||||
mio_svc_htts_cli_htrd_xtn_t* htrdxtn = (mio_svc_htts_cli_htrd_xtn_t*)mio_htrd_getxtn(htrd);
|
||||
mio_dev_sck_t* sck = htrdxtn->sck;
|
||||
mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(sck);
|
||||
thr_state_t* thr_state = (thr_state_t*)cli->rsrc;
|
||||
|
||||
printf (">> CLIENT REQUEST COMPLETED\n");
|
||||
|
||||
/* indicate EOF to the client peer */
|
||||
if (thr_state_write_to_peer(thr_state, MIO_NULL, 0) <= -1) return -1;
|
||||
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_READ_FROM_CLIENT);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_client_htrd_push_content (mio_htrd_t* htrd, mio_htre_t* req, const mio_bch_t* data, mio_oow_t dlen)
|
||||
{
|
||||
mio_svc_htts_cli_htrd_xtn_t* htrdxtn = (mio_svc_htts_cli_htrd_xtn_t*)mio_htrd_getxtn(htrd);
|
||||
mio_dev_sck_t* sck = htrdxtn->sck;
|
||||
mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(sck);
|
||||
thr_state_t* thr_state = (thr_state_t*)cli->rsrc;
|
||||
|
||||
MIO_ASSERT (sck->mio, cli->sck == sck);
|
||||
return thr_state_write_to_peer(thr_state, data, dlen);
|
||||
}
|
||||
|
||||
static mio_htrd_recbs_t thr_client_htrd_recbs =
|
||||
{
|
||||
MIO_NULL,
|
||||
thr_client_htrd_poke,
|
||||
thr_client_htrd_push_content
|
||||
};
|
||||
|
||||
static int thr_peer_on_write (mio_dev_thr_t* thr, mio_iolen_t wrlen, void* wrctx)
|
||||
{
|
||||
mio_t* mio = thr->mio;
|
||||
thr_peer_xtn_t* thr_peer = (thr_peer_xtn_t*)mio_dev_thr_getxtn(thr);
|
||||
thr_state_t* thr_state = thr_peer->state;
|
||||
|
||||
if (thr_state == MIO_NULL) return 0; /* there is nothing i can do. the thr_state is being cleared or has been cleared already. */
|
||||
|
||||
MIO_ASSERT (mio, thr_state->peer == thr);
|
||||
|
||||
if (wrlen <= -1)
|
||||
{
|
||||
MIO_DEBUG2 (mio, "HTTS(%p) - unable to write to peer %p\n", thr_state->client->htts, thr);
|
||||
goto oops;
|
||||
}
|
||||
else if (wrlen == 0)
|
||||
{
|
||||
/* indicated EOF */
|
||||
/* do nothing here as i didn't incremented num_pending_writes_to_peer when making the write request */
|
||||
|
||||
thr_state->num_pending_writes_to_peer--;
|
||||
MIO_ASSERT (mio, thr_state->num_pending_writes_to_peer == 0);
|
||||
MIO_DEBUG2 (mio, "HTTS(%p) - indicated EOF to peer %p\n", thr_state->client->htts, thr);
|
||||
/* indicated EOF to the peer side. i need no more data from the client side.
|
||||
* i don't need to enable input watching in the client side either */
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_WRITE_TO_PEER);
|
||||
}
|
||||
else
|
||||
{
|
||||
MIO_ASSERT (mio, thr_state->num_pending_writes_to_peer > 0);
|
||||
|
||||
thr_state->num_pending_writes_to_peer--;
|
||||
if (thr_state->num_pending_writes_to_peer == THR_STATE_PENDING_IO_THRESHOLD)
|
||||
{
|
||||
if (!(thr_state->over & THR_STATE_OVER_READ_FROM_CLIENT) &&
|
||||
mio_dev_sck_read(thr_state->client->sck, 1) <= -1) goto oops;
|
||||
}
|
||||
|
||||
if ((thr_state->over & THR_STATE_OVER_READ_FROM_CLIENT) && thr_state->num_pending_writes_to_peer <= 0)
|
||||
{
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_WRITE_TO_PEER);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
oops:
|
||||
thr_state_halt_participating_devices (thr_state);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void thr_client_on_disconnect (mio_dev_sck_t* sck)
|
||||
{
|
||||
mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(sck);
|
||||
thr_state_t* thr_state = (thr_state_t*)cli->rsrc;
|
||||
thr_state->client_disconnected = 1;
|
||||
thr_state->client_org_on_disconnect (sck);
|
||||
}
|
||||
|
||||
static int thr_client_on_read (mio_dev_sck_t* sck, const void* buf, mio_iolen_t len, const mio_skad_t* srcaddr)
|
||||
{
|
||||
mio_t* mio = sck->mio;
|
||||
mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(sck);
|
||||
thr_state_t* thr_state = (thr_state_t*)cli->rsrc;
|
||||
|
||||
MIO_ASSERT (mio, sck == cli->sck);
|
||||
|
||||
if (len <= -1)
|
||||
{
|
||||
/* read error */
|
||||
MIO_DEBUG2 (cli->htts->mio, "HTTPS(%p) - read error on client %p(%d)\n", sck, (int)sck->hnd);
|
||||
goto oops;
|
||||
}
|
||||
|
||||
if (!thr_state->peer)
|
||||
{
|
||||
/* the peer is gone */
|
||||
goto oops; /* do what? just return 0? */
|
||||
}
|
||||
|
||||
if (len == 0)
|
||||
{
|
||||
/* EOF on the client side. arrange to close */
|
||||
MIO_DEBUG3 (mio, "HTTPS(%p) - EOF from client %p(hnd=%d)\n", thr_state->client->htts, sck, (int)sck->hnd);
|
||||
|
||||
if (!(thr_state->over & THR_STATE_OVER_READ_FROM_CLIENT)) /* if this is true, EOF is received without thr_client_htrd_poke() */
|
||||
{
|
||||
if (thr_state_write_to_peer(thr_state, MIO_NULL, 0) <= -1) goto oops;
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_READ_FROM_CLIENT);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mio_oow_t rem;
|
||||
|
||||
MIO_ASSERT (mio, !(thr_state->over & THR_STATE_OVER_READ_FROM_CLIENT));
|
||||
|
||||
if (mio_htrd_feed(cli->htrd, buf, len, &rem) <= -1) goto oops;
|
||||
|
||||
if (rem > 0)
|
||||
{
|
||||
/* TODO store this to client buffer. once the current resource is completed, arrange to call on_read() with it */
|
||||
printf ("UUUUUUUUUUUUUUUUUUUUUUUUUUGGGGGHHHHHHHHHHHH .......... THR CLIENT GIVING EXCESSIVE DATA AFTER CONTENTS...\n");
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
oops:
|
||||
thr_state_halt_participating_devices (thr_state);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thr_client_on_write (mio_dev_sck_t* sck, mio_iolen_t wrlen, void* wrctx, const mio_skad_t* dstaddr)
|
||||
{
|
||||
mio_t* mio = sck->mio;
|
||||
mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(sck);
|
||||
thr_state_t* thr_state = (thr_state_t*)cli->rsrc;
|
||||
|
||||
if (wrlen <= -1)
|
||||
{
|
||||
MIO_DEBUG3 (mio, "HTTPS(%p) - unable to write to client %p(%d)\n", sck->mio, sck, (int)sck->hnd);
|
||||
goto oops;
|
||||
}
|
||||
|
||||
if (wrlen == 0)
|
||||
{
|
||||
/* if the connect is keep-alive, this part may not be called */
|
||||
thr_state->num_pending_writes_to_client--;
|
||||
MIO_ASSERT (mio, thr_state->num_pending_writes_to_client == 0);
|
||||
MIO_DEBUG3 (mio, "HTTS(%p) - indicated EOF to client %p(%d)\n", thr_state->client->htts, sck, (int)sck->hnd);
|
||||
/* since EOF has been indicated to the client, it must not write to the client any further.
|
||||
* this also means that i don't need any data from the peer side either.
|
||||
* i don't need to enable input watching on the peer side */
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_WRITE_TO_CLIENT);
|
||||
}
|
||||
else
|
||||
{
|
||||
MIO_ASSERT (mio, thr_state->num_pending_writes_to_client > 0);
|
||||
|
||||
thr_state->num_pending_writes_to_client--;
|
||||
if (thr_state->peer && thr_state->num_pending_writes_to_client == THR_STATE_PENDING_IO_THRESHOLD)
|
||||
{
|
||||
if (!(thr_state->over & THR_STATE_OVER_READ_FROM_PEER) &&
|
||||
mio_dev_thr_read(thr_state->peer, 1) <= -1) goto oops;
|
||||
}
|
||||
|
||||
if ((thr_state->over & THR_STATE_OVER_READ_FROM_PEER) && thr_state->num_pending_writes_to_client <= 0)
|
||||
{
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_WRITE_TO_CLIENT);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
oops:
|
||||
thr_state_halt_participating_devices (thr_state);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static MIO_INLINE int get_request_content_length (mio_htre_t* req, mio_oow_t* len)
|
||||
{
|
||||
if (req->flags & MIO_HTRE_ATTR_CHUNKED)
|
||||
{
|
||||
/* "Transfer-Encoding: chunked" take precedence over "Content-Length: XXX".
|
||||
*
|
||||
* [RFC7230]
|
||||
* If a message is received with both a Transfer-Encoding and a
|
||||
* Content-Length header field, the Transfer-Encoding overrides the
|
||||
* Content-Length. */
|
||||
return 1; /* unable to determine content-length in advance. unlimited */
|
||||
}
|
||||
|
||||
if (req->flags & MIO_HTRE_ATTR_LENGTH)
|
||||
{
|
||||
*len = req->attr.content_length;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* If no Content-Length is specified in a request, it's Content-Length: 0 */
|
||||
*len = 0;
|
||||
}
|
||||
return 0; /* limited to the length set in *len */
|
||||
}
|
||||
|
||||
static void free_thr_start_info (void* ctx)
|
||||
{
|
||||
thr_func_start_t* tfs = (thr_func_start_t*)ctx;
|
||||
if (tfs->tfi.req_path) mio_freemem (tfs->mio, tfs->tfi.req_path);
|
||||
if (tfs->tfi.req_param) mio_freemem (tfs->mio, tfs->tfi.req_param);
|
||||
mio_freemem (tfs->mio, tfs);
|
||||
}
|
||||
|
||||
static void thr_func (mio_t* mio, mio_dev_thr_iopair_t* iop, void* ctx)
|
||||
{
|
||||
thr_func_start_t* tfs = (thr_func_start_t*)ctx;
|
||||
pthread_cleanup_push (free_thr_start_info, tfs);
|
||||
tfs->thr_func (mio, iop, &tfs->tfi, tfs->thr_ctx);
|
||||
pthread_cleanup_pop (1);
|
||||
}
|
||||
|
||||
int mio_svc_htts_dothr (mio_svc_htts_t* htts, mio_dev_sck_t* csck, mio_htre_t* req, mio_svc_htts_thr_func_t func, void* ctx)
|
||||
{
|
||||
mio_t* mio = htts->mio;
|
||||
mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(csck);
|
||||
thr_state_t* thr_state = MIO_NULL;
|
||||
thr_peer_xtn_t* thr_peer;
|
||||
mio_dev_thr_make_t mi;
|
||||
thr_func_start_t* tfs;
|
||||
|
||||
/* ensure that you call this function before any contents is received */
|
||||
MIO_ASSERT (mio, mio_htre_getcontentlen(req) == 0);
|
||||
|
||||
tfs = mio_callocmem(mio, MIO_SIZEOF(*tfs));
|
||||
if (!tfs) goto oops;
|
||||
|
||||
tfs->mio = mio;
|
||||
tfs->thr_func = func;
|
||||
tfs->thr_ctx = ctx;
|
||||
|
||||
tfs->tfi.req_method = mio_htre_getqmethodtype(req);
|
||||
tfs->tfi.req_version = *mio_htre_getversion(req);
|
||||
tfs->tfi.req_path = mio_dupbcstr(mio, mio_htre_getqpath(req), MIO_NULL);
|
||||
if (!tfs->tfi.req_path) goto oops;
|
||||
if (mio_htre_getqparam(req))
|
||||
{
|
||||
tfs->tfi.req_param = mio_dupbcstr(mio, mio_htre_getqparam(req), MIO_NULL);
|
||||
if (!tfs->tfi.req_param) goto oops;
|
||||
}
|
||||
/* TODO: copy headers.. */
|
||||
tfs->tfi.server_addr = cli->sck->localaddr;
|
||||
tfs->tfi.client_addr = cli->sck->remoteaddr;
|
||||
|
||||
MIO_MEMSET (&mi, 0, MIO_SIZEOF(mi));
|
||||
mi.thr_func = thr_func;
|
||||
mi.thr_ctx = tfs;
|
||||
mi.on_read = thr_peer_on_read;
|
||||
mi.on_write = thr_peer_on_write;
|
||||
mi.on_close = thr_peer_on_close;
|
||||
|
||||
thr_state = (thr_state_t*)mio_svc_htts_rsrc_make(htts, MIO_SIZEOF(*thr_state), thr_state_on_kill);
|
||||
if (MIO_UNLIKELY(!thr_state)) goto oops;
|
||||
|
||||
thr_state->client = cli;
|
||||
/*thr_state->num_pending_writes_to_client = 0;
|
||||
thr_state->num_pending_writes_to_peer = 0;*/
|
||||
thr_state->req_version = *mio_htre_getversion(req);
|
||||
thr_state->req_content_length_unlimited = get_request_content_length(req, &thr_state->req_content_length);
|
||||
|
||||
thr_state->client_org_on_read = csck->on_read;
|
||||
thr_state->client_org_on_write = csck->on_write;
|
||||
thr_state->client_org_on_disconnect = csck->on_disconnect;
|
||||
csck->on_read = thr_client_on_read;
|
||||
csck->on_write = thr_client_on_write;
|
||||
csck->on_disconnect = thr_client_on_disconnect;
|
||||
|
||||
MIO_ASSERT (mio, cli->rsrc == MIO_NULL);
|
||||
MIO_SVC_HTTS_RSRC_ATTACH (thr_state, cli->rsrc);
|
||||
|
||||
thr_state->peer = mio_dev_thr_make(mio, MIO_SIZEOF(*thr_peer), &mi);
|
||||
if (MIO_UNLIKELY(!thr_state->peer)) goto oops;
|
||||
|
||||
tfs = MIO_NULL; /* mark that tfs is delegated to the thread */
|
||||
|
||||
thr_peer = mio_dev_thr_getxtn(thr_state->peer);
|
||||
MIO_SVC_HTTS_RSRC_ATTACH (thr_state, thr_peer->state);
|
||||
|
||||
thr_state->peer_htrd = mio_htrd_open(mio, MIO_SIZEOF(*thr_peer));
|
||||
if (MIO_UNLIKELY(!thr_state->peer_htrd)) goto oops;
|
||||
mio_htrd_setopt (thr_state->peer_htrd, MIO_HTRD_SKIPINITIALLINE | MIO_HTRD_RESPONSE);
|
||||
mio_htrd_setrecbs (thr_state->peer_htrd, &thr_peer_htrd_recbs);
|
||||
|
||||
thr_peer = mio_htrd_getxtn(thr_state->peer_htrd);
|
||||
MIO_SVC_HTTS_RSRC_ATTACH (thr_state, thr_peer->state);
|
||||
|
||||
#if !defined(THR_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH)
|
||||
if (thr_state->req_content_length_unlimited)
|
||||
{
|
||||
/* Transfer-Encoding is chunked. no content-length is known in advance. */
|
||||
|
||||
/* option 1. buffer contents. if it gets too large, send 413 Request Entity Too Large.
|
||||
* option 2. send 411 Length Required immediately
|
||||
* option 3. set Content-Length to -1 and use EOF to indicate the end of content [Non-Standard] */
|
||||
|
||||
if (thr_state_send_final_status_to_client(thr_state, 411, 1) <= -1) goto oops;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (req->flags & MIO_HTRE_ATTR_EXPECT100)
|
||||
{
|
||||
/* TODO: Expect: 100-continue? who should handle this? thr? or the http server? */
|
||||
/* CAN I LET the thr SCRIPT handle this? */
|
||||
if (mio_comp_http_version_numbers(&req->version, 1, 1) >= 0 &&
|
||||
(thr_state->req_content_length_unlimited || thr_state->req_content_length > 0))
|
||||
{
|
||||
/*
|
||||
* Don't send 100 Continue if http verions is lower than 1.1
|
||||
* [RFC7231]
|
||||
* A server that receives a 100-continue expectation in an HTTP/1.0
|
||||
* request MUST ignore that expectation.
|
||||
*
|
||||
* Don't send 100 Continue if expected content lenth is 0.
|
||||
* [RFC7231]
|
||||
* A server MAY omit sending a 100 (Continue) response if it has
|
||||
* already received some or all of the message body for the
|
||||
* corresponding request, or if the framing indicates that there is
|
||||
* no message body.
|
||||
*/
|
||||
mio_bch_t msgbuf[64];
|
||||
mio_oow_t msglen;
|
||||
|
||||
msglen = mio_fmttobcstr(mio, msgbuf, MIO_COUNTOF(msgbuf), "HTTP/%d.%d 100 Continue\r\n\r\n", thr_state->req_version.major, thr_state->req_version.minor);
|
||||
if (thr_state_write_to_client(thr_state, msgbuf, msglen) <= -1) goto oops;
|
||||
thr_state->ever_attempted_to_write_to_client = 0; /* reset this as it's polluted for 100 continue */
|
||||
}
|
||||
}
|
||||
else if (req->flags & MIO_HTRE_ATTR_EXPECT)
|
||||
{
|
||||
/* 417 Expectation Failed */
|
||||
thr_state_send_final_status_to_client(thr_state, 417, 1);
|
||||
goto oops;
|
||||
}
|
||||
|
||||
#if defined(THR_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH)
|
||||
if (thr_state->req_content_length_unlimited)
|
||||
{
|
||||
/* change the callbacks to subscribe to contents to be uploaded */
|
||||
thr_state->client_htrd_org_recbs = *mio_htrd_getrecbs(thr_state->client->htrd);
|
||||
thr_client_htrd_recbs.peek = thr_state->client_htrd_org_recbs.peek;
|
||||
mio_htrd_setrecbs (thr_state->client->htrd, &thr_client_htrd_recbs);
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif
|
||||
if (thr_state->req_content_length > 0)
|
||||
{
|
||||
/* change the callbacks to subscribe to contents to be uploaded */
|
||||
thr_state->client_htrd_org_recbs = *mio_htrd_getrecbs(thr_state->client->htrd);
|
||||
thr_client_htrd_recbs.peek = thr_state->client_htrd_org_recbs.peek;
|
||||
mio_htrd_setrecbs (thr_state->client->htrd, &thr_client_htrd_recbs);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* no content to be uploaded from the client */
|
||||
/* indicate EOF to the peer and disable input wathching from the client */
|
||||
if (thr_state_write_to_peer(thr_state, MIO_NULL, 0) <= -1) goto oops;
|
||||
thr_state_mark_over (thr_state, THR_STATE_OVER_READ_FROM_CLIENT | THR_STATE_OVER_WRITE_TO_PEER);
|
||||
}
|
||||
#if defined(THR_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH)
|
||||
}
|
||||
#endif
|
||||
|
||||
/* this may change later if Content-Length is included in the thr output */
|
||||
if (req->flags & MIO_HTRE_ATTR_KEEPALIVE)
|
||||
{
|
||||
thr_state->keep_alive = 1;
|
||||
thr_state->res_mode_to_cli = THR_STATE_RES_MODE_CHUNKED;
|
||||
/* the mode still can get switched to THR_STATE_RES_MODE_LENGTH if the thr script emits Content-Length */
|
||||
}
|
||||
else
|
||||
{
|
||||
thr_state->keep_alive = 0;
|
||||
thr_state->res_mode_to_cli = THR_STATE_RES_MODE_CLOSE;
|
||||
}
|
||||
|
||||
/* TODO: store current input watching state and use it when destroying the thr_state data */
|
||||
if (mio_dev_sck_read(csck, !(thr_state->over & THR_STATE_OVER_READ_FROM_CLIENT)) <= -1) goto oops;
|
||||
return 0;
|
||||
|
||||
oops:
|
||||
MIO_DEBUG2 (mio, "HTTS(%p) - FAILURE in dothr - socket(%p)\n", htts, csck);
|
||||
if (tfs) free_thr_start_info (tfs);
|
||||
if (thr_state) thr_state_halt_participating_devices (thr_state);
|
||||
return -1;
|
||||
}
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include <mio-ecs.h>
|
||||
#include <mio-sck.h>
|
||||
#include <mio-htre.h>
|
||||
#include <mio-thr.h>
|
||||
|
||||
/** \file
|
||||
* This file provides basic data types and functions for the http protocol.
|
||||
@ -125,11 +126,27 @@ typedef int (*mio_svc_htts_proc_req_t) (
|
||||
);
|
||||
|
||||
/* -------------------------------------------------------------- */
|
||||
struct mio_svc_htts_thr_func_info_t
|
||||
{
|
||||
mio_t* mio;
|
||||
|
||||
typedef int (*mio_svc_htts_thr_func_t) (
|
||||
mio_svc_htts_t* htts,
|
||||
mio_dev_sck_t* sck,
|
||||
mio_htre_t* req
|
||||
mio_http_method_t req_method;
|
||||
mio_http_version_t req_version;
|
||||
mio_bch_t* req_path;
|
||||
mio_bch_t* req_param;
|
||||
|
||||
/* TODO: header table */
|
||||
|
||||
mio_skad_t client_addr;
|
||||
mio_skad_t server_addr;
|
||||
};
|
||||
typedef struct mio_svc_htts_thr_func_info_t mio_svc_htts_thr_func_info_t;
|
||||
|
||||
typedef void (*mio_svc_htts_thr_func_t) (
|
||||
mio_t* mio,
|
||||
mio_dev_thr_iopair_t* iop,
|
||||
mio_svc_htts_thr_func_info_t* info,
|
||||
void* ctx
|
||||
);
|
||||
|
||||
/* -------------------------------------------------------------- */
|
||||
@ -263,7 +280,8 @@ MIO_EXPORT int mio_svc_htts_dothr (
|
||||
mio_svc_htts_t* htts,
|
||||
mio_dev_sck_t* csck,
|
||||
mio_htre_t* req,
|
||||
mio_svc_htts_thr_func_t func
|
||||
mio_svc_htts_thr_func_t func,
|
||||
void* ctx
|
||||
);
|
||||
|
||||
MIO_EXPORT mio_svc_htts_rsrc_t* mio_svc_htts_rsrc_make (
|
||||
|
@ -539,7 +539,7 @@ MIO_EXPORT mio_oow_t mio_count_bcstr (
|
||||
#define MIO_BYTE_TO_BCSTR_RADIXMASK (0xFF)
|
||||
#define MIO_BYTE_TO_BCSTR_LOWERCASE (1 << 8)
|
||||
|
||||
mio_oow_t mio_byte_to_bcstr (
|
||||
MIO_EXPORT mio_oow_t mio_byte_to_bcstr (
|
||||
mio_uint8_t byte,
|
||||
mio_bch_t* buf,
|
||||
mio_oow_t size,
|
||||
@ -549,6 +549,34 @@ mio_oow_t mio_byte_to_bcstr (
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#define MIO_UCHARS_TO_INTMAX_MAKE_OPTION(ltrim,rtrim,base) (((!!(ltrim)) << 2) | ((!!(rtrim)) << 4) | ((base) << 8))
|
||||
#define MIO_UCHARS_TO_INTMAX_GET_OPTION_LTRIM(option) ((option) & 4)
|
||||
#define MIO_UCHARS_TO_INTMAX_GET_OPTION_RTRIM(option) ((option) & 8)
|
||||
#define MIO_UCHARS_TO_INTMAX_GET_OPTION_BASE(option) ((option) >> 8)
|
||||
|
||||
#define MIO_BCHARS_TO_INTMAX_MAKE_OPTION(ltrim,rtrim,base) (((!!(ltrim)) << 2) | ((!!(rtrim)) << 4) | ((base) << 8))
|
||||
#define MIO_BCHARS_TO_INTMAX_GET_OPTION_LTRIM(option) ((option) & 4)
|
||||
#define MIO_BCHARS_TO_INTMAX_GET_OPTION_RTRIM(option) ((option) & 8)
|
||||
#define MIO_BCHARS_TO_INTMAX_GET_OPTION_BASE(option) ((option) >> 8)
|
||||
|
||||
MIO_EXPORT mio_intmax_t mio_uchars_to_intmax (
|
||||
const mio_uch_t* str,
|
||||
mio_oow_t len,
|
||||
int option,
|
||||
const mio_uch_t** endptr,
|
||||
int* is_sober
|
||||
);
|
||||
|
||||
MIO_EXPORT mio_intmax_t mio_bchars_to_intmax (
|
||||
const mio_bch_t* str,
|
||||
mio_oow_t len,
|
||||
int option,
|
||||
const mio_bch_t** endptr,
|
||||
int* is_sober
|
||||
);
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
MIO_EXPORT int mio_ucwidth (
|
||||
mio_uch_t uc
|
||||
);
|
||||
|
193
mio/lib/utl.c
193
mio/lib/utl.c
@ -1132,7 +1132,7 @@ mio_oow_t mio_byte_to_bcstr (mio_uint8_t byte, mio_bch_t* buf, mio_oow_t size, i
|
||||
|
||||
do
|
||||
{
|
||||
mio_uint8_t digit = byte % radix;
|
||||
mio_uint8_t digit = byte % radix;
|
||||
if (digit < 10) *p++ = digit + '0';
|
||||
else *p++ = digit + radix_char - 10;
|
||||
byte /= radix;
|
||||
@ -1155,6 +1155,197 @@ mio_oow_t mio_byte_to_bcstr (mio_uint8_t byte, mio_bch_t* buf, mio_oow_t size, i
|
||||
|
||||
/* ========================================================================= */
|
||||
|
||||
mio_intmax_t mio_uchars_to_intmax (const mio_uch_t* str, mio_oow_t len, int option, const mio_uch_t** endptr, int* is_sober)
|
||||
{
|
||||
mio_intmax_t n = 0;
|
||||
const mio_uch_t* p, * pp;
|
||||
const mio_uch_t* end;
|
||||
mio_oow_t rem;
|
||||
int digit, negative = 0;
|
||||
int base = MIO_UCHARS_TO_INTMAX_GET_OPTION_BASE(option);
|
||||
|
||||
p = str;
|
||||
end = str + len;
|
||||
|
||||
if (MIO_UCHARS_TO_INTMAX_GET_OPTION_LTRIM(option))
|
||||
{
|
||||
/* strip off leading spaces */
|
||||
while (p < end && mio_is_uch_space(*p)) p++;
|
||||
}
|
||||
|
||||
/* check for a sign */
|
||||
while (p < end)
|
||||
{
|
||||
if (*p == '-')
|
||||
{
|
||||
negative = ~negative;
|
||||
p++;
|
||||
}
|
||||
else if (*p == '+') p++;
|
||||
else break;
|
||||
}
|
||||
|
||||
/* check for a binary/octal/hexadecimal notation */
|
||||
rem = end - p;
|
||||
if (base == 0)
|
||||
{
|
||||
if (rem >= 1 && *p == '0')
|
||||
{
|
||||
p++;
|
||||
|
||||
if (rem == 1) base = 8;
|
||||
else if (*p == 'x' || *p == 'X')
|
||||
{
|
||||
p++; base = 16;
|
||||
}
|
||||
else if (*p == 'b' || *p == 'B')
|
||||
{
|
||||
p++; base = 2;
|
||||
}
|
||||
else base = 8;
|
||||
}
|
||||
else base = 10;
|
||||
}
|
||||
else if (rem >= 2 && base == 16)
|
||||
{
|
||||
if (*p == '0' &&
|
||||
(*(p + 1) == 'x' || *(p + 1) == 'X')) p += 2;
|
||||
}
|
||||
else if (rem >= 2 && base == 2)
|
||||
{
|
||||
if (*p == '0' &&
|
||||
(*(p + 1) == 'b' || *(p + 1) == 'B')) p += 2;
|
||||
}
|
||||
|
||||
/* process the digits */
|
||||
pp = p;
|
||||
while (p < end)
|
||||
{
|
||||
if (*p >= '0' && *p <= '9') {
|
||||
digit = *p - '0'; }
|
||||
else if (*p >= 'A' && *p <= 'Z')
|
||||
digit = *p - 'A' + 10;
|
||||
else if (*p >= 'a' && *p <= 'z')
|
||||
digit = *p - 'a' + 10;
|
||||
else break;
|
||||
|
||||
if (digit >= base) break;
|
||||
n = n * base + digit;
|
||||
|
||||
p++;
|
||||
}
|
||||
|
||||
/* base 8: at least a zero digit has been seen.
|
||||
* other case: p > pp to be able to have at least 1 meaningful digit. */
|
||||
if (is_sober) *is_sober = (base == 8 || p > pp);
|
||||
|
||||
if (MIO_UCHARS_TO_INTMAX_GET_OPTION_RTRIM(option))
|
||||
{
|
||||
/* consume trailing spaces */
|
||||
while (p < end && mio_is_uch_space(*p)) p++;
|
||||
}
|
||||
|
||||
if (endptr) *endptr = p;
|
||||
return (negative)? -n: n;
|
||||
}
|
||||
|
||||
mio_intmax_t mio_bchars_to_intmax (const mio_bch_t* str, mio_oow_t len, int option, const mio_bch_t** endptr, int* is_sober)
|
||||
{
|
||||
mio_intmax_t n = 0;
|
||||
const mio_bch_t* p, * pp;
|
||||
const mio_bch_t* end;
|
||||
mio_oow_t rem;
|
||||
int digit, negative = 0;
|
||||
int base = MIO_BCHARS_TO_INTMAX_GET_OPTION_BASE(option);
|
||||
|
||||
p = str;
|
||||
end = str + len;
|
||||
|
||||
if (MIO_BCHARS_TO_INTMAX_GET_OPTION_LTRIM(option))
|
||||
{
|
||||
/* strip off leading spaces */
|
||||
while (p < end && mio_is_bch_space(*p)) p++;
|
||||
}
|
||||
|
||||
/* check for a sign */
|
||||
while (p < end)
|
||||
{
|
||||
if (*p == '-')
|
||||
{
|
||||
negative = ~negative;
|
||||
p++;
|
||||
}
|
||||
else if (*p == '+') p++;
|
||||
else break;
|
||||
}
|
||||
|
||||
/* check for a binary/octal/hexadecimal notation */
|
||||
rem = end - p;
|
||||
if (base == 0)
|
||||
{
|
||||
if (rem >= 1 && *p == '0')
|
||||
{
|
||||
p++;
|
||||
|
||||
if (rem == 1) base = 8;
|
||||
else if (*p == 'x' || *p == 'X')
|
||||
{
|
||||
p++; base = 16;
|
||||
}
|
||||
else if (*p == 'b' || *p == 'B')
|
||||
{
|
||||
p++; base = 2;
|
||||
}
|
||||
else base = 8;
|
||||
}
|
||||
else base = 10;
|
||||
}
|
||||
else if (rem >= 2 && base == 16)
|
||||
{
|
||||
if (*p == '0' &&
|
||||
(*(p + 1) == 'x' || *(p + 1) == 'X')) p += 2;
|
||||
}
|
||||
else if (rem >= 2 && base == 2)
|
||||
{
|
||||
if (*p == '0' &&
|
||||
(*(p + 1) == 'b' || *(p + 1) == 'B')) p += 2;
|
||||
}
|
||||
|
||||
/* process the digits */
|
||||
pp = p;
|
||||
while (p < end)
|
||||
{
|
||||
if (*p >= '0' && *p <= '9')
|
||||
digit = *p - '0';
|
||||
else if (*p >= 'A' && *p <= 'Z')
|
||||
digit = *p - 'A' + 10;
|
||||
else if (*p >= 'a' && *p <= 'z')
|
||||
digit = *p - 'a' + 10;
|
||||
else break;
|
||||
|
||||
if (digit >= base) break;
|
||||
n = n * base + digit;
|
||||
|
||||
p++;
|
||||
}
|
||||
|
||||
/* base 8: at least a zero digit has been seen.
|
||||
* other case: p > pp to be able to have at least 1 meaningful digit. */
|
||||
if (is_sober) *is_sober = (base == 8 || p > pp);
|
||||
|
||||
if (MIO_BCHARS_TO_INTMAX_GET_OPTION_RTRIM(option))
|
||||
{
|
||||
/* consume trailing spaces */
|
||||
while (p < end && mio_is_bch_space(*p)) p++;
|
||||
}
|
||||
|
||||
if (endptr) *endptr = p;
|
||||
return (negative)? -n: n;
|
||||
}
|
||||
|
||||
/* ========================================================================= */
|
||||
|
||||
|
||||
MIO_INLINE int mio_conv_bchars_to_uchars_with_cmgr (
|
||||
const mio_bch_t* bcs, mio_oow_t* bcslen,
|
||||
mio_uch_t* ucs, mio_oow_t* ucslen, mio_cmgr_t* cmgr, int all)
|
||||
|
Loading…
Reference in New Issue
Block a user