Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/save name in auth check #119

Merged
merged 6 commits into from
May 18, 2020
Merged

Feature/save name in auth check #119

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8631e9
Save name in auth_check.
kirill-scherba May 13, 2020
1a5b0b0
Does not remove the same user in L0
kirill-scherba May 13, 2020
7f71604
Simplify condition in auth_check
kirill-scherba May 13, 2020
b26cbe1
The 'already connected' message updated
kirill-scherba May 13, 2020
46ff169
Version updated to v0.3.20-dev-1
kirill-scherba May 13, 2020
9f35c18
Save strdup buffer length in L0 chaech_auth function
kirill-scherba May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/modules/l0-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,26 +621,28 @@ void _send_subscribe_events(ksnetEvMgrClass *ke, const char *name,
static void ksnLNullClientAuthCheck(ksnLNullClass *kl, ksnLNullData *kld,
int fd, teoLNullCPacket *packet) {

kld->name = strdup(packet->peer_name + packet->peer_name_length);
kld->name_length = strlen(kld->name) + 1;
if(kld->name_length == packet->data_length) {
char *name = strdup(packet->peer_name + packet->peer_name_length);
kirill-scherba marked this conversation as resolved.
Show resolved Hide resolved
size_t name_length = strlen(name) + 1;
kirill-scherba marked this conversation as resolved.
Show resolved Hide resolved
if(name_length == packet->data_length) {

// Create unique name for WG new user
if(!strcmp(WG001_NEW, kld->name)) {
kld->name = ksnet_sformatMessage(kld->name, "%s%s-%d", kld->name, ksnetEvMgrGetHostName(kl->ke),fd);
kld->name_length = strlen(kld->name) + 1;
if(!strcmp(WG001_NEW, name)) {
name = ksnet_sformatMessage(name, "%s%s-%d", name, ksnetEvMgrGetHostName(kl->ke),fd);
name_length = strlen(name) + 1;
}

// Remove client with the same name
int fd_ex;
if((fd_ex = ksnLNullClientIsConnected(kl, kld->name))) {
if((fd_ex = ksnLNullClientIsConnected(kl, name))) {
#ifdef DEBUG_KSNET
ksn_printf(kev, MODULE, DEBUG,"User with name(id): %s is already connected, fd: %d\n", kld->name, fd_ex);
ksn_printf(kev, MODULE, DEBUG,"User with name(id): %s is already connected, fd: %d\n", name, fd_ex);
#endif
ksnLNullClientDisconnect(kl, fd_ex, 1);
}

// Add client to name map
kld->name = name;
kld->name_length = name_length;
pblMapAdd(kl->map_n, kld->name, kld->name_length, &fd, sizeof(fd));

// Send login to authentication application
Expand All @@ -653,6 +655,8 @@ static void ksnLNullClientAuthCheck(ksnLNullClass *kl, ksnLNullData *kld,
}
else {
// Wrong Login name received
kld->name = name;
kld->name_length = name_length;
#ifdef DEBUG_KSNET
ksn_printf(kev, MODULE, DEBUG,
"got login command with wrong name '%s'\n", kld->name
Expand Down