- Tue Sep 5 04:41:45 GMT 2000

[libfaim.git] / aim_conn.c

diff --git a/aim_conn.c b/aim_conn.c
index 47073910212f68617ea9d24d055d502f6b5f3d65..16ab711c5be8bac8e2e7f7bec093ff5f61cfbcd4 100644 (file)
--- a/aim_conn.c
+++ b/aim_conn.c
@@ -8,10 +8,16 @@
 
 #include <faim/aim.h> 
 
+#ifndef _WIN32
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
 /*
  * Clears out connection list, killing remaining connections.
  */
-void aim_connrst(struct aim_session_t *sess)
+faim_internal void aim_connrst(struct aim_session_t *sess)
 {
   faim_mutex_init(&sess->connlistlock);
   if (sess->connlist) {
@@ -31,7 +37,7 @@ void aim_connrst(struct aim_session_t *sess)
 /*
  * Gets a new connection structure.
  */
-struct aim_conn_t *aim_conn_getnext(struct aim_session_t *sess)
+faim_internal struct aim_conn_t *aim_conn_getnext(struct aim_session_t *sess)
 {
   struct aim_conn_t *newconn, *cur;
 
@@ -74,7 +80,7 @@ static void aim_conn_init(struct aim_conn_t *deadconn)
   return;
 }
 
-void aim_conn_kill(struct aim_session_t *sess, struct aim_conn_t **deadconn)
+faim_export void aim_conn_kill(struct aim_session_t *sess, struct aim_conn_t **deadconn)
 {
   struct aim_conn_t *cur;
 
@@ -111,7 +117,7 @@ void aim_conn_kill(struct aim_session_t *sess, struct aim_conn_t **deadconn)
   return;
 }
 
-void aim_conn_close(struct aim_conn_t *deadconn)
+faim_export void aim_conn_close(struct aim_conn_t *deadconn)
 {
   int typesav = -1, subtypesav = -1;
   void *privsav = NULL;
@@ -141,8 +147,8 @@ void aim_conn_close(struct aim_conn_t *deadconn)
   return;
 }
 
-struct aim_conn_t *aim_getconn_type(struct aim_session_t *sess,
-                                   int type)
+faim_internal struct aim_conn_t *aim_getconn_type(struct aim_session_t *sess,
+                                                 int type)
 {
   struct aim_conn_t *cur;
 
@@ -164,8 +170,8 @@ struct aim_conn_t *aim_getconn_type(struct aim_session_t *sess,
  * FIXME: Return errors in a more sane way.
  *
  */
-struct aim_conn_t *aim_newconn(struct aim_session_t *sess,
-                              int type, char *dest)
+faim_export struct aim_conn_t *aim_newconn(struct aim_session_t *sess,
+                                          int type, char *dest)
 {
   struct aim_conn_t *connstruct;
   int ret;
@@ -198,7 +204,7 @@ struct aim_conn_t *aim_newconn(struct aim_session_t *sess,
    *
    */
 
-  for(i=0;i<strlen(dest);i++) {
+  for(i=0;i<(int)strlen(dest);i++) {
     if (dest[i] == ':') {
       port = atoi(&(dest[i+1]));
       break;
@@ -236,7 +242,7 @@ struct aim_conn_t *aim_newconn(struct aim_session_t *sess,
   return connstruct;
 }
 
-int aim_conngetmaxfd(struct aim_session_t *sess)
+faim_export int aim_conngetmaxfd(struct aim_session_t *sess)
 {
   int j = 0;
   struct aim_conn_t *cur;
@@ -251,7 +257,7 @@ int aim_conngetmaxfd(struct aim_session_t *sess)
   return j;
 }
 
-int aim_countconn(struct aim_session_t *sess)
+static int aim_countconn(struct aim_session_t *sess)
 {
   int cnt = 0;
   struct aim_conn_t *cur;
@@ -279,8 +285,8 @@ int aim_countconn(struct aim_session_t *sess)
  * XXX: we could probably stand to do a little courser locking here.
  *
  */ 
-struct aim_conn_t *aim_select(struct aim_session_t *sess,
-                             struct timeval *timeout, int *status)
+faim_export struct aim_conn_t *aim_select(struct aim_session_t *sess,
+                                         struct timeval *timeout, int *status)
 {
   struct aim_conn_t *cur;
   fd_set fds;
@@ -333,14 +339,14 @@ struct aim_conn_t *aim_select(struct aim_session_t *sess,
   return NULL;  /* no waiting or error, return */
 }
 
-int aim_conn_isready(struct aim_conn_t *conn)
+faim_export int aim_conn_isready(struct aim_conn_t *conn)
 {
   if (conn)
     return (conn->status & 0x0001);
   return -1;
 }
 
-int aim_conn_setstatus(struct aim_conn_t *conn, int status)
+faim_export int aim_conn_setstatus(struct aim_conn_t *conn, int status)
 {
   int val;
 
@@ -353,7 +359,7 @@ int aim_conn_setstatus(struct aim_conn_t *conn, int status)
   return val;
 }
 
-int aim_conn_setlatency(struct aim_conn_t *conn, int newval)
+faim_export int aim_conn_setlatency(struct aim_conn_t *conn, int newval)
 {
   if (!conn)
     return -1;
@@ -366,7 +372,7 @@ int aim_conn_setlatency(struct aim_conn_t *conn, int newval)
   return 0;
 }
 
-void aim_session_init(struct aim_session_t *sess)
+faim_export void aim_session_init(struct aim_session_t *sess)
 {
   if (!sess)
     return;