Fix: use websockets without OpenSSL / TLS.

Signed-off-by: Tifaifai Maupiti <tifaifai.maupiti@gmail.com>
pull/567/merge
Tifaifai Maupiti 8 years ago committed by Roger Light
parent 8676cc0359
commit f2376551bc

@ -183,12 +183,14 @@ static int callback_mqtt(struct libwebsocket_context *context,
mosq->ws_context = context; mosq->ws_context = context;
#endif #endif
mosq->wsi = wsi; mosq->wsi = wsi;
#ifdef WITH_TLS
if(in){ if(in){
mosq->ssl = (SSL *)in; mosq->ssl = (SSL *)in;
if(!mosq->listener->ssl_ctx){ if(!mosq->listener->ssl_ctx){
mosq->listener->ssl_ctx = SSL_get_SSL_CTX(mosq->ssl); mosq->listener->ssl_ctx = SSL_get_SSL_CTX(mosq->ssl);
} }
} }
#endif
u->mosq = mosq; u->mosq = mosq;
}else{ }else{
return -1; return -1;
@ -222,7 +224,9 @@ static int callback_mqtt(struct libwebsocket_context *context,
mosq->pollfd_index = -1; mosq->pollfd_index = -1;
} }
mosq->wsi = NULL; mosq->wsi = NULL;
#ifdef WITH_TLS
mosq->ssl = NULL; mosq->ssl = NULL;
#endif
do_disconnect(db, mosq); do_disconnect(db, mosq);
} }
break; break;

Loading…
Cancel
Save