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

Jump to bottom

Add aeon to src as a git subtree #7

Merged
merged 247 commits into from
May 23, 2023
Merged

Add aeon to src as a git subtree #7

merged 247 commits into from
May 23, 2023

Conversation

RyanGibb
Copy link
Collaborator

See #5

Vincent Bernardoff and others added 30 commits March 17, 2013 19:37
Initial commit
25bfac6
Refactoring
f4ce492
working version on Linux
4a51130
Remove setnonblock function, it will be done later by Lwt/OCaml if ne…
bb533ac 
…eded
Added a closetun function, renamed tun_opendev to opentun
1300730
@vbmithr
Removed unused variable
6d51aab
@vbmithr
Ship the .mli as well
3451913
@vbmithr
Changes the interface a little
10e92b2
Added an _oasis file
85c56d5
@vbmithr
Code for OSX
a1bcc03
switch to OASIS for now
935883f
Do not install tunctl with oasis
cd67319
Fixed a bug in set_ipv4, now working. Refactored a bit the interface
3aa9432
Added function get_ifnamsiz
7e1f52e
Tidy the test program a bit
dcf1012
Bumped OASIS version to 0.2
7db88a9
Add make_local_hwaddr function
333525f
Renamed Makefile.obuild into Makefile_obuild to avoid conflicting wit…
e04c8b2 
…h .obuild file
Added some more doc
35434cd
@avsm
new CHANGES file
20e798c
@avsm
bump version to 0.3
5d1a245
@avsm
update gitignore for oasis
4c50356
@avsm
add oasis bits for sendfd_test (not built by default due to lwt depen…
eddd310 
…dency)
@avsm
add sendfd test
b31c0a8
@avsm
add non_block test
8885061
@avsm
Fix the returned file descriptor value from the tuntap bindings for M…
e0b258e 
…acOS X.

With this change, both the sendmsg and nonblock tests complete successfully.
@avsm
release 0.4
cfb38fd
close fd on error
c0bf7ca
Generate doc with make doc
4c2f061
Typos/improvements in doc
17d2cd4
pqwy and others added 22 commits October 25, 2022 21:22
@pqwy
ocaml 5.0 compatible
524528c 
Fixes avsm#10.
@pqwy
release
cf049b9
@verbosemode
use Bytes.t as data type for IPv6 addresses
bf9ebb6 
* this addresses issue #16
@hannesm
remove superfluous code
c60bae5
@hannesm
String.of_bytes is only available since 4.13, use Bytes.to_string ins…
4bf4aa5 
…tead
@hannesm
auto-format, and upgrade to ocamlformat 0.25.1
a199bd7
@hannesm
add test case for #113
5c4a09b
@hannesm
add test for V6.to_int64/of_int64 for 0:0:8000::
4b17291
@hannesm
Merge pull request #115 from verbosemode/uintb128
c9bc9b9 
use Bytes.t as data type for IPv6 addresses
@hannesm
changes for 5.4.0
3c8d00a
@RyanGibb
add Ipaddr of_octet functions
2e93b07
@dinosaure
Merge pull request #117 from RyanGibb/ipaddr-octet
2c222f6 
Add `Ipaddr` octet functions
@avsm
release v5.5.0
234c600
@RyanGibb
Squashed 'src/aeon/' content from commit 7c590f3a98
3106619 
git-subtree-dir: src/aeon
git-subtree-split: 7c590f3a982dd5dbb8e9d703083ab3f9862c4ce7
@RyanGibb
Merge commit '31066192f439a83780d829ddb75b0049af4b617f' as 'src/aeon'
e102e09
@RyanGibb
LOG: add aeon
3334d83
@RyanGibb
remove aeon vendored deps
d7d6fe9
@RyanGibb
add packet callback
36a2133
@RyanGibb
Merge commit '234c6009a221e23a7dd4883756e6b2cc0d7c663b' into aeon-src3
5edf02a
@RyanGibb
Add 'lib/tuntap/' from commit '2b377e4a44686aad23ecfdede41bd6902a26de6b'
1b4ac0f 
git-subtree-dir: lib/tuntap
git-subtree-mainline: 5edf02a
git-subtree-split: 2b377e4
@RyanGibb
Add 'lib/lru/' from commit 'cf049b90bfc5a36ad2c5fb01cf5bd04de80766e7'
de1f076 
git-subtree-dir: lib/lru
git-subtree-mainline: 1b4ac0f
git-subtree-split: cf049b9
@RyanGibb
replace Eio_unix.FD.as_socket with Eio_unix.import_socket_stream
48b4cce
@RyanGibb RyanGibb mentioned this pull request May 22, 2023
Closed
@RyanGibb
Copy link
Collaborator Author

Required:

@RyanGibb
Copy link
Collaborator Author

Should I be squashing git subtree operations? Updating ipaddr seems to have pulled in a lot of commits

@avsm
Copy link
Owner

avsm commented May 23, 2023

No need -- the fun of subtree is that it keeps all the intermediate commits of the subtrees!

@avsm avsm merged commit 2f652b7 into avsm:main May 23, 2023
@RyanGibb
Copy link
Collaborator Author

It looks like this has broken the macos build due to shell over DNS (SoD)'s dependency on Eio_linux for process support.

Using cross platform support should fix this, but I should probably also upstream the PTY bindings.

@RyanGibb RyanGibb mentioned this pull request May 23, 2023
Merged
avsm pushed a commit that referenced this pull request May 24, 2023
@anmonteiro
Don't use Thread.create or Eio_unix.run_in_systhread (#7)
8b3b983 
* Don't use `Thread.create` or `Eio_unix.run_in_systhread`

* update flake

* no cachix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.