[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2980] `startupSocketLib' moved inside `Socket'.
From: |
Giuseppe Scrivano |
Subject: |
[myserver-commit] [2980] `startupSocketLib' moved inside `Socket'. |
Date: |
Fri, 26 Dec 2008 22:30:21 +0000 |
Revision: 2980
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2980
Author: gscrivano
Date: 2008-12-26 22:30:20 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
`startupSocketLib' moved inside `Socket'.
Modified Paths:
--------------
trunk/myserver/include/base/socket/socket.h
trunk/myserver/src/base/socket/socket.cpp
trunk/myserver/src/server/server.cpp
Modified: trunk/myserver/include/base/socket/socket.h
===================================================================
--- trunk/myserver/include/base/socket/socket.h 2008-12-10 21:25:14 UTC (rev
2979)
+++ trunk/myserver/include/base/socket/socket.h 2008-12-26 22:30:20 UTC (rev
2980)
@@ -61,11 +61,12 @@
typedef struct sockaddr_storage MYSERVER_SOCKADDRIN;
typedef struct sockaddr_storage MYSERVER_SOCKADDR;
typedef struct hostent MYSERVER_HOSTENT;
-int startupSocketLib(u_short);
class Socket: public Stream
{
public:
+ static int startupSocketLib ();
+
void setServerSocket(Socket*);
Socket* getServerSocket();
Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp 2008-12-10 21:25:14 UTC (rev
2979)
+++ trunk/myserver/src/base/socket/socket.cpp 2008-12-26 22:30:20 UTC (rev
2980)
@@ -42,14 +42,14 @@
/*!
*Source code to wrap the socket library to MyServer project.
*/
-int startupSocketLib(u_short ver)
+int Socket::startupSocketLib()
{
#ifdef WIN32
/*!
*Under windows we need to initialize the socket library before use it.
*/
WSADATA wsaData;
- return WSAStartup(ver, &wsaData);
+ return WSAStartup(MAKEWORD( 1, 1), &wsaData);
#else
return 0;
#endif
Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp 2008-12-10 21:25:14 UTC (rev
2979)
+++ trunk/myserver/src/server/server.cpp 2008-12-26 22:30:20 UTC (rev
2980)
@@ -55,14 +55,6 @@
}
#include <sstream>
-#ifdef NOT_WIN
-#define LPINT int *
-#define INVALID_SOCKET -1
-#define WORD unsigned int
-#define BYTE unsigned char
-#define MAKEWORD(a, b) ((WORD) (((BYTE) (a)) | ((WORD) ((BYTE) (b))) << 8))
-#endif
-
#if HAVE_IPV6
const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
#endif
@@ -241,7 +233,7 @@
/* Startup the socket library. */
logWriteln(languageParser.getValue("MSG_ISOCK") );
- if(startupSocketLib(MAKEWORD( 1, 1)) != 0)
+ if(Socket::startupSocketLib() != 0)
{
logWriteln( languageParser.getValue ("MSG_SERVER_CONF"),
MYSERVER_LOG_MSG_ERROR);
return 1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2980] `startupSocketLib' moved inside `Socket'.,
Giuseppe Scrivano <=