aboutsummaryrefslogtreecommitdiffstats
path: root/ncpd/main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ncpd/main.cc')
-rw-r--r--ncpd/main.cc369
1 files changed, 195 insertions, 174 deletions
diff --git a/ncpd/main.cc b/ncpd/main.cc
index 465c003..b2f550f 100644
--- a/ncpd/main.cc
+++ b/ncpd/main.cc
@@ -51,218 +51,239 @@ static bool active = true;
static RETSIGTYPE
term_handler(int)
{
- cout << "Got SIGTERM" << endl;
- signal(SIGTERM, term_handler);
- active = false;
+ cout << "Got SIGTERM" << endl;
+ signal(SIGTERM, term_handler);
+ active = false;
};
static RETSIGTYPE
int_handler(int)
{
- cout << "Got SIGINT" << endl;
- signal(SIGINT, int_handler);
- active = false;
+ cout << "Got SIGINT" << endl;
+ signal(SIGINT, int_handler);
+ active = false;
};
void
-checkForNewSocketConnection(ppsocket & skt, int &numScp, socketChan ** scp, ncp * a, IOWatch &iow)
+checkForNewSocketConnection(ppsocket & skt, int &numScp, socketChan ** scp, ncp * a)
{
- string peer;
- ppsocket *next = skt.accept(&peer);
- if (next != NULL) {
- // New connect
- if (verbose)
- cout << "New socket connection from " << peer << endl;
- if ((numScp >= a->maxLinks()) || (!a->gotLinkChannel())) {
- bufferStore a;
+ string peer;
+ ppsocket *next = skt.accept(&peer);
+ if (next != NULL) {
+ // New connect
+ if (verbose)
+ cout << "New socket connection from " << peer << endl;
+ if ((numScp >= a->maxLinks()) || (!a->gotLinkChannel())) {
+ bufferStore a;
- // Give the client time to send it's version request.
- next->dataToGet(1, 0);
- next->getBufferStore(a, false);
+ // Give the client time to send it's version request.
+ next->dataToGet(1, 0);
+ next->getBufferStore(a, false);
- a.init();
- a.addStringT("No Psion Connected\n");
- next->sendBufferStore(a);
- next->closeSocket();
- if (verbose)
- cout << "rejected" << endl;
- } else
- scp[numScp++] = new socketChan(next, a);
- }
+ a.init();
+ a.addStringT("No Psion Connected\n");
+ next->sendBufferStore(a);
+ next->closeSocket();
+ if (verbose)
+ cout << "rejected" << endl;
+ } else
+ scp[numScp++] = new socketChan(next, a);
+ }
}
void
pollSocketConnections(int &numScp, socketChan ** scp)
{
- for (int i = 0; i < numScp; i++) {
- scp[i]->socketPoll();
- if (scp[i]->terminate()) {
- // Requested channel termination
- delete scp[i];
- numScp--;
- for (int j = i; j < numScp; j++)
- scp[j] = scp[j + 1];
- i--;
- }
+ for (int i = 0; i < numScp; i++) {
+ scp[i]->socketPoll();
+ if (scp[i]->terminate()) {
+ // Requested channel termination
+ delete scp[i];
+ numScp--;
+ for (int j = i; j < numScp; j++)
+ scp[j] = scp[j + 1];
+ i--;
}
+ }
}
void
usage()
{
- cerr << "Usage : ncpd [-V] [-v logclass] [-d] [-e] [-p <port>] [-s <device>] [-b <baudrate>]\n";
- exit(1);
+ cerr << "Usage : ncpd [-V] [-v logclass] [-d] [-e] [-p <port>] [-s <device>] [-b <baudrate>]\n";
+ exit(1);
}
int
main(int argc, char **argv)
{
- ppsocket skt;
- IOWatch iow;
- int pid;
- bool dofork = true;
- bool autoexit = false;
+ ppsocket skt;
+ IOWatch iow;
+ int pid;
+ bool dofork = true;
+ bool autoexit = false;
- int sockNum = DPORT;
- int baudRate = DSPEED;
- const char *serialDevice = NULL;
- short int nverbose = 0;
- short int pverbose = 0;
- short int lverbose = 0;
+ int sockNum = DPORT;
+ int baudRate = DSPEED;
+ const char *host = "127.0.0.1";
+ const char *serialDevice = NULL;
+ short int nverbose = 0;
+ short int pverbose = 0;
+ short int lverbose = 0;
- struct servent *se = getservbyname("psion", "tcp");
- endservent();
- if (se != 0L)
- sockNum = ntohs(se->s_port);
+ struct servent *se = getservbyname("psion", "tcp");
+ endservent();
+ if (se != 0L)
+ sockNum = ntohs(se->s_port);
- // Command line parameter processing
- for (int i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-p") && i + 1 < argc) {
- sockNum = atoi(argv[++i]);
- } else if (!strcmp(argv[i], "-s") && i + 1 < argc) {
- serialDevice = argv[++i];
- } else if (!strcmp(argv[i], "-v") && i + 1 < argc) {
- i++;
- if (!strcmp(argv[i], "nl"))
- nverbose |= NCP_DEBUG_LOG;
- if (!strcmp(argv[i], "nd"))
- nverbose |= NCP_DEBUG_DUMP;
- if (!strcmp(argv[i], "ll"))
- lverbose |= LNK_DEBUG_LOG;
- if (!strcmp(argv[i], "ld"))
- lverbose |= LNK_DEBUG_DUMP;
- if (!strcmp(argv[i], "pl"))
- pverbose |= PKT_DEBUG_LOG;
- if (!strcmp(argv[i], "pd"))
- pverbose |= PKT_DEBUG_DUMP;
- if (!strcmp(argv[i], "ph"))
- pverbose |= PKT_DEBUG_HANDSHAKE;
- if (!strcmp(argv[i], "m"))
- verbose = true;
- if (!strcmp(argv[i], "all")) {
- nverbose = NCP_DEBUG_LOG | NCP_DEBUG_DUMP;
- lverbose = LNK_DEBUG_LOG | LNK_DEBUG_DUMP;
- pverbose = PKT_DEBUG_LOG | PKT_DEBUG_DUMP |
- PKT_DEBUG_HANDSHAKE;
- verbose = true;
- }
- } else if (!strcmp(argv[i], "-b") && i + 1 < argc) {
- baudRate = atoi(argv[++i]);
- } else if (!strcmp(argv[i], "-d")) {
- dofork = 0;
- } else if (!strcmp(argv[i], "-e")) {
- autoexit = true;
- } else if (!strcmp(argv[i], "-V")) {
- cout << "ncpd version " << VERSION << endl;
- exit(0);
+ // Command line parameter processing
+ for (int i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "-p") && i + 1 < argc) {
+ // parse port argument
+ i++;
+ char *pp = strchr(argv[i], ':');
+ if (pp != NULL) {
+ // host.domain:400
+ // 10.0.0.1:400
+ *pp ++= '\0';
+ host = argv[i];
+ } else {
+ // 400
+ // host.domain
+ // host
+ // 10.0.0.1
+ if (strchr(argv[i], '.') || !isdigit(argv[i][0])) {
+ host = argv[i];
+ pp = NULL;
} else
- usage();
- }
-
- if (serialDevice == NULL) {
- // If started with -e, assume being started from mgetty and
- // use the tty opened by mgetty instead of the builtin default.
- if (autoexit)
- serialDevice = ttyname(0);
- else
- serialDevice = DDEV;
- }
+ pp = argv[i];
+ }
+ if (pp != NULL)
+ sockNum = atoi(pp);
+ } else if (!strcmp(argv[i], "-s") && i + 1 < argc) {
+ serialDevice = argv[++i];
+ } else if (!strcmp(argv[i], "-v") && i + 1 < argc) {
+ i++;
+ if (!strcmp(argv[i], "nl"))
+ nverbose |= NCP_DEBUG_LOG;
+ if (!strcmp(argv[i], "nd"))
+ nverbose |= NCP_DEBUG_DUMP;
+ if (!strcmp(argv[i], "ll"))
+ lverbose |= LNK_DEBUG_LOG;
+ if (!strcmp(argv[i], "ld"))
+ lverbose |= LNK_DEBUG_DUMP;
+ if (!strcmp(argv[i], "pl"))
+ pverbose |= PKT_DEBUG_LOG;
+ if (!strcmp(argv[i], "pd"))
+ pverbose |= PKT_DEBUG_DUMP;
+ if (!strcmp(argv[i], "ph"))
+ pverbose |= PKT_DEBUG_HANDSHAKE;
+ if (!strcmp(argv[i], "m"))
+ verbose = true;
+ if (!strcmp(argv[i], "all")) {
+ nverbose = NCP_DEBUG_LOG | NCP_DEBUG_DUMP;
+ lverbose = LNK_DEBUG_LOG | LNK_DEBUG_DUMP;
+ pverbose = PKT_DEBUG_LOG | PKT_DEBUG_DUMP |
+ PKT_DEBUG_HANDSHAKE;
+ verbose = true;
+ }
+ } else if (!strcmp(argv[i], "-b") && i + 1 < argc) {
+ baudRate = atoi(argv[++i]);
+ } else if (!strcmp(argv[i], "-d")) {
+ dofork = 0;
+ } else if (!strcmp(argv[i], "-e")) {
+ autoexit = true;
+ } else if (!strcmp(argv[i], "-V")) {
+ cout << "ncpd version " << VERSION << endl;
+ exit(0);
+ } else
+ usage();
+ }
- if (dofork)
- pid = fork();
+ if (serialDevice == NULL) {
+ // If started with -e, assume being started from mgetty and
+ // use the tty opened by mgetty instead of the builtin default.
+ if (autoexit)
+ serialDevice = ttyname(0);
else
- pid = 0;
- switch (pid) {
- case 0:
- signal(SIGTERM, term_handler);
- signal(SIGINT, int_handler);
- skt.setWatch(&iow);
- if (!skt.listen("127.0.0.1", sockNum))
- cerr << "listen on port " << sockNum << ": " << strerror(errno) << endl;
- else {
- if (dofork || autoexit) {
- logbuf dlog(LOG_DEBUG);
- logbuf elog(LOG_ERR);
- ostream lout(&dlog);
- ostream lerr(&elog);
- cout = lout;
- cerr = lerr;
- openlog("ncpd", LOG_CONS|LOG_PID, LOG_DAEMON);
- syslog(LOG_INFO,
- "daemon started. Listening at 127.0.0.1:%d, using device %s\n",
- sockNum, serialDevice);
- setsid();
- chdir("/");
- int devnull =
- open("/dev/null", O_RDWR, 0);
- if (devnull != -1) {
- dup2(devnull, STDIN_FILENO);
- dup2(devnull, STDOUT_FILENO);
- dup2(devnull, STDERR_FILENO);
- if (devnull > 2)
- close(devnull);
- }
- }
- ncp *a = new ncp(serialDevice, baudRate, iow);
- int numScp = 0;
- socketChan *scp[257]; // MAX_CHANNELS_PSION + 1
+ serialDevice = DDEV;
+ }
- a->setVerbose(nverbose);
- a->setLinkVerbose(lverbose);
- a->setPktVerbose(pverbose);
- while (active) {
- // sockets
- pollSocketConnections(numScp, scp);
- checkForNewSocketConnection(skt, numScp, scp, a, iow);
+ if (dofork)
+ pid = fork();
+ else
+ pid = 0;
+ switch (pid) {
+ case 0:
+ signal(SIGTERM, term_handler);
+ signal(SIGINT, int_handler);
+ skt.setWatch(&iow);
+ if (!skt.listen(host, sockNum))
+ cerr << "listen on " << host << ":" << sockNum << ": " << strerror(errno) << endl;
+ else {
+ if (dofork || autoexit) {
+ logbuf dlog(LOG_DEBUG);
+ logbuf elog(LOG_ERR);
+ ostream lout(&dlog);
+ ostream lerr(&elog);
+ cout = lout;
+ cerr = lerr;
+ openlog("ncpd", LOG_CONS|LOG_PID, LOG_DAEMON);
+ syslog(LOG_INFO,
+ "daemon started. Listening at %s:%d, using device %s\n",
+ host, sockNum, serialDevice);
+ setsid();
+ chdir("/");
+ int devnull =
+ open("/dev/null", O_RDWR, 0);
+ if (devnull != -1) {
+ dup2(devnull, STDIN_FILENO);
+ dup2(devnull, STDOUT_FILENO);
+ dup2(devnull, STDERR_FILENO);
+ if (devnull > 2)
+ close(devnull);
+ }
+ }
+ ncp *a = new ncp(serialDevice, baudRate, &iow);
+ int numScp = 0;
+ socketChan *scp[257]; // MAX_CHANNELS_PSION + 1
- // psion
- a->poll();
+ a->setVerbose(nverbose);
+ a->setLinkVerbose(lverbose);
+ a->setPktVerbose(pverbose);
+ while (active) {
+ // sockets
+ pollSocketConnections(numScp, scp);
+ checkForNewSocketConnection(skt, numScp, scp, a);
- if (a->stuffToSend())
- iow.watch(0, 100000);
- else
- iow.watch(1, 0);
+ // psion
+ a->poll();
- if (a->hasFailed()) {
- if (autoexit)
- break;
+ if (a->stuffToSend())
+ iow.watch(0, 100000);
+ else
+ iow.watch(1, 0);
- iow.watch(5, 0);
- if (verbose)
- cout << "ncp: restarting\n";
- a->reset();
- }
- }
- delete a;
- }
- skt.closeSocket();
- break;
- case -1:
- cerr << "fork: " << strerror(errno) << endl;
- break;
- default:
- exit(0);
- }
+ if (a->hasFailed()) {
+ if (autoexit)
+ break;
+
+ iow.watch(5, 0);
+ if (verbose)
+ cout << "ncp: restarting\n";
+ a->reset();
+ }
+ }
+ delete a;
+ }
+ skt.closeSocket();
+ break;
+ case -1:
+ cerr << "fork: " << strerror(errno) << endl;
+ break;
+ default:
+ exit(0);
+ }
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 07:38:26 +0000