Port server to hugin.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/socket.cc b/src/socket.cc
index b34bae6..1fffc87 100644
--- a/src/socket.cc
+++ b/src/socket.cc
@@ -31,16 +31,16 @@
 // for gethostbyname
 #include <netdb.h>
 
-Socket::Socket(Info *ginfo)
+#include <hugin.hpp>
+
+Socket::Socket()
 {
-  info = ginfo;
   connected = false;
   err = 0;
 }
 
-Socket::Socket(u_short port, Info *ginfo)
+Socket::Socket(u_short port)
 {
-  info = ginfo;
   connected = false;
   err = 0;
 
@@ -52,7 +52,7 @@ Socket::Socket(u_short port, Info *ginfo)
 
   if (ssocket < 0) {
     err = 1;
-    info->error("Socket: socket() failed!");
+    ERR(socket, "Socket: socket() failed!");
   }
 
   memset((char *) &socketaddr, 0, sizeof(socketaddr));
@@ -73,10 +73,10 @@ Socket::~Socket()
 
 Socket Socket::slisten()
 {
-  Socket s = Socket(info);
+  Socket s = Socket();
 
   if(err) {
-    //info->error("Socket: No socket present!");
+    ERR(socket, "Socket: No socket present!");
     return s;
   }
   if(!connected) {
@@ -84,7 +84,7 @@ Socket Socket::slisten()
     err = bind(ssocket, (struct sockaddr*)&socketaddr, sizeof(socketaddr));
     
     if (err) {
-      info->error("Socket: bind() failed! %s", strerror(errno));
+      ERR(socket, "Socket: bind() failed! %s", strerror(errno));
       return s;
     }
     
@@ -92,7 +92,7 @@ Socket Socket::slisten()
     // requests (max 5 in queue)
     err = listen(ssocket, 5);
     if(err) {
-      info->error("Socket: listen() failed! %s", strerror(errno));
+      ERR(socket, "Socket: listen() failed! %s", strerror(errno));
       return s;
     }
   }
@@ -107,7 +107,7 @@ Socket Socket::slisten()
   if (s.ssocket < 0) {
     s.connected = false;
     err = 1;
-    info->error("Socket: accept() failed! %s", strerror(errno));
+    ERR(socket, "Socket: accept() failed! %s", strerror(errno));
     return s;
   }
 
@@ -121,7 +121,7 @@ int Socket::sconnect(char *addr)
 {
   if(err) {
     connected = false;
-    info->error("Socket: No socket present!");
+    ERR(socket, "Socket: No socket present!");
     return err;
   }
 
@@ -146,7 +146,7 @@ int Socket::sconnect(char *addr)
   err = connect(ssocket, (struct sockaddr*)&socketaddr, sizeof(socketaddr));
   if (err) {
     connected = false;
-    info->error("Socket: connect() failed! %s", strerror(errno));
+    ERR(socket, "Socket: connect() failed! %s", strerror(errno));
     return err;
   }
   //  fprintf(stderr, "Socket connected\n");