Skip to content
Snippets Groups Projects
Commit b8babbf1 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Trivial bugfixes.

parent fdc5a5bc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/server/prot-a-output.h
+ 6
− 5
View file @ b8babbf1
/*
* $Id: prot-a-output.h,v 0.5 1992/04/01 20:50:46 ceder Exp $
* $Id: prot-a-output.h,v 0.6 1992/04/04 17:30:55 ceder Exp $
* Copyright (C) 1991 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
......@@ -23,7 +23,7 @@
* Please mail bug reports to bug-lyskom@lysator.liu.se.
*/
/*
* $Id: prot-a-output.h,v 0.5 1992/04/01 20:50:46 ceder Exp $
* $Id: prot-a-output.h,v 0.6 1992/04/04 17:30:55 ceder Exp $
*
*/
extern void
......@@ -67,7 +67,7 @@ extern void
prot_a_output_info(Connection *fp,
Info *info);
extern void
void
prot_a_output_who_info(Connection *fp,
Who_info *info);
......@@ -77,7 +77,8 @@ prot_a_output_who_info_list(Connection *fp,
extern void
prot_a_output_who_info_ident_list(Connection *fp,
Who_info_ident_list info)
Who_info_ident_list info);
extern void
prot_a_output_who_info_list_old(Connection *fp,
Who_info_list_old info);
......@@ -88,7 +89,7 @@ prot_a_output_session_info(Connection *fp,
void
prot_a_output_session_info_ident(Connection *fp,
Session_info *info);
Session_info_ident *info);
extern void
prot_a_output_string(Connection *fp,
......
src/server/prot-a.c
+ 4
− 4
View file @ b8babbf1
/*
* $Id: prot-a.c,v 0.13 1992/04/01 20:50:49 ceder Exp $
* $Id: prot-a.c,v 0.14 1992/04/04 17:32:55 ceder Exp $
* Copyright (C) 1991 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
......@@ -26,7 +26,7 @@
* Protocol A.
*/
static char *rcsid = "$Id: prot-a.c,v 0.13 1992/04/01 20:50:49 ceder Exp $";
static char *rcsid = "$Id: prot-a.c,v 0.14 1992/04/04 17:32:55 ceder Exp $";
#include <stdio.h>
......@@ -136,7 +136,7 @@ prot_a_reply(Connection *client,
/* Clear username, since it is allocated (in get_session_info()
in session.c). See comment abover the definition of
typedef Result_holder in connections.h. */
s_clear(&res->session_info->username);
s_clear(&res->session_info.username);
BUG(("={Session_info not listed}\n"));
break;
......@@ -178,7 +178,7 @@ prot_a_reply(Connection *client,
case rt_session_info_ident:
prot_a_output_session_info_ident(client,
&res->session_info);
&res->session_info_ident);
BUG(("={Session_info_ident not listed}\n"));
break;
}
......
src/server/session.c
+ 15
− 15
View file @ b8babbf1
/*
* $Id: session.c,v 0.6 1992/04/01 20:47:46 ceder Exp $
* $Id: session.c,v 0.7 1992/04/04 17:33:46 ceder Exp $
* Copyright (C) 1991 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
......@@ -28,7 +28,7 @@
* Session control and miscellaneous.
*/
static char *rcsid = "$Id: session.c,v 0.6 1992/04/01 20:47:46 ceder Exp $";
static char *rcsid = "$Id: session.c,v 0.7 1992/04/04 17:33:46 ceder Exp $";
#include <time.h>
......@@ -121,23 +121,23 @@ login_old (Pers_no pers_no,
if (!s_empty(active_connection->ident_user))
{
if ( s_strcat(&client->username,
if ( s_strcat(&pers_p->username,
s_fcrea_str((const unsigned char *)"(")) != OK )
restart_kom("login: s_strcat (\n");
if ( s_strcat(&client->username, active_connection->ident_user) != OK )
if ( s_strcat(&pers_p->username, active_connection->ident_user) != OK )
restart_kom("login: s_strcat ident_user\n");
if ( s_strcat(&client->username,
if ( s_strcat(&pers_p->username,
s_fcrea_str((const unsigned char *)")")) != OK )
restart_kom("login: s_strcat )\n");
}
if ( s_strcat(&client->username,
if ( s_strcat(&pers_p->username,
s_fcrea_str((const unsigned char *)"@")) != OK )
restart_kom("prot_a_parse_packet: s_strcat\n");
if ( s_strcat(&client->username, client->hostname) != OK )
if ( s_strcat(&pers_p->username, active_connection->hostname) != OK )
restart_kom("prot_a_parse_packet: s_strcat II\n");
mark_person_as_changed( pers_no );
......@@ -195,23 +195,23 @@ login (Pers_no pers_no,
if (!s_empty(active_connection->ident_user))
{
if ( s_strcat(&client->username,
if ( s_strcat(&pers_p->username,
s_fcrea_str((const unsigned char *)"(")) != OK )
restart_kom("login: s_strcat (\n");
if ( s_strcat(&client->username, active_connection->ident_user) != OK )
if ( s_strcat(&pers_p->username, active_connection->ident_user) != OK )
restart_kom("login: s_strcat ident_user\n");
if ( s_strcat(&client->username,
if ( s_strcat(&pers_p->username,
s_fcrea_str((const unsigned char *)")")) != OK )
restart_kom("login: s_strcat )\n");
}
if ( s_strcat(&client->username,
if ( s_strcat(&pers_p->username,
s_fcrea_str((const unsigned char *)"@")) != OK )
restart_kom("prot_a_parse_packet: s_strcat\n");
if ( s_strcat(&client->username, client->hostname) != OK )
if ( s_strcat(&pers_p->username, active_connection->hostname) != OK )
restart_kom("prot_a_parse_packet: s_strcat II\n");
mark_person_as_changed( pers_no );
......@@ -445,7 +445,7 @@ who_is_on_ident( Who_info_ident_list *result )
if ( cptr->person != NULL )
{
result->info[i] = EMPTY_WHO_INFO;
result->info[i] = EMPTY_WHO_INFO_IDENT;
result->info[i].person = cptr->pers_no;
result->info[i].what_am_i_doing = cptr->what_am_i_doing;
result->info[i].username = cptr->username;
......@@ -495,7 +495,7 @@ get_session_info (Session_no session_no,
s_fcrea_str((const unsigned char *)"@")) != OK )
restart_kom("get_session_info: s_strcat\n");
if ( s_strcat(&result->username, client->hostname) != OK )
if ( s_strcat(&result->username, cptr->hostname) != OK )
restart_kom("get_session_infot: s_strcat II\n");
return OK;
......@@ -519,7 +519,7 @@ get_session_info_ident (Session_no session_no,
if ( cptr != NULL )
{
*result = EMPTY_SESSION_INFO;
*result = EMPTY_SESSION_INFO_IDENT;
result->person = cptr->pers_no;
result->what_am_i_doing = cptr->what_am_i_doing;
result->working_conference = cptr->cwc;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment