Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bridging smoltcp and tiny-http #240

Merged
merged 19 commits into from
Jan 14, 2025
Merged

Bridging smoltcp and tiny-http #240

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
86185e2
testing shim with completed functions: bind, accept, and connect
ananyabalagere Nov 26, 2024
bfbf2ef
commiting preliminary test of the tiny-http - smoltcp shim
ananyabalagere Dec 29, 2024
a715901
commiting basic test with tiny-http in main.rs
ananyabalagere Jan 8, 2025
bcf150e
tcplistener and tcpstream types complete
ananyabalagere Jan 10, 2025
760ca2d
Merge branch 'main' into ananya-tiny-http
ananyabalagere Jan 10, 2025
e0ef29d
Merge pull request #2 from ananyabalagere/ananya-tiny-http
ananyabalagere Jan 10, 2025
f52e595
minor change - double checking specific numbers in the code
ananyabalagere Jan 10, 2025
db53e7e
Merge pull request #3 from ananyabalagere/ananya-tiny-http
ananyabalagere Jan 10, 2025
fbc1af7
changed path for git submodule
ananyabalagere Jan 10, 2025
323b975
changed path for git submodule
ananyabalagere Jan 10, 2025
5a11385
changed path for git submodule and took out commented stuff in main.rs
ananyabalagere Jan 10, 2025
2511094
Merge pull request #4 from ananyabalagere/ananya-tiny-http
ananyabalagere Jan 10, 2025
acf0ab6
small changes in cargo.toml and lib.rs within tiny-http
ananyabalagere Jan 11, 2025
ae27c85
Merge pull request #5 from ananyabalagere/ananya-tiny-http
ananyabalagere Jan 11, 2025
8abc47f
update tiny-http cargo.toml
ananyabalagere Jan 11, 2025
f54a176
Merge pull request #6 from ananyabalagere/ananya-tiny-http
ananyabalagere Jan 11, 2025
bb08942
update cargo.toml and xtask build
ananyabalagere Jan 12, 2025
f99d5e2
Merge pull request #7 from ananyabalagere/ananya-tiny-http
ananyabalagere Jan 12, 2025
82fd26f
Merge branch 'twizzler-operating-system:main' into main
ananyabalagere Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
[submodule "src/abi"]
path = src/abi
url = ../../twizzler-operating-system/abi.git
[submodule "src/bin/src/bin/test-tiny-http/src/tiny-http-twizzler"]
path = src/bin/src/bin/test-tiny-http/src/tiny-http-twizzler
url = [email protected]:ClariseTG/tiny-http-twizzler.git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to update this to twizzler-operating-system/tiny-http-twizzler. I just moved the repo, so it should work.

123 changes: 121 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ members = [
"src/bin/devmgr",
"src/bin/etl_twizzler",
"src/bin/mnemosyne",
"src/bin/test-tiny-http",
"src/bin/random_validation",
"src/bin/genrandom",
"src/bin/randtest",
Expand Down Expand Up @@ -53,6 +54,12 @@ initrd = [
"crate:bootstrap",
"crate:init",
"crate:devmgr",
"crate:netmgr",
"crate:nettest",
"crate:pager",
"crate:test-tiny-http",
#"lib:twz-rt",
#"lib:monitor",
"crate:etl_twizzler",
"crate:virtio",
"crate:monitor",
Expand Down
Loading
Loading