Skip to content

[0.2] if_tun.h ioctls for android #4392

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

Merged
merged 1 commit into from
Apr 11, 2025

Conversation

jjanowsk
Copy link
Contributor

@jjanowsk jjanowsk commented Apr 11, 2025

Description

backport #4379
Add missing constants from linux/if_tun.h header on android platform. Mainly ioctl operation codes

Sources

https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/kernel/uapi/linux/if_tun.h;drc=180edefbd287c39caeb9d48784a9a10ac35f3636

Checklist

  • Relevant tests in libc-test/semver have been updated
  • No placeholder or unstable values like *LAST or *MAX are
    included (see #3131)
  • Tested locally (cd libc-test && cargo test --target mytarget);
    especially relevant for platforms that may not be checked in CI

@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2025

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2025

Some changes occurred in the Android module

cc @maurer

@tgross35 tgross35 changed the title if_tun.h ioctls for android [0.2] if_tun.h ioctls for android Apr 11, 2025
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

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

I usually pick up cherry picks before doing a release, but this one was a bit conflict-y so thanks for handling it :)

Add missing constants from linux/if_tun.h header on android platform.
Mainly ioctl operation codes

(backport <rust-lang#4379>)
(cherry picked from commit 610eb02)
@tgross35 tgross35 force-pushed the android_ioctls_0.2 branch from 61fd993 to 8b54b5c Compare April 11, 2025 20:05
@tgross35 tgross35 enabled auto-merge April 11, 2025 20:06
@tgross35 tgross35 added this pull request to the merge queue Apr 11, 2025
Merged via the queue into rust-lang:libc-0.2 with commit ae44b25 Apr 11, 2025
42 of 43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants