From c412edcadd9a2b85d6562b8c5e67b5536ea0142b Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Mon, 11 Nov 2002 07:44:15 +0000
Subject: [PATCH] %[BugId: 114]% Moved Socket.{h,cc} from OCTOPUSSY/Net to
Common/Net for CoordServer
---
CEP/CPA/OCTOPUSSY/src/GWClientWP.h | 2 +-
CEP/CPA/OCTOPUSSY/src/GWServerWP.h | 2 +-
CEP/CPA/OCTOPUSSY/src/GatewayWP.h | 2 +-
CEP/CPA/OCTOPUSSY/src/MTGatewayWP.h | 2 +-
CEP/CPA/OCTOPUSSY/src/Makefile.am | 2 +-
CEP/CPA/OCTOPUSSY/src/Net/Socket.cc | 776 ----------------------------
CEP/CPA/OCTOPUSSY/src/Net/Socket.h | 344 ------------
7 files changed, 5 insertions(+), 1125 deletions(-)
delete mode 100755 CEP/CPA/OCTOPUSSY/src/Net/Socket.cc
delete mode 100755 CEP/CPA/OCTOPUSSY/src/Net/Socket.h
diff --git a/CEP/CPA/OCTOPUSSY/src/GWClientWP.h b/CEP/CPA/OCTOPUSSY/src/GWClientWP.h
index 1914391923b..34398a9133c 100755
--- a/CEP/CPA/OCTOPUSSY/src/GWClientWP.h
+++ b/CEP/CPA/OCTOPUSSY/src/GWClientWP.h
@@ -8,7 +8,7 @@
#include "OCTOPUSSY/MTGatewayWP.h"
// Socket
-#include "OCTOPUSSY/Net/Socket.h"
+#include "Common/Net/Socket.h"
// GatewayWP
#include "OCTOPUSSY/GatewayWP.h"
// WorkProcess
diff --git a/CEP/CPA/OCTOPUSSY/src/GWServerWP.h b/CEP/CPA/OCTOPUSSY/src/GWServerWP.h
index 58d2eae5ce4..33771bd06a6 100755
--- a/CEP/CPA/OCTOPUSSY/src/GWServerWP.h
+++ b/CEP/CPA/OCTOPUSSY/src/GWServerWP.h
@@ -7,7 +7,7 @@
#include "OCTOPUSSY/MTGatewayWP.h"
// Socket
-#include "OCTOPUSSY/Net/Socket.h"
+#include "Common/Net/Socket.h"
// GatewayWP
#include "OCTOPUSSY/GatewayWP.h"
// WorkProcess
diff --git a/CEP/CPA/OCTOPUSSY/src/GatewayWP.h b/CEP/CPA/OCTOPUSSY/src/GatewayWP.h
index 6448b870510..7c31cac1016 100755
--- a/CEP/CPA/OCTOPUSSY/src/GatewayWP.h
+++ b/CEP/CPA/OCTOPUSSY/src/GatewayWP.h
@@ -5,7 +5,7 @@
#include "DMI/DMI.h"
// Socket
-#include "OCTOPUSSY/Net/Socket.h"
+#include "Common/Net/Socket.h"
// Subscriptions
#include "OCTOPUSSY/Subscriptions.h"
// WorkProcess
diff --git a/CEP/CPA/OCTOPUSSY/src/MTGatewayWP.h b/CEP/CPA/OCTOPUSSY/src/MTGatewayWP.h
index 2761d3566d0..69be9818c98 100755
--- a/CEP/CPA/OCTOPUSSY/src/MTGatewayWP.h
+++ b/CEP/CPA/OCTOPUSSY/src/MTGatewayWP.h
@@ -13,7 +13,7 @@ using std::deque;
//##ModelId=3DB958F10261
// Socket
-#include "OCTOPUSSY/Net/Socket.h"
+#include "Common/Net/Socket.h"
// Subscriptions
#include "OCTOPUSSY/Subscriptions.h"
// WorkProcess
diff --git a/CEP/CPA/OCTOPUSSY/src/Makefile.am b/CEP/CPA/OCTOPUSSY/src/Makefile.am
index af2166966b6..8d304b43440 100644
--- a/CEP/CPA/OCTOPUSSY/src/Makefile.am
+++ b/CEP/CPA/OCTOPUSSY/src/Makefile.am
@@ -10,7 +10,7 @@ liboctopussy_la_SOURCES = Dispatcher.cc Message.cc MsgAddress.cc \
WPInterface.cc WorkProcess.cc OctopussyDebugContext.cc \
GWClientWP.cc GWServerWP.cc GatewayWP.cc MTGatewayWP.cc MTGatewayWP2.cc \
LoggerWP.cc LatencyVector.cc OctopussyConfig.cc \
- Net/Socket.cc Subscriptions.cc \
+ Subscriptions.cc \
AID-OCTOPUSSY-Registry.cc
# script used to generate AID maps
diff --git a/CEP/CPA/OCTOPUSSY/src/Net/Socket.cc b/CEP/CPA/OCTOPUSSY/src/Net/Socket.cc
deleted file mode 100755
index 73aec400311..00000000000
--- a/CEP/CPA/OCTOPUSSY/src/Net/Socket.cc
+++ /dev/null
@@ -1,776 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include "OCTOPUSSY/OctopussyDebugContext.h"
-
-// Socket
-#include "OCTOPUSSY/Net/Socket.h"
-
-InitDebugSubContext(Socket,OctopussyDebugContext,"Socket");
-
-//##ModelId=3DB936CF02C9
-int Socket::default_sigpipe_counter;
-
-//##ModelId=3DB936D300BC
-int Socket::setBlocking (bool block)
-{
- if( fcntl(sid,F_SETFL,block?0:FNDELAY)<0 )
- return set_errcode(SOCKOPT);
- return 0;
-}
-
-//##ModelId=3C91BA4300F6
-
-
-// Class Socket
-
-Socket::Socket (const string &sname)
- : name(sname),errcode_(Socket::NOINIT),sid(-1),do_intr(False),bound(False)
-{
- sigpipe_counter = &default_sigpipe_counter;
-}
-
-//##ModelId=9FD2BC39FEED
-Socket::Socket (const string &sname, const string &serv, int proto, int backlog)
- : name(sname),port_(serv),do_intr(False),bound(False)
-{
- sigpipe_counter = &default_sigpipe_counter;
- initServer(serv,proto,backlog);
-}
-
-//##ModelId=C15CE2A5FEED
-Socket::Socket (const string &sname, const string &host, const string &serv, int proto, int wait_ms)
- : name(sname),host_(host),port_(serv),do_intr(False),bound(False)
-{
- sigpipe_counter = &default_sigpipe_counter;
- initClient(host,serv,proto,wait_ms);
-}
-
-//##ModelId=4760B82BFEED
-Socket::Socket (int id, struct sockaddr_in &sa)
- : name("client"),sid(id),type(TCP),host_(">tcp"),port_("0"),do_intr(False),bound(False)
-{
- sigpipe_counter = &default_sigpipe_counter;
- dprintf(1)("creating connected socket\n");
- // constructs a generic socket (used by accept(), below)
- rmt_addr = sa;
- if( setDefaults()<0 )
- {
- close(sid);
- sid = -1;
- return;
- }
-// Set non-blocking mode
- if( fcntl(sid,F_SETFL,FNDELAY)<0 )
- set_errcode(SOCKOPT);
-}
-
-//##ModelId=3CC95D6E032A
-Socket::Socket (int id, struct sockaddr_un &sa)
- : name("client"),sid(id),type(UNIX),host_(">unix"),port_("0"),do_intr(False),bound(False)
-{
- connected = false;
- sigpipe_counter = &default_sigpipe_counter;
- dprintf(1)("creating connected socket\n");
- unix_addr = sa;
- if( setDefaults()<0 )
- {
- close(sid);
- sid = -1;
- return;
- }
-// Set non-blocking mode
- if( fcntl(sid,F_SETFL,FNDELAY)<0 )
- set_errcode(SOCKOPT);
- // successfully created connected socket
- connected = true;
-}
-
-
-//##ModelId=3DB936D00067
-Socket::~Socket()
-{
- if( sid >=0 )
- {
- dprintf(1)("close(fd)\n");
- close(sid);
- }
- if( bound && type == Socket::UNIX && unix_addr.sun_path[0] )
- {
- int res = unlink(unix_addr.sun_path);
- dprintf(1)("unlink(%s) = %d (%s)\n",unix_addr.sun_path,res<0?errno:res,res<0?strerror(errno):"OK");
- }
- dprintf(1)("destroying socket\n");
-}
-
-
-
-//##ModelId=3C91B9FC0130
-int Socket::initServer (const string &serv, int proto, int backlog)
-{
- // open a server socket
- errcode_ = errno_sys_ = 0;
- sid = -1;
- server = True;
- connected = bound = False;
- type = proto;
-
- if( type == UNIX )
- {
- host_ = "unix";
- port_ = serv;
- // setup socket address
- unix_addr.sun_family = AF_UNIX;
- FailWhen( serv.length() >= sizeof(unix_addr.sun_path),"socket name too long");
- if( serv[0] == '=' ) // abstract socket name
- {
- memset(unix_addr.sun_path,0,sizeof(unix_addr.sun_path));
- serv.substr(1).copy(unix_addr.sun_path+1,sizeof(unix_addr.sun_path)-1);
- }
- else // socket in filesystem
- serv.copy(unix_addr.sun_path,sizeof(unix_addr.sun_path));
- // create socket
- sid = socket(PF_UNIX,SOCK_STREAM,0);
- if( sid < 0 )
- return set_errcode(SOCKET);
- dprintf(1)("creating unix socket %s\n",serv.c_str());
- if( setDefaults()<0 )
- {
- close(sid);
- sid = -1;
- return errcode_;
- }
- // bind the socket
- int res = bind(sid,(struct sockaddr*)&unix_addr,sizeof(unix_addr));
- dprintf(1)("bind()=%d (%s)\n",res<0?errno:res,res<0?strerror(errno):"OK");
- if( res<0 )
- {
- dprintf(1)("close(fd)\n");
- close(sid);
- sid = -1;
- return set_errcode(BIND);
- }
- bound = True;
- // start listening for connections
- res = listen(sid,backlog);
- dprintf(1)("listen()=%d (%s)\n",res<0?errno:res,res<0?strerror(errno):"OK");
- if( res<0 )
- {
- dprintf(1)("close(fd)\n");
- close(sid);
- sid=-1;
- return set_errcode(LISTEN);
- }
- } // endif type UNIX
- else // networked socket (type TCP or UDP)
- {
- host_ = "localhost";
- port_ = serv;
-
- struct servent *pse; // service info entry
- struct protoent *ppe; // protocol entry
-
- const char *prot = ( type == UDP ? "udp" : "tcp" );
-
- memset(&rmt_addr,0,sizeof(rmt_addr));
- rmt_addr.sin_family = AF_INET;
- rmt_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
- // try to get service by name or port
- if( (pse = getservbyname(serv.c_str(),prot)) != 0 )
- rmt_addr.sin_port = pse->s_port;
- else if( !(rmt_addr.sin_port = htons((u_short)atoi(serv.c_str()))) )
- return errcode_ = PORT;
- // Map protocol name to protocol number
- if( !(ppe = getprotobyname(prot)) )
- return errcode_ = PROTOCOL;
- // open the socket fd
- int soktype = type == TCP ? SOCK_STREAM : SOCK_DGRAM;
- sid = socket(PF_INET, soktype, ppe->p_proto);
- if( sid < 0 )
- return set_errcode(SOCKET);
- dprintf(1)("created server socket, port %d, protocol %d\n",
- ntohs((ushort)rmt_addr.sin_port),(int)ppe->p_proto);
- // set default options
- if( setDefaults()<0 )
- {
- close(sid);
- sid = -1;
- return errcode_;
- }
- // bind to the socket
- int res = bind(sid,(struct sockaddr*)&rmt_addr,sizeof(rmt_addr));
- dprintf(1)("bind()=%d (%s)\n",res<0?errno:res,res<0?strerror(errno):"OK");
- if( res<0 )
- {
- dprintf(1)("close(fd)\n");
- close(sid);
- sid = -1;
- return set_errcode(BIND);
- }
- bound = True;
- // start listening on the socket
- if( type == TCP )
- {
- res = listen(sid,backlog);
- dprintf(1)("listen()=%d (%s)\n",res<0?errno:res,res<0?strerror(errno):"OK");
- if( res<0 )
- {
- dprintf(1)("close(fd)\n");
- close(sid);
- sid=-1;
- return set_errcode(LISTEN);
- }
- }
- else
- {
- memset(&rmt_addr,0,sizeof(rmt_addr));
- }
- } // end else TCP/UDP
-
- // set non-blocking mode
- if( fcntl(sid,F_SETFL,FNDELAY)<0 )
- return set_errcode(SOCKOPT);
-
- return 0;
-}
-
-//##ModelId=3C91BA16008E
-int Socket::initClient (const string &host, const string &serv, int proto, int wait_ms)
-{
- errcode_ = errno_sys_ = 0;
- sid = -1;
- server = False;
- connected = False;
- type = proto;
- host_ = host;
- port_ = serv;
- if( type == UNIX )
- {
- // setup socket address
- string path = host +":" +serv;
- unix_addr.sun_family = AF_UNIX;
- FailWhen(path.length() >= sizeof(unix_addr.sun_path),"socket name too long");
- if( path[0] == '=' ) // abstract socket name
- {
- memset(unix_addr.sun_path,0,sizeof(unix_addr.sun_path));
- path.substr(1).copy(unix_addr.sun_path+1,sizeof(unix_addr.sun_path)-1);
- }
- else // socket in filesystem
- path.copy(unix_addr.sun_path,sizeof(unix_addr.sun_path));
- // create socket
- sid = socket(PF_UNIX,SOCK_STREAM,0);
- if( sid < 0 )
- return set_errcode(SOCKET);
- dprintf(1)("connecting unix socket to %s\n",path.c_str());
- if( setDefaults()<0 )
- {
- close(sid);
- sid = -1;
- return errcode_;
- }
- } // endif type UNIX
- else // networked socket (type TCP or UDP)
- {
- // opens a client socket
- struct servent *pse; // service info entry
- struct hostent *phe; // server host entry
- struct protoent *ppe; // protocol entry
- string host_addr; // address of server host
-
- memset(&rmt_addr,0,sizeof(rmt_addr));
- rmt_addr.sin_family = AF_INET;
-
- const char *prot = ( proto == UDP ? "udp" : "tcp" );
-
- // try to get service by name or port
- if( (pse = getservbyname(serv.c_str(),prot)) != 0 )
- rmt_addr.sin_port = pse->s_port;
- else if( !(rmt_addr.sin_port = htons((u_short)atoi(serv.c_str()))) )
- return errcode_ = PORT;
- // try to get host by name
- if( (phe = gethostbyname(host.c_str())) != 0 )
- {
- if( phe->h_addrtype != AF_INET )
- return errcode_ = BADADDRTYPE;
- host_addr = inet_ntoa(*((struct in_addr*)*(phe->h_addr_list)));
- }
- else
- host_addr = host;
- // try using dot notation
- if( (rmt_addr.sin_addr.s_addr = inet_addr(host_addr.c_str())) == INADDR_NONE )
- return errcode_ = BADHOST;
- // Map protocol name to protocol number
- if( !(ppe = getprotobyname(prot)) )
- return errcode_ = PROTOCOL;
- dprintf(1)("connecting client socket to %s:%s, protocol %d\n",
- host_addr.c_str(),port_.c_str(),ppe->p_proto);
- // open the socket fd
- int soktype = type == TCP ? SOCK_STREAM : SOCK_DGRAM;
- sid = socket(PF_INET,soktype,ppe->p_proto);
- if( sid < 0 )
- return set_errcode(SOCKET);
- // set default options
- if( setDefaults()<0 )
- {
- close(sid);
- sid = -1;
- return errcode_;
- }
- }
-
- // set non-blocking mode
- if( fcntl(sid,F_SETFL,FNDELAY)<0 )
- return set_errcode(SOCKOPT);
- // try to connect
- if( wait_ms >= 0 )
- return connect(wait_ms);
- return 0;
-}
-
-//##ModelId=F1A741D4FEED
-string Socket::errstr () const
-{
- static char const *s_errstr[] = {
- "OK",
- "Can't create socket (%d: %s)",
- "Can't bind local address (%d: %s)",
- "Can't connect to server (%d: %s)",
- "Can't accept client socket (%d: %s)",
- "Bad server host name given",
- "Bad address type",
- "Read error (%d: %s)",
- "Write error (%d: %s)",
- "Remote client closed connection (%d: %s)",
- "Couldn't read/write whole message (%d: %s)",
- "Invalid operation",
- "setsockopt() or getsockopt() failure (%d: %s)",
- "wrong port/service specified (%d: %s)",
- "invalid protocol (%d: %s)",
- "listen() error (%d: %s)",
- "timeout (%d: %s)",
- "connect in progress (%d: %s)",
- "No more clients (%d: %s)",
- "General failure",
- "Uninitialized socket"
- };
- if( errcode_ < NOINIT || errcode_ > 0 )
- return "";
- return Debug::ssprintf(s_errstr[-errcode_],errno,strerror(errno));
-}
-
-//##ModelId=6AE5AA36FEED
-int Socket::connect (int wait_ms)
-{
- if( isServer() )
- return errcode_=INVOP;
- for(;;)
- {
- int res;
- if( type == UNIX )
- res = ::connect(sid,(struct sockaddr*)&unix_addr,sizeof(unix_addr));
- else
- res = ::connect(sid,(struct sockaddr*)&rmt_addr,sizeof(rmt_addr));
- if( !res )
- break; // connected? break out
- else
- {
- dprintf(2)("connect() failed: errno=%d (%s)\n",errno,strerror(errno));
- if( errno == EINPROGRESS || errno == EALREADY )
- {
- {
- errcode_ = INPROGRESS;
- return 0;
- }
- }
- close(sid);
- sid = -1;
- return set_errcode(CONNECT);
- }
- }
- dprintf(1)("connect() successful\n");
- connected = True;
- errcode_ = 0;
- return 1;
-}
-
-//##ModelId=1357FC75FEED
-Socket* Socket::accept ()
-{
- if( !isServer() )
- { errcode_=INVOP; return 0; }
- if( sid<0 )
- { errcode_=NOINIT; return 0; }
- if( type == UDP )
- return this;
- int id;
- if( type == UNIX )
- {
- size_t len = sizeof(unix_addr);
- id = ::accept(sid,(struct sockaddr*)&unix_addr,&len);
- }
- else
- {
- size_t len = sizeof(rmt_addr);
- id = ::accept(sid,(struct sockaddr*)&rmt_addr,&len);
- }
- if( id < 0 )
- {
- dprintf(1)("accept() failed, errno=%d (%s)\n",errno,strerror(errno));
- set_errcode(ACCEPT);
- return 0;
- }
- else
- {
- dprintf(1)("accept() successful\n");
- errcode_=0;
- return type == UNIX
- ? new Socket(id,unix_addr)
- : new Socket(id,rmt_addr);
- }
-}
-
-//##ModelId=5264A6A9FEED
-int Socket::read (void *buf, int maxn)
-{
- if( sid<0 )
- return errcode_=NOINIT;
- FailWhen(!buf,"null buffer");
- errcode_ = 0;
- if( !maxn )
- return 0;
- bool sigpipe = False;
-
- int nread,nleft=maxn;
- if( type != UDP )
- {
- while( nleft>0 && !errcode_ && !sigpipe )
- {
- errno = 0;
- int old_counter = *sigpipe_counter;
- nread = ::read( sid,buf,nleft ); // try to read something
- sigpipe = old_counter != *sigpipe_counter; // check for SIGPIPE
- dprintf(3)("read(%d)=%d%s, errno=%d (%s)\n",nleft,nread,
- sigpipe?" SIGPIPE":"",errno,strerror(errno));
- if( Debug(10) && nread>0 )
- printData(buf,min(nread,200));
- if( nread<0 ) // error?
- {
- if( errno == EWOULDBLOCK || errno == EAGAIN )
- { // if refuses to block, that's OK, return 0
- errcode_ = TIMEOUT;
- return maxn - nleft;
- }
- else // else a real error
- return set_errcode(READERR);
- }
- else if( nread == 0 )
- return errcode_ = PEERCLOSED;
- else
- {
- buf = nread + (char*)buf;
- nleft -= nread;
- }
- }
- }
- else // UDP socket
- {
- errno = 0;
-// if ((wres=Wait(rtimeout,SWAIT_READ))==0)
-// errcode_=SK_TIMEOUT;
-// else
- socklen_t alen = sizeof(rmt_addr);
- if( (nread=recvfrom(sid,(char*)buf,maxn,0,
- (struct sockaddr*)&rmt_addr,&alen))<=0 ||
- errno )
- return set_errcode(READERR);
- else
- {
- nleft = 0;
- connected = True;
- }
- }
-
- if( sigpipe )
- return errcode_ = PEERCLOSED;
-
- return maxn-nleft;
-}
-
-//##ModelId=139EF112FEED
-int Socket::write (const void *buf, int n)
-{
- if( sid<0 )
- return errcode_=NOINIT;
- FailWhen(!buf,"null buffer");
- errcode_ = 0;
- if( !n )
- return 0;
- bool sigpipe = False;
-
- int nleft=n,nwr;
- if( type != UDP ) // TCP or UNIX: write to stream
- {
- while( nleft>0 && !errcode_ && !sigpipe)
- {
- errno = 0;
- int old_counter = *sigpipe_counter;
- nwr = ::write(sid,buf,nleft);
- sigpipe = old_counter != *sigpipe_counter; // check for SIGPIPE
- dprintf(3)("write(%d)=%d%s, errno=%d (%s)\n",nleft,nwr,
- sigpipe?" SIGPIPE":"",errno,strerror(errno));
- if( Debug(10) && nwr>0 )
- printData(buf,min(nwr,200));
- if( nwr<0 )
- {
- if( errno == EWOULDBLOCK || errno == EAGAIN )
- { // if refuses to block, that's OK, return 0
- errcode_ = TIMEOUT;
- return n - nleft;
- }
- else // else a real error
- return set_errcode(WRITERR);
- }
- else if( nwr==0 )
- return errcode_ = PEERCLOSED;
- else
- {
- buf = nwr + (char*)buf;
- nleft -= nwr;
- }
- }
- }
- else // UDP
- {
- errno = 0;
- if( !connected )
- return errcode_ = WRITERR;
- if( (nwr = sendto(sid,(char*)buf,n,0,(struct sockaddr*)&rmt_addr,
- sizeof(rmt_addr)))<=0 || errno )
- return set_errcode(WRITERR);
- else
- nleft=0;
- }
-
- if( sigpipe )
- return errcode_ = PEERCLOSED;
-
- return n - nleft;
-}
-
-//##ModelId=890ACD77FEED
-int Socket::shutdown (bool receive, bool send)
-{
- FailWhen(!receive && !send,"neither receive nor send specified");
- if( sid<0 )
- return errcode_ = NOINIT;
- errcode_ = 0;
- int how = receive ? (send ? 2 : 0) : 1;
- int res = shutdown(sid,how);
- dprintf(1)("shutdown(%d)=%d",how,res);
- if( res<0 )
- return set_errcode(SHUTDOWN);
- return 0;
-}
-
-//##ModelId=3EE80597FEED
-int Socket::setDefaults ()
-{
- if( sid<0 )
- return errcode_ = NOINIT;
-
- uint val=1;
- struct linger lin = { 1,1 };
-
-
- if( setsockopt(sid,SOL_SOCKET,SO_REUSEADDR,(char*)&val,sizeof(val))<0 )
- return set_errcode(SOCKOPT);
-
- // no more defaults for UNIX sockets
- if( type == UNIX )
- return 0;
-
- if( setsockopt(sid,SOL_SOCKET,SO_KEEPALIVE,(char*)&val,sizeof(val) )<0)
- return set_errcode(SOCKOPT);
-
- if( setsockopt(sid,SOL_SOCKET,SO_LINGER,(const char*)&lin,sizeof(lin))<0 )
- return set_errcode(SOCKOPT);
-
- if( getsockopt(sid,SOL_SOCKET,SO_SNDBUF,(char*)&sbuflen,&val)<0 )
- return set_errcode(SOCKOPT);
-
- if( getsockopt(sid,SOL_SOCKET,SO_RCVBUF,(char*)&rbuflen,&val)<0 )
- return set_errcode(SOCKOPT);
-
- return 0;
-}
-
-// Additional Declarations
-//##ModelId=3DB936D50067
-int Socket::readblock (void *buf, int maxn)
-{
- if( sid<0 )
- return errcode_=NOINIT;
- if( !maxn )
- return 0;
- FailWhen(!buf,"null buffer");
- errcode_ = 0;
- int nread,nleft=maxn;
- if( type != UDP )
- {
- while( nleft>0 )
- {
- errno = 0;
- nread = ::read( sid,buf,nleft ); // try to read something
- dprintf(3)("read(%d)=%d, errno=%d (%s)\n",nleft,nread,errno,strerror(errno));
- if( do_intr )
- return set_errcode(INCOMPLETE);
- if( Debug(10) && nread>0 )
- printData(buf,min(nread,200));
- if( nread<0 ) // error?
- {
- // return error (except in a few special cases)
- if( errno != EWOULDBLOCK && errno != EAGAIN && errno != EINTR )
- return set_errcode(READERR);
- }
- else if( nread == 0 ) // peer closed connection -- return
- return errcode_ = PEERCLOSED;
- else
- {
- buf = nread + (char*)buf;
- nleft -= nread;
- }
- }
- }
- else // UDP socket
- {
- errno = 0;
-// if ((wres=Wait(rtimeout,SWAIT_READ))==0)
-// errcode_=SK_TIMEOUT;
-// else
- socklen_t alen = sizeof(rmt_addr);
- if( (nread=recvfrom(sid,(char*)buf,maxn,0,
- (struct sockaddr*)&rmt_addr,&alen))<=0 ||
- errno )
- return set_errcode(READERR);
- else
- {
- nleft = 0;
- connected = True;
- }
- }
-
- return maxn;
-}
-
-//##ModelId=3DB936D6007C
-int Socket::writeblock (const void *buf, int n)
-{
- if( sid<0 )
- return errcode_=NOINIT;
- if( !n )
- return 0;
- FailWhen(!buf,"null buffer");
- errcode_ = 0;
-
- int nleft=n,nwr;
- if( type != UDP ) // TCP or UNIX: write to stream
- {
- while( nleft>0 )
- {
- errno = 0;
- nwr = ::write(sid,buf,nleft);
- dprintf(3)("write(%d)=%d, errno=%d (%s)\n",nleft,nwr,errno,strerror(errno));
- if( do_intr )
- return set_errcode(INCOMPLETE);
- if( Debug(10) && nwr>0 )
- printData(buf,min(nwr,200));
- if( nwr<0 )
- {
- if( errno != EWOULDBLOCK && errno != EAGAIN && errno != EINTR )
- return set_errcode(WRITERR);
- }
- else if( nwr==0 )
- return errcode_ = PEERCLOSED;
- else
- {
- buf = nwr + (char*)buf;
- nleft -= nwr;
- }
- }
- }
- else // UDP
- {
- errno = 0;
- if( !connected )
- return errcode_ = WRITERR;
- if( (nwr = sendto(sid,(char*)buf,n,0,(struct sockaddr*)&rmt_addr,
- sizeof(rmt_addr)))<=0 || errno )
- return set_errcode(WRITERR);
- else
- nleft=0;
- }
-
- return n;
-}
-
-
-//##ModelId=3DB936D700EC
-void Socket::printData (const void *buf,int n)
-{
- char hex[64],chars[32];
- chars[20] = 0;
- const unsigned char *ch=(const unsigned char*)buf;
- for( int i=0; i<n; i++,ch++ )
- {
- int pos = i%20;
- if( i && !pos )
- {
- printf("%-60s%-20s\n",hex,chars);
- hex[0] = chars[0] = 0;
- }
- sprintf(hex+pos*3,"%02x ",(int)*ch);
- chars[pos] = (*ch>=32 && *ch<=127) ? *ch : '.';
- }
- if( strlen(hex) )
- {
- if( n%20 )
- chars[n%20] = 0;
- printf("%-60s%-20s\n",hex,chars);
- }
-}
-
-//##ModelId=3DB936D3037B
-void Socket::interrupt (bool intr)
-{
- do_intr = intr;
-}
-
-string Socket::sdebug ( int detail,const string &,const char *name ) const
-{
- string out;
- if( detail>=0 ) // basic detail
- {
- out = Debug::ssprintf("%s/%d",name?name:"Socket",sid);
- if( server )
- Debug::append(out,"S");
- if( connected )
- Debug::append(out,"c");
- }
- if( detail >= 1 || detail == -1 ) // normal detail
- {
- Debug::appendf(out,"err:%d",errcode_);
- if( errcode_ )
- Debug::append(out,errstr());
- }
- return out;
-}
diff --git a/CEP/CPA/OCTOPUSSY/src/Net/Socket.h b/CEP/CPA/OCTOPUSSY/src/Net/Socket.h
deleted file mode 100755
index 6f44accd2e0..00000000000
--- a/CEP/CPA/OCTOPUSSY/src/Net/Socket.h
+++ /dev/null
@@ -1,344 +0,0 @@
-#ifndef Socket_h
-#define Socket_h 1
-
-#include "DMI/Common.h"
-#include "DMI/DMI.h"
-
-#include <resolv.h>
-#include <errno.h>
-#include <sys/un.h>
-
-
-//##ModelId=3C90CE58024E
-class Socket
-{
- //##ModelId=3DB936CC0314
- LocalDebugSubContext;
-
- public:
- //##ModelId=3C91BA4300F6
- Socket (const string &sname = "");
-
- //##ModelId=9FD2BC39FEED
- //##Documentation
- //## Creates server socket
- Socket (
- //##Documentation
- //## service name/port number
- const string &sname, const string &serv,
- int proto = Socket::TCP, int backlog = 5);
-
- //##ModelId=C15CE2A5FEED
- //##Documentation
- //## Creates client socket
- Socket (
- //##Documentation
- //## remote host
- const string &sname, const string &host,
- //##Documentation
- //## service name/port number
- const string &serv,
- int proto = Socket::TCP, int wait_ms = -1);
-
- //##ModelId=3DB936D00067
- ~Socket();
-
-
- //##ModelId=3C91B9FC0130
- int initServer (const string &serv, int proto = Socket::TCP, int backlog = 5);
-
- //##ModelId=3C91BA16008E
- int initClient (const string &host, const string &serv, int proto = Socket::TCP, int wait_ms = -1);
-
- //##ModelId=F1A741D4FEED
- string errstr () const;
-
- //##ModelId=3A99B058FEED
- bool ok ();
-
- //##ModelId=6AE5AA36FEED
- //##Documentation
- //## Attempts to connect to a server socket.
- int connect (int wait_ms = 0);
-
- //##ModelId=1357FC75FEED
- //##Documentation
- //## Tries to accept an incoming connection on a server socket.
- Socket* accept ();
-
- //##ModelId=5264A6A9FEED
- //##Documentation
- //## Reads up to maxn bytes from socket.
- int read (void *buf, int maxn);
-
- //##ModelId=139EF112FEED
- //##Documentation
- //## Writes n bytes to socket.
- int write (const void *buf, int n);
-
- //##ModelId=890ACD77FEED
- //##Documentation
- //## Shuts down the socket for receive and/or send
- int shutdown (bool receive, bool send);
-
- //##ModelId=3DB936D000E9
- const string& getName () const;
- //##ModelId=3DB936D001E4
- void setName (const string& value);
-
- //##ModelId=3DB936D003C4
- int errcode () const;
-
- //##ModelId=3DB936D100CD
- int errno_sys () const;
-
- //##ModelId=3DB936D101DB
- int getSid () const;
-
- //##ModelId=3DB936D102D5
- int getType () const;
-
- //##ModelId=3DB936D20006
- bool isServer () const;
-
- //##ModelId=3DB936D20128
- bool isConnected () const;
-
- //##ModelId=3DB936D20255
- const string& host () const;
-
- //##ModelId=3DB936D20377
- const string& port () const;
-
- // Data Members for Class Attributes
-
- // Additional Public Declarations
- //##ModelId=3DB936520032
- typedef enum {
- UDP, // UDP datagram socket
- TCP, // TCP (stream) socket over network
- UNIX, // unix socket (local)
- LOCAL=UNIX
- } SocketTypes;
- //##ModelId=3DB9365200B4
- typedef enum {
- SK_OK = 0, // Ok
- SOCKET = -1, // Can't create socket
- BIND = -2, // Can't bind local address
- CONNECT = -3, // Can't connect to server
- ACCEPT = -4, // Can't accept client socket
- BADHOST = -5, // Bad server host name given
- BADADDRTYPE = -6, // Bad address type
- READERR = -7, // Read error
- WRITERR = -8, // Write error
- PEERCLOSED = -9, // Remote client closed connection
- INCOMPLETE = -10, // Couldn't read/write whole message
- INVOP = -11, // Invalid operation
- SOCKOPT = -12, // sockopt() failure
- PORT = -13, // wrong port/service specified
- PROTOCOL = -14, // invalid protocol
- LISTEN = -15, // listen() error
- TIMEOUT = -16, // timeout
- INPROGRESS = -17, // connect() in progress
- NOMORECLI = -18, // No more clients
- SHUTDOWN = -19, // shutdown() failure
- NOINIT = -20 // uninitialized socket
- } ErrorCodes;
-
- // sets blocking mode on socket if block is true
- // (default sockets are non-blocking)
- //##ModelId=3DB936D300BC
- int setBlocking (bool block=true);
-
- // interrupts readblock / writeblock calls (for multithreaded sockets)
- //##ModelId=3DB936D3037B
- void interrupt (bool intr=True);
-
- // points socket at SIGPIPE counter
- //##ModelId=3DB936D401F6
- void setSigpipeCounter (const volatile int *counter);
-
- // Reads maxn bytes from socket (in blocking mode)
- //##ModelId=3DB936D50067
- int readblock (void *buf, int maxn);
- // Writes n bytes to socket (in blocking mode)
- //##ModelId=3DB936D6007C
- int writeblock (const void *buf, int n);
-
- // helper function: prints formatted data from buffer
- //##ModelId=3DB936D700EC
- static void printData (const void *buf,int n);
-
- //##ModelId=3DB936D80210
- Declare_sdebug( );
- //##ModelId=3DB936D802BA
- Declare_debug( );
- protected:
- //##ModelId=4760B82BFEED
- //##Documentation
- //## Constructs a generic socket for an incoming connection on a server
- //## socket.
- Socket (int id, struct sockaddr_in &sa);
-
- //##ModelId=3CC95D6E032A
- Socket (int id, struct sockaddr_un &sa);
-
-
- //##ModelId=3EE80597FEED
- //##Documentation
- //## Sets default socket options
- int setDefaults ();
-
- // Additional Protected Declarations
- //##ModelId=3DB936D8036E
- int set_errcode (int n);
- private:
- //##ModelId=3DB936D902EE
- Socket(const Socket &right);
-
- //##ModelId=3DB936DA0277
- Socket & operator=(const Socket &right);
-
- private:
- // Data Members for Class Attributes
-
- //##ModelId=3C90CE5803BA
- string name;
-
- //##ModelId=3C90CE5803C1
- int errcode_;
-
- //##ModelId=3C91B661029C
- int errno_sys_;
-
- //##ModelId=3C90CE590017
- int sid;
-
- //##ModelId=3C90CE590038
- int type;
-
- //##ModelId=3C90CE590039
- bool server;
-
- //##ModelId=3C90CE59009B
- bool connected;
-
- //##ModelId=3CC00CDC00EA
- string host_;
-
- //##ModelId=3CC00CE902E8
- string port_;
-
- //##ModelId=3C90CE59009C
- int sbuflen;
-
- //##ModelId=3C90CE5900A1
- int rbuflen;
-
- // Additional Implementation Declarations
- //##ModelId=3DB936CE001E
- bool do_intr; // flag: interrupt readblock/writeblock call
- //##ModelId=3DB936CE01B9
- bool bound;
- //##ModelId=3DB936CE0321
- struct sockaddr_in rmt_addr; // connected client address (TCP)
- //##ModelId=3DB936CF00CA
- struct sockaddr_un unix_addr; // connected client address (UNIX)
-
- //##ModelId=3C90CE5803B3
- const volatile int *sigpipe_counter;
- //##ModelId=3DB936CF02C9
- static int default_sigpipe_counter;
-};
-
-// Class Socket
-
-
-//##ModelId=3A99B058FEED
-inline bool Socket::ok ()
-{
- return sid >= 0 && !errcode_;
-}
-
-//##ModelId=3DB936D000E9
-inline const string& Socket::getName () const
-{
- return name;
-}
-
-//##ModelId=3DB936D001E4
-inline void Socket::setName (const string& value)
-{
- name = value;
-}
-
-//##ModelId=3DB936D003C4
-inline int Socket::errcode () const
-{
- return errcode_;
-}
-
-//##ModelId=3DB936D100CD
-inline int Socket::errno_sys () const
-{
- return errno_sys_;
-}
-
-//##ModelId=3DB936D101DB
-inline int Socket::getSid () const
-{
- return sid;
-}
-
-//##ModelId=3DB936D102D5
-inline int Socket::getType () const
-{
- return type;
-}
-
-//##ModelId=3DB936D20006
-inline bool Socket::isServer () const
-{
- return server;
-}
-
-//##ModelId=3DB936D20128
-inline bool Socket::isConnected () const
-{
- return connected;
-}
-
-//##ModelId=3DB936D20255
-inline const string& Socket::host () const
-{
- return host_;
-}
-
-//##ModelId=3DB936D20377
-inline const string& Socket::port () const
-{
- return port_;
-}
-
-//##ModelId=3DB936D8036E
-inline int Socket::set_errcode ( int n )
-{
- errno_sys_ = errno;
- return errcode_ = n;
-}
-
-//##ModelId=3DB936D401F6
-inline void Socket::setSigpipeCounter (const volatile int *counter)
-{
- sigpipe_counter = counter;
-}
-
-
-#endif
-
-
-// Detached code regions:
-#if 0
- sigpipe = True;
-
-#endif
--
GitLab