X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/28f552b84b319d50c4c1d97c08b7f84db88dbe89..082f064da8876b7fd2a9db8e332945c2e494926e:/gameserv/sockhelp.cpp

diff --git a/gameserv/sockhelp.cpp b/gameserv/sockhelp.cpp
index 25cfcb5..1536767 100644
--- a/gameserv/sockhelp.cpp
+++ b/gameserv/sockhelp.cpp
@@ -13,6 +13,7 @@
  */
 
 #include "sockhelp.h"
+#include "extern.h"
 
 /* Take a service name, and a service type, and return a port number.  If 
 the
@@ -22,19 +23,14 @@ int atoport(char *service, char *proto)
 {
   int port;
   long int lport;
-  struct servent *serv;
   char *errpos;
 
-  /* First try to read it from /etc/services */
-  serv = getservbyname(service, proto);
-  if (serv != NULL)
-    port = serv->s_port;
-  else { /* Not in services, maybe a number? */
     lport = strtol(service,&errpos,0);
     if ( (errpos[0] != 0) || (lport < 1) || (lport > 65535) )
       return -1; /* Invalid port address */
+
     port = htons(lport);
-  }
+
   return port;
 }
 
@@ -191,7 +187,7 @@ int make_connection(char *service, int type, char *netaddress)
 
   sock = socket(AF_INET, type, 0);
 
-  printf("Connecting to %s on port %d.\n",inet_ntoa(*addr),htons(port));
+  log("Connecting to %s on port %d.",inet_ntoa(*addr),htons(port));
 
   if (type == SOCK_STREAM) {
     connected = connect(sock, (struct sockaddr *) &address,