From d4b796119af628da552a64367557e31198c3f960 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Sun, 27 Aug 2000 23:29:33 +0000 Subject: Programs now use an entry in /etc/services (if exists) for the TCP port. --- ncpd/main.cc | 7 ++++++- plpftp/main.cc | 13 +++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ncpd/main.cc b/ncpd/main.cc index ca1d2c4..a23267f 100644 --- a/ncpd/main.cc +++ b/ncpd/main.cc @@ -95,7 +95,6 @@ main(int argc, char **argv) bool dofork = true; bool autoexit = false; - // Command line parameter processing int sockNum = DPORT; int baudRate = DSPEED; const char *serialDevice = DDEV; @@ -103,6 +102,12 @@ main(int argc, char **argv) short int pverbose = 0; short int lverbose = 0; + struct servent *se = getservbyname("psion", "tcp"); + endservent(); + if (se != 0L) + sockNum = ntohs(se->s_port); + + // Command line parameter processing signal(SIGPIPE, SIG_IGN); for (int i = 1; i < argc; i++) { if (!strcmp(argv[i], "-p") && i + 1 < argc) { diff --git a/plpftp/main.cc b/plpftp/main.cc index cbd88f6..2d5140a 100644 --- a/plpftp/main.cc +++ b/plpftp/main.cc @@ -71,19 +71,24 @@ main(int argc, char **argv) rpcs *r; ftp f; int status = 0; + int sockNum = DPORT; sigset_t sigset; - // Command line parameter processing - int sockNum = DPORT; sigemptyset(&sigset); sigaddset(&sigset, SIGPIPE); sigprocmask(SIG_BLOCK, &sigset, 0L); + struct servent *se = getservbyname("psion", "tcp"); + endservent(); + if (se != 0L) + sockNum = ntohs(se->s_port); + + // Command line parameter processing if ((argc > 2) && !strcmp(argv[1], "-p")) { sockNum = atoi(argv[2]); argc -= 2; - for (int i=1; i