diff options
| author | nenolod <nenolod@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-04-08 01:35:02 +0000 |
|---|---|---|
| committer | nenolod <nenolod@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-04-08 01:35:02 +0000 |
| commit | ab24f0dca4050e6bd11ace131b7ac7bb53d42bae (patch) | |
| tree | bf75d042c2cd7a1ab146645ba3cc9bb1bca62dcc /src | |
| parent | ac6b0d3f1d2f5c389ba06629a8f2b26ca994d3f0 (diff) | |
- first steps towards a working IPv6 port. I'll work more on this tomorrow. :-P
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3845 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspircd.cpp | 6 | ||||
| -rw-r--r-- | src/inspircd_io.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 79a6f1976..bdb1812c3 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -77,7 +77,9 @@ extern char LOG_FILE[MAXBUF]; int openSockfd[MAX_DESCRIPTORS]; int yield_depth; int iterations = 0; -sockaddr_in client,server; + +insp_sockaddr client, server; + socklen_t length; extern InspSocket* socket_ref[MAX_DESCRIPTORS]; @@ -598,7 +600,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) InspSocket* s = NULL; InspSocket* s_del = NULL; unsigned int numberactive; - sockaddr_in sock_us; // our port number + insp_sockaddr sock_us; // our port number socklen_t uslen; // length of our port number if (yield_depth > 100) diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp index ddad3d388..723e5a48a 100644 --- a/src/inspircd_io.cpp +++ b/src/inspircd_io.cpp @@ -1365,10 +1365,10 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in * a maximum of one second before it times out, using the DNS * server specified in the configuration file. */ -bool BindSocket(int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr) +bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) { memset(&server,0,sizeof(server)); - struct in_addr addy; + insp_inaddr addy; bool resolved = false; char resolved_addr[128]; @@ -1463,7 +1463,7 @@ bool HasPort(int port, char* addr) int BindPorts(bool bail) { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; - sockaddr_in client,server; + insp_sockaddr client, server; int clientportcount = 0; int BoundPortCount = 0; |