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.

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

Add socket timeout and ttl support in sys::redox #38707

Merged
merged 3 commits into from
Jan 4, 2017

Conversation

jackpot51
Copy link
Contributor

This adds support for read_timeout, write_timeout, and ttl on TcpStream, TcpListener, and UdpSocket in the sys::redox module.

The DNS lookup has been set to use a 5 second timeout by default.

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@jackpot51 jackpot51 changed the title Add socket timeout and ttl support Add socket timeout and ttl support in sys::redox Dec 30, 2016
@brson brson assigned brson and unassigned aturon Jan 3, 2017
@brson
Copy link
Contributor

brson commented Jan 3, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Jan 3, 2017

📌 Commit 57950fa has been approved by brson

@jackpot51
Copy link
Contributor Author

Thanks!

@bors
Copy link
Contributor

bors commented Jan 3, 2017

⌛ Testing commit 57950fa with merge 4bd7830...

bors added a commit that referenced this pull request Jan 3, 2017
Add socket timeout and ttl support in `sys::redox`

This adds support for `read_timeout`, `write_timeout`, and `ttl` on `TcpStream`, `TcpListener`, and `UdpSocket` in the `sys::redox` module.

The DNS lookup has been set to use a 5 second timeout by default.
"-Wl,-z,noexecstack".to_string(),

// Static link
"-static".to_string()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't need these extra arguments anymore.

"-static".to_string()
],
late_link_args: vec![
"-lc".to_string(),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't need these extra arguments anymore. -lc and -lm will be specified by the cross compiler

],
executables: true,
relocation_model: "static".to_string(),
disable_redzone: true,
eliminate_frame_pointer: false,
target_family: None,
linker_is_gnu: true,
no_default_libraries: true,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Default libraries will be added by the cross compiler

@jackpot51
Copy link
Contributor Author

@brson I made one more change - to setup rustc correctly for use with a cross compiler. https://github.com/rust-lang/rust/pull/38707/files#diff-7e2418069cfc6bf086cd8495d2a90af7

@brson
Copy link
Contributor

brson commented Jan 3, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Jan 3, 2017

📌 Commit c6858a1 has been approved by brson

@jackpot51
Copy link
Contributor Author

Thanks @brson!

@bors
Copy link
Contributor

bors commented Jan 4, 2017

⌛ Testing commit c6858a1 with merge 01677ee...

bors added a commit that referenced this pull request Jan 4, 2017
Add socket timeout and ttl support in `sys::redox`

This adds support for `read_timeout`, `write_timeout`, and `ttl` on `TcpStream`, `TcpListener`, and `UdpSocket` in the `sys::redox` module.

The DNS lookup has been set to use a 5 second timeout by default.
@bors
Copy link
Contributor

bors commented Jan 4, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing 01677ee to master...

@bors bors merged commit c6858a1 into rust-lang:master Jan 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants