working on https

libevent.rpm
mom040267 11 years ago
parent 0aee63f61e
commit 385bb2fe9b
  1. 4
      src/apps/relay/mainrelay.c
  2. 4
      src/apps/relay/mainrelay.h
  3. 4
      src/apps/relay/ns_ioalib_impl.h
  4. 11
      src/apps/relay/turn_admin_server.c

@ -122,9 +122,7 @@ LOW_DEFAULT_PORTS_BOUNDARY,HIGH_DEFAULT_PORTS_BOUNDARY,0,0,0,"",
///////////// Users DB ////////////// ///////////// Users DB //////////////
{ (TURN_USERDB_TYPE)0, {"\0"}, {0,NULL,NULL, {NULL,0}} }, { (TURN_USERDB_TYPE)0, {"\0"}, {0,NULL,NULL, {NULL,0}} },
///////////// CPUs ////////////////// ///////////// CPUs //////////////////
DEFAULT_CPUS_NUMBER, DEFAULT_CPUS_NUMBER
///////////// HTTPS ADMIN SERVER ////
"123"
}; };
//////////////// OpenSSL Init ////////////////////// //////////////// OpenSSL Init //////////////////////

@ -310,10 +310,6 @@ typedef struct _turn_params_ {
unsigned long cpus; unsigned long cpus;
/////// HTTPS SERVER /////
char https_admin_pwd[129];
} turn_params_t; } turn_params_t;
extern turn_params_t turn_params; extern turn_params_t turn_params;

@ -223,6 +223,10 @@ struct _ioa_socket
accept_cb acb; accept_cb acb;
void *acbarg; void *acbarg;
/* <<== RFC 6062 */ /* <<== RFC 6062 */
//Admin server:
int as_ok;
char as_login[17];
char as_realm[STUN_MAX_REALM_SIZE + 1];
}; };
typedef struct _timer_event typedef struct _timer_event

@ -1357,7 +1357,7 @@ int send_turn_session_info(struct turn_session_info* tsi)
/////////// HTTPS ///////////// /////////// HTTPS /////////////
static void write_https_default_page(ioa_socket_handle s) static void write_https_logon_page(ioa_socket_handle s)
{ {
if(s && !ioa_socket_tobeclosed(s)) { if(s && !ioa_socket_tobeclosed(s)) {
//TODO //TODO
@ -1386,19 +1386,20 @@ static void handle_https(ioa_socket_handle s, ioa_network_buffer_handle nbh) {
} }
} }
if(!turn_params.https_admin_pwd[0]) { if(s->as_ok) {
handle_http_echo(s);
} else {
if(nbh) { if(nbh) {
struct http_request* hr = parse_http_request((char*)ioa_network_buffer_data(nbh)); struct http_request* hr = parse_http_request((char*)ioa_network_buffer_data(nbh));
if(!hr) { if(!hr) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "%s: wrong HTTPS request (I cannot parse it)\n", __FUNCTION__); TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "%s: wrong HTTPS request (I cannot parse it)\n", __FUNCTION__);
} else { } else {
//TODO //TODO
write_https_logon_page(s);
s->as_ok = 1;
free_http_request(hr); free_http_request(hr);
} }
} }
write_https_default_page(s); } else {
write_https_logon_page(s);
} }
} }

Loading…
Cancel
Save