Changeset a56903

Timestamp:

04/23/11 20:55:59 (13 months ago)

Author:

Marcel Bokhorst <marcel@…>

Branches:

master

Children:

85be9b

Parents:

66d942

git-author:

Marcel Bokhorst <marcel@…> (04/23/11 20:55:59)

git-committer:

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

Message:

Android support (#105) patch from Marcel Bokhorst

Files:

• src/Android.mk (added)
• src/android_dns.h (added)
• src/client.c (modified) (2 diffs)
• src/common.c (modified) (5 diffs)
• src/common.h (modified) (1 diff)
• src/dns.c (modified) (1 diff)
• src/iodined.c (modified) (2 diffs)
• src/tun.c (modified) (4 diffs)
• src/user.c (modified) (10 diffs)
• src/user.h (modified) (1 diff)
• src/util.c (modified) (2 diffs)
• tests/user.c (modified) (1 diff)

src/client.c

@@ -32 +32 @@
 #include <winsock2.h>
 #else
+#ifdef ANDROID
+#include "android_dns.h"
+#endif
 #include <arpa/nameser.h>
 #ifdef DARWIN
@@ -149 +152 @@
 client_set_nameserver(const char *cp, int port) 
 {
+#ifdef ANDROID
+        struct addrinfo hints, *result, *p;
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = AF_INET;
+
+        char sport[10];
+        sprintf(sport, "%d", port);
+
+        getaddrinfo(cp, sport, &hints, &result);
+        if (result == NULL)
+                errx(1, "Cannot resolve %s:%s (no network?)",  cp, sport);
+        else {
+                for (p = result;p != NULL; p = p->ai_next) {
+                        if (p->ai_family == AF_INET) { /* IPv4 */
+                                struct sockaddr_in *ipv4 = (struct sockaddr_in *)p->ai_addr;
+                                memset(&nameserv, 0, sizeof(nameserv));
+                                nameserv.sin_family = AF_INET;
+                                nameserv.sin_port = htons(port);
+                                nameserv.sin_addr = ipv4->sin_addr;
+                                freeaddrinfo(result);
+                                return;
+                        }
+                }
+                freeaddrinfo(result);
+        }
+#endif
         struct in_addr addr;
 

src/common.c

@@ -55 +55 @@
 
 /* daemon(3) exists only in 4.4BSD or later, and in GNU libc */
-#if !defined(WINDOWS32) && !(defined(BSD) && (BSD >= 199306)) && !defined(__GLIBC__)
+#if !defined(ANDROID) && !defined(WINDOWS32) && !(defined(BSD) && (BSD >= 199306)) && !defined(__GLIBC__)
 static int daemon(int nochdir, int noclose)
 {
@@ -277 +277 @@
 }
 
-#ifdef WINDOWS32
+#if defined(WINDOWS32) || defined(ANDROID)
+#ifndef ANDROID
 int
 inet_aton(const char *cp, struct in_addr *inp)
@@ -284 +285 @@
  return inp->s_addr != INADDR_ANY;
 }
+#endif
 
 void
@@ -292 +294 @@
         va_start(list, fmt);
         if (fmt) fprintf(stderr, fmt, list);
+#ifndef ANDROID
         if (errno == 0) {
                 fprintf(stderr, ": WSA error %d\n", WSAGetLastError()); 
@@ -297 +300 @@
                 fprintf(stderr, ": %s\n", strerror(errno));
         }
+#endif
         va_end(list);
 }

src/common.h

@@ -120 +120 @@
 int check_topdomain(char *);
 
-#ifdef WINDOWS32
+#if defined(WINDOWS32) || defined(ANDROID)
+#ifndef ANDROID
 int inet_aton(const char *cp, struct in_addr *inp);
+#endif
 
 void err(int eval, const char *fmt, ...);

src/dns.c

@@ -26 +26 @@
 #include "windows.h"
 #else
+#ifdef ANDROID
+#include "android_dns.h"
+#endif
 #include <arpa/nameser.h>
 #ifdef DARWIN

src/iodined.c

@@ -1656 +1656 @@
                    20msec: ~8 packs every 1/50sec = ~400 DNSreq/sec,
                    or ~1200bytes every 1/50sec = ~0.5 Mbit/sec upstream */
-                for (userid = 0; userid < USERS; userid++) {
+                for (userid = 0; userid < created_users; userid++) {
                         if (users[userid].active && !users[userid].disabled &&
                             users[userid].last_pkt + 60 > time(NULL)) {
@@ -1708 +1708 @@
 
                 /* Send realsoon's if tun or dns didn't already */
-                for (userid = 0; userid < USERS; userid++)
+                for (userid = 0; userid < created_users; userid++)
                         if (users[userid].active && !users[userid].disabled &&
                             users[userid].last_pkt + 60 > time(NULL) &&

src/tun.c

@@ -25 +25 @@
 #include <fcntl.h>
 
+#ifndef IFCONFIGPATH
+#define IFCONFIGPATH "/sbin/"
+#endif
+
 #ifdef WINDOWS32
 #include <winsock2.h>
@@ -72 +76 @@
         int tun_fd;
         struct ifreq ifreq;
+#ifdef ANDROID
+        char *tunnel = "/dev/tun";
+#else
         char *tunnel = "/dev/net/tun";
+#endif
 
         if ((tun_fd = open(tunnel, O_RDWR)) < 0) {
@@ -456 +464 @@
 #ifndef WINDOWS32
         snprintf(cmdline, sizeof(cmdline), 
-                        "/sbin/ifconfig %s %s %s netmask %s",
+                        IFCONFIGPATH "ifconfig %s %s %s netmask %s",
                         if_name,
                         ip,
@@ -523 +531 @@
         if (mtu > 200 && mtu <= 1500) {
                 snprintf(cmdline, sizeof(cmdline), 
-                                "/sbin/ifconfig %s mtu %u",
+                                IFCONFIGPATH "ifconfig %s mtu %u",
                                 if_name,
                                 mtu);

src/user.c

@@ -34 +34 @@
 #include "user.h"
 
-struct user users[USERS];
+struct user *users;
+unsigned usercount;
 
 int
@@ -42 +43 @@
         int skip = 0;
         char newip[16];
-        int created_users = 0;
 
         int maxusers;
@@ -58 +58 @@
 
         maxusers = (1 << (32-netbits)) - 3; /* 3: Net addr, broadcast addr, iodined addr */
-        
-        memset(users, 0, USERS * sizeof(struct user));
-        for (i = 0; i < USERS; i++) {
+        usercount = MIN(maxusers, USERS);
+        
+        users = calloc(usercount, sizeof(struct user));
+        for (i = 0; i < usercount; i++) {
                 in_addr_t ip;
                 users[i].id = i;
@@ -73 +74 @@
                 users[i].tun_ip = ip;
                 net.s_addr = ip;
-                if (maxusers--  < 1) {
-                        users[i].disabled = 1;
-                } else {
-                        users[i].disabled = 0;
-                        created_users++;
-                }
+                users[i].disabled = 0;
                 users[i].active = 0;
                 /* Rest is reset on login ('V' packet) */
         }
 
-        return created_users;
+        return usercount;
 }
 
@@ -101 +97 @@
 
         ret = 0;
-        for (i = 0; i < USERS; i++) {
+        for (i = 0; i < usercount; i++) {
                 if (users[i].active && !users[i].disabled && 
                         users[i].last_pkt + 60 > time(NULL) &&
@@ -119 +115 @@
 
         ret = -1;
-        for (i = 0; i < USERS; i++) {
+        for (i = 0; i < usercount; i++) {
                 if (users[i].active && !users[i].disabled &&
                         users[i].last_pkt + 60 > time(NULL) &&
@@ -144 +140 @@
         ret = 1;
         now = time(NULL);
-        for (i = 0; i < USERS; i++) {
+        for (i = 0; i < usercount; i++) {
                 if (users[i].active && !users[i].disabled &&
                         users[i].last_pkt + 60 > now &&
@@ -168 +164 @@
         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 */
                 if ((!users[i].active || users[i].last_pkt + 60 < time(NULL)) && !users[i].disabled) {
@@ -185 +181 @@
 user_switch_codec(int userid, struct encoder *enc)
 {
-        if (userid < 0 || userid >= USERS)
+        if (userid < 0 || userid >= usercount)
                 return;
         
@@ -194 +190 @@
 user_set_conn_type(int userid, enum connection c)
 {
-        if (userid < 0 || userid >= USERS)
+        if (userid < 0 || userid >= usercount)
                 return;
 

src/user.h

@@ -74 +74 @@
 };
 
-extern struct user users[USERS];
+extern struct user *users;
 
 int init_users(in_addr_t, int);

src/util.c

@@ -26 +26 @@
         char buf[80];
         FILE *fp;
+#ifdef ANDROID
+        fp = popen("getprop net.dns1", "r");
+        if (fp == NULL)
+                err(1, "getprop net.dns1 failed");
+        if (fgets(buf, sizeof(buf), fp) == NULL)
+                err(1, "read getprop net.dns1 failed");
+        if (sscanf(buf, "%15s", addr) == 1)
+                rv = addr;
+        pclose(fp);
+#else
         
         rv = NULL;
@@ -42 +52 @@
         
         fclose(fp);
+#endif
 #else /* !WINDOWS32 */
         FIXED_INFO  *fixed_info;

tests/user.c

@@ -33 +33 @@
         char givenip[16];
         int i;
-
-        ip = inet_addr("127.0.0.1");
-        init_users(ip, 27);
-        for (i = 0; i < USERS; i++) {
+        int count;
+
+        ip = inet_addr("127.0.0.1");
+        count = init_users(ip, 27);
+        for (i = 0; i < count; i++) {
                 fail_unless(users[i].id == i);
                 fail_unless(users[i].q.id == 0);