diff --git a/src/apps/common/ns_turn_utils.c b/src/apps/common/ns_turn_utils.c index 85a1aead..7ca70f86 100644 --- a/src/apps/common/ns_turn_utils.c +++ b/src/apps/common/ns_turn_utils.c @@ -867,11 +867,11 @@ char *turn_strdup_func(const char* s, const char* function, int line) { //////////////////////////////// -int is_secure_username(const u08bits *username) +int is_secure_string(const u08bits *string) { int ret = 0; - if(username) { - unsigned char *s0 = (unsigned char*)turn_strdup((const char*)username); + if(string) { + unsigned char *s0 = (unsigned char*)turn_strdup((const char*)string); unsigned char *s = s0; while(*s) { *s = (unsigned char)tolower((int)*s); @@ -891,4 +891,3 @@ int is_secure_username(const u08bits *username) } ////////////////////////////////////////////////////////////////// - diff --git a/src/apps/common/ns_turn_utils.h b/src/apps/common/ns_turn_utils.h index 809a04c4..d3890d32 100644 --- a/src/apps/common/ns_turn_utils.h +++ b/src/apps/common/ns_turn_utils.h @@ -78,7 +78,7 @@ void rollover_logfile(void); /////////////////////////////////////////////////////// -int is_secure_username(const u08bits *username); +int is_secure_string(const u08bits *string); /////////////////////////////////////////////////////// diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 5611ed51..4c9ced52 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -1790,7 +1790,7 @@ static int adminmain(int argc, char **argv) #endif case 'u': STRCPY(user,optarg); - if(!is_secure_username((u08bits*)user)) { + if(!is_secure_string((u08bits*)user)) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Wrong user name structure or symbols, choose another name: %s\n",user); exit(-1); } diff --git a/src/server/ns_turn_server.c b/src/server/ns_turn_server.c index 008a5e40..36d18b30 100644 --- a/src/server/ns_turn_server.c +++ b/src/server/ns_turn_server.c @@ -1029,7 +1029,7 @@ static int handle_turn_allocate(turn_turnserver *server, } ns_bcopy(value,username,ulen); username[ulen]=0; - if(!is_secure_username(username)) { + if(!is_secure_string(username)) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "%s: wrong username: %s\n", __FUNCTION__, (char*)username); username[0]=0; *err_code = 400; @@ -3383,7 +3383,7 @@ static int check_stun_auth(turn_turnserver *server, ns_bcopy(stun_attr_get_value(sar),usname,alen); usname[alen]=0; - if(!is_secure_username(usname)) { + if(!is_secure_string(usname)) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "%s: wrong username: %s\n", __FUNCTION__, (char*)usname); usname[0]=0; *err_code = 400;