From patchwork Wed Jan 14 00:59:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 5363 Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (8.14.3/8.13.4/Debian-3sarge3) with SMTP id n0E112Dp015950 for ; Wed, 14 Jan 2009 01:01:03 GMT Received: (qmail invoked by alias); 14 Jan 2009 00:59:38 -0000 Received: from unknown (EHLO localhost) [89.246.220.223] by mail.gmx.net (mp011) with SMTP; 14 Jan 2009 01:59:38 +0100 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX18niZBjoQgnmaJ/ZHYYgpGP1cZqrlijYbwmhM2TUW 1rFqkayXrYiL9K From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Wed, 14 Jan 2009 01:59:39 +0100 Message-Id: <1231894779-29325-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <200901140145.34127.sven.eckelmann@gmx.de> References: <200901140145.34127.sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.55 Subject: [B.A.T.M.A.N.] [PATCH] Sync definitions in bsd/* with definitions in os.h X-BeenThere: b.a.t.m.a.n@open-mesh.net X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2009 01:01:03 -0000 Signed-off-by: Sven Eckelmann --- batman/bsd/kernel.c | 9 ++------- batman/bsd/tun.c | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/batman/bsd/kernel.c b/batman/bsd/kernel.c index 505f551..0a126d4 100644 --- a/batman/bsd/kernel.c +++ b/batman/bsd/kernel.c @@ -35,7 +35,7 @@ #include "../os.h" #include "../batman.h" -void set_forwarding(int state) +void set_forwarding(int32_t state) { int mib[4]; @@ -56,7 +56,7 @@ void set_forwarding(int state) err(1, "Cannot change net.inet.ip.forwarding"); } -int get_forwarding(void) +int32_t get_forwarding(void) { int state; size_t len; @@ -138,11 +138,6 @@ int8_t bind_to_iface( int32_t udp_recv_sock, char *dev ) return 1; } -int8_t use_kernel_module( char *dev ) -{ - return -1; -} - int32_t use_gateway_module(void) { return -1; diff --git a/batman/bsd/tun.c b/batman/bsd/tun.c index d38b954..7d4c79c 100644 --- a/batman/bsd/tun.c +++ b/batman/bsd/tun.c @@ -51,7 +51,7 @@ * this string is assumed to be dev_name_size bytes large. */ #if defined(__OpenBSD__) || defined(__Darwin__) -int open_tun_any(char *dev_name, size_t dev_name_size) +static int open_tun_any(char *dev_name, size_t dev_name_size) { int i; int fd; @@ -72,7 +72,7 @@ int open_tun_any(char *dev_name, size_t dev_name_size) return -1; } #elif defined(__FreeBSD__) -int open_tun_any(char *dev_name, size_t dev_name_size) +static int open_tun_any(char *dev_name, size_t dev_name_size) { int fd; struct stat buf; @@ -90,7 +90,7 @@ int open_tun_any(char *dev_name, size_t dev_name_size) #endif /* Probe for tun interface availability */ -int8_t probe_tun() +int8_t probe_tun(uint8_t print_to_stderr) { int fd; fd = open_tun_any(NULL, 0);