Commit e863d8af authored by Per Cederqvist's avatar Per Cederqvist
Browse files

param.num_ip_client_port and param.num_ip_mux_port superseeds

num_ip_client_port and num_ip_mux_port.

Fixed format strings in LOG macro.
parent 3cb42e98
/*
* $Id: connections.c,v 0.30 1993/10/18 12:29:02 ceder Exp $
* $Id: connections.c,v 0.31 1994/01/12 01:34:45 ceder Exp $
* Copyright (C) 1991 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
......@@ -30,7 +30,7 @@
* Created by Willf|r 31/3-90. Mostly written by ceder.
*/
static char *rcsid = "$Id: connections.c,v 0.30 1993/10/18 12:29:02 ceder Exp $";
static char *rcsid = "$Id: connections.c,v 0.31 1994/01/12 01:34:45 ceder Exp $";
#include "rcs.h"
USE(rcsid);
......@@ -81,6 +81,7 @@ USE(rcsid);
#include "send-async.h"
#include "cache.h"
#include "rfc931.h"
#include "param.h"
IscMaster * kom_server_mcb = NULL;
Connection * active_connection = NULL;
......@@ -412,7 +413,7 @@ mux_handle_packet(Mux *mux)
mux_addclient(mux, mux->parse.num, cp);
BUG(("\n[Client %d from %.*s via MUX %s",
BUG(("\n[Client %lu from %.*s via MUX %s",
cp->session_no,
(int)cp->hostname.len,
cp->hostname.string,
......@@ -432,7 +433,7 @@ mux_handle_packet(Mux *mux)
cp = mcp->conn;
BUG(("\n[Client %d via MUX(%s)",
BUG(("\n[Client %lu via MUX(%s)",
cp->session_no,
isc_gethostname(mux->scb->info.tcp.raddr, NULL, 0)));
BUG((" is logging out by request]\n"));
......@@ -451,7 +452,7 @@ mux_handle_packet(Mux *mux)
cp = mcp->conn;
VBUG(("\n[Message client %d via MUX #%d]\n",
VBUG(("\n[Message client %lu via MUX #%d]\n",
cp->session_no, (int)mux->scb));
parse_message(cp, mux->parse.string);
......@@ -477,7 +478,7 @@ mux_logout(Mux *mp)
for (i = 0; i < mp->client_c; i++)
if (mp->client_v[i].conn)
{
BUG(("\n[Client %d via MUX(%s)",
BUG(("\n[Client %lu via MUX(%s)",
mp->client_v[i].conn->session_no,
isc_gethostname(mp->scb->info.tcp.raddr, NULL, 0)));
BUG((" is logging out by MUX shutdown]\n"));
......@@ -546,7 +547,7 @@ mux_parse_message(Mux *mp, String tmp_str)
{
VBUGSTR(tmp_str);
BUG(("%s(): mp->parse.unparsed = { len = %d, string = %p }\n",
BUG(("%s(): mp->parse.unparsed = { len = %lu, string = %p }\n",
"mux_parse_message",
mp->parse.unparsed.len,
(void *)mp->parse.unparsed.string));
......@@ -760,7 +761,7 @@ login_request(IscEvent *event)
localport = isc_getportnum (isc_adr);
isc_freeaddress (isc_adr);
if (localport == num_ip_mux_port)
if (localport == param.num_ip_mux_port)
{
/* Multiplexer requesting connection */
......@@ -773,7 +774,7 @@ login_request(IscEvent *event)
(int)event->session,
isc_gethostname(event->session->info.tcp.raddr, NULL, 0)));
}
else if (localport == num_ip_client_port)
else if (localport == param.num_ip_client_port)
{
/* Client requesting connection */
......@@ -804,7 +805,7 @@ login_request(IscEvent *event)
mux_addclient(event->session->udg, 0, cp);
BUG(("\n[Client %d from %s", cp->session_no,
BUG(("\n[Client %lu from %s", cp->session_no,
isc_gethostname(event->session->info.tcp.raddr, NULL, 0)));
BUG((" is connecting]\n"));
}
......@@ -835,7 +836,7 @@ logout_request(IscEvent *event)
{
cp = event->session->udg->client_v[0].conn;
BUG(("\n[Client %d from %s", cp->session_no,
BUG(("\n[Client %lu from %s", cp->session_no,
isc_gethostname(event->session->info.tcp.raddr, NULL, 0)));
BUG((" is logging out]\n"));
......@@ -860,7 +861,7 @@ message_request(IscEvent *event)
else
{
cp = event->session->udg->client_v[0].conn;
VBUG(("\n[Message from client %d]\n",
VBUG(("\n[Message from client %lu]\n",
cp->session_no));
/*
** Pass the message on to the parser
......
Markdown is supported
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