Changed IRC name to IBC

This commit is contained in:
Michiel Broek 2005-04-16 14:49:58 +00:00
parent 79ba3b3c47
commit 81a0cb20f8
6 changed files with 30 additions and 30 deletions

View File

@ -2030,16 +2030,16 @@ struct _route {
/* /*
* IRC servers to connect to. * IBC servers to connect to.
*/ */
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
struct _ircsrvhdr { struct _ibcsrvhdr {
long hdrsize; /* Size of header */ long hdrsize; /* Size of header */
long recsize; /* Size of record */ long recsize; /* Size of record */
}; };
struct _ircsrv { struct _ibcsrv {
char server[64]; /* Peer server name */ char server[64]; /* Peer server name */
char passwd[16]; /* Password */ char passwd[16]; /* Password */
unsigned Active : 1; /* Is server active */ unsigned Active : 1; /* Is server active */
@ -2664,8 +2664,8 @@ struct _routehdr routehdr; /* Routing file */
struct _route route; struct _route route;
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
struct _ircsrvhdr ircsrvhdr; /* IRC servers */ struct _ibcsrvhdr ibcsrvhdr; /* IBC servers */
struct _ircsrv ircsrv; struct _ibcsrv ibcsrv;
#endif #endif

View File

@ -4,13 +4,13 @@
include ../Makefile.global include ../Makefile.global
SRCS = callstat.c scanout.c taskcomm.c taskinfo.c taskstat.c taskirc.c \ SRCS = callstat.c scanout.c taskcomm.c taskinfo.c taskstat.c taskibc.c \
mbtask.c outstat.c signame.c taskdisk.c taskregs.c taskutil.c \ mbtask.c outstat.c signame.c taskdisk.c taskregs.c taskutil.c \
ports.c calllist.c ping.c taskchat.c crc.c ports.c calllist.c ping.c taskchat.c crc.c
HDRS = callstat.h mbtask.h outstat.h signame.h taskdisk.h taskregs.h taskutil.h \ HDRS = callstat.h mbtask.h outstat.h signame.h taskdisk.h taskregs.h taskutil.h \
scanout.h taskcomm.h taskinfo.h taskstat.h taskirc.h \ scanout.h taskcomm.h taskinfo.h taskstat.h taskibc.h \
ports.h calllist.h ping.h taskchat.h ports.h calllist.h ping.h taskchat.h
OBJS = callstat.o scanout.o taskcomm.o taskinfo.o taskstat.o taskirc.o \ OBJS = callstat.o scanout.o taskcomm.o taskinfo.o taskstat.o taskibc.o \
mbtask.o outstat.o signame.o taskdisk.o taskregs.o taskutil.o \ mbtask.o outstat.o signame.o taskdisk.o taskregs.o taskutil.o \
ports.o calllist.o ping.o taskchat.o crc.o ports.o calllist.o ping.o taskchat.o crc.o
SLIBS = ../lib/libnodelist.a SLIBS = ../lib/libnodelist.a
@ -73,8 +73,8 @@ scanout.o: ../config.h ../lib/mbselib.h taskutil.h scanout.h
taskcomm.o: ../config.h ../lib/mbselib.h taskstat.h taskregs.h taskdisk.h taskinfo.h taskutil.h taskchat.h taskcomm.h taskcomm.o: ../config.h ../lib/mbselib.h taskstat.h taskregs.h taskdisk.h taskinfo.h taskutil.h taskchat.h taskcomm.h
taskinfo.o: ../config.h ../lib/mbselib.h taskinfo.h taskinfo.o: ../config.h ../lib/mbselib.h taskinfo.h
taskstat.o: ../config.h ../lib/mbselib.h taskstat.h callstat.h outstat.h taskutil.h taskstat.o: ../config.h ../lib/mbselib.h taskstat.h callstat.h outstat.h taskutil.h
taskirc.o: ../config.h ../lib/mbselib.h taskirc.h taskibc.o: ../config.h ../lib/mbselib.h taskibc.h
mbtask.o: ../config.h ../lib/mbselib.h ../paths.h signame.h taskstat.h taskutil.h taskregs.h taskcomm.h taskdisk.h taskirc.h callstat.h outstat.h ../lib/nodelist.h ports.h calllist.h ping.h taskchat.h mbtask.h mbtask.o: ../config.h ../lib/mbselib.h ../paths.h signame.h taskstat.h taskutil.h taskregs.h taskcomm.h taskdisk.h taskibc.h callstat.h outstat.h ../lib/nodelist.h ports.h calllist.h ping.h taskchat.h mbtask.h
outstat.o: ../config.h ../lib/mbselib.h taskutil.h taskstat.h scanout.h ../lib/nodelist.h callstat.h ports.h outstat.h outstat.o: ../config.h ../lib/mbselib.h taskutil.h taskstat.h scanout.h ../lib/nodelist.h callstat.h ports.h outstat.h
signame.o: ../config.h signame.h signame.o: ../config.h signame.h
taskdisk.o: ../config.h ../lib/mbselib.h taskdisk.h taskutil.h taskdisk.o: ../config.h ../lib/mbselib.h taskdisk.h taskutil.h
@ -83,6 +83,6 @@ taskutil.o: ../config.h ../lib/mbselib.h signame.h scanout.h taskutil.h
ports.o: ../config.h ../lib/mbselib.h taskutil.h ../lib/nodelist.h ports.h ports.o: ../config.h ../lib/mbselib.h taskutil.h ../lib/nodelist.h ports.h
calllist.o: ../config.h ../lib/mbselib.h taskstat.h taskutil.h callstat.h outstat.h mbtask.h calllist.h calllist.o: ../config.h ../lib/mbselib.h taskstat.h taskutil.h callstat.h outstat.h mbtask.h calllist.h
ping.o: ../config.h ../lib/mbselib.h taskstat.h taskutil.h ping.h ping.o: ../config.h ../lib/mbselib.h taskstat.h taskutil.h ping.h
taskchat.o: ../config.h ../lib/mbselib.h taskutil.h taskregs.h taskchat.h taskirc.h taskchat.o: ../config.h ../lib/mbselib.h taskutil.h taskregs.h taskchat.h taskibc.h
crc.o: ../config.h ../lib/mbselib.h crc.o: ../config.h ../lib/mbselib.h
# End of generated dependencies # End of generated dependencies

View File

@ -37,7 +37,7 @@
#include "taskregs.h" #include "taskregs.h"
#include "taskcomm.h" #include "taskcomm.h"
#include "taskdisk.h" #include "taskdisk.h"
#include "taskirc.h" #include "taskibc.h"
#include "callstat.h" #include "callstat.h"
#include "outstat.h" #include "outstat.h"
#include "../lib/nodelist.h" #include "../lib/nodelist.h"
@ -116,7 +116,7 @@ extern int ping_run; /* Ping running */
int sched_run = FALSE; /* Scheduler running */ int sched_run = FALSE; /* Scheduler running */
extern int disk_run; /* Disk watch running */ extern int disk_run; /* Disk watch running */
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
extern int irc_run; /* IRC thread running */ extern int ibc_run; /* IBC thread running */
#endif #endif
@ -128,7 +128,7 @@ pthread_t pt_command;
pthread_t pt_disk; pthread_t pt_disk;
pthread_t pt_scheduler; pthread_t pt_scheduler;
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
pthread_t pt_irc; pthread_t pt_ibc;
#endif #endif
@ -746,14 +746,14 @@ void die(int onsig)
*/ */
now = time(NULL) + 2; now = time(NULL) + 2;
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
while ((cmd_run || ping_run || sched_run || disk_run || irc_run) && (time(NULL) < now)) { while ((cmd_run || ping_run || sched_run || disk_run || ibc_run) && (time(NULL) < now)) {
#else #else
while ((cmd_run || ping_run || sched_run || disk_run) && (time(NULL) < now)) { while ((cmd_run || ping_run || sched_run || disk_run) && (time(NULL) < now)) {
#endif #endif
sleep(1); sleep(1);
} }
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
if (cmd_run || ping_run || sched_run || disk_run || irc_run) if (cmd_run || ping_run || sched_run || disk_run || ibc_run)
#else #else
if (cmd_run || ping_run || sched_run || disk_run) if (cmd_run || ping_run || sched_run || disk_run)
#endif #endif
@ -1048,8 +1048,8 @@ void start_scheduler(void)
WriteError("$pthread_create scheduler rc=%d", rc); WriteError("$pthread_create scheduler rc=%d", rc);
die(SIGTERM); die(SIGTERM);
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
} else if ((rc = pthread_create(&pt_irc, NULL, (void (*))irc_thread, NULL))) { } else if ((rc = pthread_create(&pt_ibc, NULL, (void (*))ibc_thread, NULL))) {
WriteError("$pthread_create irc rc=%d", rc); WriteError("$pthread_create ibc rc=%d", rc);
die(SIGTERM); die(SIGTERM);
#endif #endif
} else { } else {

View File

@ -33,7 +33,7 @@
#include "taskutil.h" #include "taskutil.h"
#include "taskregs.h" #include "taskregs.h"
#include "taskchat.h" #include "taskchat.h"
#include "taskirc.h" #include "taskibc.h"
#define MAXCHANNELS 10 /* Maximum chat channels */ #define MAXCHANNELS 10 /* Maximum chat channels */

View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
* *
* $Id$ * $Id$
* Purpose ...............: mbtask - Internet Realy Chat (sort of) * Purpose ...............: mbtask - Internet BBS Chat (but it looks like...)
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2005 * Copyright (C) 1997-2005
@ -30,13 +30,13 @@
#include "../config.h" #include "../config.h"
#include "../lib/mbselib.h" #include "../lib/mbselib.h"
#include "taskirc.h" #include "taskibc.h"
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
int irc_run = FALSE; /* Thread running */ int ibc_run = FALSE; /* Thread running */
extern int T_Shutdown; /* Program shutdown */ extern int T_Shutdown; /* Program shutdown */
@ -115,17 +115,17 @@ void send_all(char *msg)
/* /*
* IRC thread * IRC thread
*/ */
void *irc_thread(void *dummy) void *ibc_thread(void *dummy)
{ {
Syslog('+', "Starting IRC thread"); Syslog('+', "Starting IBC thread");
irc_run = TRUE; ibc_run = TRUE;
while (! T_Shutdown) { while (! T_Shutdown) {
sleep(1); sleep(1);
} }
irc_run = FALSE; ibc_run = FALSE;
Syslog('+', "IRC thread stopped"); Syslog('+', "IBC thread stopped");
pthread_exit(NULL); pthread_exit(NULL);
} }

View File

@ -1,11 +1,11 @@
#ifndef _TASKIRC_H #ifndef _TASKIBC_H
#define _TASKIRC_H #define _TASKIBC_H
/* $Id$ */ /* $Id$ */
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
void send_all(char *); void send_all(char *);
void *irc_thread(void *); void *ibc_thread(void *);
#endif #endif
#endif #endif