warning fixes, and fix signal handling

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index 7e1d9a080334659a85090161a26b2e75472f5379..f8eb971dbe1bb28beedd2fac937de1d8e2336ddc 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -15,23 +15,24 @@
 class TCPsocket {
 public:
        TCPsocket::TCPsocket(void);
-       int attach(char *, char *);
+       int attach(const char *, const char *);
        void detach(void);
        void serv_read(char *, int);
        void serv_write(char *, int);
        void serv_gets(char *);
-       void serv_puts(char *);
+       void serv_puts(const char *);
        bool is_connected(void);
 private:
        int serv_sock;
-       int connectsock(char *, char *, char *);
-       void timeout(int);
+       int connectsock(const char *, const char *, const char *);
+       static void timeout(int);
 };
 
 
 
 // CitClient represents an application-level connection to a Citadel server.
 class CitClient {
+       friend TCPsocket::timeout(int);
 public:
        CitClient(void);
        ~CitClient(void);
@@ -263,3 +264,4 @@ void load_roomlist(RoomTree *tree, CitClient *citsock);
 
 extern wxMDIParentFrame *BigMDI;
 extern RoomTree *RoomList;
+extern CitClient *citadel;

diff --git a/daphne/tcp_sockets.cpp b/daphne/tcp_sockets.cpp
index cc96232f5e44641ea2fe458569c852f5c85dfad9..cabe7c1b3f1aee6f6166ccb4d3acedd3d1921708 100644 (file)
--- a/daphne/tcp_sockets.cpp
+++ b/daphne/tcp_sockets.cpp
@@ -32,11 +32,11 @@ TCPsocket::TCPsocket(void) {
 
 void TCPsocket::timeout(int signum) {
        fprintf(stderr, "Connection timed out.\n");
-       serv_sock = (-1);
+       citadel->sock.serv_sock = (-1);
 }
 
-int TCPsocket::connectsock(char *host, char *service,
-                       char *protocol)
+int TCPsocket::connectsock(const char *host, const char *service,
+                       const char *protocol)
 {
        struct hostent *phe;
        struct servent *pse;
@@ -169,7 +169,7 @@ void TCPsocket::serv_write(char *buf, int nbytes)
 /*
  * send line to server
  */
-void TCPsocket::serv_puts(char *string)
+void TCPsocket::serv_puts(const char *string)
 {
        char buf[256];
 
@@ -178,7 +178,7 @@ void TCPsocket::serv_puts(char *string)
        }
 
 
-int TCPsocket::attach(char *host, char *port) {
+int TCPsocket::attach(const char *host, const char *port) {
        serv_sock = connectsock(host, port, "tcp");
        if (serv_sock >= 0) return 0;
        else return (-1);