Changeset 60dfbf

Timestamp:

09/20/09 23:10:39 (3 years ago)

Author:

J. A. Bezemer <J.A.Bezemer@…>

Branches:

master

Children:

d87432

Parents:

05e99c

git-author:

J. A. Bezemer <J.A.Bezemer@…> (09/20/09 23:10:39)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:04)

Message:

merge dns and user #76

Location:

src

Files:

• dns.c (modified) (1 diff)
• iodined.c (modified) (1 diff)
• user.c (modified) (3 diffs)
• user.h (modified) (3 diffs)

src/dns.c

@@ -357 +357 @@
                 readshort(packet, &data, &class);
                 
+                /* if CHECKLEN okay, then we're sure to have a proper name */
+                if (q != NULL) {
+                        /* We only need the first char to check it */
+                        q->name[0] = name[0];
+                        q->name[1] = '\0';
+                }
+
                 /* Assume that first answer is NULL/CNAME that we wanted */
                 readname(packet, packetlen, &data, name, sizeof(name));

src/iodined.c

@@ -377 +377 @@
                                 users[userid].inpacket.fragment = 0;
                                 users[userid].fragsize = 100; /* very safe */
+                                users[userid].conn = CONN_DNS_NULL;
                         } else {
                                 /* No space for another user */

src/user.c

@@ -79 +79 @@
                         created_users++;
                 }
-                users[i].inpacket.len = 0;
-                users[i].inpacket.offset = 0;
-                users[i].outpacket.len = 0;
-                users[i].q.id = 0;
-                users[i].out_acked_seqno = 0;
-                users[i].out_acked_fragment = 0;
-                users[i].fragsize = 4096;
-                users[i].conn = CONN_DNS_NULL;
+                users[i].active = 0;
+                /* Rest is reset on login ('V' packet) */
         }
 
@@ -130 +124 @@
 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;
@@ -140 +139 @@
                 if (users[i].active && !users[i].disabled &&
                         users[i].last_pkt + 60 > now &&
-                        ((users[i].outpacket.len == 0 && users[i].conn == CONN_DNS_NULL) 
-                                || users[i].conn == CONN_RAW_UDP)) {
+                        ((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;

src/user.h

@@ -20 +20 @@
 #define USERS 16
 
+#define OUTPACKETQ_LEN 4                /* Note: 16 users * 1 packet = 1MB */
+/* Undefine to have no queue for packets coming in from tun device, which may
+   lead to massive dropping in multi-user situations with high traffic. */
+
+#define DNSCACHE_LEN 4
+/* Undefine to disable. MUST be less than 7; also see comments in iodined.c */
+
 struct user {
         char id;
@@ -29 +36 @@
         struct in_addr host;
         struct query q;
+        struct query q_prev;
+        struct query q_sendrealsoon;
+        int q_sendrealsoon_new;
         struct packet inpacket;
         struct packet outpacket;
+        int outfragresent;
         struct encoder *encoder;
         char downenc;
@@ -37 +48 @@
         int fragsize;
         enum connection conn;
+        int lazy;
+#ifdef OUTPACKETQ_LEN
+        struct packet outpacketq[OUTPACKETQ_LEN];
+        int outpacketq_nexttouse;
+        int outpacketq_filled;
+#endif
+#ifdef DNSCACHE_LEN
+        struct query dnscache_q[DNSCACHE_LEN];
+        char dnscache_answer[DNSCACHE_LEN][4096];
+        int dnscache_answerlen[DNSCACHE_LEN];
+        int dnscache_lastfilled;
+#endif
 };