extern time_t TIME;
/** This will bind a socket to a port. It works for UDP/TCP.
- * If a hostname is given to bind to, the function will first
- * attempt to resolve the hostname, then bind to the IP the
- * hostname resolves to. This is a blocking lookup blocking for
- * a maximum of one second before it times out, using the DNS
- * server specified in the configuration file.
+ * It can only bind to IP addresses, if you wish to bind to hostnames
+ * you should first resolve them using class 'Resolver'.
*/
bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
{
memset(&server,0,sizeof(server));
insp_inaddr addy;
- bool resolved = false;
- char resolved_addr[128];
if (*addr == '*')
*addr = 0;
- if (*addr && !inet_aton(addr,&addy))
+ if ((*addr) && (insp_aton(addr,&addy) < 1))
{
- /* If they gave a hostname, bind to the IP it resolves to */
- if (CleanAndResolve(resolved_addr, addr, true))
- {
- inet_aton(resolved_addr,&addy);
- log(DEFAULT,"Resolved binding '%s' -> '%s'",addr,resolved_addr);
- server.sin_addr = addy;
- resolved = true;
- }
- else
- {
- log(DEFAULT,"WARNING: Could not resolve '%s' to an IP for binding to on port %d",addr,port);
- return false;
- }
+ log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
+ return false;;
}
- server.sin_family = AF_INET;
- if (!resolved)
+
+#ifdef IPV6
+ server.sin6_family = AF_FAMILY;
+#else
+ server.sin_family = AF_FAMILY;
+#endif
+ if (!*addr)
{
- if (!*addr)
- {
- server.sin_addr.s_addr = htonl(INADDR_ANY);
- }
- else
- {
- server.sin_addr = addy;
- }
+#ifdef IPV6
+ memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+#else
+ server.sin_addr.s_addr = htonl(INADDR_ANY);
+#endif
+ }
+ else
+ {
+#ifdef IPV6
+ memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+#else
+ server.sin_addr = addy;
+#endif
}
+#ifdef IPV6
+ server.sin6_port = htons(port);
+#else
server.sin_port = htons(port);
+#endif
if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0)
{
return false;
int on = 1;
struct linger linger = { 0 };
- if ((sockfd = socket (AF_INET, SOCK_STREAM, 0)) < 0)
+ if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0)
{
log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
return (ERROR);
bool HasPort(int port, char* addr)
{
- for (int count = 0; count < ServerInstance->stats->BoundPortCount; count++)
+ for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++)
{
if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
{
return BoundPortCount;
}
+
+const char* insp_ntoa(insp_inaddr n)
+{
+ static char buf[1024];
+ inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
+ return buf;
+}
+
+int insp_aton(const char* a, insp_inaddr* n)
+{
+ return inet_pton(AF_FAMILY, a, n);
+}
+