Skip to content

Resolve: Expose purpose and sockaddr inside of address #1

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

Open
ReinierMaas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve: Expose purpose and sockaddr inside of address #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions src/easy/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ use std::slice;
use std::str;
use std::time::Duration;

use libc::{c_char, c_double, c_int, c_long, c_ulong, c_void, size_t};
use libc::{c_char, c_double, c_int, c_long, c_uint, c_ulong, c_void, size_t};
use socket2::Socket;
#[cfg(windows)]
use windows_sys::Win32::Networking::WinSock::SOCKADDR;

use crate::easy::form;
use crate::easy::list;
Expand Down Expand Up @@ -271,12 +273,16 @@ pub trait Handler {
/// triggered this callback.
///
/// By default this function opens a standard socket and
/// corresponds to `CURLOPT_OPENSOCKETFUNCTION `.
/// corresponds to `CURLOPT_OPENSOCKETFUNCTION`.
fn open_socket(
&mut self,
_purpose: curl_sys::curlsocktype,
family: c_int,
socktype: c_int,
protocol: c_int,
_address_length: c_uint,
#[cfg(unix)] _address_data: libc::sockaddr,
#[cfg(windows)] _address_data: SOCKADDR,
) -> Option<curl_sys::curl_socket_t> {
// Note that we override this to calling a function in `socket2` to
// ensure that we open all sockets with CLOEXEC. Otherwise if we rely on
Expand Down Expand Up @@ -3651,16 +3657,22 @@ extern "C" fn ssl_ctx_cb<H: Handler>(
res.unwrap_or(curl_sys::CURLE_SSL_CONNECT_ERROR)
}

// TODO: expose `purpose` and `sockaddr` inside of `address`
extern "C" fn opensocket_cb<H: Handler>(
data: *mut c_void,
_purpose: curl_sys::curlsocktype,
purpose: curl_sys::curlsocktype,
address: *mut curl_sys::curl_sockaddr,
) -> curl_sys::curl_socket_t {
let res = panic::catch(|| unsafe {
(*(data as *mut Inner<H>))
.handler
.open_socket((*address).family, (*address).socktype, (*address).protocol)
.open_socket(
purpose,
(*address).family,
(*address).socktype,
(*address).protocol,
(*address).addrlen,
(*address).addr,
)
.unwrap_or(curl_sys::CURL_SOCKET_BAD)
});
res.unwrap_or(curl_sys::CURL_SOCKET_BAD)
Expand Down