Merge with 'charybdis-ts6only' branch.

[irc/rqf/shadowircd.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 32a3b8ef15d12670a6cbb46937e1aa181fda1a3f..9a652d0c803f1901a4520b45b8a54c42f91b7176 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -35,8 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
@@ -1177,7 +1176,7 @@ serv_connect_resolved(struct Client *client_p)
        }
 
        /* log */
-       inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
+       rb_inet_ntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
        ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", client_p->name, client_p->sockhost, port,
 #ifdef RB_IPV6
                        server_p->aftype == AF_INET6 ? "IPv6" :
@@ -1231,7 +1230,7 @@ serv_connect_dns_callback(void *vptr, struct DNSReply *reply)
 #endif
                ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = port;
        /* Set sockhost properly now -- jilles */
-       inetntop_sock((struct sockaddr *)&client_p->localClient->ip,
+       rb_inet_ntop_sock((struct sockaddr *)&client_p->localClient->ip,
                        client_p->sockhost, sizeof client_p->sockhost);
        serv_connect_resolved(client_p);
 }