diff --git a/examples/etc/turnserver.conf b/examples/etc/turnserver.conf index 02d51b6..f701b20 100644 --- a/examples/etc/turnserver.conf +++ b/examples/etc/turnserver.conf @@ -395,6 +395,13 @@ # #channel-lifetime=600 +# Uncomment to set the permission lifetime. +# Default to 300 secs (5 minutes). +# In production this value MUST not be changed, +# however it can be useful for test purposes. +# +#permission-lifetime=300 + # Certificate file. # Use an absolute path or path relative to the # configuration file. diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 7638014..e7491d6 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -124,7 +124,7 @@ LOW_DEFAULT_PORTS_BOUNDARY,HIGH_DEFAULT_PORTS_BOUNDARY,0,0,0,"", /////////////// stop server //////////////// 0, /////////////// MISC PARAMS //////////////// -0,0,0,0,0,':',0,0,0,0,TURN_CREDENTIALS_NONE,0,0,0,0,0,0, +0,0,0,0,0,':',0,0,0,0,0,TURN_CREDENTIALS_NONE,0,0,0,0,0,0, ///////////// Users DB ////////////// { (TURN_USERDB_TYPE)0, {"\0"}, {0,NULL, {NULL,0}} }, ///////////// CPUs ////////////////// @@ -551,6 +551,8 @@ static char Usage[] = "Usage: turnserver [options]\n" " --max-allocate-lifetime Set the maximum value for the allocation lifetime. Default to 3600 secs.\n" " --channel-lifetime Set the lifetime for channel binding, default to 600 secs.\n" " This value MUST not be changed for production purposes.\n" +" --permission-lifetime Set the value for the lifetime of the permission. Default to 300 secs.\n" +" This MUST not be changed for production purposes.\n" " -S, --stun-only Option to set standalone STUN operation only, all TURN requests will be ignored.\n" " --no-stun Option to suppress STUN functionality, only TURN requests will be processed.\n" " --alternate-server Set the TURN server to redirect the allocate requests (UDP and TCP services).\n" @@ -675,6 +677,7 @@ enum EXTRA_OPTS { STALE_NONCE_OPT, MAX_ALLOCATE_LIFETIME_OPT, CHANNEL_LIFETIME_OPT, + PERMISSION_LIFETIME_OPT, AUTH_SECRET_OPT, DEL_ALL_AUTH_SECRETS_OPT, STATIC_AUTH_SECRET_VAL_OPT, @@ -794,6 +797,7 @@ static const struct myoption long_options[] = { { "stale-nonce", optional_argument, NULL, STALE_NONCE_OPT }, { "max-allocate-lifetime", optional_argument, NULL, MAX_ALLOCATE_LIFETIME_OPT }, { "channel-lifetime", optional_argument, NULL, CHANNEL_LIFETIME_OPT }, + { "permission-lifetime", optional_argument, NULL, PERMISSION_LIFETIME_OPT }, { "stun-only", optional_argument, NULL, 'S' }, { "no-stun", optional_argument, NULL, NO_STUN_OPT }, { "cert", required_argument, NULL, CERT_FILE_OPT }, @@ -1061,6 +1065,9 @@ static void set_option(int c, char *value) case CHANNEL_LIFETIME_OPT: turn_params.channel_lifetime = get_int_value(value, STUN_DEFAULT_CHANNEL_LIFETIME); break; + case PERMISSION_LIFETIME_OPT: + turn_params.permission_lifetime = get_int_value(value, STUN_DEFAULT_PERMISSION_LIFETIME); + break; case MAX_ALLOCATE_TIMEOUT_OPT: TURN_MAX_ALLOCATE_TIMEOUT = atoi(value); TURN_MAX_ALLOCATE_TIMEOUT_STUN_ONLY = atoi(value); diff --git a/src/apps/relay/mainrelay.h b/src/apps/relay/mainrelay.h index 5edce67..bf59940 100644 --- a/src/apps/relay/mainrelay.h +++ b/src/apps/relay/mainrelay.h @@ -287,6 +287,7 @@ typedef struct _turn_params_ { vint stale_nonce; vint max_allocate_lifetime; vint channel_lifetime; + vint permission_lifetime; vint mobility; turn_credential_type ct; int use_auth_secret_with_timestamp; diff --git a/src/apps/relay/netengine.c b/src/apps/relay/netengine.c index d2bcfd7..06cf26c 100644 --- a/src/apps/relay/netengine.c +++ b/src/apps/relay/netengine.c @@ -1635,6 +1635,7 @@ static void setup_relay_server(struct relay_server *rs, ioa_engine_handle e, int &turn_params.stale_nonce, &turn_params.max_allocate_lifetime, &turn_params.channel_lifetime, + &turn_params.permission_lifetime, &turn_params.stun_only, &turn_params.no_stun, &turn_params.alternate_servers_list, diff --git a/src/client/ns_turn_msg_defs.h b/src/client/ns_turn_msg_defs.h index 019c509..867babc 100644 --- a/src/client/ns_turn_msg_defs.h +++ b/src/client/ns_turn_msg_defs.h @@ -64,8 +64,8 @@ #define STUN_MIN_ALLOCATE_LIFETIME STUN_DEFAULT_ALLOCATE_LIFETIME #define STUN_DEFAULT_MAX_ALLOCATE_LIFETIME (3600) #define STUN_DEFAULT_CHANNEL_LIFETIME (600) -#define STUN_PERMISSION_LIFETIME (300) #define STUN_DEFAULT_NONCE_EXPIRATION_TIME (600) +#define STUN_DEFAULT_PERMISSION_LIFETIME (300) /**/ #define STUN_METHOD_BINDING (0x0001) diff --git a/src/server/ns_turn_server.c b/src/server/ns_turn_server.c index 2e371c1..791d207 100644 --- a/src/server/ns_turn_server.c +++ b/src/server/ns_turn_server.c @@ -848,7 +848,7 @@ static int update_turn_permission_lifetime(ts_ur_super_session *ss, turn_permiss if (server) { - if(!time_delta) time_delta = STUN_PERMISSION_LIFETIME; + if(!time_delta) time_delta = *(server->permission_lifetime); tinfo->expiration_time = server->ctime + time_delta; IOA_EVENT_DEL(tinfo->lifetime_ev); @@ -4798,6 +4798,7 @@ void init_turn_server(turn_turnserver* server, vintp stale_nonce, vintp max_allocate_lifetime, vintp channel_lifetime, + vintp permission_lifetime, vintp stun_only, vintp no_stun, turn_server_addrs_list_t *alternate_servers_list, @@ -4855,6 +4856,7 @@ void init_turn_server(turn_turnserver* server, server->stale_nonce = stale_nonce; server->max_allocate_lifetime = max_allocate_lifetime; server->channel_lifetime = channel_lifetime; + server->permission_lifetime = permission_lifetime; server->stun_only = stun_only; server->no_stun = no_stun; diff --git a/src/server/ns_turn_server.h b/src/server/ns_turn_server.h index 3d86a24..e7994b4 100644 --- a/src/server/ns_turn_server.h +++ b/src/server/ns_turn_server.h @@ -117,6 +117,7 @@ struct _turn_turnserver { vintp stale_nonce; vintp max_allocate_lifetime; vintp channel_lifetime; + vintp permission_lifetime; vintp stun_only; vintp no_stun; vintp secure_stun; @@ -188,6 +189,7 @@ void init_turn_server(turn_turnserver* server, vintp stale_nonce, vintp max_allocate_lifetime, vintp channel_lifetime, + vintp permission_lifetime, vintp stun_only, vintp no_stun, turn_server_addrs_list_t *alternate_servers_list,