[Olsr-cvs] olsrd-current/src duplicate_set.h, 1.11, 1.12 olsr_cfg.h, 1.38, 1.39 link_set.h, 1.33, 1.34 interfaces.h, 1.45, 1.46
Bernd Petrovitsch
(spam-protected)
Sun Nov 25 22:38:15 CET 2007
Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31242/src
Modified Files:
duplicate_set.h olsr_cfg.h link_set.h interfaces.h
Log Message:
* rearranged fields a little bit to save space
Index: olsr_cfg.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_cfg.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** olsr_cfg.h 23 Nov 2007 23:40:43 -0000 1.38
--- olsr_cfg.h 25 Nov 2007 21:38:13 -0000 1.39
***************
*** 1,5 ****
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
--- 1,5 ----
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
***************
*** 200,234 ****
olsr_u16_t tos;
olsr_u8_t rttable;
- olsr_bool willingness_auto;
olsr_u8_t willingness;
int ipc_connections;
olsr_bool open_ipc;
olsr_bool use_hysteresis;
struct hyst_param hysteresis_param;
float pollrate;
float nic_chgs_pollrate;
olsr_u8_t tc_redundancy;
olsr_u8_t mpr_coverage;
- olsr_bool clear_screen;
olsr_u8_t lq_level;
- olsr_u32_t lq_wsize;
olsr_u8_t lq_fish;
- olsr_u8_t lq_dlimit;
float lq_dinter;
! struct plugin_entry *plugins;
! struct local_hna_entry *hna_entries;
! struct ipc_host *ipc_hosts;
! struct ipc_net *ipc_nets;
! struct olsr_if *interfaces;
/* Stuff set by olsrd */
- size_t ipsize; /* Size of address */
- olsr_u8_t maxplen; /* maximum prefix len */
olsr_u16_t system_tick_divider; /* Tick resolution */
olsr_bool del_gws; /* Delete InternetGWs at startup */
union olsr_ip_addr main_addr; /* Main address of this node */
float will_int;
float max_jitter;
! int exit_value; /* Global return value for process termination */
float max_tc_vtime;
--- 200,234 ----
olsr_u16_t tos;
olsr_u8_t rttable;
olsr_u8_t willingness;
+ olsr_bool willingness_auto;
int ipc_connections;
olsr_bool open_ipc;
olsr_bool use_hysteresis;
struct hyst_param hysteresis_param;
+ struct plugin_entry *plugins;
+ struct local_hna_entry *hna_entries;
+ struct ipc_host *ipc_hosts;
+ struct ipc_net *ipc_nets;
+ struct olsr_if *interfaces;
float pollrate;
float nic_chgs_pollrate;
+ olsr_bool clear_screen;
olsr_u8_t tc_redundancy;
olsr_u8_t mpr_coverage;
olsr_u8_t lq_level;
olsr_u8_t lq_fish;
float lq_dinter;
! olsr_u32_t lq_wsize;
! olsr_u8_t lq_dlimit;
/* Stuff set by olsrd */
olsr_u16_t system_tick_divider; /* Tick resolution */
+ olsr_u8_t maxplen; /* maximum prefix len */
+ size_t ipsize; /* Size of address */
olsr_bool del_gws; /* Delete InternetGWs at startup */
union olsr_ip_addr main_addr; /* Main address of this node */
float will_int;
float max_jitter;
! int exit_value; /* Global return value for process termination */
float max_tc_vtime;
Index: duplicate_set.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/duplicate_set.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** duplicate_set.h 21 Oct 2007 20:15:51 -0000 1.11
--- duplicate_set.h 25 Nov 2007 21:38:13 -0000 1.12
***************
*** 1,5 ****
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
--- 1,5 ----
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
***************
*** 51,57 ****
union olsr_ip_addr addr; /* IP address of originator */
olsr_u16_t seqno; /* Seqno of message */
clock_t timer; /* Holding time */
struct dup_iface *ifaces; /* Interfaces this message was recieved on */
- olsr_u8_t forwarded; /* If this message was forwarded or not */
struct dup_entry *next; /* Next entry */
struct dup_entry *prev; /* Prev entry */
--- 51,57 ----
union olsr_ip_addr addr; /* IP address of originator */
olsr_u16_t seqno; /* Seqno of message */
+ olsr_u8_t forwarded; /* If this message was forwarded or not */
clock_t timer; /* Holding time */
struct dup_iface *ifaces; /* Interfaces this message was recieved on */
struct dup_entry *next; /* Next entry */
struct dup_entry *prev; /* Prev entry */
Index: link_set.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/link_set.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** link_set.h 2 Nov 2007 20:58:06 -0000 1.33
--- link_set.h 25 Nov 2007 21:38:13 -0000 1.34
***************
*** 1,5 ****
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
--- 1,5 ----
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
***************
*** 62,65 ****
--- 62,66 ----
struct neighbor_entry *neighbor;
olsr_u8_t prev_status;
+
/*
*Hysteresis
***************
*** 87,91 ****
unsigned int total_packets;
! double loss_link_quality, loss_link_quality2;
double loss_link_multiplier;
--- 88,93 ----
unsigned int total_packets;
! double loss_link_quality
! double loss_link_quality2;
double loss_link_multiplier;
Index: interfaces.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** interfaces.h 16 Nov 2007 19:12:55 -0000 1.45
--- interfaces.h 25 Nov 2007 21:38:13 -0000 1.46
***************
*** 1,5 ****
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
--- 1,5 ----
/*
* The olsr.org Optimized Link-State Routing daemon(olsrd)
! * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
* All rights reserved.
*
***************
*** 140,147 ****
int int_mtu; /* MTU of interface */
int int_flags; /* see below */
- char *int_name; /* from kernel if structure */
int if_index; /* Kernels index of this interface */
int is_wireless; /* wireless interface or not*/
olsr_u16_t olsr_seqnum; /* Olsr message seqno */
float hello_etime;
--- 140,147 ----
int int_mtu; /* MTU of interface */
int int_flags; /* see below */
int if_index; /* Kernels index of this interface */
int is_wireless; /* wireless interface or not*/
olsr_u16_t olsr_seqnum; /* Olsr message seqno */
+ char *int_name; /* from kernel if structure */
float hello_etime;
More information about the Olsr-cvs
mailing list