added initial (not working) version of client list

git-svn-id: https://svn.spreadspace.org/tcpproxy/trunk@10 e61f0598-a718-4e21-a8f0-0aadfa62ad6b

4 files changed, 205 insertions, 0 deletions

diff --git a/src/Makefile b/src/Makefile
index 2fb2065..a40a5e8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,6 +38,7 @@ C_OBJS := log.o \
           sig_handler.o \
           tcp.o \
           listener.o \
+          clients.o \
           tcpproxy.o
 
 C_SRCS := $(C_OBJS:%.o=%.c)
diff --git a/src/clients.c b/src/clients.c
new file mode 100644
index 0000000..ab82e28
--- /dev/null
+++ b/src/clients.c
@@ -0,0 +1,147 @@
+/*
+ *  tcpproxy
+ *
+ *  tcpproxy is a simple tcp connection proxy which combines the 
+ *  features of rinetd and 6tunnel. tcpproxy supports IPv4 and 
+ *  IPv6 and also supports connections from IPv6 to IPv4 
+ *  endpoints and vice versa.
+ *  
+ *
+ *  Copyright (C) 2010-2011 Christian Pointner <equinox@spreadspace.org>
+ *                         
+ *  This file is part of tcpproxy.
+ *
+ *  tcpproxy is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  tcpproxy is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with tcpproxy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "datatypes.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+/* #include <netdb.h> */
+/* #include <sys/types.h> */
+/* #include <sys/socket.h> */
+/* #include <arpa/inet.h> */
+/* #include <netinet/in.h> */
+/* #include <sys/select.h> */
+
+#include "clients.h"
+#include "tcp.h"
+#include "log.h"
+
+void clients_delete_element(void* e)
+{
+  if(!e)
+    return;
+  
+  client_t* element = (client_t*)e;
+  close(element->fd_);
+
+  free(e);
+}
+
+int clients_init(clients_t* list)
+{
+  return slist_init(list, &clients_delete_element);
+}
+
+void clients_clear(clients_t* list)
+{
+  slist_clear(list);
+}
+
+int clients_add(clients_t* list, int fd, tcp_endpoint_t remote_end)
+{
+  if(!list)
+    return -1;
+
+  int ret = 0;
+
+// TODO: connect to remote end and setup write buffers
+
+  return ret;
+}
+
+void clients_remove(clients_t* list, int fd)
+{
+  slist_remove(list, clients_find(list, fd));
+}
+
+client_t* clients_find(clients_t* list, int fd)
+{
+  if(!list)
+    return NULL;
+
+  slist_element_t* tmp = list->first_;
+  while(tmp) {
+    client_t* l = (client_t*)tmp->data_;
+    if(l && l->fd_ == fd)
+      return l;
+    tmp = tmp->next_;
+  }
+
+  return NULL;
+}
+
+void clients_print(clients_t* list)
+{
+  if(!list)
+    return;
+  
+  slist_element_t* tmp = list->first_;
+  while(tmp) {
+    client_t* l = (client_t*)tmp->data_;
+    if(l) {
+          // print useful info
+      printf("clients #%d: tba...\n", l->fd_);
+    }
+    tmp = tmp->next_;
+  }
+}
+
+void clients_read_fds(clients_t* list, fd_set* set, int* max_fd)
+{
+  if(!list)
+    return;
+
+  slist_element_t* tmp = list->first_;
+  while(tmp) {
+    client_t* l = (client_t*)tmp->data_;
+    if(l) {
+      FD_SET(l->fd_, set);
+      *max_fd = *max_fd > l->fd_ ? *max_fd : l->fd_;
+    }
+    tmp = tmp->next_;
+  }
+}
+
+void clients_write_fds(clients_t* list, fd_set* set, int* max_fd)
+{
+  if(!list)
+    return;
+
+      // TODO: add all clients with pending data
+/*   slist_element_t* tmp = list->first_; */
+/*   while(tmp) { */
+/*     client_t* l = (client_t*)tmp->data_; */
+/*     if(l) { */
+/*       FD_SET(l->fd_, set); */
+/*       *max_fd = *max_fd > l->fd_ ? *max_fd : l->fd_; */
+/*     } */
+/*     tmp = tmp->next_; */
+/*   } */
+}
diff --git a/src/clients.h b/src/clients.h
new file mode 100644
index 0000000..ced5f16
--- /dev/null
+++ b/src/clients.h
@@ -0,0 +1,55 @@
+/*
+ *  tcpproxy
+ *
+ *  tcpproxy is a simple tcp connection proxy which combines the 
+ *  features of rinetd and 6tunnel. tcpproxy supports IPv4 and 
+ *  IPv6 and also supports connections from IPv6 to IPv4 
+ *  endpoints and vice versa.
+ *  
+ *
+ *  Copyright (C) 2010-2011 Christian Pointner <equinox@spreadspace.org>
+ *                         
+ *  This file is part of tcpproxy.
+ *
+ *  tcpproxy is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  tcpproxy is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with tcpproxy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TCPPROXY_clients_h_INCLUDED
+#define TCPPROXY_clients_h_INCLUDED
+
+#include <sys/select.h>
+
+#include "slist.h"
+#include "tcp.h"
+
+typedef struct {
+  int fd_;
+      // TODO: add info for each client and write buffers
+} client_t;
+
+void clients_delete_element(void* e);
+
+typedef slist_t clients_t;
+
+int clients_init(clients_t* list);
+void clients_clear(clients_t* list);
+int clients_add(clients_t* list, int fd, tcp_endpoint_t remote_end);
+void clients_remove(clients_t* list, int fd);
+client_t* clients_find(clients_t* list, int fd);
+void clients_print(clients_t* list);
+
+void clients_read_fds(clients_t* list, fd_set* set, int* max_fd);
+void clients_write_fds(clients_t* list, fd_set* set, int* max_fd);
+
+#endif
diff --git a/src/listener.c b/src/listener.c
index b607bdf..0f92990 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -25,6 +25,8 @@
  *  along with tcpproxy. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "datatypes.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>