christian
/
quicp2p
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

various fixes

This commit is contained in:
Christian Ulrich 2020-11-02 09:59:28 +01:00
parent 1adba05d39
commit 9403c90082
No known key found for this signature in database
GPG Key ID: 8241BE099775A097
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
picotls/openssl.nim
View File

@ -10,16 +10,17 @@ from picotls import
ptls_verify_certificate_t ptls_verify_certificate_t
type type
ptls_openssl_signature_scheme_t {.importc, header: "picotls/openssl.h", bycopy.} = object ptls_openssl_signature_scheme_t* {.importc: "struct st_ptls_openssl_signature_scheme_t",
header: "picotls/openssl.h", bycopy.} = object
scheme_id*: uint16 scheme_id*: uint16
scheme_md*: PEVP_MD scheme_md*: PEVP_MD
ptls_openssl_sign_certificate_t {.importc, header: "picotls/openssl.h", bycopy.} = object ptls_openssl_sign_certificate_t* {.importc, header: "picotls/openssl.h", bycopy.} = object
super*: ptls_sign_certificate_t super*: ptls_sign_certificate_t
key*: EVP_PKEY key*: EVP_PKEY
schemes*: array[4, ptls_openssl_signature_scheme_t] schemes*: array[4, ptls_openssl_signature_scheme_t]
ptls_openssl_verify_certificate_t {.importc, header: "picotls/openssl.h", bycopy.} = object ptls_openssl_verify_certificate_t* {.importc, header: "picotls/openssl.h", bycopy.} = object
super*: ptls_verify_certificate_t super*: ptls_verify_certificate_t
cert_store*: PX509_STORE cert_store*: PX509_STORE

37
quicly/quicly.nim
View File

@ -18,6 +18,10 @@ from ../picotls/picotls import
ptls_hash_algorithm_t, ptls_hash_algorithm_t,
ptls_iovec_t ptls_iovec_t
export
quicly_stream_t,
quicly_stream_id_t
type type
quicly_address_t* {.importc, header: "quicly.h", bycopy.} = object quicly_address_t* {.importc, header: "quicly.h", bycopy.} = object
sa: SockAddr sa: SockAddr
@ -54,33 +58,33 @@ type
appdata*: AppData appdata*: AppData
quicly_stream_open_t* {.importc, header: "quicly.h", bycopy.} = object quicly_stream_open_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_stream_open_t, stream: ptr quicly_stream_t): cint cb*: proc(self: ptr quicly_stream_open_t, stream: ptr quicly_stream_t): cint
{.cdecl.} {.cdecl.}
quicly_receive_datagram_frame_t* {.importc, header: "quicly.h", bycopy.} = object quicly_receive_datagram_frame_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_receive_datagram_frame_t, conn: ptr quicly_conn_t, cb*: proc(self: ptr quicly_receive_datagram_frame_t, conn: ptr quicly_conn_t,
payload: ptls_iovec_t) {.cdecl.} payload: ptls_iovec_t) {.cdecl.}
quicly_closed_by_remote_t* {.importc, header: "quicly.h", bycopy.} = object quicly_closed_by_remote_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_closed_by_remote_t, conn: ptr quicly_conn_t, cb*: proc(self: ptr quicly_closed_by_remote_t, conn: ptr quicly_conn_t,
err: cint, frame_type: uint64, reason: cstring, err: cint, frame_type: uint64, reason: cstring,
reason_len: csize_t) {.cdecl.} reason_len: csize_t) {.cdecl.}
quicly_now_t* {.importc, header: "quicly.h", bycopy.} = object quicly_now_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_now_t): int64 {.cdecl.} cb*: proc(self: ptr quicly_now_t): int64 {.cdecl.}
quicly_save_resumption_token_t* {.importc, header: "quicly.h", bycopy.} = object quicly_save_resumption_token_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_save_resumption_token_t, conn: ptr quicly_conn_t, cb*: proc(self: ptr quicly_save_resumption_token_t, conn: ptr quicly_conn_t,
token: ptls_iovec_t): cint {.cdecl.} token: ptls_iovec_t): cint {.cdecl.}
quicly_generate_resumption_token_t* {.importc, header: "quicly.h", bycopy.} = object quicly_generate_resumption_token_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_generate_resumption_token_t, cb*: proc(self: ptr quicly_generate_resumption_token_t,
conn: ptr quicly_conn_t, buf: ptr ptls_buffer_t, conn: ptr quicly_conn_t, buf: ptr ptls_buffer_t,
token: ptr quicly_address_token_plaintext_t): cint {.cdecl.} token: ptr quicly_address_token_plaintext_t): cint {.cdecl.}
quicly_init_cc_t* {.importc, header: "quicly.h", bycopy.} = object quicly_init_cc_t* {.importc, header: "quicly.h", bycopy.} = object
cb: proc(self: ptr quicly_init_cc_t, cc: ptr quicly_cc_t, initcwnd: uint32, cb*: proc(self: ptr quicly_init_cc_t, cc: ptr quicly_cc_t, initcwnd: uint32,
now: int64) {.cdecl.} now: int64) {.cdecl.}
quicly_max_stream_data_t* {.importc, header: "quicly.h", bycopy.} = object quicly_max_stream_data_t* {.importc, header: "quicly.h", bycopy.} = object
bidi_local*: uint64 bidi_local*: uint64
@ -215,6 +219,9 @@ proc quicly_connect*(conn: ptr ptr quicly_conn_t, server_name: cstring,
resumed_transport_params: ptr quicly_transport_parameters_t): resumed_transport_params: ptr quicly_transport_parameters_t):
cint {.cdecl, importc, header: "quicly.h".} cint {.cdecl, importc, header: "quicly.h".}
proc quicly_amend_ptls_context*(ptls: ptr ptls_context_t)
{.cdecl, importc, header: "quicly.h".}
proc quicly_get_socklen*(sa: ptr SockAddr): SockLen proc quicly_get_socklen*(sa: ptr SockAddr): SockLen
{.cdecl, importc, header: "quicly.h".} {.cdecl, importc, header: "quicly.h".}