From patchwork Mon Dec 1 20:48:47 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 5350 Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (8.13.4/8.13.4/Debian-3sarge3) with SMTP id mB1Ksbpd028597 for ; Mon, 1 Dec 2008 21:54:38 +0100 Received: (qmail invoked by alias); 01 Dec 2008 20:48:50 -0000 Received: from unknown (EHLO localhost) [89.246.207.63] by mail.gmx.net (mp054) with SMTP; 01 Dec 2008 21:48:50 +0100 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/3xd5Juc73waoxN6XjiI7MzzxUe/r5NXjlw2XJMm UFhdJZUV+yYYtM From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Mon, 1 Dec 2008 21:48:47 +0100 Message-Id: <1228164527-31652-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1228157822-29406-1-git-send-email-sven.eckelmann@gmx.de> References: <1228157822-29406-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.61 Subject: [B.A.T.M.A.N.] [PATCH] Don't truncate file descriptor in use_kernel_module X-BeenThere: b.a.t.m.a.n@open-mesh.net X-Mailman-Version: 2.1.5 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: Mon, 01 Dec 2008 20:54:38 -0000 We should not truncate the file descriptor of /dev/batgat from int32_t to int8_t (return type of use_kernel_module) when we save it as int32_t in batman_if::udp_tunnel_sock. Signed-off-by: Sven Eckelmann --- batman/bsd/kernel.c | 2 +- batman/linux/kernel.c | 2 +- batman/os.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/batman/bsd/kernel.c b/batman/bsd/kernel.c index 90076e3..505f551 100644 --- a/batman/bsd/kernel.c +++ b/batman/bsd/kernel.c @@ -143,7 +143,7 @@ int8_t use_kernel_module( char *dev ) return -1; } -int8_t use_gateway_module(void) +int32_t use_gateway_module(void) { return -1; } diff --git a/batman/linux/kernel.c b/batman/linux/kernel.c index 09c24da..da98197 100644 --- a/batman/linux/kernel.c +++ b/batman/linux/kernel.c @@ -193,7 +193,7 @@ int8_t bind_to_iface( int32_t sock, char *dev ) { -int8_t use_gateway_module(void) { +int32_t use_gateway_module(void) { int32_t fd; diff --git a/batman/os.h b/batman/os.h index da61d18..ee5e536 100644 --- a/batman/os.h +++ b/batman/os.h @@ -70,7 +70,7 @@ int32_t get_send_redirects( char *dev ); void set_forwarding( int32_t state ); int32_t get_forwarding( void ); int8_t bind_to_iface( int32_t sock, char *dev ); -int8_t use_gateway_module(void); +int32_t use_gateway_module(void); /* posix.c */ void print_animation( void );