fix typo in pt.po headers

[debian/iodine.git] / src / user.c

diff --git a/src/user.c b/src/user.c
index ed809b80bb624f8aa32538bd2aa76f3b883bfad6..0dc95db7fcc1be6ffc5a1b3eed319bcbfd9eaf1e 100644 (file)
--- a/src/user.c
+++ b/src/user.c
@@ -1,5 +1,6 @@
 /*
 /*

- * Copyright (c) 2006-2007 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
+ * Copyright (c) 2006-2014 Erik Ekman <yarrick@kryo.se>,
+ * 2006-2009 Bjorn Andersson <flex@kryo.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,35 +15,81 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 

-#include <string.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdint.h>

 #include <time.h>
 #include <time.h>

-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifdef WINDOWS32
+#include <winsock2.h>
+#else
+#include <netdb.h>
+#endif

 
 #include "common.h"
 
 #include "common.h"

+#include "encoding.h"

 #include "user.h"
 
 #include "user.h"
 

-struct user users[USERS];
+struct tun_user *users;
+unsigned usercount;

 
 

-void
-init_users(in_addr_t my_ip)
+int
+init_users(in_addr_t my_ip, int netbits)

 {
        int i;
 {
        int i;

+       int skip = 0;

        char newip[16];
        char newip[16];

-       
-       memset(users, 0, USERS * sizeof(struct user));
-       for (i = 0; i < USERS; i++) {
+
+       int maxusers;
+
+       in_addr_t netmask = 0;
+       struct in_addr net;
+       struct in_addr ipstart;
+
+       for (i = 0; i < netbits; i++) {
+               netmask = (netmask << 1) | 1;
+       }
+       netmask <<= (32 - netbits);
+       net.s_addr = htonl(netmask);
+       ipstart.s_addr = my_ip & net.s_addr;
+
+       maxusers = (1 << (32-netbits)) - 3; /* 3: Net addr, broadcast addr, iodined addr */
+       usercount = MIN(maxusers, USERS);
+
+       users = calloc(usercount, sizeof(struct tun_user));
+       for (i = 0; i < usercount; i++) {
+               in_addr_t ip;

                users[i].id = i;
                users[i].id = i;

-               snprintf(newip, sizeof(newip), "0.0.0.%d", i + 1);
-               users[i].tun_ip = my_ip + inet_addr(newip);;
-               users[i].inpacket.len = 0;
-               users[i].inpacket.offset = 0;
-               users[i].outpacket.len = 0;
-               users[i].q.id = 0;
+               snprintf(newip, sizeof(newip), "0.0.0.%d", i + skip + 1);
+               ip = ipstart.s_addr + inet_addr(newip);
+               if (ip == my_ip && skip == 0) {
+                       /* This IP was taken by iodined */
+                       skip++;
+                       snprintf(newip, sizeof(newip), "0.0.0.%d", i + skip + 1);
+                       ip = ipstart.s_addr + inet_addr(newip);
+               }
+               users[i].tun_ip = ip;
+               net.s_addr = ip;
+               users[i].disabled = 0;
+               users[i].authenticated = 0;
+               users[i].authenticated_raw = 0;
+               users[i].active = 0;
+               /* Rest is reset on login ('V' packet) */

        }
        }

+
+       return usercount;
+}
+
+const char*
+users_get_first_ip()
+{
+       struct in_addr ip;
+       ip.s_addr = users[0].tun_ip;
+       return strdup(inet_ntoa(ip));

 }
 
 int
 }
 
 int


@@ -52,13 +99,14 @@ users_waiting_on_reply()
        int i;
 
        ret = 0;
        int i;
 
        ret = 0;

-       for (i = 0; i < USERS; i++) {
-               if (users[i].active && users[i].last_pkt + 60 > time(NULL) &&
-                       users[i].q.id != 0) {
+       for (i = 0; i < usercount; i++) {
+               if (users[i].active && !users[i].disabled &&
+                       users[i].last_pkt + 60 > time(NULL) &&
+                       users[i].q.id != 0 && users[i].conn == CONN_DNS_NULL) {

                        ret++;
                }
        }
                        ret++;
                }
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -69,8 +117,11 @@ find_user_by_ip(uint32_t ip)
        int i;
 
        ret = -1;
        int i;
 
        ret = -1;

-       for (i = 0; i < USERS; i++) {
-               if (users[i].active && users[i].last_pkt + 60 > time(NULL) &&
+       for (i = 0; i < usercount; i++) {
+               if (users[i].active &&
+                       users[i].authenticated &&
+                       !users[i].disabled &&
+                       users[i].last_pkt + 60 > time(NULL) &&

                        ip == users[i].tun_ip) {
                        ret = i;
                        break;
                        ip == users[i].tun_ip) {
                        ret = i;
                        break;


@@ -81,6 +132,11 @@ find_user_by_ip(uint32_t ip)
 
 int
 all_users_waiting_to_send()
 
 int
 all_users_waiting_to_send()

+/* If this returns true, then reading from tun device is blocked.
+   So only return true when all clients have at least one packet in
+   the outpacket-queue, so that sending back-to-back is possible
+   without going through another select loop.
+*/

 {
        time_t now;
        int ret;
 {
        time_t now;
        int ret;


@@ -88,9 +144,18 @@ all_users_waiting_to_send()
 
        ret = 1;
        now = time(NULL);
 
        ret = 1;
        now = time(NULL);

-       for (i = 0; i < USERS; i++) {
-               if (users[i].active && users[i].last_pkt + 60 > now &&
-                       users[i].outpacket.len == 0) {
+       for (i = 0; i < usercount; i++) {
+               if (users[i].active && !users[i].disabled &&
+                       users[i].last_pkt + 60 > now &&
+                       ((users[i].conn == CONN_RAW_UDP) ||
+                       ((users[i].conn == CONN_DNS_NULL)
+#ifdef OUTPACKETQ_LEN
+                               && users[i].outpacketq_filled < 1
+#else
+                               && users[i].outpacket.len == 0
+#endif
+                       ))) {
+

                        ret = 0;
                        break;
                }
                        ret = 0;
                        break;
                }


@@ -103,11 +168,15 @@ find_available_user()
 {
        int ret = -1;
        int i;
 {
        int ret = -1;
        int i;

-       for (i = 0; i < USERS; i++) {
+       for (i = 0; i < usercount; i++) {

                /* Not used at all or not used in one minute */
                /* Not used at all or not used in one minute */

-               if (!users[i].active || users[i].last_pkt + 60 < time(NULL)) {
+               if ((!users[i].active || users[i].last_pkt + 60 < time(NULL)) && !users[i].disabled) {

                        users[i].active = 1;
                        users[i].active = 1;

+                       users[i].authenticated = 0;
+                       users[i].authenticated_raw = 0;

                        users[i].last_pkt = time(NULL);
                        users[i].last_pkt = time(NULL);

+                       users[i].fragsize = 4096;
+                       users[i].conn = CONN_DNS_NULL;

                        ret = i;
                        break;
                }
                        ret = i;
                        break;
                }


@@ -115,3 +184,24 @@ find_available_user()
        return ret;
 }
 
        return ret;
 }
 

+void
+user_switch_codec(int userid, struct encoder *enc)
+{
+       if (userid < 0 || userid >= usercount)
+               return;
+
+       users[userid].encoder = enc;
+}
+
+void
+user_set_conn_type(int userid, enum connection c)
+{
+       if (userid < 0 || userid >= usercount)
+               return;
+
+       if (c < 0 || c >= CONN_MAX)
+               return;
+
+       users[userid].conn = c;
+}
+