The following commit has been merged in the master branch: commit 816fc71bb74989527c1e36e8cbdb6afbb5090878 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Apr 16 18:20:03 2007 +0200

fix os.h confusion

diff --git a/batman.h b/batman.h index f5952eb..aabddb9 100644 --- a/batman.h +++ b/batman.h @@ -226,7 +226,6 @@ void verbose_usage( void ); void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_recv_buff, int16_t hna_buff_len ); void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ); void choose_gw(); -void del_default_route(); -int8_t add_default_route(); +

#endif diff --git a/os.h b/os.h index ec02f30..9ce987d 100644 --- a/os.h +++ b/os.h @@ -44,6 +44,8 @@ int8_t send_packet( unsigned char *packet_buff, int packet_buff_len, struct sock int8_t probe_tun(); int8_t del_dev_tun( int32_t fd ); int8_t add_dev_tun( struct batman_if *batman_if, uint32_t dest_addr, char *tun_dev, size_t tun_dev_size, int32_t *fd ); +void del_default_route(); +int8_t add_default_route();

void apply_init_args( int argc, char *argv[] ); void init_interface ( struct batman_if *batman_if );