urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-22 02:11:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Vere side of the %light card reorganization

Browse Source
This commit is contained in:
Elliot Glaysher 2019-02-05 15:51:04 -08:00
parent 6ffbea1071
commit b7c0412224
3 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vere/vere.h
View File

@ -1061,10 +1061,10 @@
void void
u3_http_ef_that(u3_noun tat); u3_http_ef_that(u3_noun tat);
/* u3_http_ef_http_response: send %http-response to http. /* u3_http_ef_http_server: send %http-server to http.
*/ */
void void
u3_http_ef_http_response(c3_l sev_l, u3_http_ef_http_server(c3_l sev_l,
c3_l coq_l, c3_l coq_l,
c3_l seq_l, c3_l seq_l,
u3_noun rep); u3_noun rep);

49
vere/http.c
View File

@ -304,8 +304,9 @@ _http_req_kill(u3_hreq* req_u)
{ {
u3_noun pox = _http_req_to_duct(req_u); u3_noun pox = _http_req_to_duct(req_u);
u3_noun typ = u3i_string("cancel-inbound-request"); u3v_plan(pox, u3nt(u3i_string("http-server"),
u3v_plan(pox, u3nc(typ, u3_nul)); u3i_string("cancel-request"),
u3_nul));
} }
typedef struct _u3_hgen { typedef struct _u3_hgen {
@ -381,16 +382,15 @@ _http_req_dispatch(u3_hreq* req_u, u3_noun req)
req_u->sat_e = u3_rsat_plan; req_u->sat_e = u3_rsat_plan;
u3_noun pox = _http_req_to_duct(req_u); u3_noun pox = _http_req_to_duct(req_u);
u3_noun typ = u3i_string("inbound-request");
//_(req_u->hon_u->htp_u->lop) ? c3__chis : c3__this;
u3v_plan(pox, u3nq(typ, u3v_plan(pox, u3i_cell(u3i_string("http-server"),
u3nq(u3i_string("request"),
req_u->hon_u->htp_u->sec, req_u->hon_u->htp_u->sec,
u3nc(c3__ipv4, u3i_words(1, &req_u->hon_u->ipf_w)), u3nc(c3__ipv4,
req)); u3i_words(1, &req_u->hon_u->ipf_w)),
req)));
} }
/* _http_hgen_dispose(): dispose response generator and buffers /* _http_hgen_dispose(): dispose response generator and buffers
*/ */
static void static void
@ -1553,7 +1553,7 @@ u3_http_ef_thou(c3_l sev_l,
} }
} }
else { else {
u3_noun p_rep, q_rep, r_rep; /* u3_noun p_rep, q_rep, r_rep; */
fprintf(stderr, "Old %%thou not used anymore\n"); fprintf(stderr, "Old %%thou not used anymore\n");
@ -1568,10 +1568,10 @@ u3_http_ef_thou(c3_l sev_l,
u3z(rep); u3z(rep);
} }
/* responds to an incoming %http-response from %light /* responds to an incoming %http-server card from %light
*/ */
void void
u3_http_ef_http_response(c3_l sev_l, u3_http_ef_http_server(c3_l sev_l,
c3_l coq_l, c3_l coq_l,
c3_l seq_l, c3_l seq_l,
u3_noun rep) u3_noun rep)
@ -1581,7 +1581,11 @@ u3_http_ef_http_response(c3_l sev_l,
u3_hreq* req_u; u3_hreq* req_u;
c3_w bug_w = u3C.wag_w & u3o_verbose; c3_w bug_w = u3C.wag_w & u3o_verbose;
if ( !(htp_u = _http_serv_find(sev_l)) ) { if (c3y == u3r_sing(u3i_string("set-config"), u3k(u3h(rep)))) {
// sets server configuration
u3_http_ef_form(u3k(u3t(rep)));
}
else if ( !(htp_u = _http_serv_find(sev_l)) ) {
if ( bug_w ) { if ( bug_w ) {
uL(fprintf(uH, "http: server not found: %x\r\n", sev_l)); uL(fprintf(uH, "http: server not found: %x\r\n", sev_l));
} }
@ -1597,29 +1601,34 @@ u3_http_ef_http_response(c3_l sev_l,
sev_l, coq_l, seq_l)); sev_l, coq_l, seq_l));
} }
} }
else { else if (c3y == u3r_sing(u3i_string("response"), u3k(u3h(rep)))) {
if (c3y == u3r_sing(u3i_string("start"), u3k(u3h(rep)))) { // responds to data
u3_noun response = u3t(rep);
if (c3y == u3r_sing(u3i_string("start"), u3k(u3h(response)))) {
// Separate the %start message into its components. // Separate the %start message into its components.
u3_noun status, headers, data, complete; u3_noun status, headers, data, complete;
if (c3y == u3r_qual(u3t(rep), &status, &headers, &data, &complete)) { if (c3y == u3r_qual(u3t(response), &status, &headers, &data, &complete)) {
_http_start_respond(req_u, u3k(status), u3k(headers), u3k(data), _http_start_respond(req_u, u3k(status), u3k(headers), u3k(data),
u3k(complete)); u3k(complete));
} else { } else {
uL(fprintf(uH, "http: strange %%start response\n")); uL(fprintf(uH, "http: strange %%start response\n"));
} }
} else if (c3y == u3r_sing(u3i_string("continue"), u3k(u3h(rep)))) { } else if (c3y == u3r_sing(u3i_string("continue"), u3k(u3h(response)))) {
// Separate the %continue message into its components. // Separate the %continue message into its components.
u3_noun data, complete; u3_noun data, complete;
if (c3y == u3r_cell(u3t(rep), &data, &complete)) { if (c3y == u3r_cell(u3t(response), &data, &complete)) {
_http_continue_respond(req_u, u3k(data), u3k(complete)); _http_continue_respond(req_u, u3k(data), u3k(complete));
} else { } else {
uL(fprintf(uH, "http: strange %%continue response\n")); uL(fprintf(uH, "http: strange %%continue response\n"));
} }
} else if (c3y == u3r_sing(u3i_string("cancel"), u3k(u3h(rep)))) { } else if (c3y == u3r_sing(u3i_string("cancel"), u3k(u3h(response)))) {
uL(fprintf(uH, "http: %%cancel not handled yet\n"));
} else { } else {
uL(fprintf(uH, "http: strange response\n")); uL(fprintf(uH, "http: strange response\n"));
} }
} else {
uL(fprintf(uH, "http: strange response\n"));
} }
u3z(rep); u3z(rep);
@ -1696,7 +1705,7 @@ _http_serv_start_all(void)
c3_assert( u3_none != non ); c3_assert( u3_none != non );
u3_noun pax = u3nq(u3_blip, c3__http, u3k(u3A->sen), u3_nul); u3_noun pax = u3nq(u3_blip, c3__http, u3k(u3A->sen), u3_nul);
u3v_plan(pax, u3nt(c3__live, non, sec)); u3v_plan(pax, u3nq(u3i_string("http-server"), c3__live, non, sec));
} }
_http_write_ports_file(u3_Host.dir_c); _http_write_ports_file(u3_Host.dir_c);

4
vere/reck.c
View File

@ -141,9 +141,9 @@ _reck_kick_http(u3_noun pox,
if ( c3n == u3du(fav) ) { if ( c3n == u3du(fav) ) {
u3z(pox); u3z(fav); return c3n; u3z(pox); u3z(fav); return c3n;
} }
else if (c3y == u3r_sing(u3i_string("http-response"), u3k(u3h(fav)))) { else if (c3y == u3r_sing(u3i_string("http-server"), u3k(u3h(fav)))) {
p_fav = u3t(fav); p_fav = u3t(fav);
u3_http_ef_http_response(sev_l, coq_l, seq_l, u3k(p_fav)); u3_http_ef_http_server(sev_l, coq_l, seq_l, u3k(p_fav));
u3z(pox); u3z(fav); u3z(pox); u3z(fav);
return c3y; return c3y;