Add Makefile#170

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

Closed
Thomasdezeeuw wants to merge 8 commits into from
Closed

Add Makefile #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb1c240
Fix compilation on Android
Thomasdezeeuw Dec 26, 2020
b273690
Enable some more functions on Android
Thomasdezeeuw Dec 26, 2020
8790751
Don't borrow from packed struct on NetBSD
Thomasdezeeuw Dec 26, 2020
0d28340
Add Makefile
Thomasdezeeuw Dec 26, 2020
ad74d78
Check all code in rustfmt on CI
Thomasdezeeuw Dec 26, 2020
3bafc48
Add more target to check on CI
Thomasdezeeuw Dec 26, 2020
5ee6f5d
Run CI on current and v0.3.x branches
Thomasdezeeuw Dec 26, 2020
a717456
Test will all combinations of features on CI
Thomasdezeeuw Dec 26, 2020
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
37 changes: 23 additions & 14 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
push:
branches: [ master, v0.3.x ]
pull_request:
branches: [ master, v0.3.x ]
env:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: full

jobs:
test:
Test:
name: Test
runs-on: ${{ matrix.os }}
strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
- name: Install Rust (rustup)
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
shell: bash
- run: cargo test
- run: cargo test --features all
- name: Install cargo-hack
run: cargo install cargo-hack
- name: Run tests
run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update stable && rustup default stable && rustup component add rustfmt
- run: cargo fmt -- --check
- name: Check formatting
run: cargo fmt --all -- --check

check:
Check:
name: Check
runs-on: ubuntu-latest
strategy:
matrix:
target: [x86_64-unknown-redox, x86_64-fuchsia]
target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update nightly && rustup default nightly
- run: rustup target add ${{ matrix.target }}
- run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
- run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
continue-on-error: true
run: rustup update stable && rustup default stable
- name: Install cargo-hack
run: cargo install cargo-hack
- name: Install Target
run: rustup target add ${{ matrix.target }}
- name: Run check:
run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
name: Publish Documentation
runs-on: ubuntu-latest
steps:
Expand Down
30 changes: 30 additions & 0 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
cargo hack test --feature-powerset
cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean
50 changes: 39 additions & 11 deletions src/sys/unix.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
feature = "all",
any(
target_os = "android",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
/// # Notes
///
/// This function is only available on Fuchsia and Linux.
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
libc::AF_INET,
libc::AF_INET6,
libc::AF_UNIX,
#[cfg(any(target_os = "fuchsia", target_os = "linux"))]
#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
libc::AF_PACKET,
libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
///
/// This function is only available on Fuchsia and Linux. On Linux it
/// requires the `CAP_NET_ADMIN` capability.
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub fn mark(&self) -> io::Result<u32> {
unsafe {
getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
///
/// This function is only available on Fuchsia and Linux. On Linux it
/// requires the `CAP_NET_ADMIN` capability.
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub fn set_mark(&self, mark: u32) -> io::Result<()> {
unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
}
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
/// This value gets the socket binded device's interface name.
///
/// This function is only available on Fuchsia and Linux.
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub fn device(&self) -> io::Result<Option<CString>> {
// TODO: replace with `MaybeUninit::uninit_array` once stable.
let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
/// If `interface` is `None` or an empty string it removes the binding.
///
/// This function is only available on Fuchsia and Linux.
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
let (value, len) = if let Some(interface) = interface {
(interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
/// This function is only available on Fuchsia and Linux.
///
/// [`set_freebind`]: Socket::set_freebind
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub fn freebind(&self) -> io::Result<bool> {
unsafe {
getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
/// to bind to it.
///
/// This function is only available on Fuchsia and Linux.
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
feature = "all",
any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
unsafe {
setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
let ip = Ipv4Addr::new(127, 0, 0, 1);
let raw = to_in_addr(&ip);
assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
// NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
let a = raw.s_addr;
assert_eq!(a, 127 << 0 | 1 << 24);
assert_eq!(from_in_addr(raw), ip);

let ip = Ipv4Addr::new(127, 34, 4, 12);
let raw = to_in_addr(&ip);
assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
let a = raw.s_addr;
assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
assert_eq!(from_in_addr(raw), ip);
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add Makefile#170

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

 Closed

Thomasdezeeuw
wants to merge
8
commits into

from

 Closed


Add Makefile
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cb1c240

Fix compilation on Android


Thomasdezeeuw Dec 26, 2020
b273690

Enable some more functions on Android


Thomasdezeeuw Dec 26, 2020
8790751

Don't borrow from packed struct on NetBSD


Thomasdezeeuw Dec 26, 2020
0d28340

Add Makefile


Thomasdezeeuw Dec 26, 2020
ad74d78

Check all code in rustfmt on CI


Thomasdezeeuw Dec 26, 2020
3bafc48

Add more target to check on CI


Thomasdezeeuw Dec 26, 2020
5ee6f5d

Run CI on current and v0.3.x branches


Thomasdezeeuw Dec 26, 2020
a717456

Test will all combinations of features on CI


Thomasdezeeuw Dec 26, 2020

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


37 changes: 23 additions & 14 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
name: CI
on: [push, pull_request]
on:
 push:
 branches: [ master, v0.3.x ]
 pull_request:
 branches: [ master, v0.3.x ]
env:
 CARGO_TERM_COLOR: always
 RUST_BACKTRACE: full

jobs:
test:
Test:
 name: Test
 runs-on: ${{ matrix.os }}
 strategy:
Expand All@@ -32,34 +36,39 @@ jobs:
 - name: Install Rust (rustup)
 run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
 shell: bash
 - run: cargo test
 - run: cargo test --features all
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Run tests
 run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release

rustfmt:
Rustfmt:
 name: Rustfmt
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update stable && rustup default stable && rustup component add rustfmt
 - run: cargo fmt -- --check
 - name: Check formatting
 run: cargo fmt --all -- --check

check:
Check:
 name: Check
 runs-on: ubuntu-latest
 strategy:
 matrix:
 target: [x86_64-unknown-redox, x86_64-fuchsia]
 target: ["aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"]
 steps:
 - uses: actions/checkout@master
 - name: Install Rust
 run: rustup update nightly && rustup default nightly
 - run: rustup target add ${{ matrix.target }}
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --no-default-features
 - run: cargo check --target ${{ matrix.target }} --all-targets --examples --bins --tests --all-features
 continue-on-error: true
 run: rustup update stable && rustup default stable
 - name: Install cargo-hack
 run: cargo install cargo-hack
 - name: Install Target
 run: rustup target add ${{ matrix.target }}
 - name: Run check:
 run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}

publish_docs:
Publish_docs:
 name: Publish Documentation
 runs-on: ubuntu-latest
 steps:
Expand Down

30 changes: 30 additions & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
# Targets available via Rustup that are supported.
TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-fuchsia" "x86_64-pc-windows-msvc" "x86_64-sun-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-linux-gnu" "x86_64-unknown-netbsd" "x86_64-unknown-redox"

test:
	cargo test --all-features

# Test everything for the current OS/architecture and check all targets in
# $TARGETS.
test_all: check_all_targets
	cargo hack test --feature-powerset
	cargo hack test --feature-powerset --release

# Check all targets using all features.
check_all_targets: $(TARGETS)
$(TARGETS):
	cargo hack check --feature-powerset --all-targets --examples --bins --tests --target $@

# Installs all required targets for `check_all_targets`.
install_targets:
	rustup target add $(TARGETS)

# NOTE: when using this command you might want to change the `test` target to
# only run a subset of the tests you're actively working on.
dev:
	find src/ tests/ Makefile Cargo.toml | entr -d -c $(MAKE) test

clean:
	cargo clean

.PHONY: test test_all check_all_targets $(TARGETS) install_targets dev clean

50 changes: 39 additions & 11 deletions
src/sys/unix.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,10 @@
// except according to those terms.

use std::cmp::min;
#[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
#[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
))]
use std::ffi::{CStr, CString};
#[cfg(not(target_os = "redox"))]
use std::io::IoSlice;
Expand DownExpand Up@@ -89,6 +92,7 @@ pub(crate) use libc::{
#[cfg(all(
 feature = "all",
 any(
 target_os = "android",
 target_os = "freebsd",
 target_os = "fuchsia",
 target_os = "linux",
Expand DownExpand Up@@ -162,7 +166,10 @@ impl Domain {
 /// # Notes
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub const PACKET: Domain = Domain(libc::AF_PACKET);
}

Expand All@@ -171,7 +178,7 @@ impl_debug!(
 libc::AF_INET,
 libc::AF_INET6,
 libc::AF_UNIX,
 #[cfg(any(target_os = "fuchsia", target_os = "linux"))]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 libc::AF_PACKET,
 libc::AF_UNSPEC, // = 0.
);
Expand DownExpand Up@@ -887,7 +894,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn mark(&self) -> io::Result<u32> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK).map(|mark| mark as u32)
Expand All@@ -902,7 +912,10 @@ impl crate::Socket {
 ///
 /// This function is only available on Fuchsia and Linux. On Linux it
 /// requires the `CAP_NET_ADMIN` capability.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_mark(&self, mark: u32) -> io::Result<()> {
 unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
 }
Expand All@@ -912,7 +925,10 @@ impl crate::Socket {
 /// This value gets the socket binded device's interface name.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn device(&self) -> io::Result<Option<CString>> {
 // TODO: replace with `MaybeUninit::uninit_array` once stable.
 let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
Expand DownExpand Up@@ -957,7 +973,10 @@ impl crate::Socket {
 /// If `interface` is `None` or an empty string it removes the binding.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
 let (value, len) = if let Some(interface) = interface {
 (interface.as_ptr(), interface.to_bytes_with_nul().len())
Expand DownExpand Up@@ -1021,7 +1040,10 @@ impl crate::Socket {
 /// This function is only available on Fuchsia and Linux.
 ///
 /// [`set_freebind`]: Socket::set_freebind
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn freebind(&self) -> io::Result<bool> {
 unsafe {
 getsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::IP_FREEBIND)
Expand All@@ -1038,7 +1060,10 @@ impl crate::Socket {
 /// to bind to it.
 ///
 /// This function is only available on Fuchsia and Linux.
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
 #[cfg(all(
 feature = "all",
 any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
 pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
 unsafe {
 setsockopt(
Expand DownExpand Up@@ -1088,12 +1113,15 @@ from!(crate::Socket, UnixDatagram);
fn in_addr_convertion() {
 let ip = Ipv4Addr::new(127, 0, 0, 1);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 1 << 24);
 // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 1 << 24);
 assert_eq!(from_in_addr(raw), ip);

 let ip = Ipv4Addr::new(127, 34, 4, 12);
 let raw = to_in_addr(&ip);
 assert_eq!(raw.s_addr, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 let a = raw.s_addr;
 assert_eq!(a, 127 << 0 | 34 << 8 | 4 << 16 | 12 << 24);
 assert_eq!(from_in_addr(raw), ip);
}

Expand Down