summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2018-10-30 15:02:18 -0400
committerRyan Dahl <ry@tinyclouds.org>2018-10-30 17:42:19 -0700
commit80b5c614600f8298612497c66b5ac001c6721cc2 (patch)
treefb7680d38b34f86a3efe91535ed681c1376b5382 /src
parent3b4dfd8bb59922f9f5e5d929aad3ffc1f459c5b9 (diff)
Rename FetchReq op to Fetch.
Diffstat (limited to 'src')
-rw-r--r--src/msg.fbs5
-rw-r--r--src/ops.rs7
2 files changed, 6 insertions, 6 deletions
diff --git a/src/msg.fbs b/src/msg.fbs
index ba7031621..f402960a1 100644
--- a/src/msg.fbs
+++ b/src/msg.fbs
@@ -8,7 +8,7 @@ union Any {
Exit,
Environ,
EnvironRes,
- FetchReq,
+ Fetch,
FetchRes,
MakeTempDir,
MakeTempDirRes,
@@ -190,9 +190,10 @@ table EnvPair {
value: string;
}
-table FetchReq {
+table Fetch {
id: uint;
url: string;
+ // TODO Supply request headers:
// header_line: [string];
}
diff --git a/src/ops.rs b/src/ops.rs
index ce123ccd2..e93ec5cf7 100644
--- a/src/ops.rs
+++ b/src/ops.rs
@@ -83,7 +83,7 @@ pub fn dispatch(
msg::Any::Dial => op_dial,
msg::Any::Environ => op_env,
msg::Any::Exit => op_exit,
- msg::Any::FetchReq => op_fetch_req,
+ msg::Any::Fetch => op_fetch,
msg::Any::Listen => op_listen,
msg::Any::MakeTempDir => op_make_temp_dir,
msg::Any::Metrics => op_metrics,
@@ -390,18 +390,17 @@ fn op_env(
))
}
-fn op_fetch_req(
+fn op_fetch(
state: Arc<IsolateState>,
base: &msg::Base,
data: &'static mut [u8],
) -> Box<Op> {
assert_eq!(data.len(), 0);
- let inner = base.inner_as_fetch_req().unwrap();
+ let inner = base.inner_as_fetch().unwrap();
let cmd_id = base.cmd_id();
let id = inner.id();
let url = inner.url().unwrap();
- // FIXME use domain (or use this inside check_net)
if let Err(e) = state.check_net(url) {
return odd_future(e);
}