Lws refcount fix (#20)

Author: luigikav

Project.toml

@@ -1,6 +1,6 @@
 name = "Libwebsockets"
 uuid = "30a1cee6-c274-443c-b274-d8ea34e8f87d"
-version = "1.2.0"
+version = "1.3.0"
 
 [deps]
 libwebsockets_jll = "b6b84edf-6aef-5ff6-9b66-656961a84a09"

src/types.jl

@@ -45,7 +45,9 @@ export Lws,
     LwsRetryBo,
     LwsDll2,
     LwsStateNotifyLink,
-    LwsSortedUsecList
+    LwsSortedUsecList,
+    LwsTransportClientOps,
+    LwsTransportProxyOps
 
 struct LwsContext end
 struct LwsVhost end
@@ -61,9 +63,10 @@ struct LwsSpa end
 struct LwsAc end
 struct LwsX509Cert end
 struct LwsSslCtxSt end
+struct LwsTransportProxyOps end
+struct LwsTransportClientOps end
 
 Base.@kwdef mutable struct LwsLogCxUnion
-    emit::Ptr{Cvoid} = C_NULL
     emit_cx::Ptr{Cvoid} = C_NULL
 end
 
@@ -91,7 +94,7 @@ end
 
 Base.@kwdef mutable struct LwsAcmeCertAgingArgs
     vh::Ptr{LwsVhost} = C_NULL
-    element_overrides::Ptr{Ptr{Cchar}} = C_NULL# max_len = LWS_TLS_TOTAL_COUNT
+    element_overrides::Ptr{Ptr{Cchar}} = C_NULL # max_len = LWS_TLS_TOTAL_COUNT
 end
 
 Base.@kwdef mutable struct LwsExtOptions
@@ -160,7 +163,7 @@ Base.@kwdef mutable struct LwsPluginEvlib
 end
 
 Base.@kwdef mutable struct LwsTokenLimits
-    token_limit::Vector{Cushort} = fill(Cushort(0), WSI_TOKEN_COUNT)# max_len = WSI_TOKEN_COUNT
+    token_limit::Vector{Cushort} = fill(Cushort(0), WSI_TOKEN_COUNT) # max_len = WSI_TOKEN_COUNT
 end
 
 Base.@kwdef mutable struct LwsHttpMount
@@ -239,7 +242,7 @@ Base.@kwdef mutable struct LwsContextCreationInfo
     max_http_header_data2::Cuint = 0
     max_http_header_pool2::Cuint = 0
     keepalive_timeout::Cint = 0
-    http2_settings::NTuple{7,UInt32} = ntuple(i -> UInt32(0), 7)
+    http2_settings::NTuple{7,UInt32} = ntuple(_ -> UInt32(0), 7)
     max_http_header_data::Cushort = 0
     max_http_header_pool::Cushort = 0
     ssl_private_key_password::Ptr{Cchar} = C_NULL
@@ -287,7 +290,7 @@ Base.@kwdef mutable struct LwsContextCreationInfo
     tls_session_cache_max::Cuint = 0
     gid::Cuint = 0
     uid::Cuint = 0
-    options::Cuintmax_t = 0
+    options::UInt64 = 0
     user::Ptr{Cvoid} = C_NULL
     count_threads::Cuint = 0
     fd_limit_per_thread::Cuint = 0
@@ -311,21 +314,32 @@ Base.@kwdef mutable struct LwsContextCreationInfo
     system_ops::Ptr{LwsSystemOpts} = Ptr{LwsSystemOpts}(C_NULL)
     retry_and_idle_policy::Ptr{LwsRetryBo} = Ptr{LwsRetryBo}(C_NULL)
     register_notifier_list::Ptr{Ptr{LwsStateNotifyLink}} = Ptr{Ptr{LwsStateNotifyLink}}(C_NULL)
+    pss_policies_json::Ptr{Cchar} = C_NULL
+    pss_plugins::Ptr{Ptr{LwsSsPlugin}} = Ptr{Ptr{LwsSsPlugin}}(C_NULL)
+    ss_proxy_bind::Ptr{Cchar} = C_NULL
+    ss_proxy_address::Ptr{Cchar} = C_NULL
+    ss_proxy_port::Cushort = 0
+    txp_ops_ssproxy::Ptr{LwsTransportProxyOps} = Ptr{LwsTransportProxyOps}(C_NULL)
+    txp_ssproxy_info::Ptr{Cvoid} = C_NULL
+    txp_ops_sspc::Ptr{LwsTransportClientOps} = Ptr{LwsTransportClientOps}(C_NULL)
     rlimit_nofile::Cint = 0
     early_smd_cb::Ptr{Cvoid} = C_NULL
     early_smd_opaque::Ptr{Cvoid} = C_NULL
-    early_smd_class_filter::Cint = 0
+    early_smd_class_filter::UInt32 = UInt32(0)
     smd_ttl_us::UInt64 = 0
     smd_queue_depth::Cushort = 0
     fo_listen_queue::Cint = 0
     event_lib_custom::Ptr{LwsPluginEvlib} = C_NULL
     log_cx::Ptr{LwsLogCx} = C_NULL
-    default_loglevel::Cint = 0
-    vh_listen_sockfd::Cint = 0
     http_nsc_filepath::Ptr{Cchar} = C_NULL
     http_nsc_heap_max_footprint::Csize_t = 0
     http_nsc_heap_max_items::Csize_t = 0
     http_nsc_heap_max_payload::Csize_t = 0
+    default_loglevel::Cint = 0
+    vh_listen_sockfd::Cint = 0
+    wol_if::Ptr{Cchar} = C_NULL
+    argc::Cint = 0
+    argv::Ptr{Ptr{Cchar}} = Ptr{Ptr{Cchar}}(C_NULL)
     _unused::NTuple{2,Ptr{Cvoid}} = (Ptr{Nothing}(C_NULL), Ptr{Nothing}(C_NULL))
 end
 
@@ -348,9 +362,9 @@ Base.@kwdef mutable struct LwsClientConnectInfo
     vhost::Ptr{LwsVhost} = C_NULL
     pwsi::Ptr{Ptr{Lws}} = C_NULL
     iface::Ptr{Cchar} = C_NULL
+    local_port::Cint = 0
     local_protocol_name::Ptr{Cchar} = C_NULL
     alpn::Ptr{Cchar} = C_NULL
-    seq::Ptr{LwsSequencer} = C_NULL
     opaque_user_data::Ptr{Cvoid} = C_NULL
     retry_and_idle_policy::Ptr{LwsRetryBo} = C_NULL
     manual_initial_tx_credit::Cint = 0
@@ -360,6 +374,8 @@ Base.@kwdef mutable struct LwsClientConnectInfo
     fi_wsi_name::Ptr{Cchar} = C_NULL
     keep_warm_secs::Cushort = 0
     log_cx::Ptr{LwsLogCx} = C_NULL
+    auth_username::Ptr{Cchar} = C_NULL
+    auth_password::Ptr{Cchar} = C_NULL
     _unused::NTuple{4,Ptr{Cvoid}} = (Ptr{Nothing}(C_NULL), Ptr{Nothing}(C_NULL), Ptr{Nothing}(C_NULL), Ptr{Nothing}(C_NULL))
 end
 
@@ -373,15 +389,15 @@ end
 
 Base.@kwdef mutable struct LwsProcessHtmlState
     start::Ptr{Cchar} = C_NULL
-    swallow::Ptr{Cchar} = C_NULL# max_len = 16
+    swallow::NTuple{16, Cchar} = ntuple(_ -> Cchar('\0'), 16)
     pos::Cint = 0
     data::Ptr{Cvoid} = C_NULL
     vars::Ptr{Ptr{Cchar}} = C_NULL
     count_vars::Cint = 0
     replace::Ptr{Cvoid} = C_NULL
 end
 
-Base.@kwdef mutable struct LwsTokens
+Base.@kwdef mutable struct LwswrTokens
     token::Ptr{Cuchar} = C_NULL
     len::Cint = 0
 end
@@ -404,16 +420,17 @@ Base.@kwdef mutable struct LwsWritePassthru
     wp::Cuint = 0
 end
 
-Base.@kwdef mutable struct LwsTlsCertInfoResults
-    verified::Cuint = 0
-    time::Clong = 0
-    usage::Cuint = 0
+Base.@kwdef struct _ns
     len::Cint = 0
-    name::Ptr{Cchar} = C_NULL
+    name::NTuple{64, Cchar} = ntuple(_ -> Cchar('\0'), 64)
+end
+
+Base.@kwdef mutable struct LwsTlsCertInfoResults
+    ns::_ns = _ns()
 end
 
 Base.@kwdef mutable struct LwsTlsSessionDump
-    tag::Ptr{Cchar} = C_NULL # max_len = LWS_SESSION_TAG_LEN
+    tag::NTuple{96, Cchar} = ntuple(_ -> Cchar('\0'), 96) # LWS_SESSION_TAG_LEN = 96
     blob::Ptr{Cvoid} = C_NULL
     opaque::Ptr{Cvoid} = C_NULL
     blob_len::Csize_t = 0