From f2d9bc87bc87b4ef3cdee081c65ad1c248804edd Mon Sep 17 00:00:00 2001
From: Fritz Elfert <felfert@to.com>
Date: Sun, 4 Jul 1999 11:59:42 +0000
Subject: logging via syslog, more error-handling.
---
lib/Makefile.am | 5 +++--
lib/ppsocket.cc | 37 +------------------------------------
lib/ppsocket.h | 18 ------------------
3 files changed, 4 insertions(+), 56 deletions(-)
(limited to 'lib')
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f72c44e..27d5ea4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,5 @@
lib_LTLIBRARIES = libplp.la
-libplp_la_LDFLAGS = -version-info 1:0:0
-libplp_la_SOURCES = bufferarray.cc bufferstore.cc iowatch.cc ppsocket.cc rfsv32.cc
+libplp_la_LDFLAGS = --debug -version-info 1:0:0
+libplp_la_SOURCES = bufferarray.cc bufferstore.cc iowatch.cc ppsocket.cc rfsv32.cc log.cc
+EXTRA_DIST = bool.h bufferarray.h bufferstore.h iowatch.h ppsocket.h rfsv32.h log.h
diff --git a/lib/ppsocket.cc b/lib/ppsocket.cc
index 9230f81..c51c557 100644
--- a/lib/ppsocket.cc
+++ b/lib/ppsocket.cc
@@ -74,11 +74,10 @@ ppsocket::ppsocket()
((struct sockaddr_in *) &m_PeerAddr)->sin_family = AF_INET;
m_Bound = false;
-
+ m_LastError = 0;
m_Timeout = INFINITE;
}
-
ppsocket::~ppsocket()
{
if (m_Socket != INVALID_SOCKET) {
@@ -87,20 +86,6 @@ ppsocket::~ppsocket()
}
}
-
-bool ppsocket::
-startup(void)
-{
-#ifdef WIN32
- WSADATA wd;
- m_LastError = WSAStartup(MAKEWORD(1, 1), &wd);
-#else
- m_LastError = 0;
-#endif
-
- return (m_LastError == 0 ? true : false);
-}
-
bool ppsocket::
reconnect()
{
@@ -124,7 +109,6 @@ reconnect()
return (true);
}
-
void ppsocket::
printPeer()
{
@@ -168,8 +152,6 @@ connect(char *Peer, int PeerPort, char *Host, int HostPort)
return (true);
}
-
-
bool ppsocket::
listen(char *Host, int Port)
{
@@ -193,7 +175,6 @@ listen(char *Host, int Port)
return (true);
}
-
ppsocket *ppsocket::
accept(char *Peer, int MaxLen)
{
@@ -247,7 +228,6 @@ accept(char *Peer, int MaxLen)
return (accepted);
}
-
int ppsocket::
printf(const char *Format,...)
{
@@ -381,8 +361,6 @@ puts(const char *Data)
return (true);
}
-
-
char ppsocket::
sgetc(void)
{
@@ -396,7 +374,6 @@ sgetc(void)
return (c);
}
-
bool ppsocket::
sputc(char c)
{
@@ -409,7 +386,6 @@ sputc(char c)
return (true);
}
-
int ppsocket::
read(void *Data, size_t Size, size_t NumObj)
{
@@ -418,7 +394,6 @@ read(void *Data, size_t Size, size_t NumObj)
return (i);
}
-
int ppsocket::
write(const void *Data, size_t Size, size_t NumObj)
{
@@ -427,7 +402,6 @@ write(const void *Data, size_t Size, size_t NumObj)
return (i);
}
-
int ppsocket::
recv(char *buf, int len, int flags)
{
@@ -439,7 +413,6 @@ recv(char *buf, int len, int flags)
return (i);
}
-
int ppsocket::
send(const char *buf, int len, int flags)
{
@@ -451,7 +424,6 @@ send(const char *buf, int len, int flags)
return (i);
}
-
int ppsocket::
readTimeout(char *buf, int len, int flags)
{
@@ -480,7 +452,6 @@ readTimeout(char *buf, int len, int flags)
return (i);
}
-
int ppsocket::
writeTimeout(const char *buf, int len, int flags)
{
@@ -514,7 +485,6 @@ closeSocket(void)
return (true);
}
-
bool ppsocket::
bindSocket(char *Host, int Port)
{
@@ -547,7 +517,6 @@ bindSocket(char *Host, int Port)
return (true);
}
-
bool ppsocket::
bindInRange(char *Host, int Low, int High, int Retries)
{
@@ -625,7 +594,6 @@ linger(bool LingerOn, int LingerTime)
return (true);
}
-
bool ppsocket::
createSocket(void)
{
@@ -672,7 +640,6 @@ setPeer(char *Peer, int Port)
return (true);
}
-
bool ppsocket::
getPeer(char *Peer, int MaxLen, int *Port)
{
@@ -692,7 +659,6 @@ getPeer(char *Peer, int MaxLen, int *Port)
return (false);
}
-
bool ppsocket::
setHost(char *Host, int Port)
{
@@ -722,7 +688,6 @@ setHost(char *Host, int Port)
return (true);
}
-
bool ppsocket::
getHost(char *Host, int MaxLen, int *Port)
{
diff --git a/lib/ppsocket.h b/lib/ppsocket.h
index 2bd43f9..9b8c4c2 100644
--- a/lib/ppsocket.h
+++ b/lib/ppsocket.h
@@ -36,53 +36,36 @@ public:
ppsocket();
virtual ~ppsocket();
- virtual bool startup(void);
-
virtual bool connect(char* Peer, int PeerPort, char* Host = NULL, int HostPort = 0);
virtual bool reconnect();
-
virtual void printPeer();
-
virtual bool listen(char* Host, int Port);
-
ppsocket* accept(char* Peer, int MaxLen);
-
bool dataToGet() const;
int getBufferStore(bufferStore &a, bool wait = true);
bool sendBufferStore(const bufferStore &a);
-
int printf(const char* Format, ...);
-
int readEx(char* Data, int cTerm, int MaxLen);
bool puts(const char* Data);
-
char sgetc(void);
bool sputc(char c);
-
int read(void* Data, size_t Size, size_t NumObj);
virtual int write(const void* Data, size_t Size, size_t NumObj);
-
int recv(char* buf, int len, int flags);
int send(const char* buf, int len, int flags);
-
int readTimeout(char* buf, int len, int flags);
int writeTimeout(const char* buf, int len, int flags);
-
inline void timeout(DWORD t) { m_Timeout = t; }
inline DWORD timeout(void) { return(m_Timeout); }
-
bool closeSocket(void);
bool bindSocket(char* Host, int Port);
bool bindInRange(char* Host, int Low, int High, int Retries);
bool linger(bool LingerOn, int LingerTime = 0);
-
virtual bool createSocket(void);
-
bool setPeer(char* Peer, int Port);
bool getPeer(char* Peer, int MaxLen, int* Port);
bool setHost(char* Host, int Port);
bool getHost(char* Host, int MaxLen, int* Port);
-
DWORD getLastError(void) { return(m_LastError); }
inline SOCKET socket(void) const { return(m_Socket); }
DWORD lastErrorCode();
@@ -95,7 +78,6 @@ public:
protected:
ppsocket(const ppsocket&);
-
struct sockaddr* getPeerAddrStruct() { return &m_PeerAddr; }
struct sockaddr* getHostAddrStruct() { return &m_HostAddr; }
void setHostAddrStruct(struct sockaddr* pHostStruct) { m_HostAddr = *pHostStruct; }
--
cgit v1.2.3