aboutsummaryrefslogtreecommitdiffstats
path: root/ncpd
diff options
context:
space:
mode:
authorFritz Elfert <felfert@to.com>2001-02-04 04:23:06 +0000
committerFritz Elfert <felfert@to.com>2001-02-04 04:23:06 +0000
commita7e4250b20fa5012942c4fe05ee0c7f701c5799f (patch)
tree087ef59c3c88713aa8c7b3150a2ae114c04a929e /ncpd
parent1664530e8f0e1ac6e762a1c79629fcec86f68724 (diff)
downloadplptools-a7e4250b20fa5012942c4fe05ee0c7f701c5799f.tar.gz
plptools-a7e4250b20fa5012942c4fe05ee0c7f701c5799f.tar.bz2
plptools-a7e4250b20fa5012942c4fe05ee0c7f701c5799f.zip
Cleaned up ppsocket.
More 64bit-related stuff.
Diffstat (limited to 'ncpd')
-rw-r--r--ncpd/linkchan.cc2
-rw-r--r--ncpd/main.cc7
-rw-r--r--ncpd/ncp.cc2
-rw-r--r--ncpd/packet.cc6
4 files changed, 9 insertions, 8 deletions
diff --git a/ncpd/linkchan.cc b/ncpd/linkchan.cc
index f8e586f..21ec39f 100644
--- a/ncpd/linkchan.cc
+++ b/ncpd/linkchan.cc
@@ -23,7 +23,7 @@
// e-mail philip.proudman@btinternet.com
#include <stream.h>
-#include <iomanip.h>
+#include <iomanip>
#include "linkchan.h"
#include "bufferstore.h"
diff --git a/ncpd/main.cc b/ncpd/main.cc
index 2392d09..76d0bb2 100644
--- a/ncpd/main.cc
+++ b/ncpd/main.cc
@@ -27,10 +27,11 @@
#endif
#include <stdio.h>
-#include <string.h>
+#include <string>
#include <stream.h>
#include <stdlib.h>
#include <signal.h>
+#include <errno.h>
#include "ncp.h"
#include "bufferstore.h"
@@ -64,8 +65,8 @@ int_handler(int)
void
checkForNewSocketConnection(ppsocket & skt, int &numScp, socketChan ** scp, ncp * a, IOWatch & iow)
{
- char peer[201];
- ppsocket *next = skt.accept(peer, 200);
+ string peer;
+ ppsocket *next = skt.accept(&peer);
if (next != NULL) {
// New connect
if (verbose)
diff --git a/ncpd/ncp.cc b/ncpd/ncp.cc
index 8af83d8..b3cf009 100644
--- a/ncpd/ncp.cc
+++ b/ncpd/ncp.cc
@@ -27,7 +27,7 @@
#endif
#include <stream.h>
-#include <string.h>
+#include <string>
#include <time.h>
#include "ncp.h"
diff --git a/ncpd/packet.cc b/ncpd/packet.cc
index ebefc0a..6d97ccc 100644
--- a/ncpd/packet.cc
+++ b/ncpd/packet.cc
@@ -32,9 +32,9 @@
#include <unistd.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <string.h>
-#include <fstream.h>
-#include <iomanip.h>
+#include <string>
+#include <fstream>
+#include <iomanip>
#include <errno.h>
#include <sys/ioctl.h>
#include <termios.h>