iv-org-mirror
/
lsquic.cr
mirror of https://gitea.invidious.io/iv-org/lsquic.cr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from syeopite/master 

Upgrade to crystal 1.0
This commit is contained in:
syeopite 2021-06-10 04:37:30 -07:00 committed by GitHub
parent 3aab3dd7f1 c417433a47
commit 9eb767d668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shard.yml
View File

@ -1,9 +1,9 @@
name: lsquic
version: 2.23.1
version: 2.24.1
authors:
- Omar Roth <omarroth@protonmail.com>
crystal: 0.36.1
crystal: ">= 0.35.0, < 2.0.0"
license: MIT

55
src/lsquic/client.cr
View File

@ -145,7 +145,6 @@ module QUIC
@read_timeout : Float64?
@socket : UDPSocket?
@stream_ctx : StreamCtx?
@process_fiber : Fiber
def initialize(@host : String, port = nil, tls : Bool | OpenSSL::SSL::Context::Client = false)
check_host_only(@host)
@ -163,7 +162,6 @@ module QUIC
@stream_channel = Channel(StreamCtx?).new(20)
@stream_ctx = nil
@engine_open = false
@process_fiber = Fiber.new { puts "process_fiber started before run_engine" }
end
def run_engine
@ -211,7 +209,7 @@ module QUIC
while stream_ctx = @stream_channel.receive
LibLsquic.conn_set_ctx(conn, Box.box(stream_ctx))
LibLsquic.conn_make_stream(conn)
client_process_conns(engine)
LibLsquic.engine_process_conns(engine)
end
@engine_open = false
LibLsquic.engine_destroy(engine)
@ -219,59 +217,22 @@ module QUIC
@socket = nil
end
@process_fiber = spawn do
loop do
sleep
LibLsquic.engine_process_conns(engine)
diff = 0
# check advisory time
if LibLsquic.engine_earliest_adv_tick(engine, pointerof(diff)) != 0
Crystal::Scheduler.current_fiber.resume_event.add(diff.microseconds)
end
end
end
begin
buffers = [] of Bytes
bytes_read = [] of Int32
buffer = Bytes.new(0x600)
loop do
# wait until the socket has something.
socket.wait_readable
# read available messages from the socket into the buffers.
buffers_read = 0
loop do
if (buffers_read >= buffers.size)
buffers.push(Bytes.new(0x600))
bytes_read.push(0)
end
bytes_read[buffers_read] = LibC.recv(socket.fd, buffers[buffers_read], buffers[buffers_read].size, 0).to_i32
if bytes_read[buffers_read] == -1
if Errno.value == Errno::EAGAIN || Errno.value == Errno::EWOULDBLOCK
# no more messages are currently available to read from the socket.
break
else
raise IO::Error.from_errno("failed to read from socket")
end
end
buffers_read += 1
end
bytes_read = socket.read buffer
break if !@engine_open
buffers[0, buffers_read].zip(bytes_read) do |buffer, bytes|
LibLsquic.engine_packet_in(engine, buffer[0, bytes], bytes, socket.local_address, socket.remote_address, Box.box(socket), 0) if bytes != 0
end
client_process_conns(engine)
LibLsquic.engine_packet_in(engine, buffer[0, bytes_read], bytes_read, socket.local_address, socket.remote_address, Box.box(socket), 0) if bytes_read != 0
LibLsquic.engine_process_conns(engine)
end
@socket.try &.close
@socket = nil
rescue IO::Error
# may have already been closed
ensure
@socket.try &.close
@socket = nil
end
end
def client_process_conns(engine)
Crystal::Scheduler.yield @process_fiber
end
def socket : UDPSocket
socket = @socket
return socket.not_nil! if @socket

BIN
src/lsquic/ext/liblsquic.a
View File

Binary file not shown.

46
src/lsquic/liblsquic.cr
View File

@ -6,7 +6,7 @@ lib LibLsquic
GLOBAL_CLIENT = 1
GLOBAL_SERVER = 2
MAJOR_VERSION = 2
MINOR_VERSION = 23
MINOR_VERSION = 18
PATCH_VERSION = 1
EXPERIMENTAL_Q098 = 0
DEPRECATED_VERSIONS = 0
@ -43,11 +43,7 @@ lib LibLsquic
DF_SPIN = 1
DF_DELAYED_ACKS = 0
DF_TIMESTAMPS = 1
DF_CC_ALGO = 3
LSQUIC_DF_CC_RTT_THRESH = 1500
LSQUIC_DF_DATAGRAMS = 0
LSQUIC_DF_OPTIMISTIC_NAT = 1
LSQUIC_DF_EXT_HTTP_PRIO = 1
DF_CC_ALGO = 1
DF_MAX_UDP_PAYLOAD_SIZE_RX = 0
DF_GREASE_QUIC_BIT = 1
DF_NOPROGRESS_TIMEOUT_SERVER = 60
@ -104,8 +100,6 @@ lib LibLsquic
on_read : (StreamT, Void* -> Void*)
on_write : (StreamT, Void* -> Void*)
on_close : (StreamT, Void* -> Void*)
on_dg_write : (ConnT, Void*, LibC::SizeT -> LibC::SizeT)
on_datagram : (ConnT, Void*, LibC::SizeT -> Void*)
on_hsk_done : (ConnT, HskStatus -> Void*)
on_new_token : (ConnT, UInt8*, LibC::SizeT -> Void*)
on_zero_rtt_info : (ConnT, UInt8*, LibC::SizeT -> Void*)
@ -147,9 +141,6 @@ lib LibLsquic
es_proc_time_thresh : LibC::UInt
es_pace_packets : LibC::Int
es_clock_granularity : LibC::UInt
es_cc_algo : LibC::UInt
es_cc_rtt_thresh : LibC::UInt
es_noprogress_timeout : LibC::UInt
es_init_max_data : LibC::UInt
es_init_max_stream_data_bidi_remote : LibC::UInt
es_init_max_stream_data_bidi_local : LibC::UInt
@ -166,19 +157,12 @@ lib LibLsquic
es_qpack_enc_max_blocked : LibC::UInt
es_ecn : LibC::Int
es_allow_migration : LibC::Int
es_cc_algo : LibC::UInt
es_ql_bits : LibC::Int
es_spin : LibC::Int
es_delayed_acks : LibC::Int
es_timestamps : LibC::Int
es_max_packet_size_rx : LibC::UInt16T
es_grease_quic_bit : LibC::Int
es_dplpmtud : LibC::Int
es_base_plpmtu : LibC::UInt16T
es_max_plpmtu : LibC::UInt16T
es_mtu_probe_timer : LibC::UInt
es_datagrams : LibC::Int
es_optimistic_nat : LibC::Int
es_ext_http_prio : LibC::Int
end
fun engine_init_settings = lsquic_engine_init_settings(x0 : EngineSettings*, engine_flags : LibC::UInt)
@ -190,7 +174,6 @@ lib LibLsquic
local_sa : LibC::Sockaddr*
dest_sa : LibC::Sockaddr*
peer_ctx : Void*
conn_ctx : ConnCtx*
ecn : LibC::Int
end
@ -203,7 +186,7 @@ lib LibLsquic
alias TimeT = LibC::Long
struct PackoutMemIf
pmi_allocate : (Void*, Void*, ConnCtx*, LibC::UShort, LibC::Char -> Void*)
pmi_allocate : (Void*, Void*, LibC::UShort, LibC::Char -> Void*)
pmi_release : (Void*, Void*, Void*, LibC::Char -> Void)
pmi_return : (Void*, Void*, Void*, LibC::Char -> Void)
end
@ -252,7 +235,6 @@ lib LibLsquic
ea_keylog_if : KeylogIf*
ea_keylog_ctx : Void*
ea_alpn : LibC::Char*
ea_generate_scid : (ConnT*, CidT*, LibC::UInt -> Void*)
end
alias PacketsOutF = (Void*, OutSpec*, LibC::UInt -> LibC::Int)
@ -264,7 +246,7 @@ lib LibLsquic
alias StackStX509 = Void
fun engine_new = lsquic_engine_new(engine_flags : LibC::UInt, api : EngineApi*) : EngineT
type EngineT = Void*
fun engine_connect = lsquic_engine_connect(x0 : EngineT, x1 : Version, local_sa : Sockaddr*, peer_sa : Sockaddr*, peer_ctx : Void*, conn_ctx : Void*, hostname : LibC::Char*, base_plpmtu : LibC::UShort, sess_resume : UInt8*, sess_resume_len : LibC::SizeT, token : UInt8*, token_sz : LibC::SizeT) : ConnT
fun engine_connect = lsquic_engine_connect(x0 : EngineT, x1 : Version, local_sa : Sockaddr*, peer_sa : Sockaddr*, peer_ctx : Void*, conn_ctx : Void*, hostname : LibC::Char*, max_packet_size : LibC::UShort, zero_rtt : UInt8*, zero_rtt_len : LibC::SizeT, token : UInt8*, token_sz : LibC::SizeT) : ConnT
enum Version
Lsqver043 = 0
@ -273,10 +255,8 @@ lib LibLsquic
LsqverId27 = 3
LsqverId28 = 4
LsqverId29 = 5
LsqverId30 = 6
LsqverId31 = 7
LsqverVerneg = 8
NLsqver = 9
LsqverVerneg = 6
NLsqver = 7
end
fun engine_packet_in = lsquic_engine_packet_in(x0 : EngineT, packet_in_data : UInt8*, packet_in_size : LibC::SizeT, sa_local : Sockaddr*, sa_peer : Sockaddr*, peer_ctx : Void*, ecn : LibC::Int) : LibC::Int
@ -297,7 +277,6 @@ lib LibLsquic
fun stream_wantwrite = lsquic_stream_wantwrite(s : StreamT, is_want : LibC::Int) : LibC::Int
fun stream_write = lsquic_stream_write(s : StreamT, buf : Void*, len : LibC::SizeT) : LibC::SizeT
fun stream_writev = lsquic_stream_writev(s : StreamT, vec : Iovec*, count : LibC::Int) : LibC::SizeT
fun stream_pwritev = lsquic_stream_pwritev(s : StreamT, preadv : (Void*, Iovec, LibC::Int -> LibC::SizeT), user_data : Void*, n_to_write : LibC::SizeT) : LibC::SizeT
struct Reader
lsqr_read : (Void*, Void*, LibC::SizeT -> LibC::SizeT)
@ -323,21 +302,10 @@ lib LibLsquic
fun stream_push_info = lsquic_stream_push_info(x0 : StreamT, ref_stream_id : StreamIdT*, hdr_set : Void**) : LibC::Int
fun stream_priority = lsquic_stream_priority(s : StreamT) : LibC::UInt
fun stream_set_priority = lsquic_stream_set_priority(s : StreamT, priority : LibC::UInt) : LibC::Int
struct ExtHttpPrio
urgency : UInt8
incremental : LibC::Char
end
fun stream_get_http_prio = lsquic_stream_get_http_prio(s : StreamT, ext_http_prio : ExtHttpPrio* ) : LibC::Int
fun stream_set_http_prio = lsquic_stream_set_http_prio(s : StreamT, ext_http_prio : ExtHttpPrio* ) : LibC::Int
fun stream_conn = lsquic_stream_conn(s : StreamT) : ConnT
fun conn_id = lsquic_conn_id(c : ConnT) : CidT*
fun conn_get_engine = lsquic_conn_get_engine(c : ConnT) : EngineT
fun conn_get_sockaddr = lsquic_conn_get_sockaddr(c : ConnT, local : Sockaddr**, peer : Sockaddr**) : LibC::Int
fun conn_want_datagram_write = lsquic_conn_want_datagram_write(c : ConnT, is_want : LibC::Int) : LibC::Int
fun conn_get_min_datagram_size = lsquic_conn_get_min_datagram_size(c : ConnT) : LibC::SizeT
fun conn_set_min_datagram_size = lsquic_conn_set_min_datagram_size(c : ConnT, sz : LibC::SizeT) : LibC::Int
struct LoggerIf
log_buf : (Void*, LibC::Char*, LibC::SizeT -> LibC::Int)