From a0ddb8524579c2e05f7829daaab4eac81d853bc7 Mon Sep 17 00:00:00 2001 From: mom040267 Date: Mon, 15 Dec 2014 02:49:37 +0000 Subject: [PATCH] ALPN fixes --- src/apps/relay/mainrelay.c | 4 ++-- src/apps/uclient/startuclient.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 3133dc3..6176813 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -2357,12 +2357,12 @@ static int ServerALPNCallback(SSL *s, unsigned char current_len = *ptr; if(ptr+1+current_len > in+inlen) break; - if((current_len == sa_len) && (memcmp(ptr+1,STUN_ALPN,sa_len)==0)) { + if((!turn_params.no_stun) && (current_len == sa_len) && (memcmp(ptr+1,STUN_ALPN,sa_len)==0)) { *out = ptr+1; *outlen = sa_len; return SSL_TLSEXT_ERR_OK; } - if((current_len == ta_len) && (memcmp(ptr+1,TURN_ALPN,ta_len)==0)) { + if((!turn_params.stun_only) && (current_len == ta_len) && (memcmp(ptr+1,TURN_ALPN,ta_len)==0)) { *out = ptr+1; *outlen = ta_len; return SSL_TLSEXT_ERR_OK; diff --git a/src/apps/uclient/startuclient.c b/src/apps/uclient/startuclient.c index 823434b..38ab87b 100644 --- a/src/apps/uclient/startuclient.c +++ b/src/apps/uclient/startuclient.c @@ -51,7 +51,7 @@ static int allocate_rtcp = 0; static const int never_allocate_rtcp = 0; #if ALPN_SUPPORTED -static const unsigned char kALPNProtos[] = "\x09stun.turn\x12stun.nat-discovery"; +static const unsigned char kALPNProtos[] = "\x08http/1.1\x09stun.turn\x12stun.nat-discovery"; static const size_t kALPNProtosLen = sizeof(kALPNProtos) - 1; #endif