Patched to build with Android NDK.

(Android.mk is in batphone tree).

Author: gardners

Makefile

@@ -31,7 +31,7 @@ NO_POLICY_ROUTING = -DNO_POLICY_ROUTING
 CC =		gcc
 CFLAGS +=	-pedantic -Wall -W -Os -g3 -std=gnu99
 EXTRA_CFLAGS =	-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION)
-LDFLAGS +=	-lpthread -Xlinker -I/data/data/org.servalproject/lib/ld-linux.so.3 -R/data/data/org.servalproject/lib -Xlinker -rpath=/data/data/org.servalproject/lib
+LDFLAGS +=	-lpthread -Xlinker -I/data/data/org.servalproject/libs/ld-linux.so.3 -R/data/data/org.servalproject/libs -Xlinker -rpath=/data/data/org.servalproject/libs
 
 SBINDIR =	$(INSTALL_PREFIX)/usr/sbin
 
@@ -77,7 +77,8 @@ REVISION_VERSION =\"\ rv$(REVISION)\"
 
 BAT_VERSION =	$(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}')
 FILE_NAME =	$(PACKAGE_NAME)_$(BAT_VERSION)-rv$(REVISION)_$@
-NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`)
+#NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`)
+NUM_CPUS = 1
 
 
 all:

batman.c

@@ -401,7 +401,7 @@ void update_routes(struct orig_node *orig_node, struct neigh_node *neigh_node, u
 
 #ifdef NO_POLICY_ROUTING
 			/* add new route AGAIN, if not using policy based routing as the process of deleting the old route can actually delete the new route
-			 as well. */
+			   as well. */
 			add_del_route(orig_node->orig, 32, neigh_node->addr, neigh_node->if_incoming->addr.sin_addr.s_addr,
 					neigh_node->if_incoming->if_index, neigh_node->if_incoming->dev, BATMAN_RT_TABLE_HOSTS, ROUTE_TYPE_UNICAST, ROUTE_ADD);
 

batman.h

@@ -31,6 +31,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <poll.h>
+#include <sys/select.h>
+
 #define TYPE_OF_WORD uintmax_t /* you should choose something big, if you don't want to waste cpu */
 
 #include "list-batman.h"

bsd/tun.c

@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
-#include <net/if_tun.h>
+//#include <net/if_tun.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -158,12 +158,12 @@ int8_t add_dev_tun(struct batman_if *batman_if, uint32_t tun_addr,
 {
 	int so;
 	struct ifreq ifr_tun, ifr_if;
-	struct tuninfo ti;
+//	struct tuninfo ti;
 	char *tun_ifname;
 
 	memset(&ifr_tun, 0, sizeof(ifr_tun));
 	memset(&ifr_if, 0, sizeof(ifr_if));
-	memset(&ti, 0, sizeof(ti));
+//	memset(&ti, 0, sizeof(ti));
 
 	if ((*fd = open_tun_any(tun_dev, tun_dev_size)) < 0) {
 		perror("Could not open tun device");
@@ -173,11 +173,11 @@ int8_t add_dev_tun(struct batman_if *batman_if, uint32_t tun_addr,
 	printf("Using %s\n", tun_dev);
 
 	/* Initialise tuninfo to defaults. */
-	if (ioctl(*fd, TUNGIFINFO, &ti) < 0) {
-		perror("TUNGIFINFO");
-		del_dev_tun(*fd);
+//	if (ioctl(*fd, TUNGIFINFO, &ti) < 0) {
+//		perror("TUNGIFINFO");
+//		del_dev_tun(*fd);
 		return -1;
-	}
+//	}
 
 	/* Set name of interface to configure ("tunX") */
 	tun_ifname = strstr(tun_dev, "tun");
@@ -224,12 +224,12 @@ int8_t add_dev_tun(struct batman_if *batman_if, uint32_t tun_addr,
 	if (ifr_if.ifr_mtu < 100) {
 		fprintf(stderr, "Warning: MTU smaller than 100 - cannot reduce MTU anymore\n" );
 	} else {
-		ti.mtu = ifr_if.ifr_mtu - 28;
-		if (ioctl(*fd, TUNSIFINFO, &ti) < 0) {
-			perror("TUNSIFINFO");
-			del_dev_tun(*fd);
+//		ti.mtu = ifr_if.ifr_mtu - 28;
+//		if (ioctl(*fd, TUNSIFINFO, &ti) < 0) {
+//			perror("TUNSIFINFO");
+//			del_dev_tun(*fd);
 			return -1;
-		}
+//		}
 	}
 
 	strlcpy(tun_dev, ifr_tun.ifr_name, tun_dev_size);

dprintf.c

@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <unistd.h>
+
+void dprintf(int fd,const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    vdprintf(fd,fmt,ap);
+    va_end(ap);
+}
+
+void vdprintf(int fd,const char *fmt,va_list ap)
+{
+    char buff[8192];
+    int len=vsnprintf(buff,8192,fmt,ap);
+    if (len>-1) write(fd,buff,len);
+}

linux/tun.c

@@ -46,9 +46,8 @@
 #define IPTABLES_ADD_ACC "iptables -t nat -I POSTROUTING -s %s/%i -j ACCEPT"
 #define IPTABLES_DEL_ACC "iptables -t nat -D POSTROUTING -s %s/%i -j ACCEPT"
 
-
 int run_cmd(char *cmd) {
-	int error, pipes[2], stderr = -1, ret = 0;
+	int error; int pipes[2]; int stderrfd = -1; int ret = 0;
 	char error_log[256];
 
 	if (pipe(pipes) < 0) {
@@ -59,7 +58,7 @@ int run_cmd(char *cmd) {
 	memset(error_log, 0, 256);
 
 	/* save stderr */
-	stderr = dup(STDERR_FILENO);
+	stderrfd = dup(STDERR_FILENO);
 
 	/* connect the commands output with the pipe for later logging */
 	dup2(pipes[1], STDERR_FILENO);
@@ -68,8 +67,8 @@ int run_cmd(char *cmd) {
 	error = system(cmd);
 
 	/* copy stderr back */
-	dup2(stderr, STDERR_FILENO);
-	close(stderr);
+	dup2(stderrfd, STDERR_FILENO);
+	close(stderrfd);
 
 	if ((error < 0) || (WEXITSTATUS(error) != 0)) {
 		ret = read(pipes[0], error_log, sizeof(error_log));