urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-30 22:15:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

adds static libsni (extracted from sniproxy) dependency

Browse Source
This commit is contained in:
Joe Bryan 2018-06-12 13:59:08 -04:00
parent 8c14770e98
commit 9ff2c86a2b
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -19,3 +19,6 @@
[submodule "subprojects/h2o"] [submodule "subprojects/h2o"]
path = subprojects/libh2o path = subprojects/libh2o
url = https://github.com/urbit/h2o.git url = https://github.com/urbit/h2o.git
[submodule "subprojects/libsni"]
path = subprojects/libsni
url = https://github.com/urbit/sniproxy

5
meson.build
View File

@ -306,6 +306,8 @@ softfloat3_dep = dependency('softfloat3', version: '>=3.0.0', fallback: ['softfl
libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep']) libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep'])
libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep']) libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep'])
libsni_dep = dependency('libsni', version: '>=0.5.0', fallback: ['libsni', 'libsni_dep'])
executable('urbit', executable('urbit',
sources : sources, sources : sources,
include_directories : incdir, include_directories : incdir,
@ -321,5 +323,6 @@ dependencies: [openssl_dep,
urbitscrypt_dep, urbitscrypt_dep,
ed25519_dep, ed25519_dep,
murmur3_dep, murmur3_dep,
softfloat3_dep] + os_deps, softfloat3_dep,
libsni_dep] + os_deps,
install: true) install: true)

1
subprojects/libsni Submodule

@ -0,0 +1 @@
Subproject commit a59901c38a67660039ee93a6170a338634d76ec0

5
vere/http.c
View File

@ -18,7 +18,7 @@
#include "vere/vere.h" #include "vere/vere.h"
#include <picohttpparser.h> #include <picohttpparser.h>
// #include <tls.h> #include <tls.h>
static const c3_i TCP_BACKLOG = 16; static const c3_i TCP_BACKLOG = 16;
@ -1574,7 +1574,8 @@ _proxy_parse_host(const uv_buf_t* buf_u, c3_c** hot_c)
static u3_proxy_pars static u3_proxy_pars
_proxy_parse_sni(const uv_buf_t* buf_u, c3_c** hot_c) _proxy_parse_sni(const uv_buf_t* buf_u, c3_c** hot_c)
{ {
c3_i sas_i = 0; //tls_protocol->parse_packet(buf_u->base, buf_u->len, hot_c); c3_i sas_i = parse_tls_header((const uint8_t*)buf_u->base,
buf_u->len, hot_c);
if ( 0 > sas_i ) { if ( 0 > sas_i ) {
switch ( sas_i ) { switch ( sas_i ) {